svn commit: r730853 [1/4] - in /ofbiz/trunk/applications: accounting/config/ accounting/webapp/accounting/payment/ accounting/widget/ content/config/ humanres/config/ manufacturing/config/ order/config/ order/widget/ordermgr/ party/config/ product/conf...

Fri, 02 Jan 2009 14:29:05 -0800 

Author: mrisaliti
Date: Fri Jan  2 14:28:35 2009
New Revision: 730853

URL: http://svn.apache.org/viewvc?rev=730853&view=rev
Log:
A lot of Product labels renamed/moved or merged (Part of OFBIZ-1780).

Modified:
    ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
    ofbiz/trunk/applications/accounting/webapp/accounting/payment/manualTx.ftl
    ofbiz/trunk/applications/accounting/widget/Menus.xml
    ofbiz/trunk/applications/accounting/widget/PaymentMethodTypeScreens.xml
    ofbiz/trunk/applications/accounting/widget/TransactionForms.xml
    ofbiz/trunk/applications/content/config/ContentUiLabels.xml
    ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml
    
ofbiz/trunk/applications/manufacturing/config/ManufacturingReportsUiLabels.xml
    ofbiz/trunk/applications/order/config/OrderUiLabels.xml
    ofbiz/trunk/applications/order/widget/ordermgr/ReportForms.xml
    ofbiz/trunk/applications/party/config/PartyUiLabels.xml
    ofbiz/trunk/applications/product/config/ProductEntityLabels.xml
    ofbiz/trunk/applications/product/config/ProductErrorUiLabels.xml
    ofbiz/trunk/applications/product/config/ProductUiLabels.xml
    
ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductUomFormulas.xml
    
ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductEvents.java
    
ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearch.java
    
ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearchEvents.java
    
ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java
    
ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductUtilServices.java
    
ofbiz/trunk/applications/product/src/org/ofbiz/product/product/VariantEvents.java
    ofbiz/trunk/applications/product/webapp/catalog/category/EditCategory.ftl
    
ofbiz/trunk/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl
    ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml
    ofbiz/trunk/applications/product/webapp/catalog/reviews/pendingReviews.ftl
    ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml
    ofbiz/trunk/applications/product/webapp/facility/facility/PickMoveStock.ftl
    ofbiz/trunk/applications/product/webapp/facility/facility/Picklist.fo.ftl
    ofbiz/trunk/applications/product/webapp/facility/facility/PicklistManage.ftl
    
ofbiz/trunk/applications/product/webapp/facility/facility/PicklistOptions.ftl
    
ofbiz/trunk/applications/product/webapp/facility/shipment/AddItemsFromOrder.ftl
    ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl
    ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml
    ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml
    ofbiz/trunk/applications/product/widget/catalog/Menus.xml
    ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml
    ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml
    ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml

Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=730853&r1=730852&r2=730853&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Fri Jan  
2 14:28:35 2009
@@ -5603,19 +5603,6 @@
         <value 
xml:lang="th">ข้อมูลวิธีการชำระเงิน</value>
         <value xml:lang="zh">支付方法信息</value>
     </property>
-    <property key="AccountingPaymentMethodType">
-        <value xml:lang="ar">نوع طريقة التسديد</value>
-        <value xml:lang="de">Zahlungsmethode Typ</value>
-        <value xml:lang="en">Payment Method Type</value>
-        <value xml:lang="es">Tipo Metodo de Pago</value>
-        <value xml:lang="fr">Type de méthode de paiement</value>
-        <value xml:lang="it">Tipo Metodo Pagamento</value>
-        <value xml:lang="nl">Type betaalmethode</value>
-        <value xml:lang="ro">Tip Metoda Plata.</value>
-        <value xml:lang="ru">Тип способа платежа</value>
-        <value 
xml:lang="th">ประเภทวิธีการชำระเงิน</value>
-        <value xml:lang="zh">支付方法类型</value>
-    </property>
     <property key="AccountingPaymentMethodTypeNotHandled">
         <value xml:lang="en">Payment method not handled paymentMethodTypeId 
:</value>
         <value xml:lang="it">Metodo di pagamento non trattato :</value>
@@ -5666,17 +5653,6 @@
         <value 
xml:lang="th">รูปแบบการชำระเงิน</value>
         <value xml:lang="zh">支付参数</value>
     </property>
-    <property key="AccountingPaymentProps">
-        <value xml:lang="de">Zahlung Einstellungen</value>
-        <value xml:lang="en">Payment Props</value>
-        <value xml:lang="es">Propiedades de Pago</value>
-        <value xml:lang="fr">Propriétés du paiement</value>
-        <value xml:lang="it">Prop. Pagamento</value>
-        <value xml:lang="ro">Prop. Plata</value>
-        <value xml:lang="ru">Свойства платежа</value>
-        <value 
xml:lang="th">รูปแบบการชำระเงิน</value>
-        <value xml:lang="zh">支付参数</value>
-    </property>
     <property key="AccountingPaymentReceiveViaPayPal">
         <value xml:lang="en">Payment receive via PayPal</value>
         <value xml:lang="fr">Paiement reçu par PayPal</value>
