You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mr...@apache.org on 2008/12/30 14:28:45 UTC

svn commit: r730128 - in /ofbiz/trunk/applications: order/config/ order/src/org/ofbiz/order/order/ order/webapp/ordermgr/entry/cart/ order/webapp/ordermgr/entry/order/ order/webapp/ordermgr/return/ product/config/

Author: mrisaliti
Date: Tue Dec 30 05:28:45 2008
New Revision: 730128

URL: http://svn.apache.org/viewvc?rev=730128&view=rev
Log:
Moved all Facility labels from OrderUiLabels.xml to ProductUiLabels.xml (Part of OFBIZ-1780)

Modified:
    ofbiz/trunk/applications/order/config/OrderUiLabels.xml
    ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
    ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoUseDetailsInline.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/return/returnList.ftl
    ofbiz/trunk/applications/product/config/ProductUiLabels.xml

Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels.xml?rev=730128&r1=730127&r2=730128&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderUiLabels.xml (original)
+++ ofbiz/trunk/applications/order/config/OrderUiLabels.xml Tue Dec 30 05:28:45 2008
@@ -19,193 +19,6 @@
     under the License.
 -->
 <resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <property key="AddedItemToOrder">
-        <value xml:lang="en">Added item to order: </value>
-        <value xml:lang="es">Ítem añadido al pedido:</value>
-        <value xml:lang="fr">Article ajouté à la commande : </value>
-    </property>
-    <property key="FacilityBillingAddressSameShipping">
-        <value xml:lang="de">Rechnungsadresse und Lieferadresse stimmen überein</value>
-        <value xml:lang="en">Billing address is the same as the shipping address</value>
-        <value xml:lang="es">La dirección de facturación es la misma que la dirección de envío</value>
-        <value xml:lang="fr">L'adresse de facturation est la même que celle de livraison</value>
-        <value xml:lang="it">Indirizzo Fatturazione è lo stesso di quello di Spedizione</value>
-        <value xml:lang="nl">Faktuur adres is hetzelfde als het verzend adres</value>
-        <value xml:lang="ro">Adresa Facturare este aceiasi cu cel de expediere</value>
-        <value xml:lang="ru">Платежный адрес тот же что и адрес доставки</value>
-        <value xml:lang="th">ที่อยู่ใบเสร็จรับเงินเหมือนกับที่อยู่การส่งสินค้า</value>
-        <value xml:lang="zh">账单地址和送货地址相同</value>
-        <value xml:lang="zh_CN">帐单地址和运货地址相同</value>
-    </property>
-    <property key="FacilityDeliveryOrder">
-        <value xml:lang="de">Lieferschein</value>
-        <value xml:lang="en">Delivery order</value>
-        <value xml:lang="es">Orden de entrega</value>
-        <value xml:lang="fr">Bon de livraison</value>
-        <value xml:lang="it">Ordine Spedito</value>
-        <value xml:lang="nl">Afleveren bestelling</value>
-        <value xml:lang="ro">Comanda Expediata</value>
-        <value xml:lang="ru">Заказ на доставку</value>
-        <value xml:lang="th">รายการส่ง</value>
-        <value xml:lang="zh">订单交付</value>
-        <value xml:lang="zh_CN">发货订单</value>
-    </property>
-    <property key="FacilityFacility">
-        <value xml:lang="de">Lager</value>
-        <value xml:lang="en">Facility</value>
-        <value xml:lang="es">Almacén</value>
-        <value xml:lang="fr">Lieu de stockage</value>
-        <value xml:lang="it">Stabilimento </value>
-        <value xml:lang="nl">Faciliteit</value>
-        <value xml:lang="ro">Compartiment </value>
-        <value xml:lang="ru">Оборудование</value>
-        <value xml:lang="th">คลังสินค้า</value>
-        <value xml:lang="zh">场所</value>
-        <value xml:lang="zh_CN">仓储设施</value>
-    </property>
-    <property key="FacilityInventory">
-        <value xml:lang="de">Inventar</value>
-        <value xml:lang="en">Inventory</value>
-        <value xml:lang="es">Inventario</value>
-        <value xml:lang="fr">Stock</value>
-        <value xml:lang="it">Inventario</value>
-        <value xml:lang="nl">Voorraad</value>
-        <value xml:lang="ro">Inventar</value>
-        <value xml:lang="ru">Реестр</value>
-        <value xml:lang="th">สินค้าคงเหลือ</value>
-        <value xml:lang="zh">库存</value>
-        <value xml:lang="zh_CN">库存</value>
-    </property>
-    <property key="FacilityNoFacility">
-        <value xml:lang="de">Kein Lager</value>
-        <value xml:lang="en">No Facility</value>
-        <value xml:lang="es">Ningún almacén</value>
-        <value xml:lang="fr">Aucun lieu de stockage</value>
-        <value xml:lang="it">Nessun Stabilimento </value>
-        <value xml:lang="nl">Geen faciliteit</value>
-        <value xml:lang="ro">Nici-un Compartiment </value>
-        <value xml:lang="ru">Нет оборудования</value>
-        <value xml:lang="th">ไม่มีคลังสินค้า</value>
-        <value xml:lang="zh">没有场所</value>
-        <value xml:lang="zh_CN">仓储设施</value>
-    </property>
-    <property key="FacilityNoOtherShippingMethods">
-        <value xml:lang="de">Benutze Voreinstellung: Keine anderen Liefermethoden verfügbar</value>
-        <value xml:lang="en">Use Default: No other shipping methods available.</value>
-        <value xml:lang="es">Por defecto: Ningún otro medio de envío disponible</value>
-        <value xml:lang="fr">Par défaut : Aucun autre moyen d'expédition possible</value>
-        <value xml:lang="it">Usare Default: Nessun altro metodo di spedizione disponibile.</value>
-        <value xml:lang="nl">Gebruik Standaard: Geen andere verzend methoden beschikbaar.</value>
-        <value xml:lang="ro">Foloseste Default: Nici-o alta metoda de  expediere disponibila.</value>
-        <value xml:lang="ru">Использовать по умолчанию: Не доступен ни один способ доставки.</value>
-        <value xml:lang="th">ใช้ค่าเริ่มต้น : ไม่มีวิธีการขนส่งสินค้าอื่น ๆ ที่นำไปใช้ได้</value>
-        <value xml:lang="zh">使用缺省值：没有其它可用的送货方式。</value>
-        <value xml:lang="zh_CN">使用默认: 没有其他送货方式</value>
-    </property>
-    <property key="FacilityShipAvailable">
-        <value xml:lang="de">Bitte liefern Sie meine bestellten Artikel sobald sie verfügbar sind (Sie dürfen zusätzliche Lieferungskosten  erheben).</value>
-        <value xml:lang="en">Please ship items I ordered as they become available (you may incur additional shipping charges).</value>
-        <value xml:lang="es">Por favor, envíe los artículos que he pedido en cuanto se encuentren disponibles (puede causar gastos de envío adicionales)</value>
-        <value xml:lang="fr">Livrer les articles dès qu'ils sont disponibles (peut occasionner des frais additionnels d'expédition)</value>
-        <value xml:lang="it">Prego spedire gli articoli ordinati appena diventano disponibili (potresti incorrere in spese di spedizione aggiuntive).</value>
-        <value xml:lang="nl">Verstuur items wanneer ze beschikbaar komen (extra verzendkosten mogen worden aangerekend).</value>
-        <value xml:lang="ro">Va rugam expediati liniile pe care le-am comandat  ordinato imediat ce devin disponibile (s-ar putea sa ti se adauge cheltuieli de expediere).</value>
-        <value xml:lang="ru">Пожалуйста поставляйте заказанные мной позиции по мере доступности (можно учитывать дополнительные расходы на доставку).</value>
-        <value xml:lang="th">Please ship items I ordered as they become available (you may incur additional shipping charges).</value>
-        <value xml:lang="zh">当我订的明细有货时请送货 (你可能要支付额外的运费)。</value>
-        <value xml:lang="zh_CN">当所订商品个别项可用时即刻发货（不是一起发货，你可能需要另付发货费用）。</value>
-    </property>
-    <property key="FacilityShipOnceOrAvailable">
-        <value xml:lang="de">Alles zusammen liefern oder 'sobald etwas verfügbar'?</value>
-        <value xml:lang="en">Ship all at once, or 'as available'?</value>
-        <value xml:lang="es">¿Enviar todo de una vez o en cuanto se encuentre disponibles?</value>
-        <value xml:lang="fr">Expédition complète ou partielle ?</value>
-        <value xml:lang="it">Spedisci tutto in una volta, o 'appena disponibili'?</value>
-        <value xml:lang="nl">Verzend alles tegelijk, of wanneer ze beschikbaar komen?</value>
-        <value xml:lang="ro">Expediaza totul o singura data, sau in momentul in care devin disponibile?</value>
-        <value xml:lang="ru">Поставлять все одной партией, или "по мере доступности"?</value>
-        <value xml:lang="th">ส่งสินค้าทั้งหมดหนึ่งครั้ง หรือ เท่าที่จะหาได้</value>
-        <value xml:lang="zh">一次全部送货，或者“到货即送”？</value>
-        <value xml:lang="zh_CN">同时货运全部商品，或单项可用即刻发货？</value>
-    </property>
-    <property key="FacilityShipmentDatas">
-        <value xml:lang="de">Daten zur Lieferung</value>
-        <value xml:lang="en">Shipment Data</value>
-        <value xml:lang="es">Datos de envío</value>
-        <value xml:lang="fr">Données d'expédition</value>
-        <value xml:lang="it">Data Spedizione</value>
-        <value xml:lang="nl">Verzend informatie</value>
-        <value xml:lang="ro">Data Expediere</value>
-        <value xml:lang="ru">Дата поставки</value>
-        <value xml:lang="th">วันที่ขนส่งสินค้า</value>
-        <value xml:lang="zh">运输数据</value>
-        <value xml:lang="zh_CN">装运数据</value>
-    </property>
-    <property key="FacilityShipments">
-        <value xml:lang="de">Auslieferungen</value>
-        <value xml:lang="en">Shipments</value>
-        <value xml:lang="es">Envíos</value>
-        <value xml:lang="fr">Expéditions</value>
-        <value xml:lang="it">Spedizioni</value>
-        <value xml:lang="nl">Zending</value>
-        <value xml:lang="ro">Expediere</value>
-        <value xml:lang="ru">Поставки</value>
-        <value xml:lang="th">การขนส่งสินค้า</value>
-        <value xml:lang="zh">运输</value>
-        <value xml:lang="zh_CN">装运</value>
-    </property>
-    <property key="FacilityShipping">
-        <value xml:lang="de">Versand</value>
-        <value xml:lang="en">Shipping</value>
-        <value xml:lang="es">Envío</value>
-        <value xml:lang="fr">Expédition</value>
-        <value xml:lang="it">Spedizioniere</value>
-        <value xml:lang="nl">Verzenden</value>
-        <value xml:lang="ro">Expeditor</value>
-        <value xml:lang="ru">Поставка</value>
-        <value xml:lang="th">การขนส่งสินค้า</value>
-        <value xml:lang="zh">送货</value>
-        <value xml:lang="zh_CN">装运</value>
-    </property>
-    <property key="FacilityShippingAndHandling">
-        <value xml:lang="de">Versandkosten</value>
-        <value xml:lang="en">Shipping and Handling</value>
-        <value xml:lang="es">Envío y manipulación</value>
-        <value xml:lang="fr">Port et emballage</value>
-        <value xml:lang="it">Spese di Spedizione e Imballaggio</value>
-        <value xml:lang="nl">Verzend en handelingen</value>
-        <value xml:lang="ro">Cheltuieli de Expediere si Ambalare</value>
-        <value xml:lang="ru">Доставка и обработка</value>
-        <value xml:lang="th">การขนส่งสินค้าและการควบคุม</value>
-        <value xml:lang="zh">送货及包装</value>
-        <value xml:lang="zh_CN">货运及处理</value>
-    </property>
-    <property key="FacilitySpecialInstructions">
-        <value xml:lang="de">Spezielle Anweisungen</value>
-        <value xml:lang="en">Special Instructions</value>
-        <value xml:lang="es">Instrucciones especiales</value>
-        <value xml:lang="fr">Instructions spéciales</value>
-        <value xml:lang="it">Istruzioni Speciali</value>
-        <value xml:lang="nl">Speciale Instructies</value>
-        <value xml:lang="ro">Instructiuni Speciale</value>
-        <value xml:lang="ru">Специальные инструкции</value>
-        <value xml:lang="th">คำแนะนำพิเศษ</value>
-        <value xml:lang="zh">特别说明</value>
-        <value xml:lang="zh_CN">特殊说明</value>
-    </property>
-    <property key="FacilityWaitEntireOrderReady">
-        <value xml:lang="de">Bitte warten Sie mit der Auslieferung bis die Bestellung vollständig vorliegt.</value>
-        <value xml:lang="en">Please wait until the entire order is ready before shipping.</value>
-        <value xml:lang="es">Por favor, esperar hasta que el pedido esté completo antes de enviarlo</value>
-        <value xml:lang="fr">Attendre que la commande soit complète avant de l'expédier.</value>
-        <value xml:lang="it">Per favore aspettare fino a quando l'intero ordine è pronto per la spedizione.</value>
-        <value xml:lang="nl">Wacht alstublieft tot de gehele bestelling compleet is voor verzenden.</value>
-        <value xml:lang="ro">Va rog asteptati pana cand intreaga comanda  este gata pentru expediere.</value>
-        <value xml:lang="ru">Пожалуйста поставляйте после того как будет готов весь заказ.</value>
-        <value xml:lang="th">กรุณารอจนกระทั่งอ่านรายการสั่งซื้อทั้งหมดก่อนการขนส่งสินค้า</value>
-        <value xml:lang="zh">请等待整个订单都有货时再送货。</value>
-        <value xml:lang="zh_CN">等待直到整个订单完成后发货。</value>
-    </property>
     <property key="FormFieldTitle_amountTotal">
         <value xml:lang="de">Totalbetrag</value>
         <value xml:lang="en">Amount Total</value>
