You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mr...@apache.org on 2009/02/22 11:45:16 UTC

svn commit: r746654 - in /ofbiz/trunk: applications/accounting/config/ applications/accounting/webapp/accounting/payment/ applications/content/config/ applications/humanres/widget/forms/ applications/marketing/config/ applications/marketing/widget/sfa/...

Author: mrisaliti
Date: Sun Feb 22 10:45:15 2009
New Revision: 746654

URL: http://svn.apache.org/viewvc?rev=746654&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/webapp/accounting/payment/PaymentForms.xml
    ofbiz/trunk/applications/content/config/ContentUiLabels.xml
    ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml
    ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml
    ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml
    ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml
    ofbiz/trunk/applications/order/webapp/ordermgr/entry/PartySettingsForm.xml
    ofbiz/trunk/applications/product/config/ProductUiLabels.xml
    ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml
    ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml
    ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml
    ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml
    ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
    ofbiz/trunk/specialpurpose/shark/config/SharkUiLabels.xml
    ofbiz/trunk/specialpurpose/shark/widget/ProcessScreens.xml

Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=746654&r1=746653&r2=746654&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Sun Feb 22 10:45:15 2009
@@ -147,13 +147,6 @@
         <value xml:lang="nl">Afstemmingen</value>
         <value xml:lang="th">การเช็คยอดบัญชี</value>
     </property>
-    <property key="AccountingAcctgTransEntries">
-        <value xml:lang="en">Accounting Transactions Entries</value>
-        <value xml:lang="fr">Entrées de transactions comptables</value>
-        <value xml:lang="it">Righe Prime Note</value>
-        <value xml:lang="nl">Ingaves Boekhoudtransacties</value>
-        <value xml:lang="th">รายการบัญชีรายรับ</value>
-    </property>
     <property key="AccountingAcctgTrans">
         <value xml:lang="en">Accounting Transactions</value>
         <value xml:lang="fr">Transactions comptables</value>
@@ -161,6 +154,13 @@
         <value xml:lang="nl">Boekhoudtransacties</value>
         <value xml:lang="th">รายการบัญชี</value>
     </property>
+    <property key="AccountingAcctgTransEntries">
+        <value xml:lang="en">Accounting Transactions Entries</value>
+        <value xml:lang="fr">Entrées de transactions comptables</value>
+        <value xml:lang="it">Righe Prime Note</value>
+        <value xml:lang="nl">Ingaves Boekhoudtransacties</value>
+        <value xml:lang="th">รายการบัญชีรายรับ</value>
+    </property>
     <property key="AccountingActualCurrencyAmount">
         <value xml:lang="en">Actual Currency Amount</value>
         <value xml:lang="fr">Valeur réelle en devise</value>
@@ -5613,14 +5613,6 @@
         <value xml:lang="fr">Assigner un méthode de paiement à un type de compte</value>
         <value xml:lang="it">Assegna Metodo Pagamento a Tipo Conto Gl</value>
     </property>
-    <property key="AccountingPaymentMethodId........">
-        <value xml:lang="en">AccountingPaymentMethodId........</value>
-        <value xml:lang="fr">Réf. de méthode de paiement      </value>
-        <value xml:lang="it">Metodo di pagamento..............</value>
-        <value xml:lang="nl">AccountingPaymentMethodId........</value>
-        <value xml:lang="ro">No values are passed............???</value>
-        <value xml:lang="th">รหัสวิธีการชำระเงิน............???</value>
-    </property>
     <property key="AccountingPaymentMethodId">
         <value xml:lang="en">Payment Method Id</value>
         <value xml:lang="es">Id Metodo de Pago</value>
@@ -5632,6 +5624,14 @@
         <value xml:lang="th">รหัสวิธีการชำระเงิน</value>
         <value xml:lang="zh">支付方法标识</value>
     </property>
+    <property key="AccountingPaymentMethodId........">
+        <value xml:lang="en">AccountingPaymentMethodId........</value>
+        <value xml:lang="fr">Réf. de méthode de paiement      </value>
+        <value xml:lang="it">Metodo di pagamento..............</value>
+        <value xml:lang="nl">AccountingPaymentMethodId........</value>
+        <value xml:lang="ro">No values are passed............???</value>
+        <value xml:lang="th">รหัสวิธีการชำระเงิน............???</value>
+    </property>
     <property key="AccountingPaymentMethodIdPaymentMethodTypeIdNullError">
         <value xml:lang="en">No values are passed for paymentMethodId or paymentMethodTypeId. At least pass paymentMethodId.</value>
         <value xml:lang="es">Ningun valor pasado para IdMetodoPago o IdTipoMetodoPago. Al menos pasar IdMetodoPago.</value>
@@ -7412,6 +7412,10 @@
         <value xml:lang="ru">Фактический остаток</value>
         <value xml:lang="th">ยอดเงินจริง</value>
     </property>
+    <property key="FormFieldTitle_actualCurrencyAmount">
+        <value xml:lang="en">Actual Currency Amount</value>
+        <value xml:lang="it">Importo attuale in valuta</value>
+    </property>
     <property key="FormFieldTitle_actualEndOfLife">
         <value xml:lang="de">Ist-Lebensdauer</value>
         <value xml:lang="en">Actual End Of Life</value>
@@ -7423,6 +7427,10 @@
         <value xml:lang="th">Actual End Of Life</value>
         <value xml:lang="zh">实际使用寿命</value>
     </property>
+    <property key="FormFieldTitle_addSurveyResponse">
+        <value xml:lang="en">Add Survey Response</value>
+        <value xml:lang="it">Aggiungi risposta sondaggio</value>
+    </property>
     <property key="FormFieldTitle_agreementDate">
         <value xml:lang="ar">تاريخ الإتفاقية</value>
         <value xml:lang="de">Vereinbarungsdatum</value>

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml?rev=746654&r1=746653&r2=746654&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml Sun Feb 22 10:45:15 2009
@@ -227,7 +227,7 @@
             </drop-down>
         </field>
         <field name="actualAmount" position="1" title="${uiLabelMap.AccountingActualCurrencyAmount}"><text/></field>
