svn commit: r746406 [1/2] - in /ofbiz/trunk: applications/accounting/config/ applications/accounting/widget/ applications/content/config/ applications/content/webapp/content/cms/ applications/content/webapp/content/datasetup/ applications/content/webap...

[mrisaliti]

Author: mrisaliti
Date: Fri Feb 20 22:53:32 2009
New Revision: 746406

URL: http://svn.apache.org/viewvc?rev=746406&view=rev
Log:
A lot of hardcoded labels cleaning and changes some wrong references

Modified:
    ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
    ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml
    ofbiz/trunk/applications/content/config/ContentUiLabels.xml
    ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml
    ofbiz/trunk/applications/content/webapp/content/datasetup/DataSetupForms.xml
    ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml
    ofbiz/trunk/applications/content/webapp/content/lookup/LookupForms.xml
    ofbiz/trunk/applications/content/webapp/content/survey/EditSurveyQuestions.ftl
    ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSContent.ftl
    ofbiz/trunk/applications/content/widget/CommonScreens.xml
    ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml
    ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml
    ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml
    ofbiz/trunk/applications/content/widget/forum/BlogScreens.xml
    ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml
    ofbiz/trunk/applications/ecommerce/webapp/ecommerce/cart/showcart.ftl
    ofbiz/trunk/applications/ecommerce/webapp/ecommerce/forum/ForumForms.xml
    ofbiz/trunk/applications/ecommerce/widget/CustomerScreens.xml
    ofbiz/trunk/applications/ecommerce/widget/EmailContactListScreens.xml
    ofbiz/trunk/applications/ecommerce/widget/blog/BlogScreens.xml
    ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/techdata/TechDataServices.java
    ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsInfoAndOrder.fo.ftl
    ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsStacks.fo.ftl
    ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/ShipmentPlanStockReport.fo.ftl
    ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml
    ofbiz/trunk/applications/order/webapp/ordermgr/entry/PartySettingsForm.xml
    ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementForms.xml
    ofbiz/trunk/applications/order/widget/ordermgr/OrderSetupScreens.xml
    ofbiz/trunk/applications/product/config/ProductUiLabels.xml
    ofbiz/trunk/applications/product/webapp/catalog/category/createProductInCategoryCheckExisting.ftl
    ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml
    ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml
    ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/assetmaint/printFixedAssetMaint.fo.ftl
    ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/forms/FacilityForms.xml
    ofbiz/trunk/specialpurpose/hhfacility/widget/hhfacility/FacilityScreens.xml
    ofbiz/trunk/specialpurpose/mypage/config/MyPageUiLabels.xml
    ofbiz/trunk/specialpurpose/mypage/webapp/mypage/addAttachFile.ftl
    ofbiz/trunk/specialpurpose/mypage/webapp/mypage/attachFileList.ftl
    ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml
    ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml
    ofbiz/trunk/specialpurpose/myportal/webapp/myportal/addAttachFile.ftl
    ofbiz/trunk/specialpurpose/myportal/webapp/myportal/attachFileList.ftl
    ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml
    ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml
    ofbiz/trunk/specialpurpose/shark/config/SharkUiLabels.xml
    ofbiz/trunk/specialpurpose/shark/widget/ProcessScreens.xml
    ofbiz/trunk/specialpurpose/shark/widget/TaskListScreens.xml
    ofbiz/trunk/specialpurpose/webpos/config/WebPosUiLabels.xml
    ofbiz/trunk/specialpurpose/webpos/src/org/ofbiz/webpos/session/WebPosSession.java

Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=746406&r1=746405&r2=746406&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Fri Feb 20 22:53:32 2009
@@ -924,6 +924,10 @@
         <value xml:lang="th">องค์กรภายในที่สามารถใช้ประโยชน์ได้</value>
         <value xml:lang="zh">可用的内部团体</value>
     </property>
+    <property key="AccountingBackToAdmin">
+        <value xml:lang="en">Back to Admin</value>
+        <value xml:lang="it">Torna indietro all'amministrazione</value>
+    </property>
     <property key="AccountingBalanceDue">
         <value xml:lang="ar">العجز المالي</value>
         <value xml:lang="en">Balance Due</value>

Modified: ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml?rev=746406&r1=746405&r2=746406&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml Fri Feb 20 22:53:32 2009
@@ -165,7 +165,7 @@
     <form name="GlAccountsNavForm" type="single" target="" title="GL Accounts" default-map-name="journal"
         header-row-style="header-row" default-table-style="basic-table">
         <field name="" title="${uiLabelMap.CommonEmptyHeader}">
-            <hyperlink also-hidden="false" description="[Back to Admin]" target="AdminMain?organizationPartyId=${organizationPartyId}"/>
+            <hyperlink also-hidden="false" description="${uiLAbelMap.AccountingBackToAdmin}" target="AdminMain?organizationPartyId=${organizationPartyId}"/>
         </field>
     </form>
 

Modified: ofbiz/trunk/applications/content/config/ContentUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/config/ContentUiLabels.xml?rev=746406&r1=746405&r2=746406&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/config/ContentUiLabels.xml (original)
+++ ofbiz/trunk/applications/content/config/ContentUiLabels.xml Fri Feb 20 22:53:32 2009
@@ -78,12 +78,16 @@
         <value xml:lang="th">คุณสมบัติ</value>
         <value xml:lang="zh">属性</value>
     </property>
+    <property key="ContentAttributeName">
+        <value xml:lang="en">Attribute Name</value>
+        <value xml:lang="it">Nome attributo</value>
+    </property>
     <property key="ContentBlog">
         <value xml:lang="en">Blog</value>
         <value xml:lang="fr">Blog</value>
- <value xml:lang="it">Blog</value>
+        <value xml:lang="it">Blog</value>
     </property>
- <property key="ContentBlogs">
+    <property key="ContentBlogs">
         <value xml:lang="en">Blogs</value>
         <value xml:lang="it">Blogs</value>
     </property>
@@ -111,7 +115,7 @@
         <value xml:lang="en">Blog Name</value>
         <value xml:lang="it">Nome blog</value>
     </property>
- <property key="ContentBlogPost">
+    <property key="ContentBlogPost">
         <value xml:lang="en">POST</value>
         <value xml:lang="it">Inviare</value>
     </property>
@@ -650,7 +654,7 @@
         <value xml:lang="it">Messaggi</value>
         <value xml:lang="th">ข้อความ</value>
     </property>
- <property key="ContentForums">
+    <property key="ContentForums">
         <value xml:lang="en">Forums</value>
         <value xml:lang="it">Forums</value>
     </property>
@@ -922,7 +926,7 @@
         <value xml:lang="en">PNG</value>
         <value xml:lang="it">PNG</value>
     </property>
- <property key="ContentPublishToContent">
+    <property key="ContentPublishToContent">
         <value xml:lang="en">Publish-to content</value>
         <value xml:lang="it">Pubblica sul contenuto</value>
     </property>
@@ -1379,6 +1383,10 @@
         <value xml:lang="en">Text only</value>
         <value xml:lang="it">Solo testo</value>
     </property>
+    <property key="ContentTestPermission">
+        <value xml:lang="en">Test Permission</value>
+        <value xml:lang="it">Test Permesso</value>
+    </property>
     <property key="ContentText">
         <value xml:lang="ar">نص</value>
         <value xml:lang="de">Text</value>
@@ -1429,6 +1437,10 @@
         <value xml:lang="th">คุณยังไม่ได้รับอนุญาตให้ดูหน้านี้("CONTENTMGR_UPDATE" หรือ "CONTENTMGR_ADMIN" )</value>
         <value xml:lang="zh">你没有浏览本页面的权限。(需要具备"CONTENTMGR_UPDATE"或"CONTENTMGR_ADMIN")</value>
     </property>
+    <property key="ContentUploadedFile">
+        <value xml:lang="en">Uploaded File</value>
+        <value xml:lang="it">File caricato</value>
+    </property>
     <property key="ContentUrl">
         <value xml:lang="ar">Url</value>
         <value xml:lang="de">Url</value>
@@ -3061,6 +3073,10 @@
         <value xml:lang="th">แก้ไขความคิดเห็น</value>
         <value xml:lang="zh">编辑关联</value>
     </property>
+    <property key="PageTitleEditBlogArticlePermissionError">
+        <value xml:lang="en">Permissions failed to edit Article</value>
+        <value xml:lang="it">Aggiorna una associazione</value>
+    </property>
     <property key="PageTitleEditCMSContent">
         <value xml:lang="de">CMS Inhalt bearbeiten</value>
         <value xml:lang="en">CMS Content Edit</value>

Modified: ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml?rev=746406&r1=746405&r2=746406&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml (original)
+++ ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml Fri Feb 20 22:53:32 2009
@@ -186,14 +186,14 @@
         </field>
         <field name="roleTypeId">
             <drop-down allow-empty="false">
-                <option key="_NA_" description="Not Applicable"/>
+                <option key="_NA_" description="${uiLabelMap.CommonNA}"/>
                 <entity-options description="${description}"
                     entity-name="RoleType" key-field-name="roleTypeId"/>
             </drop-down>
         </field>
         <field name="statusId">
             <drop-down allow-empty="false">
