From bc1eb109a46896a3f3df9d06f4f6ffc2f07e67e4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Mon, 29 Aug 2016 16:20:55 +0200 Subject: [PATCH] Please cherry-pick: - opps, English in German file and wise versa --- .../localization/bundle_de_DE.properties | 26 +++++++++---------- .../localization/bundle_en_US.properties | 24 ++++++++--------- 2 files changed, 24 insertions(+), 26 deletions(-) diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index 9f23d635..04b1b118 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -776,17 +776,15 @@ ADMIN_DELETE_USER_NOTICE=Durch das L\u00f6schen des Benutzeraccounts werden nur ADMIN_ACTIVITY_ADMIN_DELETED_USER_ACCOUNT=Benutzeraccount gel\u00f6scht vom Administrator. USER_ACTIVITY_ADMIN_DELETED_USER_ACCOUNT=Ihr Benutzeraccount wurde von einem Administrator gel\u00f6scht. ADMIN_USER_DELETE_REASON=L\u00f6schgrund: (optional) -ADMIN_USER_PASSWORD_REPEAT_DIFFERENT=Your both entered passwords don't match. -ADMIN_USER_NAME_ALREADY_EXISTS=Your entered user name does already exist in other user account. -ADMIN_USER_ENTERED_SAME_AS_OLD_PASSWORD=You have not changed the password (same as stored entered) -PAGE_TITLE_USER_LOGIN_CHANGE_PASSWORD=Change your user account password -CONTENT_TITLE_USER_LOGIN_CHANGE_PASSWORD=Here you can change your user account password: -USER_MUST_CHANGE_PASSWORD_NOTICE=You have to change your password as this is requested by the administrator. After successful change, you can use your account as usual. -LOGIN_CHANGE_PASSWORD_TITLE=Change your password: -LOGIN_CHANGE_PASSWORD_LEGEND=Please enter twice the new password: -#Das neue Passwort muss zweimal eingegeben werden, um Tippfehler auszuschlie\u00dfen. Dabei darf es mit bereits verwendeten Passw\u00f6rtern nicht \u00fcbereinstimmen. -LOGIN_CHANGE_PASSWORD_LEGEND_TITLE=The new password must be entered twice to avoid typing mistakes. It still must not match older passwords. -ERROR_LOGIN_USER_CHANGE_EMAIL_ADDRESS_DISABLED=Changing of user's email address is administratively deactivated. -#Die von Ihnen eingegebene Email-Adresse hatten Sie bereits zum \u00c4ndern eingegeben. Bitte melden Sie sich beim Support. -ERROR_USER_CHANGE_EMAIL_ADDRESS_ALREADY_QUEUED=You have already entered the email address for changing. Please report to support. -ERROR_USER_EMAIL_ADDRESSES_MISMATCH=Your both entered email addresses are mismatching. +ADMIN_USER_PASSWORD_REPEAT_DIFFERENT=Die beiden von Ihnen eingegebenen Passw\u00f6rter stimmen nicht \u00fcberein. +ADMIN_USER_NAME_ALREADY_EXISTS=Der von Ihnen eingegebene Benutzername existiert bereits (anderes Benutzeraccount). +ADMIN_USER_ENTERED_SAME_AS_OLD_PASSWORD=Sie haben das Passwort nicht ge\u00e4ndert (selibiges wie gespeichertes). +PAGE_TITLE_USER_LOGIN_CHANGE_PASSWORD=\u00c4ndern Ihres Zugangspasswortes +CONTENT_TITLE_USER_LOGIN_CHANGE_PASSWORD=\u00c4ndern Sie hier Ihr Zugangspasswort: +USER_MUST_CHANGE_PASSWORD_NOTICE=Sie m\u00fcssen Ihr Passwort \u00e4ndern, da dies vom Administrator so vorgegeben ist. Danach k\u00f6nnen Sie Ihren Account wieder normal verwenden. +LOGIN_CHANGE_PASSWORD_TITLE=\u00c4ndern Sie Ihr Passwort: +LOGIN_CHANGE_PASSWORD_LEGEND=Bitte zweimal das neue Passwort eingeben: +LOGIN_CHANGE_PASSWORD_LEGEND_TITLE=Das neue Passwort muss zweimal eingegeben werden, um Tippfehler auszuschlie\u00dfen. Dabei darf es mit bereits verwendeten Passw\u00f6rtern nicht \u00fcbereinstimmen. +ERROR_LOGIN_USER_CHANGE_EMAIL_ADDRESS_DISABLED=Das \u00c4ndern der Email-Adresse ist administrativ deaktiviert worden. +ERROR_USER_CHANGE_EMAIL_ADDRESS_ALREADY_QUEUED=Die von Ihnen eingegebene Email-Adresse hatten Sie bereits zum \u00c4ndern eingegeben. Bitte melden Sie sich beim Support. +ERROR_USER_EMAIL_ADDRESSES_MISMATCH=Die von Ihnen eingegebenen Email-Adressen stimmen nicht \u00fcberein. diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties index 542f3c80..96f66c4e 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -777,15 +777,15 @@ ADMIN_DELETE_USER_NOTICE=By deleting the user's account, only user data is delet ADMIN_ACTIVITY_ADMIN_DELETED_USER_ACCOUNT=User account has been deleted by administrator. USER_ACTIVITY_ADMIN_DELETED_USER_ACCOUNT=Your account has been deleted by an administrator. ADMIN_USER_DELETE_REASON=Delete reason: (optional) -ADMIN_USER_PASSWORD_REPEAT_DIFFERENT=Die beiden von Ihnen eingegebenen Passw\u00f6rter stimmen nicht \u00fcberein. -ADMIN_USER_NAME_ALREADY_EXISTS=Der von Ihnen eingegebene Benutzername existiert bereits (anderes Benutzeraccount). -ADMIN_USER_ENTERED_SAME_AS_OLD_PASSWORD=Sie haben das Passwort nicht ge\u00e4ndert (selibiges wie gespeichertes). -PAGE_TITLE_USER_LOGIN_CHANGE_PASSWORD=\u00c4ndern Ihres Zugangspasswortes -CONTENT_TITLE_USER_LOGIN_CHANGE_PASSWORD=\u00c4ndern Sie hier Ihr Zugangspasswort: -USER_MUST_CHANGE_PASSWORD_NOTICE=Sie m\u00fcssen Ihr Passwort \u00e4ndern, da dies vom Administrator so vorgegeben ist. Danach k\u00f6nnen Sie Ihren Account wieder normal verwenden. -LOGIN_CHANGE_PASSWORD_TITLE=\u00c4ndern Sie Ihr Passwort: -LOGIN_CHANGE_PASSWORD_LEGEND=Bitte zweimal das neue Passwort eingeben: -LOGIN_CHANGE_PASSWORD_LEGEND_TITLE=Das neue Passwort muss zweimal eingegeben werden, um Tippfehler auszuschlie\u00dfen. Dabei darf es mit bereits verwendeten Passw\u00f6rtern nicht \u00fcbereinstimmen. -ERROR_LOGIN_USER_CHANGE_EMAIL_ADDRESS_DISABLED=Das \u00c4ndern der Email-Adresse ist administrativ deaktiviert worden. -ERROR_USER_CHANGE_EMAIL_ADDRESS_ALREADY_QUEUED=Die von Ihnen eingegebene Email-Adresse hatten Sie bereits zum \u00c4ndern eingegeben. Bitte melden Sie sich beim Support. -ERROR_USER_EMAIL_ADDRESSES_MISMATCH=Die von Ihnen eingegebenen Email-Adressen stimmen nicht \u00fcberein. +ADMIN_USER_PASSWORD_REPEAT_DIFFERENT=Your both entered passwords don't match. +ADMIN_USER_NAME_ALREADY_EXISTS=Your entered user name does already exist in other user account. +ADMIN_USER_ENTERED_SAME_AS_OLD_PASSWORD=You have not changed the password (same as stored entered) +PAGE_TITLE_USER_LOGIN_CHANGE_PASSWORD=Change your user account password +CONTENT_TITLE_USER_LOGIN_CHANGE_PASSWORD=Here you can change your user account password: +USER_MUST_CHANGE_PASSWORD_NOTICE=You have to change your password as this is requested by the administrator. After successful change, you can use your account as usual. +LOGIN_CHANGE_PASSWORD_TITLE=Change your password: +LOGIN_CHANGE_PASSWORD_LEGEND=Please enter twice the new password: +LOGIN_CHANGE_PASSWORD_LEGEND_TITLE=The new password must be entered twice to avoid typing mistakes. It still must not match older passwords. +ERROR_LOGIN_USER_CHANGE_EMAIL_ADDRESS_DISABLED=Changing of user's email address is administratively deactivated. +ERROR_USER_CHANGE_EMAIL_ADDRESS_ALREADY_QUEUED=You have already entered the email address for changing. Please report to support. +ERROR_USER_EMAIL_ADDRESSES_MISMATCH=Your both entered email addresses are mismatching. -- 2.39.5