@@ -1498,6 +1311,7 @@
         <value xml:lang="en">Actions</value>
         <value xml:lang="es">Acciones</value>
         <value xml:lang="fr">Actions</value>
+        <value xml:lang="it">Azioni</value>
     </property>
     <property key="OrderAddAllToCart">
         <value xml:lang="cs">Přidat všechno do košíku</value>
@@ -1546,6 +1360,12 @@
         <value xml:lang="zh">添加代码</value>
         <value xml:lang="zh_CN">添加代码</value>
     </property>
+    <property key="OrderAddedItemToOrder">
+        <value xml:lang="en">Added item to order: </value>
+        <value xml:lang="es">Ítem añadido al pedido:</value>
+        <value xml:lang="fr">Article ajouté à la commande : </value>
+        <value xml:lang="it">Aggiunta riga all'ordine: </value>
+    </property>
     <property key="OrderAddNote">
         <value xml:lang="de">Anmerkung hinzufügen</value>
         <value xml:lang="en">Add Note</value>
@@ -1648,6 +1468,7 @@
         <value xml:lang="en">Adjustment Type</value>
         <value xml:lang="es">Tipo de ajuste</value>
         <value xml:lang="fr">Type d'ajustement</value>
+        <value xml:lang="it">Aggiustamento</value>
         <value xml:lang="nl">Soort instelling</value>
         <value xml:lang="ru">Тип настройки</value>
         <value xml:lang="th">ประเภทการปรับปรุง</value>
