diff --git a/ezcommerce-admin-ui/messages.xlf b/ezcommerce-admin-ui/messages.xlf
index 26302fc61ee3..2977aa73bff8 100644
--- a/ezcommerce-admin-ui/messages.xlf
+++ b/ezcommerce-admin-ui/messages.xlf
@@ -6,11 +6,41 @@
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.
+
+ Basket with ID: %basketId% not found
+ Basket with ID: %basketId% not found
+ key: Basket with ID: %basketId% not found
+
+
+ Cockpit
+ Cockpit
+ key: Cockpit
+ Control centerControl centerkey: Control center
+
+ Error for basket %basketId%: %error%
+ Error for basket %basketId%: %error%
+ key: Error for basket %basketId%: %error%
+
+
+ Order for basket: %basketId% has been deleted successfully.
+ Order for basket: %basketId% has been deleted successfully.
+ key: Order for basket: %basketId% has been deleted successfully.
+
+
+ Order for basket: %basketId% has been processed successfully, Order-ID: %orderId%
+ Order for basket: %basketId% has been processed successfully, Order-ID: %orderId%
+ key: Order for basket: %basketId% has been processed successfully, Order-ID: %orderId%
+
+
+ Price and stock management
+ Price and stock management
+ key: Price and stock management
+ Request BEFORE mapping.Request BEFORE mapping.
@@ -41,76 +71,6 @@
Response AFTER mapping.key: code.280_complete
-
- Input Values
- Input Values
- key: configuration_settings.field.array.input.placeholder
-
-
- Prices from ERP
- Prices from ERP
- key: configuration_settings.field.array.option.remote
-
-
- Local price engine
- Local price engine
- key: configuration_settings.field.array.option.shop
-
-
- Data
- Data
- key: content_fields.external_data.data.label
-
-
- Name
- Name
- key: content_fields.external_data.name.label
-
-
- Code
- Code
- key: content_fields.ezvariants.code.label
-
-
- Description
- Description
- key: content_fields.ezvariants.description.label
-
-
- SKU
- SKU
- key: content_fields.ezvariants.sku.label
-
-
- Add. attributes from ERP
- Add. attributes from ERP
- key: content_fields.profiledata.add.attributes.from.erp
-
-
- Buyer address
- Buyer address
- key: content_fields.profiledata.buyer.address
-
-
- Customer number
- Customer number
- key: content_fields.profiledata.customer.number
-
-
- Delivery address
- Delivery address
- key: content_fields.profiledata.delivery.address
-
-
- Last update from ERP
- Last update from ERP
- key: content_fields.profiledata.last.update.from.erp
-
-
- Shipcode
- Shipcode
- key: content_fields.profiledata.shipcode
- Add variantAdd variant
@@ -121,61 +81,6 @@
Remove variantkey: field_types.variants.button.trash
-
- Download prices
- Download prices
- key: import_export.download_price.button
-
-
- Download stock
- Download stock
- key: import_export.download_stock.button
-
-
- Search
- Search
- key: import_export.search.button
-
-
- Upload file
- Upload file
- key: import_export.upload.file
-
-
- Select a CSV file to import
- Select a CSV file to import
- key: import_export.upload.info
-
-
- Note: It might take some time until the CSV file has been imported.
- Note: It might take some time until the CSV file has been imported.
- key: import_export.upload.note
-
-
- Upload prices
- Upload prices
- key: import_export.upload_price.button
-
-
- Upload new price list
- Upload new price list
- key: import_export.upload_price.title
-
-
- Upload stock
- Upload stock
- key: import_export.upload_stock.button
-
-
- Upload new stock list
- Upload new stock list
- key: import_export.upload_stock.title
-
-
- eCommerce
- eCommerce
- key: label.price_stock_tab
- CloseClose
@@ -201,41 +106,6 @@
Stock for %products% products imported successfullykey: msg.stock_upload_success
-
- Add price
- Add price
- key: price_management.add_price
-
-
- Base price
- Base price
- key: price_management.base_price
-
-
- Customer group
- Customer group
- key: price_management.customer_group
-
-
- Delete price
- Delete price
- key: price_management.delete_price.button
-
-
- Offer price
- Offer price
- key: price_management.offer_price
-
-
- Save
- Save
- key: price_management.save
-
-
- SKU
- SKU
- key: price_management.sku
- Add a new AddressAdd a new Address
@@ -306,81 +176,6 @@
Remove addresskey: profile.data.button.trash
-
- Save
- Save
- key: shipping.save
-
-
- Country
- Country
- key: shipping.table.country
-
-
- Currency
- Currency
- key: shipping.table.currency
-
-
- Shipping cost
- Shipping cost
- key: shipping.table.shipping_cost
-
-
- Shipping method
- Shipping method
- key: shipping.table.shipping_method
-
-
- State
- State
- key: shipping.table.state
-
-
- Manage shipping costs
- Manage shipping costs
- key: shipping.table.title
-
-
- Value of goods
- Value of goods
- key: shipping.table.value
-
-
- ZIP
- ZIP
- key: shipping.table.zip
-
-
- Add
- Add
- key: shipping_management.add_shipping
-
-
- Delete
- Delete
- key: shipping_management.delete_shippment.button
-
-
- On stock
- On stock
- key: stock_management.on_stock
-
-
- Save
- Save
- key: stock_management.save
-
-
- SKU
- SKU
- key: stock_management.sku
-
-
- Stock text
- Stock text
- key: stock_management.stock_text
-
diff --git a/ezcommerce-base-design/messages.xlf b/ezcommerce-base-design/messages.xlf
index d8896aca6e19..ddf0be3c8091 100644
--- a/ezcommerce-base-design/messages.xlf
+++ b/ezcommerce-base-design/messages.xlf
@@ -36,6 +36,11 @@
Eventkey: Event|search
+
+ Folder
+ Folder
+ key: Folder
+ FolderFolder
@@ -46,26 +51,6 @@
Newskey: News|search
-
- Go to basket
- Go to basket
- key: basket.widget.go.to.basket
-
-
- Go to checkout
- Go to checkout
- key: basket.widget.go.to.checkout
-
-
- Shopping basket
- Shopping basket
- key: basket.widget.shopping.basket
-
-
- Total
- Total
- key: basket.widget.total
- emailemail
diff --git a/ezcommerce-checkout/messages.xlf b/ezcommerce-checkout/messages.xlf
index 4e96dd34cb8a..f0c7fb2532d9 100644
--- a/ezcommerce-checkout/messages.xlf
+++ b/ezcommerce-checkout/messages.xlf
@@ -562,8 +562,8 @@
key: basket.widget.go.to.checkout
- Shopping basket
- Shopping basket
+ Basket
+ Basketkey: basket.widget.shopping.basket
diff --git a/ezcommerce-price-engine/messages.xlf b/ezcommerce-price-engine/messages.xlf
index 3db8285f7732..33411cf532eb 100644
--- a/ezcommerce-price-engine/messages.xlf
+++ b/ezcommerce-price-engine/messages.xlf
@@ -51,11 +51,6 @@
Price and stock managementkey: Price and stock management
-
- No prices given
- No prices given
- key: message.no_prices_given
- Product not foundProduct not found
diff --git a/ezcommerce-shop-eshop/configuration.xlf b/ezcommerce-shop-eshop/configuration.xlf
index 5affc364b213..9ac9b6543de1 100644
--- a/ezcommerce-shop-eshop/configuration.xlf
+++ b/ezcommerce-shop-eshop/configuration.xlf
@@ -724,55 +724,55 @@ The defer attribute may be specified even if the async attribute is specified, t
]]>
key: variant_type|description
-
- URL of the Web-Connector
- URL of the Web-Connector
- key: web_connector.service_location|config
-
-
- The URL points to your Web-Connector System installed near by your ERP system. Please use a https connection and make sure that the shop can access this ip and port only!
- The URL points to your Web-Connector System installed near by your ERP system. Please use a https connection and make sure that the shop can access this ip and port only!
- key: web_connector.service_location|description
-
-
+ Timeout towards the ERP-System in secondsTimeout towards the ERP-System in seconds
- key: webconnector.erpTimeout|config
+ key: web_connector.erpTimeout|config
-
+ Timeout (ERP) for the communication with the Web-Connector in secondsTimeout (ERP) for the communication with the Web-Connector in seconds
- key: webconnector.erpTimeout|description
+ key: web_connector.erpTimeout|description
-
+ Password (configured per Web-Connector)Password (configured per Web-Connector)
- key: webconnector.password|config
+ key: web_connector.password|config
-
+ Password for the communication with the Web-Connector servicePassword for the communication with the Web-Connector service
- key: webconnector.password|description
+ key: web_connector.password|description
+
+
+ URL of the Web-Connector
+ URL of the Web-Connector
+ key: web_connector.service_location|config
+
+
+ The URL points to your Web-Connector System installed near by your ERP system. Please use a https connection and make sure that the shop can access this ip and port only!
+ The URL points to your Web-Connector System installed near by your ERP system. Please use a https connection and make sure that the shop can access this ip and port only!
+ key: web_connector.service_location|description
-
+ SOAP Web-Service timeout in secondsSOAP Web-Service timeout in seconds
- key: webconnector.soapTimeout|config
+ key: web_connector.soapTimeout|config
-
+ Timeout (Web-Service) for the communication with the Web-Connector in secondsTimeout (Web-Service) for the communication with the Web-Connector in seconds
- key: webconnector.soapTimeout|description
+ key: web_connector.soapTimeout|description
-
+ User name (configured per Web-Connector)User name (configured per Web-Connector)
- key: webconnector.username|config
+ key: web_connector.username|config
-
+ User name for the communication with the Web-Connector serviceUser name for the communication with the Web-Connector service
- key: webconnector.username|description
+ key: web_connector.username|description