svn commit: r730989 - in /ofbiz/trunk: applications/product/config/ProductUiLabels.xml applications/product/webapp/catalog/product/ProductForms.xml applications/product/webapp/catalog/store/ProductStoreForms.xml framework/common/config/CommonUiLabels.xml

Sat, 03 Jan 2009 06:28:42 -0800 

Author: jleroux
Date: Sat Jan  3 06:28:16 2009
New Revision: 730989

URL: http://svn.apache.org/viewvc?rev=730989&view=rev
Log:
Refactoring of Edit Product Screen.
Note that I have commented out salesDiscWhenNotAvail and inventoryMessage as 
they are any longer used
There are also some changes in labels (i18n and French l10n)

Modified:
    ofbiz/trunk/applications/product/config/ProductUiLabels.xml
    ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml
    ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml
    ofbiz/trunk/framework/common/config/CommonUiLabels.xml

Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=730989&r1=730988&r2=730989&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Sat Jan  3 
06:28:16 2009
@@ -7340,7 +7340,7 @@
         <value xml:lang="de">Schlüsselwörter automatisch erstellen</value>
         <value xml:lang="en">AutoCreateKeywords</value>
         <value xml:lang="es">Creación Automática de Palabras Clave</value>
-        <value xml:lang="fr">Création automatique de mots-clés</value>
+        <value xml:lang="fr">Création automatique de mots-clés ?</value>
         <value xml:lang="it">Creazione Automatica Chiavi</value>
         <value xml:lang="ro">Creatie Automatica Chei</value>
         <value xml:lang="ru">Ключев. слова созд. 
автом-ки</value>
@@ -8098,7 +8098,7 @@
         <value xml:lang="de">Lieferung verrechnen</value>
         <value xml:lang="en">Charge Shipping</value>
         <value xml:lang="es">(Cobrar) Gastos de envío</value>
-        <value xml:lang="fr">Frais d'expédition</value>
+        <value xml:lang="fr">Frais d'expédition ?</value>
         <value xml:lang="it">Spese di Spedizione</value>
         <value xml:lang="ro">Cheltuieli de Expediere</value>
         <value xml:lang="ru">Считать стоим. 
доставки</value>
@@ -9155,6 +9155,10 @@
         <value 
xml:lang="th">หมายเลขรายการค่าเริ่มต้น</value>
         <value xml:lang="zh">缺省序号</value>
     </property>
+    <property key="ProductDefaultShipmentBoxTypeId">
+        <value xml:lang="en">Default Shipment Box Type Id</value>
+        <value xml:lang="fr">Réf. de carton d'emballage par défaut</value>
+    </property>    
     <property key="ProductDefaultsTo">
         <value xml:lang="de">Standartwert</value>
         <value xml:lang="en">Defaults to</value>
@@ -9364,7 +9368,7 @@
         <value xml:lang="de">Produkt duplizieren</value>
         <value xml:lang="en">Duplicate Product</value>
         <value xml:lang="es">Producto duplicado</value>
-        <value xml:lang="fr">Copier l'article</value>
+        <value xml:lang="fr">Dupliquer l'article</value>
         <value xml:lang="it">Duplica Prodotto</value>
         <value xml:lang="ro">Produs Duplicat</value>
         <value xml:lang="ru">Копировать продукт</value>
@@ -11282,7 +11286,7 @@
         <value xml:lang="de">Bei Aktionen berücksichtigen</value>
         <value xml:lang="en">Include In Promotions</value>
         <value xml:lang="es">Incluir en promociones</value>
-        <value xml:lang="fr">Inclure dans les promotions</value>
+        <value xml:lang="fr">Inclure dans les promotions ?</value>
         <value xml:lang="it">Includi Nelle Promozioni</value>
         <value xml:lang="ro">Include In Promotii</value>
         <value xml:lang="ru">Включать в акционную 
кат-рию</value>
@@ -11951,7 +11955,7 @@
         <value xml:lang="ru">Ключевые слова</value>
         <value xml:lang="th">คำหลัก</value>
         <value xml:lang="zh">关键字</value>
-    </property>
+    </property>    
     <property key="ProductLabel">
         <value xml:lang="de">Etikette</value>
         <value xml:lang="en">Label</value>
@@ -13833,7 +13837,7 @@
         <value xml:lang="de">ANMERKUNG: Für Inhalte verwenden Sie den Bereich 
