svn commit: r755394 - in /ofbiz/trunk/framework: common/config/ common/widget/ example/config/ example/widget/example/ exampleext/widget/example/ webtools/config/ webtools/webapp/webtools/entity/ webtools/webapp/webtools/tempexpr/ webtools/webapp/webto...

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r755394 - in /ofbiz/trunk/framework: common/config/ common/widget/ example/config/ example/widget/example/ exampleext/widget/example/ webtools/config/ webtools/webapp/webtools/entity/ webtools/webapp/webtools/tempexpr/ webtools/webapp/webto...

jleroux@apache.org
Author: jleroux
Date: Tue Mar 17 21:01:43 2009
New Revision: 755394

URL: http://svn.apache.org/viewvc?rev=755394&view=rev
Log:
Marco's LabelsReferences8.patch : "New tool to get labels information." (https://issues.apache.org/jira/browse/OFBIZ-2070) - OFBIZ-2070



Modified:
    ofbiz/trunk/framework/common/config/CommonUiLabels.xml
    ofbiz/trunk/framework/common/widget/PortalPageForms.xml
    ofbiz/trunk/framework/common/widget/PortalPageScreens.xml
    ofbiz/trunk/framework/example/config/ExampleEntityLabels.xml
    ofbiz/trunk/framework/example/config/ExampleUiLabels.xml
    ofbiz/trunk/framework/example/widget/example/ExampleForms.xml
    ofbiz/trunk/framework/example/widget/example/ExampleMenus.xml
    ofbiz/trunk/framework/example/widget/example/FormWidgetExampleForms.xml
    ofbiz/trunk/framework/example/widget/example/FormWidgetExampleScreens.xml
    ofbiz/trunk/framework/example/widget/example/PortletScreens.xml
    ofbiz/trunk/framework/exampleext/widget/example/ExampleForms.xml
    ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml
    ofbiz/trunk/framework/webtools/webapp/webtools/entity/FindGeneric.ftl
    ofbiz/trunk/framework/webtools/webapp/webtools/entity/ViewGeneric.ftl
    ofbiz/trunk/framework/webtools/webapp/webtools/entity/ViewRelations.ftl
    ofbiz/trunk/framework/webtools/webapp/webtools/tempexpr/tempExprForms.xml
    ofbiz/trunk/framework/webtools/webapp/webtools/workflow/workflowMonitor.ftl
    ofbiz/trunk/framework/webtools/widget/EntityScreens.xml

Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.xml?rev=755394&r1=755393&r2=755394&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonUiLabels.xml Tue Mar 17 21:01:43 2009
@@ -4731,6 +4731,22 @@
         <value xml:lang="zh">人员</value>
         <value xml:lang="zh_CN">人</value>
     </property>
+    <property key="CommonPortalCategoryPage">
+        <value xml:lang="en">Category of portlet pages for application</value>
+        <value xml:lang="it">Categoria di pagine portale per applicazione</value>
+    </property>
+    <property key="CommonPortalEditPage">
+        <value xml:lang="en">Edit portal page</value>
+        <value xml:lang="it">Aggiorna pagina portale</value>
+    </property>
+    <property key="CommonPortalNewPage">
+        <value xml:lang="en">Add a new portal Page</value>
+        <value xml:lang="it">Aggiungi una nuova pagina portale</value>
+    </property>
+    <property key="CommonPortalPagesForApplication">
+        <value xml:lang="en">Portal pages for application</value>
+        <value xml:lang="it">Pagine porale per applicazione</value>
+    </property>
     <property key="CommonPostedBy">
         <value xml:lang="ar">مرسلة من</value>
         <value xml:lang="de">Übermittelt von</value>
@@ -7758,6 +7774,14 @@
         <value xml:lang="th">สร้างวันที่</value>
         <value xml:lang="zh">创建日期</value>
     </property>
+    <property key="FormFieldTitle_createdTxStamp">
+        <value xml:lang="en">Created Tx Stamp</value>
+        <value xml:lang="it">Data/ora creazione</value>
+    </property>
+    <property key="FormFieldTitle_createdByUserLoginId">
+        <value xml:lang="en">Created By User Login Id</value>
+        <value xml:lang="it">Creato dall'utente</value>
+    </property>
     <property key="FormFieldTitle_currencyUomId">
         <value xml:lang="ar">العملة</value>
         <value xml:lang="de">Währung</value>
@@ -7772,6 +7796,10 @@
         <value xml:lang="th">สกุลเงิน</value>
         <value xml:lang="zh">币种</value>
     </property>
+    <property key="FormFieldTitle_currentRecurrenceCount">
+        <value xml:lang="en">Current Recurrence Count</value>
+        <value xml:lang="it">Conteggio attuale ricorrenze</value>
+    </property>
     <property key="FormFieldTitle_currentStatusId">
         <value xml:lang="de">Aktuelle Status ID</value>
         <value xml:lang="en">Current Status Id</value>
@@ -7893,6 +7921,10 @@
         <value xml:lang="th">วันสุดท้ายของการปรับปรุง</value>
         <value xml:lang="zh">上次修改日期</value>
     </property>
+    <property key="FormFieldTitle_lastUpdatedTxStamp">
+        <value xml:lang="en">Last Updated Tx Stamp</value>
+        <value xml:lang="it">Ultimo aggiornamento data/ora</value>
+    </property>    
     <property key="FormFieldTitle_lineTotal">
         <value xml:lang="ar">مجموع السطر</value>
         <value xml:lang="de">Zeilentotal</value>
@@ -7907,6 +7939,14 @@
         <value xml:lang="th">ผลรวม</value>
         <value xml:lang="zh">行小计</value>
     </property>
+    <property key="FormFieldTitle_maxRecurrenceCount">
+        <value xml:lang="en">Max Recurrence Count</value>
+        <value xml:lang="it">Conteggio massimo ricorrenze</value>
+    </property>
+    <property key="FormFieldTitle_modifiedByUserLoginId">
+        <value xml:lang="en">Modified By User Login Id</value>
+        <value xml:lang="it">Modificato dall'utente</value>
+    </property>
     <property key="FormFieldTitle_price">
         <value xml:lang="ar">السعر</value>
         <value xml:lang="de">Preis</value>

Modified: ofbiz/trunk/framework/common/widget/PortalPageForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/PortalPageForms.xml?rev=755394&r1=755393&r2=755394&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/PortalPageForms.xml (original)
+++ ofbiz/trunk/framework/common/widget/PortalPageForms.xml Tue Mar 17 21:01:43 2009
@@ -26,14 +26,14 @@
         <field name="portalPageId" title="${uiLabelMap.CommonEdit}">
             <hyperlink description="${uiLabelMap.CommonEdit}" target="ManagePortalPages?portalPageId=${portalPageId}&amp;parentPortalPageId=${parameters.parentPortalPageId}"/>
         </field>
