svn commit: r748715 [1/2] - in /ofbiz/trunk/applications: accounting/config/ content/config/ ecommerce/webapp/ecommerce/customer/ manufacturing/config/ marketing/config/ order/webapp/ordermgr/lookup/ party/config/ product/config/ product/webapp/catalog...

[mr...@apache.org]

Author: mrisaliti
Date: Fri Feb 27 21:52:03 2009
New Revision: 748715

URL: http://svn.apache.org/viewvc?rev=748715&view=rev
Log:
A lot of hardcoded labels cleaning/changes some wrong references or missing entity labels entries

Modified:
    ofbiz/trunk/applications/accounting/config/AccountingEntityLabels.xml
    ofbiz/trunk/applications/content/config/ContentEntityLabels.xml
    ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/viewprofile.ftl
    ofbiz/trunk/applications/manufacturing/config/ManufacturingEntityLabels.xml
    ofbiz/trunk/applications/marketing/config/MarketingEntityLabels.xml
    ofbiz/trunk/applications/order/webapp/ordermgr/lookup/FieldLookupForms.xml
    ofbiz/trunk/applications/party/config/PartyEntityLabels.xml
    ofbiz/trunk/applications/product/config/ProductEntityLabels.xml
    ofbiz/trunk/applications/product/config/ProductUiLabels.xml
    ofbiz/trunk/applications/product/webapp/catalog/config/ConfigForms.xml
    ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml
    ofbiz/trunk/applications/product/widget/catalog/Menus.xml
    ofbiz/trunk/applications/workeffort/config/WorkEffortEntityLabels.xml

Modified: ofbiz/trunk/applications/accounting/config/AccountingEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingEntityLabels.xml?rev=748715&r1=748714&r2=748715&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingEntityLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingEntityLabels.xml Fri Feb 27 21:52:03 2009
@@ -71,12 +71,6 @@
         <value xml:lang="en">Disbursement</value>
         <value xml:lang="fr">Débours</value>
         <value xml:lang="it">Esborso</value>
-        <value xml:lang="th">การชำระเงิน</value>
-    </property>
-    <property key="AcctgTransType.description.DISBURSEMENT_ACCTG_T">
-        <value xml:lang="en">DISBURSEMENT_ACCTG_T</value>
-        <value xml:lang="fr">Débours</value>
-        <value xml:lang="it">Rimborso</value>
         <value xml:lang="ro">Rambursari</value>
         <value xml:lang="ru">Выплата</value>
         <value xml:lang="th">การชำระเงิน</value>
@@ -91,6 +85,10 @@
         <value xml:lang="th">ภายนอก</value>
         <value xml:lang="zh">外部</value>
     </property>
+    <property key="AcctgTransType.description.INCOMING_PAYMENT">
+        <value xml:lang="en">Incoming Payment</value>
+        <value xml:lang="it">Pagamento in entrata</value>
+    </property>
     <property key="AcctgTransType.description.INTERNAL_ACCTG_TRANS">
         <value xml:lang="en">Internal</value>
         <value xml:lang="fr">Interne</value>
@@ -100,6 +98,10 @@
         <value xml:lang="th">ภายใน</value>
         <value xml:lang="zh">内部</value>
     </property>
+    <property key="AcctgTransType.description.INVENTORY">
+        <value xml:lang="en">Inventory</value>
+        <value xml:lang="it">Inventario</value>
+    </property>
     <property key="AcctgTransType.description.INVENTORY_RETURN">
         <value xml:lang="en">Inventory from Return</value>
         <value xml:lang="fr">Inventaire des retours</value>
@@ -109,7 +111,7 @@
         <value xml:lang="th">สินค้าคงเหลือจากการผลตอบแทน</value>
         <value xml:lang="zh">退货库存</value>
     </property>
-    <property key="AcctgTransType.description.ITEM_VARIANCE_ACCTG">
+    <property key="AcctgTransType.description.ITEM_VARIANCE">
         <value xml:lang="en">Item Variance</value>
         <value xml:lang="fr">Différence d'inventaire</value>
         <value xml:lang="it">Riga Varianza</value>
@@ -118,6 +120,10 @@
         <value xml:lang="th">รายการผลต่าง</value>
         <value xml:lang="zh">明细变量</value>
     </property>
+    <property key="AcctgTransType.description.MANUFACTURING">
+        <value xml:lang="en">Manufacturing</value>
+        <value xml:lang="it">Produzione</value>
+    </property>
     <property key="AcctgTransType.description.NOTE">
         <value xml:lang="en">Note</value>
         <value xml:lang="fr">Note</value>
@@ -140,12 +146,6 @@
         <value xml:lang="en">Other Internal</value>
         <value xml:lang="fr">Autre interne</value>
         <value xml:lang="it">Altri Interni</value>
-        <value xml:lang="th">ภายในอื่น ๆ</value>
-    </property>
-    <property key="AcctgTransType.description.OTHER_INTERNAL_ACCTG">
-        <value xml:lang="en">OTHER_INTERNAL_ACCTG</value>
-        <value xml:lang="fr">Autre interne</value>
-        <value xml:lang="it">Altro Interno</value>
         <value xml:lang="ro">Alt Intern</value>
         <value xml:lang="ru">Другая внутренняя</value>
         <value xml:lang="th">ภายในอื่น ๆ</value>
@@ -160,6 +160,10 @@
         <value xml:lang="th">สัญญาผูกมัดอื่น ๆ</value>
         <value xml:lang="zh">其它债务</value>
     </property>
+    <property key="AcctgTransType.description.OUTGOING_PAYMENT">
+        <value xml:lang="en">Outgoing Payment</value>
+        <value xml:lang="it">Pagamento in uscita</value>
+    </property>
     <property key="AcctgTransType.description.PAYMENT_ACCTG_TRANS">
         <value xml:lang="en">Payment</value>
         <value xml:lang="fr">Paiement</value>
@@ -169,6 +173,10 @@
         <value xml:lang="th">การชำระเงิน</value>
         <value xml:lang="zh">支付款</value>
     </property>
+    <property key="AcctgTransType.description.PAYMENT_APPL">
+        <value xml:lang="en">Payment Applied</value>
+        <value xml:lang="it">Pagamento applicato</value>
+    </property>
     <property key="AcctgTransType.description.PERIOD_CLOSING">
         <value xml:lang="en">Period Closing</value>
         <value xml:lang="fr">Clôture de période</value>
@@ -178,17 +186,15 @@
         <value xml:lang="th">ปิดช่วงเวลา</value>
         <value xml:lang="zh">一期结束</value>
     </property>
+    <property key="AcctgTransType.description.PURCHASE_INVOICE">
+        <value xml:lang="en">Purchase Invoice</value>
+        <value xml:lang="it">Fattura di acquisto</value>
+    </property>
     <property key="AcctgTransType.description.RECEIPT">
         <value xml:lang="de">Quittung</value>
         <value xml:lang="en">Receipt</value>
         <value xml:lang="fr">Reçu</value>
         <value xml:lang="it">Ricevute</value>
-        <value xml:lang="th">ใบเสร็จรับเงิน</value>
-    </property>
-    <property key="AcctgTransType.description.RECEIPT_ACCTG_TRANS">
-        <value xml:lang="en">RECEIPT_ACCTG_TRANS</value>
-        <value xml:lang="fr">Reçu</value>
-        <value xml:lang="it">Ricevuta</value>
         <value xml:lang="ro">Chitanta</value>
         <value xml:lang="ru">Выручка</value>
         <value xml:lang="th">ใบเสร็จรับเงิน</value>
@@ -198,17 +204,23 @@
         <value xml:lang="en">Sales</value>
         <value xml:lang="fr">Ventes</value>
         <value xml:lang="it">Vendite</value>
-        <value xml:lang="th">การขาย</value>
-    </property>
-    <property key="AcctgTransType.description.SALES_ACCTG_TRANS">
-        <value xml:lang="en">SALES_ACCTG_TRANS</value>
-        <value xml:lang="fr">Ventes</value>
-        <value xml:lang="it">Vendite</value>
         <value xml:lang="ro">Vanzari</value>
         <value xml:lang="ru">Продажи</value>
         <value xml:lang="th">การขาย</value>
         <value xml:lang="zh">销售</value>
     </property>
+    <property key="AcctgTransType.description.SALES_INVOICE">
+        <value xml:lang="en">Sales Invoice</value>
+        <value xml:lang="it">Fattura di vendita</value>
+    </property>
+    <property key="AcctgTransType.description.SALES_SHIPMENT">
+        <value xml:lang="en">Sales Shipment</value>
+        <value xml:lang="it">Spedizione di vendita</value>
+    </property>
+    <property key="AcctgTransType.description.SHIPMENT_RECEIPT">
+        <value xml:lang="en">Shipment Receipt</value>
+        <value xml:lang="it">Ricevuta di spedizione</value>
+    </property>
     <property key="AcctgTransType.description.TAX_DUE">
         <value xml:lang="en">Tax Due</value>
         <value xml:lang="fr">Impôts dûs</value>
@@ -386,6 +398,14 @@
         <value xml:lang="th">การใช้ราคามาตรฐาน</value>
         <value xml:lang="zh">标准使用费用</value>
     </property>
+    <property key="FixedAssetType.description.COMPUTER_HARDWARE">
+        <value xml:lang="en">Computer Hardware</value>
+        <value xml:lang="it">Hardware per computer</value>
+    </property>
+    <property key="FixedAssetType.description.COMPUTER_SOFTWARE">
+        <value xml:lang="en">Computer Software</value>
+        <value xml:lang="it">Software per computer</value>
+    </property>
     <property key="FixedAssetType.description.EQUIPMENT">
         <value xml:lang="en">Equipment</value>
         <value xml:lang="fr">Equipement</value>
@@ -630,6 +650,10 @@
         <value xml:lang="th">ส่วนลดสินค้าคงเหลือ</value>
         <value xml:lang="zh">库存调整</value>
     </property>
+    <property key="GlAccountClass.description.INVENTORY_ASSET">
+        <value xml:lang="en">Inventory Asset</value>
+        <value xml:lang="it">Inventario cespite</value>
+    </property>
     <property key="GlAccountClass.description.LIABILITY">
         <value xml:lang="en">Liability</value>
         <value xml:lang="fr">Dette</value>
@@ -741,7 +765,7 @@
     <property key="GlAccountType.description.ACCOUNTS_PAYABLE">
         <value xml:lang="en">Accounts Payable</value>
         <value xml:lang="fr">Comptes fournisseurs</value>
