From: Roland Häder <roland@mxchange.org>
Date: Tue, 12 Mar 2019 13:13:52 +0000 (+0100)
Subject: Product-only:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a694da8a0aaf46d1c836f3c2fd3c5ef87aa1773f;p=jfinancials-war.git

Product-only:
- renamed ADMIN_ASSIGNED_ITEM_PRODUCT to ADMIN_PRODUCT_HEADER
- renamed ADMIN_ASSIGNED_PRODUCT_CATEGORY_HEADER to ADMIN_ASSIGNED_PRODUCT_CATEGORY_LABEL
- renamed ADMIN_ASSIGNED_PARENT_CATEGORY_HEADER to ADMIN_PARENT_PRODUCT_CATEGORY_HEADER
- added more missing i18n strings
- removed some obsolete

Signed-off-by: Roland Häder <roland@mxchange.org>
---

diff --git a/src/java/org/mxchange/localization/product_de_DE.properties b/src/java/org/mxchange/localization/product_de_DE.properties
index 53261d5a..56e219bd 100644
--- a/src/java/org/mxchange/localization/product_de_DE.properties
+++ b/src/java/org/mxchange/localization/product_de_DE.properties
@@ -24,7 +24,7 @@ ADMIN_ENTER_GENERIC_PRODUCT_PRICE=Preis des Produktes eingeben:
 ENTER_NET_PRICE=Nettopreis:
 ENTER_TAX_RATE=Steuersatz:
 ENTER_GROSS_PRICE=Bruttopreis:
-ADMIN_ASSIGNED_ITEM_PRODUCT=Zugewiesenes Produkt:
+ADMIN_PRODUCT_HEADER=Produkt:
 LABEL_PRODUCTS=Produkte
 #@TODO Please fix German umlauts!
 ADMIN_PRODUCT_REQUIRED=Bitte waehlen Sie ein Produkt aus.
@@ -43,17 +43,17 @@ ADMIN_LINK_SHOW_GENERIC_PRODUCT_TITLE=Zeigt Daten des Produktes an.
 ADMIN_LINK_EDIT_GENERIC_PRODUCT_TITLE=Aendert Daten des Produktes ab.
 #@TODO Please fix German umlauts!
 ADMIN_LINK_DELETE_GENERIC_PRODUCT_TITLE=Loescht das Produkt aus der Datenbank.
-ADMIN_ASSIGNED_PRODUCT_CATEGORY_HEADER=Zugewiesene Produktkategorie:
+ADMIN_ASSIGNED_PRODUCT_CATEGORY_LABEL=Zugewiesene Produktkategorie:
+ADMIN_PRODUCT_CATEGORY_HEADER=Produktkategorie:
 LABEL_PRODUCT_CATEGORIES=Produktkategorien
 FILTER_BY_MULTIPLE_PRODUCT_CATEGORIES_TITLE=Liste durch Auswahl von ein oder mehr Produktkategorien filtern.
+FILTER_BY_MULTIPLE_GENERIC_PRODUCTS_TITLE=Liste durch Auswahl von ein oder mehr Prdukten filtern.
 ADMIN_LINK_SHOW_GENERIC_PRODUCT_CATEGORY_TITLE=Zeigt Daten der Produktkategorie an.
 #@TODO Please fix German umlauts!
 ADMIN_LINK_EDIT_GENERIC_PRODUCT_CATEGORY_TITLE=Aendert Daten der Produktkategorie ab.
 #@TODO Please fix German umlauts!
 ADMIN_LINK_DELETE_GENERIC_PRODUCT_CATEGORY_TITLE=Loescht die Produktkategorie aus der Datenbank.
 #@TODO Please fix German umlauts!
-PRODUCT_AVAILABILITY_HEADER=Produkt verfuegbar:
-#@TODO Please fix German umlauts!
 ADMIN_ADD_GENERIC_PRODUCT_TITLE=Neues Produkt hinzufuegen
 #@TODO Please fix German umlauts!
 ADMIN_ADD_GENERIC_PRODUCT_MINIMUM_DATA=Bitte waehlen Sie eine Produktkategorie aus und geben Sie Produkttitel, sowie Stueckzahl (meistens 1), Einheit, Bruttopreis und Waehrungscode (EUR z.B.) ein.
@@ -86,7 +86,7 @@ PAGE_TITLE_ADMIN_LIST_PRODUCT_CATEGORY=Produktkategorien auflisten
 CONTENT_TITLE_ADMIN_LIST_PRODUCT_CATEGORY=Produktkategorien auflisten:
 TABLE_SUMMARY_ADMIN_LIST_PRODUCT_CATEGORIES=Diese Tabelle listet alle eingetragenen Produktkategorien auf.
 ADMIN_EMPTY_LIST_PRODUCT_CATEGORIES=Es befinden sich keine Produktkategorien in der Datenbank. Oder Ihre Suche ergab keine Uebereinstimmungen.