-                <option key="_NA_" description="Not Applicable"/>
+                <option key="_NA_" description="${uiLabelMap.CommonNA}"/>
                 <entity-options description="${description}"
                     entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" value="PUBLISH_STATUS"/>
@@ -202,7 +202,7 @@
         </field>
         <field name="privilegeEnumId">
             <drop-down allow-empty="false">
-                <option key="_NA_" description="Not Applicable"/>
+                <option key="_NA_" description="${uiLabelMap.CommonNA}"/>
                 <entity-options description="${description}"
                     entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" value="SUBSCRIPTION_TYPE"/>

Modified: ofbiz/trunk/applications/content/webapp/content/datasetup/DataSetupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/datasetup/DataSetupForms.xml?rev=746406&r1=746405&r2=746406&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/datasetup/DataSetupForms.xml (original)
+++ ofbiz/trunk/applications/content/webapp/content/datasetup/DataSetupForms.xml Fri Feb 20 22:53:32 2009
@@ -68,7 +68,7 @@
         <field name="dataResourceTypeId">
             <display/>
         </field>
-        <field name="attrName" title="Attribute Name">
+        <field name="attrName" title="${uiLabelMap.ContentAttributeName}">
             <display/>
         </field>
         <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">

Modified: ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml?rev=746406&r1=746405&r2=746406&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml (original)
+++ ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml Fri Feb 20 22:53:32 2009
@@ -347,7 +347,7 @@
         <field name="drMimeTypeId" >
             <display description="text/plain"/>
         </field>
-        <field name="drObjectInfo" title="Url">
+        <field name="drObjectInfo" title="${uiLabelMap.ContentUrl}">
             <text />
         </field>
         <field name="createdByUserLogin" position="1">

Modified: ofbiz/trunk/applications/content/webapp/content/lookup/LookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/lookup/LookupForms.xml?rev=746406&r1=746405&r2=746406&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/lookup/LookupForms.xml (original)
+++ ofbiz/trunk/applications/content/webapp/content/lookup/LookupForms.xml Fri Feb 20 22:53:32 2009
@@ -82,12 +82,12 @@
             </service>
         </actions>
         <field name="replace" widget-style="buttontext" >
-            <hyperlink also-hidden="false" target-type="plain" description="Replace[${dataResourceId}/${coContentId}]"
+            <hyperlink also-hidden="false" target-type="plain" description="${uiLabelMap.FormFieldTitle_replace} [${dataResourceId}/${coContentId}]"
                target="javascript:execRemoteCall('replaceSubContent','${dataResourceId}','${coContentId}', '${contentIdTo}', '${mapKey}')"
             />
         </field>
         <field name="pasteContent" widget-style="buttontext" >
-            <hyperlink also-hidden="false" target-type="plain" description="Paste[${dataResourceId}/${coContentId}]"
+            <hyperlink also-hidden="false" target-type="plain" description="${uiLabelMap.ContentPaste} [${dataResourceId}/${coContentId}]"
                target="javascript:execRemoteCall('pasteContent','${dataResourceId}','${coContentId}')"/>
         </field>
         <field name="dataResourceName" widget-style="buttontext">

Modified: ofbiz/trunk/applications/content/webapp/content/survey/EditSurveyQuestions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/survey/EditSurveyQuestions.ftl?rev=746406&r1=746405&r2=746406&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/survey/EditSurveyQuestions.ftl (original)
+++ ofbiz/trunk/applications/content/webapp/content/survey/EditSurveyQuestions.ftl Fri Feb 20 22:53:32 2009
@@ -239,7 +239,7 @@
       <br class="clear"/>
     </div>  
     <div class="screenlet-body">  
-      <a href="<@ofbizUrl>EditSurveyQuestions?surveyId=${requestParameters.surveyId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonNew} ${uiLabelMap.SurveyQuestion}</a>
+      <a href="<@ofbizUrl>EditSurveyQuestions?surveyId=${requestParameters.surveyId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonNew} ${uiLabelMap.ContentSurveyQuestion}</a>
     <#else>
     <div class="screenlet-title-bar">
       <ul>

Modified: ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSContent.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSContent.ftl?rev=746406&r1=746405&r2=746406&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSContent.ftl (original)
+++ ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSContent.ftl Fri Feb 20 22:53:32 2009
@@ -182,7 +182,7 @@
             </td>
           </tr>
           <tr>
-            <td class="label">${uiLabelMap.CommonKey}</td>
+            <td class="label">${uiLabelMap.ContentMapKey}</td>
             <td>
                 <input type="text" name="mapKey" value="${(assoc.mapKey)?if_exists}" size="40"/>
             </td>

Modified: ofbiz/trunk/applications/content/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/CommonScreens.xml?rev=746406&r1=746405&r2=746406&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/CommonScreens.xml Fri Feb 20 22:53:32 2009
@@ -344,7 +344,7 @@
                     <widgets>
                         <container style="responseSelected">
                             <label text="${rsp.contentName} - ${rsp.description} [${rsp.contentId}]" style="responseheader" />
-                            <link  text="Reply" target="addForumThreadMessage?forumGroupId=${parameters.forumGroupId}&amp;forumId=${parameters.forumId}&amp;forumMessageIdTo=${rsp.contentId}&amp;contentAssocTypeId=RESPONSE" style="buttontext"/>
+                            <link  text="${uiLabelMap.PartyReply}" target="addForumThreadMessage?forumGroupId=${parameters.forumGroupId}&amp;forumId=${parameters.forumId}&amp;forumMessageIdTo=${rsp.contentId}&amp;contentAssocTypeId=RESPONSE" style="buttontext"/>
                             <container style="responsetext">
                                 <include-form name="EditForumThreadMessage" location="component://content/widget/forum/ForumForms.xml"/>
                             </container>
@@ -353,7 +353,7 @@
                     <fail-widgets>
                         <container>
                             <label text="${rsp.contentName} - ${rsp.description} [${rsp.contentId}]" style="responseheader" />
-                            <link  text="Reply" target="addForumThreadMessage?forumGroupId=${parameters.forumGroupId}&amp;forumId=${parameters.forumId}&amp;forumMessageIdTo=${rsp.contentId}&amp;contentAssocTypeId=RESPONSE" style="buttontext"/>
+                            <link  text="${uiLabelMap.PartyReply}" target="addForumThreadMessage?forumGroupId=${parameters.forumGroupId}&amp;forumId=${parameters.forumId}&amp;forumMessageIdTo=${rsp.contentId}&amp;contentAssocTypeId=RESPONSE" style="buttontext"/>
                             <container style="responsetext">
                                 <include-form name="EditForumThreadMessage" location="component://content/widget/forum/ForumForms.xml"/>
                             </container>

Modified: ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml?rev=746406&r1=746405&r2=746406&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml Fri Feb 20 22:53:32 2009
@@ -373,7 +373,7 @@
         <section>
             <actions>
                 <script location="component://content/widget/GetMenuContext.groovy"/>
-                <set field="titleProperty" value="Test Permission"/>
+                <set field="titleProperty" value="ContentTestPermission"/>
             </actions>
             <widgets>
                 <decorator-screen name="commonCmsDecorator" location="${parameters.mainDecoratorLocation}">
@@ -381,7 +381,7 @@
                         <container style="screenlet">
                             <container style="screenlet-title-bar">
                                 <container style="h3">
-                                    <label text="Test Permission"/>
+                                    <label text="${uiLabelMap.ContentTestPermission}"/>
                                 </container>
                             </container>
                             <container style="screenlet-body">

Modified: ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml?rev=746406&r1=746405&r2=746406&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml Fri Feb 20 22:53:32 2009
@@ -427,15 +427,15 @@
         <field name="contentAssocTypeId" widget-style="tabletext"><display-entity entity-name="ContentAssocType" also-hidden="false"/></field>
         <field name="fromDate" title="${uiLabelMap.CommonFromDate}" widget-style="tabletext"><display/></field>
         <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display/></field>
-        <field name="sequenceNum" title="Sequence Num"><display/></field>
+        <field name="sequenceNum" title="${uiLabelMap.CommonSequenceNum}"><display/></field>
         
        <field name="mimeTypeId" map-name="dataResource" title="${uiLabelMap.ContentDocumentType}"  widget-style="tabletext">
             <display-entity entity-name="MimeType" key-field-name="mimeTypeId" description="${description}"/>
         </field>
-        <field name="relatedDetailId" map-name="dataResource" title="Survey ID" use-when="dataResource!=null&amp;&amp;&quot;SURVEY&quot;.equals(dataResource.getString(&quot;dataResourceTypeId&quot;))">      
+        <field name="relatedDetailId" map-name="dataResource" title="${uiLabelMap.ContentSurvey}" use-when="dataResource!=null&amp;&amp;&quot;SURVEY&quot;.equals(dataResource.getString(&quot;dataResourceTypeId&quot;))">      
             <display/>
         </field>