-        <field position="2" name="actualCurrencyUomId" title="${uiLabelMap.AccountingActualCurrencyUomId}">
+        <field name="actualCurrencyUomId" position="2" title="${uiLabelMap.AccountingActualCurrencyUomId}">
             <drop-down allow-empty="true" no-current-selected-key="${uomId}">
                 <entity-options key-field-name="uomId" description="${abbreviation} - ${description}" entity-name="Uom">
                     <entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/>
@@ -387,7 +387,7 @@
         <field name="paymentRefNum" position="1"><display/></field>
         <field name="paymentPreferenceId" position="2"><display/></field>
         <field name="amount" position="1"><display type="currency" currency="${payment.currencyUomId}"/></field>
-        <field name="actualCurrencyAmount" position="2"><display type="currency" currency="${payment.actualCurrencyUomId}"/></field>
+        <field name="actualCurrencyAmount" title="${uiLabelMap.AccountingActualCurrencyAmount}" position="2"><display type="currency" currency="${payment.actualCurrencyUomId}"/></field>
         <field name="effectiveDate" position="1"><display type="date"/></field>
         <field name="comments" position="2"><display/></field>
         <!--field name="paymentGatewayResponseId" title="Paym Gatw Resp." position="2"><display/></field-->

Modified: ofbiz/trunk/applications/content/config/ContentUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/config/ContentUiLabels.xml?rev=746654&r1=746653&r2=746654&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/config/ContentUiLabels.xml (original)
+++ ofbiz/trunk/applications/content/config/ContentUiLabels.xml Sun Feb 22 10:45:15 2009
@@ -87,10 +87,6 @@
         <value xml:lang="fr">Blog</value>
         <value xml:lang="it">Blog</value>
     </property>
-    <property key="ContentBlogs">
-        <value xml:lang="en">Blogs</value>
-        <value xml:lang="it">Blogs</value>
-    </property>
     <property key="ContentBlogArticle">
         <value xml:lang="en">Article</value>
         <value xml:lang="fr">Article</value>
@@ -123,14 +119,14 @@
         <value xml:lang="en">Summary</value>
         <value xml:lang="fr">Summario</value>
     </property>
+    <property key="ContentBlogs">
+        <value xml:lang="en">Blogs</value>
+        <value xml:lang="it">Blogs</value>
+    </property>
     <property key="ContentBrowse">
         <value xml:lang="en">Browse</value>
         <value xml:lang="fr">Sfoglia</value>
     </property>
-    <property key="ContentClip">
-        <value xml:lang="en">Clip</value>
-        <value xml:lang="it">Taglia</value>
-    </property>
     <property key="ContentCMS">
         <value xml:lang="ar">CMS</value>
         <value xml:lang="de">CMS</value>
@@ -183,6 +179,10 @@
         <value xml:lang="th">เซ็ตลักษณะ</value>
         <value xml:lang="zh">字符集</value>
     </property>
+    <property key="ContentClip">
+        <value xml:lang="en">Clip</value>
+        <value xml:lang="it">Taglia</value>
+    </property>
     <property key="ContentCloneLayout">
         <value xml:lang="de">Layout duplizieren</value>
         <value xml:lang="en">Clone Layout</value>
@@ -209,6 +209,10 @@
         <value xml:lang="en">+Aft</value>
         <value xml:lang="it">+Dopo</value>
     </property>
+    <property key="ContentCompDocApprovalStatus">
+        <value xml:lang="en">Approval Status</value>
+        <value xml:lang="it">Stato approvazione</value>
+    </property>
     <property key="ContentCompDocApprovals">
         <value xml:lang="de">Genehmigungen</value>
         <value xml:lang="en">Approvals</value>
@@ -223,10 +227,6 @@
         <value xml:lang="it">Approvazioni Contenuto</value>
         <value xml:lang="th">หัวข้อความคิดเห็นสำหรับ</value>
     </property>
-    <property key="ContentCompDocApprovalStatus">
-        <value xml:lang="en">Approval Status</value>
-        <value xml:lang="it">Stato approvazione</value>
-    </property>
     <property key="ContentCompDocBefore">
         <value xml:lang="en">+Bef</value>
         <value xml:lang="it">+Prima</value>
@@ -516,10 +516,6 @@
         <value xml:lang="en">Document Type</value>
         <value xml:lang="it">Tipo documento</value>
     </property>
-    <property key="ContentEditingLatestRevision">
-        <value xml:lang="en">Editing Latest Revision</value>
-        <value xml:lang="it">Aggiorna ultima revisione</value>
-    </property>
     <property key="ContentEditProductStore">
         <value xml:lang="ar">تحرير مخزن المنتوج</value>
         <value xml:lang="de">Produktladen bearbeiten</value>
@@ -531,6 +527,10 @@
         <value xml:lang="th">แก้ไขคลังสินค้า</value>
         <value xml:lang="zh">编辑产品店铺</value>
     </property>
+    <property key="ContentEditingLatestRevision">
+        <value xml:lang="en">Editing Latest Revision</value>
+        <value xml:lang="it">Aggiorna ultima revisione</value>
+    </property>
     <property key="ContentFile">
         <value xml:lang="ar">ملف</value>
         <value xml:lang="de">Datei</value>
@@ -654,10 +654,6 @@
         <value xml:lang="it">Messaggi</value>
         <value xml:lang="th">ข้อความ</value>
     </property>
-    <property key="ContentForums">
-        <value xml:lang="en">Forums</value>
-        <value xml:lang="it">Forums</value>
-    </property>
     <property key="ContentForumThread">
         <value xml:lang="de">Thema</value>
         <value xml:lang="en">Thread</value>
@@ -665,6 +661,10 @@
         <value xml:lang="it">Discussione</value>
         <value xml:lang="th">Thread</value>
     </property>