-ADMIN_ASSIGNED_PARENT_CATEGORY_HEADER=Zugewiesene Elternkategorie:
+ADMIN_PARENT_PRODUCT_CATEGORY_HEADER=Elternkategorie:
 ADMIN_LINK_SHOW_PRODUCT_CATEGORY_TITLE=Zeigt Daten der Produktkategorie an.
 ADMIN_LINK_ASSIGN_PARENT_CATEGORY_TITLE=Elternkategorie zuweisen.
 #@TODO Please fix German umlauts!
@@ -96,8 +96,8 @@ ADMIN_ADD_PRODUCT_CATEGORY_MINIMUM_DATA=Bitte geben Sie den Titel fuer die Kateg
 #@TODO Please fix German umlauts!
 BUTTON_ADMIN_ADD_PRODUCT_CATEGORY=Produktkategorie hinzufuegen
 ADMIN_PRODUCT_CATEGORY_DATA_LEGEND=Daten zur Produktkategorie:
-ADMIN_ASSIGN_PARENT_CATEGORY=Elternkategorie zuweisen:
-ADMIN_ASSIGN_PARENT_CATEGORY_TITLE=Weisen Sie eine andere Produktkategorie als Elternkategorie zu dieser neuen zu.
+ADMIN_ASSIGN_PARENT_PRODUCT_CATEGORY=Elternkategorie zuweisen:
+ADMIN_ASSIGN_PARENT_PRODUCT_CATEGORY_TITLE=Weisen Sie eine andere Produktkategorie als Elternkategorie zu dieser neuen zu.
 #@TODO Please fix German umlauts!
 ADMIN_ENTER_CATEGORY_I18N_KEY=I18N-Schluessel fuer Kategorie eingeben:
 #@TODO Please fix German umlauts!
@@ -126,7 +126,6 @@ ADMIN_PRODUCT_CURRENCY_CODE_REQUIRED=Bitte geben Sie den Waehrungscode fuer das
 ADMIN_PRODUCT_UNIT_AMOUNT_REQUIRED=Bitte geben Sie die Stueckanzahl des Produktes ein. Beispiel: 500 fuer 500g
 #@TODO Please fix German umlauts!
 ADMIN_PRODUCT_UNIT_I18N_KEY_REQUIRED=Bitte geben Sie den Uebersetzungschluessel zur Stueckzahl ein. Beispiel: UNIT_TYPE_GRAMS fuer Gramm
-ADMIN_PRODUCT_MANUFACTURER_NAME_HEADER=Produktehersteller:
 ADMIN_NO_PRODUCT_MANUFACTURER_ASSIGNED_TITLE=Es ist kein Hersteller dem Produkt zugewiesen.
 ADMIN_ENTER_GENERIC_PRODUCT_NUMBER=Geben Sie die Produktnummer ein:
 ADMIN_ENTER_GENERIC_PRODUCT_NUMBER_TITLE=Geben Sie die Nummer des Produktes ein.
@@ -172,7 +171,6 @@ PRODUCT_UNIT_I18N_KEY_HEADER=Internationalisierungsschluessel fuer Einheit:
 #@TODO Please fix German umlauts!
 PRODUCT_UNIT_I18N_KEY_TITLE=Internationalisierungsschluessel fuer Einheit
 PRODUCT_HAS_NO_MANUFACTURER_ASSIGNED=Produkt hat keinen Hersteller zugewiesen.
-ADMIN_ASSIGNED_PRODUCT_MANUFACTURER_HEADER=Zugewiesener Hersteller:
 ADMIN_ASSIGNED_PRODUCT_MANUFACTURER_TITLE=Diesem Produkt zugewiesner Hersteller.
 #@TODO Please fix German umlauts!
 ADMIN_PRODUCT_ENTRY_CREATED_TITLE=Wann dieses Produkt der Datenbank hinzugefuegt wurde.