@@ -1816,6 +1637,7 @@
         <value xml:lang="en">Auth Service</value>
         <value xml:lang="es">Servicio de autentificación</value>
         <value xml:lang="fr">Service d'authentification</value>
+        <value xml:lang="it">Servizio d'autenticazione</value>
         <value xml:lang="th">ให้บริการ</value>
     </property>
     <property key="OrderAutoAssign">
@@ -3563,7 +3385,7 @@
         <value xml:lang="es">Instrucciones</value>
         <value xml:lang="fr">Instructions</value>
         <value xml:lang="hi_IN">कैसे करें</value>
-        <value xml:lang="it">Instruzioni</value>
+        <value xml:lang="it">Istruzioni</value>
         <value xml:lang="ja">Instructions</value>
         <value xml:lang="nl">Aanwijzingen</value>
         <value xml:lang="pt_PT">Instruções</value>
@@ -6652,6 +6474,10 @@
         <value xml:lang="zh">产品店铺</value>
         <value xml:lang="zh_CN">货品仓库</value>
     </property>
+    <property key="OrderPromotion">
+        <value xml:lang="en">Promotion</value>
+        <value xml:lang="it">Promozione</value>
+    </property>
     <property key="OrderPromotionsApplied">
         <value xml:lang="cs">Uskutečněné promoakce</value>
         <value xml:lang="de">Angewandte Aktionen</value>