+    <property key="ContentForums">
+        <value xml:lang="en">Forums</value>
+        <value xml:lang="it">Forums</value>
+    </property>
     <property key="ContentGIF">
         <value xml:lang="en">GIF</value>
         <value xml:lang="it">GIF</value>
@@ -771,6 +771,10 @@
         <value xml:lang="fr">Voir vos propres modèles</value>
         <value xml:lang="it">Lista templates personali creati</value>
     </property>
+    <property key="ContentMSWord">
+        <value xml:lang="en">MS Word</value>
+        <value xml:lang="it">MS Word</value>
+    </property>
     <property key="ContentMain">
         <value xml:lang="ar">الرئيسية</value>
         <value xml:lang="de">Primärer</value>
@@ -833,10 +837,6 @@
         <value xml:lang="it">Tipo Mime Template</value>
         <value xml:lang="th">รูปแบบประเภทแบบจำลอง</value>
     </property>
-    <property key="ContentMSWord">
-        <value xml:lang="en">MS Word</value>
-        <value xml:lang="it">MS Word</value>
-    </property>
     <property key="ContentNavigate">
         <value xml:lang="de">Navigieren</value>
         <value xml:lang="en">Navigate</value>
@@ -850,7 +850,7 @@
         <value xml:lang="fr">New Content in Folder</value>
         <value xml:lang="it">New Content in Folder</value>
         <value xml:lang="th">สร้างเนื้อหาใหม่ในกล่อง</value>
-    </property>    
+    </property>
     <property key="ContentNewFolder">
         <value xml:lang="de">New Folder</value>
         <value xml:lang="en">New Folder</value>
@@ -878,14 +878,22 @@
         <value xml:lang="th">หัวข้อ PDF</value>
         <value xml:lang="zh">PDF内容标识</value>
     </property>
-    <property key="ContentPDFSurveyName">
-        <value xml:lang="en">PDF/Survey Name</value>
-        <value xml:lang="it">PDF/Nome sondaggio</value>
+    <property key="ContentPDFFile">
+        <value xml:lang="en">PDF File</value>
+        <value xml:lang="it">File PDF</value>
     </property>
     <property key="ContentPDFFilePath">
         <value xml:lang="en">Enter a PDF file path to automatically create a survey.</value>
         <value xml:lang="it">Inserire un path file PDF che automaticamente creerà un sondaggio.</value>
     </property>
+    <property key="ContentPDFSurveyName">
+        <value xml:lang="en">PDF/Survey Name</value>
+        <value xml:lang="it">PDF/Nome sondaggio</value>
+    </property>
+    <property key="ContentPNG">
+        <value xml:lang="en">PNG</value>
+        <value xml:lang="it">PNG</value>
+    </property>
     <property key="ContentParent">
         <value xml:lang="de">Übergeordneter Inhalt</value>
         <value xml:lang="en">Parent Content</value>
@@ -914,18 +922,10 @@
         <value xml:lang="fr">Liste d'alias de chemin d'accès</value>
         <value xml:lang="it">Lista path alias</value>
     </property>
-    <property key="ContentPDFFile">
-        <value xml:lang="en">PDF File</value>
-        <value xml:lang="it">File PDF</value>
-    </property>
     <property key="ContentPlainText">
         <value xml:lang="en">Plain Text</value>
         <value xml:lang="it">Testo fisso</value>
     </property>
-    <property key="ContentPNG">
-        <value xml:lang="en">PNG</value>
-        <value xml:lang="it">PNG</value>
-    </property>
     <property key="ContentPublishToContent">
         <value xml:lang="en">Publish-to content</value>
         <value xml:lang="it">Pubblica sul contenuto</value>
@@ -950,7 +950,7 @@
     <property key="ContentRejected">
         <value xml:lang="en">Rejected</value>
         <value xml:lang="it">Rifiutato</value>
-    </property>    
+    </property>
     <property key="ContentRenameFolder">
         <value xml:lang="en">Rename Folder</value>
         <value xml:lang="th">เปลี่ยนชื่อกล่อง</value>
@@ -1334,6 +1334,10 @@
         <value xml:lang="th">W/คำถาม</value>
         <value xml:lang="zh">带有问题</value>
     </property>
+    <property key="ContentTIFF">
+        <value xml:lang="en">TIFF</value>
+        <value xml:lang="it">TIFF</value>
+    </property>
     <property key="ContentTemplate">
         <value xml:lang="ar">نموذج</value>
         <value xml:lang="de">Vorlage</value>
@@ -1349,6 +1353,14 @@
         <value xml:lang="en">Template Child</value>
         <value xml:lang="it">Template figlio</value>
     </property>
+    <property key="ContentTemplateImageCentered">
+        <value xml:lang="en">Image centered above</value>
+        <value xml:lang="it">Immagine centrata sopra</value>
+    </property>
+    <property key="ContentTemplateImageLeft">
+        <value xml:lang="en">Image left, text flows around.</value>
+        <value xml:lang="it">Immagine a sinistra.</value>
+    </property>
     <property key="ContentTemplateInstanceChild">
         <value xml:lang="en">Instance Child</value>
         <value xml:lang="it">Istanza figlia</value>
@@ -1361,6 +1373,10 @@
         <value xml:lang="en">Root Instance</value>
         <value xml:lang="it">Istanza principale</value>
     </property>
+    <property key="ContentTemplateTextOnly">
+        <value xml:lang="en">Text only</value>
+        <value xml:lang="it">Solo testo</value>
+    </property>
     <property key="ContentTemplates">
         <value xml:lang="ar">نماذج</value>
         <value xml:lang="de">Vorlagen</value>
@@ -1371,18 +1387,6 @@
         <value xml:lang="th">รูปแบบ</value>
         <value xml:lang="zh">模板</value>
     </property>