Inhalte.</value>
         <value xml:lang="en">NOTE: For content options, use the Content 
tab.</value>
         <value xml:lang="es">NOTA: Para opciones de contenido, use la pestaña 
Contenido</value>
-        <value xml:lang="fr">NOTE: Pour les options concernant le contenu, 
utiliser l'onglet contenu.</value>
+        <value xml:lang="fr">NOTE: Pour les options concernant le contenu 
(descriptions, etc.), utiliser l'onglet contenu.</value>
         <value xml:lang="it">NOTA: Per le opzioni contenuto, usare il Tab 
Contenuto.</value>
         <value xml:lang="ro">NOTA: Pentru optiunile continut, folositi Tab 
Continut.</value>
         <value xml:lang="ru">ПРИМЕЧАНИЕ: для параметров 
контента используйте разделитель 
Контент.</value>
@@ -16805,7 +16809,7 @@
         <value xml:lang="de">Benötigt Betrag</value>
         <value xml:lang="en">Require Amount</value>
         <value xml:lang="es">Monto requerido</value>
-        <value xml:lang="fr">Nécessite une quantitée</value>
+        <value xml:lang="fr">Nécessite une quantitée ?</value>
         <value xml:lang="it">Importo Richiesto</value>
         <value xml:lang="ro">Valoare Ceruta</value>
         <value xml:lang="ru">Требуется количество</value>
@@ -16849,7 +16853,7 @@
         <value xml:lang="de">Benötigt Bestand</value>
         <value xml:lang="en">Require Inventory</value>
         <value xml:lang="es">Requerir inventario</value>
-        <value xml:lang="fr">Stock requis</value>
+        <value xml:lang="fr">Stock requis ?</value>
         <value xml:lang="it">Richiesto Inventario</value>
         <value xml:lang="ro">Se cere Inventarul</value>
         <value xml:lang="ru">Требует наличия</value>
@@ -17092,7 +17096,7 @@
         <value xml:lang="de">Wird zurückgenommen</value>
         <value xml:lang="en">Returnable</value>
         <value xml:lang="es">Retornable</value>
-        <value xml:lang="fr">Restituable/remboursable</value>
+        <value xml:lang="fr">Restituable/remboursable ?</value>
         <value xml:lang="it">Reso</value>
         <value xml:lang="ro">Returnabil</value>
         <value xml:lang="ru">Возврат возможен</value>
@@ -17309,7 +17313,7 @@
         <value xml:lang="de">Verkauf einstellen wenn kein Lagerbestand 
vorhanden</value>
         <value xml:lang="en">Disc. When Inv. Not Avail?</value>
         <value xml:lang="es">¿Interrumpir venta cuando no hay inventario 
disponible?</value>
-        <value xml:lang="fr">Escompte si stock vide</value>
+        <value xml:lang="fr">Pas de vente si le stock est vide</value>
         <value xml:lang="it">Sospeso Quando Inventario Non Disponibile?</value>
         <value xml:lang="ro">Suspendat Cand Inventarul nu este 
Disponibil?</value>
         <value xml:lang="ru">Прекр. прод. если нет в 
наличии?</value>
@@ -18265,7 +18269,7 @@
         <value xml:lang="de">In Versandkiste?</value>
         <value xml:lang="en">In Shipping Box ?</value>
         <value xml:lang="es">¿En el paquete de envío?</value>
-        <value xml:lang="fr">Dans le carton d'expédition ?</value>
+        <value xml:lang="fr">Dans un carton d'emballage ?</value>
         <value xml:lang="it">Spedizioni In Scatoloni ?</value>
         <value xml:lang="ru">В ящике?</value>
         <value 
xml:lang="th">ในกล่องการขนส่ง</value>
@@ -19089,7 +19093,7 @@
         <value xml:lang="de">Versteuerbar</value>
         <value xml:lang="en">Taxable</value>
         <value xml:lang="es">Imponible</value>
-        <value xml:lang="fr">Taxable</value>
+        <value xml:lang="fr">Taxable ?</value>
         <value xml:lang="it">Tassabile</value>
         <value xml:lang="ro">Taxabila</value>
         <value xml:lang="ru">Облагаемый налогом</value>
