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:40:38 UTC

svn commit: r726814 - in /ofbiz/trunk: applications/order/config/OrderUiLabels.xml framework/common/config/CommonUiLabels.xml framework/example/config/ExampleEntityLabels.xml framework/example/config/ExampleUiLabels.xml

Author: jleroux
Date: Mon Dec 15 13:40:37 2008
New Revision: 726814

URL: http://svn.apache.org/viewvc?rev=726814&view=rev
Log:
Related to OFBIZ-2073. Now all labels should be correctly sorted (I know this will not last a lot, but it should help in the meantime :o)

Modified:
    ofbiz/trunk/applications/order/config/OrderUiLabels.xml
    ofbiz/trunk/framework/common/config/CommonUiLabels.xml
    ofbiz/trunk/framework/example/config/ExampleEntityLabels.xml
    ofbiz/trunk/framework/example/config/ExampleUiLabels.xml

Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels.xml?rev=726814&r1=726813&r2=726814&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderUiLabels.xml (original)
+++ ofbiz/trunk/applications/order/config/OrderUiLabels.xml Mon Dec 15 13:40:37 2008
@@ -8158,8 +8158,8 @@
         <value xml:lang="ro">Comanda Vanzare </value>
         <value xml:lang="ru">Заказ на продажу</value>
         <value xml:lang="th">รายการขาย</value>
-        <value xml:lang="zh_CN">销售订单</value>
         <value xml:lang="zh">销售订单</value>
+        <value xml:lang="zh_CN">销售订单</value>
     </property>
     <property key="OrderSalesTax"> <!-- Maybe something  is to be done here to differentiate Sales Tax and VAT, seems OK so far... -->
         <value xml:lang="cs">DPH</value>

Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.xml?rev=726814&r1=726813&r2=726814&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonUiLabels.xml Mon Dec 15 13:40:37 2008
@@ -1896,8 +1896,8 @@
         <value xml:lang="ro">Email-uri</value>
         <value xml:lang="ru">Сообщения</value>
         <value xml:lang="th">อีเมล</value>
-        <value xml:lang="zh_CN">电子邮件</value>
         <value xml:lang="zh">电子邮件</value>
+        <value xml:lang="zh_CN">电子邮件</value>
     </property>
     <property key="CommonEmptyHeader">
         <value xml:lang="de"> </value>

Modified: ofbiz/trunk/framework/example/config/ExampleEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/config/ExampleEntityLabels.xml?rev=726814&r1=726813&r2=726814&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/config/ExampleEntityLabels.xml (original)
+++ ofbiz/trunk/framework/example/config/ExampleEntityLabels.xml Mon Dec 15 13:40:37 2008
@@ -1,21 +1,21 @@
 <?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
-regarding copyright ownership.  The ASF licenses this file
-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.
+    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
+    regarding copyright ownership.  The ASF licenses this file
+    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">
     <!-- Example entity labels -->
@@ -54,12 +54,12 @@
         <value xml:lang="it">Non Permesso</value>
         <value xml:lang="th">ไม่อนุญาต</value>
     </property>
-
+    
     <!-- Entity field descriptions. The Webtools component will use these properties
-         for online documentation. Field description properties have two forms:
-         FieldDescription.[fieldname] - will be used for all fields of that name
-         FieldDescription.[entityname].[fieldname] - will be used for the specified
-         entity field
+        for online documentation. Field description properties have two forms:
+        FieldDescription.[fieldname] - will be used for all fields of that name
+        FieldDescription.[entityname].[fieldname] - will be used for the specified
+        entity field
     -->
     <property key="FieldDescription.exampleId">
         <value xml:lang="en">Example ID</value>

Modified: ofbiz/trunk/framework/example/config/ExampleUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/config/ExampleUiLabels.xml?rev=726814&r1=726813&r2=726814&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/config/ExampleUiLabels.xml (original)
+++ ofbiz/trunk/framework/example/config/ExampleUiLabels.xml Mon Dec 15 13:40:37 2008
@@ -1,21 +1,21 @@
 <?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
-regarding copyright ownership.  The ASF licenses this file
-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.
+    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
+    regarding copyright ownership.  The ASF licenses this file
+    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">
     <!-- Example component properties -->
@@ -40,8 +40,8 @@
     </property>
     <property key="ExampleCompanySubtitle">
         <value xml:lang="en">Part of the Open For Business Family of Open Source Software</value>
-        <value xml:lang="th">ส่วนหนึ่งของธุรกิจแบบครอบครัวที่เป็นซอฟต์แวร์โอเพนซอส</value>
         <value xml:lang="ru">Часть семейства ПО Open For Business</value>
+        <value xml:lang="th">ส่วนหนึ่งของธุรกิจแบบครอบครัวที่เป็นซอฟต์แวร์โอเพนซอส</value>
         <value xml:lang="zh">开源软件OFBiz的组成部分</value>
     </property>
     <property key="ExampleExampleId">
@@ -175,7 +175,7 @@
         <value xml:lang="th">ยินดีต้อนรับสู่ตัวอย่างโปรแกรม!</value>
         <value xml:lang="zh">欢迎使用样例应用！</value>
     </property>
-
+    
     <!-- Page Titles -->
     <property key="PageTitleFindExample">
         <value xml:lang="en">Find Example</value>
@@ -245,7 +245,7 @@
         <value xml:lang="th">ดูลักษณะตัวอย่าง</value>
         <value xml:lang="zh">查找样例特征</value>
     </property>
-
+    
     <!-- Form Field Labels -->
     <property key="FormFieldTitle_amount">
         <value xml:lang="en">Amount</value>