-        <field name="relatedDetailId" map-name="dataResource" title="Survey Response ID" use-when="dataResource!=null&amp;&amp;&quot;SURVEY_RESPONSE&quot;.equals(dataResource.getString(&quot;dataResourceTypeId&quot;))&amp;&amp;dataResource.get(&quot;relatedDetailId&quot;)!=null">      
+        <field name="relatedDetailId" map-name="dataResource" title="${uiLabelMap.ContentSurveyResponse}" use-when="dataResource!=null&amp;&amp;&quot;SURVEY_RESPONSE&quot;.equals(dataResource.getString(&quot;dataResourceTypeId&quot;))&amp;&amp;dataResource.get(&quot;relatedDetailId&quot;)!=null">      
             <display/>
         </field>
     </form>

Modified: ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml?rev=746406&r1=746405&r2=746406&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml Fri Feb 20 22:53:32 2009
@@ -257,14 +257,14 @@
         header-row-style="header-row" default-table-style="basic-table">
         <field name="dataResourceId"><text/></field>
         <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
-        <field name="objectInfo" title="URL"/>
+        <field name="objectInfo" title="${uiLabelMap.ContentUrl}"/>
         <field name="mode"><hidden value="CREATE"/></field>
     </form>
     <form name="AddDataResourceText" target="createDataResourceAndText" title="" type="single" extends="DataResourceMaster"
         header-row-style="header-row" default-table-style="basic-table">
         <field name="dataResourceId"><text/></field>
         <field name="dataResourceTypeId"><hidden value="ELECTRONIC_TEXT"/></field>
-        <field name="dataResourceTypeIdDisplay" title="Type Id" field-name="dataResourceTypeId">
+        <field name="dataResourceTypeIdDisplay" title="${uiLabelMap.CommonType}" field-name="dataResourceTypeId">
             <display description="ELECTRONIC_TEXT" also-hidden="false"/>
         </field>
         <field name="textData" id-name="textData"><textarea rows="20" cols="120"/></field>
@@ -273,9 +273,9 @@
     <form name="AddDataResourceUrl" target="createDataResourceUrl" title="" type="single" extends="DataResourceMaster"
         header-row-style="header-row" default-table-style="basic-table">
         <field name="dataResourceId"><text/></field>
-        <field name="objectInfo" title="URL"><text/></field>
+        <field name="objectInfo" title="${uiLabelMap.ContentUrl}"><text/></field>
         <field name="dataResourceTypeId"><hidden value="URL_RESOURCE"/></field>
-        <field name="dataResourceTypeIdDisplay" title="Type Id" field-name="dataResourceTypeId">
+        <field name="dataResourceTypeIdDisplay" title="${uiLabelMap.CommonType}" field-name="dataResourceTypeId">
             <display description="URL_RESOURCE" also-hidden="false"/>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
@@ -284,17 +284,17 @@
         header-row-style="header-row" default-table-style="basic-table">
         <field name="dataResourceId"><display description="${dataResource.dataResourceId}"/></field>
         <field name="dataResourceTypeId"><hidden value="IMAGE_OBJECT"/></field>
-        <field name="dataResourceTypeIdDisplay" title="Type Id" field-name="dataResourceTypeId">
+        <field name="dataResourceTypeIdDisplay" title="${uiLabelMap.CommonType}" field-name="dataResourceTypeId">
             <display description="IMAGE_OBJECT" also-hidden="false"/>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
-        <field name="objectInfo" title="Uploaded File"><display/></field>
+        <field name="objectInfo" title="${uiLabelMap.ContentUploadedFile}"><display/></field>
     </form>
     <form name="EditDataResourceText" target="updateDataResourceText" title="" type="single" extends="DataResourceMaster"
         header-row-style="header-row" default-table-style="basic-table">
         <field name="dataResourceId"><hidden/></field>
         <field name="dataResourceTypeId"><hidden value="ELECTRONIC_TEXT"/></field>
-        <field name="dataResourceTypeIdDisplay" title="Type Id" field-name="dataResourceTypeId">
+        <field name="dataResourceTypeIdDisplay" title="${uiLabelMap.CommonType}" field-name="dataResourceTypeId">
             <display description="ELECTRONIC_TEXT" also-hidden="false"/>
         </field>
         <field name="textData" id-name="textData"><textarea rows="20" cols="120"/> </field>
@@ -304,15 +304,15 @@
         header-row-style="header-row" default-table-style="basic-table">
         <field name="dataResourceId"><hidden/></field>
         <field name="dataResourceTypeId"><hidden value="IMAGE_OBJECT"/></field>
-        <field name="dataResourceTypeIdDisplay" title="Type Id" field-name="dataResourceTypeId">
+        <field name="dataResourceTypeIdDisplay" title="${uiLabelMap.CommonType}" field-name="dataResourceTypeId">
             <display description="IMAGE_OBJECT" also-hidden="false"/>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
-        <field name="objectInfo" title="Uploaded File"><display/></field>
+        <field name="objectInfo" title="${uiLabelMap.ContentUploadedFile}"><display/></field>
     </form>
     <form name="EditDataResourceUrl" target="updateDataResourceUrl" title="" type="single" extends="AddDataResourceUrl"
         header-row-style="header-row" default-table-style="basic-table">
-        <field name="objectInfo" title="URL"><text/></field>
+        <field name="objectInfo" title="${uiLabelMap.ContentUrl}"><text/></field>
     </form>
     <form name="ImageUpload" target="uploadImage" title="" type="upload"  default-map-name="currentValue"
         header-row-style="header-row" default-table-style="basic-table">
@@ -427,7 +427,7 @@
             <hyperlink also-hidden="false" target-type="plain" description="${productFeatureId}" target="javascript:set_value('${productFeatureId}')"/>
         </field>
         <field name="description" title="${uiLabelMap.FormFieldTitle_contentName}" widget-style="buttontext"><display/></field>
-        <field name="productFeatureTypeId" title="Type" widget-style="buttontext"><display/></field>
+        <field name="productFeatureTypeId" title="${uiLabelMap.CommonType}" widget-style="buttontext"><display/></field>
     </form>
 
     <!-- ElectronicText forms -->

Modified: ofbiz/trunk/applications/content/widget/forum/BlogScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/forum/BlogScreens.xml?rev=746406&r1=746405&r2=746406&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/forum/BlogScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/forum/BlogScreens.xml Fri Feb 20 22:53:32 2009
@@ -204,7 +204,7 @@
                         </decorator-screen>
                     </widgets>
                     <fail-widgets>
-                        <label text="Permissions failed to edit Article: ${contentId} in Blog: ${blogContentId}"></label>
+                        <label text="${uiLabelMap.PageTitleEditBlogArticlePermissionError}: ${contentId} ${uiLabelMap.ContentBlog} ${blogContentId}"></label>
                     </fail-widgets>
                 </section>
             </widgets>

Modified: ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml?rev=746406&r1=746405&r2=746406&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml (original)
+++ ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml Fri Feb 20 22:53:32 2009
@@ -2455,6 +2455,10 @@
         <value xml:lang="th">สีเงิน</value>
         <value xml:lang="zh">银牌</value>
     </property>
+    <property key="EcommerceSorryDigitalProductUploadNotEnabled">
+        <value xml:lang="en">Sorry, digital product upload is not enabled.</value>
+        <value xml:lang="it">Spiacente, l'upload di prodotti digitali non è abilitato.</value>
+    </property>
     <property key="EcommerceStartDate">
         <value xml:lang="de">Startdatum</value>
         <value xml:lang="en">Start</value>
@@ -2514,6 +2518,10 @@
         <value xml:lang="th">ชำระค่าสั่งซื้อ</value>
         <value xml:lang="zh">注册</value>
     </property>
+    <property key="EcommerceSubscriptionVerifyEmail">
+        <value xml:lang="en">Subscription Verify Email</value>
+        <value xml:lang="it">Sottiscrivi verifica email</value>
+    </property>
     <property key="EcommerceSummary">
         <value xml:lang="de">Zusammenfassung</value>
         <value xml:lang="en">Summary</value>

Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/cart/showcart.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/cart/showcart.ftl?rev=746406&r1=746405&r2=746406&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/cart/showcart.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/cart/showcart.ftl Fri Feb 20 22:53:32 2009
@@ -174,7 +174,7 @@
           <#else>
             <td NOWRAP>&nbsp;</td>
           </#if>