-        <value xml:lang="it">Conti Pagamenti</value>
+        <value xml:lang="it">Conto debiti</value>
         <value xml:lang="ro">Conturi Plati</value>
         <value xml:lang="ru">Счет кредиторов</value>
         <value xml:lang="th">เจ้าหนี้การค้า</value>
@@ -750,12 +774,20 @@
     <property key="GlAccountType.description.ACCOUNTS_RECEIVABLE">
         <value xml:lang="en">Accounts Receivable</value>
         <value xml:lang="fr">Comptes clients</value>
-        <value xml:lang="it">Crediti a Breve</value>
+        <value xml:lang="it">Conto crediti</value>
         <value xml:lang="ro">Credite pe termen scurt</value>
         <value xml:lang="ru">Счет дебиторов</value>
         <value xml:lang="th">ลูกหนี้การค้า</value>
         <value xml:lang="zh">应收账款</value>
     </property>
+    <property key="GlAccountType.description.ACCTPAY_WRITEOFF">
+        <value xml:lang="en">Accounts Payables Write Off</value>
+        <value xml:lang="it">Conti debiti ammortizzati</value>
+    </property>
+    <property key="GlAccountType.description.ACCTRECV_WRITEOFF">
+        <value xml:lang="en">Accounts Receivables Write Off</value>
+        <value xml:lang="it">Conto crediti ammortizzati</value>
+    </property>
     <property key="GlAccountType.description.BALANCE_ACCOUNT">
         <value xml:lang="en">Balance</value>
         <value xml:lang="fr">Solde du compte</value>
@@ -792,6 +824,18 @@
         <value xml:lang="th">ต้นทุนสินค้าขาย - ต้นทุนถัวเฉลี่ยการปรับปรุงรายการขาย</value>
         <value xml:lang="zh">已售商品的费用 - 平均费用调整</value>
     </property>
+    <property key="GlAccountType.description.COMMISSIONS_PAYABLE">
+        <value xml:lang="en">Commissions Payables</value>
+        <value xml:lang="it">Provvigioni a debito</value>
+    </property>
+    <property key="GlAccountType.description.COMMISSIONS_WRITEOFF">
+        <value xml:lang="en">Commissions Payables Write Off</value>
+        <value xml:lang="it">Provvigioni a credito</value>
+    </property>
+    <property key="GlAccountType.description.COMMISSION_EXPENSE">
+        <value xml:lang="en">Commission Expense</value>
+        <value xml:lang="it">Provvigioni sulle spese</value>
+    </property>
     <property key="GlAccountType.description.CREDIT_CARD">
         <value xml:lang="de">Kreditkarte</value>
         <value xml:lang="en">Credit Card</value>
@@ -865,6 +909,10 @@
         <value xml:lang="th">ส่วนลด</value>
         <value xml:lang="zh">折扣</value>
     </property>
+    <property key="GlAccountType.description.EXPENSE">
+        <value xml:lang="en">Expense</value>
+        <value xml:lang="it">Spese</value>
+    </property>
     <property key="GlAccountType.description.FIXED_ASSET">
         <value xml:lang="en">Fixed Asset</value>
         <value xml:lang="fr">Actifs immobilisés</value>
@@ -874,6 +922,38 @@
         <value xml:lang="th">ทรัพย์สินไม่หมุนเวียน</value>
         <value xml:lang="zh">固定资产</value>
     </property>
+    <property key="GlAccountType.description.FIXED_ASSET_MAINT">
+        <value xml:lang="en">Fixed Asset Maintenance</value>
+        <value xml:lang="it">Manutenzione cespiti</value>
+    </property>
+    <property key="GlAccountType.description.FX_GAIN_ACCOUNT">
+        <value xml:lang="en">Foreign Exchange Gain</value>
+        <value xml:lang="it">Profitti da cambio di valuta</value>
+    </property>
+    <property key="GlAccountType.description.FX_GAIN_LOSS_ACCT">
+        <value xml:lang="en">Foreign Exchange Gain/Loss</value>
+        <value xml:lang="it">Profitti/perdite da cambio di valuta</value>
+    </property>
+    <property key="GlAccountType.description.FX_LOSS_ACCOUNT">
+        <value xml:lang="en">Foreign Exchange Loss</value>
+        <value xml:lang="it">Perdite da cambio di valuta</value>
+    </property>
+    <property key="GlAccountType.description.INCOME">
+        <value xml:lang="en">Income</value>
+        <value xml:lang="it">Reddito</value>
+    </property>
+    <property key="GlAccountType.description.INTEREST_INCOME">
+        <value xml:lang="en">Interest Income</value>
+        <value xml:lang="it">Reddito da interessi</value>
+    </property>
+    <property key="GlAccountType.description.INTRSTINC_RECEIVABLE">
+        <value xml:lang="en">Interest Income Receivables</value>
+        <value xml:lang="it">Reddito da interessi a credito</value>
+    </property>
+    <property key="GlAccountType.description.INTRSTINC_WRITEOFF">
+        <value xml:lang="en">Interest Income Write Off</value>
+        <value xml:lang="it">Reddito da interessi a debito</value>
+    </property>
     <property key="GlAccountType.description.INVENTORY_ACCOUNT">
         <value xml:lang="en">Inventory</value>
         <value xml:lang="fr">Stock</value>
@@ -910,6 +990,10 @@
         <value xml:lang="th">รายการปรับปรุงสินค้าคงเหลือจากต้นทุนถัวเฉลี่ย</value>
         <value xml:lang="zh">从平均费用调整库存</value>
     </property>
+    <property key="GlAccountType.description.INV_ADJ_VAL">
+        <value xml:lang="en">Inventory Item Value Adjustment</value>
+        <value xml:lang="it">Aggiustamento valore riga inventario</value>
+    </property>
     <property key="GlAccountType.description.INV_CHANGE_ACCOUNT">
         <value xml:lang="en">Inventory Change</value>
         <value xml:lang="fr">Provision pour dépréciation des stocks</value>
@@ -964,6 +1048,10 @@
         <value xml:lang="th">ค่าใช้จ่ายอื่น ๆ</value>
         <value xml:lang="zh">其它支出</value>
     </property>
+    <property key="GlAccountType.description.OTHER_INCOME">
+        <value xml:lang="en">Other Income</value>
+        <value xml:lang="it">Altri redditi</value>
+    </property>
     <property key="GlAccountType.description.OWNERS_EQUITY">
         <value xml:lang="en">Owner's Equity</value>
         <value xml:lang="fr">Capital et réserves</value>
@@ -1072,6 +1160,10 @@
         <value xml:lang="th">ภาษี</value>
         <value xml:lang="zh">税</value>
     </property>
+    <property key="GlAccountType.description.UNDEPOSITED_RECEIPTS">
+        <value xml:lang="en">Undeposited Receipts</value>
+        <value xml:lang="it">Ricevute non depositate</value>
+    </property>
     <property key="GlAccountType.description.UNINVOICED_SHIP_RCPT">
         <value xml:lang="en">Uninvoiced Shipment Receipts</value>
         <value xml:lang="fr">Stock non réceptionné</value>
@@ -1090,6 +1182,10 @@
         <value xml:lang="th">งานระหว่างผลิตสินค้าคงเหลือ</value>
         <value xml:lang="zh">在制品盘存</value>
     </property>
+    <property key="GlAccountType.description.WRITEOFF">
+        <value xml:lang="en">Write Off</value>
+        <value xml:lang="it">Perdite</value>
+    </property>
     <property key="GlFiscalType.description.ACTUAL">
         <value xml:lang="en">Actual</value>
         <value xml:lang="fr">Réel</value>
@@ -1189,6 +1285,14 @@
         <value xml:lang="th">บริการ</value>
         <value xml:lang="zh">服务</value>
     </property>
+    <property key="InvoiceItemType.description.COMM_INV_ADJ">
+        <value xml:lang="en">Commission Invoice Adjustment</value>
+        <value xml:lang="it">Aggiustamenti fattura provvigioni</value>
+    </property>
+    <property key="InvoiceItemType.description.COMM_INV_ITEM">
+        <value xml:lang="en">Commission Invoice Line Item</value>
+        <value xml:lang="it">Riga fattura provvigioni</value>
+    </property>
     <property key="InvoiceItemType.description.CRT_ADD_FEATURE_ADJ">
         <value xml:lang="en">Return Additional Feature</value>
         <value xml:lang="fr">Retour d'option supplémentaire</value>
@@ -1441,6 +1545,10 @@
         <value xml:lang="th">ใบกำกับรายการสินค้าสำเร็จรูป</value>
         <value xml:lang="zh">发票的制成品明细</value>
     </property>
+    <property key="InvoiceItemType.description.INV_INTRST_CHRG">
+        <value xml:lang="en">Invoice Interest Charge</value>
+        <value xml:lang="it">Interesse ricaricato fattura</value>
+    </property>
     <property key="InvoiceItemType.description.INV_MISC_CHARGE">
         <value xml:lang="en">Invoice Miscellaneous Charges</value>
         <value xml:lang="fr">Facturation charges diverses</value>
@@ -1630,6 +1738,138 @@
         <value xml:lang="th">การรับประกันรายการใบกำกับสินค้า</value>
         <value xml:lang="zh">发票明细的保证条款</value>
     </property>