@@ -7250,6 +7076,10 @@
         <value xml:lang="th">แสดงรายการจากการสั่งซื้อ</value>
         <value xml:lang="zh">来自订单的退货明细</value>
     </property>
+    <property key="OrderReturnsCurrent">
+        <value xml:lang="en">Current Returns</value>
+        <value xml:lang="it">Resi Attuali</value>
+    </property>
     <property key="OrderReturnSelectedItems">
         <value xml:lang="cs">vrátit vybranou položku</value>
         <value xml:lang="de">ausgewählte Artikel zurückgeben</value>
@@ -9900,9 +9730,7 @@
         <value xml:lang="nl">Create a new Quote and QuoteItem for a CustRequest</value>
         <value xml:lang="ro">Creare o noua Oferta pentru o Cerere Client</value>
         <value xml:lang="ru">Создать новое предложение и позиции по запросу клиента</value>
-        <value xml:lang="th">สร้างคำร้องใหม่และหัวข้อคำร้องสำหรับการร้องขอของลูกค้า
-
-</value>
+        <value xml:lang="th">สร้างคำร้องใหม่และหัวข้อคำร้องสำหรับการร้องขอของลูกค้า</value>
         <value xml:lang="zh">为客户请求新建询价和询价明细</value>
     </property>
     <property key="PageTitleEditQuoteItemForCustRequest">

Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java?rev=730128&r1=730127&r2=730128&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java Tue Dec 30 05:28:45 2008
@@ -3326,7 +3326,7 @@
 
         // log an order note
         try {
-            String addedItemToOrder = UtilProperties.getMessage(resource, "AddedItemToOrder", locale);
+            String addedItemToOrder = UtilProperties.getMessage(resource, "OrderAddedItemToOrder", locale);
             dispatcher.runSync("createOrderNote", UtilMisc.<String, Object>toMap("orderId", orderId, "note", addedItemToOrder +
                     productId + " (" + quantity + ")", "internalNote", "Y", "userLogin", userLogin));
         } catch (GenericServiceException e) {

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoUseDetailsInline.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoUseDetailsInline.ftl?rev=730128&r1=730127&r2=730128&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoUseDetailsInline.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoUseDetailsInline.ftl Tue Dec 30 05:28:45 2008
@@ -27,7 +27,7 @@
             <#list shoppingCart.getProductPromoUseInfoIter() as productPromoUseInfo>
                 <div>
                     <#-- TODO: when promo pretty print is done show promo short description here -->
-                       ${uiLabelMap.EcommercePromotion} <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDetails}</a>
+                       ${uiLabelMap.OrderPromotion} <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDetails}</a>
                     <#if productPromoUseInfo.productPromoCodeId?has_content> - ${uiLabelMap.OrderWithPromoCode} [${productPromoUseInfo.productPromoCodeId}]</#if>
                     <#if (productPromoUseInfo.totalDiscountAmount != 0)> - ${uiLabelMap.CommonTotalValue} <@ofbizCurrency amount=(-1*productPromoUseInfo.totalDiscountAmount) isoCode=shoppingCart.getCurrency()/></#if>
                 </div>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl?rev=730128&r1=730127&r2=730128&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl Tue Dec 30 05:28:45 2008
