From 0e4c4cbbb225f8a351be5fa82d8511b5b237353d Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Fri, 16 Oct 2015 14:53:20 +0200 Subject: [PATCH] =?utf8?q?Renamed=20login/login=5Fshow=5Fadressbook*=20->?= =?utf8?q?=20user/show=5Faddressbook*=20and=20maybe=20all=20language=20str?= =?utf8?q?ings=3F=20Signed-off-by:Roland=20H=C3=A4der=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- nbproject/faces-config.NavData | 4 ++-- .../org/mxchange/localization/bundle_de_DE.properties | 10 +++++----- .../org/mxchange/localization/bundle_en_US.properties | 10 +++++----- web/WEB-INF/faces-config.xml | 10 +++++----- web/login/login_own_addressbooks.xhtml | 8 ++++---- web/login/login_shared_addressbooks.xhtml | 4 ++-- .../show_addressbook.xhtml} | 6 +++--- .../show_addressbook_entries.xhtml} | 4 ++-- 8 files changed, 28 insertions(+), 28 deletions(-) rename web/{login/login_show_addressbook.xhtml => user/show_addressbook.xhtml} (86%) rename web/{login/login_show_addressbook_entries.xhtml => user/show_addressbook_entries.xhtml} (79%) diff --git a/nbproject/faces-config.NavData b/nbproject/faces-config.NavData index 574d0226..f0eec34e 100644 --- a/nbproject/faces-config.NavData +++ b/nbproject/faces-config.NavData @@ -16,7 +16,7 @@ - + @@ -36,7 +36,7 @@ - + diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index c9ed444d..0623ee56 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -178,12 +178,12 @@ ADDRESSBOOK_NAME=Addressbuchname: ADDRESSBOOK_NAME_TITLE=Name des Adressbuches ADDRESSBOOK_CREATED=Erstellt: ADDRESSBOOK_CREATED_TITLE=Wann das Adressbuch erstellt wurde. -LINK_LOGIN_SHOW_ADDRESS_BOOK_TITLE=Adressbuch anzeigen -PAGE_TITLE_LOGIN_SHOW_ADDRESSBOOK=Adressbuch anzeigen -CONTENT_TITLE_LOGIN_SHOW_ADDRESSBOOK=Anzeigen des ausgew\u00e4hlten Adressbuchs: +LINK_SHOW_ADDRESSBOOK_TITLE=Adressbuch anzeigen +PAGE_TITLE_USER_SHOW_ADDRESSBOOK=Adressbuch anzeigen +CONTENT_TITLE_USER_SHOW_ADDRESSBOOK=Anzeigen des ausgew\u00e4hlten Adressbuchs: ADDRESSBOOK_TOTAL_ENTRIES=Eintr\u00e4ge: -PAGE_TITLE_LOGIN_SHOW_ADDRESSBOOK_ENTRIES=Adressbucheintr\u00e4ge zeigen -CONTENT_TITLE_LOGIN_SHOW_ADDRESSBOOK_ENTRIES=Alle Adressbuchentr\u00e4ge anzeigen: +PAGE_TITLE_USER_SHOW_ADDRESSBOOK_ENTRIES=Adressbucheintr\u00e4ge zeigen +CONTENT_TITLE_USER_SHOW_ADDRESSBOOK_ENTRIES=Alle Adressbuchentr\u00e4ge anzeigen: ADDRESSBOOK_TOTAL_ENTRIES_TITLE=Eintr\u00e4ge im Adressbuch PARAMETER_ADDRESSBOOK_ID_MISSING=Bitte diese Seite mit Id-Nummer aufrufen. PARAMETER_ADDRESSBOOK_ID_INVALID=Id-Nummer f\u00fcr Adressbuch ung\u00fcltig. Bitte links weiter navigieren. diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties index 9bf4873b..6b104835 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 @@ ADDRESSBOOK_NAME=Address book name: ADDRESSBOOK_NAME_TITLE=Name of the address book ADDRESSBOOK_CREATED=Created: ADDRESSBOOK_CREATED_TITLE=When the address book was created. -LINK_LOGIN_SHOW_ADDRESS_BOOK_TITLE=Show address book -PAGE_TITLE_LOGIN_SHOW_ADDRESSBOOK=Show address book -CONTENT_TITLE_LOGIN_SHOW_ADDRESSBOOK=Show selected address book: +LINK_SHOW_ADDRESSBOOK_TITLE=Show address book +PAGE_TITLE_USER_SHOW_ADDRESSBOOK=Show address book +CONTENT_TITLE_USER_SHOW_ADDRESSBOOK=Show selected address book: ADDRESSBOOK_TOTAL_ENTRIES=Entries: -PAGE_TITLE_LOGIN_SHOW_ADDRESSBOOK_ENTRIES=Show address book entries -CONTENT_TITLE_LOGIN_SHOW_ADDRESSBOOK_ENTRIES=Show all address book entries: +PAGE_TITLE_USER_SHOW_ADDRESSBOOK_ENTRIES=Show address book entries +CONTENT_TITLE_USER_SHOW_ADDRESSBOOK_ENTRIES=Show all address book entries: ADDRESSBOOK_TOTAL_ENTRIES_TITLE=Entries in address book PARAMETER_ADDRESSBOOK_ID_MISSING=Please call this web page with id number. PARAMETER_ADDRESSBOOK_ID_INVALID=Id number for address book invalid. Please continue navigating on left menu. diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml index b41a48a2..d7c7b34f 100644 --- a/web/WEB-INF/faces-config.xml +++ b/web/WEB-INF/faces-config.xml @@ -144,12 +144,12 @@ /login/login_add_addressbook.xhtml - login_show_addressbook - /login/login_show_addressbook.xhtml + user_show_addressbook + /user/show_addressbook.xhtml - login_show_addressbook_entries - /login/login_show_addressbook_entries.xhtml + show_addressbook_entries + /login/show_addressbook_entries.xhtml @@ -160,7 +160,7 @@ - /login/login_show_addressbook.xhtml + /user/show_addressbook.xhtml login_start_sharing_addressbook /login/login_start_sharing_addressbook.xhtml diff --git a/web/login/login_own_addressbooks.xhtml b/web/login/login_own_addressbooks.xhtml index f6c414f8..7fe3565e 100644 --- a/web/login/login_own_addressbooks.xhtml +++ b/web/login/login_own_addressbooks.xhtml @@ -30,8 +30,8 @@ #{msg.ADDRESSBOOK_NAME} - - + + @@ -39,8 +39,8 @@ #{msg.ADDRESSBOOK_TOTAL_ENTRIES} - - + + diff --git a/web/login/login_shared_addressbooks.xhtml b/web/login/login_shared_addressbooks.xhtml index 2f6ba09a..c6b56daa 100644 --- a/web/login/login_shared_addressbooks.xhtml +++ b/web/login/login_shared_addressbooks.xhtml @@ -24,8 +24,8 @@ #{msg.SHARED_ADDRESSBOOK} - - + + diff --git a/web/login/login_show_addressbook.xhtml b/web/user/show_addressbook.xhtml similarity index 86% rename from web/login/login_show_addressbook.xhtml rename to web/user/show_addressbook.xhtml index c5ab81ad..9bf683e4 100644 --- a/web/login/login_show_addressbook.xhtml +++ b/web/user/show_addressbook.xhtml @@ -7,18 +7,18 @@ > - + - #{msg.PAGE_TITLE_LOGIN_SHOW_ADDRESSBOOK} + #{msg.PAGE_TITLE_USER_SHOW_ADDRESSBOOK} #{msg.PAGE_TITLE_INDEX_SHOW_ADDRESSBOOK} - #{msg.CONTENT_TITLE_LOGIN_SHOW_ADDRESSBOOK} + #{msg.CONTENT_TITLE_USER_SHOW_ADDRESSBOOK} diff --git a/web/login/login_show_addressbook_entries.xhtml b/web/user/show_addressbook_entries.xhtml similarity index 79% rename from web/login/login_show_addressbook_entries.xhtml rename to web/user/show_addressbook_entries.xhtml index 5f53e615..e4cb5aee 100644 --- a/web/login/login_show_addressbook_entries.xhtml +++ b/web/user/show_addressbook_entries.xhtml @@ -7,10 +7,10 @@ > - #{msg.PAGE_TITLE_LOGIN_SHOW_ADDRESSBOOK_ENTRIES} + #{msg.PAGE_TITLE_USER_SHOW_ADDRESSBOOK_ENTRIES} - #{msg.CONTENT_TITLE_LOGIN_SHOW_ADDRESSBOOK_ENTRIES} + #{msg.CONTENT_TITLE_USER_SHOW_ADDRESSBOOK_ENTRIES} -- 2.39.5