svn commit: r823833 - in /ofbiz/trunk: applications/accounting/config/ applications/accounting/widget/ applications/accounting/widget/ap/ applications/accounting/widget/ar/ applications/content/config/ applications/content/widget/content/ applications/...

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

svn commit: r823833 - in /ofbiz/trunk: applications/accounting/config/ applications/accounting/widget/ applications/accounting/widget/ap/ applications/accounting/widget/ar/ applications/content/config/ applications/content/widget/content/ applications/...

buscob
Author: buscob
Date: Sat Oct 10 09:27:30 2009
New Revision: 823833

URL: http://svn.apache.org/viewvc?rev=823833&view=rev
Log:
Removed the word "Application" from the Application menu title (OFBIZ-3016)
At this stage I did this for the primary applications only.

Modified:
    ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
    ofbiz/trunk/applications/accounting/widget/Menus.xml
    ofbiz/trunk/applications/accounting/widget/ap/Menus.xml
    ofbiz/trunk/applications/accounting/widget/ar/ArMenus.xml
    ofbiz/trunk/applications/content/config/ContentUiLabels.xml
    ofbiz/trunk/applications/content/widget/content/ContentMenus.xml
    ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml
    ofbiz/trunk/applications/humanres/widget/Menus.xml
    ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml
    ofbiz/trunk/applications/manufacturing/widget/manufacturing/Menus.xml
    ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml
    ofbiz/trunk/applications/marketing/widget/MarketingMenus.xml
    ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml
    ofbiz/trunk/applications/order/config/OrderUiLabels.xml
    ofbiz/trunk/applications/order/widget/ordermgr/Menus.xml
    ofbiz/trunk/applications/party/config/PartyUiLabels.xml
    ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml
    ofbiz/trunk/applications/product/config/ProductUiLabels.xml
    ofbiz/trunk/applications/product/widget/catalog/Menus.xml
    ofbiz/trunk/applications/product/widget/facility/Menus.xml
    ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml
    ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml
    ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml
    ofbiz/trunk/specialpurpose/assetmaint/config/AssetMaintUiLabels.xml
    ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml
    ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml

Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=823833&r1=823832&r2=823833&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Sat Oct 10 09:27:30 2009
@@ -799,6 +799,15 @@
         <value xml:lang="nl">OFBiz: Credit Manager</value>
         <value xml:lang="zh">OFBiz: 应付账户管理</value>
     </property>
+    <property key="AccountingApManager">
+        <value xml:lang="de">Kreditorenbuchhaltung</value>
+        <value xml:lang="en">Account Payable Manager</value>
+        <value xml:lang="fr">Application de gestion des comptes fourn.</value>
+        <value xml:lang="hi_IN">देय खाता प्रबंधक अनुप्रयोग</value>
+        <value xml:lang="it">Gestione conti debitori</value>
+        <value xml:lang="nl">Credit Manager applicatie</value>
+        <value xml:lang="zh">应付账户管理应用程序</value>
+    </property>
     <property key="AccountingApManagerApplication">
         <value xml:lang="de">Kreditorenbuchhaltung</value>
         <value xml:lang="en">Account Payable Manager Application</value>
@@ -1009,10 +1018,19 @@
         <value xml:lang="en">OFBiz: AR Manager</value>
         <value xml:lang="fr">OFBiz : gestion des comptes clients</value>
         <value xml:lang="hi_IN">OFBiz: खाता प्राप्य प्रबंधक</value>
-        <value xml:lang="it">OFBiz: Gestione conto creditori</value>
+        <value xml:lang="it">OFBiz: Gestione conti creditori</value>
         <value xml:lang="nl">OFBiz: Debiteuren Manager</value>
         <value xml:lang="zh">OFBiz: 应收账户管理</value>
     </property>
+    <property key="AccountingArManager">
+        <value xml:lang="de">Debitorenbuchhaltung</value>
+        <value xml:lang="en">Account Receivable Manager</value>
+        <value xml:lang="fr">Application de gestion des comptes clients</value>
+        <value xml:lang="hi_IN">प्राप्य खाता प्रबंधक अनुप्रयोग</value>
+        <value xml:lang="it">Gestione conti creditori</value>
+        <value xml:lang="nl">Debiteuren Manager toepassing</value>
+        <value xml:lang="zh">应收账户管理应用程序</value>
+    </property>
     <property key="AccountingArManagerApplication">
         <value xml:lang="de">Debitorenbuchhaltung</value>
         <value xml:lang="en">Account Receivable Manager Application</value>
@@ -5623,6 +5641,22 @@
         <value xml:lang="th">ยินดีต้อนรับเข้าสู่การจัดการบัญชี!</value>
         <value xml:lang="zh">欢迎使用财务管理!</value>
     </property>
+    <property key="AccountingManager">
+        <value xml:lang="ar">تطبيق تسيير المحاسبة</value>
+        <value xml:lang="de">Buchhaltung</value>
+        <value xml:lang="en">Accounting Manager</value>
+        <value xml:lang="es">Aplicación Administrador Contable</value>
+        <value xml:lang="fr">Module de Gestion comptable</value>
+        <value xml:lang="hi_IN">लेखांकन प्रबंधक अनुप्रयोग</value>
+        <value xml:lang="it">Gestione contabilità</value>
+        <value xml:lang="nl">Boekhoud toepassing</value>
+        <value xml:lang="pt_BR">Aplicação de Gestão de Contas</value>
+        <value xml:lang="pt_PT">Aplicação de Gestão de Contas</value>
+        <value xml:lang="ro">Program Gestiune Contabila</value>
+        <value xml:lang="ru">Менеджер учета</value>
+        <value xml:lang="th">โปรแกรมประยุกต์การจัดการบัญชี</value>
+        <value xml:lang="zh">财务管理软件</value>
+    </property>
     <property key="AccountingManagerApplication">
         <value xml:lang="ar">تطبيق تسيير المحاسبة</value>
         <value xml:lang="de">Buchhaltung</value>