@@ -19889,7 +19893,7 @@
     <property key="ProductVariantProduct">
         <value xml:lang="en">Is VARIANT Product ?</value>
         <value xml:lang="es">Es producto VARIANTE?</value>
-        <value xml:lang="fr">C'est une variante ?</value>
+        <value xml:lang="fr">Est-ce une variante ?</value>
         <value xml:lang="it">E' un Prodotto con VARIANTE ?</value>
         <value xml:lang="ro">Este un Produs cu VARIANTE ?</value>
         <value xml:lang="ru">Это ВАРИАНТ продукта?</value>
@@ -19981,6 +19985,10 @@
         <value xml:lang="ru">У вас нет прав для 
просмотра этой страницы. (нужны права 
"CATALOG_VIEW" или "CATALOG_ADMIN")</value>
         <value 
xml:lang="th">คุณไม่ได้รับการอนุญาตในการแสดงหน้านี้.
 ("CATALOG_VIEW" หรือ "CATALOG_ADMIN" ต้องการ)</value>
         <value xml:lang="zh">你没有权限浏览本页面。 
(需要"CATALOG_VIEW" 或 "CATALOG_ADMIN")</value>
+    </property>    
+    <property key="ProductVirtualFieldGroup">
+        <value xml:lang="en">Virtual Product</value>
+        <value xml:lang="fr">Article virtuel</value>
     </property>
     <property key="ProductVirtualProduct">
         <value xml:lang="en">Is VIRTUAL Product ?</value>
@@ -20166,6 +20174,10 @@
         <value 
xml:lang="th">รหัสหน่วยวัดความกว้าง</value>
         <value xml:lang="zh">宽度度量单位标识</value>
     </property>
+    <property key="ProductWordingAndComment">
+        <value xml:lang="en">Wording And Comment</value>
+        <value xml:lang="fr">Libellés et commentaire</value>
+    </property>
     <property key="ProductWorkEffort">
         <value xml:lang="de">Arbeitseinsatz</value>
         <value xml:lang="en">Work Effort</value>

Modified: 
ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml?rev=730989&r1=730988&r2=730989&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml 
(original)
+++ ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml 
Sat Jan  3 06:28:16 2009
@@ -31,11 +31,11 @@
 
         <field use-when="product==null" name="isCreate"><hidden 
value="true"/></field>
 
-        <field use-when="product!=null" name="productId" 
title="${uiLabelMap.ProductProductId}" 
tooltip="&amp;nbsp;${uiLabelMap.ProductNotModificationRecreatingProduct}"><display/></field>
-        <field use-when="product==null&amp;&amp;productId==null" 
name="productId" title="${uiLabelMap.ProductProductId}"><text size="20" 
maxlength="20"/></field>
-        <field use-when="product==null&amp;&amp;productId!=null" 
name="productId" title="${uiLabelMap.ProductProductId}" 
tooltip="${uiLabelMap.ProductNotFindProductId} [${productId}]"><text size="20" 
maxlength="20"/></field>
+        <field position="1" use-when="product!=null" name="productId" 
title="${uiLabelMap.ProductProductId}" 
tooltip="&amp;nbsp;${uiLabelMap.ProductNotModificationRecreatingProduct}"><display/></field>
+        <field position="1" use-when="product==null&amp;&amp;productId==null" 
name="productId" title="${uiLabelMap.ProductProductId}"><text size="20" 
maxlength="20"/></field>
+        <field position="1" use-when="product==null&amp;&amp;productId!=null" 
name="productId" title="${uiLabelMap.ProductProductId}" 
tooltip="${uiLabelMap.ProductNotFindProductId} [${productId}]"><text size="20" 
maxlength="20"/></field>
 
-        <field name="productTypeId" title="${uiLabelMap.ProductProductType}">
+        <field position="2" name="productTypeId" 
title="${uiLabelMap.ProductProductType}">
             <drop-down no-current-selected-key="FINISHED_GOOD">
                 <entity-options entity-name="ProductType" 
description="${description}"> <!-- [${productTypeId}] -->
                     <entity-order-by field-name="description"/>
@@ -72,11 +72,12 @@
 
         <field position="1" name="introductionDate" 
title="${uiLabelMap.CommonIntroductionDate}" 
red-when="after-now"><date-time/></field>
         <field position="2" name="salesDiscontinuationDate" 
