From 3ca7d46e60f45e799e01646b67c363f2668583bb Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Thu, 5 May 2016 18:38:47 +0200 Subject: [PATCH] renamed language strings --- .../mxchange/localization/bundle_de_DE.properties | 12 ++++++------ .../mxchange/localization/bundle_en_US.properties | 15 ++++++--------- .../templates/generic/form_personal_data.tpl | 6 +++--- 3 files changed, 15 insertions(+), 18 deletions(-) diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index 7f103b69..08bdc0f1 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -179,10 +179,10 @@ USER_PROFILE_NOT_PUBLICLY_VISIBLE=Das Benutzerprofil ist privat. PAGE_TITLE_LOGIN_USER_PROFILE=Benutzerprofil ansehen PUBLIC_USER_PROFILE=\u00d6ffentliches Benutzerprofil #TODO: Please fix German umlaut! -USER_PROFILE_MODE_SELECTION_NOTICE1=Stellen Sie auf "Verdeckt", kann niemand mit Ihnen Adressbuecher teilen. +SELECTION_NOTICE_USER_PROFILE_MODE_INVISIBLE=Stellen Sie auf "Verdeckt", kann niemand mit Ihnen Adressbuecher teilen. #TODO: Please fix German umlaut! -USER_PROFILE_MODE_SELECTION_NOTICE2=Stellen Sie auf "Nur Mitglieder", koennen andere Mitglieder Ihnen Ihre Adressbuecher freigeben. -USER_PROFILE_MODE_SELECTION_NOTICE3=Stellen Sie auf "Alle", ist Ihr Profil im gesamten Internet sichtbar, auch Bots. +SELECTION_NOTICE_USER_PROFILE_MODE_MEMBERS=Stellen Sie auf "Nur Mitglieder", koennen andere Mitglieder Ihnen Ihre Adressbuecher freigeben. +SELECTION_NOTICE_USER_PROFILE_MODE_PUBLIC=Stellen Sie auf "Alle", ist Ihr Profil im gesamten Internet sichtbar, auch Bots. LOGIN_NO_PASSWORD_MESSAGE=Sie haben kein Passwort eingegeben. LOGIN_NO_USER_NAME_MESSAGE=Sie haben keinen Benutzernamen eingegeben. USER_NOT_LOGGED_IN=Sie sind nicht angemeldet. @@ -357,9 +357,9 @@ ADMIN_LIST_USER_CREATED=Angemeldet seit: USER_ACCOUNT_STATUS_CONFIRMED=Best\u00e4tigt USER_ACCOUNT_STATUS_UNCONFIRMED=Unbest\u00e4tigt USER_ACCOUNT_STATUS_LOCKED=Gesperrt -USER_PROFILE_MODE_INVISIBLE=Durchsichtig -USER_PROFILE_MODE_MEMBERS=Nur Mitglieder -USER_PROFILE_MODE_PUBLIC=\u00d6ffentlich +PROFILE_MODE_INVISIBLE=Durchsichtig +PROFILE_MODE_MEMBERS=Nur Mitglieder +PROFILE_MODE_PUBLIC=\u00d6ffentlich ADMIN_LINK_SHOW_USER_TITLE=Administratives Benutzerprofil anzeigen PAGE_TITLE_ADMIN_SHOW_USER=Benutzerprofil anzeigen CONTENT_TITLE_ADMIN_SHOW_USER=Profil eines Benutzers anzeigen: diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties index 6a9a55b4..1b181b87 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -178,12 +178,12 @@ PAGE_TITLE_INDEX_SHOW_ADDRESSBOOK=Show public part of address book USER_PROFILE_NOT_PUBLICLY_VISIBLE=The user profile is private. PAGE_TITLE_LOGIN_USER_PROFILE=View user profile PUBLIC_USER_PROFILE=Public user profile -USER_PROFILE_MODE_INVISIBLE=Invisible -USER_PROFILE_MODE_MEMBERS=Only visible to members -USER_PROFILE_MODE_PUBLIC=Visible for all -USER_PROFILE_MODE_SELECTION_NOTICE1=If you choose "Invisible", nobody can share address books with you. -USER_PROFILE_MODE_SELECTION_NOTICE2=If you choose "Only members", other users can start sharing address books with you. -USER_PROFILE_MODE_SELECTION_NOTICE3=If you choose "All" the whole Internet can view your profile, including bots. +PROFILE_MODE_INVISIBLE=Invisible +PROFILE_MODE_MEMBERS=Only visible to members +PROFILE_MODE_PUBLIC=Visible for all +SELECTION_NOTICE_USER_PROFILE_MODE_INVISIBLE=If you choose "Invisible", nobody can share address books with you. +SELECTION_NOTICE_USER_PROFILE_MODE_MEMBERS=If you choose "Only members", other users can start sharing address books with you. +SELECTION_NOTICE_USER_PROFILE_MODE_PUBLIC=If you choose "All" the whole Internet can view your profile, including bots. LOGIN_NO_PASSWORD_MESSAGE=You have entered no password. LOGIN_NO_USER_NAME_MESSAGE=You have entered no user name. USER_NOT_LOGGED_IN=You are not signed in. @@ -338,9 +338,6 @@ ADMIN_LIST_USER_CREATED=Registered: USER_ACCOUNT_STATUS_CONFIRMED=Confirmed USER_ACCOUNT_STATUS_UNCONFIRMED=Unconfirmed USER_ACCOUNT_STATUS_LOCKED=Locked -USER_PROFILE_MODE_INVISIBLE=Invisible -USER_PROFILE_MODE_MEMBERS=Only members -USER_PROFILE_MODE_PUBLIC=Public ADMIN_LINK_SHOW_USER_TITLE=Show administrative user profile PAGE_TITLE_ADMIN_SHOW_USER=Show user profile CONTENT_TITLE_ADMIN_SHOW_USER=Show profile of a user: diff --git a/web/WEB-INF/templates/generic/form_personal_data.tpl b/web/WEB-INF/templates/generic/form_personal_data.tpl index 3f285021..a39b1a92 100644 --- a/web/WEB-INF/templates/generic/form_personal_data.tpl +++ b/web/WEB-INF/templates/generic/form_personal_data.tpl @@ -207,9 +207,9 @@
    -
  • #{msg.USER_PROFILE_MODE_SELECTION_NOTICE1}
  • -
  • #{msg.USER_PROFILE_MODE_SELECTION_NOTICE2}
  • -
  • #{msg.USER_PROFILE_MODE_SELECTION_NOTICE3}
  • +
  • #{msg.SELECTION_NOTICE_USER_PROFILE_MODE_INVISIBLE}
  • +
  • #{msg.SELECTION_NOTICE_USER_PROFILE_MODE_MEMBERS}
  • +
  • #{msg.SELECTION_NOTICE_USER_PROFILE_MODE_PUBLIC}
-- 2.39.5