Modified: ofbiz/trunk/applications/accounting/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/Menus.xml?rev=823833&r1=823832&r2=823833&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/Menus.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/Menus.xml Sat Oct 10 09:27:30 2009
@@ -21,7 +21,7 @@
 <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">
 
-    <menu name="AccountingAppBar" title="${uiLabelMap.AccountingManagerApplication}" extends="CommonAppBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
+    <menu name="AccountingAppBar" title="${uiLabelMap.AccountingManager}" extends="CommonAppBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
         <menu-item name="invoices" title="${uiLabelMap.AccountingInvoicesMenu}"><link target="findInvoices"/></menu-item>
         <menu-item name="payments" title="${uiLabelMap.AccountingPaymentsMenu}"><link target="findPayments"/></menu-item>
         <menu-item name="PaymentGroup" title="${uiLabelMap.AccountingPaymentGroup}"><link target="FindPaymentGroup"/></menu-item>

Modified: ofbiz/trunk/applications/accounting/widget/ap/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/Menus.xml?rev=823833&r1=823832&r2=823833&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ap/Menus.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ap/Menus.xml Sat Oct 10 09:27:30 2009
@@ -18,7 +18,7 @@
 under the License.
 -->
 <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">
-    <menu name="ApAppBar" title="${uiLabelMap.AccountingApManagerApplication}" extends="CommonAppBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
+    <menu name="ApAppBar" title="${uiLabelMap.AccountingApManager}" extends="CommonAppBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
         <menu-item name="agreements" title="${uiLabelMap.AccountingAgreements}"><link target="FindAgreement"/></menu-item>
         <menu-item name="invoices" title="${uiLabelMap.AccountingInvoicesMenu}"><link target="FindApInvoices"/></menu-item>
         <menu-item name="payments" title="${uiLabelMap.AccountingPaymentsMenu}"><link target="findPayments"/></menu-item>

Modified: ofbiz/trunk/applications/accounting/widget/ar/ArMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ar/ArMenus.xml?rev=823833&r1=823832&r2=823833&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ar/ArMenus.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ar/ArMenus.xml Sat Oct 10 09:27:30 2009
@@ -19,7 +19,7 @@
 -->
 
 <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">
-    <menu name="ArAppBar" title="${uiLabelMap.AccountingArManagerApplication}" extends="CommonAppBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
+    <menu name="ArAppBar" title="${uiLabelMap.AccountingArManager}" extends="CommonAppBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
         <menu-item name="agreements" title="${uiLabelMap.AccountingAgreements}"><link target="FindAgreement"/></menu-item>
         <menu-item name="invoices" title="${uiLabelMap.AccountingInvoicesMenu}"><link target="findInvoices"/></menu-item>
         <menu-item name="payments" title="${uiLabelMap.AccountingPaymentsMenu}"><link target="findPayments"/></menu-item>

Modified: ofbiz/trunk/applications/content/config/ContentUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/config/ContentUiLabels.xml?rev=823833&r1=823832&r2=823833&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/config/ContentUiLabels.xml (original)
+++ ofbiz/trunk/applications/content/config/ContentUiLabels.xml Sat Oct 10 09:27:30 2009
@@ -436,6 +436,17 @@
         <value xml:lang="th">หัวข้อ</value>
         <value xml:lang="zh">内容</value>
     </property>
+    <property key="ContentContentManager">
+        <value xml:lang="ar">تطبيق تسيير المحتوى</value>
+        <value xml:lang="de">Inhaltsverwaltung Anwendung</value>
+        <value xml:lang="en">Content Manager</value>
+        <value xml:lang="es">Aplicación de Administración de Contenidos</value>
+        <value xml:lang="fr">Application de gestion de contenu</value>
+        <value xml:lang="it">Gestione contenuti</value>
+        <value xml:lang="ro">Aplicatie Gestiune Continuturi</value>
+        <value xml:lang="th">หัวข้อการจัดการที่นำไปประยุกต์ใช้</value>
+        <value xml:lang="zh">内容管理应用程序</value>
+    </property>
     <property key="ContentContentManagerApplication">
         <value xml:lang="ar">تطبيق تسيير المحتوى</value>
         <value xml:lang="de">Inhaltsverwaltung Anwendung</value>

Modified: ofbiz/trunk/applications/content/widget/content/ContentMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/ContentMenus.xml?rev=823833&r1=823832&r2=823833&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/ContentMenus.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/ContentMenus.xml Sat Oct 10 09:27:30 2009
@@ -19,7 +19,7 @@
 -->
 <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">
 
-    <menu name="ContentAppBar" title="${uiLabelMap.ContentContentManagerApplication}" extends="CommonAppBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
+    <menu name="ContentAppBar" title="${uiLabelMap.ContentContentManager}" extends="CommonAppBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
         <menu-item name="websites" title="${uiLabelMap.ContentWebSites}"><link target="FindWebSite"/></menu-item>
         <menu-item name="survey" title="${uiLabelMap.ContentSurvey}"><link target="FindSurvey"/></menu-item>
         <menu-item name="Forum" title="${uiLabelMap.ContentForum}"><link target="findForumGroups"/></menu-item>