@@ -200,7 +198,6 @@ ERROR_PARAMETER_PRODUCT_ID_NOT_SET=Fehler: Produkt-Id nicht gesetzt (Parameter:
 #@TODO Please fix German umlauts!
 PARAMETER_PRODUCT_ID_INVALID=Parameter "productId" ist ungueltig.
 PRODUCT_I18N_KEY_HEADER=Internationalisierungsschluessel des Produktes:
-ADMIN_ASSIGNED_MANUFACTURER_HEADER=Zugewiesener Hersteller:
 GROSS_PRICE_HEADER=Bruttopreis:
 NET_PRICE_HEADER=Nettopreis:
 TAX_RATE_HEADER=Steuersatz:
@@ -219,3 +216,8 @@ ADMIN_ENTER_GENERIC_PRODUCT_BARCODE_NUMBER=Geben Sie die Balkencodenummer des Pr
 BARCODE_NUMBER_HEADER=Barcode-Nummer:
 PRODUCT_NO_BARCODE_NUMBER_ASSIGNED=Das Produkt hat keine Barcode-Nummer zugewiesen.
 PRODUCT_BARCODE_NUMBER_TITLE=Barcode Nummer des Produktes.
+ADMIN_PRODUCT_CATEGORY_DATA_LEGEND=Daten zur Produktkategorie:
+ADMIN_ASSIGN_PARENT_PRODUCT_CATEGORY=Elternkategorie zuweisen:
+ENTER_BRAND_NAME=Markenzeichen eingeben:
+ENTER_BRAND_NAME_TITLE=Geben Sie das Markenzeichen zum Produkt ein.
+ADMIN_PRODUCT_MANUFACTURER_HEADER=Hersteller des Produktes:
diff --git a/src/java/org/mxchange/localization/product_en_US.properties b/src/java/org/mxchange/localization/product_en_US.properties
index 1a5d8d85..ed337e6f 100644
--- a/src/java/org/mxchange/localization/product_en_US.properties
+++ b/src/java/org/mxchange/localization/product_en_US.properties
@@ -21,7 +21,7 @@ ADMIN_ENTER_GENERIC_PRODUCT_PRICE=Enter product's price:
 ENTER_NET_PRICE=Net price:
 ENTER_TAX_RATE=Tax rate:
 ENTER_GROSS_PRICE=Gross price:
-ADMIN_ASSIGNED_ITEM_PRODUCT=Assigned product:
+ADMIN_PRODUCT_HEADER=Product:
 LABEL_PRODUCTS=Products
 ADMIN_PRODUCT_REQUIRED=Please choose a product.
 ADMIN_MENU_PRODUCTS_CATEGORIES_TITLE=Products & Categories
@@ -36,13 +36,14 @@ ADMIN_EMPTY_LIST_GENERIC_PRODUCTS=There are no products in database. Or your sea
 ADMIN_LINK_SHOW_GENERIC_PRODUCT_TITLE=Shows product data.
 ADMIN_LINK_EDIT_GENERIC_PRODUCT_TITLE=Edits product data.
 ADMIN_LINK_DELETE_GENERIC_PRODUCT_TITLE=Deletes product data.
-ADMIN_ASSIGNED_PRODUCT_CATEGORY_HEADER=Assigned product category:
+ADMIN_ASSIGNED_PRODUCT_CATEGORY_LABEL=Assigned product category:
+ADMIN_PRODUCT_CATEGORY_HEADER=Product category:
 LABEL_PRODUCT_CATEGORIES=Product categories
 FILTER_BY_MULTIPLE_PRODUCT_CATEGORIES_TITLE=Filter list by selecting one or more product categories.
+FILTER_BY_MULTIPLE_GENERIC_PRODUCTS_TITLE=Filter list bny selecting one or more products.
 ADMIN_LINK_SHOW_GENERIC_PRODUCT_CATEGORY_TITLE=Shows product category data.
 ADMIN_LINK_EDIT_GENERIC_PRODUCT_CATEGORY_TITLE=Edits product category data.
 ADMIN_LINK_DELETE_GENERIC_PRODUCT_CATEGORY_TITLE=Deletes product category data.
-PRODUCT_AVAILABILITY_HEADER=Product available:
 ADMIN_ADD_GENERIC_PRODUCT_TITLE=Add new product
 ADMIN_ADD_GENERIC_PRODUCT_MINIMUM_DATA=Please choose a product category and enter product title, unit amount and type, gross price and currency code (e.g. USD).
 ADMIN_GENERIC_PRODUCT_DATA_LEGEND=Product data:
@@ -63,15 +64,15 @@ PAGE_TITLE_ADMIN_LIST_PRODUCT_CATEGORY=List product categories
 CONTENT_TITLE_ADMIN_LIST_PRODUCT_CATEGORY=List product categories:
 TABLE_SUMMARY_ADMIN_LIST_PRODUCT_CATEGORIES=This table lists all product categories.
 ADMIN_EMPTY_LIST_PRODUCT_CATEGORIES=There are no product categories in database. Or your search criteria doesn't match anything.
-ADMIN_ASSIGNED_PARENT_CATEGORY_HEADER=Assigned parent category:
+ADMIN_PARENT_PRODUCT_CATEGORY_HEADER=Parent category:
 ADMIN_LINK_SHOW_PRODUCT_CATEGORY_TITLE=Shows product category data.
 ADMIN_LINK_ASSIGN_PARENT_CATEGORY_TITLE=Assign parent cateogory.
 ADMIN_ADD_PRODUCT_CATEGORY_TITLE=Add new product category
 ADMIN_ADD_PRODUCT_CATEGORY_MINIMUM_DATA=Please enter a title for adding new category. You can optionally choose a parent category of the new one.
 BUTTON_ADMIN_ADD_PRODUCT_CATEGORY=Add product category
 ADMIN_PRODUCT_CATEGORY_DATA_LEGEND=Data of product category:
-ADMIN_ASSIGN_PARENT_CATEGORY=Assign parent category:
-ADMIN_ASSIGN_PARENT_CATEGORY_TITLE=Assign an other product category as parent category for the new one.
+ADMIN_ASSIGN_PARENT_PRODUCT_CATEGORY=Assign parent category:
+ADMIN_ASSIGN_PARENT_PRODUCT_CATEGORY_TITLE=Assign an other product category as parent category for the new one.
 ADMIN_ENTER_CATEGORY_I18N_KEY=Enter category i18n key:
 ADMIN_ENTER_CATEGORY_I18N_KEY_TITLE=Enter i18n key for this new product category (example: CATEGORY_CONSUMABLES).
 ADMIN_CATEGORY_I18N_KEY_REQUIRED=Please enter i18n key of product category.
@@ -90,7 +91,6 @@ ENTER_RAND_NAME_TITLE=Enter the item's brand name found on receipt.
 ADMIN_PRODUCT_CURRENCY_CODE_REQUIRED=Please enter current code for product. Example: EUR, USD, PHP
 ADMIN_PRODUCT_UNIT_AMOUNT_REQUIRED=Please enter a unit amount. Example 500 for 500 grams.
 ADMIN_PRODUCT_UNIT_I18N_KEY_REQUIRED=Please enter unit's i18n key. Example: UNIT_TYPE_GRAMS for grams
-ADMIN_PRODUCT_MANUFACTURER_NAME_HEADER=Product manufacturer:
 ADMIN_NO_PRODUCT_MANUFACTURER_ASSIGNED_TITLE=No manufacturer is assigned with this product.
 ADMIN_ENTER_GENERIC_PRODUCT_NUMBER=Enter product number:
 ADMIN_ENTER_GENERIC_PRODUCT_NUMBER_TITLE=Enter number of product.
@@ -126,8 +126,7 @@ PRODUCT_UNIT_AMOUNT_TITLE=Amount of product
 PRODUCT_UNIT_I18N_KEY_HEADER=Internationalization key for unit:
 PRODUCT_UNIT_I18N_KEY_TITLE=Internationalization key for unit
 PRODUCT_HAS_NO_MANUFACTURER_ASSIGNED=Product has no manufacturer assigned.
-ADMIN_ASSIGNED_PRODUCT_MANUFACTURER_HEADER=Assigned manufacturer:
-ADMIN_ASSIGNED_PRODUCT_MANUFACTURER_TITLE=This product assigned manufacturer.
+ADMIN_ASSIGNED_PRODUCT_MANUFACTURER_TITLE=This product has a manufacturer assigned.
 ADMIN_PRODUCT_ENTRY_CREATED_TITLE=When this product has been created in database.
 ADMIN_CATEGORY_ENTRY_CREATED_TITLE=When this category has been created in database.
 ADMIN_SINGLE_CATEGORY_DETAILS_HEADER=Details of a single category
@@ -148,7 +147,6 @@ CONTENT_TITLE_ADMIN_GENERIC_PRODUCT_DELETE=Delete product:
 ERROR_PARAMETER_PRODUCT_ID_NOT_SET=Error: Product Id is not set (parameter: productId).
 PARAMETER_PRODUCT_ID_INVALID=Parameter "productId" is invalid.
 PRODUCT_I18N_KEY_HEADER=Product's internationalization key:
-ADMIN_ASSIGNED_MANUFACTURER_HEADER=Assigned manufacturer:
 GROSS_PRICE_HEADER=Gross price:
 NET_PRICE_HEADER=Net price:
 TAX_RATE_HEADER=Tax rate:
@@ -164,3 +162,8 @@ ADMIN_ENTER_GENERIC_PRODUCT_BARCODE_NUMBER=Enter product's barcode number:
 BARCODE_NUMBER_HEADER=Barcode number:
 PRODUCT_NO_BARCODE_NUMBER_ASSIGNED=Product has no bar-code number assigned.
 PRODUCT_BARCODE_NUMBER_TITLE=Bar-code number of product.
+ADMIN_PRODUCT_CATEGORY_DATA_LEGEND=Data of product category:
+ADMIN_ASSIGN_PARENT_PRODUCT_CATEGORY=Assign parent category:
+ENTER_BRAND_NAME=Enter brand name:
+ENTER_BRAND_NAME_TITLE=Enter brand name of product.
+ADMIN_PRODUCT_MANUFACTURER_HEADER=Manufacturer of product:
diff --git a/web/WEB-INF/product-links.jsf.taglib.xml b/web/WEB-INF/product-links.jsf.taglib.xml
index ac75f54e..d49aad89 100644
--- a/web/WEB-INF/product-links.jsf.taglib.xml
+++ b/web/WEB-INF/product-links.jsf.taglib.xml
@@ -50,7 +50,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 		<description>This tag renders an administrative drop-down menu for given product instance.</description>
 		<source>resources/tags/admin/dropdown/generic_product/admin_generic_product_links.tpl</source>
 		<attribute>
-			<name>product</name>
+			<name>genericProduct</name>
 			<description>The generic product instance that provides the data for this tag.</description>
 			<required>true</required>
 			<type>org.mxchange.jproduct.model.product.Product</type>
diff --git a/web/WEB-INF/resources/tags/admin/dropdown/generic_product/admin_generic_product_links.tpl b/web/WEB-INF/resources/tags/admin/dropdown/generic_product/admin_generic_product_links.tpl
index fea04954..7b1ede12 100644
--- a/web/WEB-INF/resources/tags/admin/dropdown/generic_product/admin_generic_product_links.tpl
+++ b/web/WEB-INF/resources/tags/admin/dropdown/generic_product/admin_generic_product_links.tpl
@@ -14,7 +14,7 @@
 			title="#{product.ADMIN_LINK_SHOW_GENERIC_PRODUCT_TITLE}"
 			rendered="#{empty renderShowLink or renderShowLink}"
 			>
-			<f:param name="productId" value="#{product.productId}" />
+			<f:param name="productId" value="#{genericProduct.productId}" />
 		</p:menuitem>
 
 		<p:menuitem
@@ -22,7 +22,7 @@
 			value="#{msg.ADMIN_LINK_EDIT_SHORT}"
 			title="#{product.ADMIN_LINK_EDIT_GENERIC_PRODUCT_TITLE}"
 			>
-			<f:param name="productId" value="#{product.productId}" />
+			<f:param name="productId" value="#{genericProduct.productId}" />
 		</p:menuitem>
 
 		<p:menuitem outcome="admin_delete_generic_product">
@@ -31,7 +31,7 @@
 				value="#{msg.ADMIN_LINK_DELETE_SHORT}"
 				title="#{product.ADMIN_LINK_DELETE_GENERIC_PRODUCT_TITLE}"
 				/>
-			<f:param name="productId" value="#{product.productId}" />
+			<f:param name="productId" value="#{genericProduct.productId}" />
 		</p:menuitem>
 	</p:menuButton>
 </ui:composition>
diff --git a/web/WEB-INF/templates/admin/product_category/admin_form_category_data.tpl b/web/WEB-INF/templates/admin/product_category/admin_form_category_data.tpl
index e1966c5b..7b525bfb 100644
--- a/web/WEB-INF/templates/admin/product_category/admin_form_category_data.tpl
+++ b/web/WEB-INF/templates/admin/product_category/admin_form_category_data.tpl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!--
-@TODO: title="#{project.ADMIN_PRODUCT_CATEGORY_DATA_LEGEND_TITLE}"
+@TODO: title="#{product.ADMIN_PRODUCT_CATEGORY_DATA_LEGEND_TITLE}"
 -->
 <ui:composition
 	xmlns="http://www.w3.org/1999/xhtml"
@@ -9,20 +9,20 @@
 	xmlns:p="http://primefaces.org/ui"
 	>
 
-	<p:fieldset legend="#{project.ADMIN_PRODUCT_CATEGORY_DATA_LEGEND}">
+	<p:fieldset legend="#{product.ADMIN_PRODUCT_CATEGORY_DATA_LEGEND}">
 		<p:panelGrid
 			layout="grid"
 			columns="2"
 			columnClasses="ui-grid-col-4,ui-grid-col-8"
 			styleClass="ui-noborder"
 			>
-			<p:outputLabel for="parentCategory" value="#{project.ADMIN_ASSIGN_PARENT_CATEGORY}" />
+			<p:outputLabel for="parentCategory" value="#{product.ADMIN_ASSIGN_PARENT_PRODUCT_CATEGORY}" />
 			<p:selectOneMenu
 				id="parentCategory"
 				value="#{adminCategoryController.parentCategory}"
 				filter="true"
 				filterMatchMode="contains"
-				title="#{project.ADMIN_ASSIGN_PARENT_CATEGORY_TITLE}"
+				title="#{product.ADMIN_ASSIGN_PARENT_PRODUCT_CATEGORY_TITLE}"
 				>
 
 				<f:converter converterId="ProductCategoryConverter" />
@@ -37,26 +37,26 @@
 					/>
 			</p:selectOneMenu>
 
-			<p:outputLabel for="categoryI18nKey" value="#{project.ADMIN_ENTER_CATEGORY_I18N_KEY}" />
+			<p:outputLabel for="categoryI18nKey" value="#{product.ADMIN_ENTER_CATEGORY_I18N_KEY}" />
 			<p:inputText
 				id="categoryI18nKey"
 				value="#{adminCategoryController.categoryI18nKey}"
 				maxlength="255"
 				required="true"
-				requiredMessage="#{project.ADMIN_CATEGORY_I18N_KEY_REQUIRED}"
-				title="#{project.ADMIN_ENTER_CATEGORY_I18N_KEY_TITLE}"
-				validatorMessage="#{project.ADMIN_ENTERED_CATEGORY_I18N_KEY_ALREADY_ADDED}"
+				requiredMessage="#{product.ADMIN_CATEGORY_I18N_KEY_REQUIRED}"
+				title="#{product.ADMIN_ENTER_CATEGORY_I18N_KEY_TITLE}"
+				validatorMessage="#{product.ADMIN_ENTERED_CATEGORY_I18N_KEY_ALREADY_ADDED}"
 				>
 				<f:validator validatorId="ProductCategoryValidator" />
 			</p:inputText>
 
-			<p:outputLabel for="categoryShownInStatistics" value="#{project.ADMIN_ENABLE_CATEGORY_IN_STATISTICS}" />
+			<p:outputLabel for="categoryShownInStatistics" value="#{product.ADMIN_ENABLE_CATEGORY_IN_STATISTICS}" />
 			<p:selectBooleanCheckbox
 				id="categoryShownInStatistics"
 				value="#{adminCategoryController.categoryShownInStatistics}"
 				required="true"
-				requiredMessage="#{project.ADMIN_ENABLE_CATEGORY_IN_STATISTICS_REQUIRED}"
-				title="#{project.ADMIN_ENABLE_CATEGORY_IN_STATISTICS_TITLE}"
+				requiredMessage="#{product.ADMIN_ENABLE_CATEGORY_IN_STATISTICS_REQUIRED}"
+				title="#{product.ADMIN_ENABLE_CATEGORY_IN_STATISTICS_TITLE}"
 				/>
 		</p:panelGrid>
 	</p:fieldset>
diff --git a/web/admin/generic_product/admin_generic_product_list.xhtml b/web/admin/generic_product/admin_generic_product_list.xhtml
index 266355e9..3f472749 100644
--- a/web/admin/generic_product/admin_generic_product_list.xhtml
+++ b/web/admin/generic_product/admin_generic_product_list.xhtml
@@ -114,7 +114,7 @@
 				</p:column>
 
 				<p:column
-					headerText="#{product.ADMIN_ASSIGNED_PRODUCT_CATEGORY_HEADER}"
+					headerText="#{product.ADMIN_PRODUCT_CATEGORY_HEADER}"
 					sortBy="#{genericProduct.productCategory}"
 					filterBy="#{genericProduct.productCategory}"
 					filterMatchMode="in"
@@ -161,7 +161,7 @@
 				</p:column>
 
 				<p:column
-					headerText="#{product.PRODUCT_AVAILABILITY_HEADER}"
+					headerText="#{msg.AVAILABLE_HEADER}"
 					sortBy="#{genericProduct.productAvailability}"
 					filterBy="#{genericProduct.productAvailability}"
 					filterMatchMode="exact"
@@ -178,7 +178,12 @@
 					<h:outputText value="#{genericProduct.productAvailability ? msg.CHOICE_YES : msg.CHOICE_NO}" />
 				</p:column>
 
-				<p:column headerText="#{product.ADMIN_PRODUCT_MANUFACTURER_NAME_HEADER}" sortBy="#{genericProduct.productManufacturer}" filterBy="#{genericProduct.productManufacturer}" filterMatchMode="in">
+				<p:column
+					headerText="#{msg.ADMIN_MANUFACTURER_HEADER}"
+					sortBy="#{genericProduct.productManufacturer}"
+					filterBy="#{genericProduct.productManufacturer}"
+					filterMatchMode="in"
+					>
 					<f:facet name="filter">
 						<p:selectCheckboxMenu
 							filter="true"
@@ -211,14 +216,22 @@
 					<h:outputText value="#{msg.ADMIN_NOT_ASSIGNED}" title="#{product.ADMIN_NO_PRODUCT_MANUFACTURER_ASSIGNED_TITLE}" rendered="#{empty genericProduct.productManufacturer}" />
 				</p:column>
 
-				<p:column headerText="#{msg.ENTRY_CREATED_HEADER}" sortBy="#{genericProduct.productCreated}" filterable="false">
+				<p:column
+					headerText="#{msg.ENTRY_CREATED_HEADER}"
+					sortBy="#{genericProduct.productCreated}"
+					filterable="false"
+					>
 					<h:outputText value="#{genericProduct.productCreated}">
 						<f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
 					</h:outputText>
 				</p:column>
 
-				<p:column headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}" sortable="false" filterable="false">
-					<product-links:outputGenericProductAdminDropdownMenu product="#{product}" />
+				<p:column
+					headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}"
+					sortable="false"
+					filterable="false"
+					>
+					<product-links:outputGenericProductAdminDropdownMenu genericProduct="#{genericProduct}" />
 				</p:column>
 			</p:dataTable>
 
