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 2009/02/02 11:17:38 UTC

svn commit: r739955 [1/2] - in /ofbiz/trunk: applications/content/config/ framework/base/src/org/ofbiz/base/util/ framework/common/config/ framework/example/config/ framework/webtools/config/ framework/webtools/servicedef/ framework/webtools/src/org/of...

Author: jleroux
Date: Mon Feb  2 10:17:34 2009
New Revision: 739955

URL: http://svn.apache.org/viewvc?rev=739955&view=rev
Log:
LabelsInfo14.patch from Marco "New tool to get labels information" (https://issues.apache.org/jira/browse/OFBIZ-2070) - OFBIZ-2070
+ some correct changes done with this update of Labels Manager (I updated some wrong ones by hand to keep going forward...)

Added:
    ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelValue.java
Modified:
    ofbiz/trunk/applications/content/config/ContentUiLabels.xml
    ofbiz/trunk/framework/base/src/org/ofbiz/base/util/StringUtil.java
    ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilXml.java
    ofbiz/trunk/framework/common/config/CommonEntityLabels.xml
    ofbiz/trunk/framework/common/config/CommonUiLabels.xml
    ofbiz/trunk/framework/example/config/ExampleEntityLabels.xml
    ofbiz/trunk/framework/example/config/ExampleUiLabels.xml
    ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml
    ofbiz/trunk/framework/webtools/servicedef/services.xml
    ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelInfo.java
    ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelManagerFactory.java
    ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/SaveLabelsToXmlFile.java
    ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/UpdateLabel.ftl
    ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/ViewLabels.ftl
    ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml

Modified: ofbiz/trunk/applications/content/config/ContentUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/config/ContentUiLabels.xml?rev=739955&r1=739954&r2=739955&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/config/ContentUiLabels.xml (original)
+++ ofbiz/trunk/applications/content/config/ContentUiLabels.xml Mon Feb  2 10:17:34 2009
@@ -289,11 +289,11 @@
         <value xml:lang="th">สร้างไฟล์</value>
     </property>
     <property key="ContentCreateNewBlog">
-        <value xml:lang="en">Create New Blog</value>        
+        <value xml:lang="en">Create New Blog</value>
         <value xml:lang="fr">Créer un nouveau blog</value>
     </property>
     <property key="ContentCreateNewBlogArticle">
-        <value xml:lang="en">Create New Art.</value>        
+        <value xml:lang="en">Create New Art.</value>
         <value xml:lang="fr">Créer un nouvel article</value>
     </property>
     <property key="ContentDataResource">

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/StringUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/StringUtil.java?rev=739955&r1=739954&r2=739955&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/StringUtil.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/StringUtil.java Mon Feb  2 10:17:34 2009
@@ -452,9 +452,26 @@
 
         return html;
     }
+    
     public static String htmlSpecialChars(String html) {
         return htmlSpecialChars(html, true, true, true);
-    }    
+    }
+    
+    public static String fromHtmlToSpecialChars(String html, boolean doubleQuotes, boolean singleQuotes, boolean insertBR) {
+        html = StringUtil.replaceString(html, "&amp;", "&");
+        html = StringUtil.replaceString(html, "&lt;", "<");
+        html = StringUtil.replaceString(html, "&gt;", ">");
+        if (doubleQuotes) {
+            html = StringUtil.replaceString(html, "&quot;", "\"");
+        }
+        if (singleQuotes) {
+            html = StringUtil.replaceString(html, "&#039", "'");
+        }
+        if (insertBR) {
+            html = StringUtil.replaceString(html, "<br>", "\n");
+        }
+        return html;
+    }
 
     /**
      * Remove/collapse multiple newline characters

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilXml.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilXml.java?rev=739955&r1=739954&r2=739955&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilXml.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilXml.java Mon Feb  2 10:17:34 2009
@@ -389,6 +389,23 @@
         return elements;
     }
 
+    /** Return a List of Node objects that have the given name and are immediate children of the given element; 
+      * if name is null, all child elements will be included. */
+    public static List<? extends Node> childNodeList(Node node) {
+        if (node == null) return null;
+        
+        List<Node> nodes = FastList.newInstance();
+         
+        if (node != null) {
+            do {
+                if (node.getNodeType() == Node.ELEMENT_NODE || node.getNodeType() == Node.COMMENT_NODE) {
+                    nodes.add(node);
+                }
+            } while ((node = node.getNextSibling()) != null);
+        }        
+        return nodes;
+    }
+
     /** Return the first child Element
      * returns the first element. */
     public static Element firstChildElement(Element element, Set<String> childElementNames) {
@@ -516,6 +533,19 @@
         } while ((textNode = textNode.getNextSibling()) != null);
         return valueBuffer.toString();
     }