-    <property key="ContentTemplateImageCentered">
-        <value xml:lang="en">Image centered above</value>
-        <value xml:lang="it">Immagine centrata sopra</value>
-    </property>
-    <property key="ContentTemplateImageLeft">
-        <value xml:lang="en">Image left, text flows around.</value>
-        <value xml:lang="it">Immagine a sinistra.</value>
-    </property>
-    <property key="ContentTemplateTextOnly">
-        <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>
@@ -1397,10 +1401,6 @@
         <value xml:lang="th">ตัวอักษร</value>
         <value xml:lang="zh">文本</value>
     </property>
-    <property key="ContentTIFF">
-        <value xml:lang="en">TIFF</value>
-        <value xml:lang="it">TIFF</value>
-    </property>
     <property key="ContentTree">
         <value xml:lang="ar">شجرة</value>
         <value xml:lang="de">Baum</value>
@@ -1575,6 +1575,10 @@
         <value xml:lang="th">วันที่ลงความเห็น</value>
         <value xml:lang="zh">批准日期</value>
     </property>
+    <property key="FormFieldTitle_approvalStatusId">
+        <value xml:lang="en">Approval Status Id</value>
+        <value xml:lang="it">Stato approvazione</value>
+    </property>
     <property key="FormFieldTitle_caContentAssocPredicateId">
         <value xml:lang="ar">تعريف توقعة ارتباط المحتوى</value>
         <value xml:lang="de">Inhalt Zuordnung Prädikat ID</value>
@@ -2894,6 +2898,10 @@
         <value xml:lang="th">เพิ่มคุณสมบัติ</value>
         <value xml:lang="zh">新建属性</value>
     </property>
+    <property key="PageTitleAddCompDocInstance">
+        <value xml:lang="en">Add CompDoc Instance</value>
+        <value xml:lang="it">Aggiungi Istanza CompDoc</value>
+    </property>
     <property key="PageTitleAddCompositeDocumentInstance">
         <value xml:lang="en">Add Composite Document Instance Part Page</value>
         <value xml:lang="it">Aggiungi instanza composizione documenti</value>
@@ -2974,10 +2982,6 @@
         <value xml:lang="th">เพิ่มคำตอบในข้อความ:</value>
         <value xml:lang="zh">新建回答：信息</value>
     </property>
-    <property key="PageTitleAddCompDocInstance">
-        <value xml:lang="en">Add CompDoc Instance</value>
-        <value xml:lang="it">Aggiungi Istanza CompDoc</value>
-    </property>
     <property key="PageTitleAddMetaData">
         <value xml:lang="ar">إضافة  ميتا معلومات</value>
         <value xml:lang="de">Metadaten hinzufügen</value>

Modified: ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml?rev=746654&r1=746653&r2=746654&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml Sun Feb 22 10:45:15 2009
@@ -70,7 +70,7 @@
                 <sub-hyperlink target="viewprofile?partyId=${partyId}" link-style="smallSubmit" target-type="inter-app" description="${partyId}"/>
             </display-entity>
         </field>
-        <field name="statusId" title="status Id">
+        <field name="statusId" title="${uiLabelMap.CommonStatus}">
             <drop-down allow-empty="false">
                 <entity-options description="${description}" key-field-name="statusId" entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="EMPL_POSITION_STATUS"/>

Modified: ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml?rev=746654&r1=746653&r2=746654&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml Sun Feb 22 10:45:15 2009
@@ -282,7 +282,7 @@
         header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-service service-name="createPerformanceNote" map-name="performanceNote"/>
         <field name="partyId"><hidden/></field>
-        <field name="roleTypeId" title="roleType Id">
+        <field name="roleTypeId">
             <drop-down allow-empty="true">
                 <entity-options description="${description}" key-field-name="roleTypeId" entity-name="RoleType">
                     <entity-order-by field-name="description"/>

Modified: ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml?rev=746654&r1=746653&r2=746654&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml (original)
+++ ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml Sun Feb 22 10:45:15 2009
@@ -1795,4 +1795,8 @@
         <value xml:lang="fr">Téléchargement de la vCard vers le serveur</value>
         <value xml:lang="it">Carica vCard</value>
     </property>
+    <property key="SfaVCard">
+        <value xml:lang="en">vCard</value>
+        <value xml:lang="it">vCard</value>
+    </property>
 </resource>

Modified: ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml?rev=746654&r1=746653&r2=746654&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml Sun Feb 22 10:45:15 2009
@@ -36,7 +36,7 @@
         </field>
         <field name="partyName" title="${uiLabelMap.PartyName}"><display description="${person.lastName}, ${person.firstName}"/></field>
         <field name="export">