@@ -256,7 +269,7 @@
 						<h:outputText value="#{product.PRODUCT_NO_BARCODE_NUMBER_ASSIGNED}" rendered="#{empty productListController.selectedProduct.productBarCodeNumber}" />
 						<p:barcode format="svg" width="100%" type="#{initParam['product_barcode_type']}" value="#{productListController.selectedProduct.productBarCodeNumber}" rendered="#{not empty productListController.selectedProduct.productBarCodeNumber}" />
 
-						<p:outputLabel value="#{product.PRODUCT_AVAILABILITY_HEADER}" title="#{product.PRODUCT_AVAILABILITY_TITLE}" />
+						<p:outputLabel value="#{msg.AVAILABLE_HEADER}" title="#{product.PRODUCT_AVAILABILITY_TITLE}" />
 						<h:outputText value="#{productListController.selectedProduct.productAvailability ? msg.CHOICE_YES : msg.CHOICE_NO}" />
 
 						<p:outputLabel value="#{product.AGE_GROUP_HEADER}" title="#{product.PRODUCT_AGE_GROUP_TITLE}" />
@@ -295,12 +308,16 @@
 						<p:outputLabel value="#{product.PRODUCT_UNIT_I18N_KEY_HEADER}" title="#{product.PRODUCT_UNIT_I18N_KEY_TITLE}" />
 						<h:outputText value="#{productListController.selectedProduct.productUnitI18nKey}" title="#{local[productListController.selectedProduct.productUnitI18nKey]}" />
 