-          <#if fixedAssetExist == true><td NOWRAP align="center"><table><tr><td class="tabletext" nowrap align="center"><b>- ${uiLabelMap.Startdate} -</b></td><td class="tabletext" nowrap><b>- ${uiLabelMap.EcommerceNbrOfDays} -</b></td></tr><tr><td class="tabletext" nowrap><b>- ${uiLabelMap.EcommerceNbrOfPersons} -</b></td><td class="tabletext" nowrap align="center"><b>- ${uiLabelMap.CommonQuantity} -</b></td></tr></table></td>
+          <#if fixedAssetExist == true><td NOWRAP align="center"><table><tr><td class="tabletext" nowrap align="center"><b>- ${uiLabelMap.EcommerceStartDate} -</b></td><td class="tabletext" nowrap><b>- ${uiLabelMap.EcommerceNbrOfDays} -</b></td></tr><tr><td class="tabletext" nowrap><b>- ${uiLabelMap.EcommerceNbrOfPersons} -</b></td><td class="tabletext" nowrap align="center"><b>- ${uiLabelMap.CommonQuantity} -</b></td></tr></table></td>
           <#else><td NOWRAP align="center"><div class="tabletext"><b>${uiLabelMap.CommonQuantity}</b></div></td></#if>
           <td NOWRAP align="right"><div class="tabletext"><b>${uiLabelMap.EcommerceUnitPrice}</b></div></td>
           <td NOWRAP align="right"><div class="tabletext"><b>${uiLabelMap.EcommerceAdjustments}</b></div></td>

Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/forum/ForumForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/forum/ForumForms.xml?rev=746406&r1=746405&r2=746406&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/forum/ForumForms.xml (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/forum/ForumForms.xml Fri Feb 20 22:53:32 2009
@@ -398,7 +398,7 @@
         default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
         <field name="dataResourceId"><display/></field>
         <field name="dataResourceTypeId"><hidden value="ELECTRONIC_TEXT"/></field>
-        <field name="dataResourceTypeIdDisplay" title="Type Id" field-name="dataResourceTypeId" >
+        <field name="dataResourceTypeIdDisplay" title="${uiLabelMap.CommonType}" field-name="dataResourceTypeId" >
             <display description="ELECTRONIC_TEXT" also-hidden="false" />
         </field>
         <field name="textData" title="${uiLabelMap.ContentText}" id-name="textData"><textarea rows="20" cols="120"/> </field>

Modified: ofbiz/trunk/applications/ecommerce/widget/CustomerScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/widget/CustomerScreens.xml?rev=746406&r1=746405&r2=746406&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/widget/CustomerScreens.xml (original)
+++ ofbiz/trunk/applications/ecommerce/widget/CustomerScreens.xml Fri Feb 20 22:53:32 2009
@@ -340,7 +340,7 @@
                                 <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/digitalproductlist.ftl"/></html></platform-specific>
                             </widgets>
                             <fail-widgets>
-                                <container><label style="head2" text="Sorry, digital product upload is not enabled."></label></container>
+                                <container><label style="head2" text="${uiLabelMap.EcommerceSorryDigitalProductUploadNotEnabled}"></label></container>
                             </fail-widgets>
                         </section>
                     </decorator-section>

Modified: ofbiz/trunk/applications/ecommerce/widget/EmailContactListScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/widget/EmailContactListScreens.xml?rev=746406&r1=746405&r2=746406&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/widget/EmailContactListScreens.xml (original)
+++ ofbiz/trunk/applications/ecommerce/widget/EmailContactListScreens.xml Fri Feb 20 22:53:32 2009
@@ -24,7 +24,7 @@
     <screen name="ContactListVerifyEmail">
         <section>
             <actions>
-                <set field="title" value="Subscription Verify Email"/>
+                <set field="titleProperty" value="EcommerceSubscriptionVerifyEmail"/>
                 <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control/"/>
                 
                 <entity-one entity-name="PartyNameView" value-field="partyName" auto-field-map="false">

Modified: ofbiz/trunk/applications/ecommerce/widget/blog/BlogScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/widget/blog/BlogScreens.xml?rev=746406&r1=746405&r2=746406&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/widget/blog/BlogScreens.xml (original)
+++ ofbiz/trunk/applications/ecommerce/widget/blog/BlogScreens.xml Fri Feb 20 22:53:32 2009
@@ -169,7 +169,7 @@
                         </decorator-screen>
                     </widgets>
                     <fail-widgets>
-                        <label text="Permissions failed."></label>
+                        <label text="${uiLabelMap.PageTitleEditBlogArticlePermissionError}"></label>
                     </fail-widgets>
                 </section>
             </widgets>
@@ -202,7 +202,7 @@
                         </decorator-screen>
                     </widgets>
                     <fail-widgets>
-                        <label text="Permissions failed to edit Article: ${contentId} in Blog: ${blogContentId}"></label>
+                        <label text="${uiLabelMap.PageTitleEditBlogArticlePermissionError}: ${contentId} ${uiLabelMap.ContentBlog}: ${blogContentId}"></label>
                     </fail-widgets>
                 </section>
             </widgets>
@@ -331,11 +331,10 @@
                         <label text="&lt;p/&gt;"/>
                         
                         <container style="bloghr">
-                            <label text="Thread: " style="blogtitle"/>
+                            <label text="${uiLabelMap.ContentForumThread}: " style="blogtitle"/>
                         </container>
                         <include-tree name="ResponseTree" location="component://ecommerce/widget/blog/BlogTrees.xml"/>
                         <label text="&lt;p/&gt;"/>
-                                                
                         <section>
                             <condition>
                                 <or>
@@ -406,10 +405,10 @@
             </actions>
             <widgets>
                 <container style="bloghr">
-                    <label text="Comments: " style="blogtitle"/>
+                    <label text="${uiLabelMap.CommonComments}: " style="blogtitle"/>
                 </container>
                 <iterate-section list="responseList" entry="rsp" view-size="10">
-                    <section name="Blog Responses">                        
+                    <section name="BlogResponses">
                         <widgets>
                             <include-screen name="responseTreeLine"/>
                         </widgets>
@@ -439,7 +438,7 @@
                         <iterate-section list="responseList" entry="rsp">
                             <section name="BlogResponses">
                                 <widgets>
-                                    <include-screen name="responseTreeLine"/>                                            
+                                    <include-screen name="responseTreeLine"/>
                                 </widgets>
                             </section>
                         </iterate-section>

Modified: ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/techdata/TechDataServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/techdata/TechDataServices.java?rev=746406&r1=746405&r2=746406&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/techdata/TechDataServices.java (original)
+++ ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/techdata/TechDataServices.java Fri Feb 20 22:53:32 2009
@@ -262,7 +262,6 @@
             techDataCalendarWeek = techDataCalendar.getRelatedOneCache("TechDataCalendarWeek");
         } catch (GenericEntityException e) {
             Debug.logError("Pb reading Calendar Week associated with calendar"+e.getMessage(), module);
-            //                return ServiceUtil.returnError(UtilProperties.getMessage(resource, "PbReadingTechDataCalendarWeekAssociated", locale));
             return 0;
         }
         // TODO read TechDataCalendarExcDay to manage execption day
@@ -295,7 +294,6 @@
             techDataCalendarWeek = techDataCalendar.getRelatedOneCache("TechDataCalendarWeek");
         } catch (GenericEntityException e) {
             Debug.logError("Pb reading Calendar Week associated with calendar"+e.getMessage(), module);
-            //                return ServiceUtil.returnError(UtilProperties.getMessage(resource, "PbReadingTechDataCalendarWeekAssociated", locale));
             return ServiceUtil.returnError("Pb reading Calendar Week associated with calendar");
         }
         // TODO read TechDataCalendarExcDay to manage execption day

Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsInfoAndOrder.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsInfoAndOrder.fo.ftl?rev=746406&r1=746405&r2=746406&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsInfoAndOrder.fo.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsInfoAndOrder.fo.ftl Fri Feb 20 22:53:32 2009
@@ -88,7 +88,7 @@
                         </fo:table-cell>
                         <fo:table-cell>
                             <fo:block line-height="12pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="start">
-                                <fo:inline font-size="10pt">${uiLabelMap.CommonEffected}:</fo:inline>
+                                <fo:inline font-size="10pt">${uiLabelMap.FormFieldTitle_effectiveDate}:</fo:inline>
                                 <fo:inline font-size="10pt">___________________</fo:inline>
                             </fo:block>
                         </fo:table-cell>

Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsStacks.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsStacks.fo.ftl?rev=746406&r1=746405&r2=746406&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsStacks.fo.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsStacks.fo.ftl Fri Feb 20 22:53:32 2009
@@ -205,7 +205,7 @@
                         </fo:table-cell>
                         <fo:table-cell>
                             <fo:block line-height="6pt" space-before.optimum="5pt" space-after.optimum="1.5pt" keep-together="always" text-align="start">
-                                <fo:inline font-size="6pt">${uiLabelMap.CommonLocation} :</fo:inline>
+                                <fo:inline font-size="6pt">${uiLabelMap.ProductFacilityLocation} :</fo:inline>
                             </fo:block>
                         </fo:table-cell>
                         <fo:table-cell>
@@ -217,7 +217,7 @@
                         </fo:table-cell>
                         <fo:table-cell>
                             <fo:block line-height="6pt" space-before.optimum="5pt" space-after.optimum="1.5pt" keep-together="always" text-align="start">