@@ -123,7 +123,7 @@
             <tr><td colspan="7"><hr/></td></tr>
             <tr>
                 <td align="right" valign="top" width="15%">
-                    <div>&nbsp;<b>${uiLabelMap.CommonInstructions}</b></div>
+                    <div>&nbsp;<b>${uiLabelMap.OrderSpecialInstructions}</b></div>
                 </td>
                 <td width="5">&nbsp;</td>
                 <td valign="top" width="80%">

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/return/returnList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnList.ftl?rev=730128&r1=730127&r2=730128&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/return/returnList.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/return/returnList.ftl Tue Dec 30 05:28:45 2008
@@ -17,7 +17,7 @@
 under the License.
 -->
 
-<h1>Current Returns</h1>
+<h1>${uiLabelMap.OrderReturnsCurrent}</h1>
 <div><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderReturnCreate}</a></div>
 
 <br/>
@@ -29,7 +29,6 @@
     <td>${uiLabelMap.FacilityFacility}</td>
     <td>${uiLabelMap.CommonStatus}</td>
   </tr> 
-  <tr><td colspan="5"><hr></td></tr>
   <#list returnList as returnHeader>
   <#assign statusItem = returnHeader.getRelatedOne("StatusItem")>
   <#if returnHeader.destinationFacilityId?exists>

Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=730128&r1=730127&r2=730128&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Tue Dec 30 05:28:45 2008
@@ -405,6 +405,19 @@
         <value xml:lang="th">ลักษณะนิสัย</value>
         <value xml:lang="zh">突出特征</value>
     </property>