-						<p:outputLabel value="#{product.ADMIN_ASSIGNED_PRODUCT_CATEGORY_HEADER}" title="#{product.ADMIN_ASSIGNED_PRODUCT_CATEGORY_TITLE}" />
-						<p:link outcome="admin_show_product_category" title="#{product.ADMIN_LINK_SHOW_GENERIC_PRODUCT_CATEGORY_TITLE}" value="#{local[productListController.selectedProduct.productCategory.categoryI18nKey]}">
+						<p:outputLabel value="#{product.ADMIN_ASSIGNED_PRODUCT_CATEGORY_LABEL}" title="#{product.ADMIN_ASSIGNED_PRODUCT_CATEGORY_TITLE}" />
+						<p:link
+							outcome="admin_show_product_category"
+							value="#{local[productListController.selectedProduct.productCategory.categoryI18nKey]}"
+							title="#{product.ADMIN_LINK_SHOW_GENERIC_PRODUCT_CATEGORY_TITLE}"
+							>
 							<f:param name="categoryId" value="#{productListController.selectedProduct.productCategory.categoryId}" />
 						</p:link>
 
-						<p:outputLabel value="#{product.ADMIN_ASSIGNED_PRODUCT_MANUFACTURER_HEADER}" title="#{product.ADMIN_ASSIGNED_PRODUCT_MANUFACTURER_TITLE}" />
+						<p:outputLabel value="#{msg.ADMIN_ASSIGNED_MANUFACTURER_LABEL}" title="#{product.ADMIN_ASSIGNED_PRODUCT_MANUFACTURER_TITLE}" />
 						<p:link
 							outcome="admin_show_basic_data"
 							title="#{msg.ADMIN_LINK_SHOW_BASIC_DATA_TITLE}"
