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

svn commit: r725466 - in /ofbiz/trunk/applications: accounting/config/ content/config/ party/config/ product/config/

Author: mrisaliti
Date: Wed Dec 10 14:18:58 2008
New Revision: 725466

URL: http://svn.apache.org/viewvc?rev=725466&view=rev
Log:
Some wrong locales or duplicated locales while testing the new Label Manager.

Modified:
    ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
    ofbiz/trunk/applications/content/config/ContentErrorUiLabels.xml
    ofbiz/trunk/applications/content/config/ContentUiLabels.xml
    ofbiz/trunk/applications/party/config/PartyEntityLabels.xml
    ofbiz/trunk/applications/party/config/PartyUiLabels.xml
    ofbiz/trunk/applications/product/config/ProductEntityLabels.xml
    ofbiz/trunk/applications/product/config/ProductUiLabels.xml

Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=725466&r1=725465&r2=725466&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Wed Dec 10 14:18:58 2008
@@ -30,8 +30,8 @@
         <value xml:lang="nl">Bankrekening: AHC/Electronic Check </value>
         <value xml:lang="ro">Cont EFT : AHC/Cecuri Electronice</value>
         <value xml:lang="ru">Текущий счет</value>
-        <value xml:lang="th">บัญชีธนาคาร: AHC/ตรวจสอบระบบอิเล็กทรอนิกส์</value>
         <value xml:lang="zh">电子资金转账账户:金融机构委员会/电子支票</value>
+        <value xml:lang="th">บัญชีธนาคาร: AHC/ตรวจสอบระบบอิเล็กทรอนิกส์</value>
     </property>
     <property key="AccountingAccount">
         <value xml:lang="ar">حساب</value>
@@ -126,8 +126,8 @@
         <value xml:lang="es">cuentas</value>
         <value xml:lang="fr">Comptes</value>
         <value xml:lang="it">Conti</value>
-        <value xml:lang="nl">Rekeningen</value>
         <value xml:lang="ro">Conturi</value>
+        <value xml:lang="nl">Rekeningen</value>
         <value xml:lang="ru">Счета</value>
         <value xml:lang="th">บัญชี</value>
         <value xml:lang="zh">账户</value>
@@ -135,36 +135,36 @@
     <property key="AccountingAcctRecon">
         <value xml:lang="en">Account Reconciliation</value>
         <value xml:lang="fr">Réconciliation</value>
-        <value xml:lang="it">Riconciliazione</value>
         <value xml:lang="nl">Afstemming rekening</value>
+        <value xml:lang="it">Riconciliazione</value>
         <value xml:lang="th">การเช็คยอดบัญชี</value>
     </property>
     <property key="AccountingAcctRecons">
         <value xml:lang="en">Account Reconciliations</value>
         <value xml:lang="fr">Réconciliations</value>
-        <value xml:lang="it">Riconciliazioni</value>
         <value xml:lang="nl">Afstemmingen</value>
+        <value xml:lang="it">Riconciliazioni</value>
         <value xml:lang="th">การเช็คยอดบัญชี</value>
     </property>
     <property key="AccountingAcctgTransEntries">
         <value xml:lang="en">Accounting Transactions Entries</value>
         <value xml:lang="fr">Entrées de transactions comptables</value>
-        <value xml:lang="it">Righe Prime Note</value>
         <value xml:lang="nl">Ingaves Boekhoudtransacties</value>
+        <value xml:lang="it">Righe Prime Note</value>
         <value xml:lang="th">รายการบัญชีรายรับ</value>
     </property>
     <property key="AccountingAcctgTranss">
         <value xml:lang="en">Accounting Transactions</value>
         <value xml:lang="fr">Transactions comptables</value>
-        <value xml:lang="it">Prime Note</value>
         <value xml:lang="nl">Boekhoudtransacties</value>
+        <value xml:lang="it">Prime Note</value>
         <value xml:lang="th">รายการบัญชี</value>
     </property>
     <property key="AccountingActualCurrencyAmount">
         <value xml:lang="en">Actual Currency Amount</value>
         <value xml:lang="fr">Valeur réelle en devise</value>
-        <value xml:lang="it">Attuale Importo in Valuta</value>
         <value xml:lang="nl">Hoeveelheid werkelijke valuta</value>
+        <value xml:lang="it">Attuale Importo in Valuta</value>
         <value xml:lang="ru">Действительная сумма валюты</value>
         <value xml:lang="th">จำนวนเงินที่มีอยู่จริง</value>
     </property>
@@ -574,7 +574,7 @@
         <value xml:lang="th">จำนวนที่ประยุกต์ไม่ได้</value>
         <value xml:lang="zh">未付金额</value>
     </property>
-    <property key="AccountingAmountToUse">
+     <property key="AccountingAmountToUse">
         <value xml:lang="de">Betrag zur Verwendung</value>
         <value xml:lang="en">Amount To Use</value>
         <value xml:lang="es">Monto a usar</value>
@@ -837,6 +837,7 @@
         <value xml:lang="fr">Assigner le type facture d'achat au n° du compte de produit</value>
         <value xml:lang="nl">wijs inkoopfactuurtype toe aan GB-rekeningnr</value>
         <value xml:lang="th">กำหนดประเภทใบกำกับสินค้าการสั่งซื้อไปยังหมายเลขบัญชีประเภททั่วไป</value>
+
     </property>
     <property key="AccountingAssignSalesInvoiceToRevenue">
         <value xml:lang="ar">تعيين نوع فاتورة البيع إلى رقم حساب العائدات</value>
@@ -986,8 +987,8 @@
         <value xml:lang="en">Billing Account</value>
         <value xml:lang="es">Cta facturación</value>
         <value xml:lang="fr">Compte de facturation</value>
-        <value xml:lang="it">Conto Fatturazione</value>
         <value xml:lang="ja">請求先アカウント</value>
+        <value xml:lang="it">Conto Fatturazione</value>
         <value xml:lang="nl">Faktuur rekening</value>
         <value xml:lang="pt_PT">Conta para Pagamento</value>
         <value xml:lang="ro">Cont Facturare</value>
@@ -1319,8 +1320,8 @@
         <value xml:lang="es">Número de tarjeta</value>
         <value xml:lang="fr">N° de carte</value>
         <value xml:lang="hi_IN">कार्ड नम्बर</value>
-        <value xml:lang="it">Numero di carta</value>
         <value xml:lang="ja">カード番号</value>
+        <value xml:lang="it">Numero di carta</value>
         <value xml:lang="nl">Kaart nummer</value>
         <value xml:lang="pt_PT">Número do Cartão</value>
         <value xml:lang="ro">Numarul Cartii</value>
@@ -1763,8 +1764,8 @@
         <value xml:lang="es">Tarjeta de crédito</value>
         <value xml:lang="fr">Carte de crédit</value>
         <value xml:lang="hi_IN">कार्ड</value>
-        <value xml:lang="it">Carta di credito</value>
         <value xml:lang="ja">クレジットカード</value>
+        <value xml:lang="it">Carta di credito</value>
         <value xml:lang="nl">Krediet Kaart</value>
         <value xml:lang="pt_BR">Cartão de Crédito</value>
         <value xml:lang="pt_PT">Cartão de Crédito</value>
@@ -2011,8 +2012,8 @@
         <value xml:lang="es">Cuenta bancaria</value>
         <value xml:lang="fr">Compte de virement électronique</value>
         <value xml:lang="hi_IN">EFT खाता</value>
-        <value xml:lang="it">Conto EFT</value>
         <value xml:lang="ja">EFT Account</value>
+        <value xml:lang="it">Conto EFT</value>
         <value xml:lang="nl">Bank rekening</value>
         <value xml:lang="pt_PT">Conta EFT</value>
         <value xml:lang="ro">Cont EFT</value>
@@ -2136,8 +2137,8 @@
         <value xml:lang="es">Ingrese su número real y virtual de la tarjeta y su número pin para ingresar a su cuenta</value>
         <value xml:lang="fr">Entrez vos n° (réel et virtuel) de carte et code pour vous lier à votre compte</value>
         <value xml:lang="hi_IN">अपने ख़ाते मे जाने के लिये पिन नम्बर,</value>
-        <value xml:lang="it">Inserisci la tua carta fisica e virtuale e il numero pin per collegarlo al tuo conto</value>
         <value xml:lang="ja">Enter your physical and virtual card and pin number to link your account</value>
+        <value xml:lang="it">Inserisci la tua carta fisica e virtuale e il numero pin per collegarlo al tuo conto</value>
         <value xml:lang="nl">Voer uw kaart en pin nummer in om uw rekening te valideren</value>
         <value xml:lang="ro">Introdu cartea ta fizica si virtuala si numarul de pin pentru a te cupla cu contul tau.</value>
         <value xml:lang="ru">Введите вашу реальную или виртуальную карту и ПИН код для подключения к своей учетной записи</value>
@@ -2150,8 +2151,8 @@
         <value xml:lang="es">Ingrese el número de tarjeta y PIN para verificar su balance</value>
         <value xml:lang="fr">Entrez votre n° de carte cadeau et votre code pour vérifier le solde</value>
         <value xml:lang="hi_IN">रकम जानने के लिये पिन और उपहार कार्ड नम्बर दिजीये</value>
-        <value xml:lang="it">Inserisici il numero della carta omaggio ed il PIN per controllarne il bilancio</value>
         <value xml:lang="ja">Enter your gift card number and PIN to check the balance</value>
+        <value xml:lang="it">Inserisici il numero della carta omaggio ed il PIN per controllarne il bilancio</value>
         <value xml:lang="nl">Voer uw tegoedbon- en pin nummer in om het saldo op te vragen</value>
         <value xml:lang="ro">Introdu numarul cartii de omagiu, numarul Pin pentru a controla bilantul</value>
         <value xml:lang="ru">Введите номер дисконтной карты и ПИН для проверки баланса</value>
@@ -2298,8 +2299,8 @@
         <value xml:lang="es">Fecha de expiración</value>
         <value xml:lang="fr">Date d'expiration</value>
         <value xml:lang="hi_IN">खत्म होने कि तिथी</value>
-        <value xml:lang="it">Data scadenza</value>
         <value xml:lang="ja">有効期限</value>
+        <value xml:lang="it">Data scadenza</value>
         <value xml:lang="nl">Geldigheids datum</value>
         <value xml:lang="pt_PT">Validade do Cartão</value>
         <value xml:lang="ro">Data Expirata</value>
@@ -2652,8 +2653,8 @@
         <value xml:lang="es">Agencia de Gobierno</value>
         <value xml:lang="fr">Agence gouvernementale</value>
         <value xml:lang="it">Agenzia Governativa</value>
-        <value xml:lang="nl">Agent overheid</value>
         <value xml:lang="ro">Agentia Governativa</value>
+        <value xml:lang="nl">Agent overheid</value>
         <value xml:lang="ru">Государственное учреждение</value>
         <value xml:lang="th">ตัวแทนรัฐบาล</value>
         <value xml:lang="zh">政府机构</value>
@@ -3293,8 +3294,8 @@
     <property key="AccountingGlAccountTypeDefaults">
         <value xml:lang="en">GL Account Type Defaults</value>
         <value xml:lang="fr">Types par défaut de compte du GL</value>
-        <value xml:lang="it">Default Tipo Conto Contabilità Generale</value>
         <value xml:lang="nl">Standaardwaarden GB-rekeningtype</value>
+        <value xml:lang="it">Default Tipo Conto Contabilità Generale</value>
         <value xml:lang="th">ค่าเริ่มต้นอัตโนมัติของประเภทบัญชีแยกประเภททั่วไป</value>
     </property>
     <property key="AccountingGlAccounts">
@@ -4622,8 +4623,8 @@
         <value xml:lang="es">No hay cuenta de facturación</value>
         <value xml:lang="fr">Pas de compte de facturation</value>
         <value xml:lang="hi_IN">कोई भुगतान ख़ाता नही</value>
-        <value xml:lang="it">Nessun conto fatturazione</value>
         <value xml:lang="ja">No Billing Account</value>
+        <value xml:lang="it">Nessun conto fatturazione</value>
         <value xml:lang="nl">Geen factuur rekening</value>
         <value xml:lang="pt_PT">Sem Conta para Pagamento</value>
         <value xml:lang="ro">Nici-un Cont Facturatie</value>
@@ -4855,8 +4856,8 @@
         <value xml:lang="en">Offline Payment</value>
         <value xml:lang="es">Pago fuera de línea</value>
         <value xml:lang="fr">Paiement hors connexion</value>
-        <value xml:lang="it">Pagamento offline</value>
         <value xml:lang="ja">Offline Payment</value>
+        <value xml:lang="it">Pagamento offline</value>
         <value xml:lang="nl">Offline betalen</value>
         <value xml:lang="pt_PT">Pagamento Tradicional</value>
         <value xml:lang="ro">Plata Offline</value>
@@ -5052,8 +5053,8 @@
     <property key="AccountingPartyAccountsSummary">
         <value xml:lang="en">Accounts Summary</value>
         <value xml:lang="fr">Résumé des comptes</value>
-        <value xml:lang="it">Sommario Conti</value>
         <value xml:lang="nl">Samenvatting rekeningen</value>
+        <value xml:lang="it">Sommario Conti</value>
     </property>
     <property key="AccountingPartyBilledFrom">
         <value xml:lang="ar">مفوترة من طرف</value>
@@ -5088,7 +5089,7 @@
     </property>
     <property key="AccountingPartyGlAccounts">
         <value xml:lang="en">Party Gl Accounts</value>
-        <value xml:lang="fr">Comptes de tiers</value>
+        <value xml:lang="fr">Comptes d'acteur (GL)</value>
         <value xml:lang="nl">GB-rekeningen relatie</value>
         <value xml:lang="th">กลุ่มผู้ใช้บัญชีแยกประเภททั่วไป</value>
     </property>
@@ -5152,20 +5153,32 @@
         <value xml:lang="zh">会员角色列表</value>
     </property>
     <property key="AccountingPayment">
+        <value xml:lang="ar">تسديد</value>
         <value xml:lang="de">Bezahlung</value>
         <value xml:lang="en">Payment</value>
         <value xml:lang="es">Pago</value>
         <value xml:lang="fr">Paiement</value>
         <value xml:lang="it">Pagamento</value>
+        <value xml:lang="nl">Betaling</value>
+        <value xml:lang="pt_BR">Pagamento</value>
+        <value xml:lang="pt_PT">Pagamento</value>
+        <value xml:lang="ro">Plata</value>
+        <value xml:lang="ru">платеж</value>
         <value xml:lang="th">การชำระเงิน</value>