-        <field name="top" title=" " use-when="(ownerUserLoginId.equals(&quot;_NA_&quot;))||(sequenceNum == ${parameters.sequenceNumMin})"><hyperlink target="" description=""/></field>
-        <field name="bot" title=" " use-when="(ownerUserLoginId.equals(&quot;_NA_&quot;))||(sequenceNum &gt;= ${parameters.sequenceNumMax})"><hyperlink target="" description=""/></field>
-        <field name="up" title=" " use-when="(ownerUserLoginId.equals(&quot;_NA_&quot;))||(sequenceNum == ${parameters.sequenceNumMin})"><hyperlink target="" description=""/></field>
-        <field name="dwn" title=" " use-when="(ownerUserLoginId.equals(&quot;_NA_&quot;))||(sequenceNum &gt;= ${parameters.sequenceNumMax})"><hyperlink target="" description=""/></field>      
-        <field name="top" title=" " use-when="(!ownerUserLoginId.equals(&quot;_NA_&quot;))&amp;&amp;(sequenceNum &gt; ${parameters.sequenceNumMin})"><hyperlink target="updatePortalPageSeq?mode=TOP&amp;portalPageId=${portalPageId}&amp;parentPortalPageId=${parameters.parentPortalPageId}" image-location="/images/arrow-end-up-green.png"/></field>
-        <field name="bot" title=" " use-when="(!ownerUserLoginId.equals(&quot;_NA_&quot;))&amp;&amp;(sequenceNum &lt; ${parameters.sequenceNumMax})"><hyperlink target="updatePortalPageSeq?mode=BOT&amp;portalPageId=${portalPageId}&amp;parentPortalPageId=${parameters.parentPortalPageId}" image-location="/images/arrow-end-down-green.png"/></field>
-        <field name="up" title=" " use-when="(!ownerUserLoginId.equals(&quot;_NA_&quot;))&amp;&amp;(sequenceNum &gt; ${parameters.sequenceNumMin})"><hyperlink target="updatePortalPageSeq?mode=UP&amp;portalPageId=${portalPageId}&amp;parentPortalPageId=${parameters.parentPortalPageId}" image-location="/images/arrow-single-up-green.png"/></field>
-        <field name="dwn" title=" " use-when="(!ownerUserLoginId.equals(&quot;_NA_&quot;))&amp;&amp;(sequenceNum &lt; ${parameters.sequenceNumMax})"><hyperlink target="updatePortalPageSeq?mode=DWN&amp;portalPageId=${portalPageId}&amp;parentPortalPageId=${parameters.parentPortalPageId}" image-location="/images/arrow-single-down-green.png"/></field>
+        <field name="top" title="${uiLabelMap.CommonEmptyHeader}" use-when="(ownerUserLoginId.equals(&quot;_NA_&quot;))||(sequenceNum == ${parameters.sequenceNumMin})"><hyperlink target="" description=""/></field>
+        <field name="bot" title="${uiLabelMap.CommonEmptyHeader}" use-when="(ownerUserLoginId.equals(&quot;_NA_&quot;))||(sequenceNum &gt;= ${parameters.sequenceNumMax})"><hyperlink target="" description=""/></field>
+        <field name="up" title="${uiLabelMap.CommonEmptyHeader}" use-when="(ownerUserLoginId.equals(&quot;_NA_&quot;))||(sequenceNum == ${parameters.sequenceNumMin})"><hyperlink target="" description=""/></field>
+        <field name="dwn" title="${uiLabelMap.CommonEmptyHeader}" use-when="(ownerUserLoginId.equals(&quot;_NA_&quot;))||(sequenceNum &gt;= ${parameters.sequenceNumMax})"><hyperlink target="" description=""/></field>      
+        <field name="top" title="${uiLabelMap.CommonEmptyHeader}" use-when="(!ownerUserLoginId.equals(&quot;_NA_&quot;))&amp;&amp;(sequenceNum &gt; ${parameters.sequenceNumMin})"><hyperlink target="updatePortalPageSeq?mode=TOP&amp;portalPageId=${portalPageId}&amp;parentPortalPageId=${parameters.parentPortalPageId}" image-location="/images/arrow-end-up-green.png"/></field>
+        <field name="bot" title="${uiLabelMap.CommonEmptyHeader}" use-when="(!ownerUserLoginId.equals(&quot;_NA_&quot;))&amp;&amp;(sequenceNum &lt; ${parameters.sequenceNumMax})"><hyperlink target="updatePortalPageSeq?mode=BOT&amp;portalPageId=${portalPageId}&amp;parentPortalPageId=${parameters.parentPortalPageId}" image-location="/images/arrow-end-down-green.png"/></field>
+        <field name="up" title="${uiLabelMap.CommonEmptyHeader}" use-when="(!ownerUserLoginId.equals(&quot;_NA_&quot;))&amp;&amp;(sequenceNum &gt; ${parameters.sequenceNumMin})"><hyperlink target="updatePortalPageSeq?mode=UP&amp;portalPageId=${portalPageId}&amp;parentPortalPageId=${parameters.parentPortalPageId}" image-location="/images/arrow-single-up-green.png"/></field>
+        <field name="dwn" title="${uiLabelMap.CommonEmptyHeader}" use-when="(!ownerUserLoginId.equals(&quot;_NA_&quot;))&amp;&amp;(sequenceNum &lt; ${parameters.sequenceNumMax})"><hyperlink target="updatePortalPageSeq?mode=DWN&amp;portalPageId=${portalPageId}&amp;parentPortalPageId=${parameters.parentPortalPageId}" image-location="/images/arrow-single-down-green.png"/></field>
         <field name="portalPageName" use-when="ownerUserLoginId.equals(&quot;_NA_&quot;)" title="${uiLabelMap.CommonName}" sort-field="true"><display/></field>
         <field name="portalPageName" use-when="!ownerUserLoginId.equals(&quot;_NA_&quot;)" title="${uiLabelMap.CommonName}" id-name="portalPageName" widget-style="tabletext" sort-field="true">
             <display>

Modified: ofbiz/trunk/framework/common/widget/PortalPageScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/PortalPageScreens.xml?rev=755394&r1=755393&r2=755394&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/PortalPageScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/PortalPageScreens.xml Tue Mar 17 21:01:43 2009
@@ -61,10 +61,10 @@
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <screenlet title="Portal pages for application: ${parameters.parentPortalPageId}">
+                        <screenlet title="${uiLabelMap.CommonPortalPagesForApplication}: ${parameters.parentPortalPageId}">
                             <include-form name="ListPortalPages" location="component://common/widget/PortalPageForms.xml"/>
                         </screenlet>
-                        <screenlet title="Add a new portal Page">
+                        <screenlet title="${uiLabelMap.CommonPortalNewPage}">
                             <include-form name="NewPortalPage" location="component://common/widget/PortalPageForms.xml"/>
                         </screenlet>
                         <section>
@@ -84,7 +84,7 @@
                                 </entity-condition>
                             </actions>
                             <widgets>
-                                <screenlet title="Edit portal page: ${portalPage.portalPageName} [${portalPage.portalPageId}]">
+                                <screenlet title="${uiLabelMap.CommonPortalEditPage}: ${portalPage.portalPageName} [${portalPage.portalPageId}]">
                                     <link target="addPortalPageColumn?portalPageId=${portalPage.portalPageId}&amp;parentPortalPageId=${portalPage.parentPortalPageId}" text="${uiLabelMap.CommonAddColumn}" style="buttontext"/>
                                     <platform-specific><html><html-template location="component://common/webcommon/portal/editPortalPage.ftl"/></html></platform-specific>
                                 </screenlet>
@@ -123,8 +123,8 @@
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">                        
-                        <screenlet title="Category of portlet pages for application: ${parameters.parentPortalPageId}">
+                    <decorator-section name="body">
+                        <screenlet title="${uiLabelMap.CommonPortalCategoryPage}: ${parameters.parentPortalPageId}">
                             <include-form name="PortletCategoryAndPortlet" location="component://common/widget/PortalPageForms.xml"/>
                         </screenlet>
                         <platform-specific><html><html-template location="component://common/webcommon/portal/listPortalPortlets.ftl"/></html></platform-specific>

Modified: ofbiz/trunk/framework/example/config/ExampleEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/config/ExampleEntityLabels.xml?rev=755394&r1=755393&r2=755394&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/config/ExampleEntityLabels.xml (original)
+++ ofbiz/trunk/framework/example/config/ExampleEntityLabels.xml Tue Mar 17 21:01:43 2009
@@ -40,13 +40,13 @@
     <property key="ExampleType.description.CONTRIVED">
         <value xml:lang="en">Contrived</value>
         <value xml:lang="fr">Arrangé</value>
-        <value xml:lang="it">Contrived</value>
+        <value xml:lang="it">Inventato</value>
         <value xml:lang="th">เป็นไปตามที่วางแผนไว้</value>
     </property>
     <property key="ExampleType.description.INSPIRED">
         <value xml:lang="en">Inspired</value>
         <value xml:lang="fr">Inspiré</value>
-        <value xml:lang="it">Inspirato</value>
+        <value xml:lang="it">Ispirato</value>
         <value xml:lang="th">ยอดเยี่ยม</value>
     </property>
     <property key="ExampleType.description.MADE_UP">

Modified: ofbiz/trunk/framework/example/config/ExampleUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/config/ExampleUiLabels.xml?rev=755394&r1=755393&r2=755394&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/config/ExampleUiLabels.xml (original)
+++ ofbiz/trunk/framework/example/config/ExampleUiLabels.xml Tue Mar 17 21:01:43 2009
@@ -62,19 +62,172 @@
         <value xml:lang="pt_BR">Parte da família OfBiz de software de fonte aberta</value>
         <!--value xml:lang="pt_PT">Parte do Software de Fonte Aberta para Grupos Abertos Para o Negócio</value-->
         <value xml:lang="pt_PT">Parte da família OfBiz de software de fonte aberta</value>
