Merge branch 'master' of file:///E:/Java%19Project/addressbook

Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
	lib/jcore.jar

diff --git a/lib/jswingcore.jar b/lib/jswingcore.jar
index b8ad4a3890100e5e90943c943600305f0e46c227..f2375ce4af1a11e14fe9988b4f849157e7fb98ee 100644 (file)
Binary files a/lib/jswingcore.jar and b/lib/jswingcore.jar differ

diff --git a/src/org/mxchange/localization/bundle_de_DE.properties b/src/org/mxchange/localization/bundle_de_DE.properties
index 19ee7535a98b6ddd7302c1f999b7e3edd8c3703d..521436c4f6097d47a12cdfa0fe1f69ee9bcef264 100644 (file)
--- a/src/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/org/mxchange/localization/bundle_de_DE.properties
@@ -56,10 +56,10 @@ AddressbookFrame.faxNumber.text=Fax:
 AddressbookFrame.faxNumber.toolTipText=Geben Sie die Faxnummer ein.
 AddressbookFrame.comment.text=Anmerkungen:
 AddressbookFrame.comment.toolTipText=Geben Sie eine Anmerkung (Freifeld) ein.
-BaseContact.gender.unknown.text=Unbekannt
-BaseContact.gender.male.text=Herr
-BaseContact.gender.female.text=Frau
-BaseContact.gender.company.text=Firma
+GENDER_UNKNOWN=Unbekannt
+GENDER_MALE=Herr
+GENDER_FEMALE=Frau
+GENDER_COMPANY=Firma
 ContactManager.columnName.gender.text=Anrede
 ContactManager.columnName.surname.text=Vorname
 ContactManager.columnName.familyName.text=Nachname

diff --git a/src/org/mxchange/localization/bundle_en_US.properties b/src/org/mxchange/localization/bundle_en_US.properties
index 5b2c4d208f19f84835cd7dccaa28784afeb15524..d1b034621339aa9ee9b6823f5ab2217d31c32115 100644 (file)
--- a/src/org/mxchange/localization/bundle_en_US.properties
+++ b/src/org/mxchange/localization/bundle_en_US.properties
@@ -56,10 +56,10 @@ AddressbookFrame.faxNumber.text=Fax:
 AddressbookFrame.faxNumber.toolTipText=Enter fax number.
 AddressbookFrame.comment.text=Note:
 AddressbookFrame.comment.toolTipText=Enter a note (free field).
-BaseContact.gender.unknown.text=Unknown
-BaseContact.gender.male.text=Mr.
-BaseContact.gender.female.text=Mrs.
-BaseContact.gender.company.text=Company
+GENDER_UNKNOWN=Unknown
+GENDER_MALE=Mr.
+GENDER_FEMALE=Mrs.
+GENDER_COMPANY=Company
 ContactManager.columnName.gender.text=Gender
 ContactManager.columnName.surname.text=Surname
 ContactManager.columnName.familyName.text=Family name