+        <value xml:lang="zh">支付</value>
     </property>
     <property key="AccountingPaymentAlreadyReceived">
+        <value xml:lang="ar">تسديد مستلم مسبقا</value>
         <value xml:lang="de">Bezahlung bereits erhalten</value>
         <value xml:lang="en">Payment Already Received</value>
         <value xml:lang="es">El pago ya fue recibido</value>
         <value xml:lang="fr">Paiement déjà reçu</value>
         <value xml:lang="it">Pagamento già ricevuto</value>
+        <value xml:lang="nl">Betaling reeds ontvangen</value>
+        <value xml:lang="ro">Plata incasata</value>
+        <value xml:lang="ru">Платеж уже получен</value>
         <value xml:lang="th">ได้รับการชำระเงินแล้ว</value>
+        <value xml:lang="zh">已收到支付</value>
     </property>
     <property key="AccountingPaymentInformation">
         <value xml:lang="ar">معلومات التسديد</value>
@@ -5230,20 +5243,6 @@
         <value xml:lang="th">ชำระเงินผ่าน WorldPay</value>
         <value xml:lang="zh">用WorldPay支付</value>
     </property>
-    <property key="AccountingPayment">
-        <value xml:lang="ar">تسديد</value>
-        <value xml:lang="en">Payment</value>
-        <value xml:lang="es">Pago</value>
-        <value xml:lang="fr">Paiement</value>
-        <value xml:lang="it">Pagamento</value>
-        <value xml:lang="nl">Betaling</value>
-        <value xml:lang="pt_BR">Pagamento</value>
-        <value xml:lang="pt_PT">Pagamento</value>
-        <value xml:lang="ro">Plata</value>
-        <value xml:lang="ru">платеж</value>
-        <value xml:lang="th">การชำระเงิน</value>
-        <value xml:lang="zh">支付</value>
-    </property>
     <property key="AccountingPaymentAlreadyApplied">
         <value xml:lang="en">Payment [${paymentId}] is already fully applied</value>
         <value xml:lang="es">Pago [${paymentId}] esta completamente aplicado</value>
@@ -5255,18 +5254,6 @@
         <value xml:lang="th">การชำระเงิน [${paymentId}] นำไปใช้ได้เต็มที่</value>
         <value xml:lang="zh">支付[${paymentId}]已完整应用</value>
     </property>
-    <property key="AccountingPaymentAlreadyReceived">
-        <value xml:lang="ar">تسديد مستلم مسبقا</value>
-        <value xml:lang="en">Payment already received</value>
-        <value xml:lang="es">Pago recibido</value>
-        <value xml:lang="fr">Paiement déjà reçu</value>
-        <value xml:lang="it">Pagamento già ricevuto</value>
-        <value xml:lang="nl">Betaling reeds ontvangen</value>
-        <value xml:lang="ro">Plata incasata</value>
-        <value xml:lang="ru">Платеж уже получен</value>
-        <value xml:lang="th">ได้รับการชำระเงินเรียบร้อยแล้ว</value>
-        <value xml:lang="zh">已收到支付</value>
-    </property>
     <property key="AccountingPaymentApplRemoved">
         <value xml:lang="en">PaymentID [${paymentApplication.paymentId}] with amount ${paymentApplication.amountApplied?currency(${currencyUomId})} removed from</value>
         <value xml:lang="es">IdPago[${paymentApplication.paymentId}] con cantidad ${paymentApplication.amountApplied?currency(${currencyUomId})} suprimido de</value>
@@ -5473,7 +5460,7 @@
     <property key="AccountingPaymentMethodId........">
         <value xml:lang="en">AccountingPaymentMethodId........</value>
         <value xml:lang="fr">Réf. de méthode de paiement      </value>
-        <value xml:lang="nln">AccountingPaymentMethodId........</value>
+        <value xml:lang="nl">AccountingPaymentMethodId........</value>
         <value xml:lang="ro">No values are passed............???</value>
         <value xml:lang="th">รหัสวิธีการชำระเงิน............???</value>
     </property>
@@ -5917,8 +5904,8 @@
     <property key="AccountingProblemGettingOrderPaymentPreferences">
         <value xml:lang="en">Problem getting OrderPaymentPreference records</value>
         <value xml:lang="fr">Erreur en recherchant les préférences de paiement associées à la commande</value>
-        <value xml:lang="nl">Probleem met het ophalen van OrderPaymentPreference records</value>
         <value xml:lang="ru">Проблема получения записей OrderPaymentPreference</value>
+        <value xml:lang="nl">Probleem met het ophalen van OrderPaymentPreference records</value>
         <value xml:lang="th">Problem getting OrderPaymentPreference records</value>
         <value xml:lang="zh">获得定单支付优先方法记录时出错</value>
     </property>
@@ -5947,8 +5934,8 @@
     <property key="AccountingProblemStoringOrderAdjustments">
         <value xml:lang="en">Problem storing OrderAdjustments: ${orderAdjustments}</value>
         <value xml:lang="fr">Erreur en essayant d'enregistrer les ajustements de commande: ${orderAdjustments}</value>
-        <value xml:lang="nl">Probleem met het opslaan van orderaanpassing(en): ${orderAdjustments}</value>
         <value xml:lang="ru">Проблема сохранения OrderAdjustments: ${orderAdjustments}</value>
+        <value xml:lang="nl">Probleem met het opslaan van orderaanpassing(en): ${orderAdjustments}</value>
         <value xml:lang="th">ปัญหาในการเก็บข้อมูลรายการส่วนลด: ${orderAdjustments}</value>
         <value xml:lang="zh">存储定单调整时出错:${orderAdjustments}</value>
     </property>
@@ -5966,13 +5953,13 @@
     </property>
     <property key="AccountingProductCategoryGlAccount">
         <value xml:lang="en">Product Category Gl Account</value>
-        <value xml:lang="fr">Compte de catégorie de produit</value>
+        <value xml:lang="fr">Compte de catégorie de produit (GL)</value>
         <value xml:lang="nl">GB-rekening Productcategorie</value>
         <value xml:lang="th">หมวดหมู่สินค้าบัญชีแยกประเภททั่วไป</value>
     </property>
     <property key="AccountingProductGlAccount">
         <value xml:lang="en">Product GL Accounts</value>
-        <value xml:lang="fr">Comptes de produit</value>
+        <value xml:lang="fr">Comptes de produit (GL)</value>
         <value xml:lang="nl">GB-rekeningen Product</value>
         <value xml:lang="th">สินค้าบัญชีแยกประเภททั่วไป</value>
     </property>
@@ -5993,8 +5980,8 @@
         <value xml:lang="es">Tarífas de producto</value>
         <value xml:lang="fr">Taux applicables aux produits</value>
         <value xml:lang="it">Percentuali Prodotto</value>
-        <value xml:lang="nl">Productprijzen</value>
         <value xml:lang="ro">Procent Produs</value>
+        <value xml:lang="nl">Productprijzen</value>
         <value xml:lang="ru">Ставки продукта</value>
         <value xml:lang="th">ราคาสินค้า</value>
         <value xml:lang="zh">产品税率</value>
@@ -6183,7 +6170,7 @@
     </property>
     <property key="AccountingSetup">
         <value xml:lang="en">Setup</value>
-        <value xml:lang="fr">Configuration</value>
+        <value xml:lang="fr">Installation</value>
         <value xml:lang="nl">Configuratie</value>
         <value xml:lang="th">ติดตั้ง</value>
     </property>
@@ -6428,7 +6415,7 @@
     </property>
     <property key="AccountingTaxAuthorityGlAccounts">
         <value xml:lang="en">TaxAuthority GL Accounts </value>
-        <value xml:lang="fr">Comptes de l'administration fiscale</value>
+        <value xml:lang="fr">Comptes de l'administration fiscale (GL)</value>
         <value xml:lang="nl">GB-rekeningen belastinginstantie(s)</value>
         <value xml:lang="th">ภาษีบัญชีแยกประเภททั่วไป</value>
     </property>
@@ -6447,7 +6434,7 @@
     <property key="AccountingTaxAuthorityRateProductUseThisProductCategory">
         <value xml:lang="en">At least one Product Rate uses this Category</value>
         <value xml:lang="fr">Au moins un taux applicable aux produits utilise cette catégorie</value>
-    </property>
+    </property>    
     <property key="AccountingTaxSummary">
         <value xml:lang="ar">تقرير ملخص الضريبة</value>
         <value xml:lang="en">Tax Summary Report</value>
@@ -6805,8 +6792,8 @@
         <value xml:lang="es">Usar otro certificado de regalo</value>
         <value xml:lang="fr">La carte cadeau utilisée n'existe pas</value>
         <value xml:lang="hi_IN">उपहार कार्ड फाइल में नहीं</value>
-        <value xml:lang="it">La carta omaggio utilizzata non esiste</value>
         <value xml:lang="ja">Use Gift Card Not On File</value>
+        <value xml:lang="it">La carta omaggio utilizzata non esiste</value>
         <value xml:lang="nl">Gebruik een niet bekende tegoedbon</value>
         <value xml:lang="ro">Foloseste Carte Omagiu Nu din Fisier</value>
         <value xml:lang="ru">Использованной дисконтной карты нет в файле</value>
@@ -6850,7 +6837,7 @@
         <value xml:lang="th">คุณไม่ได้รบอนุญาตให้เข้าชมหน้านี้ ("ACCOUNTING_VIEW" หรือ "ACCOUNTING_ADMIN" ต้องการ)</value>
         <value xml:lang="zh">你没有浏览这个页面的权限。(需要是"ACCOUNTING_VIEW"或"ACCOUNTING_ADMIN")</value>
     </property>
-    <property key="AccountingVirtualCard">
+     <property key="AccountingVirtualCard">
         <value xml:lang="de">Virtuelle Karte</value>
         <value xml:lang="en">Virtual Card</value>
         <value xml:lang="es">Tarjeta virtual</value>
@@ -7886,8 +7873,8 @@
         <value xml:lang="en">Gl Account Type Id</value>
         <value xml:lang="es">Id Tipo Cuenta LM</value>
         <value xml:lang="fr">Type du compte comptable</value>
-        <value xml:lang="it">Tipo Conto Gl</value>
         <value xml:lang="nl">ID type GB-rekening</value>
+        <value xml:lang="it">Tipo Conto Gl</value>
         <value xml:lang="ro">Tip Cont Gl</value>
         <value xml:lang="ru">Код типа счета ГК</value>
         <value xml:lang="th">รหัสประเภทบัญชีแยกประเภททั่วไป</value>
@@ -7908,8 +7895,8 @@
     <property key="FormFieldTitle_glJournalId">
         <value xml:lang="en">Gl Journal Id</value>
         <value xml:lang="fr">Réf. journal du Grand Livre</value>
-        <value xml:lang="it">Giornale</value>
         <value xml:lang="nl">ID GB-journaal</value>
+        <value xml:lang="it">Giornale</value>
         <value xml:lang="th">Gl Journal Id</value>
     </property>
     <property key="FormFieldTitle_glResourceTypeId">
@@ -8059,7 +8046,7 @@
     <property key="FormFieldTitle_invoiceNotApplied">
         <value xml:lang="en">Not Applied</value>
         <value xml:lang="fr">Non alloué</value>
-    </property>
+    </property>        
     <property key="FormFieldTitle_invoiceProcessing">
         <value xml:lang="ar">تعيين لكامل الفاتورة</value>
         <value xml:lang="en">Assign to Whole invoice</value>
@@ -8267,7 +8254,7 @@
     <property key="FormFieldTitle_notApplied">
         <value xml:lang="en">Not Applied</value>
         <value xml:lang="fr">Non alloué</value>
-    </property>
+    </property>    
     <property key="FormFieldTitle_orderDate">
         <value xml:lang="en">Order Date</value>
         <value xml:lang="fr">Date de commande</value>
@@ -8586,7 +8573,7 @@
     </property>
     <property key="FormFieldTitle_postToGlAccountId">
         <value xml:lang="en">Post To Gl Account Id</value>
-        <value xml:lang="fr">Comptabilisé à la réf. de compte</value>
+        <value xml:lang="fr">Comptabilisé à la réf. de compte (GL)</value>
         <value xml:lang="it">Contabilizza su Conto Gl</value>
         <value xml:lang="nl">Boeken op GB-rekening</value>
         <value xml:lang="ru">На счет ГК с кодом</value>
@@ -8961,8 +8948,8 @@
         <value xml:lang="es">Id Secuencia Tarifa de Autoridad Fiscal</value>
         <value xml:lang="fr">Séquence de taux de taxation</value>
         <value xml:lang="it">Numero Sequenza Percentuale Autorità Tasse</value>
-        <value xml:lang="nl">Koersvolgnummer belastinginstantie</value>
         <value xml:lang="ro">Nr.Secventa Procent Taxa Autoritate</value>
+        <value xml:lang="nl">Koersvolgnummer belastinginstantie</value>
         <value xml:lang="ru">Код налог. ставки</value>
         <value xml:lang="th">รหัสรายการอัตราภาษี</value>
         <value xml:lang="zh">税务机关税率序号</value>
@@ -9073,8 +9060,8 @@
     <property key="FormFieldTitle_timeEntryId">
         <value xml:lang="en">Time Entry Id</value>
         <value xml:lang="fr">Réf. de date d'écriture</value>
-        <value xml:lang="it">Riga Timbratura</value>
         <value xml:lang="nl">ID tijdregistratie</value>
+        <value xml:lang="it">Riga Timbratura</value>
         <value xml:lang="th">รหัสตารางการทำงาน</value>
     </property>
     <property key="FormFieldTitle_toPaymentId">
@@ -9124,7 +9111,7 @@
     <property key="FormFieldTitle_totInvoiceApplied">
         <value xml:lang="en">Tot Invoice Applied</value>
         <value xml:lang="fr">Total alloué</value>
-    </property>
+    </property>        
     <property key="FormFieldTitle_transCodeEnumId">
         <value xml:lang="en">Trans Code Enum Id</value>
         <value xml:lang="es">Id Enum Código de Trans</value>
@@ -9430,8 +9417,8 @@
     <property key="PageTitleEditBillingAccountOrders">
         <value xml:lang="en">Edit Billing Account Orders</value>
         <value xml:lang="fr">Modifier le compte de facturation des commandes</value>
-        <value xml:lang="it">Aggiorna Ordini Conto Fatturazione</value>
         <value xml:lang="nl">Orders factuurrekening aanpassen</value>
+        <value xml:lang="it">Aggiorna Ordini Conto Fatturazione</value>
         <value xml:lang="th">แก้ไขรายการยอดรวมของบัญชี</value>
     </property>
     <property key="PageTitleEditBillingAccountPayments">