-        <!--value xml:lang="ro">Parte accesibila pentru Business Family of Open Source Software</value-->
-        <!--value xml:lang="ro">Parte din Open for Business Family of Open Source Software</value-->
+        <!--value xml:lang="ro">Parte accesibila pentru Business Family of Open Source Software</valuevalue xml:lang="ro">Parte din Open for Business Family of Open Source Software</value-->
         <value xml:lang="ro">Partea de Deschidere Pentru Afaceri Familiale din Open Source Software</value>
-        <!--value xml:lang="ru">Часть семейства ПО Open For Business</value-->
-        <!--value xml:lang="ru">Часть семейства "Open For Business Family" программных продуктов Open Source </value-->
+        <!--value xml:lang="ru">Часть семейства ПО Open For Business</valuevalue xml:lang="ru">Часть семейства "Open For Business Family" программных продуктов Open Source </value-->
         <value xml:lang="ru">Входит в состав семейства Open For Business</value>
         <!--value xml:lang="th">เป็นส่วนหนึ่งของธุรกิจแบบครอบครัวที่เป็นซอฟต์แวร์โอเพนซอส</value-->
         <value xml:lang="th">ส่วนหนึ่งของธุรกิจแบบครอบครัวที่เป็นซอฟต์แวร์โอเพนซอส</value>
-        <!--value xml:lang="zh">开源软件OFBiz的组成部分</value-->
-        <!--value xml:lang="zh">开源软件OFBiz的组成部分</value-->
+        <!--value xml:lang="zh">开源软件OFBiz的组成部分</valuevalue xml:lang="zh">开源软件OFBiz的组成部分</value-->
         <value xml:lang="zh">开源软件OFBiz家族的一部分</value>
         <value xml:lang="zh_CN">OFBiz的一部分</value>
     </property>
+    <property key="ExampleDashboard">
+        <value xml:lang="en">Dashboard</value>
+        <value xml:lang="it">Cruscotto</value>
+    </property>
+    <property key="ExampleDateField10Title">
+        <value xml:lang="en">Field10: date and time selection field with default value</value>
+        <value xml:lang="it">Campo10: campo di selezione con valore di default per data e ora</value>
+    </property>
+    <property key="ExampleDateField10Tooltip">
+        <value xml:lang="en">Same as above, uses the nowTimestamp variable (always available in the form context) to set the default value to now</value>
+        <value xml:lang="it">Lo stesso di sopra, usare la variabile nowTimestamp (sempre disponibile nel contesto della form) per impostare il valore di default ad adesso</value>
+    </property>
+    <property key="ExampleDateField1Title">
+        <value xml:lang="en">Field1: date and time selection field</value>
+        <value xml:lang="it">Campo1: campo di selezione data e ora</value>
+    </property>
+    <property key="ExampleDateField2Title">
+        <value xml:lang="en">Field2: date selection field</value>
+        <value xml:lang="it">Campo2: campo di selezione data</value>
+    </property>
+    <property key="ExampleDateField3Title">
+        <value xml:lang="en">Field3: time selection field</value>
+        <value xml:lang="it">Campo3: campo di selezione ora</value>
+    </property>
+    <property key="ExampleDateField4Title">
+        <value xml:lang="en">Field4: advanced date time selection</value>
+        <value xml:lang="it">Campo4: selezione avanzata data e ora</value>
+    </property>
+    <property key="ExampleDateField4Tooltip">
+        <value xml:lang="en">Use the input-method (time-dropdown) and clock (24) attributes to create drop down boxes for hour and minute selections</value>
+        <value xml:lang="it">Usare il metodo di input (time-dropdown) e gli attributi ora (24) per creare i box per la selezione ore e minuti</value>
+    </property>
+    <property key="ExampleDateField5Title">
+        <value xml:lang="en">Field5: advanced date time selection (AM/PM)</value>
+        <value xml:lang="it">Campo5: selezione avanzata data e ora (AM/PM)</value>
+    </property>
+    <property key="ExampleDateField6Title">
+        <value xml:lang="en">Field6: date and time simple display</value>
+        <value xml:lang="it">Campo6: data e ora semplice da visualizzare</value>
+    </property>
+    <property key="ExampleDateField7Title">
+        <value xml:lang="en">Field7: date and time display with custom format</value>
+        <value xml:lang="it">Campo7: data e ora da visualizzare con un formato personalizzato</value>
+    </property>
+    <property key="ExampleDateField7Tooltip">
+        <value xml:lang="en">This is an example of MM/dd/yyyy format</value>
+        <value xml:lang="it">Questo è un'esempio di formato data MM/gg/aaaa</value>
+    </property>
+    <property key="ExampleDateField8Title">
+        <value xml:lang="en">Field8: date and time display with custom format</value>
+        <value xml:lang="it">Campo8: data e ora da visualizzare con un formato personalizzato</value>
+    </property>
+    <property key="ExampleDateField8Tooltip">
+        <value xml:lang="en">This is an example of MMMM, dd, yyyy format</value>
+        <value xml:lang="it">Questo è un'esempio di formato data MMMM, gg, aaaa</value>
+    </property>
+    <property key="ExampleDateField9Title">
+        <value xml:lang="en">Field9: date and time selection field with default value</value>
+        <value xml:lang="it">Campo9: campo di selezione con valore di default per data e ora</value>
+    </property>
+    <property key="ExampleDateField9Tooltip">
+        <value xml:lang="en">Same as above, uses the $ {bsh:...} notation to call an util method to get the now timestamp</value>
+        <value xml:lang="it">Lo stesso di sopra, usare la notazione $ {bsh:...} per eseguire un metodo di utilità per ottenere un nuovo timestamp</value>
+    </property>
+    <property key="ExampleDateTimeFields">
+        <value xml:lang="en">Date/Time fields</value>
+        <value xml:lang="it">Campi data/ora</value>
+    </property>
+    <property key="ExampleDefinitionFile">
+        <value xml:lang="en">in the file: </value>
+        <value xml:lang="it">nel file: </value>
+    </property>
+    <property key="ExampleDefinitionFileTooltip">
+        <value xml:lang="en">framework/example/widget/example/FormWidgetExampleForms.xml</value>
+        <value xml:lang="it">framework/example/widget/example/FormWidgetExampleForms.xml</value>
+    </property>
+    <property key="ExampleDefinitionName">
+        <value xml:lang="en"> - see the form definition with name</value>
+        <value xml:lang="it"> - vedi la definizione della form con il nome</value>
+    </property>
+    <property key="ExampleDropDown">
+        <value xml:lang="en">drop-down</value>
+        <value xml:lang="it">drop-down</value>
+    </property>
+    <property key="ExampleDropDownEntityOptions">
+        <value xml:lang="en">entity-options</value>
+        <value xml:lang="it">entity-options</value>
+    </property>
+    <property key="ExampleDropDownEntityOptionsTooltip1">
+        <value xml:lang="en">All these fields retrieve the list of values from another entity by using the entity-options element.</value>
+        <value xml:lang="it">Tutti questi campi ricavano la lista di valori da un'altra entità che usa l'elemento entity-options.</value>
+    </property>
+    <property key="ExampleDropDownEntityOptionsTooltip2">
+        <value xml:lang="en">entity-options will look up options for the field in the given entity.</value>
+        <value xml:lang="it">entity-options ricercherà le opzioni per il campo nell'entità specificata.</value>
+    </property>
+    <property key="ExampleDropDownEntityOptionsTooltip3">
+        <value xml:lang="en">The complete syntax is... TODO</value>
+        <value xml:lang="it">La sintassi completa è.... DA FARE</value>
+    </property>
+    <property key="ExampleDropDownField1Title">
+        <value xml:lang="en">Field1: optional</value>
+        <value xml:lang="it">Campo1: opzionale</value>
+    </property>
+    <property key="ExampleDropDownField1Tooltip">
+        <value xml:lang="en">This is an example of a drop-down field with allow-empty set to true: as you can see, an empty entry is automatically added.</value>
+        <value xml:lang="it">Questo è un'esempio di un campo drop-down con allow-empty impostato a vero: come tu puoi vedere, una riga automatica verrà aggiunta</value>
+    </property>
+    <property key="ExampleDropDownField2Title">
+        <value xml:lang="en">Field2: mandatory</value>
+        <value xml:lang="it">Campo2: obbligatorio</value>
+    </property>
+    <property key="ExampleDropDownField2Tooltip">
+        <value xml:lang="en">The same as above, but here allow-empty is set to false (the default, if not specified): as you can see, there is no empty selection.</value>
+        <value xml:lang="it">Lo stesso di spota, ma qui allow-empty è falso (di default, se non specificato): come puoi vedere, non c'è nessuna selezione vuota.</value>
+    </property>
+    <property key="ExampleDropDownField3Title">
+        <value xml:lang="en">Field3: sort in descending order</value>
+        <value xml:lang="it">Campo3: ordinato in ordine discendente</value>
+    </property>
+    <property key="ExampleDropDownField4Title">
+        <value xml:lang="en">Field4: combined description</value>
+        <value xml:lang="it">Campo4: descrizione combinata</value>
+    </property>
+    <property key="ExampleDropDownField5Title">
+        <value xml:lang="en">Field5: selection of a default value from the list</value>
+        <value xml:lang="it">Campo5: seleziona un valore di default dalla lista</value>
+    </property>
+    <property key="ExampleDropDownField5Tooltip">
+        <value xml:lang="en">How to use the no-current-selected-key to select a default value from the options</value>
+        <value xml:lang="it">Come usare no-current-selected-key per selezionare un valore di default dalle opzioni</value>
+    </property>
+    <property key="ExampleDropDownField6Title">
+        <value xml:lang="en">Field6: (exampleTypeId): shortest notation</value>
+        <value xml:lang="it">Campo6: (exampleTypeId): notazione breve</value>
+    </property>
+    <property key="ExampleDropDownField7Title">
+        <value xml:lang="en">Field7: additional constraint</value>
+        <value xml:lang="it">Campo7: costrizioni aggiuntive</value>
+    </property>
+    <property key="ExampleDropDownField8Title">
+        <value xml:lang="en">Field8: Javascript event</value>
+        <value xml:lang="it">Campo8: evento Javascript</value>
+    </property>
+    <property key="ExampleDropDownField8Tooltip">
+        <value xml:lang="en">How to use the event and action attributes (in the field element) to trigger a Javascript action (in this example a popup message when the option is changed).</value>
+        <value xml:lang="it">Come usare gli eventi a l'azione attributi (nell'elemento field) per avviare l'azione Javascript (nell'esempio un messaggio popup quando l'opzione viene cambiata).</value>
+    </property>
+    <property key="ExampleDropDownFields">
+        <value xml:lang="en">Drop down fields</value>
+        <value xml:lang="it">Campi drop down</value>
+    </property>
+    <property key="ExampleDropDownTooltip">
+        <value xml:lang="en">First of all you have to define a drop-down element inside of the field element that you want to render as a drop down field.</value>
+        <value xml:lang="it">Prima di tutto tu devi definire un'elemento drop-down dentro un'elemento field che tu visualizzerai come campo drop down.</value>
+    </property>
     <property key="ExampleExample">
         <value xml:lang="en">Example</value>
         <value xml:lang="fr">Exemple</value>