title="${uiLabelMap.ProductSalesThruDate}" 
red-when="before-now"><date-time/></field>
-        <field position="1" name="supportDiscontinuationDate" 
title="${uiLabelMap.ProductSupportThruDate}" 
red-when="before-now"><date-time/></field>
-        <field position="2" name="salesDiscWhenNotAvail" 
title="${uiLabelMap.ProductSalesDiscontinuationNotAvailable}">
-            <drop-down allow-empty="true"><option key="Y" 
description="${uiLabelMap.CommonY}"/><option key="N" 
description="${uiLabelMap.CommonN}"/></drop-down>
-        </field>
+        <field position="3" name="supportDiscontinuationDate" 
title="${uiLabelMap.ProductSupportThruDate}" 
red-when="before-now"><date-time/></field>
 
+        <!-- commented out in ShoppingCartItem.java -->
+        <!--field name="salesDiscWhenNotAvail" 
title="${uiLabelMap.ProductSalesDiscontinuationNotAvailable}">
+            <drop-down allow-empty="true"><option key="Y" 
description="${uiLabelMap.CommonY}"/><option key="N" 
description="${uiLabelMap.CommonN}"/></drop-down>
+            </field-->
         <field position="1" name="requirementMethodEnumId" 
title="${uiLabelMap.ProductRequirementMethodEnumId}"> 
             <drop-down allow-empty="true">
                 <entity-options entity-name="Enumeration" 
key-field-name="enumId" description="${description}">
@@ -89,7 +90,8 @@
         <field position="1" name="requireInventory" 
title="${uiLabelMap.ProductRequireInventory}" 
tooltip="${uiLabelMap.ProductInventoryRequiredProduct}">
             <drop-down allow-empty="true"><option key="Y" 
description="${uiLabelMap.CommonY}"/><option key="N" 
description="${uiLabelMap.CommonN}"/></drop-down>
         </field>
-        <field position="2" name="inventoryMessage" 
title="${uiLabelMap.ProductInventoryMessage}"><text size="20" 
maxlength="255"/></field>
+        <!-- Not used anywhere, moreover maybe replaced by 
cannot_add_product_no_longer_available in ShoppingCartItem.java (but commented 
out)-->
+        <!--field position="2" name="inventoryMessage" 
title="${uiLabelMap.ProductInventoryMessage}"><text size="20" 
maxlength="255"/></field-->
 
         <field position="1" name="ratingTypeEnum" 
title="${uiLabelMap.ProductRatingTypeEnum}">
             <drop-down allow-empty="true">
@@ -163,13 +165,19 @@
             </drop-down>
         </field>
         <field position="1" name="piecesIncluded" 
title="${uiLabelMap.ProductPiecesIncluded}"><text size="10" 
maxlength="20"/></field>
-        <field position="2" name="defaultShipmentBoxTypeId">
+        <field position="2" name="inShippingBox" 
title="${uiLabelMap.ProductShippingBox}">
+            <drop-down><option key="N" 
description="${uiLabelMap.CommonN}"/><option key="Y" 
description="${uiLabelMap.CommonY}"/></drop-down>
+        </field>
+        <field position="3" name="defaultShipmentBoxTypeId" 
title="${uiLabelMap.ProductDefaultShipmentBoxTypeId}">
             <drop-down allow-empty="true">
                 <entity-options entity-name="ShipmentBoxType" 
key-field-name="shipmentBoxTypeId" description="${description}">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
+        <field position="4" name="chargeShipping" 
title="${uiLabelMap.ProductChargeShipping}">
+            <drop-down allow-empty="true"><option key="Y" 
description="${uiLabelMap.CommonY}"/><option key="N" 
description="${uiLabelMap.CommonN}"/></drop-down>
+        </field>
 
         <field position="1" name="returnable" 
title="${uiLabelMap.ProductReturnable}">
             <drop-down allow-empty="true"><option key="Y" 
description="${uiLabelMap.CommonY}"/><option key="N" 
description="${uiLabelMap.CommonN}"/></drop-down>
@@ -178,21 +186,13 @@
             <drop-down allow-empty="true"><option key="Y" 
description="${uiLabelMap.CommonY}"/><option key="N" 
description="${uiLabelMap.CommonN}"/></drop-down>
         </field>
 