@@ -5695,21 +5671,6 @@
         <value xml:lang="th">ไม่พบการชำระเงิน 
[${paymentId}]</value>
         <value 
xml:lang="zh">没有找到支付[${paymentId}]的记录...</value>
     </property>
-    <property key="AccountingPayments">
-        <value xml:lang="ar">التسديدات</value>
-        <value xml:lang="de">Zahlungen</value>
-        <value xml:lang="en">Payments</value>
-        <value xml:lang="es">Pagos</value>
-        <value xml:lang="fr">Paiements</value>
-        <value xml:lang="it">Pagamenti</value>
-        <value xml:lang="nl">Betalingen</value>
-        <value xml:lang="pt_BR">Pagamentos</value>
-        <value xml:lang="pt_PT">Pagamentos</value>
-        <value xml:lang="ro">Plati</value>
-        <value xml:lang="ru">Платежи</value>
-        <value xml:lang="th">การชำระเงิน</value>
-        <value xml:lang="zh">支付</value>
-    </property>
     <property key="AccountingPaymentsApplied">
         <value xml:lang="ar">التسديدات المطبقة</value>
         <value xml:lang="en">Payments Applied</value>

Modified: 
ofbiz/trunk/applications/accounting/webapp/accounting/payment/manualTx.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/payment/manualTx.ftl?rev=730853&r1=730852&r2=730853&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/payment/manualTx.ftl 
(original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/payment/manualTx.ftl 
Fri Jan  2 14:28:35 2009
@@ -29,7 +29,7 @@
 
     <table border='0' cellpadding='2' cellspacing='0'>
       <tr>
-        <td width="26%" align="right" 
valign="middle"><b>${uiLabelMap.AccountingPaymentMethodType}</b></td>
+        <td width="26%" align="right" 
valign="middle"><b>${uiLabelMap.CommonPaymentMethodType}</b></td>
         <td width="5">&nbsp;</td>
         <td width='74%'>
           <#if paymentMethodType?has_content>

Modified: ofbiz/trunk/applications/accounting/widget/Menus.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/Menus.xml?rev=730853&r1=730852&r2=730853&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/Menus.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/Menus.xml Fri Jan  2 14:28:35 
2009
@@ -571,7 +571,7 @@
         <menu-item name="Costs" title="${uiLabelMap.ManufacturingCostCalcs}">
             <link target="EditCostCalcs"/>
         </menu-item>  
-        <menu-item name="PaymentMethodTypes" 
title="${uiLabelMap.AccountingPaymentMethodType}">
+        <menu-item name="PaymentMethodTypes" 
title="${uiLabelMap.CommonPaymentMethodType}">
             <link target="editPaymentMethodType"/>
         </menu-item> 
         <menu-item name="InvoiceItemTypes" 
title="${uiLabelMap.AccountingInvoiceItemType}">
@@ -647,7 +647,7 @@
         <menu-item name="BillingAccountInvoices" 
title="${uiLabelMap.AccountingInvoices}">
             <link 
target="BillingAccountInvoices?billingAccountId=${billingAccount.billingAccountId}"/>
         </menu-item>
-        <menu-item name="BillingAccountPayments" 
title="${uiLabelMap.AccountingPayments}">
+        <menu-item name="BillingAccountPayments" 
title="${uiLabelMap.CommonPayments}">
             <link 
target="BillingAccountPayments?billingAccountId=${billingAccount.billingAccountId}"/>
         </menu-item>
         <menu-item name="BillingAccountOrders" 
title="${uiLabelMap.AccountingOrders}">

Modified: 
ofbiz/trunk/applications/accounting/widget/PaymentMethodTypeScreens.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentMethodTypeScreens.xml?rev=730853&r1=730852&r2=730853&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentMethodTypeScreens.xml 
(original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentMethodTypeScreens.xml Fri 
Jan  2 14:28:35 2009
@@ -25,7 +25,7 @@
         <section>
             <actions>
                 <set field="tabButtonItem" value="PaymentMethodTypes"/>
-                <set field="titleProperty" 
value="AccountingPaymentMethodType"/>
+                <set field="titleProperty" value="CommonPaymentMethodType"/>
                 <set field="viewIndex" from-field="parameters.VIEW_INDEX" 
type="Integer" default-value="0"/>
                 <set field="viewSize" from-field="parameters.VIEW_SIZE" 
type="Integer" default-value="10"/>
                 <entity-condition entity-name="PaymentMethodType" 
list-name="paymentMethodTypes">

Modified: ofbiz/trunk/applications/accounting/widget/TransactionForms.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/TransactionForms.xml?rev=730853&r1=730852&r2=730853&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/TransactionForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/TransactionForms.xml Fri Jan  2 
14:28:35 2009
@@ -80,7 +80,7 @@
         header-row-style="header-row" default-table-style="basic-table">
         <field name="orderId"><text/></field>
         <field name="orderPaymentPreferenceId"><text/></field>
-        <field name="paymentMethodTypeId" 
title="${uiLabelMap.AccountingPaymentMethodType}">
+        <field name="paymentMethodTypeId" 
title="${uiLabelMap.CommonPaymentMethodType}">
             <drop-down allow-empty="false">
                 <entity-options entity-name="PaymentMethodType" 
description="${description}"/>
             </drop-down>
@@ -94,7 +94,7 @@
         header-row-style="header-row" default-table-style="basic-table">
         <field name="orderId"><text/></field>
         <field name="orderPaymentPreferenceId"><text/></field>
-        <field name="paymentMethodTypeId" 
title="${uiLabelMap.AccountingPaymentMethodType}">
+        <field name="paymentMethodTypeId" 
title="${uiLabelMap.CommonPaymentMethodType}">
             <drop-down allow-empty="false">
                 <entity-options entity-name="PaymentMethodType" 
description="${description}"/>
             </drop-down>

Modified: ofbiz/trunk/applications/content/config/ContentUiLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/config/ContentUiLabels.xml?rev=730853&r1=730852&r2=730853&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/config/ContentUiLabels.xml (original)
+++ ofbiz/trunk/applications/content/config/ContentUiLabels.xml Fri Jan  2 
14:28:35 2009
@@ -17,7 +17,8 @@
     KIND, either express or implied.  See the License for the
     specific language governing permissions and limitations
     under the License.
---><resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+-->
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
     <property key="ContentAnswer">
         <value xml:lang="ar">الجواب</value>
         <value xml:lang="de">Antwort</value>
@@ -865,36 +866,6 @@
         <value xml:lang="th">AcroForm (PDF) Content ID</value>
         <value xml:lang="zh">AcroForm (PDF)内容标识</value>
     </property>
-    <property key="FormFieldTitle_allowMultiple">
-        <value xml:lang="ar">السماح بالتعدد</value>
-        <value xml:lang="de">Mehrere Erlauben</value>
-        <value xml:lang="en">Allow Multiple</value>
-        <value xml:lang="fr">Permettre la multiplicité</value>
-        <value xml:lang="it">Permette Multipli</value>
-        <value xml:lang="ro">Permite Multipli</value>
-        <value 
xml:lang="th">ยินยอมให้ทำหลายอย่างได้</value>
-        <value xml:lang="zh">允许多个</value>
-    </property>
-    <property key="FormFieldTitle_allowProductStoreChange">
-        <value xml:lang="ar">السماح بتغيير المتجر</value>
-        <value xml:lang="de">Produktladen wechseln erlauben</value>
-        <value xml:lang="en">Allow Product Store Change</value>
-        <value xml:lang="fr">Permettre le changement de centre de 
profit</value>
-        <value xml:lang="it">Permetti Cambio Negozio</value>
-        <value xml:lang="ro">Permisie Schimb Magazin</value>
-        <value 
xml:lang="th">อนุญาตให้แก้ไขคลังสินค้าได้</value>
-        <value xml:lang="zh">允许产品店铺修改</value>
-    </property>
-    <property key="FormFieldTitle_allowUpdate">
-        <value xml:lang="ar">السماح بالتحديث</value>
-        <value xml:lang="de">Aktualisierung erlauben</value>
-        <value xml:lang="en">Allow Update</value>
-        <value xml:lang="fr">Permettre la mise à jour</value>
-        <value xml:lang="it">Permette Aggiornamenti</value>
-        <value xml:lang="ro">Permite Actualizari</value>
-        <value 
xml:lang="th">อนุญาตให้เปลี่ยนแปลงได้</value>
-        <value xml:lang="zh">允许更新</value>
-    </property>
     <property key="FormFieldTitle_amountBase">
         <value xml:lang="ar">قاعدة المبلغ</value>
         <value xml:lang="de">Basisbetrag</value>
@@ -925,26 +896,6 @@
         <value 
xml:lang="th">วันที่ลงความเห็น</value>
         <value xml:lang="zh">批准日期</value>
     </property>
-    <property key="FormFieldTitle_attrName">
-        <value xml:lang="ar">اسم الخاصية</value>
-        <value xml:lang="de">Attributnamen</value>
-        <value xml:lang="en">Attr Name</value>
-        <value xml:lang="fr">Nom d'attribut</value>
-        <value xml:lang="it">Nome Attributo</value>
-        <value xml:lang="ro">Nume Atribut</value>
-        <value xml:lang="th">ชื่อลักษณะ</value>
-        <value xml:lang="zh">属性名称</value>
-    </property>
-    <property key="FormFieldTitle_attrValue">
-        <value xml:lang="ar">قيمة الخاصية</value>
-        <value xml:lang="de">Attributwert</value>
-        <value xml:lang="en">Attr Value</value>
-        <value xml:lang="fr">Valeur d'attribut</value>
-        <value xml:lang="it">Valore Attributo</value>
-        <value xml:lang="ro">Valoare Atribut</value>
-        <value xml:lang="th">ลักษณะ</value>
-        <value xml:lang="zh">属性值</value>
-    </property>
     <property key="FormFieldTitle_caContentAssocPredicateId">
         <value xml:lang="ar">تعريف توقعة ارتباط 
المحتوى</value>
         <value xml:lang="de">Inhalt Zuordnung Prädikat ID</value>
@@ -955,16 +906,6 @@
         <value 
xml:lang="th">รหัสหัวข้อแสดงความคิดเห็น</value>
         <value xml:lang="zh">内容关联谓词标识</value>
     </property>
-    <property key="FormFieldTitle_caContentAssocTypeId">
-        <value xml:lang="ar">تعريف نوع الارتباط</value>
-        <value xml:lang="de">Zuordnungstyp ID</value>
-        <value xml:lang="en">Assoc Type Id</value>
-        <value xml:lang="fr">Réf. de type d'association</value>
-        <value xml:lang="it">Tipo Associazione</value>
-        <value xml:lang="ro">Tip Asociatie</value>
-        <value 
xml:lang="th">รหัสประเภทกลุ่มความคิดเห็น</value>
-        <value xml:lang="zh">关联类型标识</value>
-    </property>
     <property key="FormFieldTitle_caContentIdTo">
         <value xml:lang="ar">المحتوى إلى</value>
         <value xml:lang="de">Inhalt ID zu</value>
@@ -992,26 +933,6 @@
         <value xml:lang="th">แผนที่สำคัญ</value>
         <value xml:lang="zh">变换键</value>
     </property>
-    <property key="FormFieldTitle_categoryName">
-        <value xml:lang="ar">اسم الفئة</value>
-        <value xml:lang="de">Kategorienname</value>
-        <value xml:lang="en">Category Name</value>
-        <value xml:lang="fr">Nom de catégorie</value>
-        <value xml:lang="it">Nome Categoria</value>
-        <value xml:lang="ro">Nume Categorie</value>
-        <value xml:lang="th">ชื่อหมวดหมู่</value>
-        <value xml:lang="zh">分类名称</value>
-    </property>
-    <property key="FormFieldTitle_characterSetId">
-        <value xml:lang="ar">تعريف مجموعة الحروف</value>
-        <value xml:lang="de">Zeichensatz ID</value>
-        <value xml:lang="en">Character Set Id</value>
-        <value xml:lang="fr">Réf. de jeu de caractères</value>
-        <value xml:lang="it">Set di Caratteri</value>
-        <value xml:lang="ro">Set de Caractere</value>
-        <value xml:lang="th">รหัสเซ็ตลักษณะ</value>
-        <value xml:lang="zh">字符集标识</value>
-    </property>
     <property key="FormFieldTitle_childBranchCount">
         <value xml:lang="ar">عدد الفروع</value>
         <value xml:lang="de">Zähler untergeordnete Verzweigungen</value>
@@ -1042,16 +963,6 @@
         <value xml:lang="th">ชื่อคอลัมน์</value>
         <value xml:lang="zh">列标题</value>
     </property>
-    <property key="FormFieldTitle_comments">
-        <value xml:lang="ar">تعاليق</value>
-        <value xml:lang="de">Anmerkungen</value>
-        <value xml:lang="en">Comments</value>
-        <value xml:lang="fr">Commentaires</value>
-        <value xml:lang="it">Commenti</value>
-        <value xml:lang="ro">Comentarii</value>
-        <value xml:lang="th">ข้อคิดเห็น</value>
-        <value xml:lang="zh">评论</value>
-    </property>
     <property key="FormFieldTitle_committedByPartyId">
         <value xml:lang="ar">مرتكبة من طرف</value>
         <value xml:lang="de">Eingebracht von Akteur ID</value>
@@ -1096,9 +1007,12 @@
         <value xml:lang="ar">تعريف المحتوى</value>
         <value xml:lang="de">Inhalt ID</value>
         <value xml:lang="en">Content Id</value>
+        <value xml:lang="es">Código de contenido</value>
         <value xml:lang="fr">Réf. de contenu</value>
         <value xml:lang="it">Contenuto</value>
+        <value xml:lang="nl">Content-ID</value>
         <value xml:lang="ro">Continut</value>
+        <value xml:lang="ru">Код контента</value>
         <value xml:lang="th">รหัสหัวข้อ</value>
         <value xml:lang="zh">内容标识</value>
     </property>
@@ -1126,9 +1040,11 @@
         <value xml:lang="ar">اسم المحتوى</value>
         <value xml:lang="de">Inhalt Name</value>
         <value xml:lang="en">Content Name</value>
+        <value xml:lang="es">Nombre de contenido</value>
         <value xml:lang="fr">Nom de contenu</value>
-        <value xml:lang="it">Nome Contenuto</value>
+        <value xml:lang="it">Nome contenuto</value>
         <value xml:lang="ro">Nume Continut</value>
+        <value xml:lang="ru">Имя контента</value>
         <value xml:lang="th">ชื่อหัวข้อ</value>
         <value xml:lang="zh">内容名称</value>
     </property>
@@ -1166,9 +1082,11 @@
         <value xml:lang="ar">تعريف نوع هدف المحتوى</value>
         <value xml:lang="de">Inhalt Zweck Typ ID</value>
         <value xml:lang="en">Content Purpose Type Id</value>
+        <value xml:lang="es">Código Propósito de contenido</value>
         <value xml:lang="fr">Type de but de contenu</value>
-        <value xml:lang="it">Tipo Funzione Contenuto</value>
+        <value xml:lang="it">Tipo funzione contenuto</value>
         <value xml:lang="ro">Tip Functie Continut</value>
+        <value xml:lang="ru">Код типа назначения 
контента</value>
         <value 
xml:lang="th">รหัสประเภทหัวข้อวัตถุประสงค์</value>
         <value xml:lang="zh">内容目的类型标识</value>
     </property>
@@ -1186,9 +1104,11 @@
         <value xml:lang="ar">نوع المحتوى</value>
         <value xml:lang="de">Inhaltstyp</value>
         <value xml:lang="en">Content Type</value>
+        <value xml:lang="es">Tipo de contenido</value>
         <value xml:lang="fr">Type de contenu</value>
-        <value xml:lang="it">Tipo Contenuto</value>
+        <value xml:lang="it">Tipo contenuto</value>
         <value xml:lang="ro">Tip Continut</value>
+        <value xml:lang="ru">Тип контента</value>
         <value xml:lang="th">ประเภทหัวข้อ</value>
         <value xml:lang="zh">内容类型</value>
     </property>
@@ -1196,9 +1116,11 @@
         <value xml:lang="ar"> تعريف نوع المحتوى</value>
         <value xml:lang="de">Inhaltstyp ID</value>
         <value xml:lang="en">Content Type Id</value>
+        <value xml:lang="es">Código Tipo de contenido</value>
         <value xml:lang="fr">Réf. de type de contenu</value>
         <value xml:lang="it">Tipo Contenuto</value>
         <value xml:lang="ro">Tip Continut</value>
+        <value xml:lang="ru">Код типа контента</value>
         <value 
xml:lang="th">รหัสประเภทหัวข้อ</value>
         <value xml:lang="zh">内容类型标识</value>
     </property>
@@ -1206,9 +1128,11 @@
         <value xml:lang="ar">مجال الكوكي</value>
         <value xml:lang="de">Domain Cookie</value>
         <value xml:lang="en">Domain Cookie</value>
+        <value xml:lang="es">Dominio de cookie</value>
         <value xml:lang="fr">Cookie de domaine</value>
-        <value xml:lang="it">Dominio Cookie</value>
+        <value xml:lang="it">Dominio cookie</value>
         <value xml:lang="ro">Domeniu Cookie</value>
+        <value xml:lang="ru">Cookie домен</value>
         <value xml:lang="th">ขอบเขตบุคคล</value>
         <value xml:lang="zh">对域启用Cookie</value>
     </property>
@@ -1343,15 +1267,6 @@
         <value 
xml:lang="th">ยับยั้งสิ่งที่มีอยู่</value>
         <value xml:lang="zh">令已存在的无效</value>
     </property>
-    <property key="CommonDescription">
-        <value xml:lang="ar">وصف</value>
-        <value xml:lang="de">Beschreibung</value>
-        <value xml:lang="en">Description</value>
-        <value xml:lang="it">Descrizione</value>
-        <value xml:lang="ro">Descriere</value>
-        <value xml:lang="th">รายละเอียด</value>
-        <value xml:lang="zh">描述</value>
-    </property>
     <property key="FormFieldTitle_displayFailCond">
         <value xml:lang="ar">عرض ظروف الإخفاق</value>
         <value xml:lang="de">Grund für fehlschlagen anzeigen</value>

Modified: ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml?rev=730853&r1=730852&r2=730853&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml (original)
+++ ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml Fri Jan  2 
14:28:35 2009
@@ -17,7 +17,8 @@
     KIND, either express or implied.  See the License for the
     specific language governing permissions and limitations
     under the License.
---><resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+-->
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
     <property key="FormFieldTitle_accountNumber">
         <value xml:lang="en">Account Number</value>
         <value xml:lang="fr">N° de compte</value>
@@ -60,12 +61,6 @@
         <value xml:lang="it">Soggetto Applicato</value>
         <value 
xml:lang="th">รหัสกลุ่มผู้ใช้</value>
     </property>
-    <property key="FormFieldTitle_availableTime">
-        <value xml:lang="en">Available Time</value>
-        <value xml:lang="fr">Temps disponible</value>
-        <value xml:lang="it">Tempo Disponibile</value>
-        <value xml:lang="th">เวลาที่มีอยู่</value>
-    </property>
     <property key="FormFieldTitle_bankName">
         <value xml:lang="en">Bank Name</value>
         <value xml:lang="fr">Nom de la banque</value>
@@ -102,18 +97,6 @@
         <value xml:lang="it">Tipo Budget</value>
         <value 
xml:lang="th">รหัสประเภทงบประมาณ</value>
     </property>
-    <property key="FormFieldTitle_comments">
-        <value xml:lang="en">Comments</value>
-        <value xml:lang="fr">Commentaires</value>
-        <value xml:lang="it">Commenti</value>
-        <value xml:lang="th">ความคิดเห็น</value>
-    </property>
-    <property key="FormFieldTitle_cost">
-        <value xml:lang="en">Cost</value>
-        <value xml:lang="fr">Coût</value>
-        <value xml:lang="it">Costo</value>
-        <value xml:lang="th">ราคา</value>
-    </property>
     <property key="FormFieldTitle_customTimePeriodId">
         <value xml:lang="en">Custom Time Period Id</value>
         <value xml:lang="fr">Réf. de période de temps adaptée</value>

Modified: 
ofbiz/trunk/applications/manufacturing/config/ManufacturingReportsUiLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/config/ManufacturingReportsUiLabels.xml?rev=730853&r1=730852&r2=730853&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/manufacturing/config/ManufacturingReportsUiLabels.xml 
(original)
+++ 
ofbiz/trunk/applications/manufacturing/config/ManufacturingReportsUiLabels.xml 
Fri Jan  2 14:28:35 2009
@@ -99,15 +99,6 @@
         <value xml:lang="th">แบบจำลอง</value>
         <value xml:lang="zh">模型</value>
     </property>
-    <property key="CommonNote">
-        <value xml:lang="en">Note</value>
-        <value xml:lang="es">Nota</value>
-        <value xml:lang="fr">Note</value>
-        <value xml:lang="it">Annotazioni</value>
-        <value xml:lang="ro">Anotari</value>
-        <value xml:lang="th">หมายเหตุ</value>
-        <value xml:lang="zh">便笺</value>
-    </property>
     <property key="CommonPrintoutDate">
         <value xml:lang="en">Printout Date</value>
         <value xml:lang="es">Fecha de Impresión</value>

Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels.xml?rev=730853&r1=730852&r2=730853&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderUiLabels.xml (original)
+++ ofbiz/trunk/applications/order/config/OrderUiLabels.xml Fri Jan  2 14:28:35 
2009
@@ -46,18 +46,6 @@
         <value 
xml:lang="th">ใบเสร็จถึงรหัสกลุ่มลูกค้า</value>
         <value xml:lang="zh">账单记入客户会员标识</value>
     </property>
-    <property key="FormFieldTitle_carrierPartyId">
-        <value xml:lang="de">Spediteur Akteur ID</value>
-        <value xml:lang="en">Carrier Party Id</value>
-        <value xml:lang="es">Código Transportista</value>
-        <value xml:lang="fr">Réf. de transporteur</value>
-        <value xml:lang="it">Codice Corriere</value>
-        <value xml:lang="nl">Vervoerder Id</value>
-        <value xml:lang="ro">Cod Curier</value>
-        <value xml:lang="ru">Код перевозчика</value>
-        <value 
xml:lang="th">รหัสกลุ่มผู้ส่ง</value>
-        <value xml:lang="zh">送货人会员标识</value>
-    </property>
     <property key="FormFieldTitle_carrierRoleTypeId">
         <value xml:lang="de">Spediteur Rollentyp ID</value>
         <value xml:lang="en">Carrier Role Type Id</value>
@@ -1692,6 +1680,14 @@
         <value xml:lang="th">เงินด่วน</value>
         <value xml:lang="zh">货到付款</value>
     </property>
+    <property key="OrderCalculatedMarkup">
+        <value xml:lang="de">Berechneter Aufschlag</value>
+        <value xml:lang="en">Calculated Markup</value>
+        <value xml:lang="es">Margen calculado</value>
+        <value xml:lang="fr">Marge bénéficiaire calculée</value>
+        <value xml:lang="it">Markup calcolato</value>
+        <value 
xml:lang="th">การคำนวนราคาที่เพิ่มขึ้น</value>
+    </property>
     <property key="OrderCalculatedOffline">
         <value xml:lang="en">Calculated Offline</value>
         <value xml:lang="es">Calculado sin conexión</value>
@@ -6118,6 +6114,14 @@
         <value xml:lang="zh">扣留的销售支付明细 (包括促销)</value>
         <value xml:lang="zh_CN">为支付的销售项 (包括促销)</value>
     </property>
+    <property key="OrderPercentageMarkup">
+        <value xml:lang="de">Prozent Zuschlag</value>
+        <value xml:lang="en">Percentage Markup</value>
+        <value xml:lang="es">Porcentaje de margen</value>
+        <value xml:lang="fr">Pourcentage de marge bénéficiaire</value>
+        <value xml:lang="it">Markup Percentuale</value>
+        <value 
xml:lang="th">เพิ่มราคาอัตราร้อยละ</value>
+    </property>
     <property key="OrderPickOrders">
         <value xml:lang="de">Aufträge komissionieren</value>
         <value xml:lang="en">Pick Orders</value>

Modified: ofbiz/trunk/applications/order/widget/ordermgr/ReportForms.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/ReportForms.xml?rev=730853&r1=730852&r2=730853&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/ReportForms.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/ReportForms.xml Fri Jan  2 
14:28:35 2009
@@ -146,8 +146,8 @@
         <field name="listPrice" 
title="${uiLabelMap.ProductListPrice}"><display/></field>
         <field name="retailPrice" 
title="${uiLabelMap.ProductRetailPrice}"><display/></field>
         <field name="discount" 
title="${uiLabelMap.ProductDiscount}"><display/></field>
-        <field name="calculatedMarkup" 
title="${uiLabelMap.CalculatedMarkup}"><display/></field>
-        <field name="percentMarkup" 
title="${uiLabelMap.PercentageMarkup}"><display/></field>
+        <field name="calculatedMarkup" 
title="${uiLabelMap.OrderCalculatedMarkup}"><display/></field>
+        <field name="percentMarkup" 
title="${uiLabelMap.OrderPercentageMarkup}"><display/></field>
     </form>
     
     <form name="OpenOrderItemsTotal" type="list" list-name="totalAmountList" 

Modified: ofbiz/trunk/applications/party/config/PartyUiLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/config/PartyUiLabels.xml?rev=730853&r1=730852&r2=730853&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/config/PartyUiLabels.xml (original)
+++ ofbiz/trunk/applications/party/config/PartyUiLabels.xml Fri Jan  2 14:28:35 
2009
@@ -63,29 +63,6 @@
         <value xml:lang="en">Annual revenue</value>
         <value xml:lang="es">Ingresos anuales</value>
     </property>
-    <property key="FormFieldTitle_attrName">
-        <value xml:lang="de">Attribut Name</value>
-        <value xml:lang="en">Attr Name</value>
-        <value xml:lang="fr">Nom d'attribut</value>
-        <value xml:lang="it">Nome Attributo</value>
-        <value xml:lang="nl">Attr. naam</value>
-        <value xml:lang="ro">Nume Atribut</value>
-        <value xml:lang="ru">Имя аттр.</value>
-        <value xml:lang="th">ชื่อ</value>
-        <value xml:lang="zh">属性名称</value>
-    </property>
-    <property key="FormFieldTitle_attrValue">
-        <value xml:lang="de">Attribut Wert</value>
-        <value xml:lang="en">Attr Value</value>
-        <value xml:lang="es">Valor de atributo</value>
-        <value xml:lang="fr">Valeur de l'attribut</value>
-        <value xml:lang="it">Valore Attributo</value>
-        <value xml:lang="nl">Attr. waarde</value>
-        <value xml:lang="ro">Valoare Atribut</value>
-        <value xml:lang="ru">Знач. аттр.</value>
-        <value xml:lang="th">ค่า</value>
-        <value xml:lang="zh">属性值</value>
-    </property>
     <property key="FormFieldTitle_birthDate">
         <value xml:lang="de">Geburtsdatum</value>
         <value xml:lang="en">Birth Date</value>
@@ -146,16 +123,17 @@
         <value xml:lang="ru">Обычное имя</value>
         <value xml:lang="th">ชื่อ</value>
     </property>
+    
     <property key="FormFieldTitle_communicationEventId">
-        <value xml:lang="de">Kommunkationsereignis ID</value>
-        <value xml:lang="en">communication Event Id</value>
+        <value xml:lang="de">Kommunikationsereignis ID</value>
+        <value xml:lang="en">Communication Event Id</value>
         <value xml:lang="es">Código Evento de comunicación</value>
-        <value xml:lang="fr">Réf. évènement de communication</value>
-        <value xml:lang="it">Evento Comunicazione</value>
-        <value xml:lang="nl">ID communicatie-actie</value>
-        <value xml:lang="ro">Code Eveniment Comunicare</value>
-        <value xml:lang="ru">Код коммуникационного 
события</value>
-        <value 
xml:lang="th">รหัสผลการติดต่อสื่อสาร</value>
+        <value xml:lang="fr">Réf. d'évènement de communication</value>
+        <value xml:lang="it">Codice evento comunicazioni</value>
+        <value xml:lang="nl">Communication Event Id</value>
+        <value xml:lang="ro">Cod Eveniment Comunicatii i</value>
+        <value xml:lang="ru">Код события связи</value>
+        <value 
xml:lang="th">รหัสผลลัพธ์การติดต่อสื่อสาร</value>
         <value xml:lang="zh">沟通事件标识</value>
     </property>
     <property key="FormFieldTitle_communicationEventPrpTypId">
@@ -175,7 +153,7 @@
         <value xml:lang="en">Comm.Type Id</value>
         <value xml:lang="es">Código Tipo de evento de comunicación</value>
         <value xml:lang="fr">Réf. de type d'évènement de 
communication</value>
-        <value xml:lang="it">Tipo Evento Communicazioni</value>
+        <value xml:lang="it">Tipo evento communicazioni</value>
         <value xml:lang="nl">Soort communicatie-actie</value>
         <value xml:lang="ro">Tip Eveniment Comunicatii</value>
         <value xml:lang="ru">Код типа 
коммуникационного события</value>
@@ -230,18 +208,6 @@
         <value 
xml:lang="th">รหัสประเภทการติดต่อการทำงาน</value>
         <value xml:lang="zh">联系方式类型标识</value>
     </property>
-    <property key="FormFieldTitle_contentId">
-        <value xml:lang="de">Inhalt ID</value>
-        <value xml:lang="en">Content Id</value>
-        <value xml:lang="es">Código Contenido</value>
-        <value xml:lang="fr">Réf. de contenu</value>
-        <value xml:lang="it">Codice Contenuto</value>
-        <value xml:lang="nl">Content-ID</value>
-        <value xml:lang="ro">Cod Contenut</value>
-        <value xml:lang="ru">Код контента</value>
-        <value xml:lang="th">รหัสหัวข้อ</value>
-        <value xml:lang="zh">内容标识</value>
-    </property>
     <property key="FormFieldTitle_contentMimeTypeId">
         <value xml:lang="de">Inhalt Mime Typ ID</value>
         <value xml:lang="en">Content Mime Type Id</value>
@@ -253,18 +219,6 @@
         <value 
xml:lang="th">รหัสประเภทสำเนาหัวข้อ</value>
         <value xml:lang="zh">内容Mime类型标识</value>
     </property>
-    <property key="FormFieldTitle_contentName">
-        <value xml:lang="de">Inhalt Name</value>
-        <value xml:lang="en">Content Name</value>
-        <value xml:lang="es">Nombre de contenido</value>
-        <value xml:lang="fr">Nom de contenu</value>
-        <value xml:lang="it">Nome Contenuto</value>
-        <value xml:lang="nl">Contentnaam</value>
-        <value xml:lang="ro">Nume Contenut</value>
-        <value xml:lang="ru">Имя контента</value>
-        <value xml:lang="th">ชื่อหัวข้อ</value>
-        <value xml:lang="zh">内容名称</value>
-    </property>
     <property key="FormFieldTitle_country">
         <value xml:lang="de">Land</value>
         <value xml:lang="en">Country</value>
@@ -3425,6 +3379,17 @@
         <value xml:lang="th">ERROR: ผิดพลาด ! 
ไม่สามารถลบข้อมูลการติดต่อนี้ได้
 
(ไม่พบข้อมูลการติดต่อของกลุ่มผู้ใช้นี้)</value>
         <value xml:lang="zh">错误：无法删除联系信息 
(没有找到会员联系方式)</value>
     </property>
+    <property key="PartyContactMechs">
+        <value xml:lang="de">Kontaktmechanismus</value>
+        <value xml:lang="en">ContactMechs</value>
+        <value xml:lang="es">Mecanismos de Contacto</value>
+        <value xml:lang="fr">Coordonnées</value>
+        <value xml:lang="it">Contatto</value>
+        <value xml:lang="ro">Contact</value>
+        <value xml:lang="ru">СпособСвязи</value>
+        <value xml:lang="th">วิธีการติดต่อ</value>
+        <value xml:lang="zh">联系方式</value>
+    </property>
     <property key="PartyContactMechType">
         <value xml:lang="de">Kontaktmechanismus Typ</value>
         <value xml:lang="en">Contact Mech Type</value>
@@ -4322,6 +4287,17 @@
         <value xml:lang="th">บัญชีธนาคาร</value>
         <value xml:lang="zh">电子资金转账账户</value>
     </property>
+    <property key="PartyEmailAddress">
+        <value xml:lang="de">E-Mail Adresse</value>
+        <value xml:lang="en">E-Mail Address</value>
+        <value xml:lang="es">Dirección de E-Mail</value>
+        <value xml:lang="fr">Adresse courriel</value>
+        <value xml:lang="it">Indirizzo E-Mail</value>
+        <value xml:lang="ro">Adresa E-Mail</value>
+        <value xml:lang="ru">Адрес эл. почты</value>
+        <value xml:lang="th">ที่อยู่อีเมล</value>
+        <value xml:lang="zh">电子邮件地址</value>
+    </property>
     <property key="PartyEmailAddresses">
         <value xml:lang="cs">E-mailové adresy</value>
         <value xml:lang="de">E-Mail Adressen</value>

Modified: ofbiz/trunk/applications/product/config/ProductEntityLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductEntityLabels.xml?rev=730853&r1=730852&r2=730853&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductEntityLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductEntityLabels.xml Fri Jan  2 
14:28:35 2009
@@ -17,7 +17,8 @@
     KIND, either express or implied.  See the License for the
     specific language governing permissions and limitations
     under the License.
---><resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+-->
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
     <property key="CostComponentType.description.ACTUAL_LABOR_COST">
         <value xml:lang="de">Effektive Arbeitskosten</value>
         <value xml:lang="en">Actual Labor Cost</value>
@@ -2389,4 +2390,4 @@
         <value xml:lang="th">ของเถื่อน</value>
         <value xml:lang="zh">被盗</value>
     </property>
-</resource>
+</resource>
\ No newline at end of file

Reply via email to