@@ -153,6 +306,10 @@
         <value xml:lang="th">ลักษณะ</value>
         <value xml:lang="zh">特征</value>
     </property>
+    <property key="ExampleField">
+        <value xml:lang="en">Field</value>
+        <value xml:lang="it">Campo</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>
@@ -164,6 +321,18 @@
         <value xml:lang="it">Esempi form widget</value>
         <value xml:lang="th">ตัวอย่างรูปแบบ Widget</value>
     </property>
+    <property key="ExampleGroupField">
+        <value xml:lang="en">Group</value>
+        <value xml:lang="it">Gruppo</value>
+    </property>
+    <property key="ExampleGroupFields">
+        <value xml:lang="en">Fields groups</value>
+        <value xml:lang="it">Gruppi campi</value>
+    </property>
+    <property key="ExampleLongDescription">
+        <value xml:lang="en">Long Description</value>
+        <value xml:lang="it">Descrizione lunga</value>
+    </property>
     <property key="ExampleMainPage">
         <value xml:lang="en">Example Main Page</value>
         <value xml:lang="fr">Exemple de page principale</value>
@@ -213,6 +382,42 @@
         <value xml:lang="th">ข้อผิดพลาดในส่วนของความปลอดภัย: ในการรัน ${resourceDescription} คุณต้องได้รับอนุญาตจาก EXAMPLE_${mainAction} หรือ EXAMPLE_ADMIN ก่อน</value>
         <value xml:lang="zh">安全错误: 要运行${methodShortDescription},你必须具有EXAMPLE${securityAction}或EXAMPLE_ADMIN权限</value>
     </property>
+    <property key="ExamplePortletFirst">
+        <value xml:lang="en">Hi, this is a first example of portlet</value>
+        <value xml:lang="it">Salve, questo è il primo esempio di portlet</value>
+    </property>
+    <property key="ExamplePortletSecond">
+        <value xml:lang="en">Hi, this is a second example of portlet</value>
+        <value xml:lang="it">Salve, questo è il secondo esempio di portlet</value>
+    </property>
+    <property key="ExamplePortletSpecificSubTitle">
+        <value xml:lang="en">Specific Sub Title</value>
+        <value xml:lang="it">Sotto-titolo specifico</value>
+    </property>
+    <property key="ExamplePortletSpecificTitle">
+        <value xml:lang="en">Specific Title</value>
+        <value xml:lang="it">Titolo specifico</value>
+    </property>
+    <property key="ExamplePortletThird">
+        <value xml:lang="en">Hi, this is a third example of portlet with editable parameters.</value>
+        <value xml:lang="it">Salve, questo è il terzo esempio di portlet con parametri modificabili.</value>
+    </property>
+    <property key="ExamplePrintButton">
+        <value xml:lang="en">Print Button</value>
+        <value xml:lang="it">Bottone di stampa</value>
+    </property>
+    <property key="ExampleSourceCode">
+        <value xml:lang="en">Source Code</value>
+        <value xml:lang="it">Codice sorgente</value>
+    </property>
+    <property key="ExampleTextDescription">
+        <value xml:lang="en">This example text means we are in the extended form.</value>
+        <value xml:lang="it">Questo testo di esempio significa che noi siamo nella form estesa di esempio.</value>
+    </property>
+    <property key="ExampleToDo">
+        <value xml:lang="en">TODO</value>
+        <value xml:lang="it">DA FARE</value>
+    </property>
     <property key="ExampleViewPermissionError">
         <value xml:lang="en">You do not have permission to view this page. ("EXAMPLE_VIEW" or "EXAMPLE_ADMIN" needed)</value>
         <value xml:lang="fr">Vous n'avez pas l'autorisation de voir cette page ("EXAMPLE_VIEW" ou "EXAMPLE_ADMIN" nécessaire)</value>
@@ -240,9 +445,13 @@
     <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="it">Altro testo</value>
         <value xml:lang="th">ตัวหนังสืออื่น ๆ</value>
     </property>
+    <property key="FormFieldTitle_displayAnotherText">
+        <value xml:lang="en">Another Text</value>
+        <value xml:lang="it">Testo alternativo</value>
+    </property>
     <property key="FormFieldTitle_exampleDate">
         <value xml:lang="en">Example Date</value>
         <value xml:lang="fr">Exemple de date</value>
@@ -271,6 +480,10 @@
         <value xml:lang="th">ตัวอย่างขนาด</value>
         <value xml:lang="zh">样例尺寸</value>
     </property>
+    <property key="FormFieldTitle_exampleText">
+        <value xml:lang="en">Example Text</value>
+        <value xml:lang="it">Testo esempio</value>
+    </property>
     <property key="PageTitleEditExample">
         <value xml:lang="en">Edit Example</value>
         <value xml:lang="fr">Modifier l'exemple</value>

Modified: ofbiz/trunk/framework/example/widget/example/ExampleForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/widget/example/ExampleForms.xml?rev=755394&r1=755393&r2=755394&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/widget/example/ExampleForms.xml (original)
+++ ofbiz/trunk/framework/example/widget/example/ExampleForms.xml Tue Mar 17 21:01:43 2009
@@ -128,6 +128,7 @@
             </drop-down>
         </field>
         <field name="description" title="${uiLabelMap.CommonDescription}"/>
+        <field name="longDescription" title="${uiLabelMap.ExampleLongDescription}"/>
         <field name="anotherText">
             <drop-down allow-empty="true">
                 <option key="Explicit Option" description="${uiLabelMap.ExampleExplicitOption}"/>