Modified: ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml?rev=823833&r1=823832&r2=823833&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml (original)
+++ ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml Sat Oct 10 09:27:30 2009
@@ -1177,6 +1177,14 @@
         <value xml:lang="it">Ricerca richiesta di disoccupazione</value>
         <value xml:lang="zh">解除雇佣关系声明编号查询</value>
     </property>
+    <property key="HumanResManager">
+        <value xml:lang="de">Personalverwaltung</value>
+        <value xml:lang="en">Human Resources</value>
+        <value xml:lang="fr">Application de gestion des ressources humaines</value>
+        <value xml:lang="it">Gestione risorse umane</value>
+        <value xml:lang="th">โปรแกรมประยุกต์ใช้การจัดการบุคคล</value>
+        <value xml:lang="zh">人力资源管理系统</value>
+    </property>
     <property key="HumanResManagerApplication">
         <value xml:lang="de">Personalverwaltung</value>
         <value xml:lang="en">Human Resources Application</value>

Modified: ofbiz/trunk/applications/humanres/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/Menus.xml?rev=823833&r1=823832&r2=823833&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/Menus.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/Menus.xml Sat Oct 10 09:27:30 2009
@@ -20,7 +20,7 @@
 
 <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">
-    <menu name="HumanResAppBar" title="${uiLabelMap.HumanResManagerApplication}" extends="CommonAppBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
+    <menu name="HumanResAppBar" title="${uiLabelMap.HumanResManager}" extends="CommonAppBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
         <menu-item name="Employees" title="${uiLabelMap.HumanResEmployees}"><link target="findEmployees"/></menu-item>
         <menu-item name="Employment" title="${uiLabelMap.HumanResEmployment}"><link target="FindEmployments"/></menu-item>
         <menu-item name="EmplPosition" title="${uiLabelMap.HumanResEmployeePosition}"><link target="FindEmplPositions"/></menu-item>

Modified: ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml?rev=823833&r1=823832&r2=823833&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml (original)
+++ ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml Sat Oct 10 09:27:30 2009
@@ -1813,6 +1813,16 @@
         <value xml:lang="th">เข้าสู่การจัดการคำนวณราคา</value>
         <value xml:lang="zh">管理费用组成计算记录</value>
     </property>