+    <property key="InvoiceItemType.description.PAYROL">
+        <value xml:lang="en">Payrol</value>
+        <value xml:lang="it">Paghe</value>
+    </property>
+    <property key="InvoiceItemType.description.PAYROL_ADV_PAY">
+        <value xml:lang="en">Advance Pay</value>
+        <value xml:lang="it">Paghe avanzate</value>
+    </property>
+    <property key="InvoiceItemType.description.PAYROL_BONUS">
+        <value xml:lang="en">Bonus</value>
+        <value xml:lang="it">Premio</value>
+    </property>
+    <property key="InvoiceItemType.description.PAYROL_COMMISSION">
+        <value xml:lang="en">Commission</value>
+        <value xml:lang="it">Provvigione</value>
+    </property>
+    <property key="InvoiceItemType.description.PAYROL_DD_125COMPY">
+        <value xml:lang="en">125*Compy. Contr Other Prem.</value>
+        <value xml:lang="it">125*Compy. Contr Altri Prem.</value>
+    </property>
+    <property key="InvoiceItemType.description.PAYROL_DD_125HSA">
+        <value xml:lang="en">125*HSA Contribution (pre tax)</value>
+        <value xml:lang="it">125*HSA Contributo (prima delle tasse)</value>
+    </property>
+    <property key="InvoiceItemType.description.PAYROL_DD_125PPO">
+        <value xml:lang="en">125*PPO (pre tax)</value>
+        <value xml:lang="it">125*PPO (prima delle tasse)</value>
+    </property>
+    <property key="InvoiceItemType.description.PAYROL_DD_401K">
+        <value xml:lang="en">401K Emp.</value>
+        <value xml:lang="it">401K Emp.</value>
+    </property>
+    <property key="InvoiceItemType.description.PAYROL_DD_CHAR_DONAT">
+        <value xml:lang="en">Charity Donation</value>
+        <value xml:lang="it">Donazione carità</value>
+    </property>
+    <property key="InvoiceItemType.description.PAYROL_DD_CHILD_SUPP">
+        <value xml:lang="en">Child Support Garnishment</value>
+        <value xml:lang="it">Support figlio</value>
+    </property>
+    <property key="InvoiceItemType.description.PAYROL_DD_FROM_GROSS">
+        <value xml:lang="en">Deductions from Gross</value>
+        <value xml:lang="it">Deduzione dal lordo</value>
+    </property>
+    <property key="InvoiceItemType.description.PAYROL_DD_MISC">
+        <value xml:lang="en">Miscellaneous Deduction</value>
+        <value xml:lang="it">Deduzione varie</value>
+    </property>
+    <property key="InvoiceItemType.description.PAYROL_DD_REPAY">
+        <value xml:lang="en">Advance Repayment</value>
+        <value xml:lang="it">Anticipo rimborso</value>
+    </property>
+    <property key="InvoiceItemType.description.PAYROL_DD_ROTH_401K">
+        <value xml:lang="en">Roth 401k Emp.</value>
+        <value xml:lang="it">Roth 401k Emp.</value>
+    </property>
+    <property key="InvoiceItemType.description.PAYROL_DD_SAL_TIMOFF">
+        <value xml:lang="en">Unpaid Salary Time off.</value>
+        <value xml:lang="it">Salario da pagare tempo libero.</value>
+    </property>
+    <property key="InvoiceItemType.description.PAYROL_DD_SIMP_IRA">
+        <value xml:lang="en">Simple IRA emp.</value>
+        <value xml:lang="it">Semplice IRA emp.</value>
+    </property>
+    <property key="InvoiceItemType.description.PAYROL_DD_UNION">
+        <value xml:lang="en">Union Dues</value>
+        <value xml:lang="it">Diritti sindacali dovuti</value>
+    </property>
+    <property key="InvoiceItemType.description.PAYROL_DD_WAG_GARN">
+        <value xml:lang="en">Wage Garnishment</value>
+        <value xml:lang="it">Salario</value>
+    </property>
+    <property key="InvoiceItemType.description.PAYROL_EARN_HOURS">
+        <value xml:lang="en">Earnings and Hours</value>
+        <value xml:lang="it">Guadagni e ore</value>
+    </property>
+    <property key="InvoiceItemType.description.PAYROL_HRLY_RATE">
+        <value xml:lang="en">Hourly Rate</value>
+        <value xml:lang="it">Percentuale oraria</value>
+    </property>
+    <property key="InvoiceItemType.description.PAYROL_HRLY_RATE_SIC">
+        <value xml:lang="en">Sick Hourly Rate</value>
+        <value xml:lang="it">Percentuale oraria per la malattia</value>
+    </property>
+    <property key="InvoiceItemType.description.PAYROL_MIL_REIMB">
+        <value xml:lang="en">Mileage Reimboursement</value>
+        <value xml:lang="it">Rimborso chilometrico</value>
+    </property>
+    <property key="InvoiceItemType.description.PAYROL_OFF_EXP_REIMB">
+        <value xml:lang="en">Office Exp. reimboursement</value>
+        <value xml:lang="it">Rimborso spese ufficio</value>
+    </property>
+    <property key="InvoiceItemType.description.PAYROL_PAYPER_OVRPAY">
+        <value xml:lang="en">Pay Period adj(over pay)</value>
+        <value xml:lang="it">Pagamento periodo avanzato</value>
+    </property>
+    <property key="InvoiceItemType.description.PAYROL_PAYPER_PAY">
+        <value xml:lang="en">Pay Period adj pay</value>
+        <value xml:lang="it">Pagamento periodo avanzato pagato</value>
+    </property>
+    <property key="InvoiceItemType.description.PAYROL_SALARY">
+        <value xml:lang="en">Salary</value>
+        <value xml:lang="it">Salario</value>
+    </property>
+    <property key="InvoiceItemType.description.PAYROL_SALARY_SICK">
+        <value xml:lang="en">Sick Salary</value>
+        <value xml:lang="it">Salario per la malattia</value>
+    </property>
+    <property key="InvoiceItemType.description.PAYROL_SALARY_VAC">
+        <value xml:lang="en">Vacation Salary</value>
+        <value xml:lang="it">Salario per le ferie</value>
+    </property>
+    <property key="InvoiceItemType.description.PAYROL_SOC_SEC_EMPL">
+        <value xml:lang="en">Social Security Employee</value>
+        <value xml:lang="it">Previdenza sociale impiegato</value>
+    </property>
+    <property key="InvoiceItemType.description.PAYROL_TAXES">
+        <value xml:lang="en">Taxes</value>
+        <value xml:lang="it">Tasse sulle paghe</value>
+    </property>
+    <property key="InvoiceItemType.description.PAYROL_TAX_FEDERAL">
+        <value xml:lang="en">Federal Witholding</value>
+        <value xml:lang="it">Tasse federali trattenute</value>
+    </property>
+    <property key="InvoiceItemType.description.PAYROL_TAX_MD_WITHOL">
+        <value xml:lang="en">MD Withholding</value>
+        <value xml:lang="it">Trattenute MD</value>
+    </property>
+    <property key="InvoiceItemType.description.PAYROL_TAX_MED_EMPL">
+        <value xml:lang="en">Medicare Employee</value>
+        <value xml:lang="it">Trattenute per la salute impiegato</value>
+    </property>
     <property key="InvoiceItemType.description.PINVOICE_ADJ">
         <value xml:lang="en">Invoice Adjustment</value>
         <value xml:lang="fr">Régularisation de facture</value>
@@ -1918,6 +2158,86 @@
         <value xml:lang="th">ค่าธรรมเนียมใบกำกับสินค้า</value>
         <value xml:lang="zh">发票费用</value>
     </property>
+    <property key="InvoiceItemType.description.SRT_ADD_FEATURE_ADJ">
+        <value xml:lang="en">Return Additional Feature</value>
+        <value xml:lang="it">Reso caratteristica aggiuntiva</value>
+    </property>
+    <property key="InvoiceItemType.description.SRT_DISCOUNT_ADJ">
+        <value xml:lang="en">Return Discount</value>
+        <value xml:lang="it">Sconto reso</value>
+    </property>
+    <property key="InvoiceItemType.description.SRT_DPROD_ITEM">
+        <value xml:lang="en">Return Digital Good Item</value>
+        <value xml:lang="it">Riga reso bene digitale</value>
+    </property>
+    <property key="InvoiceItemType.description.SRT_FDPROD_ITEM">
+        <value xml:lang="en">Return Finished/Digital Good Item</value>
+        <value xml:lang="it">Riga reso bene finito/digitale</value>
+    </property>
+    <property key="InvoiceItemType.description.SRT_FEE_ADJ">
+        <value xml:lang="en">Return Fee</value>
+        <value xml:lang="it">Commissioni reso</value>
+    </property>
+    <property key="InvoiceItemType.description.SRT_FPROD_ITEM">
+        <value xml:lang="en">Return Finished Good Item</value>
+        <value xml:lang="it">Riga reso bene finito</value>
+    </property>
+    <property key="InvoiceItemType.description.SRT_MAN_ADJ">
+        <value xml:lang="en">Return Manual Adjustment</value>
+        <value xml:lang="it">Reso aggiustamento manuale</value>
+    </property>
+    <property key="InvoiceItemType.description.SRT_MISC_ADJ">
+        <value xml:lang="en">Return Miscellaneous Charges</value>
+        <value xml:lang="it">Reso ricarichi vari</value>
+    </property>
+    <property key="InvoiceItemType.description.SRT_MKTG_PKG_ADJ">
+        <value xml:lang="en">Return Marketing Package Adjustment</value>
+        <value xml:lang="it">Reso aggiustamento pacco di vendita</value>
+    </property>
+    <property key="InvoiceItemType.description.SRT_PROD_FEATR_ITEM">
+        <value xml:lang="en">Return Product-Feature Item</value>
+        <value xml:lang="it">Riga reso prodotto-caratteristica</value>
+    </property>
+    <property key="InvoiceItemType.description.SRT_PROD_ITEM">
+        <value xml:lang="en">Return Product Item</value>
+        <value xml:lang="it">Riga reso prodotto</value>
+    </property>
+    <property key="InvoiceItemType.description.SRT_PROMOTION_ADJ">
+        <value xml:lang="en">Return Promotion</value>
+        <value xml:lang="it">Promozione reso</value>
+    </property>
+    <property key="InvoiceItemType.description.SRT_REPLACE_ADJ">
+        <value xml:lang="en">Return Replacement</value>
+        <value xml:lang="it">Reso per sostituzione</value>
+    </property>
+    <property key="InvoiceItemType.description.SRT_SALES_TAX_ADJ">
+        <value xml:lang="en">Return Sales Tax</value>
+        <value xml:lang="it">Reso tasse di vendita</value>
+    </property>
+    <property key="InvoiceItemType.description.SRT_SHIPPING_ADJ">
+        <value xml:lang="en">Return Shipping and Handling</value>
+        <value xml:lang="it">Reso spese di spedizione e gestione</value>
+    </property>
+    <property key="InvoiceItemType.description.SRT_SPROD_ITEM">
+        <value xml:lang="en">Return Service Product Item</value>
+        <value xml:lang="it">Riga reso prodotto servizio</value>
+    </property>
+    <property key="InvoiceItemType.description.SRT_SURCHARGE_ADJ">
+        <value xml:lang="en">Return Surcharge</value>
+        <value xml:lang="it">Soprattassa reso</value>
+    </property>
+    <property key="InvoiceItemType.description.SRT_TE_ITEM">
+        <value xml:lang="en">Return Time-Entry Item</value>
+        <value xml:lang="it">Riga reso timbratura</value>
+    </property>
+    <property key="InvoiceItemType.description.SRT_WARRANTY_ADJ">
+        <value xml:lang="en">Return Warranty</value>
+        <value xml:lang="it">Garanzia reso</value>
+    </property>
+    <property key="InvoiceItemType.description.SRT_WE_ITEM">
+        <value xml:lang="en">Return Work-Effort Item</value>
+        <value xml:lang="it">Riga reso impegno di lavoro</value>
+    </property>
     <property key="InvoiceType.description.COMMISSION_INVOICE">
         <value xml:lang="de">Kommission</value>
         <value xml:lang="en">Commission</value>
