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

svn commit: r726808 [1/5] - in /ofbiz/trunk: applications/accounting/config/ applications/content/config/ applications/ecommerce/config/ applications/humanres/config/ applications/manufacturing/config/ applications/marketing/config/ applications/order/...

Author: jleroux
Date: Mon Dec 15 13:28:06 2008
New Revision: 726808

URL: http://svn.apache.org/viewvc?rev=726808&view=rev
Log:
A modified patch from Erik Wegner "Patch for all language files (*Labels.xml) to correct language order, find duplicates or invalid entries" (https://issues.apache.org/jira/browse/OFBIZ-2073) - OFBIZ-2073
I removed some hunks, see https://issues.apache.org/jira/browse/OFBIZ-2073?focusedCommentId=12656651#action_12656651


Modified:
    ofbiz/trunk/applications/accounting/config/AccountingEntityLabels.xml
    ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
    ofbiz/trunk/applications/content/config/ContentEntityLabels.xml
    ofbiz/trunk/applications/content/config/ContentErrorUiLabels.xml
    ofbiz/trunk/applications/content/config/ContentUiLabels.xml
    ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml
    ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml
    ofbiz/trunk/applications/manufacturing/config/ManufacturingEntityLabels.xml
    ofbiz/trunk/applications/manufacturing/config/ManufacturingReportsUiLabels.xml
    ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml
    ofbiz/trunk/applications/marketing/config/MarketingEntityLabels.xml
    ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml
    ofbiz/trunk/applications/order/config/OrderEntityLabels.xml
    ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml
    ofbiz/trunk/applications/order/config/OrderUiLabels.xml
    ofbiz/trunk/applications/party/config/PartyEntityLabels.xml
    ofbiz/trunk/applications/party/config/PartyUiLabels.xml
    ofbiz/trunk/applications/product/config/ProductEntityLabels.xml
    ofbiz/trunk/applications/product/config/ProductErrorUiLabels.xml
    ofbiz/trunk/applications/product/config/ProductUiLabels.xml
    ofbiz/trunk/applications/workeffort/config/WorkEffortEntityLabels.xml
    ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml
    ofbiz/trunk/framework/base/config/DateTimeLabels.xml
    ofbiz/trunk/framework/bi/config/BiUiLabels.xml
    ofbiz/trunk/framework/common/config/CommonEntityLabels.xml
    ofbiz/trunk/framework/common/config/CommonHelpUiLabels.xml
    ofbiz/trunk/framework/common/config/CommonUiLabels.xml
    ofbiz/trunk/framework/common/config/PrefErrorUiLabels.xml
    ofbiz/trunk/framework/common/config/SecurityextUiLabels.xml
    ofbiz/trunk/framework/common/config/TemporalExpressionUiLabels.xml
    ofbiz/trunk/framework/example/config/ExampleHelpUiLabels.xml
    ofbiz/trunk/framework/guiapp/config/XuiUiLabels.xml
    ofbiz/trunk/framework/minilang/config/MiniLangErrorUiLabels.xml
    ofbiz/trunk/framework/security/config/SecurityEntityLabels.xml
    ofbiz/trunk/framework/service/config/ServiceErrorUiLabels.xml
    ofbiz/trunk/framework/webapp/config/WebappEntityLabels.xml
    ofbiz/trunk/framework/webapp/config/WebappUiLabels.xml
    ofbiz/trunk/framework/webtools/config/WebtoolsErrorUiLabels.xml
    ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml
    ofbiz/trunk/specialpurpose/assetmaint/config/AssetMaintUiLabels.xml
    ofbiz/trunk/specialpurpose/ebay/config/EbayUiLabels.xml
    ofbiz/trunk/specialpurpose/googlebase/config/GoogleBaseUiLabels.xml
    ofbiz/trunk/specialpurpose/mypage/config/MyPageUiLabels.xml
    ofbiz/trunk/specialpurpose/oagis/config/OagisUiLabels.xml
    ofbiz/trunk/specialpurpose/pos/config/PosUiLabels.xml
    ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml
    ofbiz/trunk/specialpurpose/shark/config/SharkUiLabels.xml
    ofbiz/trunk/specialpurpose/webpos/config/WebPosUiLabels.xml

Modified: ofbiz/trunk/applications/accounting/config/AccountingEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingEntityLabels.xml?rev=726808&r1=726807&r2=726808&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingEntityLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingEntityLabels.xml Mon Dec 15 13:28:06 2008
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
+
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
     distributed with this work for additional information
@@ -7,17 +8,16 @@
     to you under the Apache License, Version 2.0 (the
     "License"); you may not use this file except in compliance
     with the License.  You may obtain a copy of the License at
-    
+
     http://www.apache.org/licenses/LICENSE-2.0
-    
+
     Unless required by applicable law or agreed to in writing,
     software distributed under the License is distributed on an
     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
     KIND, either express or implied.  See the License for the
     specific language governing permissions and limitations
     under the License.
--->
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+--><resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <property key="AcctgTransType.description.AMORTIZATION">
         <value xml:lang="en">Amorization</value>
         <value xml:lang="fr">Amortissements</value>

Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=726808&r1=726807&r2=726808&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Mon Dec 15 13:28:06 2008
@@ -17,8 +17,7 @@
     KIND, either express or implied.  See the License for the
     specific language governing permissions and limitations
     under the License.
--->
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+--><resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <property key="AccountingAHCElectronicCheck">
         <value xml:lang="de">Bankverbindung: elektronische Überweisung</value>
         <value xml:lang="en">EFT Account: AHC/Electronic Check</value>
@@ -126,8 +125,8 @@
         <value xml:lang="es">cuentas</value>
         <value xml:lang="fr">Comptes</value>
         <value xml:lang="it">Conti</value>
-        <value xml:lang="ro">Conturi</value>
         <value xml:lang="nl">Rekeningen</value>
+        <value xml:lang="ro">Conturi</value>
         <value xml:lang="ru">Счета</value>
         <value xml:lang="th">บัญชี</value>
         <value xml:lang="zh">账户</value>
@@ -837,7 +836,6 @@
         <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>
@@ -987,8 +985,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="ja">請求先アカウント</value>
         <value xml:lang="it">Conto Fatturazione</value>
+        <value xml:lang="ja">請求先アカウント</value>
         <value xml:lang="nl">Faktuur rekening</value>
         <value xml:lang="pt_PT">Conta para Pagamento</value>
         <value xml:lang="ro">Cont Facturare</value>
@@ -1320,8 +1318,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="ja">カード番号</value>
         <value xml:lang="it">Numero di carta</value>
+        <value xml:lang="ja">カード番号</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>
@@ -1764,8 +1762,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="ja">クレジットカード</value>
         <value xml:lang="it">Carta di credito</value>
+        <value xml:lang="ja">クレジットカード</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>
@@ -2000,8 +1998,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="ja">EFT Account</value>
         <value xml:lang="it">Conto EFT</value>
+        <value xml:lang="ja">EFT Account</value>
         <value xml:lang="nl">Bank rekening</value>
         <value xml:lang="pt_PT">Conta EFT</value>
         <value xml:lang="ro">Cont EFT</value>
@@ -2125,8 +2123,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="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="ja">Enter your physical and virtual card and pin number to link your account</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>
@@ -2139,8 +2137,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="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="ja">Enter your gift card number and PIN to check the balance</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>
@@ -2287,8 +2285,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="ja">有効期限</value>
         <value xml:lang="it">Data scadenza</value>
+        <value xml:lang="ja">有効期限</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>
@@ -4611,8 +4609,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="ja">No Billing Account</value>
         <value xml:lang="it">Nessun conto fatturazione</value>
+        <value xml:lang="ja">No Billing Account</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>
@@ -4844,8 +4842,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="ja">Offline Payment</value>
         <value xml:lang="it">Pagamento offline</value>
+        <value xml:lang="ja">Offline Payment</value>
         <value xml:lang="nl">Offline betalen</value>
         <value xml:lang="pt_PT">Pagamento Tradicional</value>
         <value xml:lang="ro">Plata Offline</value>
@@ -6422,7 +6420,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>
@@ -6780,8 +6778,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="ja">Use Gift Card Not On File</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="nl">Gebruik een niet bekende tegoedbon</value>
         <value xml:lang="ro">Foloseste Carte Omagiu Nu din Fisier</value>
         <value xml:lang="ru">Использованной дисконтной карты нет в файле</value>
@@ -7861,8 +7859,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="nl">ID type GB-rekening</value>
         <value xml:lang="it">Tipo Conto Gl</value>
+        <value xml:lang="nl">ID type GB-rekening</value>
         <value xml:lang="ro">Tip Cont Gl</value>
         <value xml:lang="ru">Код типа счета ГК</value>
         <value xml:lang="th">รหัสประเภทบัญชีแยกประเภททั่วไป</value>
@@ -7883,8 +7881,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="nl">ID GB-journaal</value>
         <value xml:lang="it">Giornale</value>
+        <value xml:lang="nl">ID GB-journaal</value>
         <value xml:lang="th">Gl Journal Id</value>
     </property>
     <property key="FormFieldTitle_glResourceTypeId">
@@ -8034,7 +8032,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>
@@ -8242,7 +8240,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>
@@ -9052,8 +9050,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="nl">ID tijdregistratie</value>
         <value xml:lang="it">Riga Timbratura</value>
+        <value xml:lang="nl">ID tijdregistratie</value>
         <value xml:lang="th">รหัสตารางการทำงาน</value>
     </property>
     <property key="FormFieldTitle_toPaymentId">
@@ -9103,7 +9101,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>
@@ -9997,8 +9995,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="nl">Toon registraties vaste activa</value>
         <value xml:lang="it">Lista Registrazioni Cespiti</value>
+        <value xml:lang="nl">Toon registraties vaste activa</value>
         <value xml:lang="th">รายการลงทะเบียนทรัพย์สินไม่หมุนเวียน</value>
     </property>
     <property key="PageTitleListFixedAssetStdCosts">
@@ -10410,8 +10408,8 @@
     </property>
     <property key="es">
         <value xml:lang="en">Spanish</value>
-        <value xml:lang="fr">Espagnol</value>
         <value xml:lang="es">Español</value>
+        <value xml:lang="fr">Espagnol</value>
         <value xml:lang="nl">Spaans</value>
         <value xml:lang="ru">Испанский</value>
         <value xml:lang="th">สเปน</value>

Modified: ofbiz/trunk/applications/content/config/ContentEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/config/ContentEntityLabels.xml?rev=726808&r1=726807&r2=726808&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/config/ContentEntityLabels.xml (original)
+++ ofbiz/trunk/applications/content/config/ContentEntityLabels.xml Mon Dec 15 13:28:06 2008
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
+
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
     distributed with this work for additional information
@@ -7,17 +8,16 @@
     to you under the Apache License, Version 2.0 (the
     "License"); you may not use this file except in compliance
     with the License.  You may obtain a copy of the License at
-    
+
     http://www.apache.org/licenses/LICENSE-2.0
-    
+
     Unless required by applicable law or agreed to in writing,
     software distributed under the License is distributed on an
     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
     KIND, either express or implied.  See the License for the
     specific language governing permissions and limitations
     under the License.
--->
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+--><resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <property key="CharacterSet.description.ISO-8859-1">
         <value xml:lang="de">ISO-8859-1</value>
         <value xml:lang="en">ISO-8859-1</value>
@@ -841,7 +841,7 @@
         <value xml:lang="zh">人</value>
     </property>
     <property key="ContentType.description.PLACEHOLDER">
-        <value xml:lang="de">Platzhalter</value> 
+        <value xml:lang="de">Platzhalter</value>
         <value xml:lang="en">Place Holder</value>
         <value xml:lang="it">Place Holder</value>
         <value xml:lang="ro">Place Holder</value>

Modified: ofbiz/trunk/applications/content/config/ContentErrorUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/config/ContentErrorUiLabels.xml?rev=726808&r1=726807&r2=726808&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/config/ContentErrorUiLabels.xml (original)
+++ ofbiz/trunk/applications/content/config/ContentErrorUiLabels.xml Mon Dec 15 13:28:06 2008
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
+
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
     distributed with this work for additional information
@@ -7,17 +8,16 @@
     to you under the Apache License, Version 2.0 (the
     "License"); you may not use this file except in compliance
     with the License.  You may obtain a copy of the License at
-    
+
     http://www.apache.org/licenses/LICENSE-2.0
-    
+
     Unless required by applicable law or agreed to in writing,
     software distributed under the License is distributed on an
     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
     KIND, either express or implied.  See the License for the
     specific language governing permissions and limitations
     under the License.
--->
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+--><resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <property key="dataEvents.error_call_create_service">
         <value xml:lang="de">Fehler beim Aufruf createDataResource Service</value>
         <value xml:lang="en">Error calling the createDataResource service</value>

Modified: ofbiz/trunk/applications/content/config/ContentUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/config/ContentUiLabels.xml?rev=726808&r1=726807&r2=726808&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/config/ContentUiLabels.xml (original)
+++ ofbiz/trunk/applications/content/config/ContentUiLabels.xml Mon Dec 15 13:28:06 2008
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
+
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
     distributed with this work for additional information
@@ -16,8 +17,7 @@
     KIND, either express or implied.  See the License for the
     specific language governing permissions and limitations
     under the License.
--->
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+--><resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <property key="ContentAnswer">
         <value xml:lang="ar">الجواب</value>
         <value xml:lang="de">Antwort</value>
@@ -179,7 +179,7 @@
         <value xml:lang="fr">Exemples de vue</value>
         <value xml:lang="it">Mostra Istanze di CompDoc</value>
         <value xml:lang="th">ดูตัวอย่าง</value>
-        </property>
+    </property>
     <property key="ContentCompDocViewTree">
         <value xml:lang="de">Baum anzeigen</value>
         <value xml:lang="en">View Tree</value>
@@ -505,8 +505,8 @@
         <value xml:lang="th">แผนที่สำคัญ</value>
     </property>
     <property key="ContentMetaDataPred">
-        <value xml:lang="de">Metadaten Prädikat</value>
         <value xml:lang="ar">MetaData Predicate</value>
+        <value xml:lang="de">Metadaten Prädikat</value>
         <value xml:lang="en">MetaData Predicate</value>
         <value xml:lang="fr">Attribut de méta-données</value>
         <value xml:lang="it">Predicato MetaData</value>
@@ -515,8 +515,8 @@
         <value xml:lang="zh">元数据谓词</value>
     </property>
     <property key="ContentMetadata">
-        <value xml:lang="de">Metadaten</value>
         <value xml:lang="ar">Metadata</value>
+        <value xml:lang="de">Metadaten</value>
         <value xml:lang="en">Metadata</value>
         <value xml:lang="fr">Méta-données</value>
         <value xml:lang="it">Metadati</value>
@@ -530,8 +530,8 @@
         <value xml:lang="fr">Méta-étiquettes</value>
     </property>
     <property key="ContentMimeType">
-        <value xml:lang="de">Mime Typ</value>
         <value xml:lang="ar">Mime Type</value>
+        <value xml:lang="de">Mime Typ</value>
         <value xml:lang="en">Mime Type</value>
         <value xml:lang="fr">Type mime</value>
         <value xml:lang="it">Tipo Mime</value>
@@ -540,8 +540,8 @@
         <value xml:lang="zh">Mime类型</value>
     </property>
     <property key="ContentMimeTypeHtmlTemplate">
-        <value xml:lang="de">Mime Typ Vorlage</value>
         <value xml:lang="ar">Mime Type Template</value>
+        <value xml:lang="de">Mime Typ Vorlage</value>
         <value xml:lang="en">Mime Type Template</value>
         <value xml:lang="fr">Type modèle Mime</value>
         <value xml:lang="it">Tipo Mime Template</value>
@@ -848,8 +848,8 @@
         <value xml:lang="zh">网站</value>
     </property>
     <property key="FormFieldTitle_acroFormContentId">
-        <value xml:lang="de">AcroForm (PDF) Inhalt ID</value>
         <value xml:lang="ar">AcroForm (PDF) Content ID</value>
+        <value xml:lang="de">AcroForm (PDF) Inhalt ID</value>
         <value xml:lang="en">AcroForm (PDF) Content ID</value>
         <value xml:lang="fr">Réf. de contenu AcroForm (PDF)</value>
         <value xml:lang="it">Contenuto AcroForm (PDF)</value>
@@ -2611,8 +2611,8 @@
         <value xml:lang="ar">إستحداث تصويت</value>
         <value xml:lang="de">Befragung erstellen</value>
         <value xml:lang="en">Create Survey</value>
-        <value xml:lang="fr">Créer un sondage</value>
         <value xml:lang="es">Crear Encuesta</value>
+        <value xml:lang="fr">Créer un sondage</value>
         <value xml:lang="it">Creare Sondaggio</value>
         <value xml:lang="ro">Creare Sondaj</value>
         <value xml:lang="th">สร้างการสำรวจ</value>
@@ -2681,8 +2681,8 @@
         <value xml:lang="ar">تعرير محتوى</value>
         <value xml:lang="de">Inhalt bearbeiten</value>
         <value xml:lang="en">Edit Content</value>
-        <value xml:lang="fr">Modifier le contenu</value>
         <value xml:lang="es">Modificar Contenido</value>
+        <value xml:lang="fr">Modifier le contenu</value>
         <value xml:lang="it">Aggiorna Contenuto</value>
         <value xml:lang="ro">Actualizeaza Continutul</value>
         <value xml:lang="th">แก้ไขหัวข้อ</value>
@@ -3008,8 +3008,8 @@
         <value xml:lang="ar">تحرير وثيقة مركبة للجذر</value>
         <value xml:lang="de">Basis zusammengesetztes Dokument bearbeiten</value>
         <value xml:lang="en">Edit Root Composite Document</value>
-        <value xml:lang="fr">Modifier la racine du document composite</value>
         <value xml:lang="es">Modificar Documento compuesto Raíz</value>
+        <value xml:lang="fr">Modifier la racine du document composite</value>
         <value xml:lang="it">Aggiorna Radice Documento Composito</value>
         <value xml:lang="ro">Actualizeaza Radacina Document Compus</value>
         <value xml:lang="th">แก้ไขส่วนประกอบของเอกสาร</value>
@@ -3019,8 +3019,8 @@
         <value xml:lang="ar">تحرير تصويت</value>
         <value xml:lang="de">Befragung bearbeiten</value>
         <value xml:lang="en">Edit survey</value>
-        <value xml:lang="fr">Modifier le sondage</value>
         <value xml:lang="es">Modificar Encuesta</value>
+        <value xml:lang="fr">Modifier le sondage</value>
         <value xml:lang="it">Aggiorna Sondaggio</value>
         <value xml:lang="ro">Aggiorna Sondaj</value>
         <value xml:lang="th">แก้ไขการสำรวจ</value>
@@ -3030,8 +3030,8 @@
         <value xml:lang="ar">تحرير مجموعات جواب متعدد للتصويت</value>
         <value xml:lang="de">Befragung Mehrfachantwortgruppen bearbeiten</value>
         <value xml:lang="en">Edit Survey Multi-Response Groups</value>
-        <value xml:lang="fr">Modifier les groupes multi-réponses du sondage</value>
         <value xml:lang="es">Modificar Encuesta de grupo de respuestas</value>
+        <value xml:lang="fr">Modifier les groupes multi-réponses du sondage</value>
         <value xml:lang="it">Aggiorna Risposte Multiple Gruppo Sondaggio</value>
         <value xml:lang="ro">Adauga Raspunsuri Multiple Grup Sondaj</value>
         <value xml:lang="th">แก้ไขการสำรวจกลุ่มคำตอบหลาย ๆ คำตอบ</value>
@@ -3041,8 +3041,8 @@
         <value xml:lang="ar">تحرير صفحات التصويت</value>
         <value xml:lang="de">Befragungsseiten bearbeiten</value>
         <value xml:lang="en">Edit Survey Pages</value>
-        <value xml:lang="fr">Modifier les pages du sondage</value>
         <value xml:lang="es">Modificar página de encuestas</value>
+        <value xml:lang="fr">Modifier les pages du sondage</value>
         <value xml:lang="it">Aggiorna Pagine Sondaggio</value>
         <value xml:lang="ro">AActualizeaza Pagina Sondaj</value>
         <value xml:lang="th">แก้ไขหน้าการสำรวจ</value>
@@ -3052,8 +3052,8 @@
         <value xml:lang="ar">تحرير أسئلة التصويت</value>
         <value xml:lang="de">Befragung Fragen bearbeiten</value>
         <value xml:lang="en">Edit Survey Questions</value>
-        <value xml:lang="fr">Modifier les questions du sondage</value>
         <value xml:lang="es">Modificar Preeguntas de Encuesta</value>
+        <value xml:lang="fr">Modifier les questions du sondage</value>
         <value xml:lang="it">Aggiorna Domande Sondaggio</value>
         <value xml:lang="ro">Actualizeaza Intrebari Sondaj</value>
         <value xml:lang="th">แก้ไขการสำรวจคำถาม</value>
@@ -3063,8 +3063,8 @@
         <value xml:lang="ar">تحرير جواب التصويت</value>
         <value xml:lang="de">Befragung Antworten bearbeiten</value>
         <value xml:lang="en">Edit Survey Response</value>
-        <value xml:lang="fr">Modifier les réponses du sondage</value>
         <value xml:lang="es">Modificar Respuestas de Encuesta</value>
+        <value xml:lang="fr">Modifier les réponses du sondage</value>
         <value xml:lang="it">Aggiorna Risposta Sondaggio</value>
         <value xml:lang="ro">Adauga Raspuns Sondaj</value>
         <value xml:lang="th">แก้ไขการสำรวจคำตอบ</value>
@@ -3605,7 +3605,7 @@
         <value xml:lang="de">Keine Fragen in Befragung; keine Antworten können gefunden werden.</value>
         <value xml:lang="en">No questions in survey; no responses can be located.</value>
         <value xml:lang="fr">Aucune question dans le sondage, aucune réponse ne peut être localisée.</value>
-        <value xml:lang="it">Nessuna domanda nel sondaggio; nessuna risposta pu&#242; essere localizzata.</value>
+        <value xml:lang="it">Nessuna domanda nel sondaggio; nessuna risposta può essere localizzata.</value>
         <value xml:lang="ro">Nici-o intrebare in sondaj; nu poate fi localizat nici-un raspuns.</value>
         <value xml:lang="th">ไม่มีคำถามในการสำรวจ;ไม่สามารถสร้างคำตอบได้</value>
         <value xml:lang="zh">调查中没有问题；无法定位回答。</value>

Modified: ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml?rev=726808&r1=726807&r2=726808&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml (original)
+++ ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml Mon Dec 15 13:28:06 2008
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
+
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
     distributed with this work for additional information
@@ -16,9 +17,8 @@
     KIND, either express or implied.  See the License for the
     specific language governing permissions and limitations
     under the License.
--->
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-   <property key="CommonDigitalProductUpload">
+--><resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <property key="CommonDigitalProductUpload">
         <value xml:lang="de">Digitales Produkt hochladen</value>
         <value xml:lang="en">Digital Product Upload</value>
         <value xml:lang="es">carga de productos digitales</value>
@@ -452,8 +452,8 @@
         <value xml:lang="es">Listas de compras hijas</value>
         <value xml:lang="fr">Liste d'achats associée</value>
         <value xml:lang="it">Lista d'acquisto figlia</value>
-        <value xml:lang="nl">subBoodschappenlijst</value>
         <value xml:lang="ja">Child Shopping Lists</value>
+        <value xml:lang="nl">subBoodschappenlijst</value>
         <value xml:lang="pt_PT">Listas de Compras Derivadas</value>
         <value xml:lang="ro">Liste Fice Cumparari </value>
         <value xml:lang="ru">Подчиненный список покупок</value>
@@ -463,8 +463,8 @@
     <property key="EcommerceClickHereToEdit">
         <value xml:lang="de">Hier klicken um zu Bearbeiten</value>
         <value xml:lang="en">Click here to edit</value>
-        <value xml:lang="it">Clicca qui per aggiornare</value>
         <value xml:lang="fr">Cliquez-ici pour modifier</value>
+        <value xml:lang="it">Clicca qui per aggiornare</value>
     </property>
     <property key="EcommerceCompleted">
         <value xml:lang="de">Abgeschlossen</value>
@@ -513,8 +513,8 @@
         <value xml:lang="en">Content Name</value>
         <value xml:lang="es">Nombre del contenido</value>
         <value xml:lang="fr">Nom du contenu</value>
-        <value xml:lang="it">Nome contenuto</value>
         <value xml:lang="hi_IN">अंतर्वस्तु अंश नाम</value>
+        <value xml:lang="it">Nome contenuto</value>
         <value xml:lang="ja">Content Name</value>
         <value xml:lang="nl">Content naam</value>
         <value xml:lang="ro">Nume Continut</value>
@@ -541,8 +541,8 @@
     <property key="EcommerceContinueToStep">
         <value xml:lang="de">Fortfahren mit Schritt</value>
         <value xml:lang="en">Continue to step</value>
-        <value xml:lang="it">Continua al passo</value>
         <value xml:lang="fr">Continuer (prochaine étape)</value>
+        <value xml:lang="it">Continua al passo</value>
     </property>
     <property key="EcommerceDataResourceId">
         <value xml:lang="de">Datenressource ID</value>
@@ -660,7 +660,7 @@
     </property>
     <property key="EcommerceEditProfile">
         <value xml:lang="de">Profil bearbeiten</value>
-        <value xml:lang="en">Edit Profile</value>        
+        <value xml:lang="en">Edit Profile</value>
     </property>
     <property key="EcommerceEmptyBody">
         <value xml:lang="de">Leerer Meldungstext</value>
@@ -668,8 +668,8 @@
         <value xml:lang="es">Contenido vacío</value>
         <value xml:lang="fr">Corps du message vide</value>
         <value xml:lang="hi_IN">ख़ाली शरीर</value>
-        <value xml:lang="ja">Empty Body</value>
         <value xml:lang="it">Corpo messaggio vuoto</value>
+        <value xml:lang="ja">Empty Body</value>
         <value xml:lang="nl">Geen inhoud</value>
         <value xml:lang="ro">Corp Gol</value>
         <value xml:lang="ru">Пусто</value>
@@ -697,18 +697,18 @@
         <value xml:lang="de">Ihr neues Passwort ist : </value>
         <value xml:lang="en">Your new password is :- </value>
         <value xml:lang="fr">Votre nouveau mot de passe est : </value>
-    </property>        
+    </property>
     <property key="EcommerceNewPasswordMssgEncryptionOff">
         <value xml:lang="de">Ihr Passwort ist: </value>
         <value xml:lang="en">Your password is :- </value>
         <value xml:lang="fr">Votre mot de passe est : </value>
-    </property>        
+    </property>
     <property key="EcommerceEnterPromoCode">
         <value xml:lang="de">Aktionscode angeben</value>
         <value xml:lang="en">Enter Promo Code</value>
-        <value xml:lang="it">Inserire codice promozione</value>
         <value xml:lang="fr">Saisissez votre code de promotion</value>
-    </property>        
+        <value xml:lang="it">Inserire codice promozione</value>
+    </property>
     <property key="EcommerceEnterQueryParameters">
         <value xml:lang="de">Abfrageparameter angeben</value>
         <value xml:lang="en">Enter Query Parameters</value>
@@ -785,8 +785,8 @@
         <value xml:lang="es">Todos los días</value>
         <value xml:lang="fr">Chaque jour</value>
         <value xml:lang="hi_IN">हर</value>
-        <value xml:lang="ja">Every</value>
         <value xml:lang="it">Ogni giorno</value>
+        <value xml:lang="ja">Every</value>
         <value xml:lang="nl">Elke</value>
         <value xml:lang="ro">In fiecare zi</value>
         <value xml:lang="ru">Каждый</value>
@@ -964,10 +964,10 @@
         <value xml:lang="fr">Carte cadeau rechargée</value>
         <value xml:lang="hi_IN">को लोड किया जा चुका है.</value>
         <value xml:lang="it">Carta regalo ricaricata.</value>
+        <value xml:lang="ja">has been reloaded.</value>
         <value xml:lang="nl">is heropgewaardeerd</value>
         <value xml:lang="ro">a fost reincarcata.</value>
         <value xml:lang="ru">перезагружена.</value>
-        <value xml:lang="ja">has been reloaded.</value>
         <value xml:lang="th">ใส่บัตรของขวัญเพิ่ม</value>
         <value xml:lang="zh">已经充值了。</value>
     </property>
@@ -989,7 +989,7 @@
         <value xml:lang="cs">Jdi na seznam</value>
         <value xml:lang="de">Zur Liste</value>
         <value xml:lang="en">GoToList</value>
-         <value xml:lang="es">Ir a la lista</value>
+        <value xml:lang="es">Ir a la lista</value>
         <value xml:lang="fr">Aller à la liste</value>
         <value xml:lang="hi_IN">सुची पर जाऐं</value>
         <value xml:lang="it">Vai alla lista</value>
@@ -1195,10 +1195,10 @@
         <value xml:lang="fr">Dernier contenu visité</value>
         <value xml:lang="hi_IN">अतिंम अंतर्वस्तु अंश</value>
         <value xml:lang="it">Ultimo contenuto</value>
+        <value xml:lang="ja">Last Content</value>
         <value xml:lang="nl">Laatste Inhoud</value>
         <value xml:lang="ro">Ultimul  Continut</value>
         <value xml:lang="ru">Последнее содержимое</value>
-        <value xml:lang="ja">Last Content</value>
         <value xml:lang="th">หัวข้อสุดท้าย</value>
         <value xml:lang="zh">最近浏览的内容</value>
     </property>
@@ -1382,9 +1382,9 @@
         <value xml:lang="de">http://www.whitepages.com/find_person_results.pl?fid=a s_n=${addressNum} s_a=${addressOther} c=${postalAddress.city?if_exists} s=${postalAddress.stateProvinceGeoId?if_exists} x=29 y=18</value>
         <value xml:lang="en">http://www.whitepages.com/find_person_results.pl?fid=a s_n=${addressNum} s_a=${addressOther} c=${postalAddress.city?if_exists} s=${postalAddress.stateProvinceGeoId?if_exists} x=29 y=18</value>
         <value xml:lang="fr">http://www.pagesjaunes.fr/trouverunnom/RecherchePagesBlanches.do</value>
-        <value xml:lang="hi_IN">http://www.whitepages.com/find_person_results.pl?fid=a<!--&s_n=${addressNum}&s_a=${addressOther}&c=${postalAddress.city?if_exists}&s=${postalAddress.stateProvinceGeoId?if_exists}&x=29&y=18--></value>
+        <value xml:lang="hi_IN">http://www.whitepages.com/find_person_results.pl?fid=a</value>
         <value xml:lang="it">http://www.whitepages.com/find_person_results.pl?fid=a s_n=${addressNum} s_a=${addressOther} c=${postalAddress.city?if_exists} s=${postalAddress.stateProvinceGeoId?if_exists} x=29 y=18</value>
-        <value xml:lang="ja">http://www.whitepages.com/find_person_results.pl?fid=a<!--&s_n=${addressNum}&s_a=${addressOther}&c=${postalAddress.city?if_exists}&s=${postalAddress.stateProvinceGeoId?if_exists}&x=29&y=18--></value>
+        <value xml:lang="ja">http://www.whitepages.com/find_person_results.pl?fid=a</value>
         <value xml:lang="nl">http://www.whitepages.com/find_person_results.pl?fid=a s_n=${addressNum} s_a=${addressOther} c=${postalAddress.city?if_exists} s=${postalAddress.stateProvinceGeoId?if_exists} x=29 y=18</value>
         <value xml:lang="ro">http://www.whitepages.com/find_person_results.pl?fid=a s_n=${addressNum} s_a=${addressOther} c=${postalAddress.city?if_exists} s=${postalAddress.stateProvinceGeoId?if_exists} x=29 y=18</value>
         <value xml:lang="ru">http://www.whitepages.com/find_person_results.pl?fid=a s_n=${addressNum} s_a=${addressOther} c=${postalAddress.city?if_exists} s=${postalAddress.stateProvinceGeoId?if_exists} x=29 y=18</value>
@@ -2038,7 +2038,7 @@
         <value xml:lang="ru">Читать</value>
         <value xml:lang="th">อ่าน</value>
         <value xml:lang="zh">读取</value>
-    </property>    
+    </property>
     <property key="EcommerceReadMessage">
         <value xml:lang="de">Meldungen lesen</value>
         <value xml:lang="en">Read Message</value>
@@ -2381,8 +2381,8 @@
         <value xml:lang="nl">Boodschappenlijst herbestel info</value>
         <value xml:lang="ro">Info Re-Comanda Lista Cumparare</value>
         <value xml:lang="ru">Информация для повторного заказа по списку покупок</value>
-        <value xml:lang="zh">购物列表再订货信息</value>
         <value xml:lang="th">รายการสั่งซื้อสินค้าใหม่</value>
+        <value xml:lang="zh">购物列表再订货信息</value>
     </property>
     <property key="EcommerceShoppingLists">
         <value xml:lang="cs">Nákupní seznamy</value>
@@ -2480,8 +2480,8 @@
     <property key="EcommerceStep">
         <value xml:lang="de">Schritt</value>
         <value xml:lang="en">Step</value>
-        <value xml:lang="it">Passo</value>
         <value xml:lang="fr">Etape</value>
+        <value xml:lang="it">Passo</value>
     </property>
     <property key="EcommerceSubject">
         <value xml:lang="de">Thema</value>
@@ -2749,13 +2749,13 @@
         <value xml:lang="en_GB">of Variation to basket</value>
         <value xml:lang="es">de variación al carro</value>
         <value xml:lang="fr">Option au panier</value>
+        <value xml:lang="hi_IN">अन्तर को टोकरी में</value>
         <value xml:lang="it">di variante di carrello</value>
         <value xml:lang="ja">of Variation To Cart</value>
         <value xml:lang="nl">van de variant naar de winkelwagen</value>
         <value xml:lang="pt_PT">Alternativa Para o Cesto</value>
         <value xml:lang="ro">de Variante De Cos</value>
         <value xml:lang="ru">вариант в корзину</value>
-        <value xml:lang="hi_IN">अन्तर को टोकरी में</value>
         <value xml:lang="th">เปลี่ยนแปลงสู่ตะกร้า</value>
         <value xml:lang="zh">的选择到购物车</value>
     </property>
@@ -6568,8 +6568,8 @@
         <value xml:lang="th">บัลแกเรีย</value>
     </property>
     <property key="cz">
-        <value xml:lang="de">Tschechisch</value>
         <value xml:lang="cs">Česky</value>
+        <value xml:lang="de">Tschechisch</value>
         <value xml:lang="en">Czeck</value>
         <value xml:lang="fr">Tchèque</value>
         <value xml:lang="th">Czeck</value>

Modified: ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml?rev=726808&r1=726807&r2=726808&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml (original)
+++ ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml Mon Dec 15 13:28:06 2008
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
+
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
     distributed with this work for additional information
@@ -7,17 +8,16 @@
     to you under the Apache License, Version 2.0 (the
     "License"); you may not use this file except in compliance
     with the License.  You may obtain a copy of the License at
-    
+
     http://www.apache.org/licenses/LICENSE-2.0
-    
+
     Unless required by applicable law or agreed to in writing,
     software distributed under the License is distributed on an
     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
     KIND, either express or implied.  See the License for the
     specific language governing permissions and limitations
     under the License.
--->
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+--><resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <property key="FormFieldTitle_accountNumber">
         <value xml:lang="en">Account Number</value>
         <value xml:lang="it">Numero Conto</value>
@@ -507,7 +507,7 @@
     </property>
     <property key="HumanResEmplLeaveType">
         <value xml:lang="en">Employee Leave Type</value>
-    </property>    
+    </property>
     <property key="HumanResEmplPositionId">
         <value xml:lang="en">Employee Position Id</value>
         <value xml:lang="it">Codice Posizione Impiegato</value>

Modified: ofbiz/trunk/applications/manufacturing/config/ManufacturingEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/config/ManufacturingEntityLabels.xml?rev=726808&r1=726807&r2=726808&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/config/ManufacturingEntityLabels.xml (original)
+++ ofbiz/trunk/applications/manufacturing/config/ManufacturingEntityLabels.xml Mon Dec 15 13:28:06 2008
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
+
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
     distributed with this work for additional information
@@ -7,17 +8,16 @@
     to you under the Apache License, Version 2.0 (the
     "License"); you may not use this file except in compliance
     with the License.  You may obtain a copy of the License at
-    
+
     http://www.apache.org/licenses/LICENSE-2.0
-    
+
     Unless required by applicable law or agreed to in writing,
     software distributed under the License is distributed on an
     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
     KIND, either express or implied.  See the License for the
     specific language governing permissions and limitations
     under the License.
--->
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+--><resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <property key="MrpEventType.description.MANUF_ORDER_RECP">
         <value xml:lang="en">Manufacturing Order receipt</value>
         <value xml:lang="es">Recibo de Orden de Producción</value>
@@ -144,6 +144,6 @@
         <value xml:lang="it">8 ore/giorno, attualmente il Processo di Ri-Ordine converte il giorno a mms con 8h/giorno</value>
         <value xml:lang="ro">8 ore/zi, in prezent Procesul de Re-Ordinare converteste ziua in mms cu  8h/zi" mondayStartTime="08:30:00"</value>
         <value xml:lang="th">8 ชั่วโมง/วัน, ขณะนี้รายการสั่งซื้อกำลังประมวลผลในการเปลี่ยนวันไปเป็น mms ด้วย 8 ชั่วโมง/วัน</value>
-        <value xml:lang="zh">8小时/天，目前重新排订单过程会把天按8小时/天转换为百万毫秒" mondayStartTime="08:30:00" mondayCapacity="2.88E7" tuesdayStartTime="08:30:00" tuesdayCapacity="2.88E7" wednesdayStartTime="08:30:00" wednesdayCapacity="2.88E7" thursdayStartTime="08:30:00" thursdayCapacity="2.88E7" fridayStartTime="08:30:00" fridayCapacity="2.88E7"/></value>
+        <value xml:lang="zh">8小时/天，目前重新排订单过程会把天按8小时/天转换为百万毫秒" mondayStartTime="08:30:00" mondayCapacity="2.88E7" tuesdayStartTime="08:30:00" tuesdayCapacity="2.88E7" wednesdayStartTime="08:30:00" wednesdayCapacity="2.88E7" thursdayStartTime="08:30:00" thursdayCapacity="2.88E7" fridayStartTime="08:30:00" fridayCapacity="2.88E7"/&gt;</value>
     </property>
 </resource>

Modified: ofbiz/trunk/applications/manufacturing/config/ManufacturingReportsUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/config/ManufacturingReportsUiLabels.xml?rev=726808&r1=726807&r2=726808&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/config/ManufacturingReportsUiLabels.xml (original)
+++ ofbiz/trunk/applications/manufacturing/config/ManufacturingReportsUiLabels.xml Mon Dec 15 13:28:06 2008
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
+
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
     distributed with this work for additional information
@@ -16,8 +17,7 @@
     KIND, either express or implied.  See the License for the
     specific language governing permissions and limitations
     under the License.
--->
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+--><resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <property key="CommonCompletionDate">
         <value xml:lang="en">Completion Date</value>
         <value xml:lang="es">Fecha de Términación</value>

Modified: ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml?rev=726808&r1=726807&r2=726808&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml (original)
+++ ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml Mon Dec 15 13:28:06 2008
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
+
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
     distributed with this work for additional information
@@ -7,17 +8,16 @@
     to you under the Apache License, Version 2.0 (the
     "License"); you may not use this file except in compliance
     with the License.  You may obtain a copy of the License at
-    
+
     http://www.apache.org/licenses/LICENSE-2.0
-    
+
     Unless required by applicable law or agreed to in writing,
     software distributed under the License is distributed on an
     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
     KIND, either express or implied.  See the License for the
     specific language governing permissions and limitations
     under the License.
--->
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+--><resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <property key="FormFieldTitle_actualCompletionDate">
         <value xml:lang="de">Ist-Fertigstellungs-Datum</value>
         <value xml:lang="en">Actual Completion Date</value>
@@ -2092,8 +2092,8 @@
     </property>
     <property key="ManufacturingNote1">
         <value xml:lang="en">date/time entries denote that the current time is before the From Date or after the Thru Date. If the From Date is</value>
-        <value xml:lang="fr">Les lignes date/heure indiquent que l'heure en cours est avant la date ou après la date en cours. Si la date est </value>
         <value xml:lang="es">entradas fecha/hora indican que la hora actual es antes de la fecha de o hasta. Si la fecha desde es</value>
+        <value xml:lang="fr">Les lignes date/heure indiquent que l'heure en cours est avant la date ou après la date en cours. Si la date est </value>
         <value xml:lang="it">le voci data/ora indicano che l'orario attuale è prima della Data di Inizio o dopo la Data di Fine. Se la Data di Inizio è</value>
         <value xml:lang="th">เข้าสู่ วัน/เวลา หมายความว่าเวลาจริง ๆ คือ เวลาก่อน จากวันที่ หรือ หลัง ถึงวันที่ ถ้าจากวันที่คือ</value>
     </property>
@@ -2561,8 +2561,8 @@
     <property key="ManufacturingQuickComplete">
         <value xml:lang="de">Schneller Abschluß</value>
         <value xml:lang="en">Quick Complete</value>
-        <value xml:lang="fr">Terminer rapidement</value>
         <value xml:lang="es">Completar rápido</value>
+        <value xml:lang="fr">Terminer rapidement</value>
         <value xml:lang="it">Completamento Veloce</value>
         <value xml:lang="ro">Completament Rapid</value>
         <value xml:lang="th">เสร็จสิ้นอย่างรวดเร็ว</value>

Modified: ofbiz/trunk/applications/marketing/config/MarketingEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/config/MarketingEntityLabels.xml?rev=726808&r1=726807&r2=726808&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/config/MarketingEntityLabels.xml (original)
+++ ofbiz/trunk/applications/marketing/config/MarketingEntityLabels.xml Mon Dec 15 13:28:06 2008
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
+
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
     distributed with this work for additional information
@@ -7,17 +8,16 @@
     to you under the Apache License, Version 2.0 (the
     "License"); you may not use this file except in compliance
     with the License.  You may obtain a copy of the License at
-    
+
     http://www.apache.org/licenses/LICENSE-2.0
-    
+
     Unless required by applicable law or agreed to in writing,
     software distributed under the License is distributed on an
     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
     KIND, either express or implied.  See the License for the
     specific language governing permissions and limitations
     under the License.
--->
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+--><resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <property key="ContactListType.description.ANNOUNCEMENT">
         <value xml:lang="en">Announcement</value>
         <value xml:lang="es">Anuncio</value>

Modified: ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml?rev=726808&r1=726807&r2=726808&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml (original)
+++ ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml Mon Dec 15 13:28:06 2008
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
+
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
     distributed with this work for additional information
@@ -7,17 +8,16 @@
     to you under the Apache License, Version 2.0 (the
     "License"); you may not use this file except in compliance
     with the License.  You may obtain a copy of the License at
-    
+
     http://www.apache.org/licenses/LICENSE-2.0
-    
+
     Unless required by applicable law or agreed to in writing,
     software distributed under the License is distributed on an
     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
     KIND, either express or implied.  See the License for the
     specific language governing permissions and limitations
     under the License.
--->
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+--><resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <property key="AccountAnnualRevenue">
         <value xml:lang="en">Annual Revenue</value>
         <value xml:lang="es">Ingresos anuales</value>
@@ -278,8 +278,8 @@
     </property>
     <property key="FormFieldTitle_contactMechId">
         <value xml:lang="en">Contact Mech Id</value>
-        <value xml:lang="fr">Réf. des coordonnées</value>
         <value xml:lang="es">Contacto</value>
+        <value xml:lang="fr">Réf. des coordonnées</value>
         <value xml:lang="it">Contatto</value>
         <value xml:lang="ro">Contact</value>
         <value xml:lang="th">รหัสวิธีการติดต่อ</value>
@@ -594,7 +594,7 @@
         <value xml:lang="en">Create Lead from vCard</value>
         <value xml:lang="es">Crear nuevo lead desde vCard</value>
         <value xml:lang="fr">Créer un prospect depuis la vCard</value>
-    </property>  
+    </property>
     <property key="PageTitleEditAccount">
         <value xml:lang="en">Edit Account</value>
         <value xml:lang="es">Editar cuenta</value>
@@ -929,8 +929,8 @@
     </property>
     <property key="PageTitleLookupGeo">
         <value xml:lang="en">Lookup Geo</value>
-        <value xml:lang="it">Ricerca Geografia</value>
         <value xml:lang="fr">Consulter la zone géographique</value>
+        <value xml:lang="it">Ricerca Geografia</value>
         <value xml:lang="ro">Cauta Geografia</value>
         <value xml:lang="th">ค้นหาข้อมูลโครงสร้าง</value>
         <value xml:lang="zh">查找地理</value>
@@ -1197,7 +1197,7 @@
         <value xml:lang="en">Automatically create a new lead by importing a vCard</value>
         <value xml:lang="es">Crear nuevo lead automaticamente importando vCard</value>
         <value xml:lang="fr">Créez automatiquement un nouveau prospect par import d'une vCard</value>
-    </property>  
+    </property>
     <property key="SfaAccountName">
         <value xml:lang="en">Account Name</value>
         <value xml:lang="es">Nombre de cuenta</value>
@@ -1231,7 +1231,7 @@
         <value xml:lang="en">Failed to merge Leads. You have selected same Lead to merge.</value>
         <value xml:lang="es">No se ha podido unir leads. Ha seleccionado el mismo lead.</value>
         <value xml:lang="fr">Echec à la fusion des prospects. Vous avez choisi le même prospect pour fusionner</value>
-    </property>    
+    </property>
     <property key="SfaCompetitors">
         <value xml:lang="en">Competitors &amp; Partners </value>
         <value xml:lang="fr">Concurrents &amp; Associés</value>
@@ -1311,7 +1311,7 @@
         <value xml:lang="en">Import Lead</value>
         <value xml:lang="es">Importar lead</value>
         <value xml:lang="fr">Importer le prospect</value>
-    </property>    
+    </property>
     <property key="SfaInitialAccount">
         <value xml:lang="en">Initial Account</value>
         <value xml:lang="fr">Compte initial</value>
@@ -1341,8 +1341,8 @@
         <value xml:lang="fr">Application de gestion des ventes</value>
     </property>
     <property key="SfaManagerWelcome">
-        <value xml:lang="en">Welcome to the Sales Force Automation Manager Application. This is an application in progress so not completed yet.&lt;br/&gt;&lt;br/&gt;A &lt;a href=&quot;http://docs.ofbiz.org/download/attachments/4008/IfCrmPlanEstimate.pdf&quot; target=blank&gt;design document&lt;/a&gt; and &lt;a href=&quot;https://issues.apache.org/jira/browse/OFBIZ-1640&quot; target=blank&gt;Jira documents&lt;/a&gt; are available.</value>
-        <value xml:lang="fr">Bienvenue dans l'application de gestion des ventes. Cette application est en cours de développement .&lt;br/&gt;&lt;br/&gt;Un &lt;a href=&quot;http://docs.ofbiz.org/download/attachments/4008/IfCrmPlanEstimate.pdf&quot; target=blank&gt;document d'analyse détaillée&lt;/a&gt; et &lt;a href=&quot;https://issues.apache.org/jira/browse/OFBIZ-1640&quot; target=blank&gt;un document de gestion de projet Jira&lt;/a&gt; sont disponibles</value>
+        <value xml:lang="en">Welcome to the Sales Force Automation Manager Application. This is an application in progress so not completed yet.&lt;br/&gt;&lt;br/&gt;A &lt;a href="http://docs.ofbiz.org/download/attachments/4008/IfCrmPlanEstimate.pdf" target=blank&gt;design document&lt;/a&gt; and &lt;a href="https://issues.apache.org/jira/browse/OFBIZ-1640" target=blank&gt;Jira documents&lt;/a&gt; are available.</value>
+        <value xml:lang="fr">Bienvenue dans l'application de gestion des ventes. Cette application est en cours de développement .&lt;br/&gt;&lt;br/&gt;Un &lt;a href="http://docs.ofbiz.org/download/attachments/4008/IfCrmPlanEstimate.pdf" target=blank&gt;document d'analyse détaillée&lt;/a&gt; et &lt;a href="https://issues.apache.org/jira/browse/OFBIZ-1640" target=blank&gt;un document de gestion de projet Jira&lt;/a&gt; sont disponibles</value>
     </property>
     <property key="SfaMergeContacts">
         <value xml:lang="en">Merge Contacts</value>
@@ -1410,8 +1410,8 @@
     </property>
     <property key="SfaUploadVCard">
         <value xml:lang="en">Upload vCard</value>
-        <value xml:lang="fr">Téléchargement de la vCard vers le serveur</value>        
-    </property>    
+        <value xml:lang="fr">Téléchargement de la vCard vers le serveur</value>
+    </property>
     <property key="Tracking">
         <value xml:lang="en">Tracking</value>
         <value xml:lang="es">Seguimiento</value>
@@ -1727,4 +1727,4 @@
         <value xml:lang="th">ชื่อโปรแกรมประยุต์บนเว็บ</value>
         <value xml:lang="zh">Web应用名称</value>
     </property>
-</resource>
\ No newline at end of file
+</resource>

Modified: ofbiz/trunk/applications/order/config/OrderEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderEntityLabels.xml?rev=726808&r1=726807&r2=726808&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderEntityLabels.xml (original)
+++ ofbiz/trunk/applications/order/config/OrderEntityLabels.xml Mon Dec 15 13:28:06 2008
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
+
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
     distributed with this work for additional information
@@ -7,17 +8,16 @@
     to you under the Apache License, Version 2.0 (the
     "License"); you may not use this file except in compliance
     with the License.  You may obtain a copy of the License at
-    
+
     http://www.apache.org/licenses/LICENSE-2.0
-    
+
     Unless required by applicable law or agreed to in writing,
     software distributed under the License is distributed on an
     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
     KIND, either express or implied.  See the License for the
     specific language governing permissions and limitations
     under the License.
--->
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+--><resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <property key="CustRequestResolution.description.DUPLICATE">
         <value xml:lang="de">Duplikat</value>
         <value xml:lang="en">Duplicate</value>

Modified: ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml?rev=726808&r1=726807&r2=726808&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml (original)
+++ ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml Mon Dec 15 13:28:06 2008
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
+
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
     distributed with this work for additional information
@@ -7,17 +8,16 @@
     to you under the Apache License, Version 2.0 (the
     "License"); you may not use this file except in compliance
     with the License.  You may obtain a copy of the License at
-    
+
     http://www.apache.org/licenses/LICENSE-2.0
-    
+
     Unless required by applicable law or agreed to in writing,
     software distributed under the License is distributed on an
     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
     KIND, either express or implied.  See the License for the
     specific language governing permissions and limitations
     under the License.
--->
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+--><resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <property key="OrderAProductStoreMustBeSelectedForASalesOrder">
         <value xml:lang="en">A Product Store MUST be selected for a Sales Order. </value>
         <value xml:lang="es">Se debe seleccionar una tienda para un pedido de venta</value>
@@ -2530,8 +2530,8 @@
     </property>
     <property key="OrderYouDoNotHavePermissionToViewThisPage">
         <value xml:lang="en">You  Do  Not  Have  Permission  To View This Page</value>
-        <value xml:lang="fr">Vous n'avez pas l'autorisation de voir cette page</value>
         <value xml:lang="es">No tiene permisos para ver esta página.</value>
+        <value xml:lang="fr">Vous n'avez pas l'autorisation de voir cette page</value>
         <value xml:lang="th">คุณไม่มีการอนุญาตถึงการแสดงหน้านี้</value>
     </property>
     <property key="ShipBeforeDateOrderTroubleGettingOrderItemShipGrpInvResList">
@@ -2546,8 +2546,8 @@
     </property>
     <property key="ShoppingListEvents.error_calling_update">
         <value xml:lang="en">Error  calling  updateShoppingListItem  OR  handleShoppingListItemVariant</value>
-        <value xml:lang="fr">Erreur à l'appel de updateShoppingListItem  OU  handleShoppingListItemVariant</value>
         <value xml:lang="es">Error al llamar updateShoppingListItem en handleShoppingListItemVariant</value>
+        <value xml:lang="fr">Erreur à l'appel de updateShoppingListItem  OU  handleShoppingListItemVariant</value>
         <value xml:lang="th">Error : ข้อผิดพลาดาการเรียก updateShoppingListItem  หรือ  handleShoppingListItemVariant</value>
     </property>
     <property key="shoppingCartEvents.invalid_alternateGwpLine">