@@ -9616,7 +9603,7 @@
     </property>
     <property key="PageTitleEditPartyGlAccounts">
         <value xml:lang="en">Edit Party Gl Accounts</value>
-        <value xml:lang="fr">Modifier les comptes de tiers</value>
+        <value xml:lang="fr">Modifier les comptes de tiers (GL)</value>
         <value xml:lang="nl">Gb-rekeningen relatie aanpassen</value>
         <value xml:lang="th">แก้ไขกลุ่มผู้ใช้บัญชีแยกประเภททั่วไป</value>
     </property>
@@ -9771,7 +9758,7 @@
     </property>
     <property key="PageTitleFindGlAccount">
         <value xml:lang="en">PageTitleFindGlAccount</value>
-        <value xml:lang="fr">Chercher un compte</value>
+        <value xml:lang="fr">Chercher un compte (GL)</value>
         <value xml:lang="nl">Vind GB-rekening(en)</value>
         <value xml:lang="th">ค้นหาบัญชีแยกประเภททั่วไป</value>
     </property>
@@ -9950,8 +9937,8 @@
     <property key="PageTitleListFinAccountRoles">
         <value xml:lang="en">List Fin Account Roles</value>
         <value xml:lang="fr">Liste des rôles de compte financier</value>
-        <value xml:lang="it">Lista Ruoli Conto Finanziario</value>
         <value xml:lang="nl">Toon rollen financiële rekeningen</value>
+        <value xml:lang="it">Lista Ruoli Conto Finanziario</value>
         <value xml:lang="th">รายการสถานะบัญชี</value>
     </property>
     <property key="PageTitleListFinAccountTrans">
@@ -10018,8 +10005,8 @@
     <property key="PageTitleListFixedAssetRegistrations">
         <value xml:lang="en">List Fixed Asset Registrations</value>
         <value xml:lang="fr">Liste des enregistrements d'immobilisation</value>
-        <value xml:lang="it">Lista Registrazioni Cespiti</value>
         <value xml:lang="nl">Toon registraties vaste activa</value>
+        <value xml:lang="it">Lista Registrazioni Cespiti</value>
         <value xml:lang="th">รายการลงทะเบียนทรัพย์สินไม่หมุนเวียน</value>
     </property>
     <property key="PageTitleListFixedAssetStdCosts">
@@ -10431,8 +10418,8 @@
     </property>
     <property key="es">
         <value xml:lang="en">Spanish</value>
-        <value xml:lang="es">Español</value>
         <value xml:lang="fr">Espagnol</value>
+        <value xml:lang="es">Español</value>
         <value xml:lang="nl">Spaans</value>
         <value xml:lang="ru">Испанский</value>
         <value xml:lang="th">สเปน</value>
@@ -10552,8 +10539,8 @@
     <property key="ru">
         <value xml:lang="en">Russian</value>
         <value xml:lang="fr">Russe</value>
-        <value xml:lang="nl">Russisch</value>
         <value xml:lang="ru">Русский</value>
+        <value xml:lang="nl">Russisch</value>
         <value xml:lang="th">รัสเซีย</value>
     </property>
 </resource>

Modified: ofbiz/trunk/applications/content/config/ContentErrorUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/config/ContentErrorUiLabels.xml?rev=725466&r1=725465&r2=725466&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/config/ContentErrorUiLabels.xml (original)
+++ ofbiz/trunk/applications/content/config/ContentErrorUiLabels.xml Wed Dec 10 14:18:58 2008
@@ -69,7 +69,7 @@
         <value xml:lang="zh">图像({b})或类型(${imageType})为null或为空</value>
     </property>
     <property key="dataResourceWorker.image_or_field_null">
-        <value xml:lang="en">imageFi(${imageFi}) oder idFieldValue(${idFieldValue}) ist null</value>
+        <value xml:lang="de">imageFi(${imageFi}) oder idFieldValue(${idFieldValue}) ist null</value>
         <value xml:lang="en">imageFi(${imageFi}) or idFieldValue(${idFieldValue}) is null</value>
         <value xml:lang="es">Imagen(${imageFi}) or Campo(${idFieldValue}) son nulos</value>
         <value xml:lang="fr">imageFi (${imageFi}) ou idFieldValue (${idFieldValue}) est invalide</value>

Modified: ofbiz/trunk/applications/content/config/ContentUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/config/ContentUiLabels.xml?rev=725466&r1=725465&r2=725466&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/config/ContentUiLabels.xml (original)
+++ ofbiz/trunk/applications/content/config/ContentUiLabels.xml Wed Dec 10 14:18:58 2008
@@ -2516,7 +2516,7 @@
         <value xml:lang="ar">إضافة نص مورد معلومات</value>
         <value xml:lang="de">Datenressource Text hinzufügen</value>
         <value xml:lang="en">Add DataResource Text</value>
-        <value xml:lang="efr">Ajouter une ressource de données (texte)</value>
+        <value xml:lang="fr">Ajouter une ressource de données (texte)</value>
         <value xml:lang="it">Aggiungi Testo Risorsa Dati</value>
         <value xml:lang="ro">Adauga Text Resurse Date</value>
         <value xml:lang="th">เพิ่มแหล่งที่มาของข้อมูลเป็นตัวอักษร</value>
@@ -2936,7 +2936,7 @@
     <property key="PageTitleEditDataResourceTypeAttr">
         <value xml:lang="de">Datenressourcentyp Attribute bearbeiten</value>
         <value xml:lang="en">Edit Data Resource Type Attribute</value>