@@ -1947,6 +2267,10 @@
         <value xml:lang="ru">Процентный доход</value>
         <value xml:lang="th">ดอกเบี้ย</value>
     </property>
+    <property key="InvoiceType.description.PAYROL_INVOICE">
+        <value xml:lang="en">Payrol</value>
+        <value xml:lang="it">Paghe</value>
+    </property>
     <property key="InvoiceType.description.PURCHASE_INVOICE">
         <value xml:lang="de">Einkaufsrechnung</value>
         <value xml:lang="en">Purchase Invoice</value>
@@ -1958,6 +2282,14 @@
         <value xml:lang="th">ใบกำกับซื้อสินค้า</value>
         <value xml:lang="zh">购货发票</value>
     </property>
+    <property key="InvoiceType.description.PURC_RTN_INVOICE">
+        <value xml:lang="en">Purchase Return</value>
+        <value xml:lang="it">Reso acquisto</value>
+    </property>
+    <property key="InvoiceType.description.PUR_INV_TEMPLATE">
+        <value xml:lang="en">Purchase Invoice Template</value>
+        <value xml:lang="it">Reso template fattura d'acquisto</value>
+    </property>
     <property key="InvoiceType.description.SALES_INVOICE">
         <value xml:lang="de">Verkaufsrechnung</value>
         <value xml:lang="en">Sales Invoice</value>
@@ -1969,6 +2301,14 @@
         <value xml:lang="th">ใบกำกับสินค้า</value>
         <value xml:lang="zh">销售发票</value>
     </property>
+    <property key="InvoiceType.description.SALES_INV_TEMPLATE">
+        <value xml:lang="en">Sales Invoice Template</value>
+        <value xml:lang="it">Template fattura di vendita</value>
+    </property>
+    <property key="InvoiceType.description.TEMPLATE">
+        <value xml:lang="en">Invoice Template</value>
+        <value xml:lang="it">Template fattura</value>
+    </property>
     <property key="PaymentMethodType.description.CASH">
         <value xml:lang="en">Cash</value>
         <value xml:lang="fr">Espèces</value>
@@ -2095,6 +2435,10 @@
         <value xml:lang="th">WorldPay</value>
         <value xml:lang="zh">WorldPay</value>
     </property>
+    <property key="PaymentMethodType.description.FIN_ACCOUNT">
+        <value xml:lang="en">Financial Account</value>
+        <value xml:lang="it">Conto finanziario</value>
+    </property>
     <property key="PaymentMethodType.description.GIFT_CARD">
         <value xml:lang="de">Gutschriftskarte</value>
         <value xml:lang="en">Gift Card</value>
@@ -2239,6 +2583,10 @@
         <value xml:lang="th">การชำระภาษีของเงินเดือน</value>
         <value xml:lang="zh">工资税完税</value>
     </property>
+    <property key="PaymentType.description.PAYROL_PAYMENT">
+        <value xml:lang="en">Payrol Payment</value>
+        <value xml:lang="it">Pagamento paghe</value>
+    </property>
     <property key="PaymentType.description.PAY_CHECK">
         <value xml:lang="de">Lohnzahlung</value>
         <value xml:lang="en">Pay Check</value>

Modified: ofbiz/trunk/applications/content/config/ContentEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/config/ContentEntityLabels.xml?rev=748715&r1=748714&r2=748715&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/config/ContentEntityLabels.xml (original)
+++ ofbiz/trunk/applications/content/config/ContentEntityLabels.xml Fri Feb 27 21:52:03 2009
@@ -799,6 +799,10 @@
         <value xml:lang="th">ข้อมูลสินค้า</value>
         <value xml:lang="zh">产品信息</value>
     </property>
+    <property key="ContentPurposeType.description.PROJECT_INFO">
+        <value xml:lang="en">Project Info</value>
+        <value xml:lang="it">Informazione progetto</value>
+    </property>
     <property key="ContentPurposeType.description.RESPONSE">
         <value xml:lang="de">Antwort</value>
         <value xml:lang="en">Response</value>
@@ -1211,6 +1215,14 @@
         <value xml:lang="th">เปิดสำหรับทางธุรกิจ</value>
         <value xml:lang="zh">OFBiz</value>
     </property>
+    <property key="DataCategory.categoryName.TEMPLATE">
+        <value xml:lang="en">Template</value>
+        <value xml:lang="it">Template</value>
+    </property>
+    <property key="DataResourceType.description.AUDIO_OBJECT">
+        <value xml:lang="en">Audio</value>
+        <value xml:lang="it">Audio</value>
+    </property>
     <property key="DataResourceType.description.CONTEXT_FILE">
         <value xml:lang="de">Datei (relativ zu webapp Basisverzeichnis)</value>
         <value xml:lang="en">File (rel to webapp root)</value>
@@ -1337,6 +1349,10 @@
         <value xml:lang="th">แหล่งที่มาของ URL</value>
         <value xml:lang="zh">URL资源</value>
     </property>
+    <property key="DataResourceType.description.VIDEO_OBJECT">
+        <value xml:lang="en">Video</value>
+        <value xml:lang="it">Video</value>
+    </property>
     <property key="DataTemplateType.description.FTL">
         <value xml:lang="de">FreeMarker</value>
         <value xml:lang="en">FreeMarker</value>
@@ -1549,6 +1565,10 @@
         <value xml:lang="th">Microsoft PowerPoint</value>
         <value xml:lang="zh">微软PowerPoint</value>
     </property>
+    <property key="MimeType.description.application/vnd.oasis.opendocument.spreadsheet">
+        <value xml:lang="en">OpenOffice OpenDocument Spreadsheet</value>
+        <value xml:lang="it">Foglio di lavoro OpenOffice OpenDocument</value>
+    </property>
     <property key="MimeType.description.application/vnd.oasis.opendocument.text">
         <value xml:lang="de">OpenOffice OpenDocument Text</value>
         <value xml:lang="en">OpenOffice OpenDocument Text</value>
@@ -1576,6 +1596,14 @@
         <value xml:lang="th">สำรวจคำตอบ</value>
         <value xml:lang="zh">调查回答</value>
     </property>
+    <property key="MimeType.description.application/x-shockwave-flash">
+        <value xml:lang="en">Shockwave Flash Movie</value>
+        <value xml:lang="it">Filem Shockwave flash</value>
+    </property>
+    <property key="MimeType.description.application/x-tgz">
+        <value xml:lang="en">Gzipped Tar archive file</value>
+        <value xml:lang="it">File archivio Gzipped Tar</value>
+    </property>
     <property key="MimeType.description.application/x-zip-compressed">
         <value xml:lang="de">ZIP-komprimierte Datei</value>
         <value xml:lang="en">ZIP compressed file</value>
@@ -1611,6 +1639,14 @@
         <value xml:lang="th">เสียงประเภท MPEG</value>
         <value xml:lang="zh">MPEG音频</value>
     </property>
+    <property key="MimeType.description.audio/x-ms-wax">
+        <value xml:lang="en">WAX Audio</value>
+        <value xml:lang="it">WAX Audio</value>
+    </property>
+    <property key="MimeType.description.audio/x-ms-wma">
+        <value xml:lang="en">WMA Audio</value>
+        <value xml:lang="it">WMA Audio</value>
+    </property>
     <property key="MimeType.description.image/gif">
         <value xml:lang="de">GIF Bild</value>
         <value xml:lang="en">GIF Image</value>
@@ -1870,6 +1906,10 @@
         <value xml:lang="th">ใช้แท็บคั่นค่าตัวอักษร</value>
         <value xml:lang="zh">制表键分隔文本</value>
     </property>
+    <property key="MimeType.description.text/x-diff">
+        <value xml:lang="en">diff for patching files</value>
+        <value xml:lang="it">diff per files di patch</value>
+    </property>
     <property key="MimeType.description.text/xml">
         <value xml:lang="de">XML Text</value>
         <value xml:lang="en">XML Text</value>
@@ -1879,6 +1919,14 @@
         <value xml:lang="th">ตัวอักษร XML</value>
         <value xml:lang="zh">XML文本</value>
     </property>
+    <property key="MimeType.description.video/avi">
+        <value xml:lang="en">AVI Video</value>
+        <value xml:lang="it">Video AVI</value>
+    </property>
+    <property key="MimeType.description.video/mp4">
+        <value xml:lang="en">MPEG-4 (H.264) Video</value>
+        <value xml:lang="it">Video MPEG-4 (H.264)</value>
+    </property>
     <property key="MimeType.description.video/mpeg">
         <value xml:lang="de">MPEG/MPG Video</value>
         <value xml:lang="en">MPEG/MPG Video</value>
@@ -1897,6 +1945,30 @@
         <value xml:lang="th">วิดีโอแบบใช้เวลารวดเร็ว</value>
         <value xml:lang="zh">Quicktime视频</value>
     </property>
+    <property key="MimeType.description.video/x-flv">
+        <value xml:lang="en">Flash Streaming Video</value>
+        <value xml:lang="it">Video flash in streaming</value>
+    </property>
+    <property key="MimeType.description.video/x-ms-asf">
+        <value xml:lang="en">ASF Video</value>
+        <value xml:lang="it">Video ASF</value>
+    </property>
+    <property key="MimeType.description.video/x-ms-wm">
+        <value xml:lang="en">WM Video</value>
+        <value xml:lang="it">Video WM</value>
+    </property>
+    <property key="MimeType.description.video/x-ms-wmv">
+        <value xml:lang="en">WMV Video</value>
+        <value xml:lang="it">Video WMV</value>
+    </property>
+    <property key="MimeType.description.video/x-ms-wmx">
+        <value xml:lang="en">WMX Video</value>
+        <value xml:lang="it">Video WMX</value>
+    </property>
+    <property key="MimeType.description.video/x-ms-wvx">
+        <value xml:lang="en">WVX Video</value>
+        <value xml:lang="it">Video WVX</value>
+    </property>
     <property key="SurveyApplType.description.CART_ADD">
         <value xml:lang="de">Zum Warenkorb hinzufügen</value>
         <value xml:lang="en">Add-To Cart</value>
@@ -1997,6 +2069,10 @@
         <value xml:lang="th">หัวข้อการบันทึก</value>
         <value xml:lang="zh">内容记录</value>
     </property>