Modified: ofbiz/trunk/framework/example/widget/example/ExampleMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/widget/example/ExampleMenus.xml?rev=755394&r1=755393&r2=755394&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/widget/example/ExampleMenus.xml (original)
+++ ofbiz/trunk/framework/example/widget/example/ExampleMenus.xml Tue Mar 17 21:01:43 2009
@@ -24,9 +24,9 @@
         <menu-item name="Example" title="${uiLabelMap.ExampleExample}"><link target="FindExample"/></menu-item>
         <menu-item name="ExampleFeature" title="${uiLabelMap.ExampleFeature}"><link target="FindExampleFeature"/></menu-item>
         <menu-item name="FormWidgetExamples" title="${uiLabelMap.ExampleFormWidgetExamples}"><link target="FormWidgetExamples"/></menu-item>
-        <menu-item name="AjaxExample" title="Ajax Examples"><link target="authview/findExampleAjax"/></menu-item>
+        <menu-item name="AjaxExample" title="${uiLabelMap.ExampleAjaxExamples}"><link target="authview/findExampleAjax"/></menu-item>
         <menu-item name="portalPage" parent-portal-page-value="${parameters.parentPortalPageId}"/>
-        <menu-item name="Dashboard" title="Dashboard" align-style="opposed"><link target="ManagePortalPages?portalPageId=${currentPortalPage.portalPageId}&amp;parentPortalPageId=${parameters.parentPortalPageId}"/></menu-item>
+        <menu-item name="Dashboard" title="${uiLabelMap.ExampleDashboard}" align-style="opposed"><link target="ManagePortalPages?portalPageId=${currentPortalPage.portalPageId}&amp;parentPortalPageId=${parameters.parentPortalPageId}"/></menu-item>
     </menu>
 
     <menu name="EditExample" default-selected-style="selected" type="simple"

Modified: ofbiz/trunk/framework/example/widget/example/FormWidgetExampleForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/widget/example/FormWidgetExampleForms.xml?rev=755394&r1=755393&r2=755394&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/widget/example/FormWidgetExampleForms.xml (original)
+++ ofbiz/trunk/framework/example/widget/example/FormWidgetExampleForms.xml Tue Mar 17 21:01:43 2009
@@ -29,16 +29,16 @@
         <!-- ***   field1  *** -->
         <!-- ***************** -->
         <field name="field1"
-               title="Field1: date and time selection field"
-               tooltip="TODO">
+               title="${uiLabelMap.ExampleDateField1Title}"
+               tooltip="${uiLabelMap.ExampleToDo}">
             <date-time/>
         </field>
         <!-- ***************** -->
         <!-- ***   field9  *** -->
         <!-- ***************** -->
         <field name="field9"
-               title="Field9: date and time selection field with default value"
-               tooltip="Same as above, uses the $ {bsh:...} notation to call an util method to get the now timestamp}">
+               title="${uiLabelMap.ExampleDateField9Title}"
+               tooltip="${uiLabelMap.ExampleDateField9Tooltip}">
             <!-- tooltip="Same as above, uses the ${'${'bsh:...} notation to call an util method to get the now timestamp}"-->
             <!-- tooltip="Same as above, uses the \${bsh:...} notation to call an util method to get the now timestamp}"-->
             <date-time default-value="${bsh:org.ofbiz.base.util.UtilDateTime.nowTimestamp()}"/>
@@ -47,40 +47,40 @@
         <!-- ***   field10  *** -->
         <!-- ***************** -->
         <field name="field10"
-               title="Field10: date and time selection field with default value"
-               tooltip="Same as above, uses the nowTimestamp variable (always available in the form context) to set the default value to now">
+               title="${uiLabelMap.ExampleDateField10Title}"
+               tooltip="${uiLabelMap.ExampleDateField10Tooltip}">
             <date-time default-value="${nowTimestamp}"/>
         </field>
         <!-- ***************** -->
         <!-- ***   field2  *** -->
         <!-- ***************** -->
         <field name="field2"
-               title="Field2: date selection field"
-               tooltip="TODO">
+               title="${uiLabelMap.ExampleDateField2Title}"
+               tooltip="${uiLabelMap.ExampleToDo}">
             <date-time type="date"/>
         </field>
         <!-- ***************** -->
         <!-- ***   field3  *** -->
         <!-- ***************** -->
         <field name="field3"
-               title="Field3: time selection field"
-               tooltip="TODO">
+               title="${uiLabelMap.ExampleDateField3Title}"
+               tooltip="${uiLabelMap.ExampleToDo}">
             <date-time type="time"/>
         </field>
         <!-- ***************** -->
         <!-- ***   field4  *** -->
         <!-- ***************** -->
         <field name="field4"
-               title="Field4: advanced date time selection"
-               tooltip="Use the input-method (time-dropdown) and clock (24) attributes to create drop down boxes for hour and minute selections">
+               title="${uiLabelMap.ExampleDateField4Title}"
+               tooltip="${uiLabelMap.ExampleDateField4Tooltip}">
             <date-time input-method="time-dropdown" clock="24"/>
         </field>
         <!-- ***************** -->
         <!-- ***   field5  *** -->
         <!-- ***************** -->
         <field name="field5"
-               title="Field5: advanced date time selection (AM/PM)"
-               tooltip="Use the input-method (time-dropdown) and clock (12) attributes to create drop down boxes for hour and minute selections">
+               title="${uiLabelMap.ExampleDateField5Title}"
+               tooltip="${uiLabelMap.ExampleDateField4Tooltip}">
             <date-time input-method="time-dropdown" clock="12"/>
         </field>
         <!-- ***************** -->
@@ -88,8 +88,8 @@
         <!-- ***************** -->
         <field name="field6"
                entry-name="exampleDateField"
-               title="Field6: date and time simple display"
-               tooltip="TODO">
+               title="${uiLabelMap.ExampleDateField6Title}"
+               tooltip="${uiLabelMap.ExampleToDo}">
             <display/>
         </field>
         <!-- ***************** -->
@@ -97,8 +97,8 @@
         <!-- ***************** -->
         <field name="field7"
                entry-name="exampleDateField"
-               title="Field7: date and time display with custom format"
-               tooltip="This is an example of MM/dd/yyyy format">
+               title="${uiLabelMap.ExampleDateField7Title}"
+               tooltip="${uiLabelMap.ExampleDateField7Tooltip}">
             <display description="${bsh:org.ofbiz.base.util.UtilDateTime.toDateString(exampleDateField, &quot;MM/dd/yyyy&quot;);}"/>
         </field>
         <!-- ***************** -->
@@ -106,20 +106,22 @@
         <!-- ***************** -->
         <field name="field8"
                entry-name="exampleDateField"
-               title="Field8: date and time display with custom format"
-               tooltip="This is an example of MMMM, dd, yyyy format">
+               title="${uiLabelMap.ExampleDateField8Title}"
+               tooltip="${uiLabelMap.ExampleDateField8Tooltip}">
             <display description="${bsh:org.ofbiz.base.util.UtilDateTime.toDateString(exampleDateField, &quot;MMMM, dd, yyyy&quot;);}"/>
         </field>
     </form>
 
     <form name="DropDownFieldsExampleForm" type="single" title="">
-        <field name="dropDownFields1" title="drop-down"><display description="First of all you have to define a drop-down element inside of the field element that you want to render as a drop down field." also-hidden="false"/></field>
+        <field name="dropDownFields1" title="${uiLabelMap.ExampleDropDown}">
+            <display description="${uiLabelMap.ExampleDropDownTooltip}" also-hidden="false"/>
+        </field>
         <!-- ***************** -->
         <!-- ***   field1  *** -->
         <!-- ***************** -->
         <field name="field1"
-               title="Field1: optional"
-               tooltip="This is an example of a drop-down field with allow-empty set to true: as you can see, an empty entry is automatically added.">
+               title="${uiLabelMap.ExampleDropDownField1Title}"
+               tooltip="${uiLabelMap.ExampleDropDownField1Tooltip}">
             <drop-down allow-empty="true">
                 <option key="Y" description="${uiLabelMap.CommonY}"/>
                 <option key="N" description="${uiLabelMap.CommonN}"/>
@@ -129,8 +131,8 @@
         <!-- ***   field2  *** -->
         <!-- ***************** -->
         <field name="field2"