diff --git a/web/admin/product_category/admin_product_category_list.xhtml b/web/admin/product_category/admin_product_category_list.xhtml
index 0aea596b..a5b9f8d4 100644
--- a/web/admin/product_category/admin_product_category_list.xhtml
+++ b/web/admin/product_category/admin_product_category_list.xhtml
@@ -89,11 +89,21 @@
 					</p:link>
 				</p:column>
 
-				<p:column headerText="#{msg.ADMIN_I18N_KEY_HEADER}" sortBy="#{local[category.categoryI18nKey]}" filterBy="#{local[category.categoryI18nKey]}" filterMatchMode="contains">
+				<p:column
+					headerText="#{msg.ADMIN_I18N_KEY_HEADER}"
+					sortBy="#{local[category.categoryI18nKey]}"
+					filterBy="#{local[category.categoryI18nKey]}"
+					filterMatchMode="contains"
+					>
 					<h:outputText value="#{local[category.categoryI18nKey]}" title="#{category.categoryI18nKey}" />
 				</p:column>
 
-				<p:column headerText="#{product.ADMIN_ASSIGNED_PARENT_CATEGORY_HEADER}" sortBy="#{category.parentCategory}" filterBy="#{category.parentCategory}" filterMatchMode="in">
+				<p:column
+					headerText="#{product.ADMIN_PARENT_PRODUCT_CATEGORY_HEADER}"
+					sortBy="#{category.parentCategory}"
+					filterBy="#{category.parentCategory}"
+					filterMatchMode="in"
+					>
 					<f:facet name="filter">
 						<p:selectCheckboxMenu
 							filter="true"