-            <hyperlink target="createVCardFromContact?partyId=${partyRow.partyId}" description="vCard"/>
+            <hyperlink target="createVCardFromContact?partyId=${partyRow.partyId}" description="${uiLabelMap.SfaVCard}"/>
         </field>
     </form>
     <form name="CreateContact" type="single" target="createContact" header-row-style="header-row" default-table-style="basic-table">

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=746654&r1=746653&r2=746654&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/PartySettingsForm.xml (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/PartySettingsForm.xml Sun Feb 22 10:45:15 2009
@@ -25,7 +25,7 @@
         <field name="optionalPartyId" title="${uiLabelMap.PartyPartyId}">
             <lookup target-form-name="LookupPerson"/>
         </field>
-        <field name="optionalRoleTypeId" title="roleTypeId">
+        <field name="optionalRoleTypeId" title="${uiLabelMap.FormFieldTitle_roleTypeId}">
             <drop-down allow-empty="false">
                 <entity-options description="${description}"
                     entity-name="RoleType"

Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=746654&r1=746653&r2=746654&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Sun Feb 22 10:45:15 2009
@@ -206,6 +206,14 @@
         <value xml:lang="th">ย่อความ</value>
         <value xml:lang="zh">缩写</value>
     </property>
+    <property key="FormFieldTitle_accountCodeLength">
+        <value xml:lang="en">Account Code Length</value>
+        <value xml:lang="it">Lunghezza codice utenza</value>
+    </property>
+    <property key="FormFieldTitle_accountValidDays">
+        <value xml:lang="en">Account Valid Days</value>
+        <value xml:lang="it">Giorni validità utenza</value>
+    </property>
     <property key="FormFieldTitle_activationNumber">
         <value xml:lang="de">Aktivierungsnummer</value>
         <value xml:lang="en">Activation Number</value>
@@ -262,6 +270,10 @@
         <value xml:lang="it">Corridoio</value>
         <value xml:lang="th">รหัสชั้นวางสินค้า</value>
     </property>
+    <property key="FormFieldTitle_allowAuthToNegative">
+        <value xml:lang="en">Allow Auth To Negative</value>
+        <value xml:lang="it">Autorizzazione permessa è negativa</value>
+    </property>
     <property key="FormFieldTitle_allowCompanyAddr">
         <value xml:lang="de">Unternehmensadresse zulassen</value>
         <value xml:lang="en">Allow Comp. Addr</value>
@@ -384,6 +396,10 @@
         <value xml:lang="th">Auth Fraud Message</value>
         <value xml:lang="zh">授权欺骗信息</value>
     </property>
+    <property key="FormFieldTitle_authValidDays">
+        <value xml:lang="en">Auth Valid Days</value>
+        <value xml:lang="it">Giorni validità autorizzazione</value>
+    </property>
     <property key="FormFieldTitle_autoApproveInvoice">
         <value xml:lang="de">Automatische Genehmigung Rechnungen</value>
         <value xml:lang="en">Auto Approve Invoice</value>
@@ -1917,6 +1933,10 @@
         <value xml:lang="th">รหัสหน่วยวัด</value>
         <value xml:lang="zh">仪表度量单位标识</value>
     </property>
+    <property key="FormFieldTitle_minBalance">
+        <value xml:lang="en">Min Balance</value>
+        <value xml:lang="it">Bilancio minimo</value>
+    </property>
     <property key="FormFieldTitle_minSize">
         <value xml:lang="de">Minimale Grösse</value>
         <value xml:lang="en">Min Size</value>
@@ -2196,6 +2216,10 @@
         <value xml:lang="ru">Код списка сортировки</value>
         <value xml:lang="th">Picklist Bin</value>
     </property>
+    <property key="FormFieldTitle_pinCodeLength">
+        <value xml:lang="en">Pin Code Length</value>
+        <value xml:lang="it">Lunghezza codice pin</value>
+    </property>
     <property key="FormFieldTitle_positionId">
         <value xml:lang="de">Position ID</value>
         <value xml:lang="en">Position Id</value>
@@ -2580,6 +2604,14 @@
         <value xml:lang="ru">Пропорциональные налоги</value>
         <value xml:lang="th">แบ่งตามส่วนภาษี</value>
     </property>
+    <property key="FormFieldTitle_purchSurveyCopyMe">
+        <value xml:lang="en">Purch Survey Copy Me</value>
+        <value xml:lang="it">Sondaggio acquisti con me in copia</value>
+    </property>
+    <property key="FormFieldTitle_purchSurveySendTo">
+        <value xml:lang="en">Purch Survey Send To</value>
+        <value xml:lang="it">Sondaggio acquisti inviare a</value>
+    </property>
     <property key="FormFieldTitle_purchaseFromDate">
         <value xml:lang="de">Einkauf Von Datum</value>
         <value xml:lang="en">Purchase From Date</value>
@@ -2591,6 +2623,10 @@
         <value xml:lang="th">สั่งซื้อจากวันที่</value>
         <value xml:lang="zh">购物开始日期</value>
     </property>
+    <property key="FormFieldTitle_purchaseSurveyId">
+        <value xml:lang="en">Purchase Survey Id</value>
+        <value xml:lang="it">Sondaggio acquisti</value>
+    </property>
     <property key="FormFieldTitle_purchaseThruDate">
         <value xml:lang="de">Einkauf Bis Datum</value>
         <value xml:lang="en">Purchase Thru Date</value>
@@ -2765,6 +2801,14 @@
         <value xml:lang="th">นับจำนวนอีกครั้ง</value>
         <value xml:lang="zh">重复计数</value>
     </property>
+    <property key="FormFieldTitle_replenishMethodEnumId">
+        <value xml:lang="en">Replenish Method Enum Id</value>
+        <value xml:lang="it">Metodo rifornimento</value>
+    </property>
+    <property key="FormFieldTitle_replenishThreshold">
+        <value xml:lang="en">Replenish Threshold</value>
+        <value xml:lang="it">Soglia per rifornimento</value>
+    </property>
     <property key="FormFieldTitle_reportType">
         <value xml:lang="de">Bericht Typ</value>
         <value xml:lang="en">Report Type</value>
@@ -2848,6 +2892,10 @@
         <value xml:lang="th">กำหนดสินค้าคงเหลือ</value>
         <value xml:lang="zh">需要库存</value>
     </property>
+    <property key="FormFieldTitle_requirePinCode">
+        <value xml:lang="en">Require Pin Code</value>
+        <value xml:lang="it">Richiesto codice pin</value>
+    </property>
     <property key="FormFieldTitle_requireUspsAddr">
         <value xml:lang="de">Benötigt Usps Adresse</value>
         <value xml:lang="en">Req. Usps Addr</value>
@@ -3533,6 +3581,10 @@
         <value xml:lang="th">ใช้การเข้าสู่</value>
         <value xml:lang="zh">用户输入</value>
     </property>
+    <property key="FormFieldTitle_validateGCFinAcct">
+        <value xml:lang="en">Validate GC Fin Acct</value>
+        <value xml:lang="it">Valida carta regalo conto finanaza</value>
+    </property>
     <property key="FormFieldTitle_varianceReasonId">
         <value xml:lang="de">Varianz Grund ID</value>
         <value xml:lang="en">Variance Reason Id</value>
@@ -5465,6 +5517,10 @@
         <value xml:lang="ru">Экспорт продукта</value>
         <value xml:lang="th">การส่งออกสินค้า</value>
     </property>
+    <property key="PageTitleProductStocktake">
+        <value xml:lang="en">Product Stocktake</value>
+        <value xml:lang="it">Prodotti in stock</value>
+    </property>
     <property key="PageTitleQuickAddProductVariants">
         <value xml:lang="de">Rasches hinzufügen Produktvarianten</value>
         <value xml:lang="en">Quick Add Product Variants</value>
@@ -5511,10 +5567,6 @@
         <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>
@@ -7844,16 +7896,13 @@
         <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>
@@ -8532,6 +8581,10 @@
         <value xml:lang="th">สร้างข้อบังคับ</value>
         <value xml:lang="zh">创建规则</value>
     </property>
+    <property key="ProductCreateSimpleTextContentForAlternateLocale">
+        <value xml:lang="en">Create Simple Text Content For Alternate Locale</value>
+        <value xml:lang="it">Creare testo semplice per contenuto con locale alternativo</value>
+    </property>
     <property key="ProductCreateVirtualProduct">
         <value xml:lang="de">Virtuelles Produkt erstellen</value>
         <value xml:lang="en">Create Virtual Product</value>
@@ -8584,10 +8637,6 @@
         <value xml:lang="it">creato/modificato da</value>
         <value xml:lang="th">สร้าง/ปรับปรุงโดย</value>
     </property>
-    <property key="ProductCreateSimpleTextContentForAlternateLocale">
-        <value xml:lang="en">Create Simple Text Content For Alternate Locale</value>
-        <value xml:lang="it">Creare testo semplice per contenuto con locale alternativo</value>
-    </property>
     <property key="ProductCrossSell">
         <value xml:lang="de">Sie könnten auch diese Interessant finden:</value>
         <value xml:lang="en">You might be interested in these as well:</value>
@@ -8633,9 +8682,9 @@
         <value xml:lang="zh">货币币种标识</value>
     </property>
     <property key="ProductCurrentPackageSequence">
-        <value xml:lang="en">Current package sequence</value>        
-        <value xml:lang="fr">Séquence d'empaquetage actuelle</value>        
-    </property>    
+        <value xml:lang="en">Current package sequence</value>
+        <value xml:lang="fr">Séquence d'empaquetage actuelle</value>
+    </property>
     <property key="ProductCustomer">
         <value xml:lang="de">Kunde</value>
         <value xml:lang="en">Customer</value>
@@ -12237,15 +12286,15 @@
         <value xml:lang="zh">最低明细价格</value>
     </property>
     <property key="ProductMinMax">
-        <value xml:lang="de">0 min -> bis zum max; 0 max -> vom Minimum aufwärts</value>
-        <value xml:lang="en">0 min -> up to max; 0 max -> from min and up</value>
-        <value xml:lang="es">0 mínimo -> hasta máximo; 0 máximo -> de mínimo a más</value>
-        <value xml:lang="fr">0 comme mini -> jusqu'à la valeur maxi; 0 comme maxi -> à partir du mini</value>
-        <value xml:lang="it">0 min -> fino al massimo; 0 max -> da min e sù</value>
-        <value xml:lang="ro">0 min -> pana la maxim; 0 max -> de la min si sù</value>
-        <value xml:lang="ru">0 мин -> до макс; 0 макс -> от мин и выше</value>
-        <value xml:lang="th">0 น้อย -> ถึงมาก; 0 มาก -> จากหน้อยและมากกว่า</value>
-        <value xml:lang="zh">0 最小-> 到最大; 0 最大 -> 从最小起</value>
+        <value xml:lang="de">0 min -&gt; bis zum max; 0 max -&gt; vom Minimum aufwärts</value>
+        <value xml:lang="en">0 min -&gt; up to max; 0 max -&gt; from min and up</value>
+        <value xml:lang="es">0 mínimo -&gt; hasta máximo; 0 máximo -&gt; de mínimo a más</value>
+        <value xml:lang="fr">0 comme mini -&gt; jusqu'à la valeur maxi; 0 comme maxi -&gt; à partir du mini</value>
+        <value xml:lang="it">0 min -&gt; fino al massimo; 0 max -&gt; da min e sù</value>
+        <value xml:lang="ro">0 min -&gt; pana la maxim; 0 max -&gt; de la min si sù</value>
+        <value xml:lang="ru">0 мин -&gt; до макс; 0 макс -&gt; от мин и выше</value>
+        <value xml:lang="th">0 น้อย -&gt; ถึงมาก; 0 มาก -&gt; จากหน้อยและมากกว่า</value>
+        <value xml:lang="zh">0 最小-&gt; 到最大; 0 最大 -&gt; 从最小起</value>
     </property>
     <property key="ProductMinMaxSpan">
         <value xml:lang="de">Min - Max (Bereich)</value>
@@ -12853,7 +12902,7 @@
         <value xml:lang="es">Nuevo método</value>
         <value xml:lang="fr">Nouvelle méthode</value>
         <value xml:lang="it">Nuovo metodo</value>
-    </property>    
+    </property>
     <property key="ProductNextPackage">
         <value xml:lang="en">Next Package</value>
         <value xml:lang="fr">Paquet suivant</value>
@@ -13532,13 +13581,11 @@
     </property>
     <property key="ProductNoteRequireEmailParty">
         <value xml:lang="de">ANMERKUNG: Die "Benötigt E-Mail oder Akteur" Einstellung ist auf N (Nein) eingestellt, alle hier angegebenen E-Mail Adressen oder Akteure werden ignoriert. Um eine E-Mail Adresse oder Akteur von dieser Liste zu verwenden muss die Einstellung auf J (Ja) vorgenommen werden.</value>
-        <value xml:lang="en"><p>NOTE: The Require Email Or Party flag is set to N (No), so any email addresses or parties listed here will be ignored.</p><p>To require an email address or party from these lists, set the flag to Y (Yes).</p></value>
         <value xml:lang="es">NOTA: El flag "Requerir E-mail" está configurado como N (No). Cualquier dirección de e-mail o participantes listados aquí serán ignorados. Para usar alguna de estas direcciones, debe configurar el flag a Y(Si)</value>
         <value xml:lang="fr">NOTE: Pour rendre obligatoire et prendre en compte le champ acteur ou courriel, cocher (O), sinon mettre (N)</value>
         <value xml:lang="it">NOTA: L'email richiesta o se il flag soggetto è impostato a N (No), così qualsiasi indirizzo email o soggetti listati qui saranno ignorati. Per richiedere un'indirizzo email o il soggetto da queste liste, imposta il flag a Y (Si).</value>
         <value xml:lang="ro">NOTA: Email-ul cerut O daca flag Subiect este setat N (Nu), asa ca orice adresa email sau Subiectii listati aici vor fi ignorati. Pentru a cere o adresa email sau Subiectul din aceste liste, seteaza flag Y (Da).</value>
         <value xml:lang="ru">ПРИМЕЧАНИЕ: Флаги Требуется Email или Участник установлены в Н (Нет), поэтому все перечисленные адреса и участники будут проигнорированы. Если требуются адреса эл.почты или участники из этих списков, установите флаг в Д (Да).</value>
-        <value xml:lang="th"><p>NOTE: หมายเหตุ ต้องการอีเมลหรือเครื่องหมายกลุ่มผู้ใช้ในการตั้งค่าเป็น N (ไม่), ดังนั้นทุก ๆ ที่อยู่อีเมลหรือกลุ่มผู้ใช้แสดงที่นี่จะถูกมองข้าม.</p><p>ต้องการที่อยู่อีเมลหรือกลุ่มผูà�
 �‰à¹ƒà¸Šà¹‰à¸ˆà¸²à¸à¸£à¸²à¸¢à¸à¸²à¸£à¸™à¸µà¹‰, ตั้งค่าเครื่องหทายเป็น Y (ใช่).</p></value>
         <value xml:lang="zh">注意：所需的电子邮件或会员标志设为 N (否)，所以这里列出的任何电子邮件地址或会员都会被忽略。要从这些列表中使用电子邮件地址或会员，请把标志设为 Y (是)。</value>
     </property>
     <property key="ProductNoteUserPromotionEntered">
@@ -15096,7 +15143,7 @@
     <property key="ProductProductNumber">
         <value xml:lang="en">Product #</value>
         <value xml:lang="fr">N° d'article</value>
-    </property>    
+    </property>
     <property key="ProductProductPage">
         <value xml:lang="de">Produktseite</value>
         <value xml:lang="en">Product Page</value>
@@ -17743,15 +17790,15 @@
         <value xml:lang="th">รายการสำหรับแผนการขนส่ง</value>
     </property>
     <property key="ProductShipmentPlanToOrderItems">
-        <value xml:lang="de">Lieferplan --> Auftragspositionen</value>
-        <value xml:lang="en">Shipment Plan --> Order Items</value>
-        <value xml:lang="es">Plan de envío --> Artículos de pedido</value>
-        <value xml:lang="fr">Plan d'expédition --> Commande d'articles</value>
-        <value xml:lang="it">Piano di Spedizione --> Righe Ordine</value>
-        <value xml:lang="ro">Plan de Expediere --> Linii Comanda</value>
-        <value xml:lang="ru">План поставок --> Позиции заказа</value>
-        <value xml:lang="th">แผนการขนส่ง --> รายการการสั่งซื้อ</value>
-        <value xml:lang="zh">货运计划 --> 订单明细</value>
+        <value xml:lang="de">Lieferplan --&gt; Auftragspositionen</value>
+        <value xml:lang="en">Shipment Plan --&gt; Order Items</value>
+        <value xml:lang="es">Plan de envío --&gt; Artículos de pedido</value>
+        <value xml:lang="fr">Plan d'expédition --&gt; Commande d'articles</value>
+        <value xml:lang="it">Piano di Spedizione --&gt; Righe Ordine</value>
+        <value xml:lang="ro">Plan de Expediere --&gt; Linii Comanda</value>
+        <value xml:lang="ru">План поставок --&gt; Позиции заказа</value>
+        <value xml:lang="th">แผนการขนส่ง --&gt; รายการการสั่งซื้อ</value>
+        <value xml:lang="zh">货运计划 --&gt; 订单明细</value>
     </property>
     <property key="ProductShipmentQty">
         <value xml:lang="de">Liefermenge</value>
@@ -18533,6 +18580,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="ProductSubscriptionResources">
         <value xml:lang="de">Abonnement Ressourcen</value>
         <value xml:lang="en">Subscription Resources</value>
@@ -18544,9 +18595,9 @@
         <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 key="ProductSubscriptionViewPermissionError">
+        <value xml:lang="en">Subscription View Permission Error</value>
+        <value xml:lang="it">Errore permesso per visualizzazione sottoscrizione</value>
     </property>
     <property key="ProductSubscriptions">
         <value xml:lang="de">Abonnemente</value>
@@ -18559,10 +18610,6 @@
         <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>
@@ -19177,6 +19224,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="ProductUnitOfMeasure">
         <value xml:lang="de">Masseinheit</value>
         <value xml:lang="en">Unit Of Measure</value>
@@ -19253,10 +19304,6 @@
         <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/widget/catalog/SubscriptionScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml?rev=746654&r1=746653&r2=746654&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml Sun Feb 22 10:45:15 2009
@@ -53,7 +53,7 @@
                                 </decorator-screen>
                             </widgets>
                             <fail-widgets>
-                                <label>${uiLabelMap.SubscriptionViewPermissionError}</label>
+                                <label>${uiLabelMap.ProductSubscriptionViewPermissionError}</label>
                             </fail-widgets>
                         </section>
                     </decorator-section>
@@ -175,7 +175,7 @@
                                 <include-form name="ListSubscriptionResources" location="component://product/widget/catalog/SubscriptionForms.xml"/>
                             </widgets>
                             <fail-widgets>
-                                <label>${uiLabelMap.SubscriptionViewPermissionError}</label>
+                                <label>${uiLabelMap.ProductSubscriptionViewPermissionError}</label>
                             </fail-widgets>
                         </section>
                     </decorator-section>

Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml?rev=746654&r1=746653&r2=746654&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml Sun Feb 22 10:45:15 2009
@@ -65,7 +65,7 @@
         <field name="workEffortName" title="${uiLabelMap.WorkEffortEventName}"><text/></field>
         <field name="description" title="${uiLabelMap.CommonDescription}"><text/></field>
         <field name="actualStartDate" title="${uiLabelMap.MyPageTaskActStartDate}"><date-time type="date"/></field>
-        <field name="add"><submit/></field>
+        <field name="add" title="${uiLabelMap.CommonAdd}"><submit/></field>
     </form>
 
     <form name="preferences" type="single" target="updatePreferences" default-map-name="preferences.userPrefMap">

Modified: ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml?rev=746654&r1=746653&r2=746654&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml Sun Feb 22 10:45:15 2009
@@ -200,6 +200,10 @@
         <value xml:lang="it">Mio profilo</value>
         <value xml:lang="th">ประวัติส่วนตัวของฉัน</value>
     </property>
+    <property key="MyPortalReloadImage">
+        <value xml:lang="en">reload image</value>
+        <value xml:lang="it">Ricarica immagine</value>
+    </property>
     <property key="MyPortalSendMailEveryCust">
         <value xml:lang="en">Send Email To Every Customer Request Change</value>
         <value xml:lang="fr">Envoyer le courriel à chaque demande de changement d'un client</value>

Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml?rev=746654&r1=746653&r2=746654&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml Sun Feb 22 10:45:15 2009
@@ -100,7 +100,7 @@
         <field name="workEffortName" title="${uiLabelMap.WorkEffortEventName}"><text/></field>
         <field name="description" title="${uiLabelMap.CommonDescription}"><text/></field>
         <field name="actualStartDate"><date-time type="date"/></field>
-        <field name="add"><submit/></field>
+        <field name="add" title="${uiLabelMap.CommonAdd}"><submit/></field>
     </form>
     
     <form name="ListPartyCommEvents" extends="ListCommEvents" extends-resource="component://party/webapp/partymgr/communication/CommForms.xml" type="list">
@@ -317,7 +317,7 @@
         <field name="CONFIRM_PASSWORD" title="${uiLabelMap.CommonPassword}" tooltip="* ${uiLabelMap.CommonConfirm}" widget-style="required"><password size="15" maxlength="250"/></field>
         <field name="VerifyCaptchaTitle" title="${uiLabelMap.VerifyCaptcha}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
         <field name="picOfcaptcha" title="${uiLabelMap.PicCaptcha}"><image value="/tempfiles/captcha/${parameters.fileName}"></image></field>
-        <field name="reload" title=" "><hyperlink target="newRegisterLogin" description="reload image"/></field>
+        <field name="reload" title=" "><hyperlink target="newRegisterLogin" description="${uiLabelMap.MyPortalReloadImage}"/></field>
         <field name="captcha" title="${uiLabelMap.VerifyCaptcha}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="23" maxlength="30"/></field>
         <field name="submitButton" title="${uiLabelMap.CommonSave}" title-area-style="group-label"><submit button-type="button"/></field>
     </form>

Modified: ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml?rev=746654&r1=746653&r2=746654&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml Sun Feb 22 10:45:15 2009
@@ -25,6 +25,10 @@
         <value xml:lang="it">Ore attuali</value>
         <value xml:lang="zh">实际工时</value>
     </property>
+    <property key="FormFieldTitle_actualNonBilledHours">
+        <value xml:lang="en">Actual Non Billed Hours</value>
+        <value xml:lang="it">Ore attuali non fatturate</value>
+    </property>
     <property key="FormFieldTitle_clientBillingPartyId">
         <value xml:lang="en">Client Billing Party Id</value>
         <value xml:lang="fr">Réf. de facturation client</value>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=746654&r1=746653&r2=746654&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Sun Feb 22 10:45:15 2009
@@ -82,7 +82,7 @@
                 </entity-options>
             </drop-down>
         </field>
-        <field name="add"><submit/></field>
+        <field name="add" title="${uiLabelMap.CommonAdd}"><submit/></field>
     </form>
     <form name="FindProject" type="single" target="FindProject" title="Find and List Project"
         header-row-style="header-row" default-table-style="basic-table">

Modified: ofbiz/trunk/specialpurpose/shark/config/SharkUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/config/SharkUiLabels.xml?rev=746654&r1=746653&r2=746654&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/shark/config/SharkUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/shark/config/SharkUiLabels.xml Sun Feb 22 10:45:15 2009
@@ -73,6 +73,10 @@
     </property>
     <property key="SharkProcessHistory">
         <value xml:lang="en">Process History</value>
+        <value xml:lang="it">Storia processi</value>
+    </property>
+    <property key="SharkProcessList">
+        <value xml:lang="en">Process List</value>
         <value xml:lang="it">Lista processi</value>
     </property>
     <property key="SharkProcessSteps">

Modified: ofbiz/trunk/specialpurpose/shark/widget/ProcessScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/widget/ProcessScreens.xml?rev=746654&r1=746653&r2=746654&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/shark/widget/ProcessScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/shark/widget/ProcessScreens.xml Sun Feb 22 10:45:15 2009
@@ -24,7 +24,7 @@
         <section>
             <actions>
                 <set field="headerItem" value="main"/>
-                <set field="titleProperty" value="Process List"/>
+                <set field="titleProperty" value="SharkProcessList"/>
                 
                 <script location="component://shark/webapp/shark/WEB-INF/actions/process/processList.bsh"/>
             </actions>