-               title="Field2: mandatory"
-               tooltip="The same as above, but here allow-empty is set to false (the default, if not specified): as you can see, there is no empty selection.">
+               title="${uiLabelMap.ExampleDropDownField2Title}"
+               tooltip="${uiLabelMap.ExampleDropDownField2Tooltip}">
             <drop-down allow-empty="false"> <!-- allow-empty="false" is also the default value, so you can also not specify this attribute here -->
                 <option key="Y" description="${uiLabelMap.CommonY}"/>
                 <option key="N" description="${uiLabelMap.CommonN}"/>
@@ -140,8 +142,8 @@
         <!-- ***   field5  *** -->
         <!-- ***************** -->
         <field name="field5"
-               title="Field5: selection of a default value from the list"
-               tooltip="How to use the no-current-selected-key to select a default value from the options">
+               title="${uiLabelMap.ExampleDropDownField5Title}"
+               tooltip="${uiLabelMap.ExampleDropDownField5Tooltip}">
             <drop-down no-current-selected-key="N">
                 <option key="Y" description="${uiLabelMap.CommonY}"/>
                 <option key="N" description="${uiLabelMap.CommonN}"/>
@@ -151,25 +153,25 @@
         <!-- ***   field8  *** -->
         <!-- ***************** -->
         <field name="field8"
-               title="Field8: Javascript event"
+               title="${uiLabelMap.ExampleDropDownField8Title}"
                event="onChange"
                action="return alert('You have changed the value in the select box');"
-               tooltip="How to use the event and action attributes (in the field element) to trigger a Javascript action (in this example a popup message when the option is changed).">
+               tooltip="${uiLabelMap.ExampleDropDownField8Tooltip}">
             <drop-down>
                 <option key="Y" description="${uiLabelMap.CommonY}"/>
                 <option key="N" description="${uiLabelMap.CommonN}"/>
             </drop-down>
         </field>
 
-        <field name="entityOptionsFields1" title="entity-options"><display description="All these fields retrieve the list of values from another entity by using the entity-options element." also-hidden="false"/></field>
-        <field name="entityOptionsFields2" title=""><display description="entity-options will look up options for the field in the given entity." also-hidden="false"/></field>
-        <field name="entityOptionsFields3" title=""><display description="The complete syntax is... TODO" also-hidden="false"/></field>
+        <field name="entityOptionsFields1" title="${uiLabelMap.ExampleDropDownEntityOptions}"><display description="${uiLabelMap.ExampleDropDownEntityOptionsTooltip1}" also-hidden="false"/></field>
+        <field name="entityOptionsFields2" title="${uiLabelMap.CommonEmptyHeader}"><display description="${uiLabelMap.ExampleDropDownEntityOptionsTooltip2}" also-hidden="false"/></field>
+        <field name="entityOptionsFields3" title="${uiLabelMap.CommonEmptyHeader}"><display description="${uiLabelMap.ExampleDropDownEntityOptionsTooltip3}" also-hidden="false"/></field>
         <!-- ***************** -->
         <!-- ***   field3  *** -->
         <!-- ***************** -->
         <field name="field3"
-               title="Field3: sort in descending order"
-               tooltip="TODO">
+               title="${uiLabelMap.ExampleDropDownField3Title}"
+               tooltip="${uiLabelMap.ExampleToDo}">
             <drop-down>
                 <entity-options entity-name="ExampleType"
                                 key-field-name="exampleTypeId"
@@ -182,8 +184,8 @@
         <!-- ***   field4  *** -->
         <!-- ***************** -->
         <field name="field4"
-               title="Field4: combined description"
-               tooltip="TODO">
+               title="${uiLabelMap.ExampleDropDownField4Title}"
+               tooltip="${uiLabelMap.ExampleToDo}">
             <drop-down>
                 <entity-options entity-name="ExampleType"
                                 key-field-name="exampleTypeId"
@@ -196,8 +198,8 @@
         <!-- ***   field6  *** -->
         <!-- ***************** -->
         <field name="exampleTypeId"
-               title="Field6 (exampleTypeId): shortest notation"
-               tooltip="TODO">
+               title="${uiLabelMap.ExampleDropDownField6Title}"
+               tooltip="${uiLabelMap.ExampleToDo}">
             <drop-down>
                 <entity-options entity-name="ExampleType"
                                 description="${description}"/>
@@ -207,8 +209,8 @@
         <!-- ***   field7  *** -->
         <!-- ***************** -->
         <field name="field7"
-               title="Field7: additional constraint"
-               tooltip="TODO">
+               title="${uiLabelMap.ExampleDropDownField7Title}"
+               tooltip="${uiLabelMap.ExampleToDo}">
             <drop-down>
                 <entity-options entity-name="ExampleType"
                                 key-field-name="exampleTypeId"
@@ -224,36 +226,36 @@
     
     <!-- Simple form to print a FOP PDF file with the  fonts available in OFBiz Project -->
     <form name="FOPFontsExampleForm" type="single" target="printExampleFOPFonts">
-            <field name="printButton" widget-style="smallSubmit"><submit button-type="button"/></field>
+            <field name="printButton" title="${uiLabelMap.ExamplePrintButton}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
     
     <form name="FieldGroupExampleForm" type="single" title="">
-        <field name="Field1"><text/></field>
-        <field name="Field2"><text/></field>
-        <field name="Field3"><text/></field>
-        <field name="Field4"><text/></field>
-        <field name="Field5"><text/></field>
-        <field name="Field6"><text/></field>
-        <field name="Field7"><text/></field>
-        <field name="Field8"><text/></field>
-        <field name="Field9"><text/></field>
-        <field name="Field10"><text/></field>
+        <field name="field1" title="${uiLabelMap.ExampleField} 1"><text/></field>
+        <field name="field2" title="${uiLabelMap.ExampleField} 2"><text/></field>
+        <field name="field3" title="${uiLabelMap.ExampleField} 3"><text/></field>
+        <field name="field4" title="${uiLabelMap.ExampleField} 4"><text/></field>
+        <field name="field5" title="${uiLabelMap.ExampleField} 5"><text/></field>
+        <field name="field6" title="${uiLabelMap.ExampleField} 6"><text/></field>
+        <field name="field7" title="${uiLabelMap.ExampleField} 7"><text/></field>
+        <field name="field8" title="${uiLabelMap.ExampleField} 8"><text/></field>
+        <field name="field9" title="${uiLabelMap.ExampleField} 9"><text/></field>
+        <field name="field10" title="${uiLabelMap.ExampleField} 10"><text/></field>
 
         <sort-order>
-            <field-group title="Group 1" collapsible="true" initially-collapsed="true">
-                <sort-field name="Field1"/>
-                <sort-field name="Field2"/>
-                <sort-field name="Field3"/>
-                <sort-field name="Field4"/>
-                <sort-field name="Field5"/>
+            <field-group title="${uiLabelMap.ExampleGroupField} 1" collapsible="true" initially-collapsed="true">
+                <sort-field name="field1"/>
+                <sort-field name="field2"/>
+                <sort-field name="field3"/>
+                <sort-field name="field4"/>
+                <sort-field name="field5"/>
             </field-group>
 
-            <field-group title="Group 2" collapsible="true">
-                <sort-field name="Field6"/>
-                <sort-field name="Field7"/>
-                <sort-field name="Field8"/>
-                <sort-field name="Field9"/>
-                <sort-field name="Field10"/>
+            <field-group title="${uiLabelMap.ExampleGroupField} 2" collapsible="true">
+                <sort-field name="field6"/>
+                <sort-field name="field7"/>
+                <sort-field name="field8"/>
+                <sort-field name="field9"/>
+                <sort-field name="field10"/>
             </field-group>
         </sort-order>
 

Modified: ofbiz/trunk/framework/example/widget/example/FormWidgetExampleScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/widget/example/FormWidgetExampleScreens.xml?rev=755394&r1=755393&r2=755394&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/widget/example/FormWidgetExampleScreens.xml (original)
+++ ofbiz/trunk/framework/example/widget/example/FormWidgetExampleScreens.xml Tue Mar 17 21:01:43 2009
@@ -25,7 +25,6 @@
         <section>
             <actions>
                 <set field="headerItem" value="FormWidgetExamples"/>
-                <set field="titleProperty" value="PageTitleFormWidgetExamples"/>
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
@@ -35,36 +34,36 @@
                                 <if-has-permission permission="EXAMPLE" action="_VIEW"/>
                             </condition>
                             <widgets>
-                                <container style="h1"><label>${uiLabelMap[titleProperty]}</label></container>
+                                <container style="h1"><label>${uiLabelMap.PageTitleFormWidgetExamples}</label></container>
                                 <container style="screenlet-body">