@@ -114,22 +124,40 @@
 						</p:selectCheckboxMenu>
 					</f:facet>
 
-					<p:link outcome="admin_show_product_category" title="#{product.ADMIN_LINK_SHOW_PRODUCT_CATEGORY_TITLE}" value="#{local[category.parentCategory.categoryI18nKey]}" rendered="#{not empty category.parentCategory}">
+					<p:link
+						outcome="admin_show_product_category"
+						value="#{local[category.parentCategory.categoryI18nKey]}"
+						title="#{product.ADMIN_LINK_SHOW_PRODUCT_CATEGORY_TITLE}"
+						rendered="#{not empty category.parentCategory}"
+						>
 						<f:param name="categoryId" value="#{category.parentCategory.categoryId}" />
 					</p:link>
 
-					<p:link outcome="admin_assign_parent_category" title="#{product.ADMIN_LINK_ASSIGN_PARENT_CATEGORY_TITLE}" value="#{msg.ADMIN_NOT_ASSIGNED}" rendered="#{empty category.parentCategory}">
+					<p:link
+						outcome="admin_assign_parent_category"
+						value="#{msg.ADMIN_NOT_ASSIGNED}"
+						title="#{product.ADMIN_LINK_ASSIGN_PARENT_CATEGORY_TITLE}"
+						rendered="#{empty category.parentCategory}"
+						>
 						<f:param name="categoryId" value="#{category.categoryId}" />
 					</p:link>
 				</p:column>
 
