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

[risali...@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:

[EMAIL PROTECTED] 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.