+    <property key="FacilityBillingAddressSameShipping">
+        <value xml:lang="de">Rechnungsadresse und Lieferadresse stimmen überein</value>
+        <value xml:lang="en">Billing address is the same as the shipping address</value>
+        <value xml:lang="es">La dirección de facturación es la misma que la dirección de envío</value>
+        <value xml:lang="fr">L'adresse de facturation est la même que celle de livraison</value>
+        <value xml:lang="it">Indirizzo Fatturazione è lo stesso di quello di Spedizione</value>
+        <value xml:lang="nl">Faktuur adres is hetzelfde als het verzend adres</value>
+        <value xml:lang="ro">Adresa Facturare este aceiasi cu cel de expediere</value>
+        <value xml:lang="ru">Платежный адрес тот же что и адрес доставки</value>
+        <value xml:lang="th">ที่อยู่ใบเสร็จรับเงินเหมือนกับที่อยู่การส่งสินค้า</value>
+        <value xml:lang="zh">账单地址和送货地址相同</value>
+        <value xml:lang="zh_CN">帐单地址和运货地址相同</value>
+    </property>
     <property key="FacilityCompanyName">
         <value xml:lang="de">OFBiz: Einrichtungen Verwaltung</value>
         <value xml:lang="en">OFBiz: Facility Manager</value>
@@ -416,6 +429,149 @@
         <value xml:lang="th">OFBiz: การจัดการคลังสินค้า</value>
         <value xml:lang="zh">OFBiz：场所管理程序</value>
     </property>