-				<p:column headerText="#{msg.ENTRY_CREATED_HEADER}" sortBy="#{category.categoryCreated}" filterable="false">
+				<p:column
+					headerText="#{msg.ENTRY_CREATED_HEADER}"
+					sortBy="#{category.categoryCreated}"
+					filterable="false"
+					>
 					<h:outputText id="categoryCreated" value="#{category.categoryCreated}">
 						<f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
 					</h:outputText>
 				</p:column>
 
-				<p:column headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}" sortable="false" filterable="false">
+				<p:column
+					headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}"
+					sortable="false"
+					filterable="false"
+					>
 					<product-links:outputProductCategoryAdminDropdownMenu category="#{category}" />
 				</p:column>
 			</p:dataTable>
@@ -164,7 +192,12 @@
 						<h:outputText value="#{categoryListController.selectedCategory.categoryShownInStatistics ? msg.CHOICE_YES : msg.CHOICE_NO}" />
 
 						<p:outputLabel value="#{product.CATEGORY_PARENT_HEADER}" title="#{product.CATEGORY_PARENT_TITLE}" />
-						<p:link outcome="admin_show_product_category" title="#{product.ADMIN_LINK_SHOW_PRODUCT_CATEGORY_TITLE}" value="#{local[categoryListController.selectedCategory.parentCategory.categoryI18nKey]}" rendered="#{not empty categoryListController.selectedCategory.parentCategory}">
+						<p:link
+							outcome="admin_show_product_category"
+							value="#{local[categoryListController.selectedCategory.parentCategory.categoryI18nKey]}"
+							title="#{product.ADMIN_LINK_SHOW_PRODUCT_CATEGORY_TITLE}"
+							rendered="#{not empty categoryListController.selectedCategory.parentCategory}"
+							>
 							<f:param name="categoryId" value="#{categoryListController.selectedCategory.parentCategory.categoryId}" />
 						</p:link>
 						<h:outputText value="#{product.CATEGORY_HAS_NO_PARENT}" rendered="#{empty categoryListController.selectedCategory.parentCategory}" />