-                                    <container style="button-bar"><label style="h2">Date/Time fields</label></container>
+                                    <container style="button-bar"><label style="h2">${uiLabelMap.ExampleDateTimeFields}</label></container>
                                     <container style="screenlet-body">
-                                        <label style="h3">Source Code</label>
-                                        <label> - see the form definition with name &quot;DateTimeFieldsExampleForm&quot; in the file: </label>
-                                        <link target="http://svn.apache.org/repos/asf/ofbiz/trunk/framework/example/widget/example/FormWidgetExampleForms.xml" url-mode="plain" target-window="svnPage" text="framework/example/widget/example/FormWidgetExampleForms.xml" style="buttontext"/>
+                                        <label style="h3">${uiLabelMap.ExampleSourceCode}</label>
+                                        <label>${uiLabelMap.ExampleDefinitionName} &quot;DateTimeFieldsExampleForm&quot; ${uiLabelMap.ExampleDefinitionFile}</label>
+                                        <link target="http://svn.apache.org/repos/asf/ofbiz/trunk/framework/example/widget/example/FormWidgetExampleForms.xml" url-mode="plain" target-window="svnPage" text="${uiLabelMap.ExampleDefinitionFileTooltip}" style="buttontext"/>
                                         <include-form name="DateTimeFieldsExampleForm" location="component://example/widget/example/FormWidgetExampleForms.xml"/>
                                     </container>
                                 </container>
                                 <container style="screenlet-body">
-                                    <container style="button-bar"><label style="h2">Drop down fields</label></container>
+                                    <container style="button-bar"><label style="h2">${uiLabelMap.ExampleDropDownFields}</label></container>
                                     <container style="screenlet-body">
-                                        <label style="h3">Source Code</label>
-                                        <label> - see the form definition with name &quot;DropDownFieldsExampleForm&quot; in the file: </label>
-                                        <link target="http://svn.apache.org/repos/asf/ofbiz/trunk/framework/example/widget/example/FormWidgetExampleForms.xml" url-mode="plain" target-window="svnPage" text="framework/example/widget/example/FormWidgetExampleForms.xml" style="buttontext"/>
+                                        <label style="h3">${uiLabelMap.ExampleSourceCode}</label>
+                                        <label>${uiLabelMap.ExampleDefinitionName} &quot;DropDownFieldsExampleForm&quot; ${uiLabelMap.ExampleDefinitionFile}</label>
+                                        <link target="http://svn.apache.org/repos/asf/ofbiz/trunk/framework/example/widget/example/FormWidgetExampleForms.xml" url-mode="plain" target-window="svnPage" text="${uiLabelMap.ExampleDefinitionFileTooltip}" style="buttontext"/>
                                     </container>
                                     <include-form name="DropDownFieldsExampleForm" location="component://example/widget/example/FormWidgetExampleForms.xml"/>
                                 </container>
                                 <container style="screenlet-body">
-                                    <container style="button-bar"><label style="h2">Fields groups</label></container>
+                                    <container style="button-bar"><label style="h2">${uiLabelMap.ExampleGroupFields}</label></container>
                                     <container style="screenlet-body">
-                                        <label style="h3">Source Code</label>
-                                        <label> - see the form definition with name &quot;FieldGroupExampleForm&quot; in the file: </label>
-                                        <link target="http://svn.apache.org/repos/asf/ofbiz/trunk/framework/example/widget/example/FormWidgetExampleForms.xml" url-mode="plain" target-window="svnPage" text="framework/example/widget/example/FormWidgetExampleForms.xml" style="buttontext"/>
+                                        <label style="h3">${uiLabelMap.ExampleSourceCode}</label>
+                                        <label>${uiLabelMap.ExampleDefinitionName} &quot;FieldGroupExampleForm&quot; ${uiLabelMap.ExampleDefinitionFile}</label>
+                                        <link target="http://svn.apache.org/repos/asf/ofbiz/trunk/framework/example/widget/example/FormWidgetExampleForms.xml" url-mode="plain" target-window="svnPage" text="${uiLabelMap.ExampleDefinitionFileTooltip}" style="buttontext"/>
                                         <include-form name="FieldGroupExampleForm" location="component://example/widget/example/FormWidgetExampleForms.xml"/>
                                     </container>
                                 </container>
                                 <container style="screenlet-body">
-                                    <container style="button-bar"><label style="h2">Print button</label></container>
+                                    <container style="button-bar"><label style="h2">${uiLabelMap.ExamplePrintButton}</label></container>
                                     <container style="screenlet-body">
                                         <label>${uiLabelMap.ExampleFopFonts}</label>
                                     </container>

Modified: ofbiz/trunk/framework/example/widget/example/PortletScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/widget/example/PortletScreens.xml?rev=755394&r1=755393&r2=755394&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/widget/example/PortletScreens.xml (original)
+++ ofbiz/trunk/framework/example/widget/example/PortletScreens.xml Tue Mar 17 21:01:43 2009
@@ -28,7 +28,7 @@
                 <script location="component://common/webcommon/WEB-INF/actions/includes/retrievePortletAttributes.groovy"/>
             </actions>
             <widgets>
-                <label text="Hi, this is a first example of portlet"/>
+                <label text="${uiLabelMap.ExamplePortletFirst}"/>
                 <label text="...${SpecificTitle}"/>
             </widgets>
         </section>
@@ -37,7 +37,7 @@
     <screen name="ExamplePortlet2">
         <section>
             <widgets>
-                <label text="Hi, this is a second example of portlet"/>
+                <label text="${uiLabelMap.ExamplePortletSecond}"/>
             </widgets>
         </section>
     </screen>
@@ -49,13 +49,13 @@
             </actions>
             <widgets>
                 <container style="leftclear">
-                    <label style="h1" text="Hi, this is a third example of portlet with editable parameters."/>
+                    <label style="h1" text="${uiLabelMap.ExamplePortletThird}"/>
                 </container>
                 <container style="leftclear">
-                    <label style="h2" text="SpecificTitle: ${SpecificTitle}"/>
+                    <label style="h2" text="${uiLabelMap.ExamplePortletSpecificTitle}: ${SpecificTitle}"/>
                 </container>
                 <container style="leftclear">
-                    <label style="h2" text="SpecificSubTitle: ${SpecificSubTitle}"/>
+                    <label style="h2" text="${uiLabelMap.ExamplePortletSpecificSubTitle}: ${SpecificSubTitle}"/>
                 </container>
             </widgets>
         </section>

Modified: ofbiz/trunk/framework/exampleext/widget/example/ExampleForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/exampleext/widget/example/ExampleForms.xml?rev=755394&r1=755393&r2=755394&view=diff
==============================================================================
--- ofbiz/trunk/framework/exampleext/widget/example/ExampleForms.xml (original)
+++ ofbiz/trunk/framework/exampleext/widget/example/ExampleForms.xml Tue Mar 17 21:01:43 2009
@@ -23,7 +23,7 @@
     <form name="EditExampleExt" extends="EditExample"
         extends-resource="component://example/widget/example/ExampleForms.xml">
         <!-- NOTE: add new fields for the EditExample form here -->
-        <field name="exampleText"><display description="This example text means we are in the extended form."/></field>
+        <field name="exampleText"><display description="${uiLabelMap.ExampleTextDescription}"/></field>
         <!-- In order for these to be at the bottom of the form, we need to hide the buttons from the
             original form, and then create new ones. We could use the sort-order element, but that
             doesn't work well when we want to allow changes in the original form. -->

Modified: ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml?rev=755394&r1=755393&r2=755394&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml (original)
+++ ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml Tue Mar 17 21:01:43 2009
@@ -19,6 +19,18 @@
     under the License.
 -->
 <resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <property key="FormFieldTitle_date1">
+        <value xml:lang="en">date1</value>
+        <value xml:lang="it">data 1</value>
+    </property>
+    <property key="FormFieldTitle_date2">
+        <value xml:lang="en">date2</value>
+        <value xml:lang="it">data 2</value>
+    </property>
+    <property key="FormFieldTitle_entityGroupId">
+        <value xml:lang="en">Entity Group Id</value>
+        <value xml:lang="it">Gruppo entità</value>
+    </property>
     <property key="FormFieldTitle_entitySyncId">
         <value xml:lang="en">Entity Sync Id</value>
         <value xml:lang="fr">Réf. de synchro. d'entités</value>