-        <field position="1" name="taxable" 
title="${uiLabelMap.ProductTaxable}">
+        <field position="3" name="taxable" 
title="${uiLabelMap.ProductTaxable}">
             <drop-down allow-empty="true"><option key="Y" 
description="${uiLabelMap.CommonY}"/><option key="N" 
description="${uiLabelMap.CommonN}"/></drop-down>
         </field>
-
-        <field position="1" name="chargeShipping" 
title="${uiLabelMap.ProductChargeShipping}">
+        <field position="4" name="autoCreateKeywords" 
title="${uiLabelMap.ProductAutoCreateKeywords}">
             <drop-down allow-empty="true"><option key="Y" 
description="${uiLabelMap.CommonY}"/><option key="N" 
description="${uiLabelMap.CommonN}"/></drop-down>
         </field>
-        <field position="2" name="autoCreateKeywords" 
title="${uiLabelMap.ProductAutoCreateKeywords}">
-            <drop-down allow-empty="true"><option key="Y" 
description="${uiLabelMap.CommonY}"/><option key="N" 
description="${uiLabelMap.CommonN}"/></drop-down>
-        </field>
-
-        <field position="3" name="inShippingBox" 
title="${uiLabelMap.ProductShippingBox}">
-            <drop-down><option key="N" 
description="${uiLabelMap.CommonN}"/><option key="Y" 
description="${uiLabelMap.CommonY}"/></drop-down>
-        </field>
-
+        
         <field name="contentInfoText" 
title="${uiLabelMap.ProductContentInfoText}" widget-style="tooltip">
             <display description="${uiLabelMap.ProductNoteForContentOptions}" 
also-hidden="false"/>
         </field>
@@ -215,6 +215,74 @@
         <field use-when="product!=null" position="2" name="createdByText" 
title="${uiLabelMap.ProductCreatedBy}:">
             <display description="[${product.createdByUserLogin}] 
${uiLabelMap.CommonOn} ${product.createdDate}" also-hidden="false"/>
         </field>
+        <sort-order>
+            <field-group>
+                <sort-field name="productId"/>
+                <sort-field name="productTypeId"/>
+            </field-group>
+            <field-group title="${uiLabelMap.ProductVirtualFieldGroup}" 
collapsible="true">
+                <sort-field name="isVirtual"/>
+                <sort-field name="isVariant"/>
+                <sort-field name="virtualVariantMethodEnum"/>
+            </field-group>
+            <field-group title="${uiLabelMap.ProductPrimaryCategory}" 
collapsible="true" initially-collapsed="true">
+                <sort-field name="primaryProductCategoryId"/>                
+            </field-group>
+            <field-group title="${uiLabelMap.ProductWordingAndComment}" 
collapsible="true" initially-collapsed="true">
+                <sort-field name="internalName"/>
+                <sort-field name="brandName"/>
+                <sort-field name="manufacturerPartyId"/>
+                <sort-field name="comments"/>
+            </field-group>
+            <field-group title="${uiLabelMap.CommonDates}" collapsible="true" 
initially-collapsed="true">
+                <sort-field name="introductionDate"/>
+                <sort-field name="salesDiscontinuationDate"/>
+                <sort-field name="supportDiscontinuationDate"/>
+            </field-group>
+            <field-group title="${uiLabelMap.CommonInventory}" 
collapsible="true" initially-collapsed="true">
+                <!--sort-field name="salesDiscWhenNotAvail"/--> <!-- commented 
out in ShoppingCartItem.java -->
+                <sort-field name="requirementMethodEnumId"/>
+                <sort-field name="requireInventory"/>
+                <sort-field name="inventoryMessage"/>                
+            </field-group>
+            <field-group title="${uiLabelMap.CommonRate}" collapsible="true" 
initially-collapsed="true">
+                <sort-field name="ratingTypeEnum"/>
+                <sort-field name="productRating"/>
+            </field-group>
+            <field-group title="${uiLabelMap.CommonAmount}" collapsible="true" 
initially-collapsed="true">
+                <sort-field name="requireAmount"/>
+                <sort-field name="amountUomTypeId"/>
+            </field-group>
+            <field-group title="${uiLabelMap.CommonMeasures}" 
collapsible="true" initially-collapsed="true">
+                <sort-field name="productHeight"/>
+                <sort-field name="heightUomId"/>
+                <sort-field name="shippingHeight"/>
+                <sort-field name="productWidth"/>
+                <sort-field name="widthUomId"/>
+                <sort-field name="shippingWidth"/>
+                <sort-field name="productDepth"/>                
+                <sort-field name="depthUomId"/>
+                <sort-field name="shippingDepth"/>
+                <sort-field name="weight"/>
+                <sort-field name="weightUomId"/>
+                <sort-field name="quantityIncluded"/>
+                <sort-field name="quantityUomId"/>
+                <sort-field name="quantityIncluded"/>
+                <sort-field name="quantityUomId"/>                
+            </field-group>
+            <field-group title="${uiLabelMap.CommonShipping}" 
collapsible="true" initially-collapsed="true">
+                <sort-field name="piecesIncluded"/>
+                <sort-field name="inShippingBox"/>
+                <sort-field name="defaultShipmentBoxTypeId"/>
+                <sort-field name="chargeShipping"/>
+            </field-group>
+            <field-group title="${uiLabelMap.CommonMiscellaneous}" 
collapsible="true" initially-collapsed="true">
+                <sort-field name="returnable"/>
+                <sort-field name="includeInPromotions"/>
+                <sort-field name="taxable"/>
+                <sort-field name="autoCreateKeywords"/>
+            </field-group>
+        </sort-order>
     </form>
     
     <form name="EditProductDup" type="single" target="DuplicateProduct" 