-                                <fo:inline font-size="6pt">${uiLabelMap.CommonLocation} :</fo:inline>
+                                <fo:inline font-size="6pt">${uiLabelMap.ProductFacilityLocation} :</fo:inline>
                             </fo:block>
                         </fo:table-cell>
                     </fo:table-row>

Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/ShipmentPlanStockReport.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/ShipmentPlanStockReport.fo.ftl?rev=746406&r1=746405&r2=746406&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/ShipmentPlanStockReport.fo.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/ShipmentPlanStockReport.fo.ftl Fri Feb 20 22:53:32 2009
@@ -50,7 +50,7 @@
                                     <fo:block>${uiLabelMap.ManufacturingShipmentId}: ${shipmentIdPar}</fo:block>
                                 </fo:table-cell>                            
                                 <fo:table-cell padding="2pt">
-                                    <fo:block>${uiLabelMap.estimatedCompletionDate}: <#if estimatedReadyDatePar?has_content>${estimatedReadyDatePar}</#if></fo:block>
+                                    <fo:block>${uiLabelMap.ManufacturingEstimatedCompletionDate}: <#if estimatedReadyDatePar?has_content>${estimatedReadyDatePar}</#if></fo:block>
                                 </fo:table-cell>
                                 <fo:table-cell padding="2pt">                                    
                                     <fo:block>${uiLabelMap.ManufacturingEstimatedShipDate}: <#if estimatedShipDatePar?has_content>${estimatedShipDatePar}</#if></fo:block>

Modified: ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml?rev=746406&r1=746405&r2=746406&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml (original)
+++ ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml Fri Feb 20 22:53:32 2009
@@ -404,7 +404,7 @@
                 <entity-options description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/>
             </drop-down>
         </field>
-        <field name="custRequestId" title="${uiLabelMap.ServicemgntCustRequestId}"><lookup size="20" target-form-name="LookupCustRequest"/></field>
+        <field name="custRequestId"><lookup size="20" target-form-name="LookupCustRequest"/></field>
         <field name="datetimeStarted" title="${uiLabelMap.CommonStartDate}"><date-find/></field>
         <field name="datetimeEnded" title="${uiLabelMap.CommonFinishDate}"><date-find/></field>
         <field map-name="subjectMap" name="subject" title="${uiLabelMap.PartyCommEventSubject}"><text-find/></field>
@@ -431,7 +431,7 @@
         <field name="contactMechTypeId" title="${uiLabelMap.MarketingContactListContactMechTypeId}"><display-entity description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/></field>
         <field name="roleTypeIdFrom" title="${uiLabelMap.PartyRoleTypeIdFrom}"><display-entity description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/></field>
         <field name="roleTypeIdTo" title="${uiLabelMap.PartyRoleTypeIdTo}"><display-entity description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/></field>
