From 9af3b3367e9d8896d81b10c7851526f633a3f5ad Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 25 Mar 2018 18:04:15 +0200 Subject: [PATCH] Don't cherry-pick: - fixed German/English translation mixture - sorted i18n strings - added missing i18n string LABEL_RECEIPT_SELLERS - this string is in project bundle, not msg (generic) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../localization/project_de_DE.properties | 15 ++++++++------- .../localization/project_en_US.properties | 13 +++++++------ .../financial/receipt/admin_receipt_list.xhtml | 2 +- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/src/java/org/mxchange/localization/project_de_DE.properties b/src/java/org/mxchange/localization/project_de_DE.properties index 41417042..a317a33c 100644 --- a/src/java/org/mxchange/localization/project_de_DE.properties +++ b/src/java/org/mxchange/localization/project_de_DE.properties @@ -242,10 +242,11 @@ ADMIN_SELECT_PRODUCT_AGE_GROUP_TITLE=Bitte waehlen Sie wenn moeglich eine Alters ADMIN_ENTER_GENERIC_PRODUCT_SIZE=Groesse des Produktes: #@TODO Please fix German umlauts! ADMIN_ENTER_GENERIC_PRODUCT_SIZE_TITLE=Geben Sie hier die Groesse des Produktes an. Zum Beispiel haben Schuhe oder Kleider Groessen. -AGE_GROUP_BABY=Age group "Baby" -AGE_GROUP_NEWBORN=Age group "Newborn" -AGE_GROUP_CHILD=Age group "Child" -lAGE_GROUP_YOUTH= -AGE_GROUP_YOUTH=Age group "Youth" -AGE_GROUP_ADULT=Age group "Adult" -AGE_GROUP_SENIOR=Age group "Senior" +AGE_GROUP_NEWBORN=Altersgruppe "Neugeborene" +AGE_GROUP_BABY=Altersgruppe "Baby" +AGE_GROUP_CHILD=Altersgruppe "Kind" +AGE_GROUP_YOUTH=Altersgruppe "Jugend" +AGE_GROUP_ADULT=Altersgruppe "Erwachsene" +AGE_GROUP_SENIOR=Altersgruppe "Senioren" +#@TODO Please fix German umlauts! +LABEL_RECEIPT_SELLERS=Verkaeufer diff --git a/src/java/org/mxchange/localization/project_en_US.properties b/src/java/org/mxchange/localization/project_en_US.properties index d20bc35f..16e002c1 100644 --- a/src/java/org/mxchange/localization/project_en_US.properties +++ b/src/java/org/mxchange/localization/project_en_US.properties @@ -174,10 +174,11 @@ ADMIN_SELECT_PRODUCT_AGE_GROUP=Choose product's age group: ADMIN_SELECT_PRODUCT_AGE_GROUP_TITLE=Please choose an age class for this product, if possible. For example shoes and clothing have age classes. ADMIN_ENTER_GENERIC_PRODUCT_SIZE=Enter product's size: ADMIN_ENTER_GENERIC_PRODUCT_SIZE_TITLE=Enter product's size, if available. For example shoes or clothing have sizes. -AGE_GROUP_BABY=Altersgruppe "Baby" -AGE_GROUP_NEWBORN=Altersgruppe "Neugeborene" -AGE_GROUP_CHILD=Altersgruppe "Kind" -lAGE_GROUP_YOUTH=Altersgruppe "Jugend" +AGE_GROUP_NEWBORN=Age group "Newborn" +AGE_GROUP_BABY=Age group "Baby" +AGE_GROUP_CHILD=Age group "Child" +AGE_GROUP_YOUTH=Age group "Youth" +AGE_GROUP_ADULT=Age group "Adult" +AGE_GROUP_SENIOR=Age group "Senior" BUTTON_ADMIN_ADD_GENERIC_PRODUCT=Add product -AGE_GROUP_ADULT=Altersgruppe "Erwachsene" -AGE_GROUP_SENIOR=Altersgruppe "Senioren" +LABEL_RECEIPT_SELLERS=Seller diff --git a/web/admin/financial/receipt/admin_receipt_list.xhtml b/web/admin/financial/receipt/admin_receipt_list.xhtml index 6a521e30..c8928c85 100644 --- a/web/admin/financial/receipt/admin_receipt_list.xhtml +++ b/web/admin/financial/receipt/admin_receipt_list.xhtml @@ -79,7 +79,7 @@