+    <property key="ManufacturingManager">
+        <value xml:lang="de">Produktionsverwaltung</value>
+        <value xml:lang="en">Manufacturing Manager</value>
+        <value xml:lang="es">Gestión de Producción</value>
+        <value xml:lang="fr">Application de gestion de production</value>
+        <value xml:lang="it">Gestione della produzione</value>
+        <value xml:lang="ro">Aplicatie Gestiune Productie</value>
+        <value xml:lang="th">โปรแกรมประยุกต์การจัดการการผลิต</value>
+        <value xml:lang="zh">生产管理应用</value>
+    </property>
     <property key="ManufacturingManagerApplication">
         <value xml:lang="de">Produktionsverwaltung</value>
         <value xml:lang="en">Manufacturing Manager Application</value>

Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/Menus.xml?rev=823833&r1=823832&r2=823833&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/Menus.xml (original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/Menus.xml Sat Oct 10 09:27:30 2009
@@ -21,7 +21,7 @@
 <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">
 
-    <menu name="ManufacturingAppBar" title="${uiLabelMap.ManufacturingManagerApplication}" extends="CommonAppBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
+    <menu name="ManufacturingAppBar" title="${uiLabelMap.ManufacturingManager}" extends="CommonAppBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
         <menu-item name="jobshop" title="${uiLabelMap.ManufacturingJobShop}">
             <condition>
                 <if-has-permission permission="MANUFACTURING" action="_CREATE"/>

Modified: ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml?rev=823833&r1=823832&r2=823833&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml (original)
+++ ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml Sat Oct 10 09:27:30 2009
@@ -487,6 +487,15 @@
         <value xml:lang="th">หน้าหลัก</value>
         <value xml:lang="zh">首页</value>
     </property>
+    <property key="MarketingManager">
+        <value xml:lang="en">Marketing Manager</value>
+        <value xml:lang="es">Gestión de Marketing</value>
+        <value xml:lang="fr">Application de gestion marketing</value>
+        <value xml:lang="it">Gestione vendite</value>
+        <value xml:lang="ro">Aplicatie Gestiune Vanzare</value>
+        <value xml:lang="th">โปรแกรมประยุกต์การจัดการทางการตลาด</value>
+        <value xml:lang="zh">市场管理应用程序</value>
+    </property>
     <property key="MarketingManagerApplication">
         <value xml:lang="en">Marketing Manager Application</value>
         <value xml:lang="es">Gestión de Marketing</value>
@@ -1871,6 +1880,12 @@
         <value xml:lang="it">Lista dettagli previsioni di vendita</value>
         <value xml:lang="zh">销售预测细节列表</value>
     </property>
+    <property key="SfaManager">
+        <value xml:lang="en">SFA Manager</value>
+        <value xml:lang="fr">Application de gestion des ventes</value>
+        <value xml:lang="it">Gestione vendite</value>
+        <value xml:lang="zh">销售管理应用程序</value>
+    </property>
     <property key="SfaManagerApplication">
         <value xml:lang="en">SFA Manager Application</value>
         <value xml:lang="fr">Application de gestion des ventes</value>

Modified: ofbiz/trunk/applications/marketing/widget/MarketingMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/MarketingMenus.xml?rev=823833&r1=823832&r2=823833&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/MarketingMenus.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/MarketingMenus.xml Sat Oct 10 09:27:30 2009
@@ -18,7 +18,7 @@
 under the License.
 -->
 <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">
-    <menu name="MarketingAppBar" title="${uiLabelMap.MarketingManagerApplication}" extends="CommonAppBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
+    <menu name="MarketingAppBar" title="${uiLabelMap.MarketingManager}" extends="CommonAppBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
         <menu-item name="DataSource" title="${uiLabelMap.DataSource}"><link target="FindDataSource"/></menu-item>
         <menu-item name="Campaign" title="${uiLabelMap.MarketingCampaign}"><link target="FindMarketingCampaign"/></menu-item>
         <menu-item name="Tracking" title="${uiLabelMap.MarketingTracking}"><link target="FindTrackingCode"/></menu-item>

Modified: ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml?rev=823833&r1=823832&r2=823833&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml Sat Oct 10 09:27:30 2009
@@ -18,7 +18,7 @@
 under the License.
 -->
 <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">
-    <menu name="SfaAppBar" title="${uiLabelMap.SfaManagerApplication}" extends="CommonAppBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
+    <menu name="SfaAppBar" title="${uiLabelMap.SfaManager}" extends="CommonAppBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
         <menu-item name="Accounts" title="${uiLabelMap.SfaAcccounts}"><link target="FindAccounts"/></menu-item>
         <menu-item name="Contacts" title="${uiLabelMap.SfaContacts}"><link target="FindContacts"/></menu-item>
         <menu-item name="Leads" title="${uiLabelMap.SfaLeads}"><link target="FindLeads"/></menu-item>

Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels.xml?rev=823833&r1=823832&r2=823833&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderUiLabels.xml (original)
+++ ofbiz/trunk/applications/order/config/OrderUiLabels.xml Sat Oct 10 09:27:30 2009
@@ -3814,6 +3814,19 @@
         <value xml:lang="th">กำลังทำการจอง</value>
         <value xml:lang="zh">预订</value>
     </property>
+    <property key="OrderManager">
+        <value xml:lang="de">Auftragsverwaltung Anwendung</value>
+        <value xml:lang="en">Order Manager</value>
+        <value xml:lang="es">Gestión de pedidos</value>
+        <value xml:lang="fr">Gestion de Commandes</value>
+        <value xml:lang="it">Gestione ordini</value>
+        <value xml:lang="nl">Bestel Manage Programma</value>
+        <value xml:lang="ro">Aplicatie Gestiune Comenzi</value>
+        <value xml:lang="ru">Управление заказами</value>
+        <value xml:lang="th">โปรแกรมประยุกต์การจัดการรายการสั่งซื้อสินค้า</value>
+        <value xml:lang="zh">订单管理应用程序</value>
+        <value xml:lang="zh_CN">订单管理</value>
+    </property>
     <property key="OrderManagerApplication">
         <value xml:lang="de">Auftragsverwaltung Anwendung</value>
         <value xml:lang="en">Order Manager Application</value>
@@ -4982,19 +4995,6 @@
         <value xml:lang="zh">订单列表</value>
         <value xml:lang="zh_CN">订单列表</value>
     </property>
-    <property key="OrderOrderManagerApplication">
-        <value xml:lang="de">Auftragsverwaltung Anwendung</value>
-        <value xml:lang="en">Order Manager Application</value>
-        <value xml:lang="es">Gestión de pedidos</value>
-        <value xml:lang="fr">Gestion de commandes</value>
-        <value xml:lang="it">Applicazione gestione ordini</value>
-        <value xml:lang="nl">Bestelling Manager Application</value>
-        <value xml:lang="ro">Aplicatie Gestiune Comenzi</value>
-        <value xml:lang="ru">Управление заказами</value>
-        <value xml:lang="th">โปรแกรมประยุกต์การจัดการรายการสั่งซื้อสินค้า</value>
-        <value xml:lang="zh">订单管理程序</value>
-        <value xml:lang="zh_CN">订单管理应用</value>
-    </property>
     <property key="OrderOrderName">
         <value xml:lang="de">Auftragsname</value>
         <value xml:lang="en">Order Name</value>

Modified: ofbiz/trunk/applications/order/widget/ordermgr/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/Menus.xml?rev=823833&r1=823832&r2=823833&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/Menus.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/Menus.xml Sat Oct 10 09:27:30 2009
@@ -18,7 +18,7 @@
 under the License.
 -->
 <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">
-    <menu name="OrderAppBar" title="${uiLabelMap.OrderOrderManagerApplication}" extends="CommonAppBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
+    <menu name="OrderAppBar" title="${uiLabelMap.OrderManager}" extends="CommonAppBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
         <menu-item name="request" title="${uiLabelMap.OrderRequests}">
             <condition>
                 <or>

Modified: ofbiz/trunk/applications/party/config/PartyUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/config/PartyUiLabels.xml?rev=823833&r1=823832&r2=823833&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/config/PartyUiLabels.xml (original)
+++ ofbiz/trunk/applications/party/config/PartyUiLabels.xml Sat Oct 10 09:27:30 2009
@@ -6060,6 +6060,20 @@
     <property key="PartyMainRole">
         <value xml:lang="en">Main Role</value>
     </property>
+    <property key="PartyManager">
+        <value xml:lang="de">Akteur Manager Anwendung</value>
+        <value xml:lang="en">Party Manager</value>
+        <value xml:lang="es">Gestión de participantes</value>
+        <value xml:lang="fr">Application de gestion des acteurs</value>
+        <value xml:lang="hi_IN">पार्टी प्रबंधक अनुप्रयोग</value>
+        <value xml:lang="it">Gestione soggetti</value>
+        <value xml:lang="nl">Relatie Manager</value>
+        <value xml:lang="pt_PT">Função de Gerente de Secção</value>
+        <value xml:lang="ro">Aplicatie Gestiune Subiecti</value>
+        <value xml:lang="ru">Управление участниками</value>
+        <value xml:lang="th">โปรแกรมการจัดการกลุ่มผู้ใช้</value>
+        <value xml:lang="zh">会员管理应用程序</value>
+    </property>
     <property key="PartyManagerApplication">
         <value xml:lang="de">Akteur Manager Anwendung</value>
         <value xml:lang="en">Party Manager Application</value>

Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml?rev=823833&r1=823832&r2=823833&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml Sat Oct 10 09:27:30 2009
@@ -20,7 +20,7 @@
 
 <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">
 
-    <menu name="PartyAppBar" title="${uiLabelMap.PartyManagerApplication}" extends="CommonAppBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
+    <menu name="PartyAppBar" title="${uiLabelMap.PartyManager}" extends="CommonAppBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
         <menu-item name="find" title="${uiLabelMap.PartyParties}"><link target="findparty"/></menu-item>
         <menu-item name="mycomm" title="${uiLabelMap.PartyMyCommunications}"><link target="MyCommunicationEvents"/></menu-item>
         <menu-item name="comm" title="${uiLabelMap.PartyCommunications}"><link target="FindCommunicationEvents"/></menu-item>

Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=823833&r1=823832&r2=823833&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Sat Oct 10 09:27:30 2009
@@ -8217,6 +8217,17 @@
         <value xml:lang="th">หมวดหมู่ [รหัส]</value>
         <value xml:lang="zh">目录 [标识]</value>
     </property>
+    <property key="ProductCatalogManager">
+        <value xml:lang="de">Katalogverwaltung Anwendung</value>
+        <value xml:lang="en">Catalog Manager</value>
+        <value xml:lang="es">Adplicación de Administración de Catálogos</value>
+        <value xml:lang="fr">Application de gestion des articles</value>
+        <value xml:lang="it">Gestione cataloghi</value>
+        <value xml:lang="ro">Aplicatie Gestiune Catalog</value>
+        <value xml:lang="ru">Управление каталогом продуктов</value>
+        <value xml:lang="th">โปรแกรมประยุกต์การจัดการหมวดหมู่</value>
+        <value xml:lang="zh">目录管理应用程序</value>
+    </property>
     <property key="ProductCatalogManagerApplication">
         <value xml:lang="de">Katalogverwaltung Anwendung</value>
         <value xml:lang="en">Catalog Manager Application</value>
@@ -10727,6 +10738,17 @@
         <value xml:lang="th">ที่ตั้งคลังสินค้า</value>
         <value xml:lang="zh">场所位置</value>
     </property>
+    <property key="ProductFacilityManager">
+        <value xml:lang="de">Einrichtungsverwaltung Anwendung</value>
+        <value xml:lang="en">Facility Manager</value>
+        <value xml:lang="es">Aplicación de Administración del Almacén</value>
+        <value xml:lang="fr">Application de gestion de stock</value>
+        <value xml:lang="it">Gestione stabilimenti</value>
+        <value xml:lang="ro">Aplicatie Gestiune Compartimente</value>
+        <value xml:lang="ru">Управление объектами</value>
+        <value xml:lang="th">โปรแกรมประยุกต์ใช้การจัดการคลังสินค้า</value>
+        <value xml:lang="zh">场所管理应用程序</value>
+    </property>
     <property key="ProductFacilityManagerApplication">
         <value xml:lang="de">Einrichtungsverwaltung Anwendung</value>
         <value xml:lang="en">Facility Manager Application</value>

Modified: ofbiz/trunk/applications/product/widget/catalog/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/Menus.xml?rev=823833&r1=823832&r2=823833&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/Menus.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/Menus.xml Sat Oct 10 09:27:30 2009
@@ -18,7 +18,7 @@
 under the License.
 -->
 <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">
-    <menu name="CatalogAppBar" title="${uiLabelMap.ProductCatalogManagerApplication}" extends="CommonAppBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
+    <menu name="CatalogAppBar" title="${uiLabelMap.ProductCatalogManager}" extends="CommonAppBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
         <menu-item name="featurecats" title="${uiLabelMap.ProductFeatureCats}"><link target="EditFeatureCategories"/></menu-item>
         <menu-item name="promos" title="${uiLabelMap.ProductPromos}"><link target="FindProductPromo"/></menu-item>
         <menu-item name="pricerules" title="${uiLabelMap.ProductPriceRules}"><link target="FindProductPriceRules"/></menu-item>

Modified: ofbiz/trunk/applications/product/widget/facility/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/Menus.xml?rev=823833&r1=823832&r2=823833&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/Menus.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/Menus.xml Sat Oct 10 09:27:30 2009
@@ -21,7 +21,7 @@
 <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">
 
-    <menu name="FacilityAppBar" title="${uiLabelMap.ProductFacilityManagerApplication}" extends="CommonAppBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
+    <menu name="FacilityAppBar" title="${uiLabelMap.ProductFacilityManager}" extends="CommonAppBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
         <menu-item name="facility" title="${uiLabelMap.ProductFacilities}"><link target="FindFacility"/></menu-item>
         <menu-item name="facilityGroup" title="${uiLabelMap.ProductFacilityGroups}"><link target="FindFacilityGroup"/></menu-item>
         <menu-item name="inventoryItemLabel" title="${uiLabelMap.ProductInventoryItemLabels}"><link target="FindInventoryItemLabels"/></menu-item>

Modified: ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml?rev=823833&r1=823832&r2=823833&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml (original)
+++ ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml Sat Oct 10 09:27:30 2009
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
 <resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <property key="FormFieldTitle_accommodationMapId">
         <value xml:lang="en">Accommodation Map Id</value>
@@ -44,7 +44,7 @@
     <property key="FormFieldTitle_actualEndDate">
         <value xml:lang="en">Actual End Date</value>
         <value xml:lang="fr">Date d'achèvement réelle</value>
-        <value xml:lang="it">Data Fine Attuale</value>
+        <value xml:lang="it">Data fine attuale</value>
         <value xml:lang="ro">Data Finala Actuala</value>
         <value xml:lang="th">วันสิ้นสุดตามความจริง</value>
         <value xml:lang="zh">实际结束日期</value>
@@ -52,7 +52,7 @@
     <property key="FormFieldTitle_actualMilliSeconds">
         <value xml:lang="en">Actual Milli Seconds</value>
         <value xml:lang="fr">Millisecondes</value>
-        <value xml:lang="it">Millisecondi Attuali</value>
+        <value xml:lang="it">Millisecondi attuali</value>
         <value xml:lang="nl">Actual Milli Seconds</value>
         <value xml:lang="ro">Millisecunde Actuale</value>
         <value xml:lang="th">พันวินาทีตามความจริง</value>
@@ -378,7 +378,7 @@
     <property key="FormFieldTitle_serviceLoaderName">
         <value xml:lang="en">Service Loader Name </value>
         <value xml:lang="fr">Nom du service chargeur</value>
-        <value xml:lang="it">Nome Servizio Loader</value>
+        <value xml:lang="it">Nome servizio loader</value>
         <value xml:lang="nl">Service Loader Name</value>
         <value xml:lang="ro">Nume Serviciu Loader</value>
         <value xml:lang="th">ชื่อบริการโหลด</value>
@@ -580,7 +580,7 @@
         <value xml:lang="en">Add Timesheet</value>
         <value xml:lang="es">Crear hoja de tiempos</value>
         <value xml:lang="fr">Ajouter une feuille d'activité</value>
-        <value xml:lang="it">Aggiungi Timbratura</value>
+        <value xml:lang="it">Aggiungi timbratura</value>
         <value xml:lang="nl">Add Timesheet</value>
         <value xml:lang="ro">Adauga Pontaj</value>
         <value xml:lang="th">เพิ่มตารางการทำงาน</value>
@@ -1624,16 +1624,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>
@@ -1975,12 +1972,12 @@
     <property key="WorkEffortICalendarAdd">
         <value xml:lang="en">Add iCalendar</value>
     </property>
-    <property key="WorkEffortICalendarAddParty">
-        <value xml:lang="en">Add iCalendar Party</value>
-    </property>
     <property key="WorkEffortICalendarAddFixedAsset">
         <value xml:lang="en">Add iCalendar Fixed Asset</value>
     </property>
+    <property key="WorkEffortICalendarAddParty">
+        <value xml:lang="en">Add iCalendar Party</value>
+    </property>
     <property key="WorkEffortICalendarData">
         <value xml:lang="en">Data</value>
     </property>
@@ -2162,6 +2159,28 @@
         <value xml:lang="th">ค้นหา</value>
         <value xml:lang="zh">查找</value>
     </property>
+    <property key="WorkEffortManager">
+        <value xml:lang="en">Work Effort Manager</value>
+        <value xml:lang="es">Aplicación de administración de tareas</value>
+        <value xml:lang="fr">Application de gestion de tâches</value>
+        <value xml:lang="it">Gestione impegni di lavoro</value>
+        <value xml:lang="nl">WorkEffort Manager Application</value>
+        <value xml:lang="ro">Aplicatie Gestiune Sarcini de Lucru</value>
+        <value xml:lang="ru">WorkEffort: Управление приложением</value>
+        <value xml:lang="th">โปรแกรมประยุกต์ใช้การจัดการความพยายามในการทำงาน</value>
+        <value xml:lang="zh">人工服务管理应用</value>
+    </property>
+    <property key="WorkEffortManagerApplication">
+        <value xml:lang="en">Work Effort Manager Application</value>
+        <value xml:lang="es">Aplicación de administración de tareas</value>
+        <value xml:lang="fr">Application de gestion de tâches</value>
+        <value xml:lang="it">Applicazione gestione impegni di lavoro</value>
+        <value xml:lang="nl">WorkEffort Manager Application</value>
+        <value xml:lang="ro">Aplicatie Gestiune Sarcini de Lucru</value>
+        <value xml:lang="ru">WorkEffort: Управление приложением</value>
+        <value xml:lang="th">โปรแกรมประยุกต์ใช้การจัดการความพยายามในการทำงาน</value>
+        <value xml:lang="zh">人工服务管理应用</value>
+    </property>
     <property key="WorkEffortMaxAmount">
         <value xml:lang="en">Max Amount</value>
         <value xml:lang="es">Monto máximo</value>
@@ -2715,6 +2734,14 @@
         <value xml:lang="th">สิทธิพิเศษ</value>
         <value xml:lang="zh">优先级</value>
     </property>
+    <property key="WorkEffortPriorityEight">
+        <value xml:lang="en">8</value>
+        <value xml:lang="it">8</value>
+    </property>
+    <property key="WorkEffortPriorityFive">
+        <value xml:lang="en">5</value>
+        <value xml:lang="it">5</value>
+    </property>
     <property key="WorkEffortPriorityFormatNotCorrect">
         <value xml:lang="en">Priority format is incorrect</value>
         <value xml:lang="fr">Le format prioritaire est incorrect</value>
@@ -2722,6 +2749,19 @@
         <value xml:lang="th">รูปแบบสิทธิพิเศษไม่ถูกต้อง</value>
         <value xml:lang="zh">优先级格式不正确</value>
     </property>
+    <property key="WorkEffortPriorityFour">
+        <value xml:lang="en">4</value>
+        <value xml:lang="it">4</value>
+    </property>
+    <property key="WorkEffortPriorityNine">
+        <value xml:lang="en">9 (Low)</value>
+        <value xml:lang="fr">9 (Basse)</value>
+        <value xml:lang="it">9 (Bassa)</value>
+        <value xml:lang="nl">9 (Low)</value>
+        <value xml:lang="ro">9 (Joasa)</value>
+        <value xml:lang="th">9 (ต่ำ)</value>
+        <value xml:lang="zh">9 (低)</value>
+    </property>
     <property key="WorkEffortPriorityOne">
         <value xml:lang="en">1 (High)</value>
         <value xml:lang="fr">1 (Haute)</value>
@@ -2731,42 +2771,21 @@
         <value xml:lang="th">1 (สูง)</value>
         <value xml:lang="zh">1 (高)</value>
     </property>
-    <property key="WorkEffortPriorityTwo">
-        <value xml:lang="en">2</value>
-        <value xml:lang="it">2</value>
-    </property>
-    <property key="WorkEffortPriorityThree">
-        <value xml:lang="en">3</value>
-        <value xml:lang="it">3</value>
-    </property>
-    <property key="WorkEffortPriorityFour">
-        <value xml:lang="en">4</value>
-        <value xml:lang="it">4</value>
-    </property>
-    <property key="WorkEffortPriorityFive">
-        <value xml:lang="en">5</value>
-        <value xml:lang="it">5</value>
+    <property key="WorkEffortPrioritySeventh">
+        <value xml:lang="en">7</value>
+        <value xml:lang="it">7</value>
     </property>
     <property key="WorkEffortPrioritySix">
         <value xml:lang="en">6</value>
         <value xml:lang="it">6</value>
     </property>
-    <property key="WorkEffortPrioritySeventh">
-        <value xml:lang="en">7</value>
-        <value xml:lang="it">7</value>
-    </property>
-    <property key="WorkEffortPriorityEight">
-        <value xml:lang="en">8</value>
-        <value xml:lang="it">8</value>
+    <property key="WorkEffortPriorityThree">
+        <value xml:lang="en">3</value>
+        <value xml:lang="it">3</value>
     </property>
-    <property key="WorkEffortPriorityNine">
-        <value xml:lang="en">9 (Low)</value>
-        <value xml:lang="fr">9 (Basse)</value>
-        <value xml:lang="it">9 (Bassa)</value>
-        <value xml:lang="nl">9 (Low)</value>
-        <value xml:lang="ro">9 (Joasa)</value>
-        <value xml:lang="th">9 (ต่ำ)</value>
-        <value xml:lang="zh">9 (低)</value>
+    <property key="WorkEffortPriorityTwo">
+        <value xml:lang="en">2</value>
+        <value xml:lang="it">2</value>
     </property>
     <property key="WorkEffortPrivatePublic">
         <value xml:lang="en">Private/Public</value>
@@ -2786,6 +2805,17 @@
         <value xml:lang="th">สินค้า</value>
         <value xml:lang="zh">产品</value>
     </property>
+    <property key="WorkEffortProductId">
+        <value xml:lang="en">ProductID</value>
+        <value xml:lang="es">Código de producto</value>
+        <value xml:lang="fr">Référence du produit</value>
+        <value xml:lang="it">Codice Prodotto</value>
+        <value xml:lang="nl">ProductID</value>
+        <value xml:lang="ro">Cod Produs</value>
+        <value xml:lang="ru">ID продукта</value>
+        <value xml:lang="th">รหัสสินค้า</value>
+        <value xml:lang="zh">产品标识</value>
+    </property>
     <property key="WorkEffortProductId1">
         <value xml:lang="en">ProductID 1</value>
         <value xml:lang="fr">Réf. 1 de l'article</value>
@@ -2800,17 +2830,6 @@
         <value xml:lang="th">รหัสสินค้า 2</value>
         <value xml:lang="zh">产品标识2</value>
     </property>
-    <property key="WorkEffortProductId">
-        <value xml:lang="en">ProductID</value>
-        <value xml:lang="es">Código de producto</value>
-        <value xml:lang="fr">Référence du produit</value>
-        <value xml:lang="it">Codice Prodotto</value>
-        <value xml:lang="nl">ProductID</value>
-        <value xml:lang="ro">Cod Produs</value>
-        <value xml:lang="ru">ID продукта</value>
-        <value xml:lang="th">รหัสสินค้า</value>
-        <value xml:lang="zh">产品标识</value>
-    </property>
     <property key="WorkEffortProject">
         <value xml:lang="en">Project</value>
         <value xml:lang="es">Proyecto</value>
@@ -3596,17 +3615,6 @@
         <value xml:lang="th">รหัสงานว่าง</value>
         <value xml:lang="zh">人工服务标识为空</value>
     </property>
-    <property key="WorkEffortWorkEffortManagerApplication">
-        <value xml:lang="en">Work Effort Manager Application</value>
-        <value xml:lang="es">Aplicación de administración de tareas</value>
-        <value xml:lang="fr">Application de gestion de tâches</value>
-        <value xml:lang="it">Applicazione Gestione Impegni di Lavoro</value>
-        <value xml:lang="nl">WorkEffort Manager Application</value>
-        <value xml:lang="ro">Aplicatie Gestiune Sarcini de Lucru</value>
-        <value xml:lang="ru">WorkEffort: Управление приложением</value>
-        <value xml:lang="th">โปรแกรมประยุกต์ใช้การจัดการความพยายามในการทำงาน</value>
-        <value xml:lang="zh">人工服务管理应用</value>
-    </property>
     <property key="WorkEffortWorkEffortManagerMainPage">
         <value xml:lang="en">Work Effort Manager Main Page</value>
         <value xml:lang="es">Página principal de adminstración de tareas</value>

Modified: ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml?rev=823833&r1=823832&r2=823833&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml Sat Oct 10 09:27:30 2009
@@ -43,7 +43,7 @@
                 <set field="activeApp" value="workeffort" global="true"/>
                 <set field="applicationMenuName" value="WorkEffortAppBar" global="true"/>
                 <set field="applicationMenuLocation" value="component://workeffort/widget/WorkEffortMenus.xml" global="true"/>
-                <set field="applicationTitle" value="${uiLabelMap.WorkEffortWorkEffortManagerApplication}" global="true"/>
+                <set field="applicationTitle" value="${uiLabelMap.WorkEffortManagerApplication}" global="true"/>
             </actions>
             <widgets>
                 <include-screen name="ApplicationDecorator" location="component://commonext/widget/CommonScreens.xml"/>

Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml?rev=823833&r1=823832&r2=823833&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml Sat Oct 10 09:27:30 2009
@@ -20,7 +20,7 @@
 
 <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">
 
-    <menu name="WorkEffortAppBar" title="${uiLabelMap.WorkEffortWorkEffortManagerApplication}" extends="CommonAppBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+    <menu name="WorkEffortAppBar" title="${uiLabelMap.WorkEffortManager}" extends="CommonAppBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
         default-menu-item-name="task" >
         <menu-item name="task" title="${uiLabelMap.WorkEffortTaskList}"><link target="mytasks"/></menu-item>
         <menu-item name="calendar" title="${uiLabelMap.WorkEffortCalendar}"><link target="calendar"/></menu-item>

Modified: ofbiz/trunk/specialpurpose/assetmaint/config/AssetMaintUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/config/AssetMaintUiLabels.xml?rev=823833&r1=823832&r2=823833&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/config/AssetMaintUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/config/AssetMaintUiLabels.xml Sat Oct 10 09:27:30 2009
@@ -62,6 +62,14 @@
         <value xml:lang="th">รดับสินค้าคงเหลือของ ${productId} คือ ${quantity}</value>
         <value xml:lang="zh">"${productId}的有效的库存级别是${quantity}"</value>
     </property>
+    <property key="AssetMaintManager">
+        <value xml:lang="de">Vermögensverwaltungsanwendung</value>
+        <value xml:lang="en">Asset Maintenance</value>
+        <value xml:lang="fr">Application de maintenance des biens</value>
+        <value xml:lang="it">Gestione cespiti</value>
+        <value xml:lang="th">บำรุงรักษาโปรแกรม</value>
+        <value xml:lang="zh">资产维护应用程序</value>
+    </property>
     <property key="AssetMaintParentWorkEffort">
         <value xml:lang="en">Parent Work Effort</value>
         <value xml:lang="fr">"Tâche parente"</value>

Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml?rev=823833&r1=823832&r2=823833&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml Sat Oct 10 09:27:30 2009
@@ -21,7 +21,7 @@
 <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">
 
-    <menu name="AssetMaintAppBar" title="${uiLabelMap.AssetMaintApplication}" extends="CommonAppBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
+    <menu name="AssetMaintAppBar" title="${uiLabelMap.AssetMaintManager}" extends="CommonAppBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
         <menu-item name="task" title="${uiLabelMap.WorkEffortTaskList}"><link target="mytasks"/></menu-item>
         <menu-item name="ListFixedAssets" title="${uiLabelMap.AccountingFixedAssets}"><link target="ListFixedAssets"/></menu-item>
         <menu-item name="fixedAssetMaints" title="${uiLabelMap.AccountingFixedAssetMaints}"><link target="findFixedAssetMaints"/></menu-item>

Modified: ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml?rev=823833&r1=823832&r2=823833&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml Sat Oct 10 09:27:30 2009
@@ -564,6 +564,13 @@
         <value xml:lang="th">เพิ่มตารางเวลา</value>
         <value xml:lang="zh">增加时间条目</value>
     </property>
+    <property key="ProjectMgr">
+        <value xml:lang="en">Project Manager</value>
+        <value xml:lang="fr">Application de gestion de projet</value>
+        <value xml:lang="it">Gestione progetti</value>
+        <value xml:lang="th">โปรแกรมประยุกต์ใช้การจัดการโปรเจค</value>
+        <value xml:lang="zh">项目管理应用程序</value>
+    </property>
     <property key="ProjectMgrApplication">
         <value xml:lang="en">Project Manager Application</value>
         <value xml:lang="fr">Application de gestion de projet</value>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml?rev=823833&r1=823832&r2=823833&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml Sat Oct 10 09:27:30 2009
@@ -20,7 +20,7 @@
 
 <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">
-    <menu name="ProjectMgrAppBar" title="${uiLabelMap.ProjectMgrApplication}" extends="CommonAppBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
+    <menu name="ProjectMgrAppBar" title="${uiLabelMap.ProjectMgr}" extends="CommonAppBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
 
         <menu-item name="mytasks" title="${uiLabelMap.WorkEffortMyTasks}"><link target="MyTasks"/></menu-item>
         <menu-item name="mytime" title="${uiLabelMap.WorkEffortTimesheetMyTime}"><link target="MyTimesheet"/></menu-item>