-        <field name="custReqestId" position="1" title="${uiLabelMap.ServicemgntCustRequestId}"><text size="20"/></field>
+        <field name="custReqestId" position="1"><text size="20"/></field>
         <field name="datetimeStarted" title="${uiLabelMap.CommonStartDate}"><display/></field>
         <field name="datetimeEnded" title="${uiLabelMap.CommonFinishDate}"><display/></field>
     </form>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/PartySettingsForm.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/PartySettingsForm.xml?rev=746406&r1=746405&r2=746406&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/PartySettingsForm.xml (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/PartySettingsForm.xml Fri Feb 20 22:53:32 2009
@@ -22,7 +22,7 @@
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
     <form name="quickAddOptionalParty" target="addOptionalParty" title="" type="single"
         default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
-        <field name="optionalPartyId" title="partyId">
+        <field name="optionalPartyId" title="${uiLabelMap.PartyPartyId}">
             <lookup target-form-name="LookupPerson"/>
         </field>
         <field name="optionalRoleTypeId" title="roleTypeId">

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementForms.xml?rev=746406&r1=746405&r2=746406&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementForms.xml (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementForms.xml Fri Feb 20 22:53:32 2009
@@ -284,7 +284,7 @@
             <display description="${bsh: org.ofbiz.party.party.PartyHelper.getPartyName(delegator, partyId, false);}"/>
         </field>
         <field name="supplierProductId" title="${uiLabelMap.ProductSupplierProductId}"><display/></field>
-        <field name="idValue" title="UPCA"><display/></field>
+        <field name="idValue" title="${uiLabelMap.ProductUPCA}"><display/></field>
         <field name="minimumOrderQuantity" widget-area-style="align-text"><display/></field>
         <field name="lastPrice" widget-area-style="align-text"><display type="currency" currency="${currencyUomId}"/></field>
         <field name="requiredByDate"><display/></field>
@@ -309,7 +309,7 @@
             <display description="${bsh: org.ofbiz.party.party.PartyHelper.getPartyName(delegator, partyId, false);}"/>
         </field>
         <field name="supplierProductId" title="${uiLabelMap.ProductSupplierProductId}"><display/></field>
-        <field name="idValue" title="UPCA"><display/></field>
+        <field name="idValue" title="${uiLabelMap.ProductUPCA}"><display/></field>
         <field name="minimumOrderQuantity" title="${uiLabelMap.FormFieldTitle_minimumOrderQuantity}" widget-area-style="align-text"><display/></field>
         <field name="lastPrice" widget-area-style="align-text"><display type="currency" currency="${currencyUomId}"/></field>
         <field name="requiredByDate"><display/></field>

Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderSetupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderSetupScreens.xml?rev=746406&r1=746405&r2=746406&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderSetupScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderSetupScreens.xml Fri Feb 20 22:53:32 2009
@@ -36,7 +36,7 @@
     <screen name="OrderPaymentSetup">
         <section>
             <actions>
-                <set field="title" value="Payment Settings"/>
+                <set field="titleProperty" value="OrderOrderEntryPaymentSettings"/>
                 <set field="headerItem" value="setup"/>
                 <script location="component://order/webapp/ordermgr/WEB-INF/actions/setup/PaymentSetup.groovy"/>
             </actions>

Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=746406&r1=746405&r2=746406&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Fri Feb 20 22:53:32 2009
@@ -5154,6 +5154,10 @@
         <value xml:lang="th">ค้นหารหัสโปรโมชันสินค้า</value>
         <value xml:lang="zh">查找产品促销代码</value>
     </property>
+    <property key="PageTitleFindProductStocktake">
+        <value xml:lang="en">Find Product Stocktake</value>
+        <value xml:lang="it">Ricerca prodotti in stock</value>
+    </property>
     <property key="PageTitleFindSubscription">
         <value xml:lang="de">Abonnemente suchen</value>
         <value xml:lang="en">Find Subscription</value>
@@ -5423,8 +5427,7 @@
         <value xml:lang="it">Schedulazione Spedizione Pacchi</value>
         <value xml:lang="ro">Planificare Expediere Pachete</value>
         <value xml:lang="ru">Планирование поставки мест</value>
-        <value xml:lang="th">ตารางการขนส่งหีบห่อ
-        </value>
+        <value xml:lang="th">ตารางการขนส่งหีบห่อ</value>
         <value xml:lang="zh">包装货运计划</value>
     </property>
     <property key="PageTitlePickList">
@@ -5468,8 +5471,7 @@
         <value xml:lang="it">Prelievo : Mostra Inizio Prelievo</value>
         <value xml:lang="ro">Prelievo : Afiseaza Inceput Preluare</value>
         <value xml:lang="ru">Сортировка: просмотр начальных сортировок</value>
-        <value xml:lang="th">การเลือก : แสดงการเลือกเริ่มต้น
-        </value>
+        <value xml:lang="th">การเลือก : แสดงการเลือกเริ่มต้น</value>
         <value xml:lang="zh">分拣：浏览已开始的分拣</value>
     </property>
     <property key="PageTitleProductExport">
@@ -5527,6 +5529,10 @@
         <value xml:lang="th">ค้นหาผลลัพธ์</value>
         <value xml:lang="zh">搜索结果</value>
     </property>
+    <property key="PageTitleProductStocktake">
+        <value xml:lang="en">Product Stocktake</value>
+        <value xml:lang="it">Prodotti in stock</value>
+    </property>
     <property key="PageTitleTransferInventoryItem">
         <value xml:lang="de">Bestandspositionen transferieren von ${facility.facilityName} [${facility.facilityId}]</value>
         <value xml:lang="en">Transfer Inventory Item From ${facility.facilityName} [${facility.facilityId}]</value>
@@ -9840,6 +9846,10 @@
         <value xml:lang="th">โปรแกรมประยุกต์ใช้การจัดการคลังสินค้า</value>
         <value xml:lang="zh">场所管理应用程序</value>
     </property>
+    <property key="ProductFacilityMovement">
+        <value xml:lang="en">Movement</value>
+        <value xml:lang="it">Movimenti</value>
+    </property>
     <property key="ProductFacilityNameId">
         <value xml:lang="de">Einrichtung Namen [ID]</value>
         <value xml:lang="en">Facility Name [ID]</value>
@@ -18522,7 +18532,7 @@
     </property>
     <property key="ProductSubscriptionCommEvent">
         <value xml:lang="de">Abonnement Kommunikationsereignis</value>
-        <value xml:lang="en">Subscription Communication Event</value>
+        <value xml:lang="en">k Communication Event</value>
         <value xml:lang="es">Evento de comunicación de suscripción</value>
         <value xml:lang="fr">Evènement de communication d'abonnement</value>
         <value xml:lang="it">Evento Comunicazioni Abbonamento</value>
@@ -18552,6 +18562,10 @@
         <value xml:lang="th">แหล่งข้อมูลการสั่งซื้อ</value>
         <value xml:lang="zh">订阅资源</value>
     </property>
+    <property key="ProductSubscriptionResourceViewPermissionError">
+        <value xml:lang="en">Subscription Resource View Permission Error</value>
+        <value xml:lang="it">Errore permesso per visualizzazione sottoscrizione risorse</value>
+    </property>
     <property key="ProductSubscriptions">
         <value xml:lang="de">Abonnemente</value>
         <value xml:lang="en">Subscriptions</value>
@@ -18563,6 +18577,10 @@
         <value xml:lang="th">การสั่งซื้อ</value>
         <value xml:lang="zh">订阅</value>
     </property>
+    <property key="ProductSubscriptionViewPermissionError">
+        <value xml:lang="en">Subscription View Permission Error</value>
+        <value xml:lang="it">Errore permesso per visualizzazione sottoscrizione</value>
+    </property>
     <property key="ProductSupplier">
         <value xml:lang="de">Lieferant</value>
         <value xml:lang="en">Supplier</value>
@@ -19253,6 +19271,10 @@
         <value xml:lang="th">พยายามแทนที่เหล่านี้</value>
         <value xml:lang="zh">尝试这些而不是</value>
     </property>
+    <property key="ProductUPCA">
+        <value xml:lang="en">UPCA</value>
+        <value xml:lang="it">UPCA</value>
+    </property>
     <property key="ProductUpdateCategories">
         <value xml:lang="de">Kategorien aktualisieren</value>
         <value xml:lang="en">Update Categories</value>

Modified: ofbiz/trunk/applications/product/webapp/catalog/category/createProductInCategoryCheckExisting.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/createProductInCategoryCheckExisting.ftl?rev=746406&r1=746405&r2=746406&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/category/createProductInCategoryCheckExisting.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/category/createProductInCategoryCheckExisting.ftl Fri Feb 20 22:53:32 2009
@@ -25,7 +25,7 @@
         <h3>
             <b>${uiLabelMap.ProductCheckingForExistingProductInCategory} <#if (productCategory.description)?has_content>"${productCategory.description}"</#if> [${uiLabelMap.CommonId}:${productCategoryId?if_exists}]</b>
             <#if productFeatureAndTypeDatas?has_content>
-            ${uiLabelMap.CommonWhere }
+            ${uiLabelMap.CommonWhere}
                 <#list productFeatureAndTypeDatas as productFeatureAndTypeData>
                     <#assign productFeatureType = productFeatureAndTypeData.productFeatureType>
                     <#assign productFeature = productFeatureAndTypeData.productFeature>

Modified: ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml?rev=746406&r1=746405&r2=746406&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml Fri Feb 20 22:53:32 2009
@@ -93,9 +93,9 @@
                                 <decorator-section-include name="body"/>
                             </widgets>
                             <fail-widgets>
-                                <label style="h3">${uiLabelMap.SubscriptionViewPermissionError}</label>
+                                <label style="h3">${uiLabelMap.ProductSubscriptionViewPermissionError}</label>
                             </fail-widgets>
-                        </section>                    
+                        </section>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -218,9 +218,9 @@
                                 <decorator-section-include name="body"/>
                             </widgets>
                             <fail-widgets>
-                                <label style="h3">${uiLabelMap.SubscriptionResourceViewPermissionError}</label>
+                                <label style="h3">${uiLabelMap.ProductSubscriptionResourceViewPermissionError}</label>
                             </fail-widgets>
-                        </section>                    
+                        </section>
                     </decorator-section>
                 </decorator-screen>
             </widgets>

Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml?rev=746406&r1=746405&r2=746406&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml Fri Feb 20 22:53:32 2009
@@ -424,7 +424,7 @@
         <field name="workEffortTypeId"><display-entity entity-name="WorkEffortType"/></field>
         <field name="workEffortPurposeTypeId"><display-entity entity-name="WorkEffortPurposeType"/></field>
         <field name="detailLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="Detail" target="ListChildWorkEffort?trail=${workEffortId}"/>
+            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDetail}" target="ListChildWorkEffort?trail=${workEffortId}"/>
         </field>
         <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
             <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeWorkEffort?workEffortId=${workEffortId}"/>
@@ -507,8 +507,8 @@
             </drop-down>
         </field>
         
-        <field name="partyIdFrom" title="${uiLabelMap.CommonPartyID} ${uiLabelMap.CommonFrom}"><lookup target-form-name="LookupPartyName"/></field>
-        <field name="partyIdTo" title="${uiLabelMap.CommonPartyID} ${uiLabelMap.CommonTo}"><lookup target-form-name="LookupPartyName"/></field>
+        <field name="partyIdFrom" title="${uiLabelMap.PartyPartyId} ${uiLabelMap.CommonFrom}"><lookup target-form-name="LookupPartyName"/></field>
+        <field name="partyIdTo" title="${uiLabelMap.PartyPartyId} ${uiLabelMap.CommonTo}"><lookup target-form-name="LookupPartyName"/></field>
         <field name="statusId" use-when="communicationEvent==null" title="${uiLabelMap.CommonStatus}">
             <drop-down>
                 <entity-options description="${description}" entity-name="StatusItem" key-field-name="statusId">
@@ -601,10 +601,10 @@
         <field name="communicationEventId">
             <hyperlink description="${communicationEventId}" target="EditWorkEffortCommEvent?communicationEventId=${communicationEventId}&amp;DONE_PAGE=${donePage}" target-type="intra-app"/>
         </field>
-        <field name="partyIdFrom" title="${uiLabelMap.CommonPartyId} ${uiLabelMap.CommonFrom}">
+        <field name="partyIdFrom" title="${uiLabelMap.PartyPartyId} ${uiLabelMap.CommonFrom}">
             <display-entity description="${firstName} ${lastName} ${groupName} [${partyId}]" entity-name="PartyNameView" key-field-name="partyId"/>
         </field>
-        <field name="partyIdTo" title="${uiLabelMap.CommonPartyId} ${uiLabelMap.CommonTo}">
+        <field name="partyIdTo" title="${uiLabelMap.PartyPartyId} ${uiLabelMap.CommonTo}">
             <display-entity description="${firstName} ${lastName} ${groupName} [${partyId}]" entity-name="PartyNameView" key-field-name="partyId"/>
         </field>
         <field name="statusId">
@@ -640,8 +640,8 @@
     <form name="LookupCommEvent" target="LookupCommEvent" title="" type="single"
         header-row-style="header-row" default-table-style="basic-table">
         <field name="communicationEventId" title="${uiLabelMap.WorkEffortCommEventId}"><text-find/></field>
-        <field name="partyIdFrom" title="${uiLabelMap.CommonPartyID} ${uiLabelMap.CommonFrom}"><lookup target-form-name="LookupPartyName"/></field>
-        <field name="partyIdTo" title="${uiLabelMap.CommonPartyID} ${uiLabelMap.CommonTo}"><lookup target-form-name="LookupPartyName"/></field>
+        <field name="partyIdFrom" title="${uiLabelMap.PartyPartyId} ${uiLabelMap.CommonFrom}"><lookup target-form-name="LookupPartyName"/></field>
+        <field name="partyIdTo" title="${uiLabelMap.PartyPartyId} ${uiLabelMap.CommonTo}"><lookup target-form-name="LookupPartyName"/></field>
         <field name="statusId">
             <drop-down allow-empty="true">
                 <entity-options description="${description}" entity-name="StatusItem">
@@ -680,10 +680,10 @@
         <field name="communicationEventId" title="${uiLabelMap.WorkEffortCommEventId}" widget-style="buttontext">
             <hyperlink also-hidden="false" description="${communicationEventId}" target="javascript:set_value('${communicationEventId}')" target-type="plain"/>
         </field>
-        <field name="partyIdFrom" title="${uiLabelMap.CommonPartyId} ${uiLabelMap.CommonFrom}">
+        <field name="partyIdFrom" title="${uiLabelMap.PartyPartyId} ${uiLabelMap.CommonFrom}">
             <display-entity description="${firstName} ${lastName} ${groupName} [${partyId}]" entity-name="PartyNameView" key-field-name="partyId"/>
         </field>
-        <field name="partyIdTo" title="${uiLabelMap.CommonPartyId} ${uiLabelMap.CommonTo}">
+        <field name="partyIdTo" title="${uiLabelMap.PartyPartyId} ${uiLabelMap.CommonTo}">
             <display-entity description="${firstName} ${lastName} ${groupName} [${partyId}]" entity-name="PartyNameView" key-field-name="partyId"/>
         </field>
         <field name="statusId">

Modified: ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/assetmaint/printFixedAssetMaint.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/assetmaint/printFixedAssetMaint.fo.ftl?rev=746406&r1=746405&r2=746406&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/assetmaint/printFixedAssetMaint.fo.ftl (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/assetmaint/printFixedAssetMaint.fo.ftl Fri Feb 20 22:53:32 2009
@@ -164,7 +164,7 @@
       <fo:table-column column-width="80%"/>
       <fo:table-header>
         <fo:table-row>
-          <fo:table-cell><fo:block font-weight="bold">${uiLabelMap.FixedAssetMaintItemIssuance}</fo:block></fo:table-cell>
+          <fo:table-cell><fo:block font-weight="bold">${uiLabelMap.AssetMaintItemIssuance}</fo:block></fo:table-cell>
           <fo:table-cell text-align="center"><fo:block font-weight="bold">${uiLabelMap.OrderQuantity}</fo:block></fo:table-cell>
         </fo:table-row>        
       </fo:table-header>

Modified: ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/forms/FacilityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/forms/FacilityForms.xml?rev=746406&r1=746405&r2=746406&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/forms/FacilityForms.xml (original)
+++ ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/forms/FacilityForms.xml Fri Feb 20 22:53:32 2009
@@ -34,7 +34,7 @@
     <form name="POEnter" type="single" target="polinereceipt"
             default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
         <field name="facilityId"><hidden/></field>
-        <field name="OrderId" required-field="true" title="PO Number"><text size="10"/></field>
+        <field name="OrderId" required-field="true" title="${uiLabelMap.OrderPONumber}"><text size="10"/></field>
         <field name="submitButton" title="${uiLabelMap.CommonNext}" widget-style="standardSubmit"><submit button-type="button"/></field>
     </form>
 
@@ -54,7 +54,7 @@
         <field name="productId" entry-name="product.productId" ><display/></field>
         <field name="productName" title="${uiLabelMap.CommonEmptyHeader}" entry-name="product.productName" ><display/></field>
         <field name="productLocation" event="onkeypress" action="return enter(event,document.forms[0].productQty)"><text size="10"/></field>
-        <field name="productQty" required-field="true" title="Qty" ><text default-value="1" size="5"/></field>
+        <field name="productQty" required-field="true" title="${uiLabelMap.CommonQty}" ><text default-value="1" size="5"/></field>
         <field name="submitButton" title="${uiLabelMap.ProductReceiveProduct}" widget-style="standardSubmit"><submit button-type="button"/></field>
     </form>
 

Modified: ofbiz/trunk/specialpurpose/hhfacility/widget/hhfacility/FacilityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/hhfacility/widget/hhfacility/FacilityScreens.xml?rev=746406&r1=746405&r2=746406&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/hhfacility/widget/hhfacility/FacilityScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/hhfacility/widget/hhfacility/FacilityScreens.xml Fri Feb 20 22:53:32 2009
@@ -105,7 +105,7 @@
                 <decorator-screen name="FacilityDecorator">
                     <decorator-section name="body">
                         <container>
-                            <label style="h1">PO Receipt</label>
+                            <label style="h1">${uiLabelMap.ProductReceiptPurchaseOrder}</label>
                         </container>
                         <include-form name="POEnter" location="component://hhfacility/webapp/hhfacility/forms/FacilityForms.xml"/>
                     </decorator-section>
@@ -120,7 +120,7 @@
                 <decorator-screen name="FacilityDecorator">
                     <decorator-section name="body">
                         <container>
-                            <label style="h1">PO Line Receipt</label>
+                            <label style="h1">${uiLabelMap.ProductReceiptPurchaseOrder}</label>
                         </container>
                     </decorator-section>
                 </decorator-screen>
@@ -137,7 +137,7 @@
                 <decorator-screen name="FacilityDecorator">
                     <decorator-section name="body">
                         <container>
-                            <label style="h1">Product Receipt</label>
+                            <label style="h1">${uiLabelMap.ProductReceipt}</label>
                         </container>
                         <include-form name="ProductEnter" location="component://hhfacility/webapp/hhfacility/forms/FacilityForms.xml"/>
                         <platform-specific><html><html-template location="component://hhfacility/webapp/hhfacility/setFocusOnField.ftl"/></html></platform-specific>
@@ -171,7 +171,7 @@
                 <decorator-screen name="FacilityDecorator">
                     <decorator-section name="body">
                         <container>
-                            <label style="h1">Movement</label>
+                            <label style="h1">${uiLabelMap.ProductFacilityMovement}</label>
                         </container>
                     </decorator-section>
                 </decorator-screen>
@@ -217,7 +217,7 @@
                 <decorator-screen name="FacilityDecorator">
                     <decorator-section name="body">
                         <container>
-                            <label style="h1">Find Product Stocktake</label>
+                            <label style="h1">${uiLabelMap.PageTitleFindProductStocktake}</label>
                         </container>
                         <include-form name="FindProductStock" location="component://hhfacility/webapp/hhfacility/forms/FacilityForms.xml"/>
                         <platform-specific><html><html-template location="component://hhfacility/webapp/hhfacility/stocktake.ftl"/></html></platform-specific>
@@ -238,7 +238,7 @@
                 <decorator-screen name="FacilityDecorator">
                     <decorator-section name="body">
                         <container>
-                            <label style="h1">Stocktake</label>
+                            <label style="h1">${uiLabelMap.PageTitleProductStocktake}</label>
                         </container>
                         <include-form name="ProductStocktake" location="component://hhfacility/webapp/hhfacility/forms/FacilityForms.xml"/>
                         <include-form name="UpdateProductStocktake" location="component://hhfacility/webapp/hhfacility/forms/FacilityForms.xml"/>

Modified: ofbiz/trunk/specialpurpose/mypage/config/MyPageUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/config/MyPageUiLabels.xml?rev=746406&r1=746405&r2=746406&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/config/MyPageUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/config/MyPageUiLabels.xml Fri Feb 20 22:53:32 2009
@@ -31,6 +31,10 @@
         <value xml:lang="it">Mia pagina</value>
         <value xml:lang="th">แอปพริเคชันของฉัน</value>
     </property>
+    <property key="MyPageAttachFile">
+        <value xml:lang="en">Attach File</value>
+        <value xml:lang="it">Allega file</value>
+    </property>
     <property key="MyPageCommunicationEventId">
         <value xml:lang="en">Communication Event id:</value>
         <value xml:lang="fr">Réf. d'évènement de comm.</value>

Modified: ofbiz/trunk/specialpurpose/mypage/webapp/mypage/addAttachFile.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/webapp/mypage/addAttachFile.ftl?rev=746406&r1=746405&r2=746406&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/webapp/mypage/addAttachFile.ftl (original)
+++ ofbiz/trunk/specialpurpose/mypage/webapp/mypage/addAttachFile.ftl Fri Feb 20 22:53:32 2009
@@ -1,10 +1,10 @@
   <div id="partyContent" class="screenlet">
     <div class="screenlet-title-bar">
-      <h3>Attach File</h3>
+      <h3>${uiLabelMap.MyPageAttachFile}</h3>
     </div>
     <div class="screenlet-body">
 
-      <div class="label">${uiLabelMap.Attach}</div>
+      <div class="label">${uiLabelMap.MyPageAttachFile}</div>
       <form id="uploadPartyContent" method="post" enctype="multipart/form-data" action="<@ofbizUrl>uploadAttachFiletoEmail</@ofbizUrl>">
         <input type="hidden" name="dataCategoryId" value="PERSONAL"/>
         <input type="hidden" name="contentTypeId" value="DOCUMENT"/>
@@ -15,7 +15,7 @@
         <input type="hidden" name="communicationEventId" value="${communicationEventId}"/>  
         <input type="hidden" name="communicationEventTypeId" value="${communicationEventTypeId}"/>        
         <input type="hidden" name="parentCommEventId" value="${parameters.parentCommEventId?if_exists}"/>
- <input type="hidden" name="originalCommEventId" value="${parameters.originalCommEventId?if_exists}"/>
+        <input type="hidden" name="originalCommEventId" value="${parameters.originalCommEventId?if_exists}"/>
               
         <input type="file" name="uploadedFile" size="25" id="uploadedFile"/>
         <input type="submit" value="${uiLabelMap.CommonUpload}"/><br><br>

Modified: ofbiz/trunk/specialpurpose/mypage/webapp/mypage/attachFileList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/webapp/mypage/attachFileList.ftl?rev=746406&r1=746405&r2=746406&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/webapp/mypage/attachFileList.ftl (original)
+++ ofbiz/trunk/specialpurpose/mypage/webapp/mypage/attachFileList.ftl Fri Feb 20 22:53:32 2009
@@ -1,19 +1,19 @@
   <div id="partyContentList">  
     <div class="screenlet-title-bar">
-      <h3>Attached file</h3>
+      <h3>${uiLabelMap.MyPageAttachFile}</h3>
     </div>
     <div class="screenlet-body">
       <#if commEventContent?has_content>
         <table class="basic-table" cellspacing="0">
           <#list commEventContent as commContent>
-           <#list partyContent as pContent>
-   <#assign partyId = pContent.partyId/>
-   <#if commContent.contentId == pContent.contentId>
-   <#assign content = pContent.getRelatedOne("Content")>
-   <#assign fromDate = commContent.fromDate>
-   <#assign ptype = pContent.partyContentTypeId/>
-   </#if>
-   </#list>
+              <#list partyContent as pContent>
+                   <#assign partyId = pContent.partyId/>
+                   <#if commContent.contentId == pContent.contentId>
+                       <#assign content = pContent.getRelatedOne("Content")>
+                       <#assign fromDate = commContent.fromDate>
+                       <#assign ptype = pContent.partyContentTypeId/>
+                   </#if>
+               </#list>
             <tr>
               <td width="30%">
               <#if content?has_content>

Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml?rev=746406&r1=746405&r2=746406&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml Fri Feb 20 22:53:32 2009
@@ -261,7 +261,7 @@
         <field name="datetimeStarted" title="${uiLabelMap.CommonSendDate}"><date-time/></field>
         <field name="subject"><text size="60" default-value="${parameters.subject}"/></field>
         <field name="fileAttach"><display/></field><field name="fileAttach">
-            <hyperlink target="addAttachmentEmail?communicationEventTypeId=${parameters.communicationEventTypeId}&amp;partyId=${userLogin.partyId}&amp;communicationEventId=${parameters.communicationEventId}" description="Attach File"/>
+            <hyperlink target="addAttachmentEmail?communicationEventTypeId=${parameters.communicationEventTypeId}&amp;partyId=${userLogin.partyId}&amp;communicationEventId=${parameters.communicationEventId}" description="${uiLabelMap.MyPageAttachFile}"/>
         </field>
         <field name="contentMimeTypeId"><hidden value="text/plain"/></field>
         <field name="content" title="${uiLabelMap.CommonContent}"><textarea cols="80" rows="20" default-value="${parameters.content}"/></field>

Modified: ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml?rev=746406&r1=746405&r2=746406&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml Fri Feb 20 22:53:32 2009
@@ -118,6 +118,14 @@
         <value xml:lang="it">Proprie informazioni</value>
         <value xml:lang="th">ข้อมูลของฉัน</value>
     </property>
+    <property key="MyPortalMyTasks">
+        <value xml:lang="en">myTasks</value>
+        <value xml:lang="it">Propri compiti</value>
+    </property>
+    <property key="MyPortalMyTime">
+        <value xml:lang="en">myTime</value>
+        <value xml:lang="it">Propri tempo</value>
+    </property>
     <property key="MyPortalNewMessage">
         <value xml:lang="en">New Message</value>
         <value xml:lang="fr">Nouveau message</value>

Modified: ofbiz/trunk/specialpurpose/myportal/webapp/myportal/addAttachFile.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/webapp/myportal/addAttachFile.ftl?rev=746406&r1=746405&r2=746406&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/webapp/myportal/addAttachFile.ftl (original)
+++ ofbiz/trunk/specialpurpose/myportal/webapp/myportal/addAttachFile.ftl Fri Feb 20 22:53:32 2009
@@ -1,10 +1,10 @@
   <div id="partyContent" class="screenlet">
     <div class="screenlet-title-bar">
-      <h3>Attach File</h3>
+      <h3>${uiLabelMap.MyPageAttachFile}</h3>
     </div>
     <div class="screenlet-body">
 
-      <div class="label">${uiLabelMap.Attach}</div>
+      <div class="label">${uiLabelMap.MyPageAttachFile}</div>
       <form id="uploadPartyContent" method="post" enctype="multipart/form-data" action="<@ofbizUrl>uploadAttachFiletoEmail</@ofbizUrl>">
         <input type="hidden" name="dataCategoryId" value="PERSONAL"/>
         <input type="hidden" name="contentTypeId" value="DOCUMENT"/>
@@ -15,11 +15,11 @@
         <input type="hidden" name="communicationEventId" value="${communicationEventId}"/>  
         <input type="hidden" name="communicationEventTypeId" value="${communicationEventTypeId}"/>        
         <input type="hidden" name="parentCommEventId" value="${parameters.parentCommEventId?if_exists}"/>
- <input type="hidden" name="originalCommEventId" value="${parameters.originalCommEventId?if_exists}"/>
+        <input type="hidden" name="originalCommEventId" value="${parameters.originalCommEventId?if_exists}"/>
               
         <input type="file" name="uploadedFile" size="25" id="uploadedFile"/>
         <input type="submit" value="${uiLabelMap.CommonUpload}"/><br><br>
-        <input type="button" value="Back" onClick="javascript:history.go(-1);">
+        <input type="button" value="${uiLabelMap.CommonBack}" onClick="javascript:history.go(-1);">
       </form>
       <div id='progress_bar'><div></div></div>
     </div>

Modified: ofbiz/trunk/specialpurpose/myportal/webapp/myportal/attachFileList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/webapp/myportal/attachFileList.ftl?rev=746406&r1=746405&r2=746406&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/webapp/myportal/attachFileList.ftl (original)
+++ ofbiz/trunk/specialpurpose/myportal/webapp/myportal/attachFileList.ftl Fri Feb 20 22:53:32 2009
@@ -1,19 +1,19 @@
   <div id="partyContentList">  
     <div class="screenlet-title-bar">
-      <h3>Attached file</h3>
+      <h3>${uiLabelMap.MyPageAttachFile}</h3>
     </div>
     <div class="screenlet-body">
       <#if commEventContent?has_content>
         <table class="basic-table" cellspacing="0">
           <#list commEventContent as commContent>
-           <#list partyContent as pContent>
-   <#assign partyId = pContent.partyId/>
-   <#if commContent.contentId == pContent.contentId>
-   <#assign content = pContent.getRelatedOne("Content")>
-   <#assign fromDate = commContent.fromDate>
-   <#assign ptype = pContent.partyContentTypeId/>
-   </#if>
-   </#list>
+              <#list partyContent as pContent>
+                   <#assign partyId = pContent.partyId/>
+                   <#if commContent.contentId == pContent.contentId>
+                       <#assign content = pContent.getRelatedOne("Content")>
+                       <#assign fromDate = commContent.fromDate>
+                       <#assign ptype = pContent.partyContentTypeId/>
+                   </#if>
+               </#list>
             <tr>
               <td width="30%">
               <#if content?has_content>

Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml?rev=746406&r1=746405&r2=746406&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml Fri Feb 20 22:53:32 2009
@@ -283,7 +283,7 @@
         <field name="datetimeStarted" title="${uiLabelMap.CommonSendDate}"><date-time/></field>
         <field name="subject"><text size="60" default-value="${parameters.subject}"/></field>
         <field name="fileAttach"><display/></field><field name="fileAttach">
-            <hyperlink target="addAttachmentEmail?communicationEventTypeId=${parameters.communicationEventTypeId}&amp;partyId=${userLogin.partyId}&amp;communicationEventId=${parameters.communicationEventId}" description="Attach File"/>
+            <hyperlink target="addAttachmentEmail?communicationEventTypeId=${parameters.communicationEventTypeId}&amp;partyId=${userLogin.partyId}&amp;communicationEventId=${parameters.communicationEventId}" description="${uiLabelMap.MyPageAttachFile}"/>
         </field>
         <field name="contentMimeTypeId"><hidden value="text/plain"/></field>
         <field name="content" title="${uiLabelMap.CommonContent}"><textarea cols="80" rows="20" default-value="${parameters.content}"/></field>

Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml?rev=746406&r1=746405&r2=746406&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml Fri Feb 20 22:53:32 2009
@@ -68,7 +68,7 @@
     </menu>    
     
     <menu name="MyTasksMenu" type="simple" menu-container-style="button-bar button-style-2" default-selected-style="selected" selected-menuitem-context-field-name="tabButtonItem">
-        <menu-item name="myTasks" title="myTasks"><link target="/projectmgr/control/MyTasks" url-mode="inter-app"/></menu-item>
+        <menu-item name="myTasks" title="${uiLabelMap.MyPortalMyTasks}"><link target="/projectmgr/control/MyTasks" url-mode="inter-app"/></menu-item>
     </menu>
     
     <menu name="MyTimesheetMenu">
@@ -90,7 +90,7 @@
             </condition>
             <link target="statusToCompleteKey?timesheetId=${timesheet.timesheetId}&amp;statusId=TIMESHEET_COMPLETED"/>
         </menu-item>
-        <menu-item name="myTime" title="myTime"><link target="/projectmgr/control/MyTimesheet" url-mode="inter-app"/></menu-item>
+        <menu-item name="myTime" title="${uiLabelMap.MyPortalMyTime}"><link target="/projectmgr/control/MyTimesheet" url-mode="inter-app"/></menu-item>
     </menu>
     <menu name="CommSubTabBar" menu-container-style="button-bar button-style-2">
         <menu-item name="new" title="${uiLabelMap.PartyNewCommunication}">