+    
+    /** Return the text (node value) of the first node under this */
+    public static String nodeValue(Node node) {
+        if (node == null) return null;
+            
+        StringBuilder valueBuffer = new StringBuilder();
+        do {
+            if (node.getNodeType() == Node.CDATA_SECTION_NODE || node.getNodeType() == Node.TEXT_NODE || node.getNodeType() == Node.COMMENT_NODE) {
+                valueBuffer.append(node.getNodeValue());
+            }
+        } while ((node = node.getNextSibling()) != null);
+        return valueBuffer.toString();
+    }
 
     public static String checkEmpty(String string) {
         if (string != null && string.length() > 0)

Modified: ofbiz/trunk/framework/common/config/CommonEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonEntityLabels.xml?rev=739955&r1=739954&r2=739955&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonEntityLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonEntityLabels.xml Mon Feb  2 10:17:34 2009
@@ -13532,7 +13532,8 @@
         <value xml:lang="de">Tasse</value>
         <value xml:lang="en">Cup</value>
         <value xml:lang="es">Taza</value>
-        <value xml:lang="fr">Cup (236,59 cm³)</value> <!-- a very good link : http://unit-converter.org -->
+        <value xml:lang="fr">Cup (236,59 cm³)</value>
+        <!-- a very good link : http://unit-converter.org -->
         <value xml:lang="it">Tazza</value>
         <value xml:lang="pt">Taça</value>
         <value xml:lang="ro">Cupa</value>

Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.xml?rev=739955&r1=739954&r2=739955&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonUiLabels.xml Mon Feb  2 10:17:34 2009
@@ -2863,7 +2863,7 @@
         <value xml:lang="th">ซ่อนฟิลด์</value>
         <value xml:lang="zh">隐藏域</value>
         <value xml:lang="zh_CN">隐藏字段</value>
-    </property>    
+    </property>
     <property key="CommonHome">
         <value xml:lang="en">Home</value>
         <value xml:lang="fr">Point de départ</value>
@@ -7523,6 +7523,7 @@
         <value xml:lang="de">eBay</value>
         <value xml:lang="en">eBay</value>
         <value xml:lang="es">eBay</value>
+        <value xml:lang="fr">eBay</value>
         <value xml:lang="it">eBay</value>
         <value xml:lang="th">อีเบย์</value>
     </property>
@@ -8171,6 +8172,10 @@
         <value xml:lang="zh">新建数据源类型</value>
         <value xml:lang="zh_CN">增加新数据源类型</value>
     </property>
+    <property key="PageTitleCommonGeoLocation">
+        <value xml:lang="en">GeoLocation of requested element</value>
+        <value xml:lang="fr">Géolocalisation de l'élément demandé</value>
+    </property>
     <property key="PageTitleEditDataSource">
         <value xml:lang="ar">تحرير مصدر المعلومات</value>
         <value xml:lang="de">Datenquelle bearbeiten</value>
@@ -8201,10 +8206,6 @@
         <value xml:lang="zh">编辑数据源类型</value>
         <value xml:lang="zh_CN">编辑数据源类型</value>
     </property>
-    <property key="PageTitleCommonGeoLocation">
-        <value xml:lang="en">GeoLocation of requested element</value>
-        <value xml:lang="fr">Géolocalisation de l'élément demandé</value>
-    </property>
     <property key="PageTitleListDataSource">
         <value xml:lang="ar">قائمة مصادر المعلومات</value>
         <value xml:lang="de">Liste der Datenquellen</value>

Modified: ofbiz/trunk/framework/example/config/ExampleEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/config/ExampleEntityLabels.xml?rev=739955&r1=739954&r2=739955&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/config/ExampleEntityLabels.xml (original)
+++ ofbiz/trunk/framework/example/config/ExampleEntityLabels.xml Mon Feb  2 10:17:34 2009
@@ -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
@@ -18,18 +19,23 @@
     under the License.
 -->
 <resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <!-- Example entity labels -->
-    <property key="ExampleType.description.REAL_WORLD">
-        <value xml:lang="en">Real World</value>
-        <value xml:lang="fr">Monde réel</value>
-        <value xml:lang="it">Mondo Reale</value>
-        <value xml:lang="th">สภาพที่เป็นจริง</value>
+    <property key="ExampleFeatureApplType.description.DESIRED">
+        <value xml:lang="en">Desired</value>
+        <value xml:lang="fr">Désiré</value>
+        <value xml:lang="it">Desiderato</value>
+        <value xml:lang="th">ความต้องการ</value>
     </property>
-    <property key="ExampleType.description.MADE_UP">
-        <value xml:lang="en">Made Up</value>
-        <value xml:lang="fr">Composé</value>
-        <value xml:lang="it">Composto</value>
-        <value xml:lang="th">ทำขึ้น</value>
+    <property key="ExampleFeatureApplType.description.NOT_ALLOWED">
+        <value xml:lang="en">Not Allowed</value>
+        <value xml:lang="fr">Non laissé</value>
+        <value xml:lang="it">Non Permesso</value>
+        <value xml:lang="th">ไม่อนุญาต</value>
+    </property>
+    <property key="ExampleFeatureApplType.description.REQUIRED">
+        <value xml:lang="en">Required</value>
+        <value xml:lang="fr">Requis</value>
+        <value xml:lang="it">Richiesto</value>
+        <value xml:lang="th">ความต้องการ</value>
     </property>
     <property key="ExampleType.description.CONTRIVED">
         <value xml:lang="en">Contrived</value>
@@ -43,25 +49,72 @@
         <value xml:lang="it">Inspirato</value>
         <value xml:lang="th">ยอดเยี่ยม</value>
     </property>
-    <property key="ExampleFeatureApplType.description.REQUIRED">
-        <value xml:lang="en">Required</value>
-        <value xml:lang="fr">Requis</value>
-        <value xml:lang="it">Richiesto</value>
-        <value xml:lang="th">ความต้องการ</value>
+    <property key="ExampleType.description.MADE_UP">
+        <value xml:lang="en">Made Up</value>
+        <value xml:lang="fr">Composé</value>
+        <value xml:lang="it">Composto</value>
+        <value xml:lang="th">ทำขึ้น</value>
     </property>
-    <property key="ExampleFeatureApplType.description.DESIRED">
-        <value xml:lang="en">Desired</value>
-        <value xml:lang="fr">Désiré</value>
-        <value xml:lang="it">Desiderato</value>
-        <value xml:lang="th">ความต้องการ</value>
+    <!-- Example entity labels -->
+    <property key="ExampleType.description.REAL_WORLD">
+        <value xml:lang="en">Real World</value>
+        <value xml:lang="fr">Monde réel</value>
+        <value xml:lang="it">Mondo Reale</value>
+        <value xml:lang="th">สภาพที่เป็นจริง</value>
     </property>
-    <property key="ExampleFeatureApplType.description.NOT_ALLOWED">
-        <value xml:lang="en">Not Allowed</value>
-        <value xml:lang="fr">Non laissé</value>
-        <value xml:lang="it">Non Permesso</value>
-        <value xml:lang="th">ไม่อนุญาต</value>
+    <property key="FieldDescription.Example.exampleId">
+        <value xml:lang="en">A unique Example ID. If you don't assign an ID, one will be generated automatically</value>
+        <value xml:lang="fr">Une réf. unique d'exemple. Si vous n'assignez pas une réf., une sera généré automatiquement</value>
+        <value xml:lang="it">Un codice esempio univoco. Se tu non assegni un codice, uno verrà generato automaticamente</value>
+        <value xml:lang="th">รหัสตัวอย่าง ถ้าไม่มีการกำหนดรหัส จะต้องมีการสร้างขึ้นอัตโมัติ</value>
+    </property>
+    <property key="FieldDescription.ExampleItem.exampleItemSeqId">
+        <value xml:lang="en">A unique Example Item sequence ID. If you don't assign an ID, one will be generated automatically</value>
+        <value xml:lang="fr">Une réf. unique d'article exemple. Si vous n'assignez pas une réf., une sera généré automatiquement</value>
+        <value xml:lang="it">Un codice riga esempio univoco. Se tu non assegni un codice, uno verrà generato automaticamente</value>
+        <value xml:lang="th">รหัสตัวอย่างสินค้า ถ้าไม่มีการกำหนดรหัส จะต้องมีการสร้างขึ้นอัตโมัติ</value>
+    </property>
+    <property key="FieldDescription.ExampleType.exampleTypeId">
+        <value xml:lang="en">A unique Example Type ID. If you don't assign an ID, one will be generated automatically</value>
+        <value xml:lang="fr">Une réf. unique de type exemple. Si vous n'assignez pas une réf., une sera généré automatiquement</value>
+        <value xml:lang="it">Un tipo esempio univoco. Se tu non assegni un codice, uno verrà generato automaticamente</value>
+        <value xml:lang="th">รหัสตัวอย่างประเภท ถ้าไม่มีการกำหนดรหัส จะต้องมีการสร้างขึ้นอัตโมัติ</value>
+    </property>
+    <property key="FieldDescription.amount">
+        <value xml:lang="de">Betrag</value>
+        <value xml:lang="en">Amount</value>
+        <value xml:lang="fr">Montant</value>
+        <value xml:lang="it">Importo</value>
+        <value xml:lang="ro">Import</value>
+        <value xml:lang="th">จำนวน</value>
+    </property>
+    <property key="FieldDescription.anotherDate">
+        <value xml:lang="en">Another Date</value>
+        <value xml:lang="fr">Une autre date</value>
+        <value xml:lang="it">Altra Data</value>
+        <value xml:lang="th">วันที่อื่น ๆ</value>
+    </property>
+    <property key="FieldDescription.anotherText">
+        <value xml:lang="en">Another Text</value>
+        <value xml:lang="fr">Une autre texte</value>
+        <value xml:lang="it">Altro Testo</value>
+        <value xml:lang="th">ตัวอักษรอื่น ๆ</value>
+    </property>
+    <property key="FieldDescription.comments">
+        <value xml:lang="de">Kommentare</value>
+        <value xml:lang="en">Comments</value>
+        <value xml:lang="fr">Commentaires</value>
+        <value xml:lang="it">Commenti</value>
+        <value xml:lang="ro">Comentarii</value>
+        <value xml:lang="th">ความคิดเห็น</value>
+    </property>
+    <property key="FieldDescription.exampleDate">
+        <value xml:lang="en">Example Date</value>
+        <value xml:lang="fr">Exemple de date</value>
+        <value xml:lang="it">Esempio Data</value>
+        <value xml:lang="ro">Data Exemplu</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
@@ -75,26 +128,12 @@
         <value xml:lang="ro">Cod Exemplu</value>
         <value xml:lang="th">รหัสตัวอย่าง</value>
     </property>
-    <property key="FieldDescription.exampleTypeId">
-        <value xml:lang="en">Example Type ID</value>
-        <value xml:lang="fr">Réf. de type d'exemple</value>
-        <value xml:lang="it">Tipo esempio</value>
-        <value xml:lang="th">รหัสประเภทตัวอย่าง</value>
-    </property>
     <property key="FieldDescription.exampleItemSeqId">
         <value xml:lang="en">Example Item sequence ID</value>
         <value xml:lang="fr">Réf. de séquence exemple d'article</value>
         <value xml:lang="it">Riga esempio</value>
         <value xml:lang="th">รหัสลำดับตัวอย่างสินค้า</value>
     </property>
-    <property key="FieldDescription.amount">
-        <value xml:lang="de">Betrag</value>
-        <value xml:lang="en">Amount</value>
-        <value xml:lang="fr">Montant</value>
-        <value xml:lang="it">Importo</value>
-        <value xml:lang="ro">Import</value>
-        <value xml:lang="th">จำนวน</value>
-    </property>
     <property key="FieldDescription.exampleName">
         <value xml:lang="en">Example Name</value>
         <value xml:lang="fr">Nom d'exemple</value>
@@ -102,21 +141,6 @@
         <value xml:lang="ro">Nume Exemplu</value>
         <value xml:lang="th">ชื่อตัวอย่าง</value>
     </property>
-    <property key="FieldDescription.longDescription">
-        <value xml:lang="en">Long Description</value>
-        <value xml:lang="fr">Longue description</value>
-        <value xml:lang="it">Descrizione Lunga</value>
-        <value xml:lang="ro">Descriere Lunga</value>
-        <value xml:lang="th">รายละเอียด</value>
-    </property>
-    <property key="FieldDescription.comments">
-        <value xml:lang="de">Kommentare</value>
-        <value xml:lang="en">Comments</value>
-        <value xml:lang="fr">Commentaires</value>
-        <value xml:lang="it">Commenti</value>
-        <value xml:lang="ro">Comentarii</value>
-        <value xml:lang="th">ความคิดเห็น</value>
-    </property>
     <property key="FieldDescription.exampleSize">
         <value xml:lang="en">Example Size</value>
         <value xml:lang="fr">Exemple de taille</value>
@@ -124,41 +148,17 @@
         <value xml:lang="ro">Marime-size Exemplu</value>
         <value xml:lang="th">ขนาดตัวอย่าง</value>
     </property>
-    <property key="FieldDescription.exampleDate">
-        <value xml:lang="en">Example Date</value>
-        <value xml:lang="fr">Exemple de date</value>
-        <value xml:lang="it">Esempio Data</value>
-        <value xml:lang="ro">Data Exemplu</value>
-        <value xml:lang="th">ตัวอย่างวันที่</value>
-    </property>
-    <property key="FieldDescription.anotherDate">
-        <value xml:lang="en">Another Date</value>
-        <value xml:lang="fr">Une autre date</value>
-        <value xml:lang="it">Altra Data</value>
-        <value xml:lang="th">วันที่อื่น ๆ</value>
-    </property>
-    <property key="FieldDescription.anotherText">
-        <value xml:lang="en">Another Text</value>
-        <value xml:lang="fr">Une autre texte</value>
-        <value xml:lang="it">Altro Testo</value>
-        <value xml:lang="th">ตัวอักษรอื่น ๆ</value>
-    </property>
-    <property key="FieldDescription.Example.exampleId">
-        <value xml:lang="en">A unique Example ID. If you don't assign an ID, one will be generated automatically</value>
-        <value xml:lang="fr">Une réf. unique d'exemple. Si vous n'assignez pas une réf., une sera généré automatiquement</value>
-        <value xml:lang="it">Un codice esempio univoco. Se tu non assegni un codice, uno verrà generato automaticamente</value>
-        <value xml:lang="th">รหัสตัวอย่าง ถ้าไม่มีการกำหนดรหัส จะต้องมีการสร้างขึ้นอัตโมัติ</value>
-    </property>
-    <property key="FieldDescription.ExampleItem.exampleItemSeqId">
-        <value xml:lang="en">A unique Example Item sequence ID. If you don't assign an ID, one will be generated automatically</value>
-        <value xml:lang="fr">Une réf. unique d'article exemple. Si vous n'assignez pas une réf., une sera généré automatiquement</value>
-        <value xml:lang="it">Un codice riga esempio univoco. Se tu non assegni un codice, uno verrà generato automaticamente</value>
-        <value xml:lang="th">รหัสตัวอย่างสินค้า ถ้าไม่มีการกำหนดรหัส จะต้องมีการสร้างขึ้นอัตโมัติ</value>
+    <property key="FieldDescription.exampleTypeId">
+        <value xml:lang="en">Example Type ID</value>
+        <value xml:lang="fr">Réf. de type d'exemple</value>
+        <value xml:lang="it">Tipo esempio</value>
+        <value xml:lang="th">รหัสประเภทตัวอย่าง</value>
     </property>
-    <property key="FieldDescription.ExampleType.exampleTypeId">
-        <value xml:lang="en">A unique Example Type ID. If you don't assign an ID, one will be generated automatically</value>
-        <value xml:lang="fr">Une réf. unique de type exemple. Si vous n'assignez pas une réf., une sera généré automatiquement</value>
-        <value xml:lang="it">Un tipo esempio univoco. Se tu non assegni un codice, uno verrà generato automaticamente</value>
-        <value xml:lang="th">รหัสตัวอย่างประเภท ถ้าไม่มีการกำหนดรหัส จะต้องมีการสร้างขึ้นอัตโมัติ</value>
+    <property key="FieldDescription.longDescription">
+        <value xml:lang="en">Long Description</value>
+        <value xml:lang="fr">Longue description</value>
+        <value xml:lang="it">Descrizione Lunga</value>
+        <value xml:lang="ro">Descriere Lunga</value>
+        <value xml:lang="th">รายละเอียด</value>
     </property>
 </resource>

Modified: ofbiz/trunk/framework/example/config/ExampleUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/config/ExampleUiLabels.xml?rev=739955&r1=739954&r2=739955&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/config/ExampleUiLabels.xml (original)
+++ ofbiz/trunk/framework/example/config/ExampleUiLabels.xml Mon Feb  2 10:17:34 2009
@@ -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
@@ -18,6 +19,16 @@
     under the License.
 -->
 <resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <property key="ExampleAjaxExamples">
+        <value xml:lang="en">Ajax Examples</value>
+        <value xml:lang="fr">Exemples Ajax</value>
+        <value xml:lang="it">Esempi Ajax</value>
+    </property>
+    <property key="ExampleAjaxIntro">
+        <value xml:lang="en">To use this Ajax demonstration, you must have JavaScript enabled on your browser.</value>
+        <value xml:lang="fr">Pour utiliser cette démonstration Ajax, vous devez avoir activé Javascript </value>
+        <value xml:lang="it">Per usare questa dimostrazione Ajax, tu devi avere JavaScript abilitato sul tuo browser.</value>
+    </property>
     <!-- Example component properties -->
     <property key="ExampleApplication">
         <value xml:lang="en">Example Application</value>
@@ -28,16 +39,6 @@
         <value xml:lang="th">ตัวอย่างโปรแกรมคอมพิวเตอร์</value>
         <value xml:lang="zh">样例应用</value>
     </property>
-    <property key="ExampleAjaxIntro">
-        <value xml:lang="en">To use this Ajax demonstration, you must have JavaScript enabled on your browser.</value>
-        <value xml:lang="fr">Pour utiliser cette démonstration Ajax, vous devez avoir activé Javascript </value>
-        <value xml:lang="it">Per usare questa dimostrazione Ajax, tu devi avere JavaScript abilitato sul tuo browser.</value>
-    </property>
-    <property key="ExampleAjaxExamples">
-        <value xml:lang="en">Ajax Examples</value>
-        <value xml:lang="fr">Exemples Ajax</value>
-        <value xml:lang="it">Esempi Ajax</value>
-    </property>    
     <property key="ExampleCompanyName">
         <value xml:lang="en">OFBiz: Example</value>
         <value xml:lang="fr">OFBiz : Exemple</value>
@@ -74,15 +75,6 @@
         <value xml:lang="zh">开源软件OFBiz家族的一部分</value>
         <value xml:lang="zh_CN">OFBiz的一部分</value>
     </property>
-    <property key="ExampleExampleId">
-        <value xml:lang="en">Example ID</value>
-        <value xml:lang="fr">Réf. exemple</value>
-        <value xml:lang="it">Codice esempio</value>
-        <value xml:lang="ro">Cod Exemplu</value>
-        <value xml:lang="ru">Код примера</value>
-        <value xml:lang="th">รหัสตัวอย่าง</value>
-        <value xml:lang="zh">样例标识</value>
-    </property>
     <property key="ExampleExample">
         <value xml:lang="en">Example</value>
         <value xml:lang="fr">Exemple</value>
@@ -92,6 +84,33 @@
         <value xml:lang="th">ตัวอย่าง</value>
         <value xml:lang="zh">样例</value>
     </property>
+    <property key="ExampleExampleFeature">
+        <value xml:lang="en">Example Feature</value>
+        <value xml:lang="fr">Caractéristique exemple</value>
+        <value xml:lang="it">Caratteristica Esempio</value>
+        <value xml:lang="ro">Caracteristica Exemplu</value>
+        <value xml:lang="ru">Особенность примера</value>
+        <value xml:lang="th">ลักษณะตัวอย่าง</value>
+        <value xml:lang="zh">样例特征</value>
+    </property>
+    <property key="ExampleExampleFeatureId">
+        <value xml:lang="en">Example Feature ID</value>
+        <value xml:lang="fr">Réf. de caractéristique exemple</value>
+        <value xml:lang="it">Codice Caratteristica Esempio</value>
+        <value xml:lang="ro">Cod Caracteristica Exemplu </value>
+        <value xml:lang="ru">Код особенности примера</value>
+        <value xml:lang="th">ตัวอย่างรหัสลักษณะ</value>
+        <value xml:lang="zh">样例特征标识</value>
+    </property>
+    <property key="ExampleExampleId">
+        <value xml:lang="en">Example ID</value>
+        <value xml:lang="fr">Réf. exemple</value>
+        <value xml:lang="it">Codice esempio</value>
+        <value xml:lang="ro">Cod Exemplu</value>
+        <value xml:lang="ru">Код примера</value>
+        <value xml:lang="th">รหัสตัวอย่าง</value>
+        <value xml:lang="zh">样例标识</value>
+    </property>
     <property key="ExampleExamples">
         <value xml:lang="en">Examples</value>
         <value xml:lang="fr">Exemples</value>
@@ -101,6 +120,12 @@
         <value xml:lang="th">ตัวอย่าง</value>
         <value xml:lang="zh">样例</value>
     </property>
+    <property key="ExampleExplicitOption">
+        <value xml:lang="en">Explicit Option</value>
+        <value xml:lang="fr">Option explicite</value>
+        <value xml:lang="it">Opzione Esplicita</value>
+        <value xml:lang="th">ทางเลือกที่ชัดเจน</value>
+    </property>
     <property key="ExampleFeature">
         <value xml:lang="en">Feature</value>
         <value xml:lang="fr">Caractéristique</value>
@@ -110,15 +135,6 @@
         <value xml:lang="th">ลักษณะ</value>
         <value xml:lang="zh">特征</value>
     </property>
-    <property key="ExampleFeatures">
-        <value xml:lang="en">Features</value>
-        <value xml:lang="fr">Caractéristiques</value>
-        <value xml:lang="it">Caratteristiche</value>
-        <value xml:lang="ro">Caracteristici</value>
-        <value xml:lang="ru">Особенности</value>
-        <value xml:lang="th">ลักษณะ</value>
-        <value xml:lang="zh">特征</value>
-    </property>
     <property key="ExampleFeatureSource">
         <value xml:lang="en">Feature Source</value>
         <value xml:lang="fr">Caractéristique d'origine</value>
@@ -128,35 +144,20 @@
         <value xml:lang="th">ที่มา</value>
         <value xml:lang="zh">特征源</value>
     </property>
-    <property key="ExampleExampleFeature">
-        <value xml:lang="en">Example Feature</value>
-        <value xml:lang="fr">Caractéristique exemple</value>
-        <value xml:lang="it">Caratteristica Esempio</value>
-        <value xml:lang="ro">Caracteristica Exemplu</value>
-        <value xml:lang="ru">Особенность примера</value>
-        <value xml:lang="th">ลักษณะตัวอย่าง</value>
-        <value xml:lang="zh">样例特征</value>
-    </property>
-    <property key="ExampleExampleFeatureId">
-        <value xml:lang="en">Example Feature ID</value>
-        <value xml:lang="fr">Réf. de caractéristique exemple</value>
-        <value xml:lang="it">Codice Caratteristica Esempio</value>
-        <value xml:lang="ro">Cod Caracteristica Exemplu </value>
-        <value xml:lang="ru">Код особенности примера</value>
-        <value xml:lang="th">ตัวอย่างรหัสลักษณะ</value>
-        <value xml:lang="zh">样例特征标识</value>
-    </property>
-    <property key="ExampleExplicitOption">
-        <value xml:lang="en">Explicit Option</value>
-        <value xml:lang="fr">Option explicite</value>
-        <value xml:lang="it">Opzione Esplicita</value>
-        <value xml:lang="th">ทางเลือกที่ชัดเจน</value>
+    <property key="ExampleFeatures">
+        <value xml:lang="en">Features</value>
+        <value xml:lang="fr">Caractéristiques</value>
+        <value xml:lang="it">Caratteristiche</value>
+        <value xml:lang="ro">Caracteristici</value>
+        <value xml:lang="ru">Особенности</value>
+        <value xml:lang="th">ลักษณะ</value>
+        <value xml:lang="zh">特征</value>
     </property>
     <property key="ExampleFopFonts">
         <value xml:lang="en">This will print a simple PDF file which will show the FOP fonts avalaible in OFBiz</value>
         <value xml:lang="fr">Impression d'un simple fichier PDF qui montre les polices FOP disponibles dans OFBiz</value>
         <value xml:lang="it">Questo stampa un file PDF semplice che mostrerà i font FOP disponibili in OFBiz</value>
-    </property>    
+    </property>
     <property key="ExampleFormWidgetExamples">
         <value xml:lang="en">Form Widget Examples</value>
         <value xml:lang="fr">Exemple de Form Widget</value>
@@ -230,21 +231,45 @@
         <value xml:lang="th">ยินดีต้อนรับสู่ตัวอย่างโปรแกรม!</value>
         <value xml:lang="zh">欢迎使用样例应用！</value>
     </property>
-    <!-- Page Titles -->
-    <property key="PageTitleFindExample">
-        <value xml:lang="en">Find Example</value>
-        <value xml:lang="fr">Recherche d'un exemple</value>
-        <value xml:lang="it">Ricerca Esempio</value>
-        <value xml:lang="ro">Cauta Exemplu</value>
-        <value xml:lang="ru">Найти пример</value>
-        <value xml:lang="th">ค้นหาตัวอย่าง</value>
-        <value xml:lang="zh">查找样例</value>
+    <property key="FormFieldTitle_anotherDate">
+        <value xml:lang="en">Another Date</value>
+        <value xml:lang="fr">Une autre date</value>
+        <value xml:lang="it">Altra Data</value>
+        <value xml:lang="th">วันที่อื่น ๆ</value>
     </property>
-    <property key="PageTitleFormWidgetExamples">
-        <value xml:lang="en">Form Widget Examples</value>
-        <value xml:lang="fr">Exemples Form Widget</value>
-        <value xml:lang="it">Esempio form widget</value>
-        <value xml:lang="th">ตัวอย่าง Widget</value>
+    <property key="FormFieldTitle_anotherText">
+        <value xml:lang="en">Another Text</value>
+        <value xml:lang="fr">Un autre texte</value>
+        <value xml:lang="it">Altro Testo</value>
+        <value xml:lang="th">ตัวหนังสืออื่น ๆ</value>
+    </property>
+    <property key="FormFieldTitle_exampleDate">
+        <value xml:lang="en">Example Date</value>
+        <value xml:lang="fr">Exemple de date</value>
+        <value xml:lang="it">Esempio Data</value>
+        <value xml:lang="ro">Data Exemplu</value>
+        <value xml:lang="ru">Дата примера</value>
+        <value xml:lang="th">ตัวอย่างวันที่</value>
+        <value xml:lang="zh">样例日期</value>
+    </property>
+    <!-- Form Field Labels -->
+    <property key="FormFieldTitle_exampleName">
+        <value xml:lang="en">Example Name</value>
+        <value xml:lang="fr">Nom d'exemple</value>
+        <value xml:lang="it">Nome Esempio</value>
+        <value xml:lang="ro">Nume Exemplu</value>
+        <value xml:lang="ru">Имя примера</value>
+        <value xml:lang="th">ตัวอย่างชื่อ</value>
+        <value xml:lang="zh">样例名称</value>
+    </property>
+    <property key="FormFieldTitle_exampleSize">
+        <value xml:lang="en">Example Size</value>
+        <value xml:lang="fr">Exemple de taille</value>
+        <value xml:lang="it">Esempio Taglia</value>
+        <value xml:lang="ro">Marime-size Exemplu</value>
+        <value xml:lang="ru">Размер примера</value>
+        <value xml:lang="th">ตัวอย่างขนาด</value>
+        <value xml:lang="zh">样例尺寸</value>
     </property>
     <property key="PageTitleEditExample">
         <value xml:lang="en">Edit Example</value>
@@ -255,14 +280,14 @@
         <value xml:lang="th">แก้ไขตัวอย่าง</value>
         <value xml:lang="zh">编辑样例</value>
     </property>
-    <property key="PageTitleEditExampleItems">
-        <value xml:lang="en">Edit Example Items</value>
-        <value xml:lang="fr">Modifier la ligne de l'exemple</value>
-        <value xml:lang="it">Aggiorna Righe Esempio</value>
-        <value xml:lang="ro">Actualizeaza Linii Exemplu</value>
-        <value xml:lang="ru">Изменить позиции примера</value>
-        <value xml:lang="th">แก้ไขสินค้าตัวอย่าง</value>
-        <value xml:lang="zh">编辑样例明细</value>
+    <property key="PageTitleEditExampleFeature">
+        <value xml:lang="en">Edit Example Feature</value>
+        <value xml:lang="fr">Modifier la caractéristique de l'exemple</value>
+        <value xml:lang="it">Aggiorna Caratteristica Esempio</value>
+        <value xml:lang="ro">Actualizeaza Caracteristica Exemplu</value>
+        <value xml:lang="ru">Изменить особенности примера</value>
+        <value xml:lang="th">แก้ไขลักษณะตัวอย่าง</value>
+        <value xml:lang="zh">编辑样例特征</value>
     </property>
     <property key="PageTitleEditExampleFeatureAppls">
         <value xml:lang="en">Edit Example Features</value>
@@ -273,6 +298,34 @@
         <value xml:lang="th">แก้ไขลักษณะตัวอย่าง</value>
         <value xml:lang="zh">编辑样例特征</value>
     </property>
+    <property key="PageTitleEditExampleFeatureExampleAppls">
+        <value xml:lang="en">Edit Example Feature Examples</value>
+        <value xml:lang="fr">Modifier la caractéristique exemple des exemples</value>
+        <value xml:lang="it">Aggiorna Esempio Caratteristica Esempi</value>
+        <value xml:lang="ro">Actualizeaza Exemplu Caratteristica Exemple</value>
+        <value xml:lang="ru">Изменить примеры особенностей</value>
+        <value xml:lang="th">แก้ไขตัวอย่างลักษณะตัวอย่าง</value>
+        <value xml:lang="zh">编辑样例特征的样例</value>
+    </property>
+    <property key="PageTitleEditExampleItems">
+        <value xml:lang="en">Edit Example Items</value>
+        <value xml:lang="fr">Modifier la ligne de l'exemple</value>
+        <value xml:lang="it">Aggiorna Righe Esempio</value>
+        <value xml:lang="ro">Actualizeaza Linii Exemplu</value>
+        <value xml:lang="ru">Изменить позиции примера</value>
+        <value xml:lang="th">แก้ไขสินค้าตัวอย่าง</value>
+        <value xml:lang="zh">编辑样例明细</value>
+    </property>
+    <!-- Page Titles -->
+    <property key="PageTitleFindExample">
+        <value xml:lang="en">Find Example</value>
+        <value xml:lang="fr">Recherche d'un exemple</value>
+        <value xml:lang="it">Ricerca Esempio</value>
+        <value xml:lang="ro">Cauta Exemplu</value>
+        <value xml:lang="ru">Найти пример</value>
+        <value xml:lang="th">ค้นหาตัวอย่าง</value>
+        <value xml:lang="zh">查找样例</value>
+    </property>
     <property key="PageTitleFindExampleFeature">
         <value xml:lang="en">Find Example Feature</value>
         <value xml:lang="fr">Rechercher la caractéristique de l'exemple</value>
@@ -282,23 +335,11 @@
         <value xml:lang="th">ค้นหาลักษณะตัวอย่าง</value>
         <value xml:lang="zh">查找样例特征</value>
     </property>
-    <property key="PageTitleEditExampleFeature">
-        <value xml:lang="en">Edit Example Feature</value>
-        <value xml:lang="fr">Modifier la caractéristique de l'exemple</value>
-        <value xml:lang="it">Aggiorna Caratteristica Esempio</value>
-        <value xml:lang="ro">Actualizeaza Caracteristica Exemplu</value>
-        <value xml:lang="ru">Изменить особенности примера</value>
-        <value xml:lang="th">แก้ไขลักษณะตัวอย่าง</value>
-        <value xml:lang="zh">编辑样例特征</value>
-    </property>
-    <property key="PageTitleEditExampleFeatureExampleAppls">
-        <value xml:lang="en">Edit Example Feature Examples</value>
-        <value xml:lang="fr">Modifier la caractéristique exemple des exemples</value>
-        <value xml:lang="it">Aggiorna Esempio Caratteristica Esempi</value>
-        <value xml:lang="ro">Actualizeaza Exemplu Caratteristica Exemple</value>
-        <value xml:lang="ru">Изменить примеры особенностей</value>
-        <value xml:lang="th">แก้ไขตัวอย่างลักษณะตัวอย่าง</value>
-        <value xml:lang="zh">编辑样例特征的样例</value>
+    <property key="PageTitleFormWidgetExamples">
+        <value xml:lang="en">Form Widget Examples</value>
+        <value xml:lang="fr">Exemples Form Widget</value>
+        <value xml:lang="it">Esempio form widget</value>
+        <value xml:lang="th">ตัวอย่าง Widget</value>
     </property>
     <property key="PageTitleLookupExampleFeature">
         <value xml:lang="en">Lookup Example Feature</value>
@@ -309,44 +350,4 @@
         <value xml:lang="th">ดูลักษณะตัวอย่าง</value>
         <value xml:lang="zh">查找样例特征</value>
     </property>
-    <!-- Form Field Labels -->
-    <property key="FormFieldTitle_exampleName">
-        <value xml:lang="en">Example Name</value>
-        <value xml:lang="fr">Nom d'exemple</value>
-        <value xml:lang="it">Nome Esempio</value>
-        <value xml:lang="ro">Nume Exemplu</value>
-        <value xml:lang="ru">Имя примера</value>
-        <value xml:lang="th">ตัวอย่างชื่อ</value>
-        <value xml:lang="zh">样例名称</value>
-    </property>
-    <property key="FormFieldTitle_exampleSize">
-        <value xml:lang="en">Example Size</value>
-        <value xml:lang="fr">Exemple de taille</value>
-        <value xml:lang="it">Esempio Taglia</value>
-        <value xml:lang="ro">Marime-size Exemplu</value>
-        <value xml:lang="ru">Размер примера</value>
-        <value xml:lang="th">ตัวอย่างขนาด</value>
-        <value xml:lang="zh">样例尺寸</value>
-    </property>
-    <property key="FormFieldTitle_exampleDate">
-        <value xml:lang="en">Example Date</value>
-        <value xml:lang="fr">Exemple de date</value>
-        <value xml:lang="it">Esempio Data</value>
-        <value xml:lang="ro">Data Exemplu</value>
-        <value xml:lang="ru">Дата примера</value>
-        <value xml:lang="th">ตัวอย่างวันที่</value>
-        <value xml:lang="zh">样例日期</value>
-    </property>
-    <property key="FormFieldTitle_anotherDate">
-        <value xml:lang="en">Another Date</value>
-        <value xml:lang="fr">Une autre date</value>
-        <value xml:lang="it">Altra Data</value>
-        <value xml:lang="th">วันที่อื่น ๆ</value>
-    </property>
-    <property key="FormFieldTitle_anotherText">
-        <value xml:lang="en">Another Text</value>
-        <value xml:lang="fr">Un autre texte</value>
-        <value xml:lang="it">Altro Testo</value>
-        <value xml:lang="th">ตัวหนังสืออื่น ๆ</value>
-    </property>
 </resource>

Modified: ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml?rev=739955&r1=739954&r2=739955&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml (original)
+++ ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml Mon Feb  2 10:17:34 2009
@@ -1420,6 +1420,22 @@
         <value xml:lang="fr">Fichier de Log</value>
         <value xml:lang="it">File di log</value>
     </property>
+    <property key="WebtoolsLHSMapName">
+        <value xml:lang="en">LHS map name</value>
+        <value xml:lang="fr">Nom de Map LHS</value>
+        <value xml:lang="it">Nome mappa LHS</value>
+        <value xml:lang="ro">Nume mapa LHS</value>
+        <value xml:lang="th">ชื่อแผนที่ LHS </value>
+        <value xml:lang="zh">左手选择变换名称</value>
+    </property>
+    <property key="WebtoolsLHSValueName">
+        <value xml:lang="en">LHS value name</value>
+        <value xml:lang="fr">Nom de valeur LHS</value>
+        <value xml:lang="it">Nome valore LHS</value>
+        <value xml:lang="ro">Nume valoare LHS</value>
+        <value xml:lang="th">ชื่อค่า LHS </value>
+        <value xml:lang="zh">左手选择值名称</value>
+    </property>
     <property key="WebtoolsLabelManager">
         <value xml:lang="en">Label Manager</value>
         <value xml:lang="fr">Gestionnaire de traduction</value>
@@ -1498,37 +1514,21 @@
         <value xml:lang="fr">Impossible d'accèder à la page de gestion des traductions sans l'autorisation LABEL_MANAGER_VIEW.</value>
         <value xml:lang="it">Non e posssibile visualizzare la pagina Gestione delle Label senza il permesso LABEL_MANAGER_VIEW.</value>
     </property>
-    <property key="WebtoolsLabelManagerUpdateFile">
-        <value xml:lang="en">Update Labels Files</value>
-        <value xml:lang="fr">Mettre à jour les fichiers de traduction</value>
-        <value xml:lang="it">Aggiorna files delle labels</value>
-    </property>
     <property key="WebtoolsLabelManagerUpdate">
         <value xml:lang="en">Update Label</value>
         <value xml:lang="fr">Mettre à jour la traduction</value>
         <value xml:lang="it">Aggiorna Label</value>
     </property>
+    <property key="WebtoolsLabelManagerUpdateFile">
+        <value xml:lang="en">Update Labels Files</value>
+        <value xml:lang="fr">Mettre à jour les fichiers de traduction</value>
+        <value xml:lang="it">Aggiorna files delle labels</value>
+    </property>
     <property key="WebtoolsLabelManagerWarningMessage">
         <value xml:lang="en">There are some labels with more than translation for the same language</value>
         <value xml:lang="fr">Il y a des traduction dupliquées pour le même langage</value>
         <value xml:lang="it">Ci sono alcune label con più di una traduzione per la stessa lingua</value>
     </property>
-    <property key="WebtoolsLHSMapName">
-        <value xml:lang="en">LHS map name</value>
-        <value xml:lang="fr">Nom de Map LHS</value>
-        <value xml:lang="it">Nome mappa LHS</value>
-        <value xml:lang="ro">Nume mapa LHS</value>
-        <value xml:lang="th">ชื่อแผนที่ LHS </value>
-        <value xml:lang="zh">左手选择变换名称</value>
-    </property>
-    <property key="WebtoolsLHSValueName">
-        <value xml:lang="en">LHS value name</value>
-        <value xml:lang="fr">Nom de valeur LHS</value>
-        <value xml:lang="it">Nome valore LHS</value>
-        <value xml:lang="ro">Nume valoare LHS</value>
-        <value xml:lang="th">ชื่อค่า LHS </value>
-        <value xml:lang="zh">左手选择值名称</value>
-    </property>
     <property key="WebtoolsLeaveAllEntriesBlank">
         <value xml:lang="en">leave all entries blank</value>
         <value xml:lang="fr">Laisser toutes les entrées vides</value>
@@ -1670,14 +1670,6 @@
         <value xml:lang="th">หน่วยความจำ</value>
         <value xml:lang="zh">内存</value>
     </property>
-    <property key="WebtoolsMessage1">
-        <value xml:lang="en">This page can be used to export data from the database </value>
-        <value xml:lang="fr">Cette page peut être utilisée pour exporter des données depuis la base</value>
-        <value xml:lang="it">Questa pagine può essere usata per esportare i dati dal database</value>
-        <value xml:lang="ro">Aceasta pagina poate fi folosita pentru exportarea datelor din  database</value>
-        <value xml:lang="th">หน้านี้ใช้การส่งออกข้อมูลจากฐานข้อมูล</value>
-        <value xml:lang="zh">本页面用于从数据库导出数据 </value>
-    </property>
     <property key="WebtoolsMessage10">
         <value xml:lang="en">number of time the job will retry on error; use -1 for no limit or leave empty for service default</value>
         <value xml:lang="fr">Nombre de fois où le job sera relancé en cas d'erreur; utilisez -1 pour ne définir aucune limite ou laissez vide pour utilisez la valeur par défaut du service</value>
@@ -1718,15 +1710,6 @@
         <value xml:lang="th">เพื่อความแน่ใจคุณควรเข้าสู่ระบบโดยใช้ ชื่อผูใช้: admin, รหัสผ่าน: ofbiz</value>
         <value xml:lang="zh">如果你对其中的某些功能感兴趣，请先登录，可以尝试使用用户名：admin、密码：ofbiz登录</value>
     </property>
-    <property key="WebtoolsViewPermissionError">
-        <value xml:lang="en">You do not have permission to view this page. ("OFBTOOLS_VIEW" or "OFBTOOLS_ADMIN" needed)</value>
-        <value xml:lang="fr">Vous n'avez pas l'autorisation de voir cette page ("OFBTOOLS_VIEW" ou "OFBTOOLS_ADMIN" nécessaire)</value>
-        <value xml:lang="it">Non sei autorizzato a vedere questa pagina. (Necessario permesso "OFBTOOLS_VIEW" o "OFBTOOLS_ADMIN")</value>
-        <value xml:lang="ro">Nu esti autorizat sa vezi aceasta pagina. (Este necesar Permisul "OFBTOOLS_VIEW" sau "OFBTOOLS_ADMIN")</value>
-        <value xml:lang="ru">У вас нет прав для просмотра этой страницы. (необходимы права "OFBTOOLS_VIEW" или "OFBTOOLS_ADMIN")</value>
-        <value xml:lang="th">คุณไม่ได้รับอนุญาตให้เข้าดูหน้านี้ได้ (หน้า "OFBTOOLS_VIEW" หรือ "OFBTOOLS_ADMIN" ที่ต้องการ)</value>
-        <value xml:lang="zh">你没有浏览这个页面的权限。(需要"OFBTOOLS_VIEW"或"OFBTOOLS_ADMIN")</value>
-    </property>
     <property key="WebtoolsMessage15">
         <value xml:lang="en">You may create an Entity</value>
         <value xml:lang="fr">Vous pouvez créer une entité</value>
@@ -1765,13 +1748,13 @@
         <value xml:lang="it">Scritti XML per tutti i dati in</value>
         <value xml:lang="th">เขียน XML สำหรับข้อมูลทั้งหมดใน</value>
     </property>
-    <property key="WebtoolsMessage2">
-        <value xml:lang="en">The exported documents will have a root tag of "&lt;entity-engine-xml&gt;"</value>
-        <value xml:lang="fr">Les documents exportés auront une balise de racine de "&lt;entity-engine-xml&gt;"</value>
-        <value xml:lang="it">I documenti esportati avranno un root tag "&lt;entity-engine-xml&gt;"</value>
-        <value xml:lang="ro">Documentele exportate vor avea un root tag "&lt;entity-engine-xml&gt;"</value>
-        <value xml:lang="th">การส่งเอกสารจะต้องใช้รูทแท็กของ "&lt;entity-engine-xml&gt;"</value>
-        <value xml:lang="zh">导出的文档会有一个"&lt;entity-engine-xml&gt;"的根标签</value>
+    <property key="WebtoolsMessage1">
+        <value xml:lang="en">This page can be used to export data from the database </value>
+        <value xml:lang="fr">Cette page peut être utilisée pour exporter des données depuis la base</value>
+        <value xml:lang="it">Questa pagine può essere usata per esportare i dati dal database</value>
+        <value xml:lang="ro">Aceasta pagina poate fi folosita pentru exportarea datelor din  database</value>
+        <value xml:lang="th">หน้านี้ใช้การส่งออกข้อมูลจากฐานข้อมูล</value>
+        <value xml:lang="zh">本页面用于从数据库导出数据 </value>
     </property>
     <property key="WebtoolsMessage20">
         <value xml:lang="en">Wrote</value>
@@ -1834,13 +1817,13 @@
         <value xml:lang="it">NOTA: Questi risultati delle prestazioni potrebbero variare in base ai differenti database,</value>
         <value xml:lang="th">หมายเหตุ:การกระทำเหล่านี้อาจจะเป็นผลให้เกิดการซื้อขายที่ดีสำหรับความแตกต่าง</value>
     </property>
-    <property key="WebtoolsMessage3">
-        <value xml:lang="en">There will be one file for each Entity in the configured delegator for this webapp</value>
-        <value xml:lang="fr">Il y aura un dossier pour chaque entité dans le delegator configuré pour cette webapp</value>
-        <value xml:lang="it">C'è un file per ogni Entità nel delegator configurato per questa applicazione web</value>
-        <value xml:lang="ro">Exista un file pentru orice Entitate din delegatorul configurat pentru aceasta aplicatie web.</value>
-        <value xml:lang="th">มี 1 ไฟล์สำหรับตัวอย่าง Entity ในการสร้างตัวแทนสำหรับโปรแกรมประยุกต์นี้</value>
-        <value xml:lang="zh">在为这个应用配置的代表中，会对每个实体有一个文件。</value>
+    <property key="WebtoolsMessage2">
+        <value xml:lang="en">The exported documents will have a root tag of "&lt;entity-engine-xml&gt;"</value>
+        <value xml:lang="fr">Les documents exportés auront une balise de racine de "&lt;entity-engine-xml&gt;"</value>
+        <value xml:lang="it">I documenti esportati avranno un root tag "&lt;entity-engine-xml&gt;"</value>
+        <value xml:lang="ro">Documentele exportate vor avea un root tag "&lt;entity-engine-xml&gt;"</value>
+        <value xml:lang="th">การส่งเอกสารจะต้องใช้รูทแท็กของ "&lt;entity-engine-xml&gt;"</value>
+        <value xml:lang="zh">导出的文档会有一个"&lt;entity-engine-xml&gt;"的根标签</value>
     </property>
     <property key="WebtoolsMessage30">
         <value xml:lang="en">databases, JDBC drivers, JTA implementations (transaction managers), connection pools, </value>
@@ -1862,6 +1845,14 @@
         <value xml:lang="it">server hardware, connessioni di rete).</value>
         <value xml:lang="th">server ฮาร์ดแวร์,เชื่อมโยงเครือข่าย).</value>
     </property>
