svn commit: r1653224 - in /ofbiz/trunk/framework/common/config: CommonEntityLabels.xml CommonUiLabels.xml

Author: jleroux
Date: Tue Jan 20 11:05:22 2015
New Revision: 1653224

URL: http://svn.apache.org/r1653224
Log:
Slightly modified uilabels patch from Pierre Smits for Dutch translations https://issues.apache.org/jira/browse/OFBIZ-6016

jleroux: I have made some changes within these changes, in agreement with Pierre

Modified:
    ofbiz/trunk/framework/common/config/CommonEntityLabels.xml
    ofbiz/trunk/framework/common/config/CommonUiLabels.xml

Modified: ofbiz/trunk/framework/common/config/CommonEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonEntityLabels.xml?rev=1653224&r1=1653223&r2=1653224&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonEntityLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonEntityLabels.xml Tue Jan 20 11:05:22 2015
@@ -4420,14 +4420,6 @@
         <value xml:lang="zh">不可用</value>
         <value xml:lang="zh-TW">不適用</value>
     </property>
-    <property key="Enumeration.description.TX_D_PROD">
-        <value xml:lang="en">Production</value>
-        <value xml:lang="nl"> Productie</value>
-    </property>
-    <property key="Enumeration.description.TX_D_SHIP_O">
-        <value xml:lang="en">Shipment</value>
-        <value xml:lang="nl">Verzending</value>
-    </property>
     <property key="Geo.geoName.AB">
         <value xml:lang="de">Albera</value>
         <value xml:lang="en">Alberta</value>

Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.xml?rev=1653224&r1=1653223&r2=1653224&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonUiLabels.xml Tue Jan 20 11:05:22 2015
@@ -12207,7 +12207,7 @@
         <value xml:lang="ru">Доступ к этому виду - запрещен</value>
         <value xml:lang="vi">Quyền truy cập tới giao diện này hiện đã bị khoá</value>
         <value xml:lang="zh">已经禁止访问这个界面了。</value>
-        <value xml:lang="zh_-TW">已經禁止訪問這個檢視了.</value>
+        <value xml:lang="zh-TW">已經禁止訪問這個檢視了.</value>
     </property>
     <property key="CommonViewCalendar">
         <value xml:lang="ar">مشاهدة الرزمانة</value>
@@ -14967,50 +14967,4 @@
     </property>
     
     
-    <!-- ORRTIZ:BMS Applications -->
-    
-    <property key="CPM">
-        <value xml:lang="en">CPM: Products</value>
-        <value xml:lang="nl">CPM: Producten</value>
-    </property>
-    <property key="CRM">
-        <value xml:lang="en">CRM: Customers</value>
-        <value xml:lang="nl">CRM: Klanten</value>
-    </property>
-    <property key="EAM">
-        <value xml:lang="en">EAM: Equipment</value>
-        <value xml:lang="nl">EAM: Productiemiddelen</value>
-    </property>
-    <property key="MFG">
-        <value xml:lang="en">MFG: Production</value>
-        <value xml:lang="nl">MFG: Productie</value>
-    </property>
-    <property key="SRM">
-        <value xml:lang="en">SRM: Suppliers</value>
-        <value xml:lang="nl">SRM: Leveranciers</value>
-    </property>
-    <property key="WHM">
-        <value xml:lang="en">WHM: Warehousing</value>
-        <value xml:lang="nl">WHM: Magazijn</value>
-    </property>
-    <property key="TaxReport">
-        <value xml:lang="en">TRM: Tax Reporting</value>
-        <value xml:lang="nl">TRM: Belasting Rapportage</value>
-    </property>
-    <property key="ESSCAS">
-        <value xml:lang="en">ESS: CAS</value>
-        <value xml:lang="nl">ESS: CAS</value>
-    </property>
-    <property key="ESSPROFILE">
-        <value xml:lang="en">ESS: Profile</value>
-        <value xml:lang="nl">ESS: Profiel</value>
-    </property>
-    <property key="ESSTERR">
-        <value xml:lang="en">ESS: Expense Report</value>
-        <value xml:lang="nl">ESS: Onkostendeclaratie</value>
-    </property>
-    <property key="ESSTIME">
-        <value xml:lang="en">ESS: Time Registration</value>
-        <value xml:lang="nl">ESS: Tijdregistratie</value>
-    </property>
 </resource>