title="" default-map-name="product"

Modified: 
ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml?rev=730989&r1=730988&r2=730989&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml 
(original)
+++ ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml 
Sat Jan  3 06:28:16 2009
@@ -278,8 +278,7 @@
         <field name="reqReturnInventoryReceive">
             <drop-down allow-empty="true"><option key="Y" 
description="${uiLabelMap.CommonY}"/><option key="N" 
description="${uiLabelMap.CommonN}"/></drop-down>
         </field>
-        <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit 
button-type="button"/></field>
-        
+        <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit 
button-type="button"/></field>        
         <sort-order>
             <field-group>
                 <sort-field name="productStoreId"/>
@@ -380,8 +379,7 @@
             <field-group title="${uiLabelMap.CommonUpload}" collapsible="true" 
initially-collapsed="true">
                 <sort-field name="enableDigProdUpload"/>
                 <sort-field name="digProdUploadCategoryId"/>
-            </field-group>
-            
+            </field-group>            
         </sort-order>
     </form>
 

Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.xml?rev=730989&r1=730988&r2=730989&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonUiLabels.xml Sat Jan  3 06:28:16 
2009
@@ -1609,6 +1609,10 @@
         <value xml:lang="zh">日期过滤</value>
         <value xml:lang="zh_CN">日期过滤器</value>
     </property>
+    <property key="CommonDates">
+        <value xml:lang="en">Dates</value>
+        <value xml:lang="fr">Dates</value>
+    </property>
     <property key="CommonDay">
         <value xml:lang="ar">يوم</value>
         <value xml:lang="de">Tag</value>
@@ -3137,7 +3141,7 @@
         <value xml:lang="th">มิถุนายน</value>
         <value xml:lang="zh">六月</value>
         <value xml:lang="zh_CN">六月</value>
-    </property>
+    </property>    
     <property key="CommonLanguageTitle">
         <value xml:lang="ar">اللغة</value>
         <value xml:lang="cs">Jazyk</value>
@@ -3473,6 +3477,10 @@
         <value xml:lang="zh">你可以在这里新建账户</value>
         <value xml:lang="zh_CN">你可以在这里建立新的帐户</value>
     </property>
+    <property key="CommonMeasures">
+        <value xml:lang="en">Measures</value>
+        <value xml:lang="fr">Mesures</value>
+    </property>
     <property key="CommonMedium">
         <value xml:lang="ar">وسيط</value>
         <value xml:lang="de">Mittel</value>
@@ -3556,6 +3564,10 @@
         <value xml:lang="th">ทุกนาที</value>
         <value xml:lang="zh">每分钟</value>
     </property>
+    <property key="CommonMiscellaneous">
+        <value xml:lang="en">Miscellaneous</value>
+        <value xml:lang="fr">Divers</value>
+    </property>    
     <property key="CommonModify">
         <value xml:lang="ar">تغيير</value>
         <value xml:lang="de">Bearbeiten</value>

Reply via email to