+    <property key="SurveyQuestionType.description.COUNTRY">
+        <value xml:lang="en">Country</value>
+        <value xml:lang="it">Paese</value>
+    </property>
     <property key="SurveyQuestionType.description.CREDIT_CARD">
         <value xml:lang="de">Kreditkartennummer</value>
         <value xml:lang="en">Credit Card Number</value>
@@ -2027,6 +2103,14 @@
         <value xml:lang="th">ที่อยู่อีเมล์</value>
         <value xml:lang="zh">电子邮件地址</value>
     </property>
+    <property key="SurveyQuestionType.description.ENUMERATION">
+        <value xml:lang="en">Enumeration</value>
+        <value xml:lang="it">Enumerare</value>
+    </property>
+    <property key="SurveyQuestionType.description.GEO">
+        <value xml:lang="en">Geo List</value>
+        <value xml:lang="it">Lista geografia</value>
+    </property>
     <property key="SurveyQuestionType.description.GIFT_CARD">
         <value xml:lang="de">Geschenkgutschein Nummer</value>
         <value xml:lang="en">Gift Card Number</value>
@@ -2107,6 +2191,10 @@
         <value xml:lang="th">เส้นคั่นตัวอักษร</value>
         <value xml:lang="zh">分隔文本</value>
     </property>
+    <property key="SurveyQuestionType.description.STATE_PROVINCE">
+        <value xml:lang="en">State/Province</value>
+        <value xml:lang="it">Stato/Provincia    </value>
+    </property>
     <property key="SurveyQuestionType.description.TEXTAREA">
         <value xml:lang="de">Text (mehrere Zeilen)</value>
         <value xml:lang="en">Text (multi-line)</value>

Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/viewprofile.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/viewprofile.ftl?rev=748715&r1=748714&r2=748715&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/viewprofile.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/viewprofile.ftl Fri Feb 27 21:52:03 2009
@@ -182,7 +182,7 @@
                     <#if telecomNumber.areaCode?has_content>${telecomNumber.areaCode}-</#if>${telecomNumber.contactNumber?if_exists}
                     <#if partyContactMech.extension?has_content>ext&nbsp;${partyContactMech.extension}</#if>
                     <#if (!telecomNumber.countryCode?has_content || telecomNumber.countryCode = "011")>
-                      <a target="_blank" href="${uiLabelMap.CommonLookupWhoLink}" class="linktext">${uiLabelMap.CommonLookupWho}</a>
+                      <a target="_blank" href="${uiLabelMap.CommonLookupAnywhoLink}" class="linktext">${uiLabelMap.CommonLookupAnywho}</a>
                       <a target="_blank" href="${uiLabelMap.CommonLookupWhitepagesTelNumberLink}" class="linktext">${uiLabelMap.CommonLookupWhitepages}</a>
                     </#if>
                   <#else>

Modified: ofbiz/trunk/applications/manufacturing/config/ManufacturingEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/config/ManufacturingEntityLabels.xml?rev=748715&r1=748714&r2=748715&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/config/ManufacturingEntityLabels.xml (original)
+++ ofbiz/trunk/applications/manufacturing/config/ManufacturingEntityLabels.xml Fri Feb 27 21:52:03 2009
@@ -91,6 +91,10 @@
         <value xml:lang="th">ปฏิทินมาตรฐานใช้เมื่อไม่มีการระบุปฏิทินโดยเฉพาะ</value>
         <value xml:lang="zh">当没有指定日历时所用的缺省日历</value>
     </property>
+    <property key="TechDataCalendar.description.DEMO_CALENDAR">
+        <value xml:lang="en">Demo Workcenter Calendar</value>
+        <value xml:lang="it">Calendario demo</value>
+    </property>
     <property key="TechDataCalendar.description.DRYING">
         <value xml:lang="en">DRYING</value>
         <value xml:lang="es">Calendario del taller de secado</value>
@@ -127,6 +131,10 @@
         <value xml:lang="th">8 ชั่วโมง/วัน</value>
         <value xml:lang="zh">8小时/天</value>
     </property>
+    <property key="TechDataCalendarWeek.description.DEMO_WEEK">
+        <value xml:lang="en">Demo calendar week of 8hours/days 5days/week starting at 8h30 from monday to friday</value>
+        <value xml:lang="it">Calendario settimanale demo di 8 ore/giorno 5 giorni/settimana iniziando alle 8:30 dal lunedì al venerdì</value>
+    </property>
     <property key="TechDataCalendarWeek.description.HOLIDAY">
         <value xml:lang="en">HOLIDAY</value>
         <value xml:lang="es">Calendario de vacaciones, 0 horas/día, 0 días/semana</value>

Modified: ofbiz/trunk/applications/marketing/config/MarketingEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/config/MarketingEntityLabels.xml?rev=748715&r1=748714&r2=748715&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/config/MarketingEntityLabels.xml (original)
+++ ofbiz/trunk/applications/marketing/config/MarketingEntityLabels.xml Fri Feb 27 21:52:03 2009
@@ -64,6 +64,10 @@
         <value xml:lang="th">ส่วนของการขาย</value>
         <value xml:lang="zh">销售分区</value>
     </property>