+    <property key="FacilityFacility">
+        <value xml:lang="de">Lager</value>
+        <value xml:lang="en">Facility</value>
+        <value xml:lang="es">Almacén</value>
+        <value xml:lang="fr">Lieu de stockage</value>
+        <value xml:lang="it">Stabilimento </value>
+        <value xml:lang="nl">Faciliteit</value>
+        <value xml:lang="ro">Compartiment </value>
+        <value xml:lang="ru">Оборудование</value>
+        <value xml:lang="th">คลังสินค้า</value>
+        <value xml:lang="zh">场所</value>
+        <value xml:lang="zh_CN">仓储设施</value>
+    </property>
+    <property key="FacilityInventory">
+        <value xml:lang="de">Inventar</value>
+        <value xml:lang="en">Inventory</value>
+        <value xml:lang="es">Inventario</value>
+        <value xml:lang="fr">Stock</value>
+        <value xml:lang="it">Inventario</value>
+        <value xml:lang="nl">Voorraad</value>
+        <value xml:lang="ro">Inventar</value>
+        <value xml:lang="ru">Реестр</value>
+        <value xml:lang="th">สินค้าคงเหลือ</value>
+        <value xml:lang="zh">库存</value>
+        <value xml:lang="zh_CN">库存</value>
+    </property>
+    <property key="FacilityNoFacility">
+        <value xml:lang="de">Kein Lager</value>
+        <value xml:lang="en">No Facility</value>
+        <value xml:lang="es">Ningún almacén</value>
+        <value xml:lang="fr">Aucun lieu de stockage</value>
+        <value xml:lang="it">Nessun Stabilimento </value>
+        <value xml:lang="nl">Geen faciliteit</value>
+        <value xml:lang="ro">Nici-un Compartiment </value>
+        <value xml:lang="ru">Нет оборудования</value>
+        <value xml:lang="th">ไม่มีคลังสินค้า</value>
+        <value xml:lang="zh">没有场所</value>
+        <value xml:lang="zh_CN">仓储设施</value>
+    </property>
+    <property key="FacilityNoOtherShippingMethods">
+        <value xml:lang="de">Benutze Voreinstellung: Keine anderen Liefermethoden verfügbar</value>
+        <value xml:lang="en">Use Default: No other shipping methods available.</value>
+        <value xml:lang="es">Por defecto: Ningún otro medio de envío disponible</value>
+        <value xml:lang="fr">Par défaut : Aucun autre moyen d'expédition possible</value>
+        <value xml:lang="it">Usare Default: Nessun altro metodo di spedizione disponibile.</value>
+        <value xml:lang="nl">Gebruik Standaard: Geen andere verzend methoden beschikbaar.</value>
+        <value xml:lang="ro">Foloseste Default: Nici-o alta metoda de  expediere disponibila.</value>
+        <value xml:lang="ru">Использовать по умолчанию: Не доступен ни один способ доставки.</value>
+        <value xml:lang="th">ใช้ค่าเริ่มต้น : ไม่มีวิธีการขนส่งสินค้าอื่น ๆ ที่นำไปใช้ได้</value>
+        <value xml:lang="zh">使用缺省值：没有其它可用的送货方式。</value>
+        <value xml:lang="zh_CN">使用默认: 没有其他送货方式</value>
+    </property>
+    <property key="FacilityShipAvailable">
+        <value xml:lang="de">Bitte liefern Sie meine bestellten Artikel sobald sie verfügbar sind (Sie dürfen zusätzliche Lieferungskosten  erheben).</value>
+        <value xml:lang="en">Please ship items I ordered as they become available (you may incur additional shipping charges).</value>
+        <value xml:lang="es">Por favor, envíe los artículos que he pedido en cuanto se encuentren disponibles (puede causar gastos de envío adicionales)</value>
+        <value xml:lang="fr">Livrer les articles dès qu'ils sont disponibles (peut occasionner des frais additionnels d'expédition)</value>
+        <value xml:lang="it">Prego spedire gli articoli ordinati appena diventano disponibili (potresti incorrere in spese di spedizione aggiuntive).</value>
+        <value xml:lang="nl">Verstuur items wanneer ze beschikbaar komen (extra verzendkosten mogen worden aangerekend).</value>
+        <value xml:lang="ro">Va rugam expediati liniile pe care le-am comandat  ordinato imediat ce devin disponibile (s-ar putea sa ti se adauge cheltuieli de expediere).</value>
+        <value xml:lang="ru">Пожалуйста поставляйте заказанные мной позиции по мере доступности (можно учитывать дополнительные расходы на доставку).</value>
+        <value xml:lang="th">Please ship items I ordered as they become available (you may incur additional shipping charges).</value>
+        <value xml:lang="zh">当我订的明细有货时请送货 (你可能要支付额外的运费)。</value>
+        <value xml:lang="zh_CN">当所订商品个别项可用时即刻发货（不是一起发货，你可能需要另付发货费用）。</value>
+    </property>
+    <property key="FacilityShipOnceOrAvailable">
+        <value xml:lang="de">Alles zusammen liefern oder 'sobald etwas verfügbar'?</value>
+        <value xml:lang="en">Ship all at once, or 'as available'?</value>
+        <value xml:lang="es">¿Enviar todo de una vez o en cuanto se encuentre disponibles?</value>
+        <value xml:lang="fr">Expédition complète ou partielle ?</value>
+        <value xml:lang="it">Spedisci tutto in una volta, o 'appena disponibili'?</value>
+        <value xml:lang="nl">Verzend alles tegelijk, of wanneer ze beschikbaar komen?</value>
+        <value xml:lang="ro">Expediaza totul o singura data, sau in momentul in care devin disponibile?</value>
+        <value xml:lang="ru">Поставлять все одной партией, или "по мере доступности"?</value>
+        <value xml:lang="th">ส่งสินค้าทั้งหมดหนึ่งครั้ง หรือ เท่าที่จะหาได้</value>
+        <value xml:lang="zh">一次全部送货，或者“到货即送”？</value>
+        <value xml:lang="zh_CN">同时货运全部商品，或单项可用即刻发货？</value>
+    </property>
+    <property key="FacilityShipments">
+        <value xml:lang="de">Auslieferungen</value>
+        <value xml:lang="en">Shipments</value>
+        <value xml:lang="es">Envíos</value>
+        <value xml:lang="fr">Expéditions</value>
+        <value xml:lang="it">Spedizioni</value>
+        <value xml:lang="nl">Zending</value>
+        <value xml:lang="ro">Expediere</value>
+        <value xml:lang="ru">Поставки</value>
+        <value xml:lang="th">การขนส่งสินค้า</value>
+        <value xml:lang="zh">运输</value>
+        <value xml:lang="zh_CN">装运</value>
+    </property>
+    <property key="FacilityShipping">
+        <value xml:lang="de">Versand</value>
+        <value xml:lang="en">Shipping</value>
+        <value xml:lang="es">Envío</value>
+        <value xml:lang="fr">Expédition</value>
+        <value xml:lang="it">Spedizione</value>
+        <value xml:lang="nl">Verzenden</value>
+        <value xml:lang="ro">Expeditor</value>
+        <value xml:lang="ru">Поставка</value>
+        <value xml:lang="th">การขนส่งสินค้า</value>
+        <value xml:lang="zh">送货</value>
+        <value xml:lang="zh_CN">装运</value>
+    </property>
+    <property key="FacilityShippingAndHandling">
+        <value xml:lang="de">Versandkosten</value>
+        <value xml:lang="en">Shipping and Handling</value>
+        <value xml:lang="es">Envío y manipulación</value>
+        <value xml:lang="fr">Port et emballage</value>
+        <value xml:lang="it">Spese di Spedizione e Imballaggio</value>
+        <value xml:lang="nl">Verzend en handelingen</value>
+        <value xml:lang="ro">Cheltuieli de Expediere si Ambalare</value>
+        <value xml:lang="ru">Доставка и обработка</value>
+        <value xml:lang="th">การขนส่งสินค้าและการควบคุม</value>
+        <value xml:lang="zh">送货及包装</value>
+        <value xml:lang="zh_CN">货运及处理</value>
+    </property>
+    <property key="FacilitySpecialInstructions">
+        <value xml:lang="de">Spezielle Anweisungen</value>
+        <value xml:lang="en">Special Instructions</value>
+        <value xml:lang="es">Instrucciones especiales</value>
+        <value xml:lang="fr">Instructions spéciales</value>
+        <value xml:lang="it">Istruzioni Speciali</value>
+        <value xml:lang="nl">Speciale Instructies</value>
+        <value xml:lang="ro">Instructiuni Speciale</value>
+        <value xml:lang="ru">Специальные инструкции</value>
+        <value xml:lang="th">คำแนะนำพิเศษ</value>
+        <value xml:lang="zh">特别说明</value>
+        <value xml:lang="zh_CN">特殊说明</value>
+    </property>
+    <property key="FacilityWaitEntireOrderReady">
+        <value xml:lang="de">Bitte warten Sie mit der Auslieferung bis die Bestellung vollständig vorliegt.</value>
+        <value xml:lang="en">Please wait until the entire order is ready before shipping.</value>
+        <value xml:lang="es">Por favor, esperar hasta que el pedido esté completo antes de enviarlo</value>
+        <value xml:lang="fr">Attendre que la commande soit complète avant de l'expédier.</value>
+        <value xml:lang="it">Per favore aspettare fino a quando l'intero ordine è pronto per la spedizione.</value>
+        <value xml:lang="nl">Wacht alstublieft tot de gehele bestelling compleet is voor verzenden.</value>
+        <value xml:lang="ro">Va rog asteptati pana cand intreaga comanda  este gata pentru expediere.</value>
+        <value xml:lang="ru">Пожалуйста поставляйте после того как будет готов весь заказ.</value>
+        <value xml:lang="th">กรุณารอจนกระทั่งอ่านรายการสั่งซื้อทั้งหมดก่อนการขนส่งสินค้า</value>
+        <value xml:lang="zh">请等待整个订单都有货时再送货。</value>
+        <value xml:lang="zh_CN">等待直到整个订单完成后发货。</value>
+    </property>
     <property key="FeatureTypes">
         <value xml:lang="de">Merkmal Typen</value>
         <value xml:lang="en">Feature Types</value>