You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2008/07/08 11:32:19 UTC

svn commit: r674749 - in /ofbiz/trunk: applications/accounting/config/ applications/ecommerce/config/ applications/ecommerce/widget/ applications/manufacturing/config/ applications/order/config/ applications/order/src/org/ofbiz/order/shoppingcart/ appl...

Author: jleroux
Date: Tue Jul  8 02:32:18 2008
New Revision: 674749

URL: http://svn.apache.org/viewvc?rev=674749&view=rev
Log:
A patch from Bruno Busco "New and improved Italian labels" (https://issues.apache.org/jira/browse/OFBIZ-1864) - OFBIZ-1864

Modified:
    ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
    ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml
    ofbiz/trunk/applications/ecommerce/widget/EmailOrderScreens.xml
    ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml
    ofbiz/trunk/applications/order/config/OrderEntityLabels.xml
    ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml
    ofbiz/trunk/applications/order/config/OrderUiLabels.xml
    ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java
    ofbiz/trunk/applications/product/config/ProductUiLabels.xml
    ofbiz/trunk/framework/common/config/CommonUiLabels.xml
    ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml
    ofbiz/trunk/specialpurpose/bi/config/BiUiLabels.xml

Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=674749&r1=674748&r2=674749&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Tue Jul  8 02:32:18 2008
@@ -4273,7 +4273,7 @@
         <value xml:lang="en">Order #</value>
         <value xml:lang="es">Orden #</value>
         <value xml:lang="fr">Commande #</value>
-        <value xml:lang="it">Ordine #</value>
+        <value xml:lang="it">Ordine n°</value>
         <value xml:lang="nl">Order #</value>
         <value xml:lang="ro">Comanda #</value>
         <value xml:lang="ru">Заказ №</value>
@@ -7234,7 +7234,7 @@
     </property>
     <property key="FormFieldTitle_orderDate">
         <value xml:lang="en">Order Date</value>
-        <value xml:lang="it">Data Ordine</value>
+        <value xml:lang="it">Data ordine</value>
         <value xml:lang="th">รายการสั่งซื้อวันที่</value>
     </property>
     <property key="FormFieldTitle_orderIdPrefix">

Modified: ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml?rev=674749&r1=674748&r2=674749&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml (original)
+++ ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml Tue Jul  8 02:32:18 2008
@@ -790,7 +790,7 @@
         <value xml:lang="es">Vía de pago</value>
         <value xml:lang="fr">Paiement Via</value>
         <value xml:lang="hi_IN">भुगतान मार्ग</value>
-        <value xml:lang="it">Con Pagamento</value>
+        <value xml:lang="it">Con pagamento</value>
         <value xml:lang="ja">Payment Via</value>
         <value xml:lang="nl">Betaling Via</value>
         <value xml:lang="pt_PT">Pagamento Via</value>
@@ -3711,7 +3711,7 @@
         <value xml:lang="es">Usted puede agregar otras direcciones de email separadas por coma aquí que serán utilizadas solamente para la compra actual</value>
         <value xml:lang="fr">Vous pouvez ajouter d'autre adresses courriel (séparées par des virgules) qui seront utilisées seulement pour cette commande.</value>
         <value xml:lang="hi_IN">कोमा (,) के अलग करके आप अपना एक से ज्यादा ईमेल पता डाल सकते हैं, जिस तरह से आपने डाला है उस तरह से उपयोग होगा</value>
-        <value xml:lang="it">Tu puoi aggiungere altri indirizzi email separati da virgola qui che sarà usato solamente per l'ordine attuale</value>
+        <value xml:lang="it">Puoi aggiungere altri indirizzi email separati da virgola qui, saranno usati solamente per l'ordine attuale</value>
         <value xml:lang="ja">You may add other comma separated email addresses here that will be used only for the current order</value>
         <value xml:lang="nl">U mag een aantal email adressen hier toevoegen gescheiden door een comma die alleen voor de huidige bestelling worden gebruikt</value>
         <value xml:lang="pt_PT">Você pode adicionar outros endereços de e-mail, separados por vírgulas, utilizados apenas para esta encomenda</value>
@@ -4351,7 +4351,7 @@
         <value xml:lang="es">No comprado todavía</value>
         <value xml:lang="fr">Pas encore commandé</value>
         <value xml:lang="hi_IN">अभी आर्डर नही हुआ</value>
-        <value xml:lang="it">Non Ancora Ordinato</value>
+        <value xml:lang="it">Non ancora ordinato</value>
         <value xml:lang="ja">Not Yet Ordered</value>
         <value xml:lang="nl">Nog niet besteld</value>
         <value xml:lang="pt_PT">Não foi ainda encomendado</value>
@@ -4847,7 +4847,7 @@
         <value xml:lang="es">Por favor Envíe El Pago A</value>
         <value xml:lang="fr">Envoyer le paiement à</value>
         <value xml:lang="hi_IN">भुगतान इसे दें</value>
-        <value xml:lang="it">Perfavore Inviare Pagamento A</value>
+        <value xml:lang="it">Prego inviare pagamento a</value>
         <value xml:lang="ja">Please Send Payment To</value>
         <value xml:lang="nl">Stuur de betaling naar:</value>
         <value xml:lang="pt_PT">Por Favor, Envie Pagamento Para</value>
@@ -4984,7 +4984,7 @@
         <value xml:lang="es">Instrucciones Especiales</value>
         <value xml:lang="fr">Instructions spéciales</value>
         <value xml:lang="hi_IN">ख़ास सूचना</value>
-        <value xml:lang="it">Istruzioni Speciali</value>
+        <value xml:lang="it">Istruzioni speciali</value>
         <value xml:lang="ja">Special Instructions</value>
         <value xml:lang="nl">Speciale instructies</value>
         <value xml:lang="pt_PT">Instruções Especiais</value>
@@ -5000,7 +5000,7 @@
         <value xml:lang="es">La orden espefificada no se encontró, por favor inténtelo de nuevo</value>
         <value xml:lang="fr">La commande spécifiée n'existe pas, réessayez</value>
         <value xml:lang="hi_IN">आपका आर्डर नही मिला, दुबारा कोशिश करें</value>
-        <value xml:lang="it">L'ordine specificato non è stato trovato, perfavore riprovare</value>
+        <value xml:lang="it">L'ordine specificato non è stato trovato, riprovare prego</value>
         <value xml:lang="ja">The specified order was not found, please try again</value>
         <value xml:lang="nl">De gespecificeerde bestalling was niet gevonden, probeer het opnieuw</value>
         <value xml:lang="pt_PT">A encomenda especificada não foi encontrada, por favor tente de novo</value>
@@ -5149,7 +5149,7 @@
         <value xml:lang="es">Puede actualizarlo en su</value>
         <value xml:lang="fr">Vous pouvez mettre à jour celle-ci dans votre</value>
         <value xml:lang="hi_IN">आप इनको अपडेट कर सकते हैं</value>
-        <value xml:lang="it">Tu potresti aggiornare questo nel tuo</value>
+        <value xml:lang="it">Puoi cambiarli accedendo al tuo</value>
         <value xml:lang="ja">Your may update these in your</value>
         <value xml:lang="nl">U kan deze aanpassen in uw</value>
         <value xml:lang="pt_PT">Você pode actualizar isto no seu</value>
@@ -6819,7 +6819,7 @@
         <value xml:lang="es">Direcciones de Email</value>
         <value xml:lang="fr">Adresses courriel</value>
         <value xml:lang="hi_IN">ईमेल पता</value>
-        <value xml:lang="it">Indirizzi Email</value>
+        <value xml:lang="it">Indirizzi email</value>
         <value xml:lang="ja">Email Addresses</value>
         <value xml:lang="nl">Email Adressen</value>
         <value xml:lang="pt_PT">Moradas de E-mail</value>
@@ -8614,6 +8614,7 @@
         <value xml:lang="en">Refine Search</value>
         <value xml:lang="es">Afinar búsqueda</value>
         <value xml:lang="fr">Affiner la recherche</value>
+        <value xml:lang="it">Raffina la ricerca</value>
         <value xml:lang="ja">Refine Search</value>
         <value xml:lang="nl">Zoeken verfijnen</value>
         <value xml:lang="th">ปรับปรุงการค้นหา</value>

Modified: ofbiz/trunk/applications/ecommerce/widget/EmailOrderScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/widget/EmailOrderScreens.xml?rev=674749&r1=674748&r2=674749&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/widget/EmailOrderScreens.xml (original)
+++ ofbiz/trunk/applications/ecommerce/widget/EmailOrderScreens.xml Tue Jul  8 02:32:18 2008
@@ -78,6 +78,7 @@
     <screen name="OrderConfirmNotice">
         <section>
             <actions>
+                <property-map resource="EcommerceUiLabels" map-name="uiLabelMap" global="true"/>
                 <set field="title" value="${uiLabelMap.PageTitleOrderConfirmationNotice}"/>
                 <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control/"/>
                 <set field="allowAnonymousView" value="Y"/>  <!-- this field will instruction orderstatus.bsh to allow an anonymous order to be viewed by anybody, so the email confirmation screen will work -->

Modified: ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml?rev=674749&r1=674748&r2=674749&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml (original)
+++ ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml Tue Jul  8 02:32:18 2008
@@ -2065,7 +2065,7 @@
     <property key="ManufacturingQuickClose">
         <value xml:lang="en">Quick Close</value>
         <value xml:lang="es">Cerrado rápido</value>
-        <value xml:lang="it">Chiusura Veloce</value>
+        <value xml:lang="it">Chiusura veloce</value>
         <value xml:lang="ro">Inchidere Rapida</value>
         <value xml:lang="th">ปิดอย่างรวดเร็ว</value>
         <value xml:lang="zh">快速关闭</value>

Modified: ofbiz/trunk/applications/order/config/OrderEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderEntityLabels.xml?rev=674749&r1=674748&r2=674749&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderEntityLabels.xml (original)
+++ ofbiz/trunk/applications/order/config/OrderEntityLabels.xml Tue Jul  8 02:32:18 2008
@@ -305,7 +305,7 @@
         <value xml:lang="en">Purchase Order</value>
         <value xml:lang="es">Compra</value>
         <value xml:lang="fr">Achats</value>
-        <value xml:lang="it">Ordine di Acquisto</value>
+        <value xml:lang="it">Ordine di acquisto</value>
         <value xml:lang="ro">Cumparare</value>
         <value xml:lang="ru">Закупка</value>
         <value xml:lang="th">รายการการสั่งซื้อ</value>
@@ -315,7 +315,7 @@
         <value xml:lang="en">Sales Order</value>
         <value xml:lang="es">Venta</value>
         <value xml:lang="fr">Ventes</value>
-        <value xml:lang="it">Ordine di Vendita</value>
+        <value xml:lang="it">Ordine di vendita</value>
         <value xml:lang="ro">Vanzare</value>
         <value xml:lang="ru">Продажи</value>
         <value xml:lang="th">รายการขาย</value>

Modified: ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml?rev=674749&r1=674748&r2=674749&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml (original)
+++ ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml Tue Jul  8 02:32:18 2008
@@ -1197,7 +1197,7 @@
         <value xml:lang="en">Order creation failed; please notify customer service. </value>
         <value xml:lang="es">Falló creación de orden; por favor notifique al servicio al cliente.</value>
         <value xml:lang="fr">La création de commande a échouée; Veuillez contacter le service après-vente.</value>
-        <value xml:lang="it">Creazione Ordine fallita; perfavore notificare al servizio clienti. </value>
+        <value xml:lang="it">Creazione ordine fallita; contattare il servizio di assistenza clienti. </value>
         <value xml:lang="ro">Creare Comanda falita; Va rugam  transmiteti serviciului Clienti. </value>
         <value xml:lang="ru">Создание заказа завершилось неудачно; пожалуйста, сообщите в службу поддержки. </value>
         <value xml:lang="th">การสร้างรายการผิดพลาด; กรุณาแจ้งบริการลูกค้า. </value>
@@ -1267,7 +1267,7 @@
         <value xml:lang="en">Please contact customer service; payment return code unknown. </value>
         <value xml:lang="es">Por favor, contacte el servicio al cliente; código de pago de devolución desconocido.</value>
         <value xml:lang="fr">Veuillez contacter le service après-vente;code de retour de paiement inconnu.</value>
-        <value xml:lang="it">Perfavore contattare il servizio clienti; codice ritorno pagamento sconosciuto. </value>
+        <value xml:lang="it">Codice ritorno pagamento sconosciuto; contattare il servizio di assistenza clienti.</value>
         <value xml:lang="ro">Va rugam contactati serviciul clienti; cod returnare plata necunoscut. </value>
         <value xml:lang="ru">Пожалуйста свяжитесь со службой поддержки; неизвестный возращаемый код платежа. </value>
         <value xml:lang="th">กรุณาติดต่อบริการลูกค้า; ไม่ทราบรหัสการคืนค่าการชำระเงิน. </value>

Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels.xml?rev=674749&r1=674748&r2=674749&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderUiLabels.xml (original)
+++ ofbiz/trunk/applications/order/config/OrderUiLabels.xml Tue Jul  8 02:32:18 2008
@@ -191,6 +191,7 @@
         <value xml:lang="en">Payment Information</value>
         <value xml:lang="es">Información del pago</value>
         <value xml:lang="fr">Information de paiement</value>
+        <value xml:lang="it">Informazioni pagamento</value>
         <value xml:lang="th">ข้อมูลการชำระเงิน</value>
     </property>
     <property key="AccountingPleaseSendPaymentTo">
@@ -851,7 +852,7 @@
     <property key="FormFieldTitle_orderDate">
         <value xml:lang="en">Order Date</value>
         <value xml:lang="fr">Date de commande</value>
-        <value xml:lang="it">Data Ordine</value>
+        <value xml:lang="it">Data ordine</value>
         <value xml:lang="nl">Bestel datum</value>
         <value xml:lang="ro">Data Comanda</value>
         <value xml:lang="ru">Дата заказа</value>
@@ -1917,6 +1918,10 @@
         <value xml:lang="zh_CN">(必须清空订单才能改变)</value>
         <value xml:lang="zh">(不清除订单的话不能修改。)</value>
     </property>
+    <property key="OrderCannotChangeQuantityInPromotion">
+        <value xml:lang="en">Sorry, you can't change the quantity on the promotion item ${productName} (product ID: ${productId}, not setting quantity.</value>
+        <value xml:lang="it">Spiacente, non puoi cambiare la quantità del prodotto in promozione ${productName} (product ID: ${productId}.</value>
+    </property>
     <property key="OrderCaptureService">
         <value xml:lang="en">Service capture</value>
         <value xml:lang="fr">Service de prélèvement</value>
@@ -2006,7 +2011,7 @@
         <value xml:lang="es">Ir a compras rápido</value>
         <value xml:lang="fr">Validation rapide</value>
         <value xml:lang="hi_IN">जल्द छोड़ें</value>
-        <value xml:lang="it">Chiusura Veloce</value>
+        <value xml:lang="it">Chiusura veloce</value>
         <value xml:lang="ja">クイックチェックアウト</value>
         <value xml:lang="nl">Snel afrekenen</value>
         <value xml:lang="ro">Inchidere Rapida</value>
@@ -2457,7 +2462,7 @@
         <value xml:lang="en">Current Status</value>
         <value xml:lang="es">Estado actual</value>
         <value xml:lang="fr">Statut Actuel</value>
-        <value xml:lang="it">Stato Attuale</value>
+        <value xml:lang="it">Stato attuale</value>
         <value xml:lang="nl">Huidige status</value>
         <value xml:lang="ro">Stare  Actual</value>
         <value xml:lang="ru">Текущий статус</value>
@@ -2518,7 +2523,7 @@
         <value xml:lang="en">Order Date</value>
         <value xml:lang="es">Fecha de la orden</value>
         <value xml:lang="fr">Date de la commande</value>
-        <value xml:lang="it">Data Ordine</value>
+        <value xml:lang="it">Data ordine</value>
         <value xml:lang="nl">Order Datum</value>
         <value xml:lang="ro">Data Comanda</value>
         <value xml:lang="ru">Дата заказа</value>
@@ -2531,7 +2536,7 @@
         <value xml:lang="en">Date Ordered</value>
         <value xml:lang="es">Fecha de la orden</value>
         <value xml:lang="fr">Date commandée</value>
-        <value xml:lang="it">Data Ordine</value>
+        <value xml:lang="it">Data ordine</value>
         <value xml:lang="nl">Bestel datum</value>
         <value xml:lang="ro">Data Comanda</value>
         <value xml:lang="ru">Date Ordered</value>
@@ -2571,6 +2576,10 @@
         <value xml:lang="zh_CN">目的地</value>
         <value xml:lang="zh">目的地</value>
     </property>
+    <property key="OrderDoNotHaveEnoughProducts">
+        <value xml:lang="en">Sorry, we do not have enough (you tried ${requestedQuantity}) of the product ${productName} (product ID: ${productId}) in stock, not adding to cart. Please try a lower quantity, try again later, or call customer service for more information.</value>
+        <value xml:lang="it">Spiacente, al momento non disponiamo in magazzino di ${requestedQuantity} pezzi del prodotto ${productName} (product ID: ${productId}), questi non saranno aggiunti al carrello. Puoi provare a richiedere una quantità minore, a riprovare più tardi, o contattare il servizio assistenza clienti.</value>
+    </property>
     <property key="OrderDoPromotions">
         <value xml:lang="en">Run Promotions</value>
         <value xml:lang="es">Correr promociones</value>
@@ -5162,7 +5171,7 @@
         <value xml:lang="en">Order Terms</value>
         <value xml:lang="es">Condiciones de la orden</value>
         <value xml:lang="fr">Conditions de commande</value>
-        <value xml:lang="it">Termini Ordine</value>
+        <value xml:lang="it">Condizioni d'ordine</value>
         <value xml:lang="nl">Bestelling Terms</value>
         <value xml:lang="ro">Termene Comenzi</value>
         <value xml:lang="ru">Условия заказа</value>
@@ -7263,7 +7272,7 @@
         <value xml:lang="en">Shipment Information</value>
         <value xml:lang="es">Información del envío</value>
         <value xml:lang="fr">Informations sur le contenu de l'expédition</value>
-        <value xml:lang="it">Informazioni Spedizione</value>
+        <value xml:lang="it">Informazioni spedizione</value>
         <value xml:lang="nl">Shipment Information</value>
         <value xml:lang="ro">Informatii Expediere</value>
         <value xml:lang="ru">Информация по поставке</value>
@@ -7883,7 +7892,7 @@
         <value xml:lang="es">Ver Carro</value>
         <value xml:lang="fr">Voir le panier</value>
         <value xml:lang="hi_IN">टोकरी देखें</value>
-        <value xml:lang="it">Visualizza carrello</value>
+        <value xml:lang="it">Vis. carrello</value>
         <value xml:lang="ja">買い物かごを見る</value>
         <value xml:lang="nl">Kijk in de winkelwagen</value>
         <value xml:lang="pt_PT">Ver o Cesto</value>
@@ -9108,7 +9117,7 @@
         <value xml:lang="en">Cart is empty.</value>
         <value xml:lang="es">El carro está vacío.</value>
         <value xml:lang="fr">Le panier est vide</value>
-        <value xml:lang="it">Carrello è vuoto.</value>
+        <value xml:lang="it">Il carrello è vuoto.</value>
         <value xml:lang="nl">Cart is empty.</value>
         <value xml:lang="ro">Cosul este gol.</value>
         <value xml:lang="ru">Корзина пустая.</value>
@@ -9656,7 +9665,7 @@
     <property key="item.notAvailable">
         <value xml:lang="en">I am sorry, not available at these dates: ${resultMessage} item not added to the shopping cart.....</value>
         <value xml:lang="fr">je suis désolé, pas disponible à ces dates: ${resultMessage}, article non ajouté au panier d'achats...</value>
-        <value xml:lang="it">Sono spiacente, nessuna disponibilità a queste date: ${resultMessage} prodotto non aggiunto al carrello.....</value>
+        <value xml:lang="it">Spiacente, nessuna disponibilità a queste date: ${resultMessage} prodotto non aggiunto al carrello.....</value>
         <value xml:lang="ro">Imi pare rau, nici-o disponibilitate la aceste date: ${resultMessage} produs neadaugat in cos.....</value>
         <value xml:lang="ru">Извините, не доступно в эти даты: ${resultMessage} позиция в корзину покупок не добавлена....</value>
         <value xml:lang="th">ขอโทษค่ะ, วันที่สิ่งนี้ไม่สามารใช้ได้: ${resultMessage} ไม่เพิ่มรายการในบัตรซื้อของ.....</value>

Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java?rev=674749&r1=674748&r2=674749&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java Tue Jul  8 02:32:18 2008
@@ -973,7 +973,10 @@
         }
 
         if (this.isPromo) {
-            throw new CartItemModifyException("Sorry, you can't change the quantity on the promotion item " + this.getName() + " (product ID: " + productId + "), not setting quantity.");
+            Map messageMap = UtilMisc.toMap("productName", this.getName(),
+                                            "productId",   productId);
+            String excMsg = UtilProperties.getMessage(resource, "OrderCannotChangeQuantityInPromotion", messageMap , cart.getLocale() );
+            throw new CartItemModifyException(excMsg);
         }
 
         // needed for inventory checking and auto-save
@@ -983,7 +986,10 @@
             // check inventory if new quantity is greater than old quantity; don't worry about inventory getting pulled out from under, that will be handled at checkout time
             if (_product != null && quantity > this.quantity) {
                 if (!isInventoryAvailableOrNotRequired(quantity, productStoreId, dispatcher)) {
-                    String excMsg = "Sorry, we do not have enough (you tried " + UtilFormatOut.formatQuantity(quantity) + ") of the product " + this.getName() + " (product ID: " + productId + ") in stock, not adding to cart. Please try a lower quantity, try again later, or call customer service for more information.";
+                    Map messageMap = UtilMisc.toMap("requestedQuantity", UtilFormatOut.formatQuantity(quantity),
+                                                    "productName",       this.getName(),
+                                                    "productId",         productId);
+                    String excMsg = UtilProperties.getMessage(resource, "OrderDoNotHaveEnoughProducts", messageMap , cart.getLocale() );
                     Debug.logWarning(excMsg, module);
                     throw new CartItemModifyException(excMsg);
                 }

Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=674749&r1=674748&r2=674749&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Tue Jul  8 02:32:18 2008
@@ -2240,7 +2240,7 @@
     <property key="FormFieldTitle_orderDate">
         <value xml:lang="en">Order Date</value>
         <value xml:lang="fr">Date de commande</value>
-        <value xml:lang="it">Data Ordine</value>
+        <value xml:lang="it">Data ordine</value>
         <value xml:lang="ro">Data Comanda</value>
         <value xml:lang="ru">Дата заказа</value>
         <value xml:lang="th">รายการสั่งซื้อวันที่</value>
@@ -8041,7 +8041,7 @@
         <value xml:lang="en">Create New Category</value>
         <value xml:lang="es">Crear nueva Categoría</value>
         <value xml:lang="fr">Création d'une nouvelle catégorie</value>
-        <value xml:lang="it">Creare Nuova Categoria</value>
+        <value xml:lang="it">Creare nuova categoria</value>
         <value xml:lang="ro">Creare Noua Categorie</value>
         <value xml:lang="ru">Новая категория</value>
         <value xml:lang="th">สร้างหมวดหมู่ใหม่</value>
@@ -8051,7 +8051,7 @@
         <value xml:lang="en">Create New Facility</value>
         <value xml:lang="es">Crear nuevo Almacén</value>
         <value xml:lang="fr">Création d'un nouveau lieu de stockage</value>
-        <value xml:lang="it">Creare Nuova Stabilimento</value>
+        <value xml:lang="it">Creare nuovo stabilimento</value>
         <value xml:lang="ro">Creare Nou Compartiment</value>
         <value xml:lang="ru">Создать новый объект</value>
         <value xml:lang="th">สร้างคลังสินค้าใหม่</value>
@@ -8061,7 +8061,7 @@
         <value xml:lang="en">Create New Feature</value>
         <value xml:lang="es">Crear nueva Característica</value>
         <value xml:lang="fr">Création d'une nouvelle caractéristique</value>
-        <value xml:lang="it">Creare Nuova Caratteristica</value>
+        <value xml:lang="it">Creare nuova caratteristica</value>
         <value xml:lang="ro">Creare Noua Caracteristica</value>
         <value xml:lang="ru">Создать новую особенность</value>
         <value xml:lang="th">สร้างลักษณะใหม่</value>
@@ -12560,6 +12560,10 @@
         <value xml:lang="th">นำมาใช้เท่านั้นถ้าอยู่ภายในระยะเวลา</value>
         <value xml:lang="zh">必须在范围内</value>
     </property>
+    <property key="ProductOnlyShowingFirstN">
+        <value xml:lang="en">NOTE: Only showing the first ${viewSize} of ${listSize} products. To view the rest, use the Products tab for this category.</value>
+        <value xml:lang="it">NOTA: Sono elencati solo ${viewSize} di ${listSize} prodotti. Per visualizzare gli altri, usa il pannello Prodotti di questa categoria.</value>
+    </property>
     <property key="ProductOpenQuantity">
         <value xml:lang="en">Open</value>
         <value xml:lang="fr">Ouvert</value>
@@ -15106,7 +15110,7 @@
         <value xml:lang="en">Rollup</value>
         <value xml:lang="es">Jerarquía</value>
         <value xml:lang="fr">Nomenclature</value>
-        <value xml:lang="it">Arrivo</value>
+        <value xml:lang="it">Gerarchia</value>
         <value xml:lang="ro">Sosire</value>
         <value xml:lang="ru">Иерархия</value>
         <value xml:lang="th">Rollup</value>
@@ -15116,7 +15120,7 @@
         <value xml:lang="en">Rollup</value>
         <value xml:lang="es">Jerarquía</value>
         <value xml:lang="fr">Nomencl.</value>
-        <value xml:lang="it">Arrivo</value>
+        <value xml:lang="it">Gerarchia</value>
         <value xml:lang="ro">Sosire</value>
         <value xml:lang="ru">Иерархия</value>
         <value xml:lang="th">Rollup</value>

Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.xml?rev=674749&r1=674748&r2=674749&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonUiLabels.xml Tue Jul  8 02:32:18 2008
@@ -4822,10 +4822,12 @@
     <property key="CommonSearchOptions">
         <value xml:lang="en">Search Options</value>
         <value xml:lang="fr">Options de la recherche</value>
+        <value xml:lang="it">Opzioni di ricerca</value>
     </property>
     <property key="CommonSearchResults">
         <value xml:lang="en">Search Results</value>
         <value xml:lang="fr">Résultats de la recherche</value>
+        <value xml:lang="it">Risultati ricerca</value>
     </property>
     <property key="CommonSearchResultfor">
         <value xml:lang="ar">نتائج البحث ل</value>
@@ -5522,7 +5524,7 @@
         <value xml:lang="en">Tell-A-Friend</value>
         <value xml:lang="es">Contar a un amigo</value>
         <value xml:lang="fr">Dites-le à un ami</value>
-        <value xml:lang="it">Dillo-Ad-un'Amico</value>
+        <value xml:lang="it">Invia questa pagina ad un amico</value>
         <value xml:lang="nl">stuur-aan-een-kennis</value>
         <value xml:lang="pt">Dizer-A-Amigo</value>
         <value xml:lang="ro">Spune-i unui Prieten</value>

Modified: ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml?rev=674749&r1=674748&r2=674749&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml (original)
+++ ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml Tue Jul  8 02:32:18 2008
@@ -1507,7 +1507,7 @@
     </property>
     <property key="WebtoolsMessage5">
         <value xml:lang="en">This page can be used to import exported Entity Engine XML documents. These documents all have a root tag of "&lt;entity-engine-xml&gt;"</value>
-        <value xml:lang="it">Questa pagina non può essere usata per importare esportare documenti XML dal Entity Engine. Tutti questi documenti hanno un root tag "&lt;entity-engine-xml&gt;"</value>
+        <value xml:lang="it">Questa pagina può essere usata per importare documenti XML contenenti export di Entita'. Tali documenti hanno un tag root "&lt;entity-engine-xml&gt;"</value>
         <value xml:lang="ro">Aceasta pagina nu poate fi folosita pentru importarea exportarea documentelor XML de Entity Engine. Toate aceste documente au un root tag "&lt;entity-engine-xml&gt;"</value>
         <value xml:lang="th">หน้านี้ใช้การนำเข้าข้อมูลที่มีการส่งออกเอนติตี้เอนจินเอกสาร XML โดยใช้คำสั่ง "&lt;entity-engine-xml&gt;"</value>
         <value xml:lang="zh">本页面用于导入导出的实体引擎XML文档。这些文档都有一个根标签 "&lt;entity-engine-xml&gt;"</value>
@@ -2741,7 +2741,7 @@
     </property>
     <property key="WebtoolsWorkflowCurrentStatus">
         <value xml:lang="en">Current Status</value>
-        <value xml:lang="it">Stato Attuale</value>
+        <value xml:lang="it">Stato attuale</value>
         <value xml:lang="th">สถานะทั่ว ๆ ไป</value>
     </property>
     <property key="WebtoolsWorkflowEngineTools">

Modified: ofbiz/trunk/specialpurpose/bi/config/BiUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/bi/config/BiUiLabels.xml?rev=674749&r1=674748&r2=674749&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/bi/config/BiUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/bi/config/BiUiLabels.xml Tue Jul  8 02:32:18 2008
@@ -35,7 +35,7 @@
     </property>
     <property key="BusinessIntelligenceCurrentStatus">
         <value xml:lang="en">Current Status</value>
-        <value xml:lang="it">Stato Attuale</value>
+        <value xml:lang="it">Stato attuale</value>
         <value xml:lang="th">สถานะในปัจจุบัน</value>
     </property>
     <property key="BusinessIntelligenceFieldDescription">