+    <property key="TrackingCodeType.description.ACCESS">
+        <value xml:lang="en">Access Code</value>
+        <value xml:lang="it">Codice di accesso</value>
+    </property>
     <property key="TrackingCodeType.description.EXTERNAL">
         <value xml:lang="en">External</value>
         <value xml:lang="es">Externo</value>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/lookup/FieldLookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/lookup/FieldLookupForms.xml?rev=748715&r1=748714&r2=748715&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/lookup/FieldLookupForms.xml (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/lookup/FieldLookupForms.xml Fri Feb 27 21:52:03 2009
@@ -366,7 +366,7 @@
                 <entity-options description="${description}" entity-name="SkillType" key-field-name="skillTypeId"/>
             </drop-down>
         </field>
-        <field name="uomId" title="${uiLabelMap.OrderOrderQuoteuomId}">
+        <field name="uomId" title="${uiLabelMap.OrderOrderQuoteUomId}">
             <drop-down allow-empty="true">
                 <entity-options description="${uomId} - ${description}" entity-name="Uom" key-field-name="uomId">
                     <!--<entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/>-->

Modified: ofbiz/trunk/applications/party/config/PartyEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/config/PartyEntityLabels.xml?rev=748715&r1=748714&r2=748715&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/config/PartyEntityLabels.xml (original)
+++ ofbiz/trunk/applications/party/config/PartyEntityLabels.xml Fri Feb 27 21:52:03 2009
@@ -94,6 +94,10 @@
         <value xml:lang="th">งาน</value>
         <value xml:lang="zh">工作</value>
     </property>
+    <property key="AgreementType.description.EULA">
+        <value xml:lang="en">End User License Agreement</value>
+        <value xml:lang="it">Contratto licenza utente finale</value>
+    </property>
     <property key="AgreementType.description.OTHER_AGREEMENT">
         <value xml:lang="de">Andere</value>
         <value xml:lang="en">Other</value>
@@ -431,6 +435,10 @@
         <value xml:lang="th">หมายเลขโทรศัพท์ที่แจ้งต่อลูกค้า (AP)</value>
         <value xml:lang="zh">寄账单电话号码</value>
     </property>
+    <property key="ContactMechPurposeType.description.PHONE_DID">
+        <value xml:lang="en">Direct Inward Dialing Phone Number</value>
+        <value xml:lang="it">Numero telefono interno diretto per connettersi</value>
+    </property>
     <property key="ContactMechPurposeType.description.PHONE_HOME">
         <value xml:lang="de">Privat Telefonnummer</value>
         <value xml:lang="en">Main Home Phone Number</value>
@@ -464,6 +472,10 @@
         <value xml:lang="th">เบอร์โทรศัพท์ของการชำระเงิน (AR)</value>
         <value xml:lang="zh">支付电话号码</value>
     </property>
+    <property key="ContactMechPurposeType.description.PHONE_QUICK">
+        <value xml:lang="en">Quick Calls Phone Number</value>
+        <value xml:lang="it">Numero di telefono per chiamate veloci</value>
+    </property>
     <property key="ContactMechPurposeType.description.PHONE_SHIPPING">
         <value xml:lang="de">Telefonnummer Versandadresse</value>
         <value xml:lang="en">Shipping Destination Phone Number</value>
@@ -821,7 +833,7 @@
         <value xml:lang="fr">Commerce</value>
         <value xml:lang="it">Commercio</value>
     </property>
-    <property key="PartyClassificationType.description.TRADE_RETAIL_CLASSIFI">
+    <property key="PartyClassificationType.description.TRADE_RETAIL_CLASSIF">
         <value xml:lang="en">Retail</value>
         <value xml:lang="es">Venta al por menor</value>
         <value xml:lang="fr">Vente au détail</value>
@@ -957,7 +969,7 @@
         <value xml:lang="fr">Propriétaire principal</value>
         <value xml:lang="it">Proprietario</value>
     </property>
-    <property key="PartyRelationshipType.partyRelationshipName.LEAD_RELATION">
+    <property key="PartyRelationshipType.partyRelationshipName.LEAD_REL">
         <value xml:lang="en">Lead relation</value>
         <value xml:lang="es">Relación con lead</value>
         <value xml:lang="fr">Relation principale</value>
@@ -1021,6 +1033,10 @@
         <value xml:lang="th">บริษัทในเครือของการขาย</value>
         <value xml:lang="zh">附属销售</value>
     </property>
+    <property key="PartyRelationshipType.partyRelationshipName.SPOUSE">
+        <value xml:lang="en">Spouse</value>
+        <value xml:lang="it">Sposo</value>
+    </property>
     <property key="PartyRelationshipType.partyRelationshipName.SUPPLIER_REL">
         <value xml:lang="de">Lieferant</value>
         <value xml:lang="en">Supplier</value>
@@ -1165,6 +1181,10 @@
         <value xml:lang="fr">Compte principal</value>
         <value xml:lang="it">Utenza leader</value>
     </property>
+    <property key="RoleType.description.ADDRESSEE">
+        <value xml:lang="en">Addressee</value>
+        <value xml:lang="it">Indirizzi</value>
+    </property>
     <property key="RoleType.description.ADMIN">
         <value xml:lang="de">Administrator</value>
         <value xml:lang="en">Administrator</value>
@@ -1231,6 +1251,10 @@
         <value xml:lang="th">ตัวแทนจำหน่ายอัตโนมัติ</value>
         <value xml:lang="zh">自动代理人</value>
     </property>
+    <property key="RoleType.description.BCC">
+        <value xml:lang="en">Blind Copy</value>
+        <value xml:lang="it">Copia nascosta</value>
+    </property>
     <property key="RoleType.description.BILL_FROM_VENDOR">
         <value xml:lang="de">Rechnung vom Lieferant</value>
         <value xml:lang="en">Bill-From-Vendor</value>
@@ -1330,6 +1354,10 @@
         <value xml:lang="th">บันทึกข้อมูลส่วนตัวของผู้ใช้</value>
         <value xml:lang="zh">博客用户</value>
     </property>
+    <property key="RoleType.description.BULK_CUSTOMER">
+        <value xml:lang="en">Bulk Customer</value>
+        <value xml:lang="it">Grosso cliente</value>
+    </property>
     <property key="RoleType.description.BUYER">
         <value xml:lang="de">Käufer</value>
         <value xml:lang="en">Buyer</value>
@@ -1374,6 +1402,10 @@
         <value xml:lang="th">ปฏิทินของตัวแทน</value>
         <value xml:lang="zh">日历代表</value>
     </property>
+    <property key="RoleType.description.CAL_HOST">
+        <value xml:lang="en">Calendar Host</value>
+        <value xml:lang="it">Ospite calendario</value>
+    </property>
     <property key="RoleType.description.CAL_ORGANIZER">
         <value xml:lang="de">Kalenderorganisator</value>
         <value xml:lang="en">Calendar Organizer</value>
@@ -1418,6 +1450,10 @@
         <value xml:lang="th">เจ้าหน้าที่การเงิน</value>
         <value xml:lang="zh">出纳员</value>
     </property>
+    <property key="RoleType.description.CC">
+        <value xml:lang="en">Carbon Copy</value>
+        <value xml:lang="it">Copia conoscenza</value>
+    </property>
     <property key="RoleType.description.CLIENT">
         <value xml:lang="de">Klient</value>
         <value xml:lang="en">Client</value>
@@ -1490,6 +1526,34 @@
         <value xml:lang="th">ติดต่อ</value>
         <value xml:lang="zh">联系</value>
     </property>
+    <property key="RoleType.description.CONTENT">
+        <value xml:lang="en">Content Member</value>
+        <value xml:lang="it">Membro contenuto</value>
+    </property>
+    <property key="RoleType.description.CONTENT_ADMIN">
+        <value xml:lang="en">Content Administrator</value>
+        <value xml:lang="it">Amministratore contenuto</value>
+    </property>
+    <property key="RoleType.description.CONTENT_AUTHOR">
+        <value xml:lang="en">Content Author</value>
+        <value xml:lang="it">Autore contenuto</value>
+    </property>
+    <property key="RoleType.description.CONTENT_EDITOR">
+        <value xml:lang="en">Content Editor</value>
+        <value xml:lang="it">Redattore contenuto</value>
+    </property>
+    <property key="RoleType.description.CONTENT_GUEST">
+        <value xml:lang="en">Content Guest</value>
+        <value xml:lang="it">Ospite contenuto</value>
+    </property>
+    <property key="RoleType.description.CONTENT_PUBLISHER">
+        <value xml:lang="en">Content Publisher</value>
+        <value xml:lang="it">Editore contenuto</value>
+    </property>
+    <property key="RoleType.description.CONTENT_USER">
+        <value xml:lang="en">Content User</value>
+        <value xml:lang="it">Utente contenuto</value>
+    </property>
     <property key="RoleType.description.CONTRACTOR">
         <value xml:lang="de">Vertragspartner</value>
         <value xml:lang="en">Contractor</value>
@@ -1556,6 +1620,10 @@
         <value xml:lang="th">แผนก</value>
         <value xml:lang="zh">分部</value>
     </property>
+    <property key="RoleType.description.EMAIL_ADMIN">
+        <value xml:lang="en">Email Administrator</value>
+        <value xml:lang="it">Amministratore email</value>
+    </property>
     <property key="RoleType.description.EMPLOYEE">
         <value xml:lang="de">Angestellter</value>
         <value xml:lang="en">Employee</value>
@@ -1589,6 +1657,22 @@
         <value xml:lang="th">สมาชิกครอบครัว</value>
         <value xml:lang="zh">家庭成员</value>
     </property>
+    <property key="RoleType.description.FAM_ASSIGNEE">
+        <value xml:lang="en">Fixed Asset Maint Assignee</value>
+        <value xml:lang="it">Assegna manutenzione cespite</value>
+    </property>
+    <property key="RoleType.description.FAM_MANAGER">
+        <value xml:lang="en">Maintenance Manager or Supervisor</value>
+        <value xml:lang="it">Gestione manutenzione o supervisore</value>
+    </property>
+    <property key="RoleType.description.FAM_SUPPLIER">
+        <value xml:lang="en">Maintenance Supplier or Service</value>
+        <value xml:lang="it">Manutenzione fornitore o servizio</value>
+    </property>
+    <property key="RoleType.description.FAM_WORKER">
+        <value xml:lang="en">Maintenance Worker</value>
+        <value xml:lang="it">Impiegato manutenzione</value>
+    </property>
     <property key="RoleType.description.HOSTING_SERVER">
         <value xml:lang="de">Hosting Server</value>
         <value xml:lang="en">Hosting Server</value>
@@ -1715,6 +1799,10 @@
         <value xml:lang="th">หน่วยองค์กร</value>
         <value xml:lang="zh">团体单位</value>
     </property>
+    <property key="RoleType.description.ORIGINATOR">
+        <value xml:lang="en">Originator</value>
+        <value xml:lang="it">Iniziatore</value>
+    </property>
     <property key="RoleType.description.OTHER_INTERNAL_ORGAN">
         <value xml:lang="de">Andere interne Organisationseinheit</value>
         <value xml:lang="en">Other Internal</value>
@@ -2029,6 +2117,14 @@
         <value xml:lang="th">การส่งของถึงลูกค้า</value>
         <value xml:lang="zh">收货的客户</value>
     </property>
+    <property key="RoleType.description.SPONSOR">
+        <value xml:lang="en">Sponsor</value>
+        <value xml:lang="it">Sponsorizzatore</value>
+    </property>
+    <property key="RoleType.description.SPOUSE">
+        <value xml:lang="en">Spouse</value>
+        <value xml:lang="it">Sposo</value>
+    </property>
     <property key="RoleType.description.STOCKER">
         <value xml:lang="de">Magaziner</value>
         <value xml:lang="en">Stocker</value>
@@ -2195,6 +2291,18 @@
         <value xml:lang="th">ข้อสรุปความเห็นชอบ</value>
         <value xml:lang="zh">合同终止</value>
     </property>
+    <property key="TermType.description.CFR">
+        <value xml:lang="en">Incoterm Cost and Freight</value>
+        <value xml:lang="it">Costi e spese di trasporto incoterm</value>
+    </property>
+    <property key="TermType.description.CIF">
+        <value xml:lang="en">Incoterm Cost, Insurance and Freight</value>
+        <value xml:lang="it">Costi, assicurazione e spese di trasporto incoterm</value>
+    </property>
+    <property key="TermType.description.CIP">
+        <value xml:lang="en">Incoterm Carriage and Insurance Paid to</value>
+        <value xml:lang="it">Trasporto e assicurazione pagata incoterm</value>
+    </property>
     <property key="TermType.description.CLAUSE_FOR_RENEWAL">
         <value xml:lang="de">Erneuerungsbedingungen</value>
         <value xml:lang="en">Clause For Renewal</value>
@@ -2218,6 +2326,30 @@
         <value xml:lang="th">งานที่รับผิดชอบ</value>
         <value xml:lang="zh">佣金</value>
     </property>
+    <property key="TermType.description.CPT">
+        <value xml:lang="en">Incoterm Carriage Paid To</value>
+        <value xml:lang="it">Trasporto pagata incoterm</value>
+    </property>
+    <property key="TermType.description.DAF">
+        <value xml:lang="en">Incoterm Delivered At Frontier</value>
+        <value xml:lang="it">Consegnato alla frontiera incoterm</value>
+    </property>
+    <property key="TermType.description.DDP">
+        <value xml:lang="en">Incoterm Delivered Duty Paid</value>
+        <value xml:lang="it">Dazio pagato alla consegna incoterm</value>
+    </property>
+    <property key="TermType.description.DDU">
+        <value xml:lang="en">Incoterm Delivered Duty Unpaid</value>
+        <value xml:lang="it">Dazio non pagato alla consegna incoterm</value>
+    </property>
+    <property key="TermType.description.DEQ">
+        <value xml:lang="en">Incoterm Delivered Ex Quay</value>
+        <value xml:lang="it">Consegnato ex banchina incoterm</value>
+    </property>
+    <property key="TermType.description.DES">
+        <value xml:lang="en">Incoterm Delivered Ex Ship</value>
+        <value xml:lang="it">Consegnato ex spedizione incoterm</value>
+    </property>
     <property key="TermType.description.EXCLUSIVE_RELATIONSH">
         <value xml:lang="de">Exklusivverhältnis</value>
         <value xml:lang="en">Exclusive Relationship</value>
@@ -2230,6 +2362,18 @@
         <value xml:lang="th">ความสัมพันธ์พิเศษ</value>
         <value xml:lang="zh">排他关系</value>
     </property>
+    <property key="TermType.description.EXW">
+        <value xml:lang="en">Incoterm Ex Works</value>
+        <value xml:lang="it">Ex fabbrica incoterm</value>
+    </property>
+    <property key="TermType.description.FAS">
+        <value xml:lang="en">Incoterm Free Alongside Ship</value>
+        <value xml:lang="it">Gratis accanto alla spedizione incoterm</value>
+    </property>
+    <property key="TermType.description.FCA">
+        <value xml:lang="en">Incoterm Free Carrier</value>
+        <value xml:lang="it">Gratis spedizioniere incoterm</value>
+    </property>
     <property key="TermType.description.FINANCIAL_TERM">
         <value xml:lang="de">Finanzielles</value>
         <value xml:lang="en">Financial</value>
@@ -2356,6 +2500,22 @@
         <value xml:lang="th">การชำระเงิน(ทางอินเทอร์เนต)</value>
         <value xml:lang="zh">支付 (工作日)</value>
     </property>
+    <property key="TermType.description.FIN_PAY_NETDAYS_1">
+        <value xml:lang="en">Payment net days, part 1</value>
+        <value xml:lang="it">Pagamento netto giorni, parte 1</value>
+    </property>
+    <property key="TermType.description.FIN_PAY_NETDAYS_2">
+        <value xml:lang="en">Payment net days, part 2</value>
+        <value xml:lang="it">Pagamento netto giorni, parte 2</value>
+    </property>
+    <property key="TermType.description.FIN_PAY_NETDAYS_3">
+        <value xml:lang="en">Payment net days, part 3</value>
+        <value xml:lang="it">Pagamento netto giorni, parte 3</value>
+    </property>
+    <property key="TermType.description.FOB">
+        <value xml:lang="en">Incoterm Free On Board</value>
+        <value xml:lang="it">Gratis a bordo incoterm</value>
+    </property>
     <property key="TermType.description.INCENTIVE">
         <value xml:lang="de">Prämie</value>
         <value xml:lang="en">Incentive</value>
@@ -2368,6 +2528,10 @@
         <value xml:lang="th">สิ่งกระตุ้น</value>
         <value xml:lang="zh">动机</value>
     </property>
+    <property key="TermType.description.INCO_TERM">
+        <value xml:lang="en">Incoterm</value>
+        <value xml:lang="it">Incoterm</value>
+    </property>
     <property key="TermType.description.INDEMNIFICATION">
         <value xml:lang="de">Entschädigung</value>
         <value xml:lang="en">Indemnification</value>
@@ -2416,6 +2580,18 @@
         <value xml:lang="th">อื่น ๆ </value>
         <value xml:lang="zh">其它</value>
     </property>
+    <property key="TermType.description.PURCHASING">
+        <value xml:lang="en">Purchasing</value>
+        <value xml:lang="it">Acquisto</value>
+    </property>
+    <property key="TermType.description.PURCH_FREIGHT">
+        <value xml:lang="en">Preferred Freight</value>
+        <value xml:lang="it">Spese di trasporto preferite</value>
+    </property>
+    <property key="TermType.description.PURCH_VENDOR_ID">
+        <value xml:lang="en">Vendor Customer ID</value>
+        <value xml:lang="it">Cliente fornitore</value>
+    </property>
     <property key="TermType.description.THRESHOLD">
         <value xml:lang="de">Grenzwert</value>
         <value xml:lang="en">Threshold</value>

Modified: ofbiz/trunk/applications/product/config/ProductEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductEntityLabels.xml?rev=748715&r1=748714&r2=748715&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductEntityLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductEntityLabels.xml Fri Feb 27 21:52:03 2009
@@ -285,6 +285,10 @@
         <value xml:lang="th">คลังข้อมูล</value>
         <value xml:lang="zh">仓库</value>
     </property>
+    <property key="GoodIdentificationType.description.GOOGLE_ID">
+        <value xml:lang="en">Google Id</value>
+        <value xml:lang="it">Codice Google</value>
+    </property>
     <property key="GoodIdentificationType.description.ISBN">
         <value xml:lang="de">ISBN</value>
         <value xml:lang="en">ISBN</value>
@@ -632,6 +636,10 @@
         <value xml:lang="th">ส่วนประกอบสินค้าโดยแท้จริง</value>
         <value xml:lang="zh">实际产品组件</value>
     </property>
+    <property key="ProductAssocType.description.PRODUCT_CONF">
+        <value xml:lang="en">Configurable product instance</value>
+        <value xml:lang="it">Prodotto configurabile</value>
+    </property>
     <property key="ProductAssocType.description.PRODUCT_INCOMPATABLE">
         <value xml:lang="de">Inkompatibel</value>
         <value xml:lang="en">Incompatable</value>
@@ -738,6 +746,10 @@
         <value xml:lang="th">รายการลักษณะเฉพาะ</value>
         <value xml:lang="zh">独有的明细</value>
     </property>
+    <property key="ProductCategoryContentType.description.CATEGORY_IMAGE_ALT">
+        <value xml:lang="en">Category Image Alt Text</value>
+        <value xml:lang="it">Testo alternativo immagine categoria</value>
+    </property>
     <property key="ProductCategoryContentType.description.CATEGORY_IMAGE_URL">
         <value xml:lang="de">Kategorie Bild URL</value>
         <value xml:lang="en">Category Image URL</value>
@@ -782,6 +794,14 @@
         <value xml:lang="th">ท้ายกระดาษ</value>
         <value xml:lang="zh">页脚</value>
     </property>
+    <property key="ProductCategoryContentType.description.LINK1_ALT_TEXT">
+        <value xml:lang="en">Link 1 Alt Text</value>
+        <value xml:lang="it">Testo alternativo link 1</value>
+    </property>
+    <property key="ProductCategoryContentType.description.LINK2_ALT_TEXT">
+        <value xml:lang="en">Link 2 Alt Text</value>
+        <value xml:lang="it">Testo alternativo link 2</value>
+    </property>
     <property key="ProductCategoryContentType.description.LONG_DESCRIPTION">
         <value xml:lang="de">Beschreibung - lang</value>
         <value xml:lang="en">Description - Long</value>
@@ -903,6 +923,34 @@
         <value xml:lang="th">วิธีใช้</value>
         <value xml:lang="zh">用途</value>
     </property>
+    <property key="ProductContentType.description.ADDITIONAL_IMAGE_1">
+        <value xml:lang="en">Image - Additional View 1</value>
+        <value xml:lang="it">Immagine - Vista adggiuntiva 1</value>
+    </property>
+    <property key="ProductContentType.description.ADDITIONAL_IMAGE_2">
+        <value xml:lang="en">Image - Additional View 2</value>
+        <value xml:lang="it">Immagine - Vista adggiuntiva 2</value>
+    </property>
+    <property key="ProductContentType.description.ADDITIONAL_IMAGE_3">
+        <value xml:lang="en">Image - Additional View 3</value>
+        <value xml:lang="it">Immagine - Vista adggiuntiva 3</value>
+    </property>
+    <property key="ProductContentType.description.ADDITIONAL_IMAGE_4">
+        <value xml:lang="en">Image - Additional View 4</value>
+        <value xml:lang="it">Immagine - Vista adggiuntiva 4</value>
+    </property>
+    <property key="ProductContentType.description.ADDTOCART_IMAGE">
+        <value xml:lang="en">Add To Cart Image</value>
+        <value xml:lang="it">Aggiungi immagine al carrello</value>
+    </property>
+    <property key="ProductContentType.description.ADDTOCART_LABEL">
+        <value xml:lang="en">Add To Cart Label</value>
+        <value xml:lang="it">Aggiungi label al carrello</value>
+    </property>
+    <property key="ProductContentType.description.DELIVERY_INFO">
+        <value xml:lang="en">Delivery Info</value>
+        <value xml:lang="it">Informazioni sulla consegna</value>
+    </property>
     <property key="ProductContentType.description.DESCRIPTION">
         <value xml:lang="de">Beschreibung</value>
         <value xml:lang="en">Description</value>
@@ -1062,6 +1110,10 @@
         <value xml:lang="th">สิทธ์ในการออนไลน์</value>
         <value xml:lang="zh">在线访问</value>
     </property>
+    <property key="ProductContentType.description.ORIGINAL_IMAGE_URL">
+        <value xml:lang="en">Image - Original</value>
+        <value xml:lang="it">Immagine - originale</value>
+    </property>
     <property key="ProductContentType.description.PRICE_DETAIL_TEXT">
         <value xml:lang="de">Preisdetail Text</value>
         <value xml:lang="en">Price Detail Text</value>
@@ -1084,6 +1136,10 @@
         <value xml:lang="th">ชื่อสินค้า</value>
         <value xml:lang="zh">产品名称</value>
     </property>
+    <property key="ProductContentType.description.SHORT_SALES_PITCH">
+        <value xml:lang="en">Short Sales Pitch</value>
+        <value xml:lang="it">Piccolo discorso di vendita</value>
+    </property>
     <property key="ProductContentType.description.SMALL_IMAGE_ALT">
         <value xml:lang="de">Bild Alt Text - Klein</value>
         <value xml:lang="en">Image Alt Text - Small</value>
@@ -1115,6 +1171,10 @@
         <value xml:lang="th">คำแนะนำพิเศษ</value>
         <value xml:lang="zh">特别说明</value>
     </property>
+    <property key="ProductContentType.description.TERMS_AND_CONDS">
+        <value xml:lang="en">Terms and Conditions</value>
+        <value xml:lang="it">Termini e condizioni</value>
+    </property>
     <property key="ProductContentType.description.UNIQUE_INGREDIENTS">
         <value xml:lang="de">Einzigartige Inhaltsstoffe</value>
         <value xml:lang="en">Unique Ingredients</value>
@@ -1207,6 +1267,34 @@
         <value xml:lang="it">Caratteristiche danneggiate</value>
         <value xml:lang="th">Hazmat Features</value>
     </property>
+    <property key="ProductFeatureCategory.description.1001">
+        <value xml:lang="en">Model Year Features</value>
+        <value xml:lang="it">Caratteristiche anno modello</value>
+    </property>
+    <property key="ProductFeatureCategory.description.1002">
+        <value xml:lang="en">Equipment Class Features</value>
+        <value xml:lang="it">Caratteristiche classe attrezzatura</value>
+    </property>
+    <property key="ProductFeatureCategory.description.2000">
+        <value xml:lang="en">Gift Card Features</value>
+        <value xml:lang="it">Caratteristiche carta regalo</value>
+    </property>
+    <property key="ProductFeatureCategory.description.2100">
+        <value xml:lang="en">Account Features</value>
+        <value xml:lang="it">Caratteristiche utenza</value>
+    </property>
+    <property key="ProductFeatureCategory.description.3000">
+        <value xml:lang="en">Taste</value>
+        <value xml:lang="it">Caratteristiche gusto</value>
+    </property>
+    <property key="ProductFeatureCategory.description.8000">
+        <value xml:lang="en">License Features</value>
+        <value xml:lang="it">Caratteristiche licenza</value>
+    </property>
+    <property key="ProductFeatureCategory.description.9000">
+        <value xml:lang="en">Widget Features</value>
+        <value xml:lang="it">Caratteristiche widget</value>
+    </property>
     <property key="ProductFeatureIactnType.description.FEATURE_IACTN_DEPEND">
         <value xml:lang="de">Abhängiges Merkmal</value>
         <value xml:lang="en">FEATURE_IACTN_DEPEND</value>
@@ -1555,6 +1643,26 @@
         <value xml:lang="it">vendite</value>
         <value xml:lang="th">ขาย</value>
     </property>
+    <property key="ProductMaintType.description.CHASSIS_LUBE">
+        <value xml:lang="en">Chassis Lubrication</value>
+        <value xml:lang="it">Lubrificazione telaio</value>
+    </property>
+    <property key="ProductMaintType.description.CHECK_BATTERY">
+        <value xml:lang="en">Check Battery</value>
+        <value xml:lang="it">Controllo batteria</value>
+    </property>
+    <property key="ProductMaintType.description.HVAC_CHECK_REFR">
+        <value xml:lang="en">Check/Recharge Refrigerant</value>
+        <value xml:lang="it">Controllo/Ricarica refrigerante</value>
+    </property>
+    <property key="ProductMaintType.description.HVAC_MAINT">
+        <value xml:lang="en">HVAC Maintenance</value>
+        <value xml:lang="it">Manutenzione HVAC</value>
+    </property>
+    <property key="ProductMaintType.description.HVAC_REPLACE_FILTER">
+        <value xml:lang="en">Replace Air Filter</value>
+        <value xml:lang="it">Sostituzione filtro aria</value>
+    </property>
     <property key="ProductMaintType.description.OIL_CHANGE">
         <value xml:lang="de">Ölwechsel</value>
         <value xml:lang="en">Oil Change</value>
@@ -1588,6 +1696,10 @@
         <value xml:lang="th">แทนที่แบตเตอรี่</value>
         <value xml:lang="zh">更换电池</value>
     </property>
+    <property key="ProductMaintType.description.ROTATE_TIRES">
+        <value xml:lang="en">Rotate Tires</value>
+        <value xml:lang="it">Invertire le gomme</value>
+    </property>
     <property key="ProductMaintType.description.SERP_BELT">
         <value xml:lang="de">Keilriemen Ersatz</value>
         <value xml:lang="en">Serpentine Belt Replacement</value>
@@ -1599,6 +1711,10 @@
         <value xml:lang="th">การแทนที่ทางโค้งคดเคี้ยว</value>
         <value xml:lang="zh">更换平带</value>
     </property>
+    <property key="ProductMaintType.description.TUNE_UP">
+        <value xml:lang="en">Tune Up</value>
+        <value xml:lang="it">Mettere a punto</value>
+    </property>
     <property key="ProductMaintType.description.VEHICLE_MAINT">
         <value xml:lang="de">Fahrzeug Instandhaltung</value>
         <value xml:lang="en">Vehicle Maintenance</value>
@@ -1654,6 +1770,10 @@
         <value xml:lang="th">มิเตอร์เวลาเครื่องยนต์</value>
         <value xml:lang="zh">马达计时器</value>
     </property>
+    <property key="ProductMeterType.description.ODOMETER">
+        <value xml:lang="en">Odometer</value>
+        <value xml:lang="it">Odometro</value>
+    </property>
     <property key="ProductMeterType.description.SPEEDOMETER">
         <value xml:lang="de">Geschwindigkeitsmesser</value>
         <value xml:lang="en">Speedometer</value>
@@ -1973,6 +2093,10 @@
         <value xml:lang="th">สามารถสร้างสินค้า</value>
         <value xml:lang="zh">可配置商品</value>
     </property>
+    <property key="ProductType.description.AGGREGATED_CONF">
+        <value xml:lang="en">Configurable Good Configuration</value>
+        <value xml:lang="it">Configurazione beni configurabili</value>
+    </property>
     <property key="ProductType.description.ASSET_USAGE">
         <value xml:lang="de">Anlageverwendung</value>
         <value xml:lang="en">Fixed Asset Usage</value>
@@ -2389,6 +2513,14 @@
         <value xml:lang="th">สูญเสีย</value>
         <value xml:lang="zh">丢失</value>
     </property>
+    <property key="VarianceReason.description.VAR_MISSHIP_ORDERED">
+        <value xml:lang="en">Mis-shipped Item Ordered (+)</value>
+        <value xml:lang="it">Riga non-spedita ordinata (+)</value>
+    </property>
+    <property key="VarianceReason.description.VAR_MISSHIP_SHIPPED">
+        <value xml:lang="en">Mis-shipped Item Shipped (-)</value>
+        <value xml:lang="it">Riga non-spedita spedita (-)</value>
+    </property>
     <property key="VarianceReason.description.VAR_SAMPLE">
         <value xml:lang="de">Muster</value>
         <value xml:lang="en">Sample (Giveaway)</value>
@@ -2411,4 +2543,4 @@
         <value xml:lang="th">ของเถื่อน</value>
         <value xml:lang="zh">被盗</value>
     </property>
-</resource>
\ No newline at end of file
+</resource>

Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=748715&r1=748714&r2=748715&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Fri Feb 27 21:52:03 2009
@@ -8008,6 +8008,10 @@
         <value xml:lang="it">Righe Configurazioni Trovate</value>
         <value xml:lang="th">พบการสร้างรายการ</value>
     </property>
+    <property key="ProductConfigOptionList">
+        <value xml:lang="en">Config Option List</value>
+        <value xml:lang="it">Lista opzioni di prodotti configurabili</value>
+    </property>
     <property key="ProductConfigOptions">
         <value xml:lang="de">Konfigurationsoptionen</value>
         <value xml:lang="en">Config Options</value>
@@ -8369,6 +8373,10 @@
         <value xml:lang="th">สร้างหมวดหมู่ใหม่</value>
         <value xml:lang="zh">新建分类</value>
     </property>
+    <property key="ProductCreateNewConfigOptions">
+        <value xml:lang="en">Create New Config Options</value>
+        <value xml:lang="it">Creare nuove opzioni di prodotti configurabili</value>
+    </property>
     <property key="ProductCreateNewFacility">
         <value xml:lang="de">Neue Einrichtung erstellen</value>
         <value xml:lang="en">Create New Facility</value>

Modified: ofbiz/trunk/applications/product/webapp/catalog/config/ConfigForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/config/ConfigForms.xml?rev=748715&r1=748714&r2=748715&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/config/ConfigForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/config/ConfigForms.xml Fri Feb 27 21:52:03 2009
@@ -203,7 +203,7 @@
         default-table-style="basic-table" odd-row-style="alternate-row" paginate-target="FindProductConfigItems"
         target="" header-row-style="header-row-2" paginate="true">
         <auto-fields-entity entity-name="ProductConfigOption" default-field-type="display" />
-        <field name="configItemId" widget-style="buttontext" title="${uiLabelMap.Name}" ><hyperlink target="EditProductConfigOptions?configItemId=${configItemId}&amp;configOptionId=${configOptionId}" description="${configOptionId} - ${configOptionName}"/></field>
+        <field name="configItemId" widget-style="buttontext" title="${uiLabelMap.CommonName}" ><hyperlink target="EditProductConfigOptions?configItemId=${configItemId}&amp;configOptionId=${configOptionId}" description="${configOptionId} - ${configOptionName}"/></field>
         <field name="configOptionId" ><hidden/></field>
         <field name="configOptionName" ><hidden/></field>
         <field name="remove" widget-style="buttontext" ><hyperlink target="deleteProductConfigOption?configItemId=${configItemId}&amp;configOptionId=${configOptionId}" description="${uiLabelMap.Remove}"/></field>
@@ -220,7 +220,7 @@
         <auto-fields-service service-name="createProductConfigProduct" default-field-type="display"/>
         <field name="configItemId" ><hidden/></field>
         <field name="configOptionId" ><hidden/></field>
-        <field name="productId" widget-style="buttontext" title="${uiLabelMap.Product}" ><hyperlink target="EditProductConfigOptions?configItemId=${configItemId}&amp;configOptionId=${configOptionId}&amp;productId=${product.productId}" description="${product.productId} - ${product.productName}"/></field>
+        <field name="productId" widget-style="buttontext"><hyperlink target="EditProductConfigOptions?configItemId=${configItemId}&amp;configOptionId=${configOptionId}&amp;productId=${product.productId}" description="${product.productId} - ${product.productName}"/></field>
         <field name="remove" widget-style="buttontext" ><hyperlink target="deleteProductConfigProduct?configItemId=${configItemId}&amp;configOptionId=${configOptionId}&amp;productId=${product.productId}" description="${uiLabelMap.Remove}"/></field>
     </form>
     

Modified: ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml?rev=748715&r1=748714&r2=748715&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml Fri Feb 27 21:52:03 2009
@@ -70,7 +70,7 @@
             <widgets>
                 <decorator-screen name="CommonConfigDecorator">
                     <decorator-section name="body">
-                        <screenlet title="${uiLabelMap.PageTitleFindConfigItems} ${uiLabelMap.Option}">
+                        <screenlet title="${uiLabelMap.PageTitleFindConfigItems}">
                             <link target="EditProductConfigItem" text="${uiLabelMap.CommonCreateNew}" style="buttontext"/>
                             <include-form location="component://product/webapp/catalog/config/ConfigForms.xml" name="FindProductConfigItemsFrom"/>
                         </screenlet>
@@ -156,19 +156,20 @@
     <screen name="configOptions">
         <section>
             <widgets>
-                <screenlet title="${uiLabelMap.Config} ${uiLabelMap.Options}">
+                <screenlet title="${uiLabelMap.ProductConfigOptionList}">
                     <include-form name="ProductConfigOptionList" location="component://product/webapp/catalog/config/ConfigForms.xml"/>
                 </screenlet>
                 <section>
                     <condition><not><if-empty field="configOptionId"/></not></condition>
                     <widgets>
                         <screenlet title="${uiLabelMap.PageTitleEditConfigOptions}">
-                            <link style="buttontext" text="New Config Options" target="EditProductConfigOptions?configItemId=${configItemId}"/>
+                            <link style="buttontext" text="${uiLabelMap.ProductCreateNewConfigOptions}" target="EditProductConfigOptions?configItemId=${configItemId}"/>
                             <include-form name="CreateConfigOption" location="component://product/webapp/catalog/config/ConfigForms.xml"/>
                         </screenlet>
                     </widgets>
                     <fail-widgets>
-                        <screenlet title="${uiLabelMap.Create} ${uiLabelMap.New} ${uiLabelMap.Config} ${uiLabelMap.Options}">
+                    
+                        <screenlet title="${uiLabelMap.ProductCreateNewConfigOptions}">
                             <include-form name="CreateConfigOption" location="component://product/webapp/catalog/config/ConfigForms.xml"/>
                         </screenlet>
                     </fail-widgets>
@@ -271,7 +272,7 @@
             <widgets>
                 <decorator-screen name="CommonConfigDecorator">
                     <decorator-section name="body">
-                        <screenlet title="${uiLabelMap.Product} ${uiLabelMap.Lists}">
+                        <screenlet title="${uiLabelMap.PageTitleEditProductConfigItemContent}">
                             <include-form name="ListProductConfigItem" location="component://product/webapp/catalog/config/ConfigForms.xml"/>
                         </screenlet>
                     </decorator-section>