-        <value xml:lang="en">Modifier la ressource de données (type d'attibut)</value>
+        <value xml:lang="fr">Modifier la ressource de données (type d'attibut)</value>
         <value xml:lang="it">Aggiorna Attributo Tipo Risorsa Dati</value>
         <value xml:lang="th">แก้ไขข้อมูลแหล่งที่มาของประเภทคุณสมบัติ</value>
     </property>

Modified: ofbiz/trunk/applications/party/config/PartyEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/config/PartyEntityLabels.xml?rev=725466&r1=725465&r2=725466&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/config/PartyEntityLabels.xml (original)
+++ ofbiz/trunk/applications/party/config/PartyEntityLabels.xml Wed Dec 10 14:18:58 2008
@@ -2270,8 +2270,6 @@
         <value xml:lang="en">Payment (net days)</value>
         <value xml:lang="es">Pago (días netos)</value>
         <value xml:lang="fr">Paiment (à date)</value>
-        <value xml:lang="es">Pago (días netos)</value>
-        <value xml:lang="fr">Paiement (net)</value>
         <value xml:lang="it">Pagamento (netto giorni)</value>
         <value xml:lang="pt_PT">Pagamento (prazo na internet)(net days)</value>
         <value xml:lang="ro">Plata (net zile)</value>

Modified: ofbiz/trunk/applications/party/config/PartyUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/config/PartyUiLabels.xml?rev=725466&r1=725465&r2=725466&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/config/PartyUiLabels.xml (original)
+++ ofbiz/trunk/applications/party/config/PartyUiLabels.xml Wed Dec 10 14:18:58 2008
@@ -204,7 +204,6 @@
     <property key="EmailfromUnknownParties">
         <value xml:lang="de">E-Mail von unbekanntem Akteur</value>
         <value xml:lang="en">Email from unknown parties</value>
-        <value xml:lang="es">Correo electrónico de participante desconocido</value>
         <value xml:lang="es">Correo electrónico de participantes desconocidos</value>
         <value xml:lang="fr">Courriel depuis un acteur inconnu</value>
         <value xml:lang="nl">E-mail van een onbekende relatie of contact</value>
@@ -559,7 +558,6 @@
         <value xml:lang="en">Email Address</value>
         <value xml:lang="es">Correo electrónico</value>
         <value xml:lang="fr">Adresse courriel</value>
-        <value xml:lang="en">E-mailadres</value>
         <value xml:lang="it">Indirizzo Email</value>
         <value xml:lang="th">ที่อยู่อีเมล์</value>
     </property>
@@ -934,7 +932,6 @@
         <value xml:lang="zh">兴趣代码</value>
     </property>
     <property key="FormFieldTitle_organizationName">
-        <value xml:lang="de">Organisationsname</value>
         <value xml:lang="de">Organisation Name</value>
         <value xml:lang="en">Organization Name</value>
         <value xml:lang="es">Nombre de la organización</value>
@@ -1391,7 +1388,6 @@
     </property>
     <property key="FormFieldTitle_userLoginId">
         <value xml:lang="de">Benutzeranmeldung ID</value>
-        <value xml:lang="de">User Login ID</value>
         <value xml:lang="en">User Login Id</value>
         <value xml:lang="es">Código de usuario para conexión</value>
         <value xml:lang="fr">Identifiant de connexion</value>
@@ -2748,7 +2744,7 @@
         <value xml:lang="es">Emisores de certificados</value>
         <value xml:lang="fr">Émetteurs de certificat</value>
         <value xml:lang="it">Fornitori di Certificati</value>
-        <value xml:lang="fr">Certificaat-uitgever</value>
+        <value xml:lang="nl">Certificaat-uitgever</value>
         <value xml:lang="ru">Эмитенты сертификата</value>
         <value xml:lang="th">ประเด็น</value>
     </property>
@@ -5089,7 +5085,6 @@
         <value xml:lang="de">Initiale zweiter Vorname</value>
         <value xml:lang="en">Middle Initial</value>
         <value xml:lang="es">Inicial del segundo nombre</value>
-        <value xml:lang="es">Inicial</value>
         <value xml:lang="fr">Initiale</value>
         <value xml:lang="it">Iniziale Centrale</value>
         <value xml:lang="nl">Voorletters</value>
@@ -6489,7 +6484,7 @@
         <value xml:lang="zh">关系</value>
     </property>
     <property key="PartyRemoveAttributePermissionError">
-        <value xml:lang="en">Sicherheitsfehler: um createPartyAttribute auszuführen müssen Sie die Berechtigung PARTYMGR_DELETE oder PARTYMGR_ADMIN besitzen</value>
+        <value xml:lang="de">Sicherheitsfehler: um createPartyAttribute auszuführen müssen Sie die Berechtigung PARTYMGR_DELETE oder PARTYMGR_ADMIN besitzen</value>
         <value xml:lang="en">Security Error: to run createPartyAttribute you must have the PARTYMGR_DELETE or PARTYMGR_ADMIN permission</value>
         <value xml:lang="es">Error de seguridad: para acceder a esta funcionalidad debe contar con los permisos PARTYMGR_DELETE o PARTYMGR_ADMIN</value>
         <value xml:lang="fr">Erreur de sécurité: pour exécuter createPartyAttribute vous devez avoir l'autorisation PARTYMGR_DELETE ou PARTYMGR_ADMIN</value>
@@ -6501,7 +6496,7 @@
         <value xml:lang="zh">安全错误: 要运行 createPartyAttribute,你必须具有 PARTYMGR_DELETE 或 PARTYMGR_ADMIN 权限</value>
     </property>
     <property key="PartyRemoveCommunicationEventPurposePermissionError">
-        <value xml:lang="en">Sicherheitsfehler: um removeCommunicationEventPurpose auszuführen müssen Sie die Berechtigung PARTYMGR_DELETE oder PARTYMGR_ADMIN besitzen</value>
+        <value xml:lang="de">Sicherheitsfehler: um removeCommunicationEventPurpose auszuführen müssen Sie die Berechtigung PARTYMGR_DELETE oder PARTYMGR_ADMIN besitzen</value>
         <value xml:lang="en">Security Error: to run removeCommunicationEventPurpose you must have the PARTYMGR_DELETE or PARTYMGR_ADMIN permission</value>
         <value xml:lang="es">Error de seguridad: para acceder a esta funcionalidad debe contar con los permisos PARTYMGR_DELETE o PARTYMGR_ADMIN</value>
         <value xml:lang="fr">Erreur sécurité : pour supprimer l'objet d'un appel il faut avoir avoir l'autorisation PARTYMGR_DELETE ou PARTYMGR_ADMIN.</value>
@@ -6514,7 +6509,7 @@
         <value xml:lang="zh">安全错误: 要运行 removeCommunicationEventPurpose,你必须具有 PARTYMGR_DELETE 或 PARTYMGR_ADMIN 权限</value>
     </property>
     <property key="PartyRemoveCommunicationEventRolePermissionError">
-        <value xml:lang="en">Sicherheitsfehler: um removeCommunicationEventRole auszuführen müssen Sie die Berechtigung PARTYMGR_DELETE oder PARTYMGR_ADMIN besitzen</value>
+        <value xml:lang="de">Sicherheitsfehler: um removeCommunicationEventRole auszuführen müssen Sie die Berechtigung PARTYMGR_DELETE oder PARTYMGR_ADMIN besitzen</value>
         <value xml:lang="en">Security Error: to run removeCommunicationEventRole you must have the PARTYMGR_DELETE or PARTYMGR_ADMIN permission</value>
         <value xml:lang="es">Error de seguridad: para acceder a esta funcionalidad debe contar con los permisos PARTYMGR_DELETE o PARTYMGR_ADMIN</value>
         <value xml:lang="fr">Erreur sécurité : pour supprimer le rôle d'une communication il faut avoir avoir l'autorisation PARTYMGR_DELETE ou PARTYMGR_ADMIN.</value>
@@ -6526,7 +6521,7 @@
         <value xml:lang="zh">安全错误: 要运行 removeCommunicationEventRole,你必须具有 PARTYMGR_DELETE 或 PARTYMGR_ADMIN 权限</value>
     </property>
     <property key="PartyRemovePartyClassificationGroupPermissionError">
-        <value xml:lang="en">Sicherheitsfehler: um deletePartyClassificationGroup auszuführen müssen Sie die Berechtigung PARTYMGR_DELETE oder PARTYMGR_ADMIN besitzen</value>
+        <value xml:lang="de">Sicherheitsfehler: um deletePartyClassificationGroup auszuführen müssen Sie die Berechtigung PARTYMGR_DELETE oder PARTYMGR_ADMIN besitzen</value>
         <value xml:lang="en">Security Error: to run deletePartyClassificationGroup you must have the PARTYMGR_DELETE or PARTYMGR_ADMIN permission</value>
         <value xml:lang="es">Error de seguridad: para acceder a esta funcionalidad debe contar con los permisos PARTYMGR_DELETE o PARTYMGR_ADMIN</value>
         <value xml:lang="fr">Erreur sécurité : pour supprimer un groupe de classification d'acteurs, il faut avoir l'autorisation PARTYMGR_DELETE ou</value>
@@ -6538,7 +6533,7 @@
         <value xml:lang="zh">安全错误: 要运行 deletePartyClassificationGroup,你必须具有 PARTYMGR_DELETE 或 PARTYMGR_ADMIN 权限</value>
     </property>
     <property key="PartyRemovePartyClassificationPermissionError">
-        <value xml:lang="en">Sicherheitsfehler: um deletePartyClassification auszuführen müssen Sie die Berechtigung PARTYMGR_DELETE oder PARTYMGR_ADMIN besitzen</value>
+        <value xml:lang="de">Sicherheitsfehler: um deletePartyClassification auszuführen müssen Sie die Berechtigung PARTYMGR_DELETE oder PARTYMGR_ADMIN besitzen</value>
         <value xml:lang="en">Security Error: to run deletePartyClassification you must have the PARTYMGR_DELETE or PARTYMGR_ADMIN permission</value>
         <value xml:lang="es">Error de seguridad: para acceder a esta funcionalidad debe contar con los permisos PARTYMGR_DELETE o PARTYMGR_ADMIN</value>
         <value xml:lang="fr">Erreur sécurité : pour supprimer une classification d'acteur il faut avoir avoir l'autorisation PARTYMGR_DELETE ou PARTYMGR_ADMIN.</value>
@@ -6550,7 +6545,7 @@
         <value xml:lang="zh">安全错误: 要运行 deletePartyClassification,你必须具有 PARTYMGR_DELETE 或 PARTYMGR_ADMIN 权限</value>
     </property>
     <property key="PartyRemovePartyRelationshipPermissionError">
-        <value xml:lang="en">Sicherheitsfehler: um removePartyRelationship auszuführen müssen Sie die Berechtigung PARTYMGR_DELETE oder PARTYMGR_ADMIN besitzen</value>
+        <value xml:lang="de">Sicherheitsfehler: um removePartyRelationship auszuführen müssen Sie die Berechtigung PARTYMGR_DELETE oder PARTYMGR_ADMIN besitzen</value>
         <value xml:lang="en">Security Error: to run removePartyRelationship you must have the PARTYMGR_DELETE or PARTYMGR_ADMIN permission</value>
         <value xml:lang="es">Error de seguridad: para acceder a esta funcionalidad debe contar con los permisos PARTYMGR_DELETE o PARTYMGR_ADMIN</value>
         <value xml:lang="fr">Erreur sécurité : pour supprimer une relation inter-acteurs il faut avoir avoir l'autorisation PARTYMGR_DELETE ou PARTYMGR_ADMIN.</value>
@@ -6562,7 +6557,7 @@
         <value xml:lang="zh">安全错误: 要运行 removePartyRelationship,你必须具有 PARTYMGR_DELETE 或 PARTYMGR_ADMIN 权限</value>
     </property>
     <property key="PartyRemovePostalAddressBoundaryPermissionError">
-        <value xml:lang="en">Sicherheitsfehler: um deletePostalAddressBoundary auszuführen müssen Sie die Berechtigung PARTYMGR_DELETE oder PARTYMGR_ADMIN besitzen</value>
+        <value xml:lang="de">Sicherheitsfehler: um deletePostalAddressBoundary auszuführen müssen Sie die Berechtigung PARTYMGR_DELETE oder PARTYMGR_ADMIN besitzen</value>
         <value xml:lang="en">Security Error: to run deletePostalAddressBoundary you must have the PARTYMGR_DELETE or PARTYMGR_ADMIN permission</value>
         <value xml:lang="es">Error de seguridad: para acceder a esta funcionalidad debe contar con los permisos PARTYMGR_DELETE o PARTYMGR_ADMIN</value>
         <value xml:lang="fr">Erreur sécurité : pour supprimer une adresse postale frontière il faut avoir avoir l'autorisation PARTYMGR_DELETE ou PARTYMGR_ADMIN.</value>
@@ -6574,7 +6569,7 @@
         <value xml:lang="zh">安全错误: 要运行 deletePostalAddressBoundary,你必须具有 PARTYMGR_DELETE 或 PARTYMGR_ADMIN 权限</value>
     </property>
     <property key="PartyRemoveWebSiteRolePermissionError">
-        <value xml:lang="en">Sicherheitsfehler: um removeWebSiteRole auszuführen müssen Sie die Berechtigung PARTYMGR_DELETE oder PARTYMGR_ADMIN besitzen</value>
+        <value xml:lang="de">Sicherheitsfehler: um removeWebSiteRole auszuführen müssen Sie die Berechtigung PARTYMGR_DELETE oder PARTYMGR_ADMIN besitzen</value>
         <value xml:lang="en">Security Error: to run removeWebSiteRole you must have the PARTYMGR_DELETE or PARTYMGR_ADMIN permission</value>
         <value xml:lang="es">Error de seguridad: para acceder a esta funcionalidad debe contar con los permisos PARTYMGR_DELETE o PARTYMGR_ADMIN</value>
         <value xml:lang="fr">Erreur sécurité : pour supprimer un rôle de site web il faut avoir avoir l'autorisation PARTYMGR_DELETE ou PARTYMGR_ADMIN.</value>
@@ -6880,7 +6875,7 @@
         <value xml:lang="es">Seleccione rol</value>
         <value xml:lang="fr">Sélectionner le rôle</value>
         <value xml:lang="it">Seleziona Ruolo</value>
-        <value xml:lang="en">Selecteer rol</value>
+        <value xml:lang="nl">Selecteer rol</value>
         <value xml:lang="ru">Выбрать роль</value>
         <value xml:lang="th">เลือกสถานะ</value>
     </property>
@@ -7409,10 +7404,6 @@
         <value xml:lang="th">ผลรวม</value>
         <value xml:lang="zh">合计</value>
     </property>
-    <property key="PartyTotal">
-        <value xml:lang="en">Total</value>
-        <value xml:lang="fr">Total</value>
-    </property>
     <property key="PartyTotalYearsWorkNotValidNumber">
         <value xml:lang="de">Anzahl Jahre Arbeitserfahrung ist keine gültige Zahl</value>
         <value xml:lang="en">Total Years Work Experience is not a valid number</value>
@@ -7612,7 +7603,7 @@
         <value xml:lang="en">Update UserLogin Security Settings</value>
         <value xml:lang="fr">Mise à jour des paramètres de sécurité pour l'identifiant de connexion</value>
         <value xml:lang="it">Aggiorna Impostazioni Sicurezza Utente Login</value>
-        <value xml:lang="en">UserLogin Security Settings wijzigen</value>
+        <value xml:lang="nl">UserLogin Security Settings wijzigen</value>
         <value xml:lang="ro">Actualizare Setari De Siguranta Utilizator Login</value>
         <value xml:lang="ru">Обновление настроек безопасности пользователя</value>
         <value xml:lang="th">เปลี่ยนแปลงการตั้งค่าความปลอดภัยของผู้เข้าใช้ระบบ</value>

Modified: ofbiz/trunk/applications/product/config/ProductEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductEntityLabels.xml?rev=725466&r1=725465&r2=725466&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductEntityLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductEntityLabels.xml Wed Dec 10 14:18:58 2008
@@ -62,7 +62,6 @@
         <value xml:lang="de">Geschätzte Arbeitskosten</value>
         <value xml:lang="en">ESTIMATED_LABOR_COST</value>
         <value xml:lang="es">Coste estimado de mano de obra</value>
-        <value xml:lang="es">Labor estimada</value>
         <value xml:lang="th">ต้นทุนแรงงานโดยประมาณ</value>
     </property>
     <property key="CostComponentType.description.ESTIMATED_MATERIALS_">
@@ -1865,7 +1864,7 @@
     <property key="ProductPriceType.description.SPECIAL_PROMO_PRICE">
         <value xml:lang="de">Sonderaktionspreis</value>
         <value xml:lang="en">Special Promo Price</value>
-        <value xml:lang="en">Prix spécial promo</value>
+        <value xml:lang="fr">Prix spécial promo</value>
         <value xml:lang="it">Prezzo Promozionale Speciale</value>
         <value xml:lang="ro">Pret Promotional Special</value>
         <value xml:lang="ru">Специальная цена</value>

Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=725466&r1=725465&r2=725466&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Wed Dec 10 14:18:58 2008
@@ -3654,7 +3654,6 @@
         <value xml:lang="de">Benötigt E-Mail Adresse oder Akteur</value>
         <value xml:lang="en">Require Email Or Party</value>
         <value xml:lang="es">Exigir correo electrónico o participante</value>
-        <value xml:lang="fr">Nécessite email ou groupe</value>
         <value xml:lang="fr">Email ou acteur requis</value>
         <value xml:lang="it">Richiesta Email O Soggetto</value>
         <value xml:lang="ro">Cerere Email sau Subiect</value>
@@ -17503,14 +17502,13 @@
     <property key="ProductReserveInventoryFromFacility">
         <value xml:lang="de">Bestand von Einrichtung reservieren</value>
         <value xml:lang="en">Reserve inventory from facility</value>
-        <value xml:lang="en">Réserver depuis le stock d'un lieu de stockage</value>
+        <value xml:lang="fr">Réserver depuis le stock d'un lieu de stockage</value>
     </property>
     <property key="ProductReserveInventory">
         <value xml:lang="de">Bestand reservieren</value>
         <value xml:lang="en">Reserve inventory</value>
         <value xml:lang="es">Reserva de inventario</value>
         <value xml:lang="fr">Réservation de stock</value>
-        <value xml:lang="fr">Stock de réserve</value>
         <value xml:lang="it">Inventario Riservato</value>
         <value xml:lang="ro">Inventar Rezervat</value>
         <value xml:lang="ru">Резерв</value>



Re: svn commit: r725466 - in /ofbiz/trunk/applications: accounting/config/ content/config/ party/config/ product/config/

Posted by Jacques Le Roux <ja...@les7arts.com>.
Hi Marco,

This is weird because I have not updated with your commit and I can't see only 3 "(GL)" strings in all uilabels.xml file (looking 
for "(GL)" in *uilab*.xml with Eclipse) and only one in accouting.
I was surprised since I commited these changes recently (r724645) that's why I checked...

Thanks

Jacques

> Author: mrisaliti
> Date: Wed Dec 10 14:18:58 2008
> New Revision: 725466
>
> URL: http://svn.apache.org/viewvc?rev=725466&view=rev
> Log:
> Some wrong locales or duplicated locales while testing the new Label Manager.
>
> Modified:
>    ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
>    ofbiz/trunk/applications/content/config/ContentErrorUiLabels.xml
>    ofbiz/trunk/applications/content/config/ContentUiLabels.xml
>    ofbiz/trunk/applications/party/config/PartyEntityLabels.xml
>    ofbiz/trunk/applications/party/config/PartyUiLabels.xml
>    ofbiz/trunk/applications/product/config/ProductEntityLabels.xml
>    ofbiz/trunk/applications/product/config/ProductUiLabels.xml
>
> Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
> URL: 
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=725466&r1=725465&r2=725466&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
> +++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Wed Dec 10 14:18:58 2008
> @@ -30,8 +30,8 @@
>         <value xml:lang="nl">Bankrekening: AHC/Electronic Check </value>
>         <value xml:lang="ro">Cont EFT : AHC/Cecuri Electronice</value>
>         <value xml:lang="ru">Текущий счет</value>
> -        <value xml:lang="th">บัญชีธนาคาร: 
> AHC/ตรวจสอบระบบอิเล็กทรอนิกส์</value>
>         <value xml:lang="zh">电子资金转账账户:金融机构委员会/电子支票</value>
> +        <value xml:lang="th">บัญชีธนาคาร: 
> AHC/ตรวจสอบระบบอิเล็กทรอนิกส์</value>
>     </property>
>     <property key="AccountingAccount">
>         <value xml:lang="ar">حساب</value>
> @@ -126,8 +126,8 @@
>         <value xml:lang="es">cuentas</value>
>         <value xml:lang="fr">Comptes</value>
>         <value xml:lang="it">Conti</value>
> -        <value xml:lang="nl">Rekeningen</value>
>         <value xml:lang="ro">Conturi</value>
> +        <value xml:lang="nl">Rekeningen</value>
>         <value xml:lang="ru">Счета</value>
>         <value xml:lang="th">บัญชี</value>
>         <value xml:lang="zh">账户</value>
> @@ -135,36 +135,36 @@
>     <property key="AccountingAcctRecon">
>         <value xml:lang="en">Account Reconciliation</value>
>         <value xml:lang="fr">Réconciliation</value>
> -        <value xml:lang="it">Riconciliazione</value>
>         <value xml:lang="nl">Afstemming rekening</value>
> +        <value xml:lang="it">Riconciliazione</value>
>         <value xml:lang="th">การเช็คยอดบัญชี</value>
>     </property>
>     <property key="AccountingAcctRecons">
>         <value xml:lang="en">Account Reconciliations</value>
>         <value xml:lang="fr">Réconciliations</value>
> -        <value xml:lang="it">Riconciliazioni</value>
>         <value xml:lang="nl">Afstemmingen</value>
> +        <value xml:lang="it">Riconciliazioni</value>
>         <value xml:lang="th">การเช็คยอดบัญชี</value>
>     </property>
>     <property key="AccountingAcctgTransEntries">
>         <value xml:lang="en">Accounting Transactions Entries</value>
>         <value xml:lang="fr">Entrées de transactions comptables</value>
> -        <value xml:lang="it">Righe Prime Note</value>
>         <value xml:lang="nl">Ingaves Boekhoudtransacties</value>
> +        <value xml:lang="it">Righe Prime Note</value>
>         <value xml:lang="th">รายการบัญชีรายรับ</value>
>     </property>
>     <property key="AccountingAcctgTranss">
>         <value xml:lang="en">Accounting Transactions</value>
>         <value xml:lang="fr">Transactions comptables</value>
> -        <value xml:lang="it">Prime Note</value>
>         <value xml:lang="nl">Boekhoudtransacties</value>
> +        <value xml:lang="it">Prime Note</value>
>         <value xml:lang="th">รายการบัญชี</value>
>     </property>
>     <property key="AccountingActualCurrencyAmount">
>         <value xml:lang="en">Actual Currency Amount</value>
>         <value xml:lang="fr">Valeur réelle en devise</value>
> -        <value xml:lang="it">Attuale Importo in Valuta</value>
>         <value xml:lang="nl">Hoeveelheid werkelijke valuta</value>
> +        <value xml:lang="it">Attuale Importo in Valuta</value>
>         <value xml:lang="ru">Действительная сумма валюты</value>
>         <value xml:lang="th">จำนวนเงินที่มีอยู่จริง</value>
>     </property>
> @@ -574,7 +574,7 @@
>         <value xml:lang="th">จำนวนที่ประยุกต์ไม่ได้</value>
>         <value xml:lang="zh">未付金额</value>
>     </property>
> -    <property key="AccountingAmountToUse">
> +     <property key="AccountingAmountToUse">
>         <value xml:lang="de">Betrag zur Verwendung</value>
>         <value xml:lang="en">Amount To Use</value>
>         <value xml:lang="es">Monto a usar</value>
> @@ -837,6 +837,7 @@
>         <value xml:lang="fr">Assigner le type facture d'achat au n° du compte de produit</value>
>         <value xml:lang="nl">wijs inkoopfactuurtype toe aan GB-rekeningnr</value>
>         <value xml:lang="th">กำหนดประเภ
> ทใบกำกับสินค้าการสั่งซื้อไปยังหมายเลขบัญชีประเภ
> ททั่วไป</value>
> +
>     </property>
>     <property key="AccountingAssignSalesInvoiceToRevenue">
>         <value xml:lang="ar">تعيين نوع فاتورة البيع إلى رقم حساب العائدات</value>
> @@ -986,8 +987,8 @@
>         <value xml:lang="en">Billing Account</value>
>         <value xml:lang="es">Cta facturación</value>
>         <value xml:lang="fr">Compte de facturation</value>
> -        <value xml:lang="it">Conto Fatturazione</value>
>         <value xml:lang="ja">請求先アカウント</value>
> +        <value xml:lang="it">Conto Fatturazione</value>
>         <value xml:lang="nl">Faktuur rekening</value>
>         <value xml:lang="pt_PT">Conta para Pagamento</value>
>         <value xml:lang="ro">Cont Facturare</value>
> @@ -1319,8 +1320,8 @@
>         <value xml:lang="es">Número de tarjeta</value>
>         <value xml:lang="fr">N° de carte</value>
>         <value xml:lang="hi_IN">कार्ड नम्बर</value>
> -        <value xml:lang="it">Numero di carta</value>
>         <value xml:lang="ja">カード番号</value>
> +        <value xml:lang="it">Numero di carta</value>
>         <value xml:lang="nl">Kaart nummer</value>
>         <value xml:lang="pt_PT">Número do Cartão</value>
>         <value xml:lang="ro">Numarul Cartii</value>
> @@ -1763,8 +1764,8 @@
>         <value xml:lang="es">Tarjeta de crédito</value>
>         <value xml:lang="fr">Carte de crédit</value>
>         <value xml:lang="hi_IN">कार्ड</value>
> -        <value xml:lang="it">Carta di credito</value>
>         <value xml:lang="ja">クレジットカード</value>
> +        <value xml:lang="it">Carta di credito</value>
>         <value xml:lang="nl">Krediet Kaart</value>
>         <value xml:lang="pt_BR">Cartão de Crédito</value>
>         <value xml:lang="pt_PT">Cartão de Crédito</value>
> @@ -2011,8 +2012,8 @@
>         <value xml:lang="es">Cuenta bancaria</value>
>         <value xml:lang="fr">Compte de virement électronique</value>
>         <value xml:lang="hi_IN">EFT खाता</value>
> -        <value xml:lang="it">Conto EFT</value>
>         <value xml:lang="ja">EFT Account</value>
> +        <value xml:lang="it">Conto EFT</value>
>         <value xml:lang="nl">Bank rekening</value>
>         <value xml:lang="pt_PT">Conta EFT</value>
>         <value xml:lang="ro">Cont EFT</value>
> @@ -2136,8 +2137,8 @@
>         <value xml:lang="es">Ingrese su número real y virtual de la tarjeta y su número pin para ingresar a su cuenta</value>
>         <value xml:lang="fr">Entrez vos n° (réel et virtuel) de carte et code pour vous lier à votre compte</value>
>         <value xml:lang="hi_IN">अपने ख़ाते मे जाने के लिये पिन 
> नम्बर,</value>
> -        <value xml:lang="it">Inserisci la tua carta fisica e virtuale e il numero pin per collegarlo al tuo conto</value>
>         <value xml:lang="ja">Enter your physical and virtual card and pin number to link your account</value>
> +        <value xml:lang="it">Inserisci la tua carta fisica e virtuale e il numero pin per collegarlo al tuo conto</value>
>         <value xml:lang="nl">Voer uw kaart en pin nummer in om uw rekening te valideren</value>
>         <value xml:lang="ro">Introdu cartea ta fizica si virtuala si numarul de pin pentru a te cupla cu contul tau.</value>
>         <value xml:lang="ru">Введите вашу реальную или виртуальную карту и ПИН код 
> для подключения к своей учетной записи</value>
> @@ -2150,8 +2151,8 @@
>         <value xml:lang="es">Ingrese el número de tarjeta y PIN para verificar su balance</value>
>         <value xml:lang="fr">Entrez votre n° de carte cadeau et votre code pour vérifier le solde</value>
>         <value xml:lang="hi_IN">रकम जानने के लिये पिन और उपहार कार्ड 
> नम्बर दिजीये</value>
> -        <value xml:lang="it">Inserisici il numero della carta omaggio ed il PIN per controllarne il bilancio</value>
>         <value xml:lang="ja">Enter your gift card number and PIN to check the balance</value>
> +        <value xml:lang="it">Inserisici il numero della carta omaggio ed il PIN per controllarne il bilancio</value>
>         <value xml:lang="nl">Voer uw tegoedbon- en pin nummer in om het saldo op te vragen</value>
>         <value xml:lang="ro">Introdu numarul cartii de omagiu, numarul Pin pentru a controla bilantul</value>
>         <value xml:lang="ru">Введите номер дисконтной карты и ПИН для проверки 
> баланса</value>
> @@ -2298,8 +2299,8 @@
>         <value xml:lang="es">Fecha de expiración</value>
>         <value xml:lang="fr">Date d'expiration</value>
>         <value xml:lang="hi_IN">खत्म होने कि तिथी</value>
> -        <value xml:lang="it">Data scadenza</value>
>         <value xml:lang="ja">有効期限</value>
> +        <value xml:lang="it">Data scadenza</value>
>         <value xml:lang="nl">Geldigheids datum</value>
>         <value xml:lang="pt_PT">Validade do Cartão</value>
>         <value xml:lang="ro">Data Expirata</value>
> @@ -2652,8 +2653,8 @@
>         <value xml:lang="es">Agencia de Gobierno</value>
>         <value xml:lang="fr">Agence gouvernementale</value>
>         <value xml:lang="it">Agenzia Governativa</value>
> -        <value xml:lang="nl">Agent overheid</value>
>         <value xml:lang="ro">Agentia Governativa</value>
> +        <value xml:lang="nl">Agent overheid</value>
>         <value xml:lang="ru">Государственное учреждение</value>
>         <value xml:lang="th">ตัวแทนรัฐบาล</value>
>         <value xml:lang="zh">政府机构</value>
> @@ -3293,8 +3294,8 @@
>     <property key="AccountingGlAccountTypeDefaults">
>         <value xml:lang="en">GL Account Type Defaults</value>
>         <value xml:lang="fr">Types par défaut de compte du GL</value>
> -        <value xml:lang="it">Default Tipo Conto Contabilità Generale</value>
>         <value xml:lang="nl">Standaardwaarden GB-rekeningtype</value>
> +        <value xml:lang="it">Default Tipo Conto Contabilità Generale</value>
>         <value xml:lang="th">ค่าเริ่มต้นอัตโนมัติของประเภ
> ทบัญชีแยกประเภททั่วไป</value>
>     </property>
>     <property key="AccountingGlAccounts">
> @@ -4622,8 +4623,8 @@
>         <value xml:lang="es">No hay cuenta de facturación</value>
>         <value xml:lang="fr">Pas de compte de facturation</value>
>         <value xml:lang="hi_IN">कोई भुगतान ख़ाता नही</value>
> -        <value xml:lang="it">Nessun conto fatturazione</value>
>         <value xml:lang="ja">No Billing Account</value>
> +        <value xml:lang="it">Nessun conto fatturazione</value>
>         <value xml:lang="nl">Geen factuur rekening</value>
>         <value xml:lang="pt_PT">Sem Conta para Pagamento</value>
>         <value xml:lang="ro">Nici-un Cont Facturatie</value>
> @@ -4855,8 +4856,8 @@
>         <value xml:lang="en">Offline Payment</value>
>         <value xml:lang="es">Pago fuera de línea</value>
>         <value xml:lang="fr">Paiement hors connexion</value>
> -        <value xml:lang="it">Pagamento offline</value>
>         <value xml:lang="ja">Offline Payment</value>
> +        <value xml:lang="it">Pagamento offline</value>
>         <value xml:lang="nl">Offline betalen</value>
>         <value xml:lang="pt_PT">Pagamento Tradicional</value>
>         <value xml:lang="ro">Plata Offline</value>
> @@ -5052,8 +5053,8 @@
>     <property key="AccountingPartyAccountsSummary">
>         <value xml:lang="en">Accounts Summary</value>
>         <value xml:lang="fr">Résumé des comptes</value>
> -        <value xml:lang="it">Sommario Conti</value>
>         <value xml:lang="nl">Samenvatting rekeningen</value>
> +        <value xml:lang="it">Sommario Conti</value>
>     </property>
>     <property key="AccountingPartyBilledFrom">
>         <value xml:lang="ar">مفوترة من طرف</value>
> @@ -5088,7 +5089,7 @@
>     </property>
>     <property key="AccountingPartyGlAccounts">
>         <value xml:lang="en">Party Gl Accounts</value>
> -        <value xml:lang="fr">Comptes de tiers</value>
> +        <value xml:lang="fr">Comptes d'acteur (GL)</value>
>         <value xml:lang="nl">GB-rekeningen relatie</value>
>         <value xml:lang="th">กลุ่มผู้ใช้บัญชีแยกประเภททั่วไป</value>
>     </property>
> @@ -5152,20 +5153,32 @@
>         <value xml:lang="zh">会员角色列表</value>
>     </property>
>     <property key="AccountingPayment">
> +        <value xml:lang="ar">تسديد</value>
>         <value xml:lang="de">Bezahlung</value>
>         <value xml:lang="en">Payment</value>
>         <value xml:lang="es">Pago</value>
>         <value xml:lang="fr">Paiement</value>
>         <value xml:lang="it">Pagamento</value>
> +        <value xml:lang="nl">Betaling</value>
> +        <value xml:lang="pt_BR">Pagamento</value>
> +        <value xml:lang="pt_PT">Pagamento</value>
> +        <value xml:lang="ro">Plata</value>
> +        <value xml:lang="ru">платеж</value>
>         <value xml:lang="th">การชำระเงิน</value>
> +        <value xml:lang="zh">支付</value>
>     </property>
>     <property key="AccountingPaymentAlreadyReceived">
> +        <value xml:lang="ar">تسديد مستلم مسبقا</value>
>         <value xml:lang="de">Bezahlung bereits erhalten</value>
>         <value xml:lang="en">Payment Already Received</value>
>         <value xml:lang="es">El pago ya fue recibido</value>
>         <value xml:lang="fr">Paiement déjà reçu</value>
>         <value xml:lang="it">Pagamento già ricevuto</value>
> +        <value xml:lang="nl">Betaling reeds ontvangen</value>
> +        <value xml:lang="ro">Plata incasata</value>
> +        <value xml:lang="ru">Платеж уже получен</value>
>         <value xml:lang="th">ได้รับการชำระเงินแล้ว</value>
> +        <value xml:lang="zh">已收到支付</value>
>     </property>
>     <property key="AccountingPaymentInformation">
>         <value xml:lang="ar">معلومات التسديد</value>
> @@ -5230,20 +5243,6 @@
>         <value xml:lang="th">ชำระเงินผ่าน WorldPay</value>
>         <value xml:lang="zh">用WorldPay支付</value>
>     </property>
> -    <property key="AccountingPayment">
> -        <value xml:lang="ar">تسديد</value>
> -        <value xml:lang="en">Payment</value>
> -        <value xml:lang="es">Pago</value>
> -        <value xml:lang="fr">Paiement</value>
> -        <value xml:lang="it">Pagamento</value>
> -        <value xml:lang="nl">Betaling</value>
> -        <value xml:lang="pt_BR">Pagamento</value>
> -        <value xml:lang="pt_PT">Pagamento</value>
> -        <value xml:lang="ro">Plata</value>
> -        <value xml:lang="ru">платеж</value>
> -        <value xml:lang="th">การชำระเงิน</value>
> -        <value xml:lang="zh">支付</value>
> -    </property>
>     <property key="AccountingPaymentAlreadyApplied">
>         <value xml:lang="en">Payment [${paymentId}] is already fully applied</value>
>         <value xml:lang="es">Pago [${paymentId}] esta completamente aplicado</value>
> @@ -5255,18 +5254,6 @@
>         <value xml:lang="th">การชำระเงิน [${paymentId}] 
> นำไปใช้ได้เต็มที่</value>
>         <value xml:lang="zh">支付[${paymentId}]已完整应用</value>
>     </property>
> -    <property key="AccountingPaymentAlreadyReceived">
> -        <value xml:lang="ar">تسديد مستلم مسبقا</value>
> -        <value xml:lang="en">Payment already received</value>
> -        <value xml:lang="es">Pago recibido</value>
> -        <value xml:lang="fr">Paiement déjà reçu</value>
> -        <value xml:lang="it">Pagamento già ricevuto</value>
> -        <value xml:lang="nl">Betaling reeds ontvangen</value>
> -        <value xml:lang="ro">Plata incasata</value>
> -        <value xml:lang="ru">Платеж уже получен</value>
> -        <value xml:lang="th">ได้รับการชำระเงินเรียบร้อยแล้ว</value>
> -        <value xml:lang="zh">已收到支付</value>
> -    </property>
>     <property key="AccountingPaymentApplRemoved">
>         <value xml:lang="en">PaymentID [${paymentApplication.paymentId}] with amount 
> ${paymentApplication.amountApplied?currency(${currencyUomId})} removed from</value>
>         <value xml:lang="es">IdPago[${paymentApplication.paymentId}] con cantidad 
> ${paymentApplication.amountApplied?currency(${currencyUomId})} suprimido de</value>
> @@ -5473,7 +5460,7 @@
>     <property key="AccountingPaymentMethodId........">
>         <value xml:lang="en">AccountingPaymentMethodId........</value>
>         <value xml:lang="fr">Réf. de méthode de paiement      </value>
> -        <value xml:lang="nln">AccountingPaymentMethodId........</value>
> +        <value xml:lang="nl">AccountingPaymentMethodId........</value>
>         <value xml:lang="ro">No values are passed............???</value>
>         <value xml:lang="th">รหัสวิธีการชำระเงิน............???</value>
>     </property>
> @@ -5917,8 +5904,8 @@
>     <property key="AccountingProblemGettingOrderPaymentPreferences">
>         <value xml:lang="en">Problem getting OrderPaymentPreference records</value>
>         <value xml:lang="fr">Erreur en recherchant les préférences de paiement associées à la commande</value>
> -        <value xml:lang="nl">Probleem met het ophalen van OrderPaymentPreference records</value>
>         <value xml:lang="ru">Проблема получения записей OrderPaymentPreference</value>
> +        <value xml:lang="nl">Probleem met het ophalen van OrderPaymentPreference records</value>
>         <value xml:lang="th">Problem getting OrderPaymentPreference records</value>
>         <value xml:lang="zh">获得定单支付优先方法记录时出错</value>
>     </property>
> @@ -5947,8 +5934,8 @@
>     <property key="AccountingProblemStoringOrderAdjustments">
>         <value xml:lang="en">Problem storing OrderAdjustments: ${orderAdjustments}</value>
>         <value xml:lang="fr">Erreur en essayant d'enregistrer les ajustements de commande: ${orderAdjustments}</value>
> -        <value xml:lang="nl">Probleem met het opslaan van orderaanpassing(en): ${orderAdjustments}</value>
>         <value xml:lang="ru">Проблема сохранения OrderAdjustments: ${orderAdjustments}</value>
> +        <value xml:lang="nl">Probleem met het opslaan van orderaanpassing(en): ${orderAdjustments}</value>
>         <value xml:lang="th">ปัญหาในการเก็บข้อมูลรายการส่วนลด: 
> ${orderAdjustments}</value>
>         <value xml:lang="zh">存储定单调整时出错:${orderAdjustments}</value>
>     </property>
> @@ -5966,13 +5953,13 @@
>     </property>
>     <property key="AccountingProductCategoryGlAccount">
>         <value xml:lang="en">Product Category Gl Account</value>
> -        <value xml:lang="fr">Compte de catégorie de produit</value>
> +        <value xml:lang="fr">Compte de catégorie de produit (GL)</value>
>         <value xml:lang="nl">GB-rekening Productcategorie</value>
>         <value xml:lang="th">หมวดหมู่สินค้าบัญชีแยกประเภ
> ททั่วไป</value>
>     </property>
>     <property key="AccountingProductGlAccount">
>         <value xml:lang="en">Product GL Accounts</value>
> -        <value xml:lang="fr">Comptes de produit</value>
> +        <value xml:lang="fr">Comptes de produit (GL)</value>
>         <value xml:lang="nl">GB-rekeningen Product</value>
>         <value xml:lang="th">สินค้าบัญชีแยกประเภททั่วไป</value>
>     </property>
> @@ -5993,8 +5980,8 @@
>         <value xml:lang="es">Tarífas de producto</value>
>         <value xml:lang="fr">Taux applicables aux produits</value>
>         <value xml:lang="it">Percentuali Prodotto</value>
> -        <value xml:lang="nl">Productprijzen</value>
>         <value xml:lang="ro">Procent Produs</value>
> +        <value xml:lang="nl">Productprijzen</value>
>         <value xml:lang="ru">Ставки продукта</value>
>         <value xml:lang="th">ราคาสินค้า</value>
>         <value xml:lang="zh">产品税率</value>
> @@ -6183,7 +6170,7 @@
>     </property>
>     <property key="AccountingSetup">
>         <value xml:lang="en">Setup</value>
> -        <value xml:lang="fr">Configuration</value>
> +        <value xml:lang="fr">Installation</value>
>         <value xml:lang="nl">Configuratie</value>
>         <value xml:lang="th">ติดตั้ง</value>
>     </property>
> @@ -6428,7 +6415,7 @@
>     </property>
>     <property key="AccountingTaxAuthorityGlAccounts">
>         <value xml:lang="en">TaxAuthority GL Accounts </value>
> -        <value xml:lang="fr">Comptes de l'administration fiscale</value>
> +        <value xml:lang="fr">Comptes de l'administration fiscale (GL)</value>
>         <value xml:lang="nl">GB-rekeningen belastinginstantie(s)</value>
>         <value xml:lang="th">ภาษีบัญชีแยกประเภททั่วไป</value>
>     </property>
> @@ -6447,7 +6434,7 @@
>     <property key="AccountingTaxAuthorityRateProductUseThisProductCategory">
>         <value xml:lang="en">At least one Product Rate uses this Category</value>
>         <value xml:lang="fr">Au moins un taux applicable aux produits utilise cette catégorie</value>
> -    </property>
> +    </property>
>     <property key="AccountingTaxSummary">
>         <value xml:lang="ar">تقرير ملخص الضريبة</value>
>         <value xml:lang="en">Tax Summary Report</value>
> @@ -6805,8 +6792,8 @@
>         <value xml:lang="es">Usar otro certificado de regalo</value>
>         <value xml:lang="fr">La carte cadeau utilisée n'existe pas</value>
>         <value xml:lang="hi_IN">उपहार कार्ड फाइल में नहीं</value>
> -        <value xml:lang="it">La carta omaggio utilizzata non esiste</value>
>         <value xml:lang="ja">Use Gift Card Not On File</value>
> +        <value xml:lang="it">La carta omaggio utilizzata non esiste</value>
>         <value xml:lang="nl">Gebruik een niet bekende tegoedbon</value>
>         <value xml:lang="ro">Foloseste Carte Omagiu Nu din Fisier</value>
>         <value xml:lang="ru">Использованной дисконтной карты нет в файле</value>
> @@ -6850,7 +6837,7 @@
>         <value xml:lang="th">คุณไม่ได้รบอนุญาตให้เข้าชมหน้านี้ 
> ("ACCOUNTING_VIEW" หรือ "ACCOUNTING_ADMIN" ต้องการ)</value>
>         <value xml:lang="zh">ä½ æ²¡æœ‰æµè§ˆè¿™ä¸ªé¡µé¢çš„æƒé™ã€‚(需要是"ACCOUNTING_VIEW"或"ACCOUNTING_ADMIN")</value>
>     </property>
> -    <property key="AccountingVirtualCard">
> +     <property key="AccountingVirtualCard">
>         <value xml:lang="de">Virtuelle Karte</value>
>         <value xml:lang="en">Virtual Card</value>
>         <value xml:lang="es">Tarjeta virtual</value>
> @@ -7886,8 +7873,8 @@
>         <value xml:lang="en">Gl Account Type Id</value>
>         <value xml:lang="es">Id Tipo Cuenta LM</value>
>         <value xml:lang="fr">Type du compte comptable</value>
> -        <value xml:lang="it">Tipo Conto Gl</value>
>         <value xml:lang="nl">ID type GB-rekening</value>
> +        <value xml:lang="it">Tipo Conto Gl</value>
>         <value xml:lang="ro">Tip Cont Gl</value>
>         <value xml:lang="ru">Код типа счета ГК</value>
>         <value xml:lang="th">รหัสประเภทบัญชีแยกประเภททั่วไป</value>
> @@ -7908,8 +7895,8 @@
>     <property key="FormFieldTitle_glJournalId">
>         <value xml:lang="en">Gl Journal Id</value>
>         <value xml:lang="fr">Réf. journal du Grand Livre</value>
> -        <value xml:lang="it">Giornale</value>
>         <value xml:lang="nl">ID GB-journaal</value>
> +        <value xml:lang="it">Giornale</value>
>         <value xml:lang="th">Gl Journal Id</value>
>     </property>
>     <property key="FormFieldTitle_glResourceTypeId">
> @@ -8059,7 +8046,7 @@
>     <property key="FormFieldTitle_invoiceNotApplied">
>         <value xml:lang="en">Not Applied</value>
>         <value xml:lang="fr">Non alloué</value>
> -    </property>
> +    </property>
>     <property key="FormFieldTitle_invoiceProcessing">
>         <value xml:lang="ar">تعيين لكامل الفاتورة</value>
>         <value xml:lang="en">Assign to Whole invoice</value>
> @@ -8267,7 +8254,7 @@
>     <property key="FormFieldTitle_notApplied">
>         <value xml:lang="en">Not Applied</value>
>         <value xml:lang="fr">Non alloué</value>
> -    </property>
> +    </property>
>     <property key="FormFieldTitle_orderDate">
>         <value xml:lang="en">Order Date</value>
>         <value xml:lang="fr">Date de commande</value>
> @@ -8586,7 +8573,7 @@
>     </property>
>     <property key="FormFieldTitle_postToGlAccountId">
>         <value xml:lang="en">Post To Gl Account Id</value>
> -        <value xml:lang="fr">Comptabilisé à la réf. de compte</value>
> +        <value xml:lang="fr">Comptabilisé à la réf. de compte (GL)</value>
>         <value xml:lang="it">Contabilizza su Conto Gl</value>
>         <value xml:lang="nl">Boeken op GB-rekening</value>
>         <value xml:lang="ru">На счет ГК с кодом</value>
> @@ -8961,8 +8948,8 @@
>         <value xml:lang="es">Id Secuencia Tarifa de Autoridad Fiscal</value>
>         <value xml:lang="fr">Séquence de taux de taxation</value>
>         <value xml:lang="it">Numero Sequenza Percentuale Autorità Tasse</value>
> -        <value xml:lang="nl">Koersvolgnummer belastinginstantie</value>
>         <value xml:lang="ro">Nr.Secventa Procent Taxa Autoritate</value>
> +        <value xml:lang="nl">Koersvolgnummer belastinginstantie</value>
>         <value xml:lang="ru">Код налог. ставки</value>
>         <value xml:lang="th">รหัสรายการอัตราภาษี</value>
>         <value xml:lang="zh">税务机关税率序号</value>
> @@ -9073,8 +9060,8 @@
>     <property key="FormFieldTitle_timeEntryId">
>         <value xml:lang="en">Time Entry Id</value>
>         <value xml:lang="fr">Réf. de date d'écriture</value>
> -        <value xml:lang="it">Riga Timbratura</value>
>         <value xml:lang="nl">ID tijdregistratie</value>
> +        <value xml:lang="it">Riga Timbratura</value>
>         <value xml:lang="th">รหัสตารางการทำงาน</value>
>     </property>
>     <property key="FormFieldTitle_toPaymentId">
> @@ -9124,7 +9111,7 @@
>     <property key="FormFieldTitle_totInvoiceApplied">
>         <value xml:lang="en">Tot Invoice Applied</value>
>         <value xml:lang="fr">Total alloué</value>
> -    </property>
> +    </property>
>     <property key="FormFieldTitle_transCodeEnumId">
>         <value xml:lang="en">Trans Code Enum Id</value>
>         <value xml:lang="es">Id Enum Código de Trans</value>
> @@ -9430,8 +9417,8 @@
>     <property key="PageTitleEditBillingAccountOrders">
>         <value xml:lang="en">Edit Billing Account Orders</value>
>         <value xml:lang="fr">Modifier le compte de facturation des commandes</value>
> -        <value xml:lang="it">Aggiorna Ordini Conto Fatturazione</value>
>         <value xml:lang="nl">Orders factuurrekening aanpassen</value>
> +        <value xml:lang="it">Aggiorna Ordini Conto Fatturazione</value>
>         <value xml:lang="th">แก้ไขรายการยอดรวมของบัญชี</value>
>     </property>
>     <property key="PageTitleEditBillingAccountPayments">
> @@ -9616,7 +9603,7 @@
>     </property>
>     <property key="PageTitleEditPartyGlAccounts">
>         <value xml:lang="en">Edit Party Gl Accounts</value>
> -        <value xml:lang="fr">Modifier les comptes de tiers</value>
> +        <value xml:lang="fr">Modifier les comptes de tiers (GL)</value>
>         <value xml:lang="nl">Gb-rekeningen relatie aanpassen</value>
>         <value xml:lang="th">แก้ไขกลุ่มผู้ใช้บัญชีแยกประเภ
> ททั่วไป</value>
>     </property>
> @@ -9771,7 +9758,7 @@
>     </property>
>     <property key="PageTitleFindGlAccount">
>         <value xml:lang="en">PageTitleFindGlAccount</value>
> -        <value xml:lang="fr">Chercher un compte</value>
> +        <value xml:lang="fr">Chercher un compte (GL)</value>
>         <value xml:lang="nl">Vind GB-rekening(en)</value>
>         <value xml:lang="th">ค้นหาบัญชีแยกประเภททั่วไป</value>
>     </property>
> @@ -9950,8 +9937,8 @@
>     <property key="PageTitleListFinAccountRoles">
>         <value xml:lang="en">List Fin Account Roles</value>
>         <value xml:lang="fr">Liste des rôles de compte financier</value>
> -        <value xml:lang="it">Lista Ruoli Conto Finanziario</value>
>         <value xml:lang="nl">Toon rollen financiële rekeningen</value>
> +        <value xml:lang="it">Lista Ruoli Conto Finanziario</value>
>         <value xml:lang="th">รายการสถานะบัญชี</value>
>     </property>
>     <property key="PageTitleListFinAccountTrans">
> @@ -10018,8 +10005,8 @@
>     <property key="PageTitleListFixedAssetRegistrations">
>         <value xml:lang="en">List Fixed Asset Registrations</value>
>         <value xml:lang="fr">Liste des enregistrements d'immobilisation</value>
> -        <value xml:lang="it">Lista Registrazioni Cespiti</value>
>         <value xml:lang="nl">Toon registraties vaste activa</value>
> +        <value xml:lang="it">Lista Registrazioni Cespiti</value>
>         <value 
> xml:lang="th">รายการลงทะเบียนทรัพย์สินไม่หมุนเวียน</value>
>     </property>
>     <property key="PageTitleListFixedAssetStdCosts">
> @@ -10431,8 +10418,8 @@
>     </property>
>     <property key="es">
>         <value xml:lang="en">Spanish</value>
> -        <value xml:lang="es">Español</value>
>         <value xml:lang="fr">Espagnol</value>
> +        <value xml:lang="es">Español</value>
>         <value xml:lang="nl">Spaans</value>
>         <value xml:lang="ru">Испанский</value>
>         <value xml:lang="th">สเปน</value>
> @@ -10552,8 +10539,8 @@
>     <property key="ru">
>         <value xml:lang="en">Russian</value>
>         <value xml:lang="fr">Russe</value>
> -        <value xml:lang="nl">Russisch</value>
>         <value xml:lang="ru">Русский</value>
> +        <value xml:lang="nl">Russisch</value>
>         <value xml:lang="th">รัสเซีย</value>
>     </property>
> </resource>
>
> Modified: ofbiz/trunk/applications/content/config/ContentErrorUiLabels.xml
> URL: 
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/config/ContentErrorUiLabels.xml?rev=725466&r1=725465&r2=725466&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/content/config/ContentErrorUiLabels.xml (original)
> +++ ofbiz/trunk/applications/content/config/ContentErrorUiLabels.xml Wed Dec 10 14:18:58 2008
> @@ -69,7 +69,7 @@
>         <value xml:lang="zh">图像({b})或类型(${imageType})为null或为空</value>
>     </property>
>     <property key="dataResourceWorker.image_or_field_null">
> -        <value xml:lang="en">imageFi(${imageFi}) oder idFieldValue(${idFieldValue}) ist null</value>
> +        <value xml:lang="de">imageFi(${imageFi}) oder idFieldValue(${idFieldValue}) ist null</value>
>         <value xml:lang="en">imageFi(${imageFi}) or idFieldValue(${idFieldValue}) is null</value>
>         <value xml:lang="es">Imagen(${imageFi}) or Campo(${idFieldValue}) son nulos</value>
>         <value xml:lang="fr">imageFi (${imageFi}) ou idFieldValue (${idFieldValue}) est invalide</value>
>
> Modified: ofbiz/trunk/applications/content/config/ContentUiLabels.xml
> URL: 
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/config/ContentUiLabels.xml?rev=725466&r1=725465&r2=725466&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/content/config/ContentUiLabels.xml (original)
> +++ ofbiz/trunk/applications/content/config/ContentUiLabels.xml Wed Dec 10 14:18:58 2008
> @@ -2516,7 +2516,7 @@
>         <value xml:lang="ar">إضافة نص مورد معلومات</value>
>         <value xml:lang="de">Datenressource Text hinzufügen</value>
>         <value xml:lang="en">Add DataResource Text</value>
> -        <value xml:lang="efr">Ajouter une ressource de données (texte)</value>
> +        <value xml:lang="fr">Ajouter une ressource de données (texte)</value>
>         <value xml:lang="it">Aggiungi Testo Risorsa Dati</value>
>         <value xml:lang="ro">Adauga Text Resurse Date</value>
>         <value 
> xml:lang="th">เพิ่มแหล่งที่มาของข้อมูลเป็นตัวอักษร</value>
> @@ -2936,7 +2936,7 @@
>     <property key="PageTitleEditDataResourceTypeAttr">
>         <value xml:lang="de">Datenressourcentyp Attribute bearbeiten</value>
>         <value xml:lang="en">Edit Data Resource Type Attribute</value>
> -        <value xml:lang="en">Modifier la ressource de données (type d'attibut)</value>
> +        <value xml:lang="fr">Modifier la ressource de données (type d'attibut)</value>
>         <value xml:lang="it">Aggiorna Attributo Tipo Risorsa Dati</value>
>         <value xml:lang="th">แก้ไขข้อมูลแหล่งที่มาของประเภ
> ทคุณสมบัติ</value>
>     </property>
>
> Modified: ofbiz/trunk/applications/party/config/PartyEntityLabels.xml
> URL: 
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/config/PartyEntityLabels.xml?rev=725466&r1=725465&r2=725466&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/party/config/PartyEntityLabels.xml (original)
> +++ ofbiz/trunk/applications/party/config/PartyEntityLabels.xml Wed Dec 10 14:18:58 2008
> @@ -2270,8 +2270,6 @@
>         <value xml:lang="en">Payment (net days)</value>
>         <value xml:lang="es">Pago (días netos)</value>
>         <value xml:lang="fr">Paiment (Ã date)</value>
> -        <value xml:lang="es">Pago (días netos)</value>
> -        <value xml:lang="fr">Paiement (net)</value>
>         <value xml:lang="it">Pagamento (netto giorni)</value>
>         <value xml:lang="pt_PT">Pagamento (prazo na internet)(net days)</value>
>         <value xml:lang="ro">Plata (net zile)</value>
>
> Modified: ofbiz/trunk/applications/party/config/PartyUiLabels.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/config/PartyUiLabels.xml?rev=725466&r1=725465&r2=725466&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/party/config/PartyUiLabels.xml (original)
> +++ ofbiz/trunk/applications/party/config/PartyUiLabels.xml Wed Dec 10 14:18:58 2008
> @@ -204,7 +204,6 @@
>     <property key="EmailfromUnknownParties">
>         <value xml:lang="de">E-Mail von unbekanntem Akteur</value>
>         <value xml:lang="en">Email from unknown parties</value>
> -        <value xml:lang="es">Correo electrónico de participante desconocido</value>
>         <value xml:lang="es">Correo electrónico de participantes desconocidos</value>
>         <value xml:lang="fr">Courriel depuis un acteur inconnu</value>
>         <value xml:lang="nl">E-mail van een onbekende relatie of contact</value>
> @@ -559,7 +558,6 @@
>         <value xml:lang="en">Email Address</value>
>         <value xml:lang="es">Correo electrónico</value>
>         <value xml:lang="fr">Adresse courriel</value>
> -        <value xml:lang="en">E-mailadres</value>
>         <value xml:lang="it">Indirizzo Email</value>
>         <value xml:lang="th">ที่อยู่อีเมล์</value>
>     </property>
> @@ -934,7 +932,6 @@
>         <value xml:lang="zh">å…´è¶£ä»£ç </value>
>     </property>
>     <property key="FormFieldTitle_organizationName">
> -        <value xml:lang="de">Organisationsname</value>
>         <value xml:lang="de">Organisation Name</value>
>         <value xml:lang="en">Organization Name</value>
>         <value xml:lang="es">Nombre de la organización</value>
> @@ -1391,7 +1388,6 @@
>     </property>
>     <property key="FormFieldTitle_userLoginId">
>         <value xml:lang="de">Benutzeranmeldung ID</value>
> -        <value xml:lang="de">User Login ID</value>
>         <value xml:lang="en">User Login Id</value>
>         <value xml:lang="es">Código de usuario para conexión</value>
>         <value xml:lang="fr">Identifiant de connexion</value>
> @@ -2748,7 +2744,7 @@
>         <value xml:lang="es">Emisores de certificados</value>
>         <value xml:lang="fr">Émetteurs de certificat</value>
>         <value xml:lang="it">Fornitori di Certificati</value>
> -        <value xml:lang="fr">Certificaat-uitgever</value>
> +        <value xml:lang="nl">Certificaat-uitgever</value>
>         <value xml:lang="ru">Эмитенты сертификата</value>
>         <value xml:lang="th">ประเด็น</value>
>     </property>
> @@ -5089,7 +5085,6 @@
>         <value xml:lang="de">Initiale zweiter Vorname</value>
>         <value xml:lang="en">Middle Initial</value>
>         <value xml:lang="es">Inicial del segundo nombre</value>
> -        <value xml:lang="es">Inicial</value>
>         <value xml:lang="fr">Initiale</value>
>         <value xml:lang="it">Iniziale Centrale</value>
>         <value xml:lang="nl">Voorletters</value>
> @@ -6489,7 +6484,7 @@
>         <value xml:lang="zh">关系</value>
>     </property>
>     <property key="PartyRemoveAttributePermissionError">
> -        <value xml:lang="en">Sicherheitsfehler: um createPartyAttribute auszuführen müssen Sie die Berechtigung PARTYMGR_DELETE 
> oder PARTYMGR_ADMIN besitzen</value>
> +        <value xml:lang="de">Sicherheitsfehler: um createPartyAttribute auszuführen müssen Sie die Berechtigung PARTYMGR_DELETE 
> oder PARTYMGR_ADMIN besitzen</value>
>         <value xml:lang="en">Security Error: to run createPartyAttribute you must have the PARTYMGR_DELETE or PARTYMGR_ADMIN 
> permission</value>
>         <value xml:lang="es">Error de seguridad: para acceder a esta funcionalidad debe contar con los permisos PARTYMGR_DELETE o 
> PARTYMGR_ADMIN</value>
>         <value xml:lang="fr">Erreur de sécurité: pour exécuter createPartyAttribute vous devez avoir l'autorisation 
> PARTYMGR_DELETE ou PARTYMGR_ADMIN</value>
> @@ -6501,7 +6496,7 @@
>         <value xml:lang="zh">安全错误: 要运行 createPartyAttributeï¼Œä½ å¿…é¡»å…·æœ‰ PARTYMGR_DELETE 或 PARTYMGR_ADMIN 
> 权限</value>
>     </property>
>     <property key="PartyRemoveCommunicationEventPurposePermissionError">
> -        <value xml:lang="en">Sicherheitsfehler: um removeCommunicationEventPurpose auszuführen müssen Sie die Berechtigung 
> PARTYMGR_DELETE oder PARTYMGR_ADMIN besitzen</value>
> +        <value xml:lang="de">Sicherheitsfehler: um removeCommunicationEventPurpose auszuführen müssen Sie die Berechtigung 
> PARTYMGR_DELETE oder PARTYMGR_ADMIN besitzen</value>
>         <value xml:lang="en">Security Error: to run removeCommunicationEventPurpose you must have the PARTYMGR_DELETE or 
> PARTYMGR_ADMIN permission</value>
>         <value xml:lang="es">Error de seguridad: para acceder a esta funcionalidad debe contar con los permisos PARTYMGR_DELETE o 
> PARTYMGR_ADMIN</value>
>         <value xml:lang="fr">Erreur sécurité : pour supprimer l'objet d'un appel il faut avoir avoir l'autorisation 
> PARTYMGR_DELETE ou PARTYMGR_ADMIN.</value>
> @@ -6514,7 +6509,7 @@
>         <value xml:lang="zh">安全错误: 要运行 removeCommunicationEventPurposeï¼Œä½ å¿…é¡»å…·æœ‰ PARTYMGR_DELETE 或 
> PARTYMGR_ADMIN 权限</value>
>     </property>
>     <property key="PartyRemoveCommunicationEventRolePermissionError">
> -        <value xml:lang="en">Sicherheitsfehler: um removeCommunicationEventRole auszuführen müssen Sie die Berechtigung 
> PARTYMGR_DELETE oder PARTYMGR_ADMIN besitzen</value>
> +        <value xml:lang="de">Sicherheitsfehler: um removeCommunicationEventRole auszuführen müssen Sie die Berechtigung 
> PARTYMGR_DELETE oder PARTYMGR_ADMIN besitzen</value>
>         <value xml:lang="en">Security Error: to run removeCommunicationEventRole you must have the PARTYMGR_DELETE or 
> PARTYMGR_ADMIN permission</value>
>         <value xml:lang="es">Error de seguridad: para acceder a esta funcionalidad debe contar con los permisos PARTYMGR_DELETE o 
> PARTYMGR_ADMIN</value>
>         <value xml:lang="fr">Erreur sécurité : pour supprimer le rôle d'une communication il faut avoir avoir l'autorisation 
> PARTYMGR_DELETE ou PARTYMGR_ADMIN.</value>
> @@ -6526,7 +6521,7 @@
>         <value xml:lang="zh">安全错误: 要运行 removeCommunicationEventRoleï¼Œä½ å¿…é¡»å…·æœ‰ PARTYMGR_DELETE 或 
> PARTYMGR_ADMIN 权限</value>
>     </property>
>     <property key="PartyRemovePartyClassificationGroupPermissionError">
> -        <value xml:lang="en">Sicherheitsfehler: um deletePartyClassificationGroup auszuführen müssen Sie die Berechtigung 
> PARTYMGR_DELETE oder PARTYMGR_ADMIN besitzen</value>
> +        <value xml:lang="de">Sicherheitsfehler: um deletePartyClassificationGroup auszuführen müssen Sie die Berechtigung 
> PARTYMGR_DELETE oder PARTYMGR_ADMIN besitzen</value>
>         <value xml:lang="en">Security Error: to run deletePartyClassificationGroup you must have the PARTYMGR_DELETE or 
> PARTYMGR_ADMIN permission</value>
>         <value xml:lang="es">Error de seguridad: para acceder a esta funcionalidad debe contar con los permisos PARTYMGR_DELETE o 
> PARTYMGR_ADMIN</value>
>         <value xml:lang="fr">Erreur sécurité : pour supprimer un groupe de classification d'acteurs, il faut avoir 
> l'autorisation PARTYMGR_DELETE ou</value>
> @@ -6538,7 +6533,7 @@
>         <value xml:lang="zh">安全错误: 要运行 deletePartyClassificationGroupï¼Œä½ å¿…é¡»å…·æœ‰ PARTYMGR_DELETE 或 
> PARTYMGR_ADMIN 权限</value>
>     </property>
>     <property key="PartyRemovePartyClassificationPermissionError">
> -        <value xml:lang="en">Sicherheitsfehler: um deletePartyClassification auszuführen müssen Sie die Berechtigung 
> PARTYMGR_DELETE oder PARTYMGR_ADMIN besitzen</value>
> +        <value xml:lang="de">Sicherheitsfehler: um deletePartyClassification auszuführen müssen Sie die Berechtigung 
> PARTYMGR_DELETE oder PARTYMGR_ADMIN besitzen</value>
>         <value xml:lang="en">Security Error: to run deletePartyClassification you must have the PARTYMGR_DELETE or PARTYMGR_ADMIN 
> permission</value>
>         <value xml:lang="es">Error de seguridad: para acceder a esta funcionalidad debe contar con los permisos PARTYMGR_DELETE o 
> PARTYMGR_ADMIN</value>
>         <value xml:lang="fr">Erreur sécurité : pour supprimer une classification d'acteur il faut avoir avoir l'autorisation 
> PARTYMGR_DELETE ou PARTYMGR_ADMIN.</value>
> @@ -6550,7 +6545,7 @@
>         <value xml:lang="zh">安全错误: 要运行 deletePartyClassificationï¼Œä½ å¿…é¡»å…·æœ‰ PARTYMGR_DELETE 或 
> PARTYMGR_ADMIN 权限</value>
>     </property>
>     <property key="PartyRemovePartyRelationshipPermissionError">
> -        <value xml:lang="en">Sicherheitsfehler: um removePartyRelationship auszuführen müssen Sie die Berechtigung 
> PARTYMGR_DELETE oder PARTYMGR_ADMIN besitzen</value>
> +        <value xml:lang="de">Sicherheitsfehler: um removePartyRelationship auszuführen müssen Sie die Berechtigung 
> PARTYMGR_DELETE oder PARTYMGR_ADMIN besitzen</value>
>         <value xml:lang="en">Security Error: to run removePartyRelationship you must have the PARTYMGR_DELETE or PARTYMGR_ADMIN 
> permission</value>
>         <value xml:lang="es">Error de seguridad: para acceder a esta funcionalidad debe contar con los permisos PARTYMGR_DELETE o 
> PARTYMGR_ADMIN</value>
>         <value xml:lang="fr">Erreur sécurité : pour supprimer une relation inter-acteurs il faut avoir avoir l'autorisation 
> PARTYMGR_DELETE ou PARTYMGR_ADMIN.</value>
> @@ -6562,7 +6557,7 @@
>         <value xml:lang="zh">安全错误: 要运行 removePartyRelationshipï¼Œä½ å¿…é¡»å…·æœ‰ PARTYMGR_DELETE 或 PARTYMGR_ADMIN 
> 权限</value>
>     </property>
>     <property key="PartyRemovePostalAddressBoundaryPermissionError">
> -        <value xml:lang="en">Sicherheitsfehler: um deletePostalAddressBoundary auszuführen müssen Sie die Berechtigung 
> PARTYMGR_DELETE oder PARTYMGR_ADMIN besitzen</value>
> +        <value xml:lang="de">Sicherheitsfehler: um deletePostalAddressBoundary auszuführen müssen Sie die Berechtigung 
> PARTYMGR_DELETE oder PARTYMGR_ADMIN besitzen</value>
>         <value xml:lang="en">Security Error: to run deletePostalAddressBoundary you must have the PARTYMGR_DELETE or 
> PARTYMGR_ADMIN permission</value>
>         <value xml:lang="es">Error de seguridad: para acceder a esta funcionalidad debe contar con los permisos PARTYMGR_DELETE o 
> PARTYMGR_ADMIN</value>
>         <value xml:lang="fr">Erreur sécurité : pour supprimer une adresse postale frontière il faut avoir avoir l'autorisation 
> PARTYMGR_DELETE ou PARTYMGR_ADMIN.</value>
> @@ -6574,7 +6569,7 @@
>         <value xml:lang="zh">安全错误: 要运行 deletePostalAddressBoundaryï¼Œä½ å¿…é¡»å…·æœ‰ PARTYMGR_DELETE 或 
> PARTYMGR_ADMIN 权限</value>
>     </property>
>     <property key="PartyRemoveWebSiteRolePermissionError">
> -        <value xml:lang="en">Sicherheitsfehler: um removeWebSiteRole auszuführen müssen Sie die Berechtigung PARTYMGR_DELETE 
> oder PARTYMGR_ADMIN besitzen</value>
> +        <value xml:lang="de">Sicherheitsfehler: um removeWebSiteRole auszuführen müssen Sie die Berechtigung PARTYMGR_DELETE 
> oder PARTYMGR_ADMIN besitzen</value>
>         <value xml:lang="en">Security Error: to run removeWebSiteRole you must have the PARTYMGR_DELETE or PARTYMGR_ADMIN 
> permission</value>
>         <value xml:lang="es">Error de seguridad: para acceder a esta funcionalidad debe contar con los permisos PARTYMGR_DELETE o 
> PARTYMGR_ADMIN</value>
>         <value xml:lang="fr">Erreur sécurité : pour supprimer un rôle de site web il faut avoir avoir l'autorisation 
> PARTYMGR_DELETE ou PARTYMGR_ADMIN.</value>
> @@ -6880,7 +6875,7 @@
>         <value xml:lang="es">Seleccione rol</value>
>         <value xml:lang="fr">Sélectionner le rôle</value>
>         <value xml:lang="it">Seleziona Ruolo</value>
> -        <value xml:lang="en">Selecteer rol</value>
> +        <value xml:lang="nl">Selecteer rol</value>
>         <value xml:lang="ru">Выбрать роль</value>
>         <value xml:lang="th">เลือกสถานะ</value>
>     </property>
> @@ -7409,10 +7404,6 @@
>         <value xml:lang="th">ผลรวม</value>
>         <value xml:lang="zh">合计</value>
>     </property>
> -    <property key="PartyTotal">
> -        <value xml:lang="en">Total</value>
> -        <value xml:lang="fr">Total</value>
> -    </property>
>     <property key="PartyTotalYearsWorkNotValidNumber">
>         <value xml:lang="de">Anzahl Jahre Arbeitserfahrung ist keine gültige Zahl</value>
>         <value xml:lang="en">Total Years Work Experience is not a valid number</value>
> @@ -7612,7 +7603,7 @@
>         <value xml:lang="en">Update UserLogin Security Settings</value>
>         <value xml:lang="fr">Mise à jour des paramètres de sécurité pour l'identifiant de connexion</value>
>         <value xml:lang="it">Aggiorna Impostazioni Sicurezza Utente Login</value>
> -        <value xml:lang="en">UserLogin Security Settings wijzigen</value>
> +        <value xml:lang="nl">UserLogin Security Settings wijzigen</value>
>         <value xml:lang="ro">Actualizare Setari De Siguranta Utilizator Login</value>
>         <value xml:lang="ru">Обновление настроек безопасности пользователя</value>
>         <value xml:lang="th">เปลี่ยนแปลงการตั้งค่าความปลอดภ
> ัยของผู้เข้าใช้ระบบ</value>
>
> Modified: ofbiz/trunk/applications/product/config/ProductEntityLabels.xml
> URL: 
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductEntityLabels.xml?rev=725466&r1=725465&r2=725466&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/product/config/ProductEntityLabels.xml (original)
> +++ ofbiz/trunk/applications/product/config/ProductEntityLabels.xml Wed Dec 10 14:18:58 2008
> @@ -62,7 +62,6 @@
>         <value xml:lang="de">Geschätzte Arbeitskosten</value>
>         <value xml:lang="en">ESTIMATED_LABOR_COST</value>
>         <value xml:lang="es">Coste estimado de mano de obra</value>
> -        <value xml:lang="es">Labor estimada</value>
>         <value xml:lang="th">ต้นทุนแรงงานโดยประมาณ</value>
>     </property>
>     <property key="CostComponentType.description.ESTIMATED_MATERIALS_">
> @@ -1865,7 +1864,7 @@
>     <property key="ProductPriceType.description.SPECIAL_PROMO_PRICE">
>         <value xml:lang="de">Sonderaktionspreis</value>
>         <value xml:lang="en">Special Promo Price</value>
> -        <value xml:lang="en">Prix spécial promo</value>
> +        <value xml:lang="fr">Prix spécial promo</value>
>         <value xml:lang="it">Prezzo Promozionale Speciale</value>
>         <value xml:lang="ro">Pret Promotional Special</value>
>         <value xml:lang="ru">Специальная цена</value>
>
> Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml
> URL: 
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=725466&r1=725465&r2=725466&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original)
> +++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Wed Dec 10 14:18:58 2008
> @@ -3654,7 +3654,6 @@
>         <value xml:lang="de">Benötigt E-Mail Adresse oder Akteur</value>
>         <value xml:lang="en">Require Email Or Party</value>
>         <value xml:lang="es">Exigir correo electrónico o participante</value>
> -        <value xml:lang="fr">Nécessite email ou groupe</value>
>         <value xml:lang="fr">Email ou acteur requis</value>
>         <value xml:lang="it">Richiesta Email O Soggetto</value>
>         <value xml:lang="ro">Cerere Email sau Subiect</value>
> @@ -17503,14 +17502,13 @@
>     <property key="ProductReserveInventoryFromFacility">
>         <value xml:lang="de">Bestand von Einrichtung reservieren</value>
>         <value xml:lang="en">Reserve inventory from facility</value>
> -        <value xml:lang="en">Réserver depuis le stock d'un lieu de stockage</value>
> +        <value xml:lang="fr">Réserver depuis le stock d'un lieu de stockage</value>
>     </property>
>     <property key="ProductReserveInventory">
>         <value xml:lang="de">Bestand reservieren</value>
>         <value xml:lang="en">Reserve inventory</value>
>         <value xml:lang="es">Reserva de inventario</value>
>         <value xml:lang="fr">Réservation de stock</value>
> -        <value xml:lang="fr">Stock de réserve</value>
>         <value xml:lang="it">Inventario Riservato</value>
>         <value xml:lang="ro">Inventar Rezervat</value>
>         <value xml:lang="ru">Резерв</value>
>
> 


Re: svn commit: r725466 - in /ofbiz/trunk/applications: accounting/config/ content/config/ party/config/ product/config/

Posted by "risalitim@gmail.com" <ri...@gmail.com>.
Thanks a lot Adam to advice me I have fixed into rev. 725477.
It was due to a conflict I had in my local build before commit.

Marco

Il giorno 10/dic/08, alle ore 23:22, Adam Heath ha scritto:

> mrisaliti@apache.org wrote:
>> Author: mrisaliti
>> Date: Wed Dec 10 14:18:58 2008
>> New Revision: 725466
>>
>> URL: http://svn.apache.org/viewvc?rev=725466&view=rev
>> Log:
>> Some wrong locales or duplicated locales while testing the new  
>> Label Manager.
>>
>> Modified:
>>    ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
>>    ofbiz/trunk/applications/content/config/ContentErrorUiLabels.xml
>>    ofbiz/trunk/applications/content/config/ContentUiLabels.xml
>>    ofbiz/trunk/applications/party/config/PartyEntityLabels.xml
>>    ofbiz/trunk/applications/party/config/PartyUiLabels.xml
>>    ofbiz/trunk/applications/product/config/ProductEntityLabels.xml
>>    ofbiz/trunk/applications/product/config/ProductUiLabels.xml
>>
>> Modified: ofbiz/trunk/applications/accounting/config/ 
>> AccountingUiLabels.xml
>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=725466&r1=725465&r2=725466&view=diff
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> =====================================================================
>> --- ofbiz/trunk/applications/accounting/config/ 
>> AccountingUiLabels.xml (original)
>> +++ ofbiz/trunk/applications/accounting/config/ 
>> AccountingUiLabels.xml Wed Dec 10 14:18:58 2008
>> @@ -30,8 +30,8 @@
>>         <value xml:lang="nl">Bankrekening: AHC/Electronic Check </ 
>> value>
>>         <value xml:lang="ro">Cont EFT : AHC/Cecuri Electronice</ 
>> value>
>>         <value xml:lang="ru">Текущий счет</value>
>> -        <value xml:lang="th">บัญชีธนาคาร:  
>> AHC/ตรวจสภบระบบภิเล็กทรภ 
>> นิกส์</value>
>>         <value xml:lang="zh">ç”µå èµ„é‡‘è½¬è´¦è 
>> ´¦æˆ·ï¼šé‡‘融机构委员会/ç”µå æ”¯ç¥¨</value>
>> +        <value xml:lang="th">บัญชีธนาคาร:  
>> AHC/ตรวจสภบระบบภิเล็กทรภ 
>> นิกส์</value>
>>     </property>
>>     <property key="AccountingAccount">
>>         <value xml:lang="ar">Ø Ø³Ø§Ø¨</value>
>> @@ -126,8 +126,8 @@
>>         <value xml:lang="es">cuentas</value>
>>         <value xml:lang="fr">Comptes</value>
>>         <value xml:lang="it">Conti</value>
>> -        <value xml:lang="nl">Rekeningen</value>
>>         <value xml:lang="ro">Conturi</value>
>> +        <value xml:lang="nl">Rekeningen</value>
>>         <value xml:lang="ru">Счета</value>
>>         <value xml:lang="th">บัญชี</value>
>>         <value xml:lang="zh">账户</value>
>
> These are 2 examples, that I believe are wrong.  You've changed the  
> case
> ordering of the labels; I noticed other cases in this commit where you
> did the same.  Please fix the order.
>
> Plus, in at least these 2 cases, you didn't actually change anything.
> Please don't do several things in one commit.  If there are  
> duplicates,
> fine, remove them.  If you need to change the order, do that in a
> separate commit.


Re: svn commit: r725466 - in /ofbiz/trunk/applications: accounting/config/ content/config/ party/config/ product/config/

Posted by Adam Heath <do...@brainfood.com>.
mrisaliti@apache.org wrote:
> Author: mrisaliti
> Date: Wed Dec 10 14:18:58 2008
> New Revision: 725466
> 
> URL: http://svn.apache.org/viewvc?rev=725466&view=rev
> Log:
> Some wrong locales or duplicated locales while testing the new Label Manager.
> 
> Modified:
>     ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
>     ofbiz/trunk/applications/content/config/ContentErrorUiLabels.xml
>     ofbiz/trunk/applications/content/config/ContentUiLabels.xml
>     ofbiz/trunk/applications/party/config/PartyEntityLabels.xml
>     ofbiz/trunk/applications/party/config/PartyUiLabels.xml
>     ofbiz/trunk/applications/product/config/ProductEntityLabels.xml
>     ofbiz/trunk/applications/product/config/ProductUiLabels.xml
> 
> Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=725466&r1=725465&r2=725466&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
> +++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Wed Dec 10 14:18:58 2008
> @@ -30,8 +30,8 @@
>          <value xml:lang="nl">Bankrekening: AHC/Electronic Check </value>
>          <value xml:lang="ro">Cont EFT : AHC/Cecuri Electronice</value>
>          <value xml:lang="ru">Текущий счет</value>
> -        <value xml:lang="th">บัญชีธนาคาร: AHC/ตรวจสอบระบบอิเล็กทรอนิกส์</value>
>          <value xml:lang="zh">电子资金转账账户:金融机构委员会/电子支票</value>
> +        <value xml:lang="th">บัญชีธนาคาร: AHC/ตรวจสอบระบบอิเล็กทรอนิกส์</value>
>      </property>
>      <property key="AccountingAccount">
>          <value xml:lang="ar">حساب</value>
> @@ -126,8 +126,8 @@
>          <value xml:lang="es">cuentas</value>
>          <value xml:lang="fr">Comptes</value>
>          <value xml:lang="it">Conti</value>
> -        <value xml:lang="nl">Rekeningen</value>
>          <value xml:lang="ro">Conturi</value>
> +        <value xml:lang="nl">Rekeningen</value>
>          <value xml:lang="ru">Счета</value>
>          <value xml:lang="th">บัญชี</value>
>          <value xml:lang="zh">账户</value>

These are 2 examples, that I believe are wrong.  You've changed the case
ordering of the labels; I noticed other cases in this commit where you
did the same.  Please fix the order.

Plus, in at least these 2 cases, you didn't actually change anything.
Please don't do several things in one commit.  If there are duplicates,
fine, remove them.  If you need to change the order, do that in a
separate commit.