+    <property key="WebtoolsMessage3">
+        <value xml:lang="en">There will be one file for each Entity in the configured delegator for this webapp</value>
+        <value xml:lang="fr">Il y aura un dossier pour chaque entité dans le delegator configuré pour cette webapp</value>
+        <value xml:lang="it">C'è un file per ogni Entità nel delegator configurato per questa applicazione web</value>
+        <value xml:lang="ro">Exista un file pentru orice Entitate din delegatorul configurat pentru aceasta aplicatie web.</value>
+        <value xml:lang="th">มี 1 ไฟล์สำหรับตัวอย่าง Entity ในการสร้างตัวแทนสำหรับโปรแกรมประยุกต์นี้</value>
+        <value xml:lang="zh">在为这个应用配置的代表中，会对每个实体有一个文件。</value>
+    </property>
     <property key="WebtoolsMessage4">
         <value xml:lang="en">Complete XML document (root tag: entity-engine-xml)</value>
         <value xml:lang="fr">Compléter le document XML (balise racine : entity-engine-xml)(</value>
@@ -2306,12 +2297,6 @@
         <value xml:lang="th">Pop up หน้าหลักเครื่องมือพัฒนาเว็บ</value>
         <value xml:lang="zh">弹出Web工具首页</value>
     </property>
-    <property key="WebtoolsPreConfiguredSet">
-        <value xml:lang="en">Pre-configured set</value>
-        <value xml:lang="fr">Ensemble pré-configuré</value>
-        <value xml:lang="it">Impostazioni Pre-configurate</value>
-        <value xml:lang="th">ตั้งค่าก่อนการสร้าง</value>
-    </property>
     <property key="WebtoolsPreConfiguredSet1">
         <value xml:lang="en">Catalog Export</value>
         <value xml:lang="fr">Exporter le catalogue</value>
@@ -2342,6 +2327,12 @@
         <value xml:lang="it">Prodotti Parte 4</value>
         <value xml:lang="th">สินค้าส่วนที่ 4</value>
     </property>
+    <property key="WebtoolsPreConfiguredSet">
+        <value xml:lang="en">Pre-configured set</value>
+        <value xml:lang="fr">Ensemble pré-configuré</value>
+        <value xml:lang="it">Impostazioni Pre-configurate</value>
+        <value xml:lang="th">ตั้งค่าก่อนการสร้าง</value>
+    </property>
     <property key="WebtoolsPriority">
         <value xml:lang="de">Dringlichkeit</value>
         <value xml:lang="en">Priority</value>
@@ -3076,14 +3067,6 @@
         <value xml:lang="th">การเลือกระดับในการกำหนดเวลาที่เหมาะสมที่สุดโดยข้อมูลจำนวนมากผลลัพธ์ที่ได้จะใช้แก้ไขข้อผิดพลาดของแอพพลิเคชั่น</value>
         <value xml:lang="zh">Timing（定时）级别会细颗粒地指出应用程序进行情况的信息，适于调试程序。</value>
     </property>
-    <property key="WebtoolsTitle">
-        <value xml:lang="en">Title</value>
-        <value xml:lang="fr">Titre</value>
-        <value xml:lang="it">Titolo</value>
-        <value xml:lang="ro">Titlu</value>
-        <value xml:lang="th">หัวเรื่อง</value>
-        <value xml:lang="zh">标题</value>
-    </property>
     <property key="WebtoolsTitle1">
         <value xml:lang="en">The purpose of this Web Tools administration package is to contain all of the</value>
         <value xml:lang="fr">Le but de cet d'ensemble d'outils Web d'administration est de contenir tout les outils</value>
@@ -3132,6 +3115,14 @@
         <value xml:lang="th">ความพึงพอใจและความรู้ความสามารถในการจัดการ วิเคราะห์ข้อมูล พัฒนาไปข้างหน้าอย่างเต็มที่</value>
         <value xml:lang="zh">内容和知识管理、数据分析等。</value>
     </property>
+    <property key="WebtoolsTitle">
+        <value xml:lang="en">Title</value>
+        <value xml:lang="fr">Titre</value>
+        <value xml:lang="it">Titolo</value>
+        <value xml:lang="ro">Titlu</value>
+        <value xml:lang="th">หัวเรื่อง</value>
+        <value xml:lang="zh">标题</value>
+    </property>
     <property key="WebtoolsToFindAll">
         <value xml:lang="en">To find ALL of Entity</value>
         <value xml:lang="fr">Pour trouver TOUT sur l'entité </value>
@@ -3245,6 +3236,15 @@
         <value xml:lang="th">ดูข้อมูลการจดบันทึก</value>
         <value xml:lang="zh">浏览日志</value>
     </property>
+    <property key="WebtoolsViewPermissionError">
+        <value xml:lang="en">You do not have permission to view this page. ("OFBTOOLS_VIEW" or "OFBTOOLS_ADMIN" needed)</value>
+        <value xml:lang="fr">Vous n'avez pas l'autorisation de voir cette page ("OFBTOOLS_VIEW" ou "OFBTOOLS_ADMIN" nécessaire)</value>
+        <value xml:lang="it">Non sei autorizzato a vedere questa pagina. (Necessario permesso "OFBTOOLS_VIEW" o "OFBTOOLS_ADMIN")</value>
+        <value xml:lang="ro">Nu esti autorizat sa vezi aceasta pagina. (Este necesar Permisul "OFBTOOLS_VIEW" sau "OFBTOOLS_ADMIN")</value>
+        <value xml:lang="ru">У вас нет прав для просмотра этой страницы. (необходимы права "OFBTOOLS_VIEW" или "OFBTOOLS_ADMIN")</value>
+        <value xml:lang="th">คุณไม่ได้รับอนุญาตให้เข้าดูหน้านี้ได้ (หน้า "OFBTOOLS_VIEW" หรือ "OFBTOOLS_ADMIN" ที่ต้องการ)</value>
+        <value xml:lang="zh">你没有浏览这个页面的权限。(需要"OFBTOOLS_VIEW"或"OFBTOOLS_ADMIN")</value>
+    </property>
     <property key="WebtoolsViewRelations">
         <value xml:lang="en">View Relations</value>
         <value xml:lang="fr">Voir les relations</value>

Modified: ofbiz/trunk/framework/webtools/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/servicedef/services.xml?rev=739955&r1=739954&r2=739955&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/servicedef/services.xml (original)
+++ ofbiz/trunk/framework/webtools/servicedef/services.xml Mon Feb  2 10:17:34 2009
@@ -132,11 +132,13 @@
              invoke="updateLabelKey" auth="true" use-transaction="false">
         <description>Update Label Key</description>
         <attribute name="key" type="String" mode="IN" optional="true"/>
+        <attribute name="keyComment" type="String" mode="IN" optional="true"/>
         <attribute name="update_label" type="String" mode="IN" optional="false"/>
         <attribute name="fileName" type="String" mode="IN" optional="false"/>
         <attribute name="confirm" type="String" mode="IN" optional="true"/>
         <attribute name="removeLabel" type="String" mode="IN" optional="true"/>
         <attribute name="localeNames" type="List" mode="IN" optional="true"/>
         <attribute name="localeValues" type="List" mode="IN" optional="true"/>
+        <attribute name="localeComments" type="List" mode="IN" optional="true"/>
     </service>
 </services>

Modified: ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelInfo.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelInfo.java?rev=739955&r1=739954&r2=739955&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelInfo.java (original)
+++ ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelInfo.java Mon Feb  2 10:17:34 2009
@@ -31,21 +31,31 @@
     public static final String module = LabelInfo.class.getName();
     
     protected String labelKey = "";
+    protected String labelKeyComment = "";
     protected String fileName = "";
-    protected String componentName = "";
-    protected Map<String, String> labelValues = FastMap.newInstance();
+    protected String componentName = "";    
+    protected Map<String, LabelValue> labelValues = FastMap.newInstance();
     
-    public LabelInfo(String labelKey, String fileName, String componentName, String localeStr, String labelValue) throws GeneralException {
+    public LabelInfo(String labelKey, String labelKeyComment, String fileName, String componentName, String localeStr, String labelValue, String labelComment) throws GeneralException {
         this.labelKey = labelKey;
+        this.labelKeyComment = labelKeyComment;
         this.fileName = fileName;
         this.componentName = componentName;
-        setLabelValue(localeStr, labelValue, false);
+        setLabelValue(localeStr, labelValue, labelComment, false);
     }
     
     public String getLabelKey() {
         return labelKey;
     }
     
+    public String getLabelKeyComment() {
+        return labelKeyComment;
+    }
+    
+    public void setLabelKeyComment(String labelKeyComment) {
+        this.labelKeyComment = labelKeyComment;
+    }    
+    
     public String getFileName() {
         return fileName;
     }
@@ -54,26 +64,29 @@
         return componentName;
     }
     
-    public String getLabelValue(String localeStr) {
-       return (String)labelValues.get(localeStr);
+    public LabelValue getLabelValue(String localeStr) {
+       return (LabelValue)labelValues.get(localeStr);
     }
     
     public int getLabelValueSize() {
        return labelValues.size();    
     }
 
-    public boolean setLabelValue(String localeStr, String labelValue, boolean update) {
-        String localeFound = getLabelValue(localeStr);
+    public boolean setLabelValue(String localeStr, String labelValue, String labelComment, boolean update) {
+        LabelValue localeFound = getLabelValue(localeStr);
         boolean isDuplicatedLocales = false;
         
         if (UtilValidate.isEmpty(localeFound)) {
             if (UtilValidate.isNotEmpty(labelValue)) {
-                labelValues.put(localeStr, labelValue);
+                localeFound = new LabelValue(labelValue, labelComment);
+                labelValues.put(localeStr, localeFound);
             }
         } else {
             if (update) {
                 if (UtilValidate.isNotEmpty(labelValue)) {
-                    labelValues.put(localeStr, labelValue);
+                    localeFound.setLabelValue(labelValue);
+                    localeFound.setLabelComment(labelComment);
+                    labelValues.put(localeStr, localeFound);
                 } else {
                     labelValues.remove(localeStr);
                 }

Modified: ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelManagerFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelManagerFactory.java?rev=739955&r1=739954&r2=739955&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelManagerFactory.java (original)
+++ ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelManagerFactory.java Mon Feb  2 10:17:34 2009
@@ -31,6 +31,7 @@
 import org.ofbiz.base.component.ComponentConfig;
 import org.ofbiz.base.util.FileUtil;
 import org.ofbiz.base.util.GeneralException;
+import org.ofbiz.base.util.StringUtil;
 import org.ofbiz.base.util.UtilGenerics;
 import org.ofbiz.base.util.UtilMisc;
 import org.ofbiz.base.util.UtilProperties;
@@ -41,8 +42,10 @@
 import org.ofbiz.service.DispatchContext;
 import org.ofbiz.service.ServiceUtil;
 
+import org.w3c.dom.Comment;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
+import org.w3c.dom.Node;
 
 public class LabelManagerFactory {
 
@@ -101,27 +104,41 @@
                     String fileName = resourceFile.getName();
                     Document resourceDocument = UtilXml.readXmlDocument(resourceFile.toURI().toURL());
                     Element resourceElem = resourceDocument.getDocumentElement();
+                    String labelKeyComment = "";
                     
-                    for (Element propertyElem: UtilXml.childElementList(resourceElem, "property")) {
-                        String labelKey = propertyElem.getAttribute("key");                            
-                        
-                        for (Element valueElem: UtilXml.childElementList(propertyElem, "value")) {
-                            String localeName = valueElem.getAttribute("xml:lang");
-                            String labelValue = UtilXml.elementValue(valueElem);
-                            LabelInfo label = (LabelInfo)labels.get(labelKey + keySeparator + fileName);
+                    for (Node propertyNode: UtilXml.childNodeList(resourceElem.getFirstChild())) {     
+                        if (propertyNode instanceof Element) {
+                            Element propertyElem = (Element)propertyNode;
+                            String labelKey = StringUtil.htmlSpecialChars(propertyElem.getAttribute("key"), true, true, false);
+                            String labelComment = "";
                             
-                            if (UtilValidate.isEmpty(label)) {
-                                label = new LabelInfo(labelKey, fileName, componentName, localeName, labelValue);
-                                labels.put(labelKey + keySeparator + fileName, label);
-                            } else {
-                                if (label.setLabelValue(localeName, labelValue, false)) {
-                                    duplicatedLocales++;
+                            for (Node valueNode: UtilXml.childNodeList(propertyElem.getFirstChild())) {
+                                if (valueNode instanceof Element) {
+                                    Element valueElem = (Element)valueNode;
+                                    String localeName = valueElem.getAttribute("xml:lang");
+                                    String labelValue = StringUtil.htmlSpecialChars(UtilXml.nodeValue(valueElem.getFirstChild()), true, true, false);
+                                    LabelInfo label = (LabelInfo)labels.get(labelKey + keySeparator + fileName);
+                                    
+                                    if (UtilValidate.isEmpty(label)) {
+                                        label = new LabelInfo(labelKey, labelKeyComment, fileName, componentName, localeName, labelValue, labelComment);
+                                        labels.put(labelKey + keySeparator + fileName, label);
+                                    } else {
+                                        if (label.setLabelValue(localeName, labelValue, labelComment, false)) {
+                                            duplicatedLocales++;
+                                        }
+                                    }
+                                    localesFound.add(localeName);
+                                    componentNamesFound.add(componentName);
+                                    fileNamesFound.put(fileName, resourceFile.toURI().toString());
+                                    fileComponent.put(fileName, componentName);                                    
+                                    labelComment = "";                                    
+                                } else if (valueNode instanceof Comment) {
+                                    labelComment = labelComment + StringUtil.htmlSpecialChars(valueNode.getNodeValue(), true, true, false);
                                 }
-                            }
-                            localesFound.add(localeName);
-                            componentNamesFound.add(componentName);
-                            fileNamesFound.put(fileName, resourceFile.toURI().toString());
-                            fileComponent.put(fileName, componentName);
+                            }                            
+                            labelKeyComment = "";
+                        } else if (propertyNode instanceof Comment) {
+                            labelKeyComment = labelKeyComment + StringUtil.htmlSpecialChars(propertyNode.getNodeValue(), true, true, false);
                         }
                     }
                 }
@@ -168,12 +185,14 @@
     
     public static Map<String, Object> updateLabelKey(DispatchContext dctx, Map<String, ? extends Object> context) {
         String key = (String)context.get("key");
+        String keyComment = (String)context.get("keyComment");
         String update_label = (String)context.get("update_label");
         String fileName = (String)context.get("fileName");
         String confirm = (String)context.get("confirm");
         String removeLabel = (String)context.get("removeLabel");
         List<String> localeNames = UtilGenerics.cast(context.get("localeNames"));
         List<String> localeValues = UtilGenerics.cast(context.get("localeValues"));
+        List<String> localeComments = UtilGenerics.cast(context.get("localeComments"));
         Locale locale = (Locale) context.get("locale");
         
         // Remove a Label
@@ -185,7 +204,7 @@
             // Update a Label
             if (update_label.equalsIgnoreCase("Y")) {
                 if (UtilValidate.isNotEmpty(label)) {
-                    updateLabelValue(localeNames, localeValues, label, key, fileName);
+                    updateLabelValue(localeNames, localeValues, localeComments, label, key, keyComment, fileName);
                 }
             // Insert a new Label
             } else {
@@ -195,7 +214,7 @@
                     if (UtilValidate.isEmpty(key)) {
                         return ServiceUtil.returnError(UtilProperties.getMessage(resource, "WebtoolsLabelManagerNewLabelEmptyKey", locale));
                     } else {
-                        int notEmptyLabels = updateLabelValue(localeNames, localeValues, null, key, fileName);
+                        int notEmptyLabels = updateLabelValue(localeNames, localeValues, localeComments, null, key, keyComment, fileName);
                         if (notEmptyLabels == 0) {
                             return ServiceUtil.returnError(UtilProperties.getMessage(resource, "WebtoolsLabelManagerNewLabelEmpty", locale));
                         }
@@ -207,24 +226,27 @@
         return ServiceUtil.returnSuccess();
     }
     
-    private static int updateLabelValue(List<String> localeNames, List<String> localeValues, LabelInfo label, String key, String fileName) {
+    private static int updateLabelValue(List<String> localeNames, List<String> localeValues, List<String> localeComments, LabelInfo label, String key, String keyComment, String fileName) {
         int notEmptyLabels = 0;
         int i = 0;
         while (i < localeNames.size()) {
             String localeName = (String)localeNames.get(i);
             String localeValue = (String)localeValues.get(i);
+            String localeComment = (String)localeComments.get(i);
             
-            if (UtilValidate.isNotEmpty(localeValue)) {
+            if (UtilValidate.isNotEmpty(localeValue) || UtilValidate.isNotEmpty(localeComment)) {
                 if (label == null) {
                     try {
                         String componentName = getFileComponent(fileName);
-                        label = new LabelInfo(key, fileName, componentName, localeName, localeValue);
+                        label = new LabelInfo(key, keyComment, fileName, componentName, localeName, localeValue, localeComment);
                         labels.put(key + keySeparator + fileName, label);
                     } catch(Exception e) {
                         e.printStackTrace();
                     }
+                } else {
+                    label.setLabelKeyComment(keyComment);
                 }
-                label.setLabelValue(localeName, localeValue, true);
+                label.setLabelValue(localeName, localeValue, localeComment, true);
                 notEmptyLabels++;
             }
             i++;

Added: ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelValue.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelValue.java?rev=739955&view=auto
==============================================================================
--- ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelValue.java (added)
+++ ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelValue.java Mon Feb  2 10:17:34 2009
@@ -0,0 +1,48 @@
+/*
+ * 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.
+ */
+package org.ofbiz.webtools.labelmanager;
+
+public class LabelValue {
+
+    public static final String module = LabelValue.class.getName();
+
+    protected String labelValue = "";
+    protected String labelComment = "";
+
+    public LabelValue(String labelValue, String labelComment) {
+        this.labelValue = labelValue;
+        this.labelComment = labelComment;
+    }
+
+    public String getLabelValue() {
+        return labelValue;
+    }
+
+    public String getLabelComment() {
+        return labelComment;
+    }
+
+    public void setLabelValue(String labelValue) {
+        this.labelValue = labelValue;
+    }
+
+    public void setLabelComment(String labelComment) {
+        this.labelComment = labelComment;
+    }
+}