@@ -27,6 +39,14 @@
         <value xml:lang="th">รหัสสิ่งที่เกิดขึ้นพร้อมกัน</value>
         <value xml:lang="zh">实体同步标识</value>
     </property>
+    <property key="FormFieldTitle_eomodeldFullPath">
+        <value xml:lang="en">EoModel Full Path</value>
+        <value xml:lang="it">Path completo EoModel</value>
+    </property>
+    <property key="FormFieldTitle_exprAssocType">
+        <value xml:lang="en">Expr Assoc Type</value>
+        <value xml:lang="it">Tipo associazione espressione</value>
+    </property>
     <property key="FormFieldTitle_forPullOnly">
         <value xml:lang="en">For Pull Only</value>
         <value xml:lang="fr">Pour le retrait seulement</value>
@@ -43,6 +63,14 @@
         <value xml:lang="th">สำหรับการผลักเท่านั้น</value>
         <value xml:lang="zh">仅用于推送</value>
     </property>
+    <property key="FormFieldTitle_integer1">
+        <value xml:lang="en">integer1</value>
+        <value xml:lang="it">intero 1</value>
+    </property>
+    <property key="FormFieldTitle_integer2">
+        <value xml:lang="en">integer2</value>
+        <value xml:lang="it">intero 2</value>
+    </property>
     <property key="FormFieldTitle_keepRemoveInfoHours">
         <value xml:lang="en">Keep Remove Info Hours</value>
         <value xml:lang="fr">Maintenir le retrait des heures d'information</value>
@@ -99,6 +127,14 @@
         <value xml:lang="th">ดำเนินการรหัสสถานะ</value>
         <value xml:lang="zh">运行状态标识</value>
     </property>
+    <property key="FormFieldTitle_string1">
+        <value xml:lang="en">string1</value>
+        <value xml:lang="it">stringa 1</value>
+    </property>
+    <property key="FormFieldTitle_string2">
+        <value xml:lang="en">string2</value>
+        <value xml:lang="it">stringa 2</value>
+    </property>
     <property key="FormFieldTitle_syncEndBufferMillis">
         <value xml:lang="en">Sync End Buffer Millis</value>
         <value xml:lang="fr">Sync. fin de tampon millis.</value>
@@ -891,6 +927,10 @@
         <value xml:lang="th">ENTITY</value>
         <value xml:lang="zh">实体</value>
     </property>
+    <property key="WebtoolsEntityCretePermissionError">
+        <value xml:lang="en">You do not have permission to create a entity</value>
+        <value xml:lang="it">Tu non hai il permesso di creare un'entità</value>
+    </property>
     <property key="WebtoolsEntityCurrentValue">
         <value xml:lang="en">Entity Current Value</value>
         <value xml:lang="fr">Valeur courante d'entité</value>
@@ -1756,6 +1796,10 @@
         <value xml:lang="th">หน่วยความจำ</value>
         <value xml:lang="zh">内存</value>
     </property>
+    <property key="WebtoolsMinervaConnectionObjects">
+        <value xml:lang="en">Minerva Connection Objects</value>
+        <value xml:lang="it">Oggetti connessione Minerva</value>
+    </property>
     <property key="WebtoolsMiscSetupTools">
         <value xml:lang="en">Misc. Setup Tools</value>
         <value xml:lang="fr">Divers outils de configuration</value>

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/FindGeneric.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/FindGeneric.ftl?rev=755394&r1=755393&r2=755394&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/entity/FindGeneric.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/FindGeneric.ftl Tue Mar 17 21:01:43 2009
@@ -150,7 +150,7 @@
         <#if hasCreatePermission == 'Y'>
             <a href='<@ofbizUrl>ViewGeneric?entityName=${entityName}</@ofbizUrl>' class="smallSubmit">${uiLabelMap.CommonCreateNew} ${entityName}</a>
         <#else>
-            <h2>${uiLabelMap.WebtoolsMesseage17} ${entityName} ${plainTableName} ${uiLabelMap.WebtoolsMesseage18}.</h2>
+            <h2>${uiLabelMap.WebtoolsEntityCretePermissionError} ${entityName} ${plainTableName}.</h2>
         </#if>
       </div>
     </div>

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/ViewGeneric.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/ViewGeneric.ftl?rev=755394&r1=755393&r2=755394&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/entity/ViewGeneric.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/ViewGeneric.ftl Tue Mar 17 21:01:43 2009
@@ -118,7 +118,7 @@
                     </#list>
                   </#if>
                 <#else>
-                  ${uiLabelMap.WebtoolsMesseage17} ${entityName} ${plainTableName} ${uiLabelMap.WebtoolsMesseage18}
+                  ${uiLabelMap.WebtoolsEntityCretePermissionError} ${entityName} ${plainTableName}
                   <#assign showFields = false>
                 </#if>                            
               <#else>
@@ -159,7 +159,7 @@
                     </#list>
                   </#if>
                 <#else>
-                  <p>${uiLabelMap.WebtoolsMesseage17} ${entityName} ${plainTableName} ${uiLabelMap.WebtoolsMesseage18}</p>
+                  <p>${uiLabelMap.WebtoolsEntityCretePermissionError} ${entityName} ${plainTableName}</p>
                   <#assign showFields = false>
                 </#if>            
               </#if>

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/ViewRelations.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/ViewRelations.ftl?rev=755394&r1=755393&r2=755394&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/entity/ViewRelations.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/ViewRelations.ftl Tue Mar 17 21:01:43 2009
@@ -57,7 +57,7 @@
             </#list>
         </table>
     <#else>
-        <h3>${uiLabelMap.WebtoolsMesseage17} ${entityName} ${plainTableName} ${uiLabelMap.WebtoolsMesseage18}.</h3>
+        <h3>${uiLabelMap.WebtoolsEntityCretePermissionError} ${entityName} ${plainTableName}.</h3>
     </#if>
   </div>
 </div>

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/tempexpr/tempExprForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/tempexpr/tempExprForms.xml?rev=755394&r1=755393&r2=755394&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/tempexpr/tempExprForms.xml (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/tempexpr/tempExprForms.xml Tue Mar 17 21:01:43 2009
@@ -61,7 +61,7 @@
 
     <form name="ListChildExpressions" extends="BasicExpressionList" list-name="childExpressionList" paginate-target="editTemporalExpression?tempExprId=${tempExprId}">
         <field name="exprAssocType"><display/></field>
-        <field name="deleteButton" title=" " widget-style="buttontext">
+        <field name="deleteButton" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
             <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteTemporalExpressionAssoc?tempExprId=${parameters.tempExprId}&amp;fromTempExprId=${fromTempExprId}&amp;toTempExprId=${tempExprId}"/>
         </field>
     </form>

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/workflow/workflowMonitor.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/workflow/workflowMonitor.ftl?rev=755394&r1=755393&r2=755394&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/workflow/workflowMonitor.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/workflow/workflowMonitor.ftl Tue Mar 17 21:01:43 2009
@@ -62,7 +62,7 @@
         <table class="basic-table dark-grid" cellspacing="0">
           <tr class="header-row">
             <td>${uiLabelMap.WebtoolsWorkflowActivityId}</td>
-            <td>${uiLabelMap.Priority}</td>
+            <td>${uiLabelMap.WebtoolsPriority}</td>
             <td>${uiLabelMap.WebtoolsWorkflowCurrentStatus}</td>
             <td>${uiLabelMap.CommonActualStartDate}</td>
             <td>${uiLabelMap.WebtoolsWorkflowActualCompleteDate}</td>

Modified: ofbiz/trunk/framework/webtools/widget/EntityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/EntityScreens.xml?rev=755394&r1=755393&r2=755394&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/EntityScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/EntityScreens.xml Tue Mar 17 21:01:43 2009
@@ -475,7 +475,7 @@
         <section>
             <actions>
                 <set field="headerItem" value="main"/>
-                <set field="title" value="Minerva Connection Objects"/>
+                <set field="title" value="${uiLabelMap.WebtoolsMinervaConnectionObjects}"/>
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
@@ -483,7 +483,7 @@
                         <container style="screenlet">
                              <container style="screenlet-title-bar">
                                  <container style="h3">
-                                     <label text="Minerva Connection Objects"/>
+                                     <label text="${uiLabelMap.WebtoolsMinervaConnectionObjects}"/>
                                  </container>
                              </container>
                              <container style="screenlet-body">