Index: specialpurpose/myportal/widget/MyPortalMenus.xml
===================================================================
--- specialpurpose/myportal/widget/MyPortalMenus.xml	(revision 735109)
+++ specialpurpose/myportal/widget/MyPortalMenus.xml	(working copy)
@@ -40,13 +40,13 @@
             <link
                 target="EditCommunicationEvent?communicationEventTypeId=COMMENT_NOTE&amp;portalPageId=${parameters.portalPageId}" />
         </menu-item>
-        <menu-item name="openEvents" title="${uiLabelMap.OpenEvents}">
+        <menu-item name="openEvents" title="${uiLabelMap.MyPageOpenEvents}">
             <condition>
                 <if-compare field-name="parameters.all" operator="equals" value="true" />
             </condition>
             <link target="showPortalPage?portalPageId=${parameters.portalPageId}&amp;all=false" />
         </menu-item>
-        <menu-item name="allOtherEvents" title="${uiLabelMap.AllEvents}">
+        <menu-item name="allOtherEvents" title="${uiLabelMap.MyPageAllEvents}">
             <condition>
                 <or>
                     <if-compare field-name="parameters.all" operator="equals" value="false" />
@@ -62,7 +62,7 @@
     </menu>
     
     <menu name="MyTimesheetMenu">
-        <menu-item name="setToComplete" title="${uiLabelMap.CommonStatustoComplete}">
+        <menu-item name="setToComplete" title="${uiLabelMap.MyPageToComplete}">
             <condition>
                 <and>
                     <if-compare field-name="timesheet.statusId" operator="equals" value="TIMESHEET_IN_PROCESS"/>
@@ -71,7 +71,7 @@
             </condition>
             <link target="statusToComplete?timesheetId=${timesheet.timesheetId}&amp;statusId=TIMESHEET_COMPLETED"/>
         </menu-item>
-        <menu-item name="setToCompleteKey" title="${uiLabelMap.CommonStatustoComplete}">
+        <menu-item name="setToCompleteKey" title="${uiLabelMap.MyPageToComplete}">
             <condition>
                 <and>
                     <if-compare field-name="timesheet.statusId" operator="equals" value="TIMESHEET_IN_PROCESS"/>
Index: specialpurpose/mypage/widget/MyPageMenus.xml
===================================================================
--- specialpurpose/mypage/widget/MyPageMenus.xml	(revision 735109)
+++ specialpurpose/mypage/widget/MyPageMenus.xml	(working copy)
@@ -27,13 +27,13 @@
             </condition>
             <link target="main?donePage=main"/>
         </menu-item>
-        <menu-item name="viewprofile" title="${uiLabelMap.MyProfile}">
+        <menu-item name="viewprofile" title="${uiLabelMap.MyPageProfile}">
             <condition>
                 <not><if-empty field-name="userLogin"/></not>
             </condition>
             <link target="viewprofile?partyId=${userLogin.partyId}"/>
         </menu-item>
-        <menu-item name="myCommunications" title="${uiLabelMap.MyCommunications}">
+        <menu-item name="myCommunications" title="${uiLabelMap.MyPageCommunications}">
             <condition>
                 <and>
                     <not><if-empty field-name="userLogin"/></not>
@@ -42,7 +42,7 @@
             </condition>
             <link target="myCommunications?donePage=myCommunications"/>
         </menu-item>
-        <menu-item name="otherCommunications" title="${uiLabelMap.OtherCommunications}">
+        <menu-item name="otherCommunications" title="${uiLabelMap.MyPageOtherCommunications}">
             <condition>
                 <and>
                     <not><if-empty field-name="userLogin"/></not>
@@ -55,7 +55,7 @@
             </condition>
             <link target="otherCommunications?donePage=otherCommunications"/>
         </menu-item>
-        <menu-item name="myCompanyComms" title="${uiLabelMap.MyCompanyComms}">
+        <menu-item name="myCompanyComms" title="${uiLabelMap.MyPageCompanyComms}">
             <condition>
                 <and>
                     <not><if-empty field-name="userLogin"/></not>
@@ -68,7 +68,7 @@
             </condition>
             <link target="myCompanyComms"/>
         </menu-item>
-        <menu-item name="myTimesheet" title="${uiLabelMap.MyTimeSheets}">
+        <menu-item name="myTimesheet" title="${uiLabelMap.MyPageTimeSheets}">
             <condition>
                 <and>
                     <not><if-empty field-name="userLogin"/></not>
@@ -81,7 +81,7 @@
             </condition>
             <link target="myTimesheet?donePage=myTimeSheet"/>
         </menu-item>
-        <menu-item name="myTasks" title="${uiLabelMap.MyTasks}">
+        <menu-item name="myTasks" title="${uiLabelMap.MyPageTasks}">
             <condition>
                 <and>
                     <not><if-empty field-name="userLogin"/></not>
@@ -158,13 +158,13 @@
             <link
                 target="EditCommunicationEvent?communicationEventTypeId=COMMENT_NOTE&amp;donePage=${parameters.donePage}" />
         </menu-item>
-        <menu-item name="openEvents" title="${uiLabelMap.OpenEvents}">
+        <menu-item name="openEvents" title="${uiLabelMap.MyPageOpenEvents}">
             <condition>
                 <if-compare field-name="parameters.all" operator="equals" value="true" />
             </condition>
             <link target="${parameters.donePage}?donePage=${parameters.donePage}&amp;all=false" />
         </menu-item>
-        <menu-item name="allOtherEvents" title="${uiLabelMap.AllEvents}">
+        <menu-item name="allOtherEvents" title="${uiLabelMap.MyPageAllEvents}">
             <condition>
                 <or>
                     <if-compare field-name="parameters.all" operator="equals" value="false" />
@@ -176,11 +176,11 @@
     </menu>    
     
     <menu name="MyTasksMenu" type="simple" menu-container-style="button-bar button-style-2" default-selected-style="selected" selected-menuitem-context-field-name="tabButtonItem">
-        <menu-item name="myTasks" title="myTasks"><link target="/projectmgr/control/MyTasks" url-mode="inter-app"/></menu-item>
+        <menu-item name="myTasks" title="${uiLabelMap.MyPageTasks}"><link target="/projectmgr/control/MyTasks" url-mode="inter-app"/></menu-item>
     </menu>
     
     <menu name="MyTimesheetMenu">
-        <menu-item name="setToComplete" title="${uiLabelMap.CommonStatustoComplete}">
+        <menu-item name="setToComplete" title="${uiLabelMap.MyPageToComplete}">
             <condition>
                 <and>
                     <if-compare field-name="timesheet.statusId" operator="equals" value="TIMESHEET_IN_PROCESS"/>
@@ -189,7 +189,7 @@
             </condition>
             <link target="statusToComplete?timesheetId=${timesheet.timesheetId}&amp;statusId=TIMESHEET_COMPLETED"/>
         </menu-item>
-        <menu-item name="setToCompleteKey" title="${uiLabelMap.CommonStatustoComplete}">
+        <menu-item name="setToCompleteKey" title="${uiLabelMap.MyPageToComplete}">
             <condition>
                 <and>
                     <if-compare field-name="timesheet.statusId" operator="equals" value="TIMESHEET_IN_PROCESS"/>
Index: specialpurpose/pos/src/org/ofbiz/pos/event/SecurityEvents.java
===================================================================
--- specialpurpose/pos/src/org/ofbiz/pos/event/SecurityEvents.java	(revision 735109)
+++ specialpurpose/pos/src/org/ofbiz/pos/event/SecurityEvents.java	(working copy)
@@ -87,11 +87,11 @@
         String text = input.value();
         if (func != null && func[0].equals(loginFunc)) {
             if (UtilValidate.isEmpty(func[1]) && UtilValidate.isEmpty(text)) {
-                output.print(UtilProperties.getMessage(PosTransaction.resource,"ULOGIN",Locale.getDefault()));
+                output.print(UtilProperties.getMessage(PosTransaction.resource,"PosULogin",Locale.getDefault()));
                 input.setFunction(loginFunc);
                 input.setPasswordInput( false);
             } else if (UtilValidate.isEmpty(func[1])) {
-                output.print(UtilProperties.getMessage(PosTransaction.resource,"UPASSW",Locale.getDefault()));
+                output.print(UtilProperties.getMessage(PosTransaction.resource,"PosUPassw",Locale.getDefault()));
                 input.setFunction(loginFunc);
                 input.setPasswordInput( true);
             } else {
@@ -106,7 +106,7 @@
                     } catch (XuiSession.UserLoginFailure e) {
                         input.clear();
                         input.setFunction(loginFunc);
-                        output.print(e.getMessage() + " " +  UtilProperties.getMessage(PosTransaction.resource,"ULOGIN",Locale.getDefault()));
+                        output.print(e.getMessage() + " " +  UtilProperties.getMessage(PosTransaction.resource,"PosULogin",Locale.getDefault()));
                     }
                     if (passed) {
                         input.clear();
@@ -125,7 +125,7 @@
                     if (mgrUl != null) {
                         boolean isMgr = session.hasRole(mgrUl, "MANAGER");
                         if (!isMgr) {
-                            output.print(UtilProperties.getMessage(PosTransaction.resource,"UserNotmanager",Locale.getDefault()));
+                            output.print(UtilProperties.getMessage(PosTransaction.resource,"PosUserNotManager",Locale.getDefault()));
                             input.clear();
                         } else {
                             ManagerEvents.mgrLoggedIn = true;
Index: specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml
===================================================================
--- specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml	(revision 735109)
+++ specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml	(working copy)
@@ -19,8 +19,8 @@
 -->
 
 <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">
-	<simple-method method-name="updatePreferences"
-		short-description="Update the user preferences">
+    <simple-method method-name="updatePreferences"
+        short-description="Update the user preferences">
         <if-compare operator="equals" value="Y" field="parameters.myCompanyComms">
             <set field="parameters.userPrefMap.myCompanyComms" value="Y" />
             <else>
@@ -51,11 +51,11 @@
                 <set field="parameters.userPrefMap.otherCommunications" value="N" />
             </else>
         </if-compare>
-		<set-service-fields service-name="setUserPreferenceGroup"
-			map="parameters" to-map="inMap" />
-		<call-service service-name="setUserPreferenceGroup"
-			in-map-name="inMap" />
-	</simple-method>
+        <set-service-fields service-name="setUserPreferenceGroup"
+            map="parameters" to-map="inMap" />
+        <call-service service-name="setUserPreferenceGroup"
+            in-map-name="inMap" />
+    </simple-method>
 
     <simple-method method-name="updateCustPreferences" short-description="Update the customer preferences">
         <if-compare operator="equals" value="Y" field="parameters.sendCustRequestEmail">
@@ -70,31 +70,31 @@
                 in-map-name="inMap" />
     </simple-method>
     
-	<simple-method method-name="setCommEventToRead"
-		short-description="">
-		<entity-one entity-name="CommunicationEventRole"
-			value-field="eventRole" />
-		<if-compare operator="equals" value="COM_ROLE_CREATED"
-			field="eventRole.statusId">
-			<call-simple-method method-name="checkCommEventAccess" />
-			<if-compare operator="equals" value="true" field="found">
-				<entity-one entity-name="UserLogin" value-field="userLogin">
-					<field-map field-name="userLoginId" value="system" />
-				</entity-one>
-				<set-service-fields service-name="setCommunicationEventRoleStatus"
-					map="parameters" to-map="updStat" />
-				<set field="updStat.statusId" value="COM_ROLE_READ" />
-				<set field="updStat.userLogin" from-field="userLogin" />
-				<call-service service-name="setCommunicationEventRoleStatus"
-					in-map-name="updStat" include-user-login="false" />
-				<else>
-					<add-error>
-						<fail-property property="NoAccess" resource="MyPageUiLabels" />
-					</add-error>
-				</else>
-			</if-compare>
-		</if-compare>
-	</simple-method>
+    <simple-method method-name="setCommEventToRead"
+        short-description="">
+        <entity-one entity-name="CommunicationEventRole"
+            value-field="eventRole" />
+        <if-compare operator="equals" value="COM_ROLE_CREATED"
+            field="eventRole.statusId">
+            <call-simple-method method-name="checkCommEventAccess" />
+            <if-compare operator="equals" value="true" field="found">
+                <entity-one entity-name="UserLogin" value-field="userLogin">
+                    <field-map field-name="userLoginId" value="system" />
+                </entity-one>
+                <set-service-fields service-name="setCommunicationEventRoleStatus"
+                    map="parameters" to-map="updStat" />
+                <set field="updStat.statusId" value="COM_ROLE_READ" />
+                <set field="updStat.userLogin" from-field="userLogin" />
+                <call-service service-name="setCommunicationEventRoleStatus"
+                    in-map-name="updStat" include-user-login="false" />
+                <else>
+                    <add-error>
+                        <fail-property property="MyPageNoAccess" resource="MyPageUiLabels" />
+                    </add-error>
+                </else>
+            </if-compare>
+        </if-compare>
+    </simple-method>
 
     <simple-method method-name="checkCommEventAccess" short-description="check if the user has access to the email of this party">
         <set field="found" value="false"/>
Index: specialpurpose/pos/src/org/ofbiz/pos/screen/SelectProduct.java
===================================================================
--- specialpurpose/pos/src/org/ofbiz/pos/screen/SelectProduct.java	(revision 735109)
+++ specialpurpose/pos/src/org/ofbiz/pos/screen/SelectProduct.java	(working copy)
@@ -64,7 +64,7 @@
     public String openDlg() {
         XDialog dlg = (XDialog) pageMgr.loadPage(m_pos.getScreenLocation() + "/dialog/SelectProduct");
         m_dialog = dlg;
-        dlg.setCaption(UtilProperties.getMessage(PosTransaction.resource, "SelectAProduct", Locale.getDefault()));
+        dlg.setCaption(UtilProperties.getMessage(PosTransaction.resource, "PosSelectAProduct", Locale.getDefault()));
         //dlg.setModal(true);
         m_productsList = (XList) dlg.findComponent("productsList");
         XEventHelper.addMouseHandler(this, m_productsList, "DoubleClick");
@@ -86,7 +86,7 @@
         m_productsList.setVisibleRowCount(-1);
         m_productsList.ensureIndexIsVisible(m_productsList.getItemCount());
         m_productsList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-        m_productsList.setToolTipText(UtilProperties.getMessage(PosTransaction.resource, "SelectProductListDblClickTip", Locale.getDefault()));
+        m_productsList.setToolTipText(UtilProperties.getMessage(PosTransaction.resource, "PosSelectProductListDblClickTip", Locale.getDefault()));
 
         dlg.pack();
         dlg.showDialog(this);
Index: applications/order/config/OrderUiLabels.xml
===================================================================
--- applications/order/config/OrderUiLabels.xml	(revision 735109)
+++ applications/order/config/OrderUiLabels.xml	(working copy)
@@ -87,12 +87,17 @@
         <value xml:lang="zh">城市</value>
     </property>
     <property key="FormFieldTitle_closedDateTime">
+        <value xml:lang="de">Schließungsdatum &amp; -uhrzeit</value>
         <value xml:lang="en">Closed Date Time</value>
+        <value xml:lang="fr">Date/heure fermée</value>
         <value xml:lang="it">Data ora chiusura</value>
+        <value xml:lang="zh">关闭日期</value>
     </property>
     <property key="FormFieldTitle_completionDate">
-        <value xml:lang="en">Completation Date</value>
+        <value xml:lang="en">Completion Date</value>
+        <value xml:lang="fr">Date d'achèvement</value>
         <value xml:lang="it">Data completamento</value>
+        <value xml:lang="zh">完成日期</value>
     </property>
     <property key="FormFieldTitle_configId">
         <value xml:lang="en">Config Id</value>
@@ -122,10 +127,6 @@
         <value xml:lang="th">หน่วยวัดสกุลเงิน</value>
         <value xml:lang="zh">货币币种</value>
     </property>
-    <property key="FormFieldTitle_currentStatusId">
-        <value xml:lang="en">Current Status Id</value>
-        <value xml:lang="it">Stato attuale</value>
-    </property>
     <property key="FormFieldTitle_custRequestId">
         <value xml:lang="en">Cust Request Id</value>
         <value xml:lang="it">Richiesta soggetto</value>
@@ -243,7 +244,7 @@
         <value xml:lang="en">External Id</value>
         <value xml:lang="es">Código ident. externo</value>
         <value xml:lang="fr">Réf. externe</value>
-        <value xml:lang="it">Codice Esterno</value>
+        <value xml:lang="it">Codice esterno</value>
         <value xml:lang="nl">Externe Id</value>
         <value xml:lang="ro">Cod Extern</value>
         <value xml:lang="ru">Внешний код</value>
@@ -304,8 +305,11 @@
         <value xml:lang="zh">内部代码</value>
     </property>
     <property key="FormFieldTitle_internalComment">
+        <value xml:lang="de">Interner Vermerk</value>
         <value xml:lang="en">Internal Comment</value>
+        <value xml:lang="fr">Commentaire interne</value>
         <value xml:lang="it">Commento interno</value>
+        <value xml:lang="zh">内部评论</value>
     </property>
     <property key="FormFieldTitle_internalName">
         <value xml:lang="ar">الإسم الداخلي</value>
@@ -438,8 +442,11 @@
         <value xml:lang="zh">便笺信息</value>
     </property>    
     <property key="FormFieldTitle_openDateTime">
+        <value xml:lang="de">Öffnungsdatum &amp; -uhrzeit</value>
         <value xml:lang="en">Open Date Time</value>
+        <value xml:lang="fr">Date/heure ouverte</value>
         <value xml:lang="it">Data ora apertura</value>
+        <value xml:lang="zh">开启日期</value>
     </property>
     <property key="FormFieldTitle_orderDate">
         <value xml:lang="de">Auftragsdatum</value>
@@ -626,18 +633,6 @@
         <value xml:lang="th">เหตุผล</value>
         <value xml:lang="zh">原因</value>
     </property>
-    <property key="FormFieldTitle_recurrenceInfoId">
-        <value xml:lang="de">Wiederholung Info ID</value>
-        <value xml:lang="en">Recurrence Info Id</value>
-        <value xml:lang="es">Código Información de repetición</value>
-        <value xml:lang="fr">Réf. d'information récurrente</value>
-        <value xml:lang="it">Informazioni Ricorrenti</value>
-        <value xml:lang="nl">Herhaling Info Id</value>
-        <value xml:lang="ro">Informatii Recurente</value>
-        <value xml:lang="ru">Код информации о возврате</value>
-        <value xml:lang="th">รหัสการคืนข้อมูล</value>
-        <value xml:lang="zh">重复使用信息标识</value>
-    </property>
     <property key="FormFieldTitle_remainingSubTotal">
         <value xml:lang="de">Verbleibendes Zwischentotal</value>
         <value xml:lang="en">Remaining Sub Total</value>
@@ -709,6 +704,16 @@
         <value xml:lang="th">รหัสการเรียกร้อง</value>
         <value xml:lang="zh">需求标识</value>
     </property>
+    <property key="FormFieldTitle_requirementStartDate">
+        <value xml:lang="de">Bedarfs-Start-Datum</value>
+        <value xml:lang="en">Requirement Start Date</value>
+        <value xml:lang="es">Fecha de comienzo del requisito</value>
+        <value xml:lang="fr">Date de début de besoin</value>
+        <value xml:lang="it">Data Inizio Fabbisogno</value>
+        <value xml:lang="ro">Data Initiala Necesar</value>
+        <value xml:lang="th">วันที่ต้องการเริ่มต้น</value>
+        <value xml:lang="zh">需求开始日期</value>
+    </property>
     <property key="FormFieldTitle_requirementTypeId">
         <value xml:lang="de">Bedarfstyp ID</value>
         <value xml:lang="en">Requirement Type Id</value>
@@ -845,7 +850,9 @@
     </property>
     <property key="FormFieldTitle_startDate">
         <value xml:lang="en">Start Date</value>
+        <value xml:lang="fr">Date de début</value>
         <value xml:lang="it">Data inizio</value>
+        <value xml:lang="zh">开始日期</value>
     </property>
     <property key="FormFieldTitle_stateProvinceGeoId">
         <value xml:lang="de">Staat/Provinz Geo ID</value>
@@ -1537,7 +1544,7 @@
         <value xml:lang="en">Billing Address</value>
         <value xml:lang="es">Dirección de facturación</value>
         <value xml:lang="fr">Addresse de facturation</value>
-	<value xml:lang="it">Indirizzo di fatturazione</value>
+        <value xml:lang="it">Indirizzo di fatturazione</value>
         <value xml:lang="ru">Платежный адрес</value>
         <value xml:lang="th">ที่อยู่ใบเสร็จรับเงิน</value>
     </property>
@@ -1607,7 +1614,7 @@
         <value xml:lang="en">Cancel Order</value>
         <value xml:lang="es">Anular pedido</value>
         <value xml:lang="fr">Annulation de commande</value>
-	<value xml:lang="it">Annulla ordine</value>
+        <value xml:lang="it">Annulla ordine</value>
         <value xml:lang="th">ยกเลิกรายการสั่งซื้อ</value>
     </property>
     <property key="OrderCancelled">
@@ -1646,7 +1653,7 @@
         <value xml:lang="en">Service capture</value>
         <value xml:lang="es">Servicio de captura de pedido</value>
         <value xml:lang="fr">Service de prélèvement</value>
-	<value xml:lang="it">Servizio di cattura</value>
+        <value xml:lang="it">Servizio di cattura</value>
         <value xml:lang="th">ให้ความสนใจบริการ</value>
     </property>
     <property key="OrderCardSecurityCode">
@@ -1711,7 +1718,7 @@
         <value xml:lang="en">Cartons</value>
         <value xml:lang="es">Cajas</value>
         <value xml:lang="fr">Cartons</value>
-	<value xml:lang="it">Cartoni</value>
+        <value xml:lang="it">Cartoni</value>
         <value xml:lang="th">บรรจุลงกล่อง</value>
     </property>
     <property key="OrderCheckout">
@@ -1968,7 +1975,7 @@
         <value xml:lang="de">Inhalt</value>
         <value xml:lang="en">Content</value>
         <value xml:lang="es">Contenido</value>
-	<value xml:lang="it">Contenuto</value>
+        <value xml:lang="it">Contenuto</value>
     </property>
     <property key="OrderContinueToFinalOrderReview">
         <value xml:lang="cs">Dále k závěrečnému přehledu objednávky</value>
@@ -2192,7 +2199,7 @@
         <value xml:lang="de">Neue Offerte aus der Anfrage erstellen</value>
         <value xml:lang="en">Create Quote from request</value>
         <value xml:lang="es">Crear nuevo presupuesto desde petición</value>
-	<value xml:lang="it">Crea preventivo dalla richiesta</value>
+        <value xml:lang="it">Crea preventivo dalla richiesta</value>
     </property>
     <property key="OrderCreateQuoteFromShoppingList">
         <value xml:lang="de">Neue Offerte erstellen</value>
@@ -2236,7 +2243,7 @@
         <value xml:lang="en">Create return shipment</value>
         <value xml:lang="es">Crear envío de vuelta</value>
         <value xml:lang="fr">Créer une expédition de retour</value>
-	<value xml:lang="it">Creare reso dalla spedizione</value>
+        <value xml:lang="it">Creare reso dalla spedizione</value>
     </property>
     <property key="OrderCreateShippingAddress">
         <value xml:lang="de">Neue Versandadresse erstellen</value>
@@ -2265,7 +2272,7 @@
         <value xml:lang="en">Cubic Measurement</value>
         <value xml:lang="es">Medida de volumen</value>
         <value xml:lang="fr">Mesure cubique</value>
-	<value xml:lang="it">Misura cubica</value>
+        <value xml:lang="it">Misura cubica</value>
         <value xml:lang="th">ปริมาตรลูกบาศก์</value>
     </property>
     <property key="OrderCurrentStatus">
@@ -2286,7 +2293,7 @@
         <value xml:lang="en">Customer</value>
         <value xml:lang="es">Cliente</value>
         <value xml:lang="fr">Client</value>
-	<value xml:lang="it">Cliente</value>
+        <value xml:lang="it">Cliente</value>
         <value xml:lang="th">ลูกค้า</value>
     </property>
     <property key="OrderCustomerPo">
@@ -2363,7 +2370,7 @@
         <value xml:lang="en">Delivery Schedule Info</value>
         <value xml:lang="es">Información de horario de entrega</value>
         <value xml:lang="fr">Information du plan de livraison</value>
-	<value xml:lang="it">Informazioni consegna schedulata</value>
+        <value xml:lang="it">Informazioni consegna schedulata</value>
         <value xml:lang="th">ข้อมูลตารางเวลาการส่ง</value>
     </property>
     <property key="OrderDemoFrontNote">
@@ -2462,7 +2469,7 @@
         <value xml:lang="en">Drop Shipped</value>
         <value xml:lang="es">Envío directo al cliente sin transportista</value>
         <value xml:lang="fr">Expédié par un tiers</value>
-	<value xml:lang="it">Spedizione per un terzo</value>
+        <value xml:lang="it">Spedizione per un terzo</value>
         <value xml:lang="ru">Прямая поставка</value>
         <value xml:lang="th">หยุดการขนส่ง</value>
     </property>
@@ -2497,7 +2504,7 @@
         <value xml:lang="en">Edit Requirement</value>
         <value xml:lang="es">Editar requisitos</value>
         <value xml:lang="fr">Modifier le besoin</value>
-	<value xml:lang="it">Aggiorna fabbisogni</value>
+        <value xml:lang="it">Aggiorna fabbisogni</value>
         <value xml:lang="th">แก้ไขความต้องการ</value>
     </property>
     <property key="OrderEditShipmentInfo">
@@ -2505,7 +2512,7 @@
         <value xml:lang="en">Edit Shipment Info</value>
         <value xml:lang="es">Editar información de envío</value>
         <value xml:lang="fr">Modifier l'info d'expédition</value>
-	<value xml:lang="it">Aggiorna informazioni spedizione</value>
+        <value xml:lang="it">Aggiorna informazioni spedizione</value>
         <value xml:lang="ru">Изменить информацию о поставке</value>
         <value xml:lang="th">แก้ไขข้อมูลการส่งสินค้า</value>
         <value xml:lang="zh">编辑货运信息</value>
@@ -2668,7 +2675,7 @@
         <value xml:lang="en">Error : Select  Customer</value>
         <value xml:lang="es">Por favor, seleccione un cliente</value>
         <value xml:lang="fr">SVP : sélectionnez un client</value>
-	<value xml:lang="it">Errore : selezione cliente</value>
+        <value xml:lang="it">Errore : selezione cliente</value>
         <value xml:lang="th">Error : ผิดพลาด ! การเลือกลูกค้า</value>
     </property>
     <property key="OrderErrorShoppingCartEmpty">
@@ -2693,7 +2700,7 @@
         <value xml:lang="en">Estimated Ready Date</value>
         <value xml:lang="es">Fecha estimada de disponibilidad</value>
         <value xml:lang="fr">Date prête estimée</value>
-	<value xml:lang="it">Data stimata disponibilità</value>
+        <value xml:lang="it">Data stimata disponibilità</value>
         <value xml:lang="th">อ่านประมาณวันที่</value>
     </property>
     <property key="OrderEstimatedShipDate">
@@ -2701,7 +2708,7 @@
         <value xml:lang="en">Estimated Ship Date</value>
         <value xml:lang="es">Fecha de envío estimada</value>
         <value xml:lang="fr">Date d'expédition estimée</value>
-	<value xml:lang="it">Data di spedizione stimata</value>
+        <value xml:lang="it">Data di spedizione stimata</value>
         <value xml:lang="th">ชำระเงินประมาณวันที่</value>
     </property>
     <property key="OrderExcludeCategories">
@@ -2778,7 +2785,7 @@
         <value xml:lang="en">Filter On Inventory Problems</value>
         <value xml:lang="es">Filtrado problemas de almacén</value>
         <value xml:lang="fr">filtrer sur les problèmes de stock</value>
-	<value xml:lang="it">Filtro su problemi di inventario</value>
+        <value xml:lang="it">Filtro su problemi di inventario</value>
         <value xml:lang="ro">Filtreaza pe probleme de inventar</value>
         <value xml:lang="th">ปัญหาการเพิ่มสินค้าคงเหลือ</value>
     </property>
@@ -2895,7 +2902,7 @@
         <value xml:lang="en">Find Quotes</value>
         <value xml:lang="es">Buscar presupuestos</value>
         <value xml:lang="fr">Recherche de devis</value>
-	<value xml:lang="it">Ricerca preventivi</value>
+        <value xml:lang="it">Ricerca preventivi</value>
         <value xml:lang="ru">Поиск предложений</value>
         <value xml:lang="th">ค้นหาคำร้อง</value>
     </property>
@@ -2916,7 +2923,7 @@
         <value xml:lang="en">Find Requirements</value>
         <value xml:lang="es">Buscar requisitos</value>
         <value xml:lang="fr">Recherche de besoins</value>
-	<value xml:lang="it">Ricerca fabbisogni</value>
+        <value xml:lang="it">Ricerca fabbisogni</value>
         <value xml:lang="ru">Поиск требований</value>
         <value xml:lang="th">ค้นหาความต้องการ</value>
     </property>
@@ -2925,7 +2932,7 @@
         <value xml:lang="en">Find Requirements For Supplier</value>
         <value xml:lang="es">Buscar requisitos para proveedor</value>
         <value xml:lang="fr">Recherche de besoins pour le fournisseur</value>
-	<value xml:lang="it">Ricerca fabbisogni per fornitore</value>
+        <value xml:lang="it">Ricerca fabbisogni per fornitore</value>
         <value xml:lang="ru">Поиск требований для поставщика</value>
         <value xml:lang="th">ค้นหาความต้องการของผู้จัดหาสิ่งของให้</value>
     </property>
@@ -2947,7 +2954,7 @@
         <value xml:lang="en">Force Complete Purchase Order</value>
         <value xml:lang="es">Forzar finalización del pedido</value>
         <value xml:lang="fr">Forcer l'achèvement de la commande d'achat</value>
-	<value xml:lang="it">Forza completamento ordine di acquisto</value>
+        <value xml:lang="it">Forza completamento ordine di acquisto</value>
         <value xml:lang="ru">Принудительное завершение закупочного заказа</value>
         <value xml:lang="th">รายการสั่งซื้อสินค้าเสร็จสมบูรณ์</value>
     </property>
@@ -2956,7 +2963,7 @@
         <value xml:lang="en">From Monday To Tuesday</value>
         <value xml:lang="es">De lunes a martes</value>
         <value xml:lang="fr">De lundi à mardi</value>
-	<value xml:lang="it">Da lunedì a venerdì</value>
+        <value xml:lang="it">Da lunedì a venerdì</value>
         <value xml:lang="th">จากวันจันทร์ถึงวันอังคาร</value>
     </property>
     <property key="OrderGift">
@@ -3409,7 +3416,7 @@
         <value xml:lang="en">Discontinued</value>
         <value xml:lang="es">Dado de baja</value>
         <value xml:lang="fr">Epuisé, plus fabriqué</value>
-	<value xml:lang="it">Cessato</value>
+        <value xml:lang="it">Cessato</value>
         <value xml:lang="ru">Снято с производства</value>
         <value xml:lang="th">ไม่ต่อเนื่อง</value>
     </property>
@@ -3553,7 +3560,7 @@
         <value xml:lang="en">Linked from order item</value>
         <value xml:lang="es">Enlazado desde ítem de pedido</value>
         <value xml:lang="fr">Lien depuis ligne de commande</value>
-	<value xml:lang="it">Link da una riga ordine</value>
+        <value xml:lang="it">Link da una riga ordine</value>
         <value xml:lang="ru">Связь от позиции заказа</value>
         <value xml:lang="th">ลิงค์จากรายการสั่งซื้อสินค้าสินค้า</value>
         <value xml:lang="zh">链接自订单明细</value>
@@ -3652,7 +3659,7 @@
     <property key="OrderLookupWhitepagesLink">
         <value xml:lang="en">http://www.whitepages.com/find_person_results.pl?fid=a&amp;s_n=${addressNum}&amp;s_a=${addressOther}&amp;c=${postalAddress.city?if_exists}&amp;s=${postalAddress.stateProvinceGeoId?if_exists}&amp;x=29&amp;y=18</value>
         <value xml:lang="fr">http://www.pagesjaunes.fr/trouverunnom/RecherchePagesBlanches.do</value>
-	<value xml:lang="it">http://www.whitepages.com/find_person_results.pl?fid=a&amp;s_n=${addressNum}&amp;s_a=${addressOther}&amp;c=${postalAddress.city?if_exists}&amp;s=${postalAddress.stateProvinceGeoId?if_exists}&amp;x=29&amp;y=18</value>
+        <value xml:lang="it">http://www.whitepages.com/find_person_results.pl?fid=a&amp;s_n=${addressNum}&amp;s_a=${addressOther}&amp;c=${postalAddress.city?if_exists}&amp;s=${postalAddress.stateProvinceGeoId?if_exists}&amp;x=29&amp;y=18</value>
     </property>
     <property key="OrderMTD">
         <value xml:lang="de">Total Monat</value>
@@ -3797,7 +3804,7 @@
         <value xml:lang="en">Net Amount</value>
         <value xml:lang="es">Importe neto</value>
         <value xml:lang="fr">Montant net</value>
-	<value xml:lang="it">Importo netto</value>
+        <value xml:lang="it">Importo netto</value>
         <value xml:lang="th">จำนวนสุทธิ</value>
     </property>
     <property key="OrderNetPriceHT">
@@ -3805,7 +3812,7 @@
         <value xml:lang="en">Net Price HT</value>
         <value xml:lang="es">Precio neto sin impuestos</value>
         <value xml:lang="fr">Prix net HT</value>
-	<value xml:lang="it">Prezzo netto con tasse</value>
+        <value xml:lang="it">Prezzo netto con tasse</value>
         <value xml:lang="th">ราคาสุทธิHT</value>
     </property>
     <property key="OrderNewDropShipmentForShipGroup">
@@ -3813,7 +3820,7 @@
         <value xml:lang="en">New Drop Shipment For Ship Group</value>
         <value xml:lang="es">Nuevo envío directo para este grupo de envío</value>
         <value xml:lang="fr">Nouvelle livraison par un tiers pour le groupe d'expédition</value>
-	<value xml:lang="it">Nuovo gruppo spedizione per spedizione conto terzi</value>
+        <value xml:lang="it">Nuovo gruppo spedizione per spedizione conto terzi</value>
         <value xml:lang="ru">Новая прямая поставка для группы</value>
         <value xml:lang="th">ลดการขนส่งใหม่สำหรับกลุ่มการขนส่ง</value>
         <value xml:lang="zh">为货运组新建厂家直送</value>
@@ -4100,7 +4107,7 @@
         <value xml:lang="en">No payment preferences with this order.</value>
         <value xml:lang="es">No hay preferencias de pago para este pedido</value>
         <value xml:lang="fr">Aucune préférence de paiement liée à cette commande</value>
-	<value xml:lang="it">Nessuna preferenza pagamento con questo ordine.</value>
+        <value xml:lang="it">Nessuna preferenza pagamento con questo ordine.</value>
         <value xml:lang="ru">Платежных предпочтений ассоциированных с этим заказом нет.</value>
         <value xml:lang="th">ไม่มีสิทธิพิเศษที่เกี่ยวข้องกับการชำระเงินด้วยรายการสั่งซื้อสินค้านี้</value>
         <value xml:lang="zh">没有与这个订单关联的支付优先方式。</value>
@@ -4110,7 +4117,7 @@
         <value xml:lang="en">No Purchase Order Specified</value>
         <value xml:lang="es">Pedido de compra no especificado</value>
         <value xml:lang="fr">Aucune commande d'achat spécifiée</value>
-	<value xml:lang="it">Nessun ordine di acquisto specificato</value>
+        <value xml:lang="it">Nessun ordine di acquisto specificato</value>
         <value xml:lang="th">ไม่มีรายการสั่งซื้อสินค้าที่ระบุ</value>
     </property>
     <property key="OrderNoPurchasePaymentMethod">
@@ -4494,7 +4501,7 @@
         <value xml:lang="en">On Friday</value>
         <value xml:lang="es">el viernes</value>
         <value xml:lang="fr">Le vendredi</value>
-	<value xml:lang="it">Di venerdì</value>
+        <value xml:lang="it">Di venerdì</value>
         <value xml:lang="th">ภายในวันศุกร์</value>
     </property>
     <property key="OrderOnOrder">
@@ -4937,7 +4944,7 @@
         <value xml:lang="en">Quote Adjustment Type Id</value>
         <value xml:lang="es">Código del ajuste</value>
         <value xml:lang="fr">Réf. de type d'ajustement de devis</value>
-	<value xml:lang="it">Tipo aggiustamento preventivo</value>
+        <value xml:lang="it">Tipo aggiustamento preventivo</value>
         <value xml:lang="th">รหัสประเภทการปรับเปลี่ยนคำร้อง</value>
     </property>
     <property key="OrderOrderQuoteAdjustments">
@@ -5460,7 +5467,7 @@
         <value xml:lang="en">Quote Type</value>
         <value xml:lang="es">Tipo de presupuesto</value>
         <value xml:lang="fr">Type de devis</value>
-	<value xml:lang="it">Tipo preventivo</value>
+        <value xml:lang="it">Tipo preventivo</value>
         <value xml:lang="ru">Тип предложения</value>
         <value xml:lang="th">ประเภทคำร้อง</value>
     </property>
@@ -5829,7 +5836,7 @@
         <value xml:lang="de">Übersicht</value>
         <value xml:lang="en">Overview</value>
         <value xml:lang="es">Resumen</value>
-	<value xml:lang="it">Sommario</value>
+        <value xml:lang="it">Sommario</value>
     </property>
     <property key="OrderPONumber">
         <value xml:lang="de">Auftragsnummer</value>
@@ -5937,7 +5944,7 @@
         <value xml:lang="en">Pay Method Type</value>
         <value xml:lang="es">Tipo de método de pago</value>
         <value xml:lang="fr">Type de méthode de paiement</value>
-	<value xml:lang="it">Tipo metodo di pagamento</value>
+        <value xml:lang="it">Tipo metodo di pagamento</value>
         <value xml:lang="th">วิธีการชำระเงิน</value>
     </property>
     <property key="OrderPaymentAddNewSetting">
@@ -5945,7 +5952,7 @@
         <value xml:lang="en">Payment Add New Setting</value>
         <value xml:lang="es">Agregar nueva configuración</value>
         <value xml:lang="fr">Le paiement ajoute une nouvelle définition</value>
-	<value xml:lang="it">Aggiunta nuove impostazioni pagamento</value>
+        <value xml:lang="it">Aggiunta nuove impostazioni pagamento</value>
         <value xml:lang="th">เพิ่มการตั้งค่าการชำระเงินใหม่</value>
     </property>
     <property key="OrderPaymentConfig">
@@ -5953,7 +5960,7 @@
         <value xml:lang="en">Payment Config</value>
         <value xml:lang="es">Configuración del pago</value>
         <value xml:lang="fr">Configuration de paiement</value>
-	<value xml:lang="it">Configurazione pagamento</value>
+        <value xml:lang="it">Configurazione pagamento</value>
         <value xml:lang="th">สร้างการชำระเงิน</value>
     </property>
     <property key="OrderPaymentMaximumAmount">
@@ -5984,49 +5991,49 @@
         <value xml:lang="en">Processor Auth Service</value>
         <value xml:lang="es">Servicio procesador de autentificación de pago</value>
         <value xml:lang="fr">Service d'autorisation de paiement</value>
-	<value xml:lang="it">Servizio di autenticazione</value>
+        <value xml:lang="it">Servizio di autenticazione</value>
         <value xml:lang="th">การบริการให้อำนาจการประมวลผล</value>
     </property>
     <property key="OrderPaymentProcessorCaptureService">
         <value xml:lang="en">Processor Capture Service</value>
         <value xml:lang="es">Servicio procesador de captura de pago</value>
         <value xml:lang="fr">Service de prélèvement du paiement</value>
-	<value xml:lang="it">Servizio di cattura</value>
+        <value xml:lang="it">Servizio di cattura</value>
         <value xml:lang="th">การบริการให้ความสนใจการประมวลผล</value>
     </property>
     <property key="OrderPaymentProcessorPropertiesURL">
         <value xml:lang="en">Processor Properties URL</value>
         <value xml:lang="es">Dirección URL de las propiedades del procesador de pago</value>
         <value xml:lang="fr">URL du service de paiement</value>
-	<value xml:lang="it">URL del servizio di pagamento</value>
+        <value xml:lang="it">URL del servizio di pagamento</value>
         <value xml:lang="th">การประมวผลคุณสมบัติ URL</value>
     </property>
     <property key="OrderPaymentProcessorReAuthService">
         <value xml:lang="en">Processor Re Auth Service</value>
         <value xml:lang="es">Servicio procesador de reautentificación de pago</value>
         <value xml:lang="fr">Service de ré-autorisation de paiement</value>
-	<value xml:lang="it">Servizio di re-autorizzazione</value>
+        <value xml:lang="it">Servizio di re-autorizzazione</value>
         <value xml:lang="th">การบริการให้อำนาจการประมวลผลอีกครั้ง</value>
     </property>
     <property key="OrderPaymentProcessorRefundService">
         <value xml:lang="en">Processor Refund Service</value>
         <value xml:lang="es">Servicio procesador de reembolso</value>
         <value xml:lang="fr">Service de remboursement</value>
-	<value xml:lang="it">Servizio di rimborso</value>
+        <value xml:lang="it">Servizio di rimborso</value>
         <value xml:lang="th">การบริการประมวผลการคืนเงินให้</value>
     </property>
     <property key="OrderPaymentProcessorSetup">
         <value xml:lang="en">Processor Setup</value>
         <value xml:lang="es">Configuración del procesador de pago</value>
         <value xml:lang="fr">Configuration du service de paiement</value>
-	<value xml:lang="it">Configurazione processore pagamenti</value>
+        <value xml:lang="it">Configurazione processore pagamenti</value>
         <value xml:lang="th">การตั้งค่าการประมวลผล</value>
     </property>
     <property key="OrderPaymentSetup">
         <value xml:lang="en">Payment Setup</value>
         <value xml:lang="es">Configuración de pagos</value>
         <value xml:lang="fr">Configuration du paiement</value>
-	<value xml:lang="it">Configurazione dei pagamenti</value>
+        <value xml:lang="it">Configurazione dei pagamenti</value>
         <value xml:lang="th">การตั้งค่าการชำระเงิน</value>
     </property>
     <property key="OrderPaymentType">
@@ -6046,7 +6053,7 @@
         <value xml:lang="en">Payment Update Setting</value>
         <value xml:lang="es">Actualización de configuración</value>
         <value xml:lang="fr">Configuration de la mise à jour de paiement</value>
-	<value xml:lang="it">Aggiorna configurazione pagamenti</value>
+        <value xml:lang="it">Aggiorna configurazione pagamenti</value>
         <value xml:lang="th">ตั้งค่าการอัพเดทวิธีการชำระเงิน</value>
     </property>
     <property key="OrderPendingPaymentDollarAmountsIncludesAdjustments">
@@ -6239,7 +6246,7 @@
         <value xml:lang="en">Process Order</value>
         <value xml:lang="es">Tramitar pedido</value>
         <value xml:lang="fr">Exécuter la commande</value>
-	<value xml:lang="it">Processa ordine</value>
+        <value xml:lang="it">Processa ordine</value>
         <value xml:lang="th">ประมวลผลรายการสั่งซื้อสินค้า</value>
     </property>
     <property key="OrderProcessingInActive">
@@ -6485,7 +6492,7 @@
         <value xml:lang="en">Purchased From</value>
         <value xml:lang="es">Comprado a</value>
         <value xml:lang="fr">Acheté de</value>
-	<value xml:lang="it">Acquistato da</value>
+        <value xml:lang="it">Acquistato da</value>
         <value xml:lang="ru">Закупать от</value>
         <value xml:lang="th">สั่งซื้อจาก</value>
         <value xml:lang="zh">购自</value>
@@ -6589,7 +6596,7 @@
         <value xml:lang="en">In Group</value>
         <value xml:lang="es">En grupo</value>
         <value xml:lang="fr">En groupe</value>
-	<value xml:lang="it">Qnt. gruppo sped.</value>
+        <value xml:lang="it">Qnt. gruppo sped.</value>
         <value xml:lang="ru">В группе</value>
         <value xml:lang="th">ในกลุ่ม</value>
     </property>
@@ -6598,7 +6605,7 @@
         <value xml:lang="en">Total In Group</value>
         <value xml:lang="es">Total en grupo</value>
         <value xml:lang="fr">Total en groupe</value>
-	<value xml:lang="it">Totale gruppo di spedizione</value>
+        <value xml:lang="it">Totale gruppo di spedizione</value>
         <value xml:lang="ru">Всего в группе</value>
         <value xml:lang="th">ผลรวมในกลุ่ม</value>
     </property>
@@ -6619,7 +6626,7 @@
         <value xml:lang="en">Shipped</value>
         <value xml:lang="es">Enviado</value>
         <value xml:lang="fr">Expédié</value>
-	<value xml:lang="it">Qnt Spedita</value>
+        <value xml:lang="it">Qnt Spedita</value>
         <value xml:lang="ru">Отгружено</value>
         <value xml:lang="th">การขนส่ง</value>
     </property>
@@ -6800,7 +6807,7 @@
         <value xml:lang="en">Re Auth Service</value>
         <value xml:lang="es">Servicio de reautentificación</value>
         <value xml:lang="fr">Service de ré-autorisation de paiement</value>
-	<value xml:lang="it">Servizio di re-autorizzazione</value>
+        <value xml:lang="it">Servizio di re-autorizzazione</value>
         <value xml:lang="th">ให้บริการอีกครั้ง</value>
     </property>
     <property key="OrderRecalculateOrder">
@@ -6886,7 +6893,7 @@
         <value xml:lang="en">Refund Service</value>
         <value xml:lang="es">Servicio de reembolso</value>
         <value xml:lang="fr">Service de remboursement</value>
-	<value xml:lang="it">Servizio di rimborso</value>
+        <value xml:lang="it">Servizio di rimborso</value>
         <value xml:lang="th">บริการคืนเงินให้</value>
     </property>
     <property key="OrderRequestReturn">
@@ -6979,7 +6986,7 @@
         <value xml:lang="en">Reject Order</value>
         <value xml:lang="es">Rechazar pedido</value>
         <value xml:lang="fr">Rejeter la commande</value>
-	<value xml:lang="it">Rifiuta ordine</value>
+        <value xml:lang="it">Rifiuta ordine</value>
         <value xml:lang="th">ปฏิเสธรายการสั่งซื้อสินค้า</value>
     </property>
     <property key="OrderRejected">
@@ -7149,7 +7156,7 @@
         <value xml:lang="de">Inhalt</value>
         <value xml:lang="en">Content</value>
         <value xml:lang="es">Contenido</value>
-	<value xml:lang="it">Contenuto</value>
+        <value xml:lang="it">Contenuto</value>
     </property>
     <property key="OrderRequestCreatedDate">
         <value xml:lang="de">Erstellungsdatum</value>
@@ -7194,13 +7201,13 @@
         <value xml:lang="de">Anmerkungen</value>
         <value xml:lang="en">Notes</value>
         <value xml:lang="es">Notas</value>
-	<value xml:lang="it">Note</value>
+        <value xml:lang="it">Note</value>
     </property>
     <property key="OrderRequestItemQuotes">
         <value xml:lang="de">Offerten</value>
         <value xml:lang="en">Quotes</value>
         <value xml:lang="es">Presupuestos</value>
-	<value xml:lang="it">Preventivi</value>
+        <value xml:lang="it">Preventivi</value>
     </property>
     <property key="OrderRequestItems">
         <value xml:lang="de">Anfragelemente</value>
@@ -7217,7 +7224,7 @@
     </property>
     <property key="OrderRequestItemWorkEffort">
         <value xml:lang="en">Request Item WorkEffort</value>
-	<value xml:lang="it">Impegni di lavoro riga richiesta</value>
+        <value xml:lang="it">Impegni di lavoro riga richiesta</value>
     </property>
     <property key="OrderRequestLastModifiedDate">
         <value xml:lang="de">Datum letzte Änderung</value>
@@ -7288,7 +7295,7 @@
         <value xml:lang="de">Übersicht</value>
         <value xml:lang="en">Overview</value>
         <value xml:lang="es">Resumen</value>
-	<value xml:lang="it">Sommario</value>
+        <value xml:lang="it">Sommario</value>
     </property>
     <property key="OrderRequestRoles">
         <value xml:lang="de">Anfragerollen</value>
@@ -7523,7 +7530,7 @@
         <value xml:lang="en">Return Enum Id</value>
         <value xml:lang="es">Tipo de devolución</value>
         <value xml:lang="fr">Réf. type énum.</value>
-	<value xml:lang="it">Tipo reso</value>
+        <value xml:lang="it">Tipo reso</value>
         <value xml:lang="th">กลับคืนรหัสที่ระบุ</value>
     </property>
     <property key="OrderReturnFound">
@@ -7958,7 +7965,7 @@
         <value xml:lang="en">Error in toggling notes to Private/Public</value>
         <value xml:lang="es">Error al cambiar notas a privado/público</value>
         <value xml:lang="fr">Erreur dans le basculement de notes entre privé et public</value>
-	<value xml:lang="it">Errore nella impostazione delle note a private/pubbliche</value>
+        <value xml:lang="it">Errore nella impostazione delle note a private/pubbliche</value>
         <value xml:lang="ru">Ошибка переключения заметки в приватную/публичную</value>
         <value xml:lang="th">Error in toggling notes to Private/Public</value>
         <value xml:lang="zh">把便笺做私有/公开切换时发生错误</value>
@@ -7966,7 +7973,7 @@
     <property key="OrderSelAmount">
         <value xml:lang="en">Sel. amount</value>
         <value xml:lang="es">Cantidad sel.</value>
-	<value xml:lang="it">Importo selezionato</value>
+        <value xml:lang="it">Importo selezionato</value>
     </property>
     <property key="OrderSelectAgreement">
         <value xml:lang="de">Wählen Sie einen Vertrag für diesen Auftrag</value>
@@ -8114,7 +8121,7 @@
         <value xml:lang="en">Select Variant</value>
         <value xml:lang="es">Por favor, seleccione una variante</value>
         <value xml:lang="fr">SVP, sélectionnez une variante</value>
-	<value xml:lang="it">Seleziona variante</value>
+        <value xml:lang="it">Seleziona variante</value>
         <value xml:lang="th">เลือกตัวแปร</value>
     </property>
     <property key="OrderSelectedGiftNotAvailableForAll">
@@ -8148,7 +8155,7 @@
         <value xml:lang="en">BCC To</value>
         <value xml:lang="es">BCC a</value>
         <value xml:lang="fr">CCI à</value>
-	<value xml:lang="it">CN a</value>
+        <value xml:lang="it">CN a</value>
         <value xml:lang="ru">Скрытая копия</value>
         <value xml:lang="th">BCC To</value>
         <value xml:lang="zh">密送</value>
@@ -8158,7 +8165,7 @@
         <value xml:lang="en">Body</value>
         <value xml:lang="es">Cuerpo</value>
         <value xml:lang="fr">Corps</value>
-	<value xml:lang="it">Corpo</value>
+        <value xml:lang="it">Corpo</value>
         <value xml:lang="ru">Текст сообщения</value>
         <value xml:lang="th">ข้อความ</value>
         <value xml:lang="zh">主体</value>
@@ -8181,7 +8188,7 @@
         <value xml:lang="en">Content-Type</value>
         <value xml:lang="es">Tipo de contenido</value>
         <value xml:lang="fr">Type de contenu</value>
-	<value xml:lang="it">Tipo contenuto</value>
+        <value xml:lang="it">Tipo contenuto</value>
         <value xml:lang="ru">Content-Type</value>
         <value xml:lang="th">ประเภทหัวข้อ</value>
         <value xml:lang="zh">内容类型</value>
@@ -8366,7 +8373,7 @@
         <value xml:lang="en">Ship Group Seq Id</value>
         <value xml:lang="es">Nº sec. grupo de envío</value>
         <value xml:lang="fr">Réf. seq. de groupe d'expédition</value>
-	<value xml:lang="it">Gruppo spedizione</value>
+        <value xml:lang="it">Gruppo spedizione</value>
         <value xml:lang="ru">Посл. код группы поставки</value>
         <value xml:lang="th">รหัสรายการกลุ่มการขนส่ง</value>
         <value xml:lang="zh">货运组序号标识</value>
@@ -8376,7 +8383,7 @@
         <value xml:lang="en">To Ship Group</value>
         <value xml:lang="es">A grupo de envío</value>
         <value xml:lang="fr">Vers le groupe d'expédition</value>
-	<value xml:lang="it">Al gruppo spedizione</value>
+        <value xml:lang="it">Al gruppo spedizione</value>
         <value xml:lang="ru">В группу поставки</value>
         <value xml:lang="th">ถึงกลุ่มการขนส่ง</value>
     </property>
@@ -8385,7 +8392,7 @@
         <value xml:lang="en">Ship Groups</value>
         <value xml:lang="es">Grupos de envío</value>
         <value xml:lang="fr">Groupes d'expédition</value>
-	<value xml:lang="it">Gruppi spedizione</value>
+        <value xml:lang="it">Gruppi spedizione</value>
         <value xml:lang="ru">Группа поставки</value>
         <value xml:lang="th">กลุ่มการขนส่ง</value>
         <value xml:lang="zh">货运组</value>
@@ -8483,7 +8490,7 @@
         <value xml:lang="en">Shipment Received</value>
         <value xml:lang="es">Envío recibido</value>
         <value xml:lang="fr">Expédition reçue</value>
-	<value xml:lang="it">Spedizione ricevuta</value>
+        <value xml:lang="it">Spedizione ricevuta</value>
         <value xml:lang="th">ได้รับการขนส่งสินค้า</value>
     </property>
     <property key="OrderShipper">
@@ -8491,7 +8498,7 @@
         <value xml:lang="en">Shipper</value>
         <value xml:lang="es">Transportista</value>
         <value xml:lang="fr">Expéditeur</value>
-	<value xml:lang="it">Spedizioniere</value>
+        <value xml:lang="it">Spedizioniere</value>
         <value xml:lang="th">บริษัทขนส่ง</value>
     </property>
     <property key="OrderShippingAddress">
@@ -8549,7 +8556,7 @@
         <value xml:lang="en">Shipment Date Hope</value>
         <value xml:lang="es">Fecha de envío deseada</value>
         <value xml:lang="fr">Date espérée d'expédition</value>
-	<value xml:lang="it">Data di speranza spedizione</value>
+        <value xml:lang="it">Data di speranza spedizione</value>
         <value xml:lang="th">คาดว่าขนส่งสินค้าวันที่</value>
     </property>
     <property key="OrderShoppingCart">
@@ -8629,7 +8636,7 @@
         <value xml:lang="en">Skids Pallets</value>
         <value xml:lang="es">Paletas</value>
         <value xml:lang="fr">Pallettes</value>
-	<value xml:lang="it">Pallets</value>
+        <value xml:lang="it">Pallets</value>
         <value xml:lang="th">Skids Pallets</value>
     </property>
     <property key="OrderSpecialInstructions">
@@ -8864,7 +8871,7 @@
         <value xml:lang="en">The  Open  Hours  To  Receive  Products  Are</value>
         <value xml:lang="es">Horario de recepción de productos</value>
         <value xml:lang="fr">Les heures d'ouverture pour recevoir des articles sont</value>
-	<value xml:lang="it">Gli orari di apertura per ricevere i prodotti sono</value>
+        <value xml:lang="it">Gli orari di apertura per ricevere i prodotti sono</value>
         <value xml:lang="th">ชั่วโมงที่เปิดรับสินค้าคือ</value>
     </property>
     <property key="OrderThisIsGift">
@@ -8979,7 +8986,7 @@
         <value xml:lang="en">Total Cubic Size</value>
         <value xml:lang="es">Volumen total</value>
         <value xml:lang="fr">Volume total</value>
-	<value xml:lang="it">Totale ampiezza cubica</value>
+        <value xml:lang="it">Totale ampiezza cubica</value>
         <value xml:lang="th">ผลรวมขนาดลูกบาศก์</value>
     </property>
     <property key="OrderTotalDue">
@@ -9118,7 +9125,7 @@
         <value xml:lang="en">Total  Weight</value>
         <value xml:lang="es">Peso total</value>
         <value xml:lang="fr">Poids total</value>
-	<value xml:lang="it">Peso totale</value>
+        <value xml:lang="it">Peso totale</value>
         <value xml:lang="th">ผลรวมน้ำหนัก</value>
     </property>
     <property key="OrderTrackingCode">
@@ -9182,14 +9189,14 @@
         <value xml:lang="en">Unit  Price  HT</value>
         <value xml:lang="es">Precio unitario sin impuestos</value>
         <value xml:lang="fr">Prix unitaire HT</value>
-	<value xml:lang="it">Prezzo unitario con tasse</value>
+        <value xml:lang="it">Prezzo unitario con tasse</value>
         <value xml:lang="th">ราคาต่อหน่วย HT</value>
     </property>
     <property key="OrderUnitsPieces">
         <value xml:lang="de">Stückpreise</value>
         <value xml:lang="en">Units  Pieces</value>
         <value xml:lang="es">Unidades Piezas</value>
-	<value xml:lang="it">Pezzi unità</value>
+        <value xml:lang="it">Pezzi unità</value>
         <value xml:lang="th">ราคาต่อชิ้น</value>
     </property>
     <property key="OrderUnplanned">
@@ -9358,7 +9365,7 @@
         <value xml:lang="en">View/Edit Delivery</value>
         <value xml:lang="es">Ver/Editar opciones de envío</value>
         <value xml:lang="fr">Affichage/Modification des options de colisage</value>
-	<value xml:lang="it">Mostra/aggiorna consegna</value>
+        <value xml:lang="it">Mostra/aggiorna consegna</value>
         <value xml:lang="th">แสดงหรือแก้ไขการส่ง</value>
     </property>
     <property key="OrderViewEditDeliveryScheduleInfo">
@@ -9509,7 +9516,7 @@
         <value xml:lang="en">WebSite</value>
         <value xml:lang="es">Sitio web</value>
         <value xml:lang="fr">Site web</value>
-	<value xml:lang="it">Sito web</value>
+        <value xml:lang="it">Sito web</value>
         <value xml:lang="th">เว็บไซต์</value>
     </property>
     <property key="OrderWeightMeasurement">
@@ -9517,7 +9524,7 @@
         <value xml:lang="en">Weight Measurement</value>
         <value xml:lang="es">Unidad de peso</value>
         <value xml:lang="fr">Pesée</value>
-	<value xml:lang="it">Misura peso</value>
+        <value xml:lang="it">Misura peso</value>
         <value xml:lang="th">หน่วยวัดน้ำหนัก</value>
     </property>
     <property key="OrderWhereShallWeShipIt">
@@ -9553,7 +9560,7 @@
         <value xml:lang="de">Bedürfnisse</value>
         <value xml:lang="en">Requirements</value>
         <value xml:lang="es">Requisitos</value>
-	<value xml:lang="it">Fabbisogni</value>
+        <value xml:lang="it">Fabbisogni</value>
     </property>
     <property key="OrderWorkflow">
         <value xml:lang="de">Workflow</value>
Index: specialpurpose/pos/src/org/ofbiz/pos/component/Output.java
===================================================================
--- specialpurpose/pos/src/org/ofbiz/pos/component/Output.java	(revision 735109)
+++ specialpurpose/pos/src/org/ofbiz/pos/component/Output.java	(working copy)
@@ -45,12 +45,12 @@
 
     public void setLock(boolean lock) {
         if (lock) {
-            this.print(UtilProperties.getMessage(PosTransaction.resource,"ULOGIN",defaultLocale));
+            this.print(UtilProperties.getMessage(PosTransaction.resource,"PosULogin",defaultLocale));
         } else {
             if (PosTransaction.getCurrentTx(session).isOpen()) {
-                this.print(UtilProperties.getMessage(PosTransaction.resource,"ISOPEN",defaultLocale));
+                this.print(UtilProperties.getMessage(PosTransaction.resource,"PosIsOpen",defaultLocale));
             } else {
-                this.print(UtilProperties.getMessage(PosTransaction.resource,"ISCLOSED",defaultLocale));
+                this.print(UtilProperties.getMessage(PosTransaction.resource,"PosIsClosed",defaultLocale));
             }
         }
     }
Index: specialpurpose/projectmgr/widget/RequestScreens.xml
===================================================================
--- specialpurpose/projectmgr/widget/RequestScreens.xml	(revision 735109)
+++ specialpurpose/projectmgr/widget/RequestScreens.xml	(working copy)
@@ -38,7 +38,7 @@
                             <link target="newrequest" text="${uiLabelMap.OrderNewRequest}" style="buttontext"/>
                             <include-form name="ListRequests" location="component://projectmgr/widget/forms/RequestForms.xml"/>
                         </screenlet>
-                        <screenlet title="${uiLabelMap.ReviewedCustomerRequestTaskList}" navigation-form-name="ListRequestsWorkEffortForm">
+                        <screenlet title="${uiLabelMap.ProjectMgrReviewedCustomerRequestTaskList}" navigation-form-name="ListRequestsWorkEffortForm">
                             <include-form name="ListRequestsWorkEffortForm" location="component://projectmgr/widget/forms/RequestForms.xml"/>
                         </screenlet>
                     </decorator-section>
Index: specialpurpose/mypage/widget/CommonScreens.xml
===================================================================
--- specialpurpose/mypage/widget/CommonScreens.xml	(revision 735109)
+++ specialpurpose/mypage/widget/CommonScreens.xml	(working copy)
@@ -35,7 +35,7 @@
                 <property-map resource="ProjectMgrUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/>
 
-                <set field="layoutSettings.companyName" from-field="uiLabelMap.MyInformation" global="true"/>
+                <set field="layoutSettings.companyName" from-field="uiLabelMap.MyPageInformation" global="true"/>
                 <set field="layoutSettings.companySubtitle" from-field="uiLabelMap.PartyCompanySubtitle" global="true"/>
                 <!-- layoutSettings.headerImageUrl can be used to specify an application specific logo; if not set,
                      then the global layoutSettings.commonHeaderImageUrl (specified in GlobalDecorator) will be used. -->
@@ -219,7 +219,7 @@
                         <not><if-empty field-name="custRequests"/></not>
                     </condition>
                     <widgets>
-                        <screenlet title="${uiLabelMap.IncomingCustRequests}" navigation-form-name="ListRequestList" >
+                        <screenlet title="${uiLabelMap.MyPageIncomingCustRequests}" navigation-form-name="ListRequestList" >
                             <include-form name="ListRequestList" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
                         </screenlet>
                     </widgets>
@@ -332,11 +332,11 @@
                 </service>
             </actions>
             <widgets>
-                <screenlet title="${uiLabelMap.MyOpenCustomerRequests}" navigation-form-name="ListCustRequests" >
+                <screenlet title="${uiLabelMap.MyPageOpenCustomerRequests}" navigation-form-name="ListCustRequests" >
                     <link target="newrequest" text="${uiLabelMap.OrderNewRequest}" style="buttontext"/>
                     <include-form name="ListCustRequests" location="component://mypage/widget/MyPageForms.xml"/>
                 </screenlet>
-                <screenlet title="${uiLabelMap.MyCompletedCustomerRequests}" navigation-form-name="ListCustRequestsCompleted">
+                <screenlet title="${uiLabelMap.MyPageCompletedCustomerRequests}" navigation-form-name="ListCustRequestsCompleted">
                     <include-form name="ListCustRequestsCompleted" location="component://mypage/widget/MyPageForms.xml"/>
                 </screenlet>
                 <section>
@@ -344,12 +344,12 @@
                         <not><if-empty field-name="companyCustRequests"/></not>
                     </condition>
                     <widgets>
-                        <screenlet title="${uiLabelMap.OtherCompanyCustomerRequests}" navigation-form-name="ListOtherCompanyRequests">
+                        <screenlet title="${uiLabelMap.MyPageOtherCompanyCustomerRequests}" navigation-form-name="ListOtherCompanyRequests">
                             <include-form name="ListOtherCompanyRequests" location="component://mypage/widget/MyPageForms.xml"/>
                         </screenlet>
                     </widgets>
                 </section>
-                <screenlet title="${uiLabelMap.CommunicationsOfParty}: ${partyName.firstName} ${partyName.middleName} ${partyName.lastName} ${partyName.groupName} [${partyId}] "
+                <screenlet title="${uiLabelMap.MyPageCommunicationsOfParty}: ${partyName.firstName} ${partyName.middleName} ${partyName.lastName} ${partyName.groupName} [${partyId}] "
                     navigation-menu-name="communicationsMenu" navigation-form-name="ListPartyCommEvents" name="myComms">
                     <include-menu name="communicationsMenu" location="component://mypage/widget/MyPageMenus.xml" />
                     <include-form name="ListPartyCommEvents" location="component://mypage/widget/MyPageForms.xml" />
@@ -361,7 +361,7 @@
     <screen name="mainNoAccess">
         <section>
             <widgets>
-                <screenlet title="${uiLabelMap.CommonNoAccess}" navigation-form-name="ListRequestList" >
+                <screenlet title="${uiLabelMap.MyPageNoAccess}" navigation-form-name="ListRequestList" >
                     <container>
                         <label style="h1" text="${uiLabelMap.MyPageNoAccess1}"></label>
                     </container>
Index: specialpurpose/webpos/config/WebPosUiLabels.xml
===================================================================
--- specialpurpose/webpos/config/WebPosUiLabels.xml	(revision 735109)
+++ specialpurpose/webpos/config/WebPosUiLabels.xml	(working copy)
@@ -17,7 +17,8 @@
     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">
+-->
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <property key="WebPosAdjustments">
         <value xml:lang="en">Adjustments</value>
         <value xml:lang="fr">Ajustements</value>
Index: specialpurpose/pos/src/org/ofbiz/pos/screen/SaveSale.java
===================================================================
--- specialpurpose/pos/src/org/ofbiz/pos/screen/SaveSale.java	(revision 735109)
+++ specialpurpose/pos/src/org/ofbiz/pos/screen/SaveSale.java	(working copy)
@@ -52,7 +52,7 @@
     // New button for Save and Print funtion
     protected XButton m_saveAndPrint = null;
     protected static PosTransaction m_trans = null;
-    public static SimpleDateFormat sdf = new SimpleDateFormat(UtilProperties.getMessage(PosTransaction.resource,"DateTimeFormat",Locale.getDefault()));
+    public static SimpleDateFormat sdf = new SimpleDateFormat(UtilProperties.getMessage(PosTransaction.resource,"PosDateTimeFormat",Locale.getDefault()));
     private static boolean ShowKeyboardInSaveSale = UtilProperties.propertyValueEqualsIgnoreCase("parameters", "ShowKeyboardInSaveSale", "Y");
 
     //TODO : make getter and setter for members (ie m_*) if needed (extern calls).  For that in Eclipse use Source/Generate Getters and setters
@@ -67,7 +67,7 @@
         m_saleName = (XEdit) m_dialog.findComponent("saleName");        
         //m_dialog.setM_focused(m_saleName); 
         m_saleName.setText(m_pos.session.getUserId() + " " + sdf.format(new Date()));
-        m_dialog.setCaption(UtilProperties.getMessage(PosTransaction.resource, "SaveASale", Locale.getDefault()));
+        m_dialog.setCaption(UtilProperties.getMessage(PosTransaction.resource, "PosSaveASale", Locale.getDefault()));
 
         m_cancel = (XButton) m_dialog.findComponent("BtnCancel");
         m_save = (XButton) m_dialog.findComponent("BtnSave");
Index: specialpurpose/projectmgr/widget/forms/RequestForms.xml
===================================================================
--- specialpurpose/projectmgr/widget/forms/RequestForms.xml	(revision 735109)
+++ specialpurpose/projectmgr/widget/forms/RequestForms.xml	(working copy)
@@ -154,7 +154,7 @@
         <field name="custRequestId">
             <hyperlink target="ViewRequest?custRequestId=${custRequestId}" description="${custRequestName} [${custRequestId}]"/>
          </field>
-        <field name="projectId" map-name="sResult">
+        <field name="projectId" title="${uiLabelMap.ProjectMgrProjectId}" map-name="sResult">
             <hyperlink target="projectView?projectId=${sResult.projectId}" description="${sResult.projectName} [${sResult.projectId}]"/>
         </field>
         <field name="phaseId" map-name="sResult">
Index: specialpurpose/assetmaint/widget/AssetmaintScreens.xml
===================================================================
--- specialpurpose/assetmaint/widget/AssetmaintScreens.xml	(revision 735109)
+++ specialpurpose/assetmaint/widget/AssetmaintScreens.xml	(working copy)
@@ -136,6 +136,7 @@
     <screen name="EditWorkEfforts">
         <section>
             <actions>
+                <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap"/>
                 <set field="titleProperty" value="PageTitleEditWorkEffort"/>
                 <set field="tabButtonItemFixedAssetMaint" value="EditWorkEfforts"/>
                 <script location="component://assetmaint/webapp/assetmaint/WEB-INF/actions/workeffort/EditWorkEfforts.groovy"/>
Index: specialpurpose/pos/src/org/ofbiz/pos/screen/PosScreen.java
===================================================================
--- specialpurpose/pos/src/org/ofbiz/pos/screen/PosScreen.java	(revision 735109)
+++ specialpurpose/pos/src/org/ofbiz/pos/screen/PosScreen.java	(working copy)
@@ -216,25 +216,25 @@
             operator.refresh();
             if (updateOutput) {
                 if (input.isFunctionSet("PAID")) {
-                    output.print(UtilProperties.getMessage(PosTransaction.resource,"CHANGE",defaultLocale)
+                    output.print(UtilProperties.getMessage(PosTransaction.resource,"PosChange",defaultLocale)
                             + UtilFormatOut.formatPrice(trans.getTotalDue().negate().doubleValue()));
                 } else if (input.isFunctionSet("TOTAL")) {
                     if (trans.getTotalDue().compareTo(BigDecimal.ZERO) > 0) {
-                        output.print(UtilProperties.getMessage(PosTransaction.resource,"TOTALD",defaultLocale) + " " + UtilFormatOut.formatPrice(trans.getTotalDue().doubleValue()));
+                        output.print(UtilProperties.getMessage(PosTransaction.resource,"PosTotalD",defaultLocale) + " " + UtilFormatOut.formatPrice(trans.getTotalDue().doubleValue()));
                     } else {
-                        output.print(UtilProperties.getMessage(PosTransaction.resource,"PAYFIN",defaultLocale));
+                        output.print(UtilProperties.getMessage(PosTransaction.resource,"PosPayFin",defaultLocale));
                     }
                 } else {
                     if (PosTransaction.getCurrentTx(session).isOpen()) {
-                        output.print(UtilProperties.getMessage(PosTransaction.resource,"ISOPEN",defaultLocale));
+                        output.print(UtilProperties.getMessage(PosTransaction.resource,"PosIsOpen",defaultLocale));
                     } else {
-                        output.print(UtilProperties.getMessage(PosTransaction.resource,"ISCLOSED",defaultLocale));
+                        output.print(UtilProperties.getMessage(PosTransaction.resource,"PosIsClosed",defaultLocale));
                     }
                 }
             }
             //journal.focus();
         } else {
-            output.print(UtilProperties.getMessage(PosTransaction.resource,"ULOGIN",defaultLocale));
+            output.print(UtilProperties.getMessage(PosTransaction.resource,"PosULogin",defaultLocale));
             //input.focus();
         }
 
Index: specialpurpose/mypage/config/MyPageUiLabels.xml
===================================================================
--- specialpurpose/mypage/config/MyPageUiLabels.xml	(revision 735109)
+++ specialpurpose/mypage/config/MyPageUiLabels.xml	(working copy)
@@ -18,136 +18,202 @@
     under the License.
 -->
 <resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <property key="toComplete">
-        <value xml:lang="en">->Closed</value>
-        <value xml:lang="fr">->Fermé(e)</value>
-    </property>
-    <property key="AllEvents">
+    <property key="MyPageAllEvents">
         <value xml:lang="en">All Communications</value>
         <value xml:lang="fr">Toutes les communications</value>
+        <value xml:lang="it">Tutte le comunicazioni</value> 
+        <value xml:lang="th">การติดต่อทั้งหมด</value>
     </property>
-    <property key="CommunicationsOfParty">
+    <property key="MyPageAppBar">
+        <value xml:lang="en">My Page App Bar</value>
+        <value xml:lang="fr">Menu des applications</value>
+        <value xml:lang="it">Mia pagina</value>
+        <value xml:lang="th">แอปพริเคชันของฉัน</value>
+    </property>
+    <property key="MyPageCommunicationEventId">
+        <value xml:lang="en">Communication Event id:</value>
+        <value xml:lang="fr">Réf. d'évènement de comm.</value>
+        <value xml:lang="it">Evenuto comunicazioni:</value>
+        <value xml:lang="th">เหตุการณ์ที่ทำการติดต่อ</value>
+    </property>
+    <property key="MyPageCommunications">
+        <value xml:lang="en">My Communications</value>
+        <value xml:lang="fr">Mes communications</value>
+        <value xml:lang="it">Proprie comunicazioni</value>
+        <value xml:lang="th">การติดต่อฉัน</value>
+    </property>
+    <property key="MyPageCommunicationsOfParty">
         <value xml:lang="en">Communications of party</value>
         <value xml:lang="fr">Communications de l'acteur</value>
+        <value xml:lang="it">Comunicazioni del soggetto</value>
+        <value xml:lang="th">การติดต่อบุคคล</value>
     </property>
-    <property key="EmailsFromKnownOrigin">
+    <property key="MyPageCompanyComms">
+        <value xml:lang="en">Company communications</value>
+        <value xml:lang="fr">Communications de l'entreprise</value>
+        <value xml:lang="it">Comunicazioni aziendali</value>
+        <value xml:lang="th">การติดต่อบริษัท</value>
+    </property>
+    <property key="MyPageCompanyEvents">
+        <value xml:lang="en">Company events</value>
+        <value xml:lang="fr">Evènements de l'entreprise</value>
+        <value xml:lang="it">Eventi aziendali</value>
+        <value xml:lang="th">เหตุการณ์บริษัท</value>
+    </property>
+    <property key="MyPageEmailsFromKnownOrigin">
         <value xml:lang="en">Emails from known origin</value>
         <value xml:lang="fr">Courriel issue d'une origine connue</value>
+        <value xml:lang="it">Emails da origine sconosciuta</value>
+        <value xml:lang="th">อีเมล์ที่อ่านแล้ว</value>
     </property>
-    <property key="EmailsFromUnknownOrigin">
-        <value xml:lang="en">Emails from unknown origin</value>
+    <property key="MyPageEmailsFromUnknownOrigin">
+        <value xml:lang="en">Emails from known origin</value>
         <value xml:lang="fr">Courriel issue d'une origine inconnue</value>
+        <value xml:lang="it">Emails da origini conosciuta</value>
+        <value xml:lang="th">อีเมล์ที่ไม่ระบุ</value>
     </property>
-    <property key="CommunicationEventId">
-        <value xml:lang="en">Communication Event id:</value>
-        <value xml:lang="fr">Réf. d'évènement de comm.</value>
+    <property key="MyPageCompletedCustomerRequests">
+        <value xml:lang="en">My Completed Customer Requests</value>
+        <value xml:lang="fr">Mes demandes de clients terminées</value>
+        <value xml:lang="it">Mie richieste cliente completate</value>
+        <value xml:lang="th">งานที่แก้ไขให้ลูกค้าเรียยร้อยแล้ว</value>
     </property>
-    <property key="CompanyEvents">
-        <value xml:lang="en">Company events</value>
-        <value xml:lang="fr">Evènements de l'entreprise</value>
+    <property key="MyPageCustRequests">
+        <value xml:lang="en">My customer requests</value>
+        <value xml:lang="fr">Mes demandes utilisateur</value>
+        <value xml:lang="it">Proprie richieste cliente</value>
+        <value xml:lang="th">ลูกค้าเรียกร้อง</value>
     </property>
-    <property key="IncomingCustRequests">
+    <property key="MyPageIncomingCustRequests">
         <value xml:lang="en">Incoming customer requests</value>
         <value xml:lang="fr">Nouvelles demandes utilisateur</value>
+        <value xml:lang="it">Richiesta cliente in entrata</value>
+        <value xml:lang="th">แสดงรายรับของลูกค้า</value>
     </property>
-    <property key="MyCommunications">
-        <value xml:lang="en">My Communications</value>
-        <value xml:lang="fr">Mes communications</value>
+    <property key="MyPageInformation">
+        <value xml:lang="en">My Information</value>
+        <value xml:lang="fr">Mes informations </value>
+        <value xml:lang="it">Proprie informazioni</value>
+        <value xml:lang="th">ข้อมูลของฉัน</value>
     </property>
-    <property key="MyProfile">
-        <value xml:lang="en">My Profile</value>
-        <value xml:lang="fr">Mon Profil</value>
-    </property>
-    <property key="MyCompanyComms">
-        <value xml:lang="en">Company communications</value>
-        <value xml:lang="fr">Communications de l'entreprise</value>
-    </property>
-    <property key="MyPageAppBar">
-        <value xml:lang="en">My Page App Bar</value>
-        <value xml:lang="fr">Menu des applications</value>
-    </property>
     <property key="MyPageNewMessage">
         <value xml:lang="en">New Message</value>
         <value xml:lang="fr">Nouveau message</value>
+        <value xml:lang="it">Nuovo messaggio</value>
+        <value xml:lang="th">ข้อความใหม่</value>
     </property>
-    <property key="MyInformation">
-        <value xml:lang="en">My Information</value>
-        <value xml:lang="fr">Mes informations </value>
+    <property key="MyPageNoAccess">
+        <value xml:lang="en">You do not have access to this information</value>
+        <value xml:lang="fr">Vous n'avez pas accès à cette information</value>
+        <value xml:lang="it">Tu non hai l'accesso a queste informazioni</value>
+        <value xml:lang="th">คุณไม่มีข้อมูลอยู่ในระบบ</value>
     </property>
-    <property key="MyCompletedCustomerRequests">
-        <value xml:lang="en">My Completed Customer Requests</value>
-        <value xml:lang="fr">Mes demandes de clients terminées</value>
-    </property>
-    <property key="MyOpenCustomerRequests">
-        <value xml:lang="en">My Open Customer Requests</value>
-        <value xml:lang="fr">Mes demandes de clients en-cours</value>
-    </property>
     <property key="MyPageNoAccess1">
         <value xml:lang="en">No Access priviledges has been setup.</value>
         <value xml:lang="fr">Aucun accès privilégié n'a été paramétré.</value>
+        <value xml:lang="it">Nessun accesso privilegiato è stato configurato.</value>
+        <value xml:lang="th">ไม่สามารถเข้าไปติดตั้งระบบ</value>
     </property>
     <property key="MyPageNoAccess2">
         <value xml:lang="en">You do not have access to any functions in the MyPage subsystem, please contact your system admin</value>
         <value xml:lang="fr">Vous n'avez accès à aucune fonction dans l'application Ma Page, contactez votre administrateur système SVP.</value>
+        <value xml:lang="it">Tu non hai l'accesso a queste funzioni nel sottosistam mia pagina, perfavore contattare il tuo amministratore di sistema</value>
+        <value xml:lang="th">ท่านไม่เข้าถึงฟังก์ชันการทำงานส่วนอื่นๆใน MyPage ได้, กรุณาติดต่อผู้ดูแลระบบของท่าน</value>
     </property>
     <property key="MyPageNoAccess3">
         <value xml:lang="en">At least MYPAGE_CUSTOMER or MYPAGE_EMPLOYEE permission is required</value>
         <value xml:lang="fr">Au moins une autorisation MYPAGE_CUSTOMER ou MYPAGE_EMPLOYEE est nécessaire</value>
+        <value xml:lang="it">Al minimo il permesso MYPAGE_CUSTOMER o MYPAGE_EMPLOYEE è richiesto</value>
+        <value xml:lang="th">อย่างน้อยที่สุด MYPAGE_CUSTOMER หรือ MYPAGE_EMPLOYEE ถูกกำหนดการใข้สิทธิ์ </value>
     </property>
     <property key="MyPageNoAccess4">
         <value xml:lang="en">Use the demo userLogin id's 'DemoCustomer' and 'DemoEmployee' for a demo.</value>
         <value xml:lang="fr">Utilisez l'identifiant de connexion 'DemoCustomer' ou 'DemoEmployee' pour une démonstration.</value>
+        <value xml:lang="it">Usare l'utente demo come 'DemoCustomer' e 'DemoEmployee' per una dimostrazione.</value>
+        <value xml:lang="th">จำลองผู้ใช้เป็น DemoCustomer และ DemoEmployee ในการทำงาน</value>
     </property>
-    <property key="MyPagePagesVisible">
-        <value xml:lang="en">pages visible on the main screen.</value>
-        <value xml:lang="fr">Pages visibles sur l'écran principal.</value>
-    </property>
-    <property key="MyTasks">
-        <value xml:lang="en">My Tasks</value>
-        <value xml:lang="fr">Mes Tâches</value>
-    </property>
-    <property key="MyTimeSheets">
-        <value xml:lang="en">My Time Sheets</value>
-        <value xml:lang="fr">Mes feuilles d'activité</value>
-    </property>
-    <property key="OpenEvents">
+    <property key="MyPageOpenEvents">
         <value xml:lang="en">Open Communications</value>
         <value xml:lang="fr">Communications ouvertes</value>
+        <value xml:lang="it">Comunicazioni aperte</value>
+        <value xml:lang="th">เปิดการติดต่อ</value>
     </property>
-    <property key="MyCustRequests">
-        <value xml:lang="en">My customer requests</value>
-        <value xml:lang="fr">Mes demandes utilisateur</value>
+    <property key="MyPageOpenCustomerRequests">
+        <value xml:lang="en">My Open Customer Requests</value>
+        <value xml:lang="fr">Mes demandes de clients en-cours</value>
+        <value xml:lang="it">Proprie richieste clienti aperte</value>
+        <value xml:lang="th">ความต้องการของลูกค้า</value>
     </property>
-    <property key="OtherCommunications">
+    <property key="MyPageOtherCommunications">
         <value xml:lang="en">Other Communications</value>
         <value xml:lang="fr">Autres communications</value>
+        <value xml:lang="it">Altre comunicazioni</value>
+        <value xml:lang="th">การติดต่อรูปแบบต่างๆ</value>
     </property>
-    <property key="NoAccess">
-        <value xml:lang="en">You do not have access to this information</value>
-        <value xml:lang="fr">Vous n'avez pas accès à cette information</value>
-    </property>
-    <property key="OtherCompanyCustomerRequests">
+    <property key="MyPageOtherCompanyCustomerRequests">
         <value xml:lang="en">Customer Requests from other contacts of my company</value>
         <value xml:lang="fr">Demandes client depuis d'autres contacts de mon entreprise</value>
+        <value xml:lang="it">Richieste cliente da altri contatti della mia azienda</value>
+        <value xml:lang="th">ลูกค้าต้องการติดต่อรูปแบบอื่นจากบริษัทของเรา</value>
     </property>
-    <property key="TaskStatus">
-        <value xml:lang="en">Task Status</value>
-        <value xml:lang="fr">Status de la tâche</value>
+    <property key="MyPagePagesVisible">
+        <value xml:lang="en">pages visible on the main screen.</value>
+        <value xml:lang="fr">Pages visibles sur l'écran principal.</value>
+        <value xml:lang="it">pagine visibili dalla pagina principale.</value>
+        <value xml:lang="th">สามารถเห็นหน้าอื่นบนหน้าหลักได้</value>
     </property>
-    <property key="TaskPlanStartDate">
-        <value xml:lang="en">Task Plan Start</value>
-        <value xml:lang="fr">Départ prévu de la tâche</value>
+    <property key="MyPageProfile">
+        <value xml:lang="en">My Profile</value>
+        <value xml:lang="fr">Mon Profil</value>
+        <value xml:lang="it">Mio profilo</value>
+        <value xml:lang="th">ประวัติส่วนตัวของฉัน</value>
     </property>
-    <property key="TaskPlanEndDate">
-        <value xml:lang="en">Task Plan End</value>
-        <value xml:lang="fr">Fin prévue de la tâche</value>
+    <property key="MyPageTaskActEndDate">
+        <value xml:lang="en">Task Act End</value>
+        <value xml:lang="fr">Fin réelle de de la tâche</value>
+        <value xml:lang="it">Attuale data fine compito</value>
+        <value xml:lang="th">เสร็จสิ้นการทำ</value>
     </property>
-    <property key="TaskActStartDate">
+    <property key="MyPageTaskActStartDate">
         <value xml:lang="en">Task Act Start</value>
         <value xml:lang="fr">Départ réel de de la tâche</value>
+        <value xml:lang="it">Attuale data inizio compito</value>
+        <value xml:lang="th">เรื่มต้นการทำ</value>
     </property>
-    <property key="TaskActEndDate">
-        <value xml:lang="en">Task Act End</value>
-        <value xml:lang="fr">Fin réelle de de la tâche</value>
+    <property key="MyPageTaskPlanEndDate">
+        <value xml:lang="en">Task Plan End</value>
+        <value xml:lang="fr">Fin prévue de la tâche</value>
+        <value xml:lang="it">Datta fine pianificata compito</value>
+        <value xml:lang="th">สิ้นสุดชิ้นงาน</value>
     </property>
+    <property key="MyPageTaskPlanStartDate">
+        <value xml:lang="en">Task Plan Start</value>
+        <value xml:lang="fr">Départ prévu de la tâche</value>
+        <value xml:lang="it">Data inizio pianificata compito</value>
+        <value xml:lang="th">เริ่มต้นชิ้นงาน</value>
+    </property>
+    <property key="MyPageTaskStatus">
+        <value xml:lang="en">Task Status</value>
+        <value xml:lang="fr">Status de la tâche</value>
+        <value xml:lang="it">Stato compito</value>
+        <value xml:lang="th">สถานะของงาน</value>
+    </property>
+    <property key="MyPageTasks">
+        <value xml:lang="en">My Tasks</value>
+        <value xml:lang="fr">Mes Tâches</value>
+        <value xml:lang="it">Propri compiti</value>
+        <value xml:lang="th">งานของฉัน</value>
+    </property>
+    <property key="MyPageTimeSheets">
+        <value xml:lang="en">My Time Sheets</value>
+        <value xml:lang="fr">Mes feuilles d'activité</value>
+        <value xml:lang="it">Proprie timbrature</value>
+        <value xml:lang="th">ตารางการทำงานของฉัน</value>
+    </property>
+    <property key="MyPageToComplete">
+        <value xml:lang="en">->Closed</value>
+        <value xml:lang="fr">->Fermé(e)</value>
+        <value xml:lang="it">->Chiuso</value>
+        <value xml:lang="th">เสร็จสิ้น</value>
+    </property>
 </resource>
Index: specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java
===================================================================
--- specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java	(revision 735109)
+++ specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java	(working copy)
@@ -240,7 +240,7 @@
         itemInfo.put("adjustments", "");
         if (item.getOtherAdjustments().compareTo(BigDecimal.ZERO) != 0) {
             itemInfo.put("itemDiscount", UtilFormatOut.padString(
-                    UtilProperties.getMessage(PosTransaction.resource,"(ItemDiscount)",defaultLocale), Receipt.pridLength[0] + 1, true, ' '));                    
+                    UtilProperties.getMessage(PosTransaction.resource,"PosItemDiscount",defaultLocale), Receipt.pridLength[0] + 1, true, ' '));                    
             itemInfo.put("adjustments", UtilFormatOut.formatPrice(item.getOtherAdjustments().doubleValue()));
         }
         
@@ -788,14 +788,14 @@
         cart.setOrderPartyId(partyId);
 
         // validate payment methods
-        output.print(UtilProperties.getMessage(PosTransaction.resource,"Validating",defaultLocale));
+        output.print(UtilProperties.getMessage(PosTransaction.resource,"PosValidating",defaultLocale));
         Map valRes = ch.validatePaymentMethods();
         if (valRes != null && ServiceUtil.isError(valRes)) {
             throw new GeneralException(ServiceUtil.getErrorMessage(valRes));
         }
 
         // store the "order"
-        output.print(UtilProperties.getMessage(PosTransaction.resource,"Saving",defaultLocale));
+        output.print(UtilProperties.getMessage(PosTransaction.resource,"PosSaving",defaultLocale));
         Map orderRes = ch.createOrder(session.getUserLogin());
         //Debug.log("Create Order Resp : " + orderRes, module);
 
@@ -806,7 +806,7 @@
         }
 
         // process the payment(s)
-        output.print(UtilProperties.getMessage(PosTransaction.resource,"Processing",defaultLocale));
+        output.print(UtilProperties.getMessage(PosTransaction.resource,"PosProcessing",defaultLocale));
         Map payRes = null;
         try {
             payRes = ch.processPayment(ProductStoreWorker.getProductStore(productStoreId, session.getDelegator()), session.getUserLogin(), true);
@@ -823,7 +823,7 @@
         BigDecimal change = grandTotal.subtract(paymentAmt);
 
         // notify the change due
-        output.print(UtilProperties.getMessage(PosTransaction.resource,"CHANGE",defaultLocale) + " " + UtilFormatOut.formatPrice(this.getTotalDue().negate().doubleValue()));
+        output.print(UtilProperties.getMessage(PosTransaction.resource,"PosChange",defaultLocale) + " " + UtilFormatOut.formatPrice(this.getTotalDue().negate().doubleValue()));
 
         // threaded drawer/receipt printing
         final PosTransaction currentTrans = this;
@@ -927,7 +927,7 @@
                     // append the promo info
                     XModel promo = Journal.appendNode(model, "tr", "itemadjustment", "");
                     Journal.appendNode(promo, "td", "sku", "");
-                    Journal.appendNode(promo, "td", "desc", UtilProperties.getMessage(PosTransaction.resource,"(ItemDiscount)",defaultLocale));
+                    Journal.appendNode(promo, "td", "desc", UtilProperties.getMessage(PosTransaction.resource,"PosItemDiscount",defaultLocale));
                     Journal.appendNode(promo, "td", "qty", "");
                     Journal.appendNode(promo, "td", "price", UtilFormatOut.formatPrice(adjustment.doubleValue()));
                 }
@@ -966,7 +966,7 @@
                     XModel adjustmentLine = Journal.appendNode(model, "tr", "adjustment", "");
                     Journal.appendNode(adjustmentLine, "td", "sku", "");
                     Journal.appendNode(adjustmentLine, "td", "desc", 
-                            UtilProperties.getMessage(PosTransaction.resource, "(SalesDiscount)",defaultLocale));
+                            UtilProperties.getMessage(PosTransaction.resource, "PosSalesDiscount",defaultLocale));
                     if (UtilValidate.isNotEmpty(amount)) {
                         Journal.appendNode(adjustmentLine, "td", "qty", "");
                         Journal.appendNode(adjustmentLine, "td", "price", UtilFormatOut.formatPrice(amount.doubleValue()));
@@ -983,14 +983,14 @@
             XModel taxLine = Journal.appendNode(model, "tr", "tax", "");
             Journal.appendNode(taxLine, "td", "sku", "");
 
-            Journal.appendNode(taxLine, "td", "desc", UtilProperties.getMessage(PosTransaction.resource,"Sales_Tax",defaultLocale));
+            Journal.appendNode(taxLine, "td", "desc", UtilProperties.getMessage(PosTransaction.resource,"PosSalesTax",defaultLocale));
             Journal.appendNode(taxLine, "td", "qty", "");
             Journal.appendNode(taxLine, "td", "price", UtilFormatOut.formatPrice(taxAmount.doubleValue()));
             Journal.appendNode(taxLine, "td", "index", "-1");
             
             XModel totalLine = Journal.appendNode(model, "tr", "total", "");
             Journal.appendNode(totalLine, "td", "sku", "");
-            Journal.appendNode(totalLine, "td", "desc", UtilProperties.getMessage(PosTransaction.resource,"Grand_Total",defaultLocale));
+            Journal.appendNode(totalLine, "td", "desc", UtilProperties.getMessage(PosTransaction.resource,"PosGrandTotal",defaultLocale));
             Journal.appendNode(totalLine, "td", "qty", "");
             Journal.appendNode(totalLine, "td", "price", UtilFormatOut.formatPrice(total.doubleValue()));
             Journal.appendNode(totalLine, "td", "index", "-1");
Index: specialpurpose/googlebase/config/GoogleBaseUiLabels.xml
===================================================================
--- specialpurpose/googlebase/config/GoogleBaseUiLabels.xml	(revision 735109)
+++ specialpurpose/googlebase/config/GoogleBaseUiLabels.xml	(working copy)
@@ -17,7 +17,8 @@
     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">
+-->
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <property key="FormFieldTitle_actionType">
         <value xml:lang="en">Action Type</value>
         <value xml:lang="fr">Type d'action</value>
@@ -208,6 +209,7 @@
     <property key="productsExportToGoogle.invalidCountryCode">
         <value xml:lang="en">Country Code must be either US, UK or DE.</value>
         <value xml:lang="fr">Code de pays doit être l'un ou l'autre US, UK ou DE</value>
+        <value xml:lang="it">Codice paese deve essere US, UK o DE.</value>
         <value xml:lang="th">รหัสประเทศต้องเป็น US , UK หรือไม่ก็ DE</value>
     </property>
     <property key="productsExportToGoogle.missingParameterProductCategoryId">
Index: specialpurpose/assetmaint/config/IsMgrUiLabels.xml
===================================================================
--- specialpurpose/assetmaint/config/IsMgrUiLabels.xml	(revision 735109)
+++ specialpurpose/assetmaint/config/IsMgrUiLabels.xml	(working copy)
@@ -18,59 +18,69 @@
     under the License.
 -->
 <resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
     <property key="IsMgrApplication">
         <value xml:lang="en">Information Systems Management Application</value>
         <value xml:lang="fr">Gestion du parc informatique</value>
+        <value xml:lang="it">Applicazione gestione sistemi informativi</value>
     </property>
     <property key="IsMgrCompanyName">
         <value xml:lang="en">OFBiz: Is Manager</value>
         <value xml:lang="fr">OFBiz: application de gestion du parc informatique</value>
+        <value xml:lang="it">OFBiz: Gestione sistemi informativi</value>
     </property>
     <property key="IsMgrCompanySubtitle">
         <value xml:lang="en">Information Systems Department</value>
         <value xml:lang="fr">Département du système d'information</value>
+        <value xml:lang="it">Dipartimento sistemi informativi</value>
     </property>
-    
     <property key="IsMgrComputerHardware">
         <value xml:lang="en">Hardware</value>
         <value xml:lang="fr">Matériel informatique</value>
+        <value xml:lang="it">Hardware</value>
     </property>
     <property key="IsMgrComputerSoftware">
         <value xml:lang="en">Software</value>
         <value xml:lang="fr">Logiciels</value>
+        <value xml:lang="it">Software</value>
     </property>
-    
     <property key="IsMgrNewComputerHardware">
         <value xml:lang="en">New Hardware</value>
         <value xml:lang="fr">Nouveau matériel informatique</value>
+        <value xml:lang="it">Nuovo hardware</value>
     </property>
     <property key="IsMgrNewComputerSoftware">
         <value xml:lang="en">New Software</value>
         <value xml:lang="fr">Nouveau logiciel</value>
+        <value xml:lang="it">Nuovo software</value>
     </property>
     <property key="IsMgrHardwareAccessories">
         <value xml:lang="en">Accessories</value>
         <value xml:lang="fr">Accessoires</value>
+        <value xml:lang="it">Accessori</value>
     </property>
     <property key="IsMgrInstalledSoftware">
         <value xml:lang="en">Installed Software</value>
         <value xml:lang="fr">Logiciels installés</value>
+        <value xml:lang="it">Software installati</value>
     </property>
     <property key="IsMgrFindComputerHardware">
         <value xml:lang="en">Find Hardware</value>
         <value xml:lang="fr">Rechercher du matériel informatique</value>
+        <value xml:lang="it">Ricerca hardware</value>
     </property>
     <property key="IsMgrFindComputerSoftware">
         <value xml:lang="en">Find Software</value>
         <value xml:lang="fr">Rechercher du logiciel</value>
+        <value xml:lang="it">Ricerca software</value>
     </property>
     <property key="PageTitleEditComputerHardware">
         <value xml:lang="en">Edit Hardware</value>
         <value xml:lang="fr">Modifier le matériel informatique</value>
+        <value xml:lang="it">Aggiorna hardware</value>
     </property>
     <property key="PageTitleEditComputerSoftware">
         <value xml:lang="en">Edit Software</value>
         <value xml:lang="fr">Modifier le logiciel</value>
+        <value xml:lang="it">Aggiorna software</value>
     </property>
-</resource>    
\ No newline at end of file
+</resource>
\ No newline at end of file
Index: specialpurpose/myportal/widget/MyPortalForms.xml
===================================================================
--- specialpurpose/myportal/widget/MyPortalForms.xml	(revision 735109)
+++ specialpurpose/myportal/widget/MyPortalForms.xml	(working copy)
@@ -30,7 +30,7 @@
         <field name="roleTypeId" parameter-name="newRoleTypeId" title="${uiLabelMap.PartyRole}"><hidden value="${roleTypeId}"/></field>
         <field name="remove" title="${uiLabelMap.CommonRemove}"><hyperlink target="updateTaskAssigment?workEffortId=${workEffortId}&amp;partyId=${partyId}&amp;roleTypeId=${roleTypeId}&amp;fromDate=${fromDate}&amp;statusId=PAS_ENDED&amp;donePage=${parameters.donePage}" description="${uiLabelMap.CommonRemove}"/></field>
         <!-- better set to complete on the timesheet -->
-        <!-- field name="toComplete" title="${uiLabelMap.CommonStatustoComplete}"><hyperlink target="updateTaskAssigment?workEffortId=${workEffortId}&amp;partyId=${partyId}&amp;roleTypeId=${roleTypeId}&amp;fromDate=${fromDate}&amp;statusId=PAS_COMPLETED&amp;donePage=${parameters.donePage}" description="${uiLabelMap.CommonStatustoComplete}"/></field-->
+        <!-- field name="toComplete" title="${uiLabelMap.MyPageToComplete}"><hyperlink target="updateTaskAssigment?workEffortId=${workEffortId}&amp;partyId=${partyId}&amp;roleTypeId=${roleTypeId}&amp;fromDate=${fromDate}&amp;statusId=PAS_COMPLETED&amp;donePage=${parameters.donePage}" description="${uiLabelMap.MyPageToComplete}"/></field-->
     </form>
     
     <form name="EditWeekTimesheet" extends="EditWeekTimesheet" extends-resource="component://projectmgr/widget/forms/TimeSheetForms.xml">
@@ -94,7 +94,7 @@
         </field>
         <field name="statusId" entry-name="roleStatusId" widget-style="buttontext" widget-area-style="fieldWidth300">
             <display-entity entity-name="StatusItem" description="${description}">
-                <sub-hyperlink description="${uiLabelMap.${toComplete}}" target="setCommunicationEventRoleStatus?communicationEventId=${communicationEventId}&amp;partyId=${partyId}&amp;roleTypeId=${roleTypeId}&amp;statusId=COM_ROLE_COMPLETED&amp;donePage=${parameters.donePage}&amp;VIEW_SIZE=${parameters.VIEWSIZE}&amp;VIEW_INDEX=${parameters.VIEW_INDEX}"/>
+                <sub-hyperlink description="${uiLabelMap.MyPageToComplete}" target="setCommunicationEventRoleStatus?communicationEventId=${communicationEventId}&amp;partyId=${partyId}&amp;roleTypeId=${roleTypeId}&amp;statusId=COM_ROLE_COMPLETED&amp;donePage=${parameters.donePage}&amp;VIEW_SIZE=${parameters.VIEWSIZE}&amp;VIEW_INDEX=${parameters.VIEW_INDEX}"/>
             </display-entity>
         </field>
         <field name="createdStamp" entry-name="entryDate"/>
@@ -141,11 +141,11 @@
             </drop-down>
         </field>
         <field name="updateButton" widget-style="smallSubmit"><submit /></field>
-        <field name="currentStatusId" map-name="taskResult.taskInfo" title="${uiLabelMap.TaskStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
-        <field name="estimatedStartDate" map-name="taskResult.taskInfo" title="${uiLabelMap.TaskPlanStartDate}"><display type="date"/></field>
-        <field name="estimatedCompletionDate" map-name="taskResult.taskInfo" title="${uiLabelMap.TaskPlanEndDate}"><display type="date"/></field>
-        <field name="actualStartDate" map-name="taskResult.taskInfo" title="${uiLabelMap.TaskActStartDate}"><display type="date"/></field>
-        <field name="actualCompletionDate" map-name="taskResult.taskInfo" title="${uiLabelMap.TaskActEndDate}"><display type="date"/></field>
+        <field name="currentStatusId" map-name="taskResult.taskInfo" title="${uiLabelMap.MyPageTaskStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
+        <field name="estimatedStartDate" map-name="taskResult.taskInfo" title="${uiLabelMap.MyPageTaskPlanStartDate}"><display type="date"/></field>
+        <field name="estimatedCompletionDate" map-name="taskResult.taskInfo" title="${uiLabelMap.MyPageTaskPlanEndDate}"><display type="date"/></field>
+        <field name="actualStartDate" map-name="taskResult.taskInfo" title="${uiLabelMap.MyPageTaskActStartDate}"><display type="date"/></field>
+        <field name="actualCompletionDate" map-name="taskResult.taskInfo" title="${uiLabelMap.MyPageTaskActEndDate}"><display type="date"/></field>
         <field name="plannedHours" map-name="taskResult.taskInfo"><display/></field>
         <field name="actualHours" map-name="taskResult.taskInfo"><display/></field>
     </form>
Index: specialpurpose/mypage/widget/MyPageScreens.xml
===================================================================
--- specialpurpose/mypage/widget/MyPageScreens.xml	(revision 735109)
+++ specialpurpose/mypage/widget/MyPageScreens.xml	(working copy)
@@ -169,7 +169,7 @@
                 <set field="donePage" from-field="donePage" default-value="myCompanyComms"/>
             </actions>
             <widgets>
-                <screenlet title="${uiLabelMap.CompanyEvents}" navigation-menu-name="MyCompanyCommsMenu" name="companyEvents" collapsible="true">
+                <screenlet title="${uiLabelMap.MyPageCompanyEvents}" navigation-menu-name="MyCompanyCommsMenu" name="companyEvents" collapsible="true">
                     <include-menu name="MyCompanyCommsMenu" location="component://mypage/widget/MyPageMenus.xml"/>
                     <include-form name="MyCompanyComms" location="component://mypage/widget/MyPageForms.xml"/>
                 </screenlet>
@@ -231,7 +231,7 @@
                 </entity-one>
             </actions>
             <widgets>
-                <screenlet title="${uiLabelMap.CommunicationsOfParty}: ${partyName.firstName} ${partyName.middleName} ${partyName.lastName} ${partyName.groupName} [${partyId}] "
+                <screenlet title="${uiLabelMap.MyPageCommunicationsOfParty}: ${partyName.firstName} ${partyName.middleName} ${partyName.lastName} ${partyName.groupName} [${partyId}] "
                     navigation-menu-name="communicationsMenu" navigation-form-name="ListPartyCommEvents"
                     name="myComms">
                     <include-menu name="communicationsMenu"
@@ -243,13 +243,13 @@
                             </not>
                         </condition>
                         <widgets>
-                            <label style="h2" text="${uiLabelMap.EmailsFromUnknownOrigin}"></label>
+                            <label style="h2" text="${uiLabelMap.MyPageEmailsFromUnknownOrigin}"></label>
                             <include-form
                                 location="component://mypage/widget/MyPageForms.xml"
                                 name="ListMyUnknownPartyEmails" />
                         </widgets>
                     </section>
-                    <label style="h2" text="${uiLabelMap.EmailsFromKnownOrigin}"></label>
+                    <label style="h2" text="${uiLabelMap.MyPageEmailsFromKnownOrigin}"></label>
                     <include-form name="ListPartyCommEvents"
                         location="component://mypage/widget/MyPageForms.xml" />
                     <section>
@@ -310,7 +310,7 @@
                             <section>
                                 <widgets>
                                     <label style="h1"
-                                        text="${uiLabelMap.CommunicationEventId} ${parameters.communicationEventId}"></label>
+                                        text="${uiLabelMap.MyPageCommunicationEventId} ${parameters.communicationEventId}"></label>
                                     <include-screen name="commEvent" 
                                             location="component://party/widget/partymgr/CommunicationScreens.xml" />
                                 </widgets>
Index: specialpurpose/shark/config/SharkUiLabels.xml
===================================================================
--- specialpurpose/shark/config/SharkUiLabels.xml	(revision 735109)
+++ specialpurpose/shark/config/SharkUiLabels.xml	(working copy)
@@ -17,18 +17,12 @@
     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="FrameworkShark">
-        <value xml:lang="en">Framework Shark</value>
-        <value xml:lang="fr">Shark workflow engine : moteur de gestion des flux de travail</value>
-        <value xml:lang="it">Applicazione Flussi di Lavoro</value>
-        <value xml:lang="ro">Aplictie Fluxuri de Lucru</value>
-        <value xml:lang="th">Framework Shark</value>
-    </property>
+-->
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <property key="SharkCompanyName">
         <value xml:lang="en">OFBiz: Shark</value>
         <value xml:lang="fr">OFBiz : Shark</value>
-        <value xml:lang="it">OFBiz: Flussi di Lavoro</value>
+        <value xml:lang="it">OFBiz: Flussi di lavoro</value>
         <value xml:lang="ro">OFBiz: Fluxuri de Lucru</value>
         <value xml:lang="th">OFBiz: Shark</value>
     </property>
@@ -38,7 +32,7 @@
         <value xml:lang="en">Part of the Open For Business Family of Open Source Software</value>
         <value xml:lang="es">Parte de la familia de software Open For Business de código abierto</value><!--value xml:lang="es">Parte de la familia "Open for Bussiness" de Software Libre</value-->
         <value xml:lang="fr">Un module de la famille Open For Business, logiciel libre de gestion d'entreprise.</value>
-        <value xml:lang="it">Part of the Open For Business Family of Open Source Software</value>
+        <value xml:lang="it">Parte del progetto open source Open For Business Family</value>
         <value xml:lang="nl">Deel van de Open For Business-suite van Open Source Software</value><!--value xml:lang="nl">Onderdeel van de Open For Business'-suite</value-->
         <value xml:lang="pt_BR">Parte da família OfBiz de software de fonte aberta</value>
         <value xml:lang="pt_PT">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-->
@@ -48,10 +42,17 @@
         <value xml:lang="zh">开源软件OFBiz家族的一部分</value><!--value xml:lang="zh">开源软件OFBiz的组成部分</value--><!--value xml:lang="zh">开源软件OFBiz的组成部分</value-->
         <value xml:lang="zh_CN">OFBiz的一部分</value>
     </property>
+    <property key="SharkFramework">
+        <value xml:lang="en">Framework Shark</value>
+        <value xml:lang="fr">Shark workflow engine : moteur de gestion des flux de travail</value>
+        <value xml:lang="it">Applicazione flussi di lavoro</value>
+        <value xml:lang="ro">Aplictie Fluxuri de Lucru</value>
+        <value xml:lang="th">Framework Shark</value>
+    </property>
     <property key="SharkMainPage">
         <value xml:lang="en">Shark Manager Main Page</value>
         <value xml:lang="fr">Shark : page principale</value>
-        <value xml:lang="it">Pagina Principale</value>
+        <value xml:lang="it">Pagina principale</value>
         <value xml:lang="ro">Pagina Principala</value>
         <value xml:lang="th">หน้าหลักของการจัดการ Shark</value>
     </property>
Index: specialpurpose/projectmgr/widget/CommonScreens.xml
===================================================================
--- specialpurpose/projectmgr/widget/CommonScreens.xml	(revision 735109)
+++ specialpurpose/projectmgr/widget/CommonScreens.xml	(working copy)
@@ -118,7 +118,7 @@
                                     </condition>
                                     <widgets>                                        
                                         <include-menu name="TaskTabBar" location="component://projectmgr/widget/Menus.xml"/>
-                                        <label style="h1" text="${uiLabelMap.ProjectMgrTaskCurrent}: ${workEffort.workEffortName}[${workEffort.workEffortId}] Phase: ${phaseName} Project: ${projectName}"/>
+                                        <label style="h1" text="${uiLabelMap.ProjectMgrTaskCurrent}: ${workEffort.workEffortName}[${workEffort.workEffortId}] ${uiLabelMap.ProjectMgrPhaseName}: ${phaseName} ${uiLabelMap.ProjectMgrProjectName}: ${projectName}"/>
                                         <link style="h1" text="[${projectId}]" target="projectView?projectId=${projectId}"/>
                                     </widgets>                                    
                                 </section>
Index: specialpurpose/assetmaint/config/AssetMaintUiLabels.xml.r734245
===================================================================
--- specialpurpose/assetmaint/config/AssetMaintUiLabels.xml.r734245	(revision 0)
+++ specialpurpose/assetmaint/config/AssetMaintUiLabels.xml.r734245	(revision 0)
@@ -0,0 +1,102 @@
+<?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="AssetMaintApplication">
+        <value xml:lang="de">Vermögensverwaltungsanwendung</value>
+        <value xml:lang="en">Asset Maintenance Application</value>
+        <value xml:lang="fr">Application de maintenance des biens</value>
+        <value xml:lang="it">Applicazione Manutenzione Beni</value>
+        <value xml:lang="th">บำรุงรักษาโปรแกรม</value>
+    </property>
+    <property key="AssetMaintCompanyName">
+        <value xml:lang="en">OFBiz: Asset Maintenance</value>
+        <value xml:lang="fr">OFBiz : maintenance des biens</value>
+        <value xml:lang="it">OFBiz: Manutenzione Beni</value>
+        <value xml:lang="th">OFBiz: การบำรุงรักษา</value>
+    </property>
+    <property key="AssetMaintCompanySubtitle">
+        <value xml:lang="en">Maintenance Department</value>
+        <value xml:lang="fr">Service de maintenance</value>
+        <value xml:lang="it">Manutenzione Dipartimento</value>
+        <value xml:lang="th">แผนกการดูแลรักษา</value>
+    </property>
+    <property key="AssetMaintItemIssuance">
+        <value xml:lang="en">Parts</value>
+        <value xml:lang="fr">Pièces</value>
+        <value xml:lang="it">Parti</value>
+        <value xml:lang="th">ส่วนหนึ่ง</value>
+    </property>
+    <property key="AssetMaintInvalidPartProductIdError">
+        <value xml:lang="en">"Part Id ${productId} provided is invalid please check and try again"</value>
+        <value xml:lang="fr">"La réf. de piéce ${productId} fournie n'est pas valable, SVP recommencez"</value>
+        <value xml:lang="it">"Codice Parte ${productId} fornito non è valido perfavore controllare e provare nuovamente"</value>
+        <value xml:lang="th">รหัสส่วน ${productId} ใช้ไม่ได้ กรุณาตรวจสอบและลองอีกครั้ง</value>
+    </property>
+    <property key="AssetMaintLowPartInventoryError">
+        <value xml:lang="en">"Available Inventory level for ${productId} is ${quantity}"</value>
+        <value xml:lang="fr">"Le niveau de stock disponible pour ${productId} est ${quantity"</value>
+        <value xml:lang="it">"Livello Inventario Disponibile per ${productId} è ${quantity}"</value>
+        <value xml:lang="th">รดับสินค้าคงเหลือของ ${productId} คือ ${quantity}</value>
+    </property>
+    <property key="AssetMaintParentWorkEffort">
+        <value xml:lang="en">Parent Work Effort</value>
+        <value xml:lang="fr">"Tâche parente"</value>
+    </property>
+    <property key="AssetMaintProductMaint">
+        <value xml:lang="en">Product Maint</value>
+        <value xml:lang="fr">Maintenance</value>
+    </property>
+    <property key="AssetMaintViewPermissionError">
+        <value xml:lang="en">View Permission Error</value>
+        <value xml:lang="fr">Afficher l'erreur d'autorisation</value>
+        <value xml:lang="th">แสดงข้อผิดพลาดในการอนุญาต</value>
+    </property>
+    <property key="PageTitleAddItemIssuance">
+        <value xml:lang="en">Add Item Issuance</value>
+        <value xml:lang="fr">Ajouter une émission d'article</value>
+        <value xml:lang="it">Aggiungi Riga Prelievo</value>
+        <value xml:lang="th">เพิ่มรายการที่ออกมา</value>
+    </property>
+    <property key="PageTitleChildWorkEfforts">
+        <value xml:lang="en">Task Breakdown</value>
+        <value xml:lang="fr">Décomposition de tâche</value>
+        <value xml:lang="it">Compito Breakdown</value>
+        <value xml:lang="th">งานหยุด</value>
+    </property>
+    <property key="PageTitleFindFixedAssetMaints">
+        <value xml:lang="de">Verwaltungen finden</value>
+        <value xml:lang="en">Find Maintenances</value>
+        <value xml:lang="fr">Chercher des maintenances</value>
+        <value xml:lang="it">Ricerca Manutenzioni</value>
+        <value xml:lang="th">ค้นหาการบำรุงรักษา</value>
+    </property>
+    <property key="PageTitleFindFixedAssets">
+        <value xml:lang="en">Find Equipments</value>
+        <value xml:lang="fr">Chercher des équipements</value>
+        <value xml:lang="it">Ricerca Cespite</value>
+        <value xml:lang="th">ค้นหาเครื่องมือ</value>
+    </property>
+    <property key="PageTitleListItemIssuance">
+        <value xml:lang="en">Parts List</value>
+        <value xml:lang="fr">Liste des pièces</value>
+        <value xml:lang="it">Lista Soggetti</value>
+        <value xml:lang="th">ส่วนหนึ่งของรายการ</value>
+    </property>
+</resource>
Index: specialpurpose/myportal/config/MyPortalUiLabels.xml
===================================================================
--- specialpurpose/myportal/config/MyPortalUiLabels.xml	(revision 735109)
+++ specialpurpose/myportal/config/MyPortalUiLabels.xml	(working copy)
@@ -18,187 +18,26 @@
     under the License.
 -->
 <resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <property key="AllEvents">
-        <value xml:lang="en">All Communications</value>
-        <value xml:lang="fr">Toutes les communications</value>
-        <value xml:lang="th">การติดต่อทั้งหมด</value>
-    </property>
-    <property key="CommunicationsOfParty">
-        <value xml:lang="en">Communications of party</value>
-        <value xml:lang="fr">Communications de l'acteur</value>
-        <value xml:lang="th">การติดต่อบุคคล</value>
-    </property>
-    <property key="CommunicationEventId">
-        <value xml:lang="en">Communication Event id:</value>
-        <value xml:lang="fr">Réf. d'évènement de comm.</value>
-        <value xml:lang="th">เหตุการณ์ที่ทำการติดต่อ</value>
-    </property>
-    <property key="CompanyEvents">
-        <value xml:lang="en">Company events</value>
-        <value xml:lang="fr">Evènements de l'entreprise</value>
-        <value xml:lang="th">เหตุการณ์บริษัท</value>
-    </property>
-    <property key="EmailsFromKnownOrigin">
-        <value xml:lang="en">Emails from known origin</value>
-        <value xml:lang="fr">Courriel issue d'une origine connue</value>
-        <value xml:lang="th">อีเมล์ที่อ่านแล้ว</value>
-    </property>
-    <property key="EmailsFromUnknownOrigin">
-        <value xml:lang="en">Emails from unknown origin</value>
-        <value xml:lang="fr">Courriel issue d'une origine inconnue</value>
-        <value xml:lang="th">อีเมล์ที่ไม่ระบุ</value>
-    </property>
-    <property key="IncomingCustRequests">
-        <value xml:lang="en">Incoming customer requests</value>
-        <value xml:lang="fr">Nouvelles demandes utilisateur</value>
-        <value xml:lang="th">แสดงรายรับของลูกค้า</value>
-    </property>
-    <property key="MyportalDashboard">
+    <property key="MyPortalDashboard">
         <value xml:lang="en">My Portal</value>
         <value xml:lang="fr">Mon portail</value>
+        <value xml:lang="it">Mio portale</value>
         <value xml:lang="th">ส่วนตัว</value>
     </property>
-    <property key="MyCommunications">
-        <value xml:lang="en">My Communications</value>
-        <value xml:lang="fr">Mes communications</value>
-        <value xml:lang="th">การติดต่อฉัน</value>
-    </property>
-    <property key="MyCompanyComms">
-        <value xml:lang="en">Company communications</value>
-        <value xml:lang="fr">Communications de l'entreprise</value>
-        <value xml:lang="th">การติดต่อบริษัท</value>
-    </property>
-    <property key="MyCompletedCustomerRequests">
-        <value xml:lang="en">My Completed Customer Requests</value>
-        <value xml:lang="fr">Mes demandes de clients terminées</value>
-        <value xml:lang="th">งานที่แก้ไขให้ลูกค้าเรียยร้อยแล้ว</value>
-    </property>
-    <property key="MyInformation">
-        <value xml:lang="en">My Information</value>
-        <value xml:lang="fr">Mes informations </value>
-        <value xml:lang="th">ข้อมูลของฉัน</value>
-    </property>
-    <property key="MyOpenCustomerRequests">
-        <value xml:lang="en">My Open Customer Requests</value>
-        <value xml:lang="fr">Mes demandes de clients en-cours</value>
-        <value xml:lang="th">ความต้องการของลูกค้า</value>
-    </property>
-    <property key="MyProfile">
-        <value xml:lang="en">My Profile</value>
-        <value xml:lang="fr">Mon Profil</value>
-        <value xml:lang="th">ประวัติส่วนตัวของฉัน</value>
-    </property>
-    <property key="MyPageAppBar">
-        <value xml:lang="en">My Page App Bar</value>
-        <value xml:lang="fr">Menu des applications</value>
-        <value xml:lang="th">แอปพริเคชันของฉัน</value>
-    </property>
-    <property key="MyPageNewMessage">
-        <value xml:lang="en">New Message</value>
-        <value xml:lang="fr">Nouveau message</value>
-        <value xml:lang="th">ข้อความใหม่</value>
-    </property>
-    <property key="MyPageNoAccess1">
-        <value xml:lang="en">No Access priviledges has been setup.</value>
-        <value xml:lang="fr">Aucun accès privilégié n'a été paramétré.</value>
-        <value xml:lang="th">ไม่สามารถเข้าไปติดตั้งระบบ</value>
-    </property>
-    <property key="MyPageNoAccess2">
-        <value xml:lang="en">You do not have access to any functions in the MyPage subsystem, please contact your system admin</value>
-        <value xml:lang="fr">Vous n'avez accès à aucune fonction dans l'application Ma Page, contactez votre administrateur système SVP.</value>
-        <value xml:lang="th">ท่านไม่เข้าถึงฟังก์ชันการทำงานส่วนอื่นๆใน MyPage ได้, กรุณาติดต่อผู้ดูแลระบบของท่าน</value>
-    </property>
-    <property key="MyPageNoAccess3">
-        <value xml:lang="en">At least MYPAGE_CUSTOMER or MYPAGE_EMPLOYEE permission is required</value>
-        <value xml:lang="fr">Au moins une autorisation MYPAGE_CUSTOMER ou MYPAGE_EMPLOYEE est nécessaire</value>
-        <value xml:lang="th">อย่างน้อยที่สุด MYPAGE_CUSTOMER หรือ MYPAGE_EMPLOYEE ถูกกำหนดการใข้สิทธิ์ </value>
-    </property>
-    <property key="MyPageNoAccess4">
-        <value xml:lang="en">Use the demo userLogin id's 'DemoCustomer' and 'DemoEmployee' for a demo.</value>
-        <value xml:lang="fr">Utilisez l'identifiant de connexion 'DemoCustomer' ou 'DemoEmployee' pour une démonstration.</value>
-        <value xml:lang="th">จำลองผู้ใช้เป็น DemoCustomer และ DemoEmployee ในการทำงาน</value>
-    </property>
-    <property key="MyPagePagesVisible">
-        <value xml:lang="en">pages visible on the main screen.</value>
-        <value xml:lang="fr">Pages visibles sur l'écran principal.</value>
-        <value xml:lang="th">สามารถเห็นหน้าอื่นบนหน้าหลักได้</value>
-    </property>
-    <property key="MyTasks">
-        <value xml:lang="en">My Tasks</value>
-        <value xml:lang="fr">Mes Tâches</value>
-        <value xml:lang="th">งานของฉัน</value>
-    </property>
-    <property key="MyTimeSheets">
-        <value xml:lang="en">My Time Sheets</value>
-        <value xml:lang="fr">Mes feuilles d'activité</value>
-        <value xml:lang="th">ตารางการทำงานของฉัน</value>
-    </property>
-    <property key="MyCustRequests">
-        <value xml:lang="en">My customer requests</value>
-        <value xml:lang="fr">Mes demandes utilisateur</value>
-        <value xml:lang="th">ลูกค้าเรียกร้อง</value>
-    </property>
-    <property key="NoAccess">
-        <value xml:lang="en">You do not have access to this information</value>
-        <value xml:lang="fr">Vous n'avez pas accès à cette information</value>
-        <value xml:lang="th">คุณไม่มีข้อมูลอยู่ในระบบ</value>
-    </property>
-    <property key="OpenEvents">
-        <value xml:lang="en">Open Communications</value>
-        <value xml:lang="fr">Communications ouvertes</value>
-        <value xml:lang="th">เปิดการติดต่อ</value>
-    </property>
-    <property key="OtherCommunications">
-        <value xml:lang="en">Other Communications</value>
-        <value xml:lang="fr">Autres communications</value>
-        <value xml:lang="th">การติดต่อรูปแบบต่างๆ</value>
-    </property>
-    <property key="OtherCompanyCustomerRequests">
-        <value xml:lang="en">Customer Requests from other contacts of my company</value>
-        <value xml:lang="fr">Demandes client depuis d'autres contacts de mon entreprise</value>
-        <value xml:lang="th">ลูกค้าต้องการติดต่อรูปแบบอื่นจากบริษัทของเรา</value>
-    </property>
-    <property key="SendMailEveryCust">
+    <property key="MyPortalSendMailEveryCust">
         <value xml:lang="en">Send Email To Every Customer Request Change</value>
+        <value xml:lang="it">Invia email ad ogni cliente per le modifiche sulla richiesta</value>
         <value xml:lang="th">ส่งอีเมล์ถึงลูกค้าที่เปลี่ยนความต้องการ</value>
     </property>
-    <property key="TaskStatus">
-        <value xml:lang="en">Task Status</value>
-        <value xml:lang="fr">Status de la tâche</value>
-        <value xml:lang="th">สถานะของงาน</value>
-    </property>
-    <property key="TaskActEndDate">
-        <value xml:lang="en">Task Act End</value>
-        <value xml:lang="fr">Fin réelle de de la tâche</value>
-        <value xml:lang="th">เสร็จสิ้นการทำ</value>
-    </property>
-    <property key="TaskActStartDate">
-        <value xml:lang="en">Task Act Start</value>
-        <value xml:lang="fr">Départ réel de de la tâche</value>
-        <value xml:lang="th">เรื่มต้นการทำ</value>
-    </property>
-    <property key="TaskPlanEndDate">
-        <value xml:lang="en">Task Plan End</value>
-        <value xml:lang="fr">Fin prévue de la tâche</value>
-        <value xml:lang="th">สิ้นสุดชิ้นงาน</value>
-    </property>
-    <property key="TaskPlanStartDate">
-        <value xml:lang="en">Task Plan Start</value>
-        <value xml:lang="fr">Départ prévu de la tâche</value>
-        <value xml:lang="th">เริ่มต้นชิ้นงาน</value>
-    </property>
-    <property key="TitlePageMyportal">
+    <property key="PageTitleMyPortal">
         <value xml:lang="en">My Portal for : </value>
+        <value xml:lang="it">Mio portale per : </value>
         <value xml:lang="th">ส่วนตัวสำหรับ </value>
     </property>
-    <property key="TitlePageMyportalForNoLogin">
+    <property key="PageTitleMyPortalForNoLogin">
         <value xml:lang="en">My Portal Page</value>
         <value xml:lang="fr">Ma page de portail</value>
+        <value xml:lang="it">Pagina mio portale</value>
         <value xml:lang="th">หน้าส่วนตัวของฉัน</value>
     </property>
-    <property key="toComplete">
-        <value xml:lang="en">->Closed</value>
-        <value xml:lang="fr">->Fermé(e)</value>
-        <value xml:lang="th">เสร็จสิ้น</value>
-    </property>
 </resource>
Index: specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java
===================================================================
--- specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java	(revision 735109)
+++ specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java	(working copy)
@@ -72,7 +72,7 @@
         }
 
         if (sku == null) {
-            pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"Invalid_Selection",Locale.getDefault()));
+            pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"PosInvalidSelection",Locale.getDefault()));
             pos.getJournal().refresh(pos);
             pos.getInput().clear();
         }
@@ -146,7 +146,7 @@
             } else {
                 input.clear();
                 input.setFunction("OPEN");
-                pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"OPDRAM",Locale.getDefault()));
+                pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"PosOpDrAm",Locale.getDefault()));
                 return;
             }
         } else {
@@ -192,19 +192,19 @@
             }
             switch (closeInfo.length) {
                 case 0:
-                    output.print(UtilProperties.getMessage(PosTransaction.resource,"ENTCAS",Locale.getDefault()));
+                    output.print(UtilProperties.getMessage(PosTransaction.resource,"PosEntCas",Locale.getDefault()));
                     break;
                 case 1:
-                    output.print(UtilProperties.getMessage(PosTransaction.resource,"ENTCHK",Locale.getDefault()));
+                    output.print(UtilProperties.getMessage(PosTransaction.resource,"PosEntChk",Locale.getDefault()));
                     break;
                 case 2:
-                    output.print(UtilProperties.getMessage(PosTransaction.resource,"ENTCRC",Locale.getDefault()));
+                    output.print(UtilProperties.getMessage(PosTransaction.resource,"PosEntCrc",Locale.getDefault()));
                     break;
                 case 3:
-                    output.print(UtilProperties.getMessage(PosTransaction.resource,"ENTGFC",Locale.getDefault()));
+                    output.print(UtilProperties.getMessage(PosTransaction.resource,"PosEntGfc",Locale.getDefault()));
                     break;
                 case 4:
-                    output.print(UtilProperties.getMessage(PosTransaction.resource,"ENTOTH",Locale.getDefault()));
+                    output.print(UtilProperties.getMessage(PosTransaction.resource,"PosEntOth",Locale.getDefault()));
                     break;
                 case 5:
                     GenericValue state = trans.getTerminalState();
@@ -233,7 +233,7 @@
                     }
 
                     // print the totals report
-                    output.print(UtilProperties.getMessage(PosTransaction.resource,"WaitingFinalSales",Locale.getDefault()));
+                    output.print(UtilProperties.getMessage(PosTransaction.resource,"PosWaitingFinalSales",Locale.getDefault()));
                     //pos.showDialog("dialog/error/terminalclosed"); JLR 14/11/06 : Pb with that don't know why, useless => commented out
                     printTotals(pos, state, true);
 
@@ -268,7 +268,7 @@
             trans.popDrawer();
             input.clear();
             input.setFunction("CLOSE");
-            output.print(UtilProperties.getMessage(PosTransaction.resource,"ENTCAS",Locale.getDefault()));
+            output.print(UtilProperties.getMessage(PosTransaction.resource,"PosEntCas",Locale.getDefault()));
         }
     }
 
@@ -344,7 +344,7 @@
             }
         } else {
             input.setFunction("VOID");
-            output.print(UtilProperties.getMessage(PosTransaction.resource,"VOID",Locale.getDefault()));
+            output.print(UtilProperties.getMessage(PosTransaction.resource,"PosVoid",Locale.getDefault()));
         }
     }
 
@@ -389,7 +389,7 @@
         if (!mgrLoggedIn) {
             pos.showDialog("dialog/error/mgrnotloggedin");
         } else {
-            pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"Shutting_down",Locale.getDefault()));
+            pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"PosShuttingDown",Locale.getDefault()));
             PosTransaction.getCurrentTx(pos.getSession()).closeTx();
             System.exit(0);
         }
@@ -528,18 +528,18 @@
         String reportTemplate = "totals.txt";
 
         // miscellaneous
-        reportMap.put("term", UtilFormatOut.padString(UtilProperties.getMessage(PosTransaction.resource,"term",Locale.getDefault()), 20, false, ' '));
-        reportMap.put("draw", UtilFormatOut.padString(UtilProperties.getMessage(PosTransaction.resource,"draw",Locale.getDefault()), 20, false, ' '));
-        reportMap.put("clerk", UtilFormatOut.padString(UtilProperties.getMessage(PosTransaction.resource,"clerk",Locale.getDefault()), 20, false, ' '));
-        reportMap.put("total_report", UtilFormatOut.padString(UtilProperties.getMessage(PosTransaction.resource,"total_report",Locale.getDefault()), 20, false, ' '));
+        reportMap.put("term", UtilFormatOut.padString(UtilProperties.getMessage(PosTransaction.resource,"PosTerm",Locale.getDefault()), 20, false, ' '));
+        reportMap.put("draw", UtilFormatOut.padString(UtilProperties.getMessage(PosTransaction.resource,"PosDraw",Locale.getDefault()), 20, false, ' '));
+        reportMap.put("clerk", UtilFormatOut.padString(UtilProperties.getMessage(PosTransaction.resource,"PosClerk",Locale.getDefault()), 20, false, ' '));
+        reportMap.put("total_report", UtilFormatOut.padString(UtilProperties.getMessage(PosTransaction.resource,"PosTotalReport",Locale.getDefault()), 20, false, ' '));
 
         // titles
-        reportMap.put("cashTitle", UtilFormatOut.padString(UtilProperties.getMessage(PosTransaction.resource,"CASH",Locale.getDefault()), 20, false, ' '));
-        reportMap.put("checkTitle", UtilFormatOut.padString(UtilProperties.getMessage(PosTransaction.resource,"CHECK",Locale.getDefault()), 20, false, ' '));
-        reportMap.put("giftCardTitle", UtilFormatOut.padString(UtilProperties.getMessage(PosTransaction.resource,"GIFT_CARD",Locale.getDefault()), 20, false, ' '));
-        reportMap.put("creditCardTitle", UtilFormatOut.padString(UtilProperties.getMessage(PosTransaction.resource,"CREDIT_CARD",Locale.getDefault()), 20, false, ' '));
-        reportMap.put("otherTitle", UtilFormatOut.padString(UtilProperties.getMessage(PosTransaction.resource,"OTHER",Locale.getDefault()), 20, false, ' '));
-        reportMap.put("grossSalesTitle", UtilFormatOut.padString(UtilProperties.getMessage(PosTransaction.resource,"GROSS_SALES",Locale.getDefault()), 20, false, ' '));
+        reportMap.put("cashTitle", UtilFormatOut.padString(UtilProperties.getMessage(PosTransaction.resource,"PosCash",Locale.getDefault()), 20, false, ' '));
+        reportMap.put("checkTitle", UtilFormatOut.padString(UtilProperties.getMessage(PosTransaction.resource,"PosCheck",Locale.getDefault()), 20, false, ' '));
+        reportMap.put("giftCardTitle", UtilFormatOut.padString(UtilProperties.getMessage(PosTransaction.resource,"PosGiftCard",Locale.getDefault()), 20, false, ' '));
+        reportMap.put("creditCardTitle", UtilFormatOut.padString(UtilProperties.getMessage(PosTransaction.resource,"PosCreditCard",Locale.getDefault()), 20, false, ' '));
+        reportMap.put("otherTitle", UtilFormatOut.padString(UtilProperties.getMessage(PosTransaction.resource,"PosOther",Locale.getDefault()), 20, false, ' '));
+        reportMap.put("grossSalesTitle", UtilFormatOut.padString(UtilProperties.getMessage(PosTransaction.resource,"PosGrossSales",Locale.getDefault()), 20, false, ' '));
         reportMap.put("+/-", UtilFormatOut.padString("+/-", 20, false, ' '));
         reportMap.put("spacer", UtilFormatOut.padString("", 20, false, ' '));
 
Index: specialpurpose/pos/src/org/ofbiz/pos/screen/PaidInOut.java
===================================================================
--- specialpurpose/pos/src/org/ofbiz/pos/screen/PaidInOut.java	(revision 735109)
+++ specialpurpose/pos/src/org/ofbiz/pos/screen/PaidInOut.java	(working copy)
@@ -97,14 +97,14 @@
         m_comboModel = new DefaultComboBoxModel();
         List<GenericValue> posPaidReasons = FastList.newInstance();
         if (m_type.equals("IN")) { 
-            m_dialog.setCaption(UtilProperties.getMessage(PosTransaction.resource, "PaidInTitle", locale));
+            m_dialog.setCaption(UtilProperties.getMessage(PosTransaction.resource, "PosPaidInTitle", locale));
             try {
                 posPaidReasons = m_trans.getSession().getDelegator().findByAndCache("Enumeration", UtilMisc.toMap("enumTypeId", "POS_PAID_REASON_IN"));
             } catch (GenericEntityException e) {
                 Debug.logError(e, module);
             }
         } else { // OUT
-            m_dialog.setCaption(UtilProperties.getMessage(PosTransaction.resource, "PaidOutTitle", locale));
+            m_dialog.setCaption(UtilProperties.getMessage(PosTransaction.resource, "PosPaidOutTitle", locale));
             try {
                 posPaidReasons = m_trans.getSession().getDelegator().findByAndCache("Enumeration", UtilMisc.toMap("enumTypeId", "POS_PAID_REASON_OUT"));
             } catch (GenericEntityException e) {
@@ -114,7 +114,7 @@
             m_comboModel.addElement(reason.get("description", locale));
         }
         m_reasonCombo.setModel(m_comboModel);
-        m_reasonCombo.setToolTipText(UtilProperties.getMessage(PosTransaction.resource, "CreateOrChooseReasonInOut", locale));
+        m_reasonCombo.setToolTipText(UtilProperties.getMessage(PosTransaction.resource, "PosCreateOrChooseReasonInOut", locale));
 
         m_dialog.pack();
         m_reasonCombo.requestFocusInWindow();
Index: applications/product/webapp/facility/facility/FacilityForms.xml
===================================================================
--- applications/product/webapp/facility/facility/FacilityForms.xml	(revision 735109)
+++ applications/product/webapp/facility/facility/FacilityForms.xml	(working copy)
@@ -48,7 +48,7 @@
                 <entity-options description="${facilityName}" entity-name="Facility" key-field-name="facilityId"/>
             </drop-down>
         </field>
-        <field name="selectButton"><submit button-type="button"/></field>
+        <field name="selectButton" title="${uiLabelMap.CommonSubmit}"><submit button-type="button"/></field>
     </form>
 
     <form name="FindFacilityOptions" extends="lookupFacility" extends-resource="component://product/webapp/facility/lookup/FieldLookupForms.xml" target="FindFacility">
Index: specialpurpose/projectmgr/widget/ProjectScreens.xml
===================================================================
--- specialpurpose/projectmgr/widget/ProjectScreens.xml	(revision 735109)
+++ specialpurpose/projectmgr/widget/ProjectScreens.xml	(working copy)
@@ -69,6 +69,7 @@
     <screen name="EditProject">
         <section>
             <actions>
+                <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
                 <set field="titleProperty" value="PageTitleEditProject"/>
                 <set field="tabButtonItem" value="editproject"/>                
                 <set field="labelTitleProperty" value="PageTitleEditProject"/>
@@ -421,7 +422,8 @@
     <screen name="EditPartySkills">
         <section>
             <actions>
-                <set field="tabButtonItem" value="parties"/>                
+                <set field="titleProperty" value="ProjectMgrEditPartySkill"/>
+                <set field="tabButtonItem" value="parties"/>
                 <set field="partyId" from-field="parameters.partyId"/>
                 <set field="workEffortId" from-field="parameters.projectId"/>
             </actions>
@@ -616,14 +618,14 @@
             </actions>
             <widgets>
                 <screenlet title="${uiLabelMap.ProjectMgrResources}">
-                    <label style="h3" text="Providers"></label>
+                    <label style="h3" title="${uiLabelMap.ProjectMgrProviders}"/>
                     <include-form name="ListProjectProviderParties" location="component://projectmgr/widget/forms/ProjectForms.xml"/>
                     <section>
                         <condition>
                             <not><if-empty field-name="clientAssigns"/></not>
                         </condition>
                         <widgets>
-                            <label style="h3" text="ClientContacts"></label>
+                            <label style="h3" text="${uiLabelMap.ProjectMgrClientContacts}"></label>
                             <include-form name="ListProjectClientParties" location="component://projectmgr/widget/forms/ProjectForms.xml"/>
                         </widgets>
                     </section>
@@ -632,7 +634,7 @@
                             <not><if-empty field-name="companyAssigns"/></not>
                         </condition>
                         <widgets>
-                            <label style="h3" text="Companies"></label>
+                            <label style="h3" text="${uiLabelMap.ProjectMgrCompanies}"></label>
                             <include-form name="ListProjectCompanyParties" location="component://projectmgr/widget/forms/ProjectForms.xml"/>
                         </widgets>
                     </section>
@@ -1083,6 +1085,7 @@
     <screen name="ListProjectContent">
         <section>
             <actions>
+                <property-map resource="ContentUiLabels" map-name="uiLabelMap"/>
                 <set field="parameters.workEffortId" from-field="parameters.projectId"/>
             </actions>
             <widgets>
Index: specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml
===================================================================
--- specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml	(revision 735109)
+++ specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml	(working copy)
@@ -165,7 +165,7 @@
         <field name="workEffortName" entry-name="workEffortToName" title="${uiLabelMap.CommonName}">
             <hyperlink also-hidden="false" description="${workEffortToName}" target="EditWorkEfforts?workEffortId=${workEffortIdTo}&amp;workEffortIdFrom=${workEffortId}&amp;fromDate=${fromDate}&amp;workEffortAssocTypeId=${workEffortAssocTypeId}"/>
         </field>
-        <field name="workEffortAssocTypeId" title="${uiLabelMap.WorkEffortWorkEffortAssocTypeId}">
+        <field name="workEffortAssocTypeId">
             <display-entity entity-name="WorkEffortAssocType" description="${description}"/>
         </field>
         <field name="currentStatusId" entry-name="workEffortToCurrentStatusId" title="${uiLabelMap.CommonStatus}">
@@ -174,8 +174,8 @@
         <field name="workEffortPurposeTypeId" entry-name="workEffortToWorkEffortPurposeTypeId" title="${uiLabelMap.CommonPurpose}">
             <display-entity entity-name="WorkEffortPurposeType" description="${description}"/>
         </field>
-        <field name="actualStartDate" entry-name="workEffortToActualStartDate" title="${uiLabelMap.WorkEffortActualStartDate}"><display/></field>
-        <field name="actualCompletionDate"  entry-name="workEffortToActualCompletionDate" title="${uiLabelMap.WorkEffortActualCompletionDate}"><display/></field>
+        <field name="actualStartDate" entry-name="workEffortToActualStartDate"><display/></field>
+        <field name="actualCompletionDate"  entry-name="workEffortToActualCompletionDate"><display/></field>
     </form>
 
     <!-- TimeEntry -->
Index: specialpurpose/myportal/widget/MyPortalScreens.xml
===================================================================
--- specialpurpose/myportal/widget/MyPortalScreens.xml	(revision 735109)
+++ specialpurpose/myportal/widget/MyPortalScreens.xml	(working copy)
@@ -169,7 +169,7 @@
                 <set field="portalPageId" from-field="parameters.portalPageId" default-value="myCompanyComms"/>
             </actions>
             <widgets>
-                <screenlet title="${uiLabelMap.CompanyEvents}" navigation-menu-name="MyCompanyCommsMenu" name="companyEvents" collapsible="true">
+                <screenlet title="${uiLabelMap.MyPageCompanyEvents}" navigation-menu-name="MyCompanyCommsMenu" name="companyEvents" collapsible="true">
                     <include-menu name="MyCompanyCommsMenu" location="component://myportal/widget/MyPortalMenus.xml"/>
                     <include-form name="MyCompanyComms" location="component://myportal/widget/MyPortalForms.xml"/>
                 </screenlet>
@@ -231,7 +231,7 @@
                 </entity-one>
             </actions>
             <widgets>
-                <screenlet title="${uiLabelMap.CommunicationsOfParty}: ${partyName.firstName} ${partyName.middleName} ${partyName.lastName} ${partyName.groupName} [${partyId}] "
+                <screenlet title="${uiLabelMap.MyPageCommunicationsOfParty}: ${partyName.firstName} ${partyName.middleName} ${partyName.lastName} ${partyName.groupName} [${partyId}] "
                     navigation-menu-name="communicationsMenu" navigation-form-name="ListPartyCommEvents"
                     name="myComms">
                     <include-menu name="communicationsMenu"
@@ -243,13 +243,13 @@
                             </not>
                         </condition>
                         <widgets>
-                            <label style="h2" text="${uiLabelMap.EmailsFromUnknownOrigin}"></label>
+                            <label style="h2" text="${uiLabelMap.MyPageEmailsFromUnknownOrigin}"></label>
                             <include-form
                                 location="component://myportal/widget/MyPortalForms.xml"
                                 name="ListMyUnknownPartyEmails" />
                         </widgets>
                     </section>
-                    <label style="h2" text="${uiLabelMap.EmailsFromKnownOrigin}"></label>
+                    <label style="h2" text="${uiLabelMap.MyPageEmailsFromKnownOrigin}"></label>
                     <include-form name="ListPartyCommEvents"
                         location="component://myportal/widget/MyPortalForms.xml" />
                     <section>
@@ -310,7 +310,7 @@
                             <section>
                                 <widgets>
                                     <label style="h1"
-                                        text="${uiLabelMap.CommunicationEventId} ${parameters.communicationEventId}"></label>
+                                        text="${uiLabelMap.MyPageCommunicationEventId} ${parameters.communicationEventId}"></label>
                                     <include-screen name="commEvent" 
                                             location="component://party/widget/partymgr/CommunicationScreens.xml" />
                                 </widgets>
@@ -789,7 +789,7 @@
                         <not><if-empty field-name="custRequests"/></not>
                     </condition>
                     <widgets>
-                        <screenlet title="${uiLabelMap.IncomingCustRequests}" navigation-form-name="ListRequestList">
+                        <screenlet title="${uiLabelMap.MyPageIncomingCustRequests}" navigation-form-name="ListRequestList">
                             <include-form name="ListRequestList" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
                         </screenlet>
                     </widgets>
@@ -914,7 +914,7 @@
             <widgets>
                 <section>
                     <widgets>
-                        <screenlet title="${uiLabelMap.MyCompletedCustomerRequests}" navigation-form-name="ListCustRequestsCompleted">
+                        <screenlet title="${uiLabelMap.MyPageCompletedCustomerRequests}" navigation-form-name="ListCustRequestsCompleted">
                             <include-form name="ListCustRequestsCompleted" location="component://myportal/widget/MyPortalForms.xml"/>
                         </screenlet>
                     </widgets>
@@ -976,14 +976,14 @@
             <widgets>
                 <section>
                      <widgets>
-                        <screenlet title="${uiLabelMap.OtherCompanyCustomerRequests}" navigation-form-name="ListOtherCompanyRequests">
+                        <screenlet title="${uiLabelMap.MyPageOtherCompanyCustomerRequests}" navigation-form-name="ListOtherCompanyRequests">
                             <include-form name="ListOtherCompanyRequests" location="component://myportal/widget/MyPortalForms.xml"/>
                         </screenlet>
                     </widgets>
                 </section>
                 <section>
                     <widgets>
-                        <screenlet title="${uiLabelMap.CommunicationsOfParty}: ${partyName.firstName} ${partyName.middleName} ${partyName.lastName} ${partyName.groupName} [${partyId}] "
+                        <screenlet title="${uiLabelMap.MyPageCommunicationsOfParty}: ${partyName.firstName} ${partyName.middleName} ${partyName.lastName} ${partyName.groupName} [${partyId}] "
                             navigation-menu-name="communicationsMenu" navigation-form-name="ListPartyCommEvents" name="myComms">
                             <include-menu name="communicationsMenu" location="component://myportal/widget/MyPortalMenus.xml" />
                             <include-form name="ListPartyCommEvents" location="component://myportal/widget/MyPortalForms.xml" />
Index: applications/product/config/ProductUiLabels.xml
===================================================================
--- applications/product/config/ProductUiLabels.xml	(revision 735109)
+++ applications/product/config/ProductUiLabels.xml	(working copy)
@@ -95,6 +95,10 @@
         <value xml:lang="zh">使用缺省值：没有其它可用的送货方式。</value>
         <value xml:lang="zh_CN">使用默认: 没有其他送货方式</value>
     </property>
+    <property key="FacilitySelection">
+        <value xml:lang="en">Facility Selection</value>
+        <value xml:lang="it">Seleziona stabilimento</value>
+    </property>
     <property key="FacilityShipAvailable">
         <value xml:lang="de">Bitte liefern Sie meine bestellten Artikel sobald sie verfügbar sind (Sie dürfen zusätzliche Lieferungskosten  erheben).</value>
         <value xml:lang="en">Please ship items I ordered as they become available (you may incur additional shipping charges).</value>
@@ -1131,7 +1135,7 @@
     </property>
     <property key="FormFieldTitle_estimatedCost">
         <value xml:lang="de">Geschätzte Kosten</value>
-        <value xml:lang="en">Estimated Cost</value>
+        <value xml:lang="en">Estimated cost</value>
         <value xml:lang="es">Coste estimado</value>
         <value xml:lang="fr">Coût estimé</value>
         <value xml:lang="it">Costo stimato</value>
@@ -2729,9 +2733,18 @@
         <value xml:lang="th">ได้รับโดยรหัสการลอกอินเข้าสู่ระบบของผู้ใช้</value>
     </property>
     <property key="FormFieldTitle_recurrenceInfoId">
+        <value xml:lang="de">Wiederholung Info ID</value>
         <value xml:lang="en">Recurrence Info Id</value>
-        <value xml:lang="it">Informazione ricorrente</value>
+        <value xml:lang="es">Código Información de repetición</value>
+        <value xml:lang="fr">Réf. d'information récurrente</value>
+        <value xml:lang="it">Informazioni ricorrenti</value>
+        <value xml:lang="nl">Herhaling Info Id</value>
+        <value xml:lang="ro">Informatii Recurente</value>
+        <value xml:lang="ru">Код информации о возврате</value>
+        <value xml:lang="th">รหัสการคืนข้อมูล</value>
+        <value xml:lang="zh">重复使用信息标识</value>
     </property>
+    
     <property key="FormFieldTitle_rejectionId">
         <value xml:lang="de">Ablehnung ID</value>
         <value xml:lang="en">Rejection Id</value>
@@ -19519,7 +19532,7 @@
         <value xml:lang="en">Vat Tax Authority Geo not set.</value>
         <value xml:lang="es">No se ha fijado la zona geográfica de la Autoridad Tributaria responsable del IVA</value>
         <value xml:lang="fr">La réf. de zone de TVA manque</value>
-	<value xml:lang="it">Autorità tasse IVA geografia non impostata.</value>
+        <value xml:lang="it">Autorità tasse IVA geografia non impostata.</value>
         <value xml:lang="pt">Vat Tax Authority Geo not set.</value>
         <value xml:lang="ru">Не установлена страна налогового органа по НДС.</value>
         <value xml:lang="th">ไม่มีการตั้งค่าภาษี</value>
@@ -19530,7 +19543,7 @@
         <value xml:lang="en">Vat Tax Auth Party not set.</value>
         <value xml:lang="es">No se ha fijado la Autoridad Tributaria responsable del IVA</value>
         <value xml:lang="fr">La réf. de centre de TVA manque</value>
-	<value xml:lang="it">Soggetto autorità tasse IVA non impostato.</value>
+        <value xml:lang="it">Soggetto autorità tasse IVA non impostato.</value>
         <value xml:lang="pt">Vat Tax Auth Party not set.</value>
         <value xml:lang="ru">Не установлен налоговый номер по НДС.</value>
         <value xml:lang="th">ไม่มีการตั้งค่ากลุ่มภาษี</value>
Index: specialpurpose/pos/src/org/ofbiz/pos/screen/LoadSale.java
===================================================================
--- specialpurpose/pos/src/org/ofbiz/pos/screen/LoadSale.java	(revision 735109)
+++ specialpurpose/pos/src/org/ofbiz/pos/screen/LoadSale.java	(working copy)
@@ -66,7 +66,7 @@
 
     public void openDlg() {
         m_dialog = (XDialog) pageMgr.loadPage(m_pos.getScreenLocation() + "/dialog/loadsale");
-        m_dialog.setCaption(UtilProperties.getMessage(PosTransaction.resource, "LoadASale", Locale.getDefault()));
+        m_dialog.setCaption(UtilProperties.getMessage(PosTransaction.resource, "PosLoadASale", Locale.getDefault()));
         m_salesList = (XList) m_dialog.findComponent("salesList");
         XEventHelper.addMouseHandler(this, m_salesList, "saleDoubleClick");
 
@@ -92,7 +92,7 @@
         m_salesList.setVisibleRowCount(-1);
         m_salesList.ensureIndexIsVisible(m_salesList.getItemCount());     
         m_salesList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-        m_salesList.setToolTipText(UtilProperties.getMessage(PosTransaction.resource, "LoadSaleListDblClickTip", Locale.getDefault()));
+        m_salesList.setToolTipText(UtilProperties.getMessage(PosTransaction.resource, "PosLoadSaleListDblClickTip", Locale.getDefault()));
 
         m_dialog.pack();
         m_salesList.requestFocusInWindow();
Index: applications/accounting/config/AccountingUiLabels.xml
===================================================================
--- applications/accounting/config/AccountingUiLabels.xml	(revision 735109)
+++ applications/accounting/config/AccountingUiLabels.xml	(working copy)
@@ -8551,7 +8551,7 @@
         <value xml:lang="en">Organization Party Id</value>
         <value xml:lang="es">Id Grupo de Organización</value>
         <value xml:lang="fr">Réf. acteur organisation</value>
-        <value xml:lang="it">Codice Soggetto Organizzazione</value>
+        <value xml:lang="it">Soggetto organizzazione</value>
         <value xml:lang="nl">Relatie-ID organisatie</value>
         <value xml:lang="ro">Cod Subiect Organizare</value>
         <value xml:lang="ru">Код организации</value>
Index: applications/manufacturing/config/ManufacturingUiLabels.xml
===================================================================
--- applications/manufacturing/config/ManufacturingUiLabels.xml	(revision 735109)
+++ applications/manufacturing/config/ManufacturingUiLabels.xml	(working copy)
@@ -247,16 +247,6 @@
         <value xml:lang="th">การผลิตสินค้า</value>

         <value xml:lang="zh">生产运行</value>

     </property>

-    <property key="FormFieldTitle_requirementStartDate">

-        <value xml:lang="de">Bedarfs-Start-Datum</value>

-        <value xml:lang="en">Requirement Start Date</value>

-        <value xml:lang="es">Fecha de comienzo del requisito</value>

-        <value xml:lang="fr">Date de début de besoin</value>

-        <value xml:lang="it">Data Inizio Fabbisogno</value>

-        <value xml:lang="ro">Data Initiala Necesar</value>

-        <value xml:lang="th">วันที่ต้องการเริ่มต้น</value>

-        <value xml:lang="zh">需求开始日期</value>

-    </property>

     <property key="FormFieldTitle_routingId">

         <value xml:lang="de">Arbeitsplan-Nr.</value>

         <value xml:lang="en">routingId</value>

Index: specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml
===================================================================
--- specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml	(revision 735109)
+++ specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml	(working copy)
@@ -85,7 +85,7 @@
                     include-user-login="false"/>
                 <else>
                     <add-error>
-                        <fail-property property="NoAccess" resource="MyPortalUiLabels"/>
+                        <fail-property property="MyPageNoAccess" resource="MyPortalUiLabels"/>
                     </add-error>
                 </else>
             </if-compare>
Index: applications/workeffort/config/WorkEffortUiLabels.xml
===================================================================
--- applications/workeffort/config/WorkEffortUiLabels.xml	(revision 735109)
+++ applications/workeffort/config/WorkEffortUiLabels.xml	(working copy)
@@ -306,10 +306,6 @@
         <value xml:lang="th">รายละเอียดความต้องการ</value>

         <value xml:lang="zh">需求描述</value>

     </property>

-    <property key="FormFieldTitle_requirementStartDate">

-        <value xml:lang="en">Requirement Start Date</value>

-        <value xml:lang="it">Data inizio fabbisogno</value>

-    </property>

     <property key="FormFieldTitle_reserv2ndPPPerc">

         <value xml:lang="en">Reserv2nd P P Perc</value>

         <value xml:lang="fr">% d'augmentation pour une 2d personne</value>

@@ -408,10 +404,6 @@
         <value xml:lang="th">สถานะ</value>

         <value xml:lang="zh">状态</value>

     </property>

-    <property key="FormFieldTitle_tempExprId">

-        <value xml:lang="en">Temporal Expression</value>

-        <value xml:lang="it">Espressione temporale</value>

-    </property>

     <property key="FormFieldTitle_timeTransparency">

         <value xml:lang="en">Time Transparency</value>

         <value xml:lang="fr">Temps transparent</value>

Index: applications/accounting/widget/FixedAssetScreens.xml
===================================================================
--- applications/accounting/widget/FixedAssetScreens.xml	(revision 735109)
+++ applications/accounting/widget/FixedAssetScreens.xml	(working copy)
@@ -466,6 +466,7 @@
     <screen name="EditFixedAssetMaintOrders">
         <section>
             <actions>
+                <property-map resource="OrderUiLabels" map-name="uiLabelMap"/>
                 <set field="titleProperty" value="PageTitleEditFixedAssetMaintOrders"/>
                 <set field="tabButtonItem" value="ListFixedAssetMaints"/>                
                 <set field="tabButtonItemFixedAssetMaint" value="EditFixedAssetMaintOrders"/>                
Index: specialpurpose/shark/webapp/shark/includes/appheader.ftl
===================================================================
--- specialpurpose/shark/webapp/shark/includes/appheader.ftl	(revision 735109)
+++ specialpurpose/shark/webapp/shark/includes/appheader.ftl	(working copy)
@@ -18,7 +18,7 @@
 -->
 <#assign selected = headerItem?default("void")>
 <div id="app-navigation">
-    <h2>${uiLabelMap.FrameworkShark}</h2>
+    <h2>${uiLabelMap.SharkFramework}</h2>
     <ul>                               
         <#if userLogin?has_content>
             <li<#if selected == "main"> class="selected"</#if>><a href="<@ofbizUrl>main</@ofbizUrl>">${uiLabelMap.WorkEffortTaskList}</a></li>     
Index: specialpurpose/oagis/config/OagisUiLabels.xml
===================================================================
--- specialpurpose/oagis/config/OagisUiLabels.xml	(revision 735109)
+++ specialpurpose/oagis/config/OagisUiLabels.xml	(working copy)
@@ -17,7 +17,8 @@
     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">
+-->
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <property key="OagisApplication">
         <value xml:lang="en">Oagis Implementation</value>
         <value xml:lang="fr">Implémentation Oagis</value>
Index: specialpurpose/assetmaint/config/AssetMaintUiLabels.xml.r735109
===================================================================
--- specialpurpose/assetmaint/config/AssetMaintUiLabels.xml.r735109	(revision 0)
+++ specialpurpose/assetmaint/config/AssetMaintUiLabels.xml.r735109	(revision 0)
@@ -0,0 +1,102 @@
+<?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="AssetMaintApplication">
+        <value xml:lang="de">Vermögensverwaltungsanwendung</value>
+        <value xml:lang="en">Asset Maintenance Application</value>
+        <value xml:lang="fr">Application de maintenance des biens</value>
+        <value xml:lang="it">Applicazione Manutenzione Beni</value>
+        <value xml:lang="th">บำรุงรักษาโปรแกรม</value>
+    </property>
+    <property key="AssetMaintCompanyName">
+        <value xml:lang="en">OFBiz: Asset Maintenance</value>
+        <value xml:lang="fr">OFBiz : maintenance des biens</value>
+        <value xml:lang="it">OFBiz: Manutenzione Beni</value>
+        <value xml:lang="th">OFBiz: การบำรุงรักษา</value>
+    </property>
+    <property key="AssetMaintCompanySubtitle">
+        <value xml:lang="en">Maintenance Department</value>
+        <value xml:lang="fr">Service de maintenance</value>
+        <value xml:lang="it">Manutenzione Dipartimento</value>
+        <value xml:lang="th">แผนกการดูแลรักษา</value>
+    </property>
+    <property key="AssetMaintItemIssuance">
+        <value xml:lang="en">Parts</value>
+        <value xml:lang="fr">Pièces</value>
+        <value xml:lang="it">Parti</value>
+        <value xml:lang="th">ส่วนหนึ่ง</value>
+    </property>
+    <property key="AssetMaintInvalidPartProductIdError">
+        <value xml:lang="en">"Part Id ${productId} provided is invalid please check and try again"</value>
+        <value xml:lang="fr">"La réf. de piéce ${productId} fournie n'est pas valable, SVP recommencez"</value>
+        <value xml:lang="it">"Il Codice Parte ${productId} fornito non è valido per favore controllare e provare nuovamente"</value>
+        <value xml:lang="th">รหัสส่วน ${productId} ใช้ไม่ได้ กรุณาตรวจสอบและลองอีกครั้ง</value>
+    </property>
+    <property key="AssetMaintLowPartInventoryError">
+        <value xml:lang="en">"Available Inventory level for ${productId} is ${quantity}"</value>
+        <value xml:lang="fr">"Le niveau de stock disponible pour ${productId} est ${quantity"</value>
+        <value xml:lang="it">"Livello Inventario Disponibile per ${productId} è ${quantity}"</value>
+        <value xml:lang="th">รดับสินค้าคงเหลือของ ${productId} คือ ${quantity}</value>
+    </property>
+    <property key="AssetMaintParentWorkEffort">
+        <value xml:lang="en">Parent Work Effort</value>
+        <value xml:lang="fr">"Tâche parente"</value>
+    </property>
+    <property key="AssetMaintProductMaint">
+        <value xml:lang="en">Product Maint</value>
+        <value xml:lang="fr">Maintenance</value>
+    </property>
+    <property key="AssetMaintViewPermissionError">
+        <value xml:lang="en">View Permission Error</value>
+        <value xml:lang="fr">Afficher l'erreur d'autorisation</value>
+        <value xml:lang="th">แสดงข้อผิดพลาดในการอนุญาต</value>
+    </property>
+    <property key="PageTitleAddItemIssuance">
+        <value xml:lang="en">Add Item Issuance</value>
+        <value xml:lang="fr">Ajouter une émission d'article</value>
+        <value xml:lang="it">Aggiungi Riga Prelievo</value>
+        <value xml:lang="th">เพิ่มรายการที่ออกมา</value>
+    </property>
+    <property key="PageTitleChildWorkEfforts">
+        <value xml:lang="en">Task Breakdown</value>
+        <value xml:lang="fr">Décomposition de tâche</value>
+        <value xml:lang="it">Compito Breakdown</value>
+        <value xml:lang="th">งานหยุด</value>
+    </property>
+    <property key="PageTitleFindFixedAssetMaints">
+        <value xml:lang="de">Verwaltungen finden</value>
+        <value xml:lang="en">Find Maintenances</value>
+        <value xml:lang="fr">Chercher des maintenances</value>
+        <value xml:lang="it">Ricerca Manutenzioni</value>
+        <value xml:lang="th">ค้นหาการบำรุงรักษา</value>
+    </property>
+    <property key="PageTitleFindFixedAssets">
+        <value xml:lang="en">Find Equipments</value>
+        <value xml:lang="fr">Chercher des équipements</value>
+        <value xml:lang="it">Ricerca Cespite</value>
+        <value xml:lang="th">ค้นหาเครื่องมือ</value>
+    </property>
+    <property key="PageTitleListItemIssuance">
+        <value xml:lang="en">Parts List</value>
+        <value xml:lang="fr">Liste des pièces</value>
+        <value xml:lang="it">Lista Soggetti</value>
+        <value xml:lang="th">ส่วนหนึ่งของรายการ</value>
+    </property>
+</resource>
Index: applications/marketing/webapp/marketing/segment/SegmentForms.xml
===================================================================
--- applications/marketing/webapp/marketing/segment/SegmentForms.xml	(revision 735109)
+++ applications/marketing/webapp/marketing/segment/SegmentForms.xml	(working copy)
@@ -101,7 +101,7 @@
         
         <field name="segmentGroupId"><hidden/></field>
         
-        <field name="geoId" title="${uiLabelMap.MarketingSegmentGroupGeoId}"><lookup target-form-name="LookupGeo"/></field>
+        <field name="geoId" title="${uiLabelMap.CommonSegmentGroupGeoId}"><lookup target-form-name="LookupGeo"/></field>
         <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field>
     </form>
     <form name="listSegmentGroupGeo" list-name="segmentGroupGeos" target="" title="" type="list" paginate-target="listSegmentGroupGeo"
@@ -112,7 +112,7 @@
             </entity-and>
         </actions>
         <field name="segmentGroupId"><hidden/></field>
-        <field name="geoId" title="${uiLabelMap.MarketingSegmentGroupGeoId}"><display-entity entity-name="Geo" description="${geoName} [Code:${geoCode}][ID:${geoId}]"/></field>
+        <field name="geoId" title="${uiLabelMap.CommonSegmentGroupGeoId}"><display-entity entity-name="Geo" description="${geoName} [Code:${geoCode}][ID:${geoId}]"/></field>
         <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
             <hyperlink target="deleteSegmentGroupGeo?segmentGroupId=${segmentGroupId}&amp;geoId=${geoId}"
                 description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
Index: specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml
===================================================================
--- specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml	(revision 735109)
+++ specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml	(working copy)
@@ -19,223 +19,327 @@
     under the License.
 -->
 <resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <property key="PageTitleAddProjectTimeToNewInvoice">
-        <value xml:lang="en">Add all reported/approved task time to a new invoice</value>
-        <value xml:lang="fr">Ajouter tout le temps de la tâche rapporté/approuvé à une nouvelle facture/</value>
+    <property key="FormFieldTitle_actualHours">
+        <value xml:lang="en">Actual Hours</value>
+        <value xml:lang="fr">Heures réelles</value>
+        <value xml:lang="it">Ore attuali</value>
+        <value xml:lang="zh">实际工时</value>
     </property>
+    <property key="FormFieldTitle_clientBillingPartyId">
+        <value xml:lang="en">Client Billing Party Id</value>
+        <value xml:lang="it">Soggetto fatturazione</value>
+    </property>
+    <property key="FormFieldTitle_complete">
+        <value xml:lang="en">Complete</value>
+        <value xml:lang="fr">Terminé</value>
+        <value xml:lang="it">Completo</value>
+        <value xml:lang="zh">完成</value>
+    </property>
+    <property key="FormFieldTitle_createdStamp">
+        <value xml:lang="en">Created Stamp</value>
+        <value xml:lang="fr">Estampille créée</value>
+        <value xml:lang="it">Data creazione</value>
+        <value xml:lang="zh">创建时间</value>
+    </property>
+    <property key="FormFieldTitle_newTimesheetId">
+        <value xml:lang="en">New Timesheet Id</value>
+        <value xml:lang="fr">Réf. de nouvelle feuille d'activité</value>
+        <value xml:lang="it">Nuova timbratura</value>
+        <value xml:lang="zh">新的时间表Id</value>
+    </property>
+    <property key="FormFieldTitle_nonBilledHours">
+        <value xml:lang="en">Non Billed Hours</value>
+        <value xml:lang="it">Ore non fatturate</value>
+    </property>
+    <property key="FormFieldTitle_parentProjectName">
+        <value xml:lang="en">Parent Project Name</value>
+        <value xml:lang="fr">Nom du projet parent</value>
+        <value xml:lang="it">Nome progetto padre</value>
+        <value xml:lang="zh">父项目名称</value>
+    </property>
+    <property key="FormFieldTitle_phase">
+        <value xml:lang="en">Phase</value>
+        <value xml:lang="fr">Phase</value>
+        <value xml:lang="it">Fase</value>
+        <value xml:lang="zh">项目阶段</value>
+    </property>
+    <property key="FormFieldTitle_phaseId">
+        <value xml:lang="en">Phase Id</value>
+        <value xml:lang="it">Fase</value>
+    </property>
+    <property key="FormFieldTitle_phaseName">
+        <value xml:lang="en">Phase Name</value>
+        <value xml:lang="fr">Nom de phase</value>
+        <value xml:lang="it">Nome fase</value>
+        <value xml:lang="zh">阶段名称</value>
+    </property>
+    <property key="FormFieldTitle_plannedHours">
+        <value xml:lang="en">Planned Hours</value>
+        <value xml:lang="fr">Heures planifiées</value>
+        <value xml:lang="it">Orari pianificati</value>
+        <value xml:lang="zh">计划工时</value>
+    </property>
+    <property key="FormFieldTitle_projectName">
+        <value xml:lang="en">Project Name</value>
+        <value xml:lang="fr">Nom de projet</value>
+        <value xml:lang="it">Nome progetto</value>
+        <value xml:lang="zh">项目名称</value>
+    </property>
+    <property key="FormFieldTitle_relatedTasks">
+        <value xml:lang="en">Related Tasks</value>
+        <value xml:lang="fr">Tâches associées</value>
+        <value xml:lang="it">Compiti relativi</value>
+        <value xml:lang="zh">相关任务</value>
+    </property>
+    <property key="FormFieldTitle_task">
+        <value xml:lang="en">Task</value>
+        <value xml:lang="fr">Tâche</value>
+        <value xml:lang="it">Compito</value>
+        <value xml:lang="zh">任务</value>
+    </property>
+    <property key="FormFieldTitle_taskName">
+        <value xml:lang="en">Task Name</value>
+        <value xml:lang="fr">Nom de tâche</value>
+        <value xml:lang="it">Nome compito</value>
+        <value xml:lang="zh">任务名称</value>
+    </property>
+    <property key="FormFieldTitle_templateId">
+        <value xml:lang="en">Template Id</value>
+        <value xml:lang="fr">Réf. de modèle</value>
+        <value xml:lang="it">Template</value>
+        <value xml:lang="zh">模板Id</value>
+    </property>
     <property key="PageTitleAddATimesheet">
         <value xml:lang="en">Add a new weekly Timesheet</value>
         <value xml:lang="fr">Ajouter une nouvelle feuille d'activité hebdomadaire</value>
-        <value xml:lang="it">Aggiungi una nuova Timbratura settimanale</value>
+        <value xml:lang="it">Aggiungi una nuova timbratura settimanale</value>
         <value xml:lang="th">เพิ่มตารางเวลารายสัปดาห์ใหม่</value>
         <value xml:lang="zh">增加新的周时间表</value>
     </property>
     <property key="PageTitleAddDependencyAfter">
         <value xml:lang="en">Add Dependency After the current Task</value>
         <value xml:lang="fr">Ajouter une dépendance après la tâche courante</value>
-        <value xml:lang="it">Aggiungi Dipendenza Dopo l'attuale Compito</value>
+        <value xml:lang="it">Aggiungi dipendenza dopo l'attuale compito</value>
         <value xml:lang="th">เพิ่มความสัมพันธ์หลังจากงานเป็นที่ยอมรับ</value>
         <value xml:lang="zh">在当前任务后增加依赖</value>
     </property>
     <property key="PageTitleAddDependencyBefore">
         <value xml:lang="en">Add Dependency before the current Task</value>
         <value xml:lang="fr">Ajouter une dépendance avant la tâche courante</value>
-        <value xml:lang="it">Aggiungi Dipendenza prima del Compito</value>
+        <value xml:lang="it">Aggiungi dipendenza prima del compito</value>
         <value xml:lang="th">เพิ่มความสัมพันธ์ก่อนงานเป็นที่ยอมรับ</value>
         <value xml:lang="zh">在当前任务前增加依赖</value>
     </property>
     <property key="PageTitleAddPartyAssign">
         <value xml:lang="en">Add Resource Assignment</value>
         <value xml:lang="fr">Ajouter une ressource à la tâche</value>
-        <value xml:lang="it">Aggiungi Assegnazione Risorsa</value>
+        <value xml:lang="it">Aggiungi assegnazione risorsa</value>
         <value xml:lang="th">เพิ่มการกำหนดแหล่งข้อมูล</value>
         <value xml:lang="zh">增加资源分配</value>
     </property>
     <property key="PageTitleAddPhase">
         <value xml:lang="en">Add Phase</value>
         <value xml:lang="fr">Ajouter une phase</value>
-        <value xml:lang="it">Aggiungi Fase</value>
+        <value xml:lang="it">Aggiungi fase</value>
         <value xml:lang="th">เพิ่มขั้นตอนการทำงาน</value>
         <value xml:lang="zh">增加项目阶段</value>
     </property>
     <property key="PageTitleAddProject">
         <value xml:lang="en">Add Project</value>
         <value xml:lang="fr">Ajouter un projet</value>
-        <value xml:lang="it">Aggiungi Progetto</value>
+        <value xml:lang="it">Aggiungi progetto</value>
         <value xml:lang="th">เพิ่มโปรเจค</value>
         <value xml:lang="zh">增加项目</value>
     </property>
+    <property key="PageTitleAddProjectContent">
+        <value xml:lang="en">Add Project Content</value>
+        <value xml:lang="fr">Ajouter un contenu au projet</value>
+        <value xml:lang="it">Aggiungi contenuto progetto</value>
+        <value xml:lang="th">เพิ่มหัวข้อโปรเจ็ค</value>
+    </property>
     <property key="PageTitleAddProjectNotes">
         <value xml:lang="en">Add Project Notes</value>
         <value xml:lang="fr">Ajouter des notes au projet</value>
-        <value xml:lang="it">Aggiungi Note Progetto</value>
+        <value xml:lang="it">Aggiungi note progetto</value>
         <value xml:lang="th">เพิ่มข้อความโปรเจค</value>
         <value xml:lang="zh">增加项目备注</value>
     </property>
+    <property key="PageTitleAddProjectTimeToNewInvoice">
+        <value xml:lang="en">Add all reported/approved task time to a new invoice</value>
+        <value xml:lang="fr">Ajouter tout le temps de la tâche rapporté/approuvé à une nouvelle facture/</value>
+        <value xml:lang="it">Aggiungi tutte le timbrature approvate ad una nuova fattura</value>
+    </property>
     <property key="PageTitleAddResource">
         <value xml:lang="en">Add a Resource</value>
         <value xml:lang="fr">Ajouter une ressource</value>
-        <value xml:lang="it">Aggiungi una Risorsa</value>
+        <value xml:lang="it">Aggiungi una risorsa</value>
         <value xml:lang="th">เพิ่มแหล่งที่มา</value>
         <value xml:lang="zh">增加资源</value>
     </property>
     <property key="PageTitleAddSkill">
         <value xml:lang="en">Add Requirement</value>
         <value xml:lang="fr">Ajouter un besoin</value>
-        <value xml:lang="it">Aggiungi Abilità</value>
+        <value xml:lang="it">Aggiungi abilità</value>
         <value xml:lang="th">เพิ่มความต้องการ</value>
         <value xml:lang="zh">增加需求</value>
     </property>
     <property key="PageTitleAddSubProject">
         <value xml:lang="en">Add Sub Project</value>
         <value xml:lang="fr">Ajouter un sous-projet</value>
-        <value xml:lang="it">Aggiungi Sotto-Progetto</value>
+        <value xml:lang="it">Aggiungi sotto-progetto</value>
         <value xml:lang="th">เพิ่มโปรเจคย่อย</value>
         <value xml:lang="zh">增加子项目</value>
     </property>
     <property key="PageTitleAddSubTask">
         <value xml:lang="en">Add Sub Task</value>
         <value xml:lang="fr">Ajouter une sous-tâche</value>
-        <value xml:lang="it">Aggiungi Sotto-Compito</value>
+        <value xml:lang="it">Aggiungi sotto-compito</value>
         <value xml:lang="th">เพิ่มงานย่อย</value>
         <value xml:lang="zh">增加子任务</value>
     </property>
     <property key="PageTitleAddTask">
         <value xml:lang="en">Add Task</value>
         <value xml:lang="fr">Ajouter une tâche</value>
-        <value xml:lang="it">Aggiungi Compito</value>
+        <value xml:lang="it">Aggiungi compito</value>
         <value xml:lang="th">เพิ่มงาน</value>
         <value xml:lang="zh">增加任务</value>
     </property>
+    <property key="PageTitleAddTaskContent">
+        <value xml:lang="en">Add Task Content</value>
+        <value xml:lang="fr">Ajouter un contenu à la tâche</value>
+        <value xml:lang="it">Aggiungi contenuto compito</value>
+        <value xml:lang="th">เพิ่มหัวข้องาน </value>
+    </property>
     <property key="PageTitleAddTaskNotes">
         <value xml:lang="en">Add Task Notes</value>
         <value xml:lang="fr">Ajouter des notes à la tâche</value>
-        <value xml:lang="it">Aggiungi Note Compito</value>
+        <value xml:lang="it">Aggiungi note compito</value>
         <value xml:lang="th">เพิ่มข้อความงาน</value>
         <value xml:lang="zh">增加任务备注</value>
     </property>
     <property key="PageTitleCreateTaskbyRequest">
         <value xml:lang="en">Create a new Task for this Request</value>
         <value xml:lang="fr">Créer une nouvelle tâche pour cette demande</value>
-        <value xml:lang="it">Creare un nuovo Compito per questa Richiesta</value>
+        <value xml:lang="it">Creare un nuovo compito per questa richiesta</value>
         <value xml:lang="th">สร้างงานใหม่สำหรับคำร้องขอ</value>
         <value xml:lang="zh">为该请求创建新的任务</value>
     </property>
     <property key="PageTitleCurrentTimesheet">
         <value xml:lang="en">Current Timesheet</value>
         <value xml:lang="fr">Feuille d'activité courante</value>
-        <value xml:lang="it">Timbratura Corrente</value>
+        <value xml:lang="it">Timbrature attuali</value>
         <value xml:lang="th">ตารางเวลาที่ใช้กันอยู่ในปัจจุบัน</value>
         <value xml:lang="zh">当前时间表</value>
     </property>
     <property key="PageTitleDependencies">
         <value xml:lang="en">Task dependencies</value>
         <value xml:lang="fr">Dépendances de la tâche</value>
-        <value xml:lang="it">Dipendenze Compiti</value>
+        <value xml:lang="it">Dipendenze compiti</value>
         <value xml:lang="th">ความสัมพันธ์ของงาน</value>
         <value xml:lang="zh">任务间从属关系</value>
     </property>
     <property key="PageTitleEditCurrentTimesheet">
         <value xml:lang="en">Edit current timesheet</value>
         <value xml:lang="fr">Modifier la feuille d'activité courante</value>
-        <value xml:lang="it">Aggiorna timbratura correnti</value>
+        <value xml:lang="it">Aggiorna timbratura attuali</value>
         <value xml:lang="th">แก้ไขตารางเวลาที่ใช้อยู่ในปัจจุบัน</value>
         <value xml:lang="zh">编辑当前时间表</value>
     </property>
     <property key="PageTitleEditPhase">
         <value xml:lang="en">Edit Phase</value>
         <value xml:lang="fr">Modifier la phase</value>
-        <value xml:lang="it">Aggiorna Fase</value>
+        <value xml:lang="it">Aggiorna fase</value>
         <value xml:lang="th">แก้ไขขั้นตอนการทำงาน</value>
         <value xml:lang="zh">编辑项目阶段</value>
     </property>
     <property key="PageTitleEditProject">
         <value xml:lang="en">Edit Project</value>
         <value xml:lang="fr">Modifier le projet</value>
-        <value xml:lang="it">Aggiorna Progetto</value>
+        <value xml:lang="it">Aggiorna progetto</value>
         <value xml:lang="th">แก้ไขโปรเจค</value>
         <value xml:lang="zh">编辑项目</value>
     </property>
     <property key="PageTitleEditSkill">
         <value xml:lang="en">Edit Requirement</value>
         <value xml:lang="fr">Modifier le besoin</value>
-        <value xml:lang="it">Aggiorna Abilità</value>
+        <value xml:lang="it">Aggiorna abilità</value>
         <value xml:lang="th">แก้ไขความต้องการ</value>
         <value xml:lang="zh">编辑需求</value>
     </property>
     <property key="PageTitleEditSubProject">
         <value xml:lang="en">Edit Sub Project</value>
         <value xml:lang="fr">Modifier le sous-projet</value>
-        <value xml:lang="it">Aggiorna Sotto-Progetto</value>
+        <value xml:lang="it">Aggiorna sotto-progetto</value>
         <value xml:lang="th">แก้ไขโปรเจคย่อย</value>
         <value xml:lang="zh">编辑子项目</value>
     </property>
     <property key="PageTitleEditSubTask">
         <value xml:lang="en">Edit Sub Task</value>
         <value xml:lang="fr">Modifier la sous-tâche</value>
-        <value xml:lang="it">Aggiorna Sotto-Compito</value>
+        <value xml:lang="it">Aggiorna sotto-compito</value>
         <value xml:lang="th">แก้ไขงานย่อย</value>
         <value xml:lang="zh">编辑子任务</value>
     </property>
     <property key="PageTitleEditTask">
         <value xml:lang="en">Edit Task</value>
         <value xml:lang="fr">Modifier la tâche</value>
-        <value xml:lang="it">Aggiorna Compito</value>
+        <value xml:lang="it">Aggiorna compito</value>
         <value xml:lang="th">แก้ไขงาน</value>
         <value xml:lang="zh">编辑任务</value>
     </property>
     <property key="PageTitleFindPhase">
         <value xml:lang="en">Find Phase</value>
         <value xml:lang="fr">Rechercher la phase</value>
-        <value xml:lang="it">Ricerca Fase</value>
+        <value xml:lang="it">Ricerca fase</value>
         <value xml:lang="th">ค้นหาขั้นตอนการทำงาน</value>
         <value xml:lang="zh">查找项目阶段</value>
     </property>
     <property key="PageTitleFindProject">
         <value xml:lang="en">Find Project</value>
         <value xml:lang="fr">Recherche de projet(s)</value>
-        <value xml:lang="it">Ricerca Progetto</value>
+        <value xml:lang="it">Ricerca progetto</value>
         <value xml:lang="th">ค้นหาโปรเจค</value>
         <value xml:lang="zh">查找项目</value>
     </property>
     <property key="PageTitleFindProjectResults">
         <value xml:lang="en">Find Project Results</value>
         <value xml:lang="fr">Voir les résultats du projet</value>
+        <value xml:lang="it">Risultati ricerca progetto</value>
         <value xml:lang="th">ผลลัพธ์ที่ได้จากการค้นหาโปรเจค</value>
         <value xml:lang="zh">查找项目情况</value>
     </property>
     <property key="PageTitleFindResource">
         <value xml:lang="en">Find Resource</value>
         <value xml:lang="fr">Rechercher la ressource</value>
-        <value xml:lang="it">Ricerca Risorsa</value>
+        <value xml:lang="it">Ricerca risorsa</value>
         <value xml:lang="th">ค้นหาแหล่งที่มา</value>
         <value xml:lang="zh">查找资源</value>
     </property>
     <property key="PageTitleFindSubProject">
         <value xml:lang="en">Find Sub Project</value>
         <value xml:lang="fr">Rechercher le sous-projet</value>
-        <value xml:lang="it">Ricerca Sotto-Progetto</value>
+        <value xml:lang="it">Ricerca sotto-progetto</value>
         <value xml:lang="th">ค้นหาโปรเจคย่อย</value>
         <value xml:lang="zh">查找子项目</value>
     </property>
     <property key="PageTitleFindSubTask">
         <value xml:lang="en">Find Sub Task</value>
         <value xml:lang="fr">Rechercher la sous-tâche</value>
-        <value xml:lang="it">Ricerca Sotto-Compito</value>
+        <value xml:lang="it">Ricerca sotto-compito</value>
         <value xml:lang="th">ค้นหางานย่อย</value>
         <value xml:lang="zh">查找子任务</value>
     </property>
     <property key="PageTitleFindTask">
         <value xml:lang="en">Find Task</value>
         <value xml:lang="fr">Rechercher la tâche</value>
-        <value xml:lang="it">Ricerca Compito</value>
+        <value xml:lang="it">Ricerca compito</value>
         <value xml:lang="th">ค้นหางาน</value>
         <value xml:lang="zh">查找任务</value>
     </property>
     <property key="PageTitleFindTimeSheet">
         <value xml:lang="en">Find TimeSheet</value>
         <value xml:lang="fr">Rechercher une feuilled'activitée</value>
-        <value xml:lang="it">Ricerca Timbratura</value>
+        <value xml:lang="it">Ricerca timbratura</value>
         <value xml:lang="th">ค้นหาตารางเวลา</value>
         <value xml:lang="zh">查找时间表</value>
     </property>
@@ -249,14 +353,14 @@
     <property key="PageTitleListProjectByParty">
         <value xml:lang="en">List Project by Party</value>
         <value xml:lang="fr">Voir les projets par acteur</value>
-        <value xml:lang="it">Lista Progetti per Soggetto</value>
+        <value xml:lang="it">Lista progetti per soggetto</value>
         <value xml:lang="th">แสดงรายการโปรเจคโดยกลุ่มผู้ใช้</value>
         <value xml:lang="zh">按会员列出项目</value>
     </property>
     <property key="PageTitleListProjectNotes">
         <value xml:lang="en">List Project Notes</value>
         <value xml:lang="fr">Voir les notes du projet</value>
-        <value xml:lang="it">Lista Note Progetto</value>
+        <value xml:lang="it">Lista note progetto</value>
         <value xml:lang="th">แสดงรายการข้อความโปรเจค</value>
         <value xml:lang="zh">列出项目备注</value>
     </property>
@@ -270,73 +374,75 @@
     <property key="PageTitleListTaskByParty">
         <value xml:lang="en">List Task by Party</value>
         <value xml:lang="fr">Voir les tâches par acteur</value>
-        <value xml:lang="it">Lista Compito per Soggetto</value>
+        <value xml:lang="it">Lista compito per soggetto</value>
         <value xml:lang="th">แสดงรายการงานโดยกลุ่มผู้ใช้</value>
         <value xml:lang="zh">按会员列出任务</value>
     </property>
     <property key="PageTitleListTaskContent">
         <value xml:lang="en">List Task Content Items</value>
         <value xml:lang="fr">Voir les élements de la tâche</value>
+        <value xml:lang="it">Lista righe contenuto compito</value>
     </property>
     <property key="PageTitleListTaskNotes">
         <value xml:lang="en">List Task Notes</value>
         <value xml:lang="fr">Voir les notes de la tâche</value>
-        <value xml:lang="it">Lista Note Compito</value>
+        <value xml:lang="it">Lista note compito</value>
         <value xml:lang="th">แสดงรายการข้อความงาน</value>
         <value xml:lang="zh">任务备注列表</value>
     </property>
     <property key="PageTitleListTaskSearchResult">
         <value xml:lang="en">Task search results</value>
         <value xml:lang="fr">Résultats de recherche de la tâche</value>
+        <value xml:lang="it">Risulatai ricerca compito</value>
         <value xml:lang="th">ผลลัพธ์ที่ได้จากการค้นหางาน</value>
         <value xml:lang="zh">任务查找结果</value>
     </property>
     <property key="PageTitleListTimeEntries">
         <value xml:lang="en">List Time Entries for</value>
         <value xml:lang="fr">Voir les échéances pour</value>
-        <value xml:lang="it">Lista Voci Orari per</value>
+        <value xml:lang="it">Lista voci orari per</value>
         <value xml:lang="th">แสดงรายการตารางเวลาสำหรับ</value>
         <value xml:lang="zh">列出时间条目</value>
     </property>
     <property key="PageTitleProjectBilling">
         <value xml:lang="en">Project Billing</value>
         <value xml:lang="fr">Facturation du projet</value>
-        <value xml:lang="it">Fatturazione Progetto</value>
+        <value xml:lang="it">Fatturazione progetto</value>
         <value xml:lang="th">Project Billing</value>
         <value xml:lang="zh">项目账单</value>
     </property>
     <property key="PageTitleProjectGanttChart">
         <value xml:lang="en">Project Gantt Chart</value>
         <value xml:lang="fr">Graphe Gantt du projet</value>
-        <value xml:lang="it">Progetto Grafico Gantt</value>
+        <value xml:lang="it">Progetto grafico gantt</value>
         <value xml:lang="th">แผนผังคุมการกำหนดโปรเจค</value>
         <value xml:lang="zh">项目甘特图</value>
     </property>
     <property key="PageTitleProjectInformation">
         <value xml:lang="en">Project Information</value>
         <value xml:lang="fr">Informations du projet</value>
-        <value xml:lang="it">Informazione Progetto</value>
+        <value xml:lang="it">Informazione progetto</value>
         <value xml:lang="th">ข้อมูลโปรเจค</value>
         <value xml:lang="zh">项目信息</value>
     </property>
     <property key="PageTitleRequestList">
         <value xml:lang="en">Request List</value>
         <value xml:lang="fr">Liste de besoins</value>
-        <value xml:lang="it">Lista Richiesta</value>
+        <value xml:lang="it">Lista richiesta</value>
         <value xml:lang="th">รายการคำร้อง</value>
         <value xml:lang="zh">请求列表</value>
     </property>
     <property key="PageTitleTaskAssignedToMe">
         <value xml:lang="en">Open Tasks Assigned to me.</value>
         <value xml:lang="fr">Ouvrir les tâches qui me sont affectées</value>
-        <value xml:lang="it">Compiti Aperti Assegnati a me.</value>
+        <value xml:lang="it">Compiti aperti assegnati a me.</value>
         <value xml:lang="th">งานที่มอบหมายให้ฉัน</value>
         <value xml:lang="zh">打开分配给我的任务</value>
     </property>
     <property key="PageTitleTaskInformation">
         <value xml:lang="en">Task information</value>
         <value xml:lang="fr">Information sur la tâche</value>
-        <value xml:lang="it">Informazione Compito</value>
+        <value xml:lang="it">Informazione compito</value>
         <value xml:lang="th">ข้อมูลงาน</value>
         <value xml:lang="zh">任务信息</value>
     </property>
@@ -371,21 +477,28 @@
     <property key="PageTitleUnassignedTask">
         <value xml:lang="en">Unassigned Task</value>
         <value xml:lang="fr">Tâches non affectées</value>
-        <value xml:lang="it">Compito Non Assegnato</value>
+        <value xml:lang="it">Compito non assegnato</value>
         <value xml:lang="th">ไม่กำหนดงาน</value>
         <value xml:lang="zh">未分配任务</value>
     </property>
     <property key="ProjectMgrAcceptedCustomerRequestList">
         <value xml:lang="en">Accepted Customer Request list</value>
         <value xml:lang="fr">Liste des demandes client acceptées</value>
+        <value xml:lang="it">Lista richieste accettate dai clienti</value>
     </property>
     <property key="ProjectMgrActualHours">
         <value xml:lang="en">Actual Hours</value>
         <value xml:lang="fr">Heures réelles</value>
-        <value xml:lang="it">Ore Attuali</value>
+        <value xml:lang="it">Ore attuali</value>
         <value xml:lang="th">ชั่วโมงจริง</value>
         <value xml:lang="zh">实际工时</value>
     </property>
+    <property key="ProjectMgrActualTotal">
+        <value xml:lang="en">Act Total</value>
+        <value xml:lang="fr">Total réel</value>
+        <value xml:lang="it">Totale attuale</value>
+        <value xml:lang="zh">实际总时间</value>
+    </property>
     <property key="ProjectMgrAddNewTask">
         <value xml:lang="en">Add a new task to one of my projects.</value>
         <value xml:lang="fr">Ajouter une nouvelle tâches à mes projets</value>
@@ -393,24 +506,31 @@
         <value xml:lang="th">เพิ่มงานใหม่ไปยังส่วนหนึ่งของโปรเจคของฉัน</value>
         <value xml:lang="zh">为我的一个项目增加新任务</value>
     </property>
+    <property key="ProjectMgrAddTimeEntry">
+        <value xml:lang="en">Add Time Entry</value>
+        <value xml:lang="fr">Ajouter une échéance</value>
+        <value xml:lang="it">Aggiungi voce tempo</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>
-        <value xml:lang="it">Applicazione Gestione Progetti</value>
+        <value xml:lang="it">Applicazione gestione progetti</value>
         <value xml:lang="th">โปรแกรมประยุกต์ใช้การจัดการโปรเจค</value>
         <value xml:lang="zh">项目管理应用程序</value>
     </property>
     <property key="ProjectMgrAssignATaskToMe">
         <value xml:lang="en">Assign an existing Task to me.</value>
         <value xml:lang="fr">M'affecter une tâche existante</value>
-        <value xml:lang="it">Assegna un Compito esistente a me.</value>
+        <value xml:lang="it">Assegna un compito esistente a me.</value>
         <value xml:lang="th">กำหนดงานที่มีอยู่ให้ฉัน</value>
         <value xml:lang="zh">给我分配一个已有的任务</value>
     </property>
     <property key="ProjectMgrAssignMyTaskToSomebodyElse">
         <value xml:lang="en">Assign My Task To Somebody Else.</value>
         <value xml:lang="fr">Affecter ma tâche à quelqu'un d'autre</value>
-        <value xml:lang="it">Assegna Mio Compito Per Qualcuno Altro.</value>
+        <value xml:lang="it">Assegna un mio compito a qualcun'altro.</value>
         <value xml:lang="th">กำหนดงานของฉันให้คนอื่น</value>
         <value xml:lang="zh">把我的任务分配给别人</value>
     </property>
@@ -421,6 +541,20 @@
         <value xml:lang="th">Billing</value>
         <value xml:lang="zh">账单</value>
     </property>
+    <property key="ProjectMgrCheckComplete">
+        <value xml:lang="en">Check Complete</value>
+        <value xml:lang="fr">Marquée comme terminé</value>
+        <value xml:lang="it">Controllo completato</value>
+        <value xml:lang="zh">是否完成</value>
+    </property>
+    <property key="ProjectMgrClientContacts">
+        <value xml:lang="en">Client Contacts</value>
+        <value xml:lang="it">Contatti cliente</value>
+    </property>
+    <property key="ProjectMgrCompanies">
+        <value xml:lang="en">Companies</value>
+        <value xml:lang="it">Aziende</value>
+    </property>
     <property key="ProjectMgrCompanyName">
         <value xml:lang="en">OFBiz: Project</value>
         <value xml:lang="fr">OFBiz : projet</value>
@@ -435,31 +569,42 @@
         <value xml:lang="th">โปรเจค</value>
         <value xml:lang="zh">项目</value>
     </property>
+    <property key="ProjectMgrContentList">
+        <value xml:lang="en">Project Content List</value>
+        <value xml:lang="fr">Liste des contenus du projet</value>
+        <value xml:lang="it">Lsista contenuti progetto</value>
+    </property>
     <property key="ProjectMgrCopyProject">
         <value xml:lang="en">Copy Project</value>
         <value xml:lang="fr">Copier le projet</value>
-        <value xml:lang="it">Copia Progetto</value>
+        <value xml:lang="it">Copia progetto</value>
         <value xml:lang="th">คัดลอกโปรเจค</value>
         <value xml:lang="zh">复制项目</value>
     </property>
     <property key="ProjectMgrCreateByExistingTask">
         <value xml:lang="en">Link to an existing Task</value>
         <value xml:lang="fr">Lien à une tâche existante</value>
-        <value xml:lang="it">Link ad un Compito esistente</value>
+        <value xml:lang="it">Link ad un compito esistente</value>
         <value xml:lang="th">เชื่อมต่อไปยังงานที่มีอยู่แล้ว</value>
         <value xml:lang="zh">链接到已存在的任务</value>
     </property>
     <property key="ProjectMgrCreateTaskFromRequest">
         <value xml:lang="en">Create Task From Request</value>
         <value xml:lang="fr">Créer une tâche depuis une demande</value>
-        <value xml:lang="it">Creare Compito Dalla Richiesta</value>
+        <value xml:lang="it">Creare compito dalla richiesta</value>
         <value xml:lang="th">สร้างงานจากคำร้อง</value>
         <value xml:lang="zh">为请求创建任务</value>
     </property>
+    <property key="ProjectMgrCustRequestCategoryId">
+        <value xml:lang="en">Cust Request Category Id</value>
+        <value xml:lang="fr">Réf. de catégorie de demande client</value>
+        <value xml:lang="it">Categoria richiesta cliente</value>
+        <value xml:lang="zh">请求分类Id</value>
+    </property>
     <property key="ProjectMgrCustRequestWorkEffort">
         <value xml:lang="en">CustRequest WorkEffort</value>
         <value xml:lang="fr">Créer une tâche depuis une demande client</value>
-        <value xml:lang="it">Impegno di Lavoro Richiesta</value>
+        <value xml:lang="it">Impegno di lavoro richiesta</value>
         <value xml:lang="th">งานคำร้องของลูกค้า</value>
         <value xml:lang="zh">客户请求的工作任务</value>
     </property>
@@ -479,52 +624,72 @@
         <value xml:lang="th">แก้ไข</value>
         <value xml:lang="zh">编辑</value>
     </property>
-    <property key="ProjectMgrEditPatySkill">
+    <property key="ProjectMgrEditPartySkill">
         <value xml:lang="en">Edit PartySkill</value>
         <value xml:lang="fr">Modifier les compétences de l'acteur</value>
-        <value xml:lang="it">Aggiorna Abilità Soggetto</value>
+        <value xml:lang="it">Aggiorna abilità soggetto</value>
         <value xml:lang="th">แก้ไขทักษะกลุ่มผู้ใช้</value>
         <value xml:lang="zh">编辑会员技能</value>
     </property>
-    <property key="ProjectMgrEditPoject">
+    <property key="ProjectMgrEditProject">
         <value xml:lang="en">Edit Project</value>
         <value xml:lang="fr">Modifier le projet</value>
-        <value xml:lang="it">Aggiorna Progetto</value>
+        <value xml:lang="it">Aggiorna progetto</value>
         <value xml:lang="th">แก้ไขโปรเจค</value>
         <value xml:lang="zh">编辑项目</value>
     </property>
     <property key="ProjectMgrEditTask">
         <value xml:lang="en">Edit Task</value>
         <value xml:lang="fr">Modifier la tâche</value>
-        <value xml:lang="it">Aggiorna Compito</value>
+        <value xml:lang="it">Aggiorna compito</value>
         <value xml:lang="th">แก้ไขงาน</value>
         <value xml:lang="zh">编辑任务</value>
     </property>
+    <property key="ProjectMgrErrorRequestNotFound">
+        <value xml:lang="en">Customer Request: ${parameters.custRequestId} not found</value>
+        <value xml:lang="fr">Demande client : ${parameters.custRequestId} non trouvée</value>
+        <value xml:lang="it">Richiesta cliente: ${parameters.custRequestId} non trovato</value>
+    </property>
+    <property key="ProjectMgrErrorRequestStatusWrong">
+        <value xml:lang="en">Customer Request: ${parameters.custRequestId} has the wrong status, should be 'Accepted' but it is ${status.description}</value>
+        <value xml:lang="fr">Demande client : ${parameters.custRequestId} a un statut erroné, devrait être 'Accepté' mais est ${status.description}</value>
+        <value xml:lang="it">Richiesta cliente: ${parameters.custRequestId} ha uno stato errato, dovrebbe essere 'Accettato' ma questo è ${status.description}</value>
+    </property>
+    <property key="ProjectMgrErrorTaskNotFound">
+        <value xml:lang="en">Task: ${parameters.workEffortId} not found</value>
+        <value xml:lang="fr">Tâche : ${parameters.workEffortId} non trouvée</value>
+        <value xml:lang="it">Compito: ${parameters.workEffortId} non trovato</value>
+    </property>
+    <property key="ProjectMgrErrorTaskStatusWrong">
+        <value xml:lang="en">Task: ${parameters.workEffortId} is not in progress, no request can be added</value>
+        <value xml:lang="fr">Tâche : ${parameters.workEffortId} n'est pas en cours, aucune demande ne peut être ajoutée</value>
+        <value xml:lang="it">Compito: ${parameters.workEffortId} non è in corso, nessuna richiesta può essere aggiunta</value>
+    </property>
     <property key="ProjectMgrEstimatedCost">
         <value xml:lang="en">Estimated Cost</value>
         <value xml:lang="fr">Coût estimé</value>
-        <value xml:lang="it">Costo Stimato</value>
+        <value xml:lang="it">Costo stimato</value>
         <value xml:lang="th">ราคาโดยประมาณ</value>
         <value xml:lang="zh">评估费用</value>
     </property>
     <property key="ProjectMgrEstimatedDuration">
         <value xml:lang="en">Estimated Duration</value>
         <value xml:lang="fr">Durée estimée</value>
-        <value xml:lang="it">Durata Stimata</value>
+        <value xml:lang="it">Durata stimata</value>
         <value xml:lang="th">ช่วงเวลาโดยประมาณ</value>
         <value xml:lang="zh">评估周期</value>
     </property>
     <property key="ProjectMgrEstimatedHours">
         <value xml:lang="en">Estimated Hours</value>
         <value xml:lang="fr">Heures estimées</value>
-        <value xml:lang="it">Ore Stimate</value>
+        <value xml:lang="it">Ore stimate</value>
         <value xml:lang="th">ชั่วโมงโดยประมาณ</value>
         <value xml:lang="zh">评估工时</value>
     </property>
     <property key="ProjectMgrEstimatedNumPeople">
         <value xml:lang="en">Estimated People</value>
         <value xml:lang="fr">Nombre de personnes estimé</value>
-        <value xml:lang="it">Persone Stimate</value>
+        <value xml:lang="it">Persone stimate</value>
         <value xml:lang="th">บุคคลโดยประมาณ</value>
         <value xml:lang="zh">评估人力</value>
     </property>
@@ -535,38 +700,50 @@
         <value xml:lang="th">Filter on</value>
         <value xml:lang="zh">过滤</value>
     </property>
+    <property key="ProjectMgrFri">
+        <value xml:lang="en">Fri</value>
+        <value xml:lang="fr">ven</value>
+        <value xml:lang="it">Ven</value>
+        <value xml:lang="zh">周五</value>
+    </property>
     <property key="ProjectMgrGanttChart">
         <value xml:lang="en">Gantt Chart</value>
         <value xml:lang="fr">Diagramme de Gantt</value>
-        <value xml:lang="it">Grafico Gantt</value>
+        <value xml:lang="it">Grafico gantt</value>
         <value xml:lang="th">แผนผังคุมการกำหนดงาน</value>
         <value xml:lang="zh">甘特图</value>
     </property>
+    <property key="ProjectMgrMon">
+        <value xml:lang="en">Mon</value>
+        <value xml:lang="fr">lun</value>
+        <value xml:lang="it">Lun</value>
+        <value xml:lang="zh">周一</value>
+    </property>
     <property key="ProjectMgrMyRoleForThisTask">
         <value xml:lang="en">My Role For This Task</value>
         <value xml:lang="fr">Mon rôle pour cette tâches</value>
-        <value xml:lang="it">Mio Ruolo Per Questo Compito</value>
+        <value xml:lang="it">Mio ruolo per questo compito</value>
         <value xml:lang="th">สถานะของฉันสำหรับงานนี้</value>
         <value xml:lang="zh">在这个任务中我的角色</value>
     </property>
     <property key="ProjectMgrNewProject">
         <value xml:lang="en">New Project</value>
         <value xml:lang="fr">Nouveau projet</value>
-        <value xml:lang="it">Nuovo Progetto</value>
+        <value xml:lang="it">Nuovo progetto</value>
         <value xml:lang="th">โปรเจคใหม่</value>
         <value xml:lang="zh">新项目</value>
     </property>
     <property key="ProjectMgrNewSubProject">
         <value xml:lang="en">New Sub Project</value>
         <value xml:lang="fr">Nouveau sous-projet</value>
-        <value xml:lang="it">Nuovo Sotto-Progetto</value>
+        <value xml:lang="it">Nuovo sotto-progetto</value>
         <value xml:lang="th">โปรเจคย่อยใหม่</value>
         <value xml:lang="zh">新子项目</value>
     </property>
     <property key="ProjectMgrNewSubTask">
         <value xml:lang="en">New Sub Task</value>
         <value xml:lang="fr">Nouvelle sous-tâche</value>
-        <value xml:lang="it">Nuovo Sotto-Compito</value>
+        <value xml:lang="it">Nuovo sotto-compito</value>
         <value xml:lang="th">งานย่อยใหม่</value>
         <value xml:lang="zh">新子任务</value>
     </property>
@@ -574,7 +751,7 @@
         <value xml:lang="de">Neue Aufgabe</value>
         <value xml:lang="en">New Task</value>
         <value xml:lang="fr">Nouvelle tâche</value>
-        <value xml:lang="it">Nuovo Compito</value>
+        <value xml:lang="it">Nuovo compito</value>
         <value xml:lang="th">งานใหม่</value>
         <value xml:lang="zh">新任务</value>
     </property>
@@ -595,30 +772,32 @@
     <property key="ProjectMgrNoAccessToTimesheet">
         <value xml:lang="en">You have no access to the timesheet#: ${timesheetId}</value>
         <value xml:lang="fr">Vous n'avez pas accès à la feuille d'activité n° ${timesheetId}</value>
-        <value xml:lang="it">Tu non hai accesso alla marcatura#: ${timesheetId}</value>
+        <value xml:lang="it">Tu non hai accesso alla timbratura#: ${timesheetId}</value>
         <value xml:lang="th">คุณไม่มีสิทธิ์ในการเข้าถึงตารางเวลา#: ${timesheetId}</value>
         <value xml:lang="zh">你没有访问该时间表的权限：${timesheetId}</value>
     </property>
     <property key="ProjectMgrNonBilledActualHours">
         <value xml:lang="en">Act Hrs not billed</value>
+        <value xml:lang="it">Ore attuali non fatturate</value>
     </property>
     <property key="ProjectMgrNoPhasesYet">
         <value xml:lang="en">No phases have been created yet, tasks can not exist without a phase as parent, so create a phase first</value>
         <value xml:lang="fr">Aucune phase n'a encore été créée, une tâche ne peut exister sans une phase comme ancêtre, veuillez créer une phase d'abord</value>
+        <value xml:lang="it">Nessuna fase è ancora stata creata, compito non può esistere senza una fase come padre, quindi creare prima una fase</value>
         <value xml:lang="th">ไม่มีขั้นตอนการทำงานที่สร้างเสร็จแล้ว , งานไม่สามารถมีอยู่โดยปราศจากขั้นตอนการทำงานเหมือนกลุ่ม , ดังนั้นสร้างขั้นตอนการทำงานเป็นอันดับแรก</value>
         <value xml:lang="zh">该项目有没有创建任何的阶段，请先创建项目阶段，任务必须以项目阶段为父节点</value>
     </property>
     <property key="ProjectMgrNotesCreateNew">
         <value xml:lang="en">Create New</value>
         <value xml:lang="fr">Créer une nouvelle note</value>
-        <value xml:lang="it">Creare Nuovo</value>
+        <value xml:lang="it">Creare nuovo</value>
         <value xml:lang="th">สร้างใหม่</value>
         <value xml:lang="zh">创建新的</value>
     </property>
     <property key="ProjectMgrParentProjectName">
         <value xml:lang="en">Parent Project Name</value>
         <value xml:lang="fr">Nom du projet parent</value>
-        <value xml:lang="it">Nome Progetto Padre</value>
+        <value xml:lang="it">Nome progetto padre</value>
         <value xml:lang="th">ชื่อกลุ่มโปรเจค</value>
         <value xml:lang="zh">父项目的名称</value>
     </property>
@@ -632,7 +811,7 @@
     <property key="ProjectMgrPartyList">
         <value xml:lang="en">List of Parties</value>
         <value xml:lang="fr">Liste des acteurs</value>
-        <value xml:lang="it">Lista di Soggetti</value>
+        <value xml:lang="it">Lista di soggetti</value>
         <value xml:lang="th">รายการของกลุ่มผู้ใช้</value>
         <value xml:lang="zh">会员列表</value>
     </property>
@@ -640,35 +819,35 @@
         <value xml:lang="de">Funktionstyp ID</value>
         <value xml:lang="en">Role Type Id</value>
         <value xml:lang="fr">Réf. de type de rôle</value>
-        <value xml:lang="it">Tipo Ruolo</value>
+        <value xml:lang="it">Tipo ruolo</value>
         <value xml:lang="th">รหัสสถานะประเภท</value>
         <value xml:lang="zh">角色类型Id</value>
     </property>
     <property key="ProjectMgrPhaseDetails">
         <value xml:lang="en">Enter the Phase Details below</value>
         <value xml:lang="fr">Saisissez les détails de la phase ci-dessous</value>
-        <value xml:lang="it">Inserire i Dettagli della Fase qui sotto</value>
+        <value xml:lang="it">Inserire i dettagli della fase qui sotto</value>
         <value xml:lang="th">เข้าสู่รายละเอียดขั้นตอนการทำงานข้างล่าง</value>
         <value xml:lang="zh">在下面熟悉项目阶段的明细</value>
     </property>
     <property key="ProjectMgrPhaseList">
         <value xml:lang="en">List of project Phases</value>
         <value xml:lang="fr">Liste des phases du projet</value>
-        <value xml:lang="it">Lista delle Fasi Progetto</value>
+        <value xml:lang="it">Lista delle fasi progetto</value>
         <value xml:lang="th">รายการของขั้นตอนการทำงานของโปรเจค</value>
         <value xml:lang="zh">项目阶段列表</value>
     </property>
     <property key="ProjectMgrPhaseName">
         <value xml:lang="en">Phase Name</value>
         <value xml:lang="fr">Nom de la phase</value>
-        <value xml:lang="it">Nome Fase</value>
+        <value xml:lang="it">Nome fase</value>
         <value xml:lang="th">ชื่อขั้นตอนการทำงาน</value>
         <value xml:lang="zh">项目阶段名称</value>
     </property>
     <property key="ProjectMgrPhaseTaskList">
         <value xml:lang="en">List of Phases and Tasks</value>
         <value xml:lang="fr">Liste des phases et tâches</value>
-        <value xml:lang="it">Lista delle Fasi e Compiti</value>
+        <value xml:lang="it">Lista delle fasi e compiti</value>
         <value xml:lang="th">รายการของขั้นตอนการทำงานและงาน</value>
         <value xml:lang="zh">项目阶段和任务列表</value>
     </property>
@@ -679,24 +858,36 @@
         <value xml:lang="th">ขั้นตอนการทำงาน</value>
         <value xml:lang="zh">项目阶段</value>
     </property>
+    <property key="ProjectMgrPlanHours">
+        <value xml:lang="en">Plan Hours</value>
+        <value xml:lang="fr">Heures planifiées</value>
+        <value xml:lang="it">Ore da piano</value>
+        <value xml:lang="zh">计划时间</value>
+    </property>
     <property key="ProjectMgrPlannedHours">
         <value xml:lang="en">Planned Hours</value>
         <value xml:lang="fr">Heures planifiées</value>
-        <value xml:lang="it">Ore Pianificate</value>
+        <value xml:lang="it">Ore pianificate</value>
         <value xml:lang="th">ชั่วโมงที่วางแผน</value>
         <value xml:lang="zh">已计划工时</value>
     </property>
+    <property key="ProjectMgrPrivateOrPublic">
+        <value xml:lang="en">Private/Public</value>
+        <value xml:lang="fr">Privé/Public</value>
+        <value xml:lang="it">Privato/Pubblico</value>
+        <value xml:lang="zh">私人/公开</value>
+    </property>
     <property key="ProjectMgrProjectAndPhaseName">
         <value xml:lang="en">Project and Phase Name</value>
         <value xml:lang="fr">Nom du projet et de la phase</value>
-        <value xml:lang="it">Progetto e Nome Fase</value>
+        <value xml:lang="it">Progetto e nome fase</value>
         <value xml:lang="th">โปรเจคและชื่อขั้นตอนการทำงาน</value>
         <value xml:lang="zh">项目和阶段名称</value>
     </property>
     <property key="ProjectMgrProjectCurrent">
         <value xml:lang="en">Current Project</value>
         <value xml:lang="fr">Projet courant</value>
-        <value xml:lang="it">Progetto Attuale</value>
+        <value xml:lang="it">Progetto attuale</value>
         <value xml:lang="th">โปรเจคที่ใช้กันในปัจจุบัน</value>
         <value xml:lang="zh">当前项目</value>
     </property>
@@ -707,44 +898,55 @@
         <value xml:lang="th">รหัสโปรเจค</value>
         <value xml:lang="zh">项目Id</value>
     </property>
-    <property key="ProjectMgrProjects">
-        <value xml:lang="en">Projects</value>
-    </property>
     <property key="ProjectMgrProjectName">
         <value xml:lang="en">Project Name</value>
         <value xml:lang="fr">Nom du projet</value>
-        <value xml:lang="it">Nome Progetto</value>
+        <value xml:lang="it">Nome progetto</value>
         <value xml:lang="th">ชื่อโปรเจค</value>
         <value xml:lang="zh">项目名称</value>
     </property>
     <property key="ProjectMgrProjectNoNotes">
         <value xml:lang="en">No Notes for this Project</value>
         <value xml:lang="fr">Aucune note pour ce projet</value>
-        <value xml:lang="it">Nessuna Nota per questo Progetto</value>
+        <value xml:lang="it">Nessuna nota per questo progetto</value>
         <value xml:lang="th">ไม่มีข้อความสำหรับโปรเจคนี้</value>
         <value xml:lang="zh">该项目没有注释</value>
     </property>
+    <property key="ProjectMgrProjects">
+        <value xml:lang="en">Projects</value>
+        <value xml:lang="it">Progetti</value>
+    </property>
     <property key="ProjectMgrProjectSummary">
         <value xml:lang="en">Project Summary</value>
         <value xml:lang="fr">Résumé des projets</value>
-        <value xml:lang="it">Sommario Progetto</value>
+        <value xml:lang="it">Sommario progetto</value>
         <value xml:lang="th">สรุปโปรเจค</value>
         <value xml:lang="zh">项目总览</value>
     </property>
     <property key="ProjectMgrProjectTeam">
         <value xml:lang="en">Project Team</value>
         <value xml:lang="fr">Equipe du projet</value>
-        <value xml:lang="it">Gruppo Progetto</value>
+        <value xml:lang="it">Gruppo progetto</value>
         <value xml:lang="th">ทีมโปรเจค</value>
         <value xml:lang="zh">项目团队</value>
     </property>
+    <property key="ProjectMgrProviders">
+        <value xml:lang="en">Providers</value>
+        <value xml:lang="it">Providers</value>
+    </property>
     <property key="ProjectMgrQuickAssignPartyId">
         <value xml:lang="en">Quick Assign Party Id</value>
         <value xml:lang="fr">Affecter rapidement un Réf. d'acteurt</value>
-        <value xml:lang="it">Assegnazione Veloce Soggetto</value>
+        <value xml:lang="it">Assegnazione veloce soggetto</value>
         <value xml:lang="th">กำหนดรหัสกลุ่มผู้ใช้อย่างรวดเร็ว</value>
         <value xml:lang="zh">快速分配会员</value>
     </property>
+    <property key="ProjectMgrRateTypeId">
+        <value xml:lang="en">Rate Type Id</value>
+        <value xml:lang="fr">Réf. du type de taux</value>
+        <value xml:lang="it">Tipo percentuale</value>
+        <value xml:lang="zh">计算方式Id</value>
+    </property>
     <property key="ProjectMgrRates">
         <value xml:lang="de">Raten</value>
         <value xml:lang="en">Rates</value>
@@ -753,92 +955,6 @@
         <value xml:lang="th">อัตรา</value>
         <value xml:lang="zh">计算方式</value>
     </property>
-    <property key="ProjectMgrRateTypeId">
-        <value xml:lang="en">Rate Type Id</value>
-        <value xml:lang="fr">Réf. du type de taux</value>
-        <value xml:lang="zh">计算方式Id</value>
-    </property>
-    <property key="ProjectMgrSun">
-        <value xml:lang="en">Sun</value>
-        <value xml:lang="fr">dim</value>
-        <value xml:lang="zh">周日</value>
-    </property>
-    <property key="ProjectMgrMon">
-        <value xml:lang="en">Mon</value>
-        <value xml:lang="fr">lun</value>
-        <value xml:lang="zh">周一</value>
-    </property>
-    <property key="ProjectMgrTue">
-        <value xml:lang="en">Tue</value>
-        <value xml:lang="fr">mar</value>
-        <value xml:lang="zh">周二</value>
-    </property>
-    <property key="ProjectMgrWen">
-        <value xml:lang="en">Wen</value>
-        <value xml:lang="fr">mer</value>
-        <value xml:lang="zh">周三</value>
-    </property>
-    <property key="ProjectMgrThu">
-        <value xml:lang="en">Thu</value>
-        <value xml:lang="fr">jeu</value>
-        <value xml:lang="zh">周四</value>
-    </property>
-    <property key="ProjectMgrFri">
-        <value xml:lang="en">Fri</value>
-        <value xml:lang="fr">ven</value>
-        <value xml:lang="zh">周五</value>
-    </property>
-    <property key="ProjectMgrSat">
-        <value xml:lang="en">Sat</value>
-        <value xml:lang="fr">sam</value>
-        <value xml:lang="zh">周六</value>
-    </property>
-    <property key="ProjectMgrActualTotal">
-        <value xml:lang="en">Act Total</value>
-        <value xml:lang="fr">Total réel</value>
-        <value xml:lang="zh">实际总时间</value>
-    </property>
-    <property key="ProjectMgrErrorRequestNotFound">
-        <value xml:lang="en">Customer Request: ${parameters.custRequestId} not found</value>
-        <value xml:lang="fr">Demande client : ${parameters.custRequestId} non trouvée</value>
-    </property>
-    <property key="ProjectMgrErrorRequestStatusWrong">
-        <value xml:lang="en">Customer Request: ${parameters.custRequestId} has the wrong status, should be 'Accepted' but it is ${status.description}</value>
-        <value xml:lang="fr">Demande client : ${parameters.custRequestId} a un statut erroné, devrait être 'Accepté' mais est ${status.description}</value>
-    </property>
-    <property key="ProjectMgrErrorTaskNotFound">
-        <value xml:lang="en">Task: ${parameters.workEffortId} not found</value>
-        <value xml:lang="fr">Tâche : ${parameters.workEffortId} non trouvée</value>
-    </property>
-    <property key="ProjectMgrErrorTaskStatusWrong">
-        <value xml:lang="en">Task: ${parameters.workEffortId} is not in progress, no request can be added</value>
-        <value xml:lang="fr">Tâche : ${parameters.workEffortId} n'est pas en cours, aucune demande ne peut être ajoutée</value>
-    </property>
-    <property key="ProjectMgrPlanHours">
-        <value xml:lang="en">Plan Hours</value>
-        <value xml:lang="fr">Heures planifiées</value>
-        <value xml:lang="zh">计划时间</value>
-    </property>
-    <property key="ProjectMgrWeekNumber">
-        <value xml:lang="en">Week Number</value>
-        <value xml:lang="fr">N° de semaine</value>
-        <value xml:lang="zh">周数</value>
-    </property>
-    <property key="ProjectMgrWeek">
-        <value xml:lang="en">Week</value>
-        <value xml:lang="fr">Semaine</value>
-        <value xml:lang="zh">周</value>
-    </property>
-    <property key="ProjectMgrSelectedDate">
-        <value xml:lang="en">Select Date</value>
-        <value xml:lang="fr">Choisir la date</value>
-        <value xml:lang="zh">选择日期</value>
-    </property>
-    <property key="ProjectMgrRowSubmit">
-        <value xml:lang="en">Row Submit</value>
-        <value xml:lang="fr">Soumettre la ligne</value>
-        <value xml:lang="zh">选择提交行</value>
-    </property>
     <property key="ProjectMgrRelease">
         <value xml:lang="en">Release</value>
         <value xml:lang="fr">Version</value>
@@ -849,14 +965,14 @@
     <property key="ProjectMgrRequestWorkEffortList">
         <value xml:lang="en">Cust Request WorkEffort List</value>
         <value xml:lang="fr">List des demandes de tâches client</value>
-        <value xml:lang="it">Lista Impegno di Lavoro Richiesta</value>
+        <value xml:lang="it">Lista impegno di lavoro richiesta</value>
         <value xml:lang="th">รายการงานตามคำร้องของลูกค้า</value>
         <value xml:lang="zh">用户请求工作任务列表</value>
     </property>
     <property key="ProjectMgrResourceName">
         <value xml:lang="en">Resource Name</value>
         <value xml:lang="fr">Nom de ressource</value>
-        <value xml:lang="it">Nome Risorsa</value>
+        <value xml:lang="it">Nome risorsa</value>
         <value xml:lang="th">ชื่อแหล่งที่มา</value>
         <value xml:lang="zh">资源名称</value>
     </property>
@@ -867,10 +983,27 @@
         <value xml:lang="th">แหล่งที่มา</value>
         <value xml:lang="zh">资源</value>
     </property>
+    <property key="ProjectMgrReviewedCustomerRequestTaskList">
+        <value xml:lang="en">Reviewed but not completed Customer Request list with task assigned'</value>
+        <value xml:lang="fr">Liste des demandes client vérifiée mais incomplète et ayant une tâche affectée</value>
+        <value xml:lang="it">Verificato ma non completato, lista richiesta cliente con il compito assegnato</value>
+    </property>
+    <property key="ProjectMgrRowSubmit">
+        <value xml:lang="en">Row Submit</value>
+        <value xml:lang="fr">Soumettre la ligne</value>
+        <value xml:lang="it">Invia riga</value>
+        <value xml:lang="zh">选择提交行</value>
+    </property>
+    <property key="ProjectMgrSat">
+        <value xml:lang="en">Sat</value>
+        <value xml:lang="fr">sam</value>
+        <value xml:lang="it">Sab</value>
+        <value xml:lang="zh">周六</value>
+    </property>
     <property key="ProjectMgrSaveAsTemplate">
         <value xml:lang="en">Save As Template</value>
         <value xml:lang="fr">Nom de ressource</value>
-        <value xml:lang="it">Salva Come Template</value>
+        <value xml:lang="it">Salva come template</value>
         <value xml:lang="th">บันทึกเทมเพลต</value>
         <value xml:lang="zh">存为模板</value>
     </property>
@@ -881,6 +1014,18 @@
         <value xml:lang="th">ตารางเวลา</value>
         <value xml:lang="zh">进度表</value>
     </property>
+    <property key="ProjectMgrSelectedDate">
+        <value xml:lang="en">Select Date</value>
+        <value xml:lang="fr">Choisir la date</value>
+        <value xml:lang="it">Seleziona data</value>
+        <value xml:lang="zh">选择日期</value>
+    </property>
+    <property key="ProjectMgrSetComplete">
+        <value xml:lang="en">Complete</value>
+        <value xml:lang="fr">Achevé</value>
+        <value xml:lang="it">Completa</value>
+        <value xml:lang="th">เสร็จสมบูรณ์</value>
+    </property>
     <property key="ProjectMgrSetOnHold">
         <value xml:lang="en">On-Hold</value>
         <value xml:lang="fr">En attente</value>
@@ -888,29 +1033,24 @@
         <value xml:lang="th">หยุดไว้ชั่วคราว</value>
         <value xml:lang="zh">暂停</value>
     </property>
-    <property key="ProjectMgrSetComplete">
-        <value xml:lang="en">Complete</value>
-        <value xml:lang="fr">Achevé</value>
-        <value xml:lang="th">เสร็จสมบูรณ์</value>
-    </property>
     <property key="ProjectMgrSkillStandards">
         <value xml:lang="en">Skill Standards</value>
         <value xml:lang="fr">Compétences standards</value>
-        <value xml:lang="it">Abilità Standard</value>
+        <value xml:lang="it">Abilità standard</value>
         <value xml:lang="th">ชั่วโมงที่วางแผน</value>
         <value xml:lang="zh">已计划工时</value>
     </property>
     <property key="ProjectMgrSkillType">
         <value xml:lang="en">Skill Type</value>
         <value xml:lang="fr">Compétences</value>
-        <value xml:lang="it">Tipo Abilità</value>
+        <value xml:lang="it">Tipo abilità</value>
         <value xml:lang="th">ประเภททักษะ</value>
         <value xml:lang="zh">技能类别</value>
     </property>
     <property key="ProjectMgrStatusCannotUpdate">
         <value xml:lang="en">Status does not allow an update</value>
         <value xml:lang="fr">CE status ne permet pas une mise à jour</value>
-        <value xml:lang="it">Stato non permette un aggiornamento</value>
+        <value xml:lang="it">Stato non permette un'aggiornamento</value>
         <value xml:lang="th">สถานะยังไม่อนุญาตให้อัพเดท</value>
         <value xml:lang="zh">状态不允许更新</value>
     </property>
@@ -924,56 +1064,67 @@
     <property key="ProjectMgrSubProjectDetails">
         <value xml:lang="en">Enter the SubProject Details below</value>
         <value xml:lang="fr">Saisissez les détails du sous-projet ci-dessous</value>
-        <value xml:lang="it">Inserire i Dettagli del Sotto-Progetto qui sotto</value>
+        <value xml:lang="it">Inserire i dettagli del sotto-progetto qui sotto</value>
         <value xml:lang="th">เข้าสู่รายละเอียดโปรเจคย่อยข้างล่าง</value>
         <value xml:lang="zh">在下面输入子项目的明细</value>
     </property>
     <property key="ProjectMgrSubProjectList">
         <value xml:lang="en">List of SubProjects</value>
         <value xml:lang="fr">Listes des sous-projets</value>
-        <value xml:lang="it">Lista dei Sotto-Progetti</value>
+        <value xml:lang="it">Lista dei sotto-progetti</value>
         <value xml:lang="th">รายการของโปรเจคย่อย</value>
         <value xml:lang="zh">子项目列表</value>
     </property>
     <property key="ProjectMgrSubProjectName">
         <value xml:lang="en">Sub Project Name</value>
         <value xml:lang="fr">Nom du sous-projet</value>
-        <value xml:lang="it">Nome Sotto-Progetto</value>
+        <value xml:lang="it">Nome sotto-progetto</value>
         <value xml:lang="th">ชื่อโปรเจคย่อย</value>
         <value xml:lang="zh">子项目名称</value>
     </property>
     <property key="ProjectMgrSubProjects">
         <value xml:lang="en">Sub Projects</value>
         <value xml:lang="fr">Sous-projets</value>
-        <value xml:lang="it">Sotto-Progetti</value>
+        <value xml:lang="it">Sotto-progetti</value>
         <value xml:lang="th">โปรเจคย่อย</value>
         <value xml:lang="zh">子项目</value>
     </property>
     <property key="ProjectMgrSubTaskName">
         <value xml:lang="en">Sub Task Name</value>
         <value xml:lang="fr">Nom de la sous-tâche</value>
-        <value xml:lang="it">Nome Sotto-Compito</value>
+        <value xml:lang="it">Nome sotto-compito</value>
         <value xml:lang="th">ชื่องานย่อย</value>
         <value xml:lang="zh">子任务名称</value>
     </property>
     <property key="ProjectMgrSubTasks">
         <value xml:lang="en">Sub Tasks</value>
         <value xml:lang="fr">Sous-tâches</value>
-        <value xml:lang="it">Sotto-Compito</value>
+        <value xml:lang="it">Sotto-compito</value>
         <value xml:lang="th">งานย่อย</value>
         <value xml:lang="zh">子任务</value>
     </property>
+    <property key="ProjectMgrSun">
+        <value xml:lang="en">Sun</value>
+        <value xml:lang="fr">dim</value>
+        <value xml:lang="it">Dom</value>
+        <value xml:lang="zh">周日</value>
+    </property>
+    <property key="ProjectMgrTaskContentList">
+        <value xml:lang="en">Task Content List</value>
+        <value xml:lang="fr">Liste des contenus de la tâche</value>
+        <value xml:lang="it">Lista contenuti compito</value>
+    </property>
     <property key="ProjectMgrTaskCurrent">
         <value xml:lang="en">Current Task</value>
         <value xml:lang="fr">Tâche courante</value>
-        <value xml:lang="it">Compito Attuale</value>
+        <value xml:lang="it">Compito attuale</value>
         <value xml:lang="th">งานที่ใช้กันอยู่ในปัจจุบัน</value>
         <value xml:lang="zh">当前任务</value>
     </property>
     <property key="ProjectMgrTaskDetails">
         <value xml:lang="en">Enter the Task Details below</value>
         <value xml:lang="fr">Saisissez les détails de la tâche ci-dessous</value>
-        <value xml:lang="it">Inserire i Dettagli Compito qui sotto</value>
+        <value xml:lang="it">Inserire i dettagli compito qui sotto</value>
         <value xml:lang="th">เข้าสู่รายละเอียดงานข้างล่าง</value>
         <value xml:lang="zh">在下面输入任务明细</value>
     </property>
@@ -987,7 +1138,7 @@
     <property key="ProjectMgrTaskList">
         <value xml:lang="en">List of Project Tasks</value>
         <value xml:lang="fr">Liste des tâches du projet</value>
-        <value xml:lang="it">Lista dei Compiti Progetto</value>
+        <value xml:lang="it">Lista dei compiti progetto</value>
         <value xml:lang="th">รายการงานของโปรเจค</value>
         <value xml:lang="zh">项目任务列表</value>
     </property>
@@ -1001,14 +1152,14 @@
     <property key="ProjectMgrTaskName">
         <value xml:lang="en">Task Name</value>
         <value xml:lang="fr">Nom de la tâche</value>
-        <value xml:lang="it">Nome Compito</value>
+        <value xml:lang="it">Nome compito</value>
         <value xml:lang="th">ชื่องาน</value>
         <value xml:lang="zh">任务名称</value>
     </property>
     <property key="ProjectMgrTaskNoNotes">
         <value xml:lang="en">No Notes for this Task</value>
         <value xml:lang="fr">Aucune note pour cette tâche</value>
-        <value xml:lang="it">Nessuna Nota per questo Compito</value>
+        <value xml:lang="it">Nessuna nota per questo compito</value>
         <value xml:lang="th">ไม่มีข้อความสำหรับงานนี้</value>
         <value xml:lang="zh">该任务无注释</value>
     </property>
@@ -1029,27 +1180,28 @@
     <property key="ProjectMgrTaskNotAssignedPhase">
         <value xml:lang="en">Task not assigned to Phase/Iteration</value>
         <value xml:lang="fr">Tâche non affectée à une phase/itération</value>
-        <value xml:lang="it">Compito non assegnato alla Fase/Iterazione</value>
+        <value xml:lang="it">Compito non assegnato alla fase/iterazione</value>
         <value xml:lang="th">ไม่กำหนดงานถึงขั้นตอนการทำงาน/การทำซ้ำ</value>
         <value xml:lang="zh">孤立的任务</value>
     </property>
     <property key="ProjectMgrTaskPhase">
         <value xml:lang="en">Parent Phase</value>
         <value xml:lang="fr">Phase parente</value>
-        <value xml:lang="it">Fase Padre</value>
+        <value xml:lang="it">Fase padre</value>
         <value xml:lang="th">กลุ่มขั้นตอนการทำงาน</value>
         <value xml:lang="zh">父阶段</value>
     </property>
     <property key="ProjectMgrTaskSummary">
         <value xml:lang="en">Task Summary</value>
         <value xml:lang="fr">Résumé de la tâche</value>
-        <value xml:lang="it">Sommario Compito</value>
+        <value xml:lang="it">Sommario compito</value>
         <value xml:lang="th">สรุปงาน</value>
         <value xml:lang="zh">任务总览</value>
     </property>
     <property key="ProjectMgrTaskTeam">
         <value xml:lang="en">Task Team</value>
         <value xml:lang="fr">Equipe de la tâche</value>
+        <value xml:lang="it">Team compito</value>
         <value xml:lang="th">ทีมงาน</value>
         <value xml:lang="zh">任务团队</value>
     </property>
@@ -1060,41 +1212,59 @@
         <value xml:lang="th">งาน</value>
         <value xml:lang="zh">任务</value>
     </property>
+    <property key="ProjectMgrThu">
+        <value xml:lang="en">Thu</value>
+        <value xml:lang="fr">jeu</value>
+        <value xml:lang="it">Gio</value>
+        <value xml:lang="zh">周四</value>
+    </property>
     <property key="ProjectMgrTimeEntries">
         <value xml:lang="en">Time Entries</value>
         <value xml:lang="fr">Echéances</value>
-        <value xml:lang="it">Aggiungere/Aggiornare Voce Orario</value>
+        <value xml:lang="it">Aggiungere/Aggiornare voce orario</value>
         <value xml:lang="th">ชั่วโมงจริง</value>
         <value xml:lang="zh">实际工时</value>
     </property>
     <property key="ProjectMgrToComplete">
         <value xml:lang="en">To complete</value>
         <value xml:lang="fr">Changer pour 'terminé'</value>
-        <value xml:lang="it">Per Trovare il Progetto Inserire Intervallo</value>
+        <value xml:lang="it">Per completare</value>
         <value xml:lang="th">ค้นหาโปรเจคแสดงขอบเขต</value>
         <value xml:lang="zh">查找项目的范围</value>
     </property>
     <property key="ProjectMgrToFindProject">
         <value xml:lang="en">To Find Project Give Range</value>
         <value xml:lang="fr">Pour trouver le projet donner un intervalle</value>
-        <value xml:lang="it">Per Trovare il Progetto Inserire Intervallo</value>
+        <value xml:lang="it">Per trovare il progetto inserire intervallo</value>
         <value xml:lang="th">ค้นหาโปรเจคแสดงขอบเขต</value>
         <value xml:lang="zh">查找项目的范围</value>
     </property>
     <property key="ProjectMgrToFindTask">
         <value xml:lang="en">To Find Task Give Range</value>
         <value xml:lang="fr">Pour trouver la tâche donner un intervalle</value>
-        <value xml:lang="it">Per Trovare il Compito Inserire Intervallo</value>
+        <value xml:lang="it">Per trovare il compito inserire intervallo</value>
         <value xml:lang="th">ค้นหางานแสดงขอบเขต</value>
         <value xml:lang="zh">查找任务的范围</value>
     </property>
     <property key="ProjectMgrTreeDetails">
         <value xml:lang="en">Tree Details</value>
         <value xml:lang="fr">Détails de l'arborescence</value>
-        <value xml:lang="it">Dettagli Albero</value>
+        <value xml:lang="it">Dettagli albero</value>
         <value xml:lang="th">รายละเอียดแผนผังแบบต้นไม้</value>
         <value xml:lang="zh">树明细</value>
     </property>
+    <property key="ProjectMgrTue">
+        <value xml:lang="en">Tue</value>
+        <value xml:lang="fr">mar</value>
+        <value xml:lang="it">Mar</value>
+        <value xml:lang="zh">周二</value>
+    </property>
+    <property key="ProjectMgrUnbilledHours">
+        <value xml:lang="en">Unbilled hours</value>
+        <value xml:lang="fr">Heures non facturées</value>
+        <value xml:lang="it">Ore non fatturate</value>
+        <value xml:lang="zh">没记账工时</value>
+    </property>
     <property key="ProjectMgrView">
         <value xml:lang="en">View</value>
         <value xml:lang="fr">Voir</value>
@@ -1109,11 +1279,29 @@
         <value xml:lang="th">คุณต้องการการอนุญาตอย่างน้อยที่สุด PROJECTMGR_READ ในการแสดงหน้าจอนี้</value>
         <value xml:lang="zh">你至少需要有PROJECTMGR_READ权限才能查看本页</value>
     </property>
+    <property key="ProjectMgrWeek">
+        <value xml:lang="en">Week</value>
+        <value xml:lang="fr">Semaine</value>
+        <value xml:lang="it">Settimana</value>
+        <value xml:lang="zh">周</value>
+    </property>
+    <property key="ProjectMgrWeekNumber">
+        <value xml:lang="en">Week Number</value>
+        <value xml:lang="fr">N° de semaine</value>
+        <value xml:lang="it">Settimana numero</value>
+        <value xml:lang="zh">周数</value>
+    </property>
+    <property key="ProjectMgrWen">
+        <value xml:lang="en">Wen</value>
+        <value xml:lang="fr">mer</value>
+        <value xml:lang="it">Mer</value>
+        <value xml:lang="zh">周三</value>
+    </property>
     <property key="ProjectMgrWorkEffortActualCompletionDate">
         <value xml:lang="de">Tatsächliches Erledigungsdatum</value>
         <value xml:lang="en">Actual Completion Date</value>
         <value xml:lang="fr">Date de fin réelle</value>
-        <value xml:lang="it">Data Fine Attuale</value>
+        <value xml:lang="it">Data fine attuale</value>
         <value xml:lang="th">วันที่ทำเสร็จจริง</value>
         <value xml:lang="zh">实际完成日期</value>
     </property>
@@ -1121,7 +1309,7 @@
         <value xml:lang="de">Zuordnungsart</value>
         <value xml:lang="en">Association Type</value>
         <value xml:lang="fr">Type d'association</value>
-        <value xml:lang="it">Tipo Associazione</value>
+        <value xml:lang="it">Tipo associazione</value>
         <value xml:lang="th">ประเภทกลุ่ม</value>
         <value xml:lang="zh">相关类型</value>
     </property>
@@ -1129,7 +1317,7 @@
         <value xml:lang="de">Soll-Enddatum</value>
         <value xml:lang="en">Estimated Completion Date</value>
         <value xml:lang="fr">Date de fin prévue</value>
-        <value xml:lang="it">Data Fine Stimata</value>
+        <value xml:lang="it">Data fine stimata</value>
         <value xml:lang="th">วันที่เสร็จโดยประมาณ</value>
         <value xml:lang="zh">估计完成日期</value>
     </property>
@@ -1137,27 +1325,27 @@
         <value xml:lang="de">Soll-Anfangsdatum</value>
         <value xml:lang="en">Estimated Start Date</value>
         <value xml:lang="fr">Date de début prévue</value>
-        <value xml:lang="it">Data Inizio Stimata</value>
+        <value xml:lang="it">Data inizio stimata</value>
         <value xml:lang="th">วันที่เริ่มโดยประมาณ</value>
         <value xml:lang="zh">估计开始日期</value>
     </property>
     <property key="ProjectMgrWorkEffortId">
         <value xml:lang="en">Id</value>
         <value xml:lang="fr">Réf.</value>
-        <value xml:lang="it">Codice</value>
+        <value xml:lang="it">Impegno di lavoro</value>
         <value xml:lang="zh">Id</value>
     </property>
     <property key="ProjectMgrWorkEffortIdFrom">
         <value xml:lang="en">Id From</value>
         <value xml:lang="fr">Réf. depuis</value>
-        <value xml:lang="it">Codice Da</value>
+        <value xml:lang="it">Impegno di lavoro da</value>
         <value xml:lang="th">จากรหัส</value>
         <value xml:lang="zh">Id来至</value>
     </property>
     <property key="ProjectMgrWorkEffortIdTo">
         <value xml:lang="en">Id To</value>
         <value xml:lang="fr">Réf. vers</value>
-        <value xml:lang="it">Codice A</value>
+        <value xml:lang="it">Impegno di lavoro a</value>
         <value xml:lang="th">ถึงรหัส</value>
         <value xml:lang="zh">Id到</value>
     </property>
@@ -1165,7 +1353,7 @@
         <value xml:lang="de">Gebrauchsart</value>
         <value xml:lang="en">Purpose Type</value>
         <value xml:lang="fr">Type de but</value>
-        <value xml:lang="it">Tipo Funzione</value>
+        <value xml:lang="it">Tipo scopo</value>
         <value xml:lang="th">ประเภทเป้าหมาย</value>
         <value xml:lang="zh">目标类型</value>
     </property>
@@ -1184,150 +1372,4 @@
         <value xml:lang="th">ประเภท</value>
         <value xml:lang="zh">类型</value>
     </property>
-    <property key="ProjectMgrCheckComplete">
-        <value xml:lang="en">Check Complete</value>
-        <value xml:lang="fr">Marquée comme terminé</value>
-        <value xml:lang="zh">是否完成</value>
-    </property>
-    <property key="ReviewedCustomerRequestTaskList">
-        <value xml:lang="en">Reviewed but not completed Customer Request list with task assigned'</value>
-        <value xml:lang="fr">Liste des demandes client vérifiée mais incomplète et ayant une tâche affectée</value>
-    </property>
-    <property key="FormFieldTitle_newTimesheetId">
-        <value xml:lang="en">New Timesheet Id</value>
-        <value xml:lang="fr">Réf. de nouvelle feuille d'activité</value>
-        <value xml:lang="zh">新的时间表Id</value>
-    </property>
-    <property key="FormFieldTitle_actualHours">
-        <value xml:lang="en">Actual Hours</value>
-        <value xml:lang="fr">Heures réelles</value>
-        <value xml:lang="zh">实际工时</value>
-    </property>
-    <property key="FormFieldTitle_plannedHours">
-        <value xml:lang="en">Planned Hours</value>
-        <value xml:lang="fr">Heures planifiées</value>
-        <value xml:lang="zh">计划工时</value>
-    </property>
-    <property key="FormFieldTitle_relatedTasks">
-        <value xml:lang="en">Related Tasks</value>
-        <value xml:lang="fr">Tâches associées</value>
-        <value xml:lang="zh">相关任务</value>
-    </property>
-    <property key="FormFieldTitle_complete">
-        <value xml:lang="en">Complete</value>
-        <value xml:lang="fr">Terminé</value>
-        <value xml:lang="zh">完成</value>
-    </property>
-    <property key="ProjectMgrAddTimeEntry">
-        <value xml:lang="en">Add Time Entry</value>
-        <value xml:lang="fr">Ajouter une échéance</value>
-        <value xml:lang="it">Aggiungi Voce Tempo</value>
-        <value xml:lang="th">เพิ่มตารางเวลา</value>
-        <value xml:lang="zh">增加时间条目</value>
-    </property>
-    <property key="ProjectMgrPrivateOrPublic">
-        <value xml:lang="en">Private/Public</value>
-        <value xml:lang="fr">Privé/Public</value>
-        <value xml:lang="zh">私人/公开</value>
-    </property>
-    <property key="FormFieldTitle_templateId">
-        <value xml:lang="en">Template Id</value>
-        <value xml:lang="fr">Réf. de modèle</value>
-        <value xml:lang="zh">模板Id</value>
-    </property>
-    <property key="FormFieldTitle_parentProjectName">
-        <value xml:lang="en">Parent Project Name</value>
-        <value xml:lang="fr">Nom du projet parent</value>
-        <value xml:lang="zh">父项目名称</value>
-    </property>
-    <property key="ProjectMgrCustRequestCategoryId">
-        <value xml:lang="en">Cust Request Category Id</value>
-        <value xml:lang="fr">Réf. de catégorie de demande client</value>
-        <value xml:lang="zh">请求分类Id</value>
-    </property>
-    <property key="FormFieldTitle_openDateTime">
-        <value xml:lang="de">Öffnungsdatum &amp; -uhrzeit</value>
-        <value xml:lang="en">Open Date Time</value>
-        <value xml:lang="fr">Date/heure ouverte</value>
-        <value xml:lang="zh">开启日期</value>
-    </property>
-    <property key="FormFieldTitle_internalComment">
-        <value xml:lang="de">Interner Vermerk</value>
-        <value xml:lang="en">Internal Comment</value>
-        <value xml:lang="fr">Commentaire interne</value>
-        <value xml:lang="zh">内部评论</value>
-    </property>
-    <property key="FormFieldTitle_closedDateTime">
-        <value xml:lang="de">Schließungsdatum &amp; -uhrzeit</value>
-        <value xml:lang="en">Closed Date Time</value>
-        <value xml:lang="fr">Date/heure fermée</value>
-        <value xml:lang="zh">关闭日期</value>
-    </property>
-    <property key="FormFieldTitle_phase">
-        <value xml:lang="en">Phase</value>
-        <value xml:lang="fr">Phase</value>
-        <value xml:lang="zh">项目阶段</value>
-    </property>
-    <property key="FormFieldTitle_startDate">
-        <value xml:lang="en">Start Date</value>
-        <value xml:lang="fr">Date de début</value>
-        <value xml:lang="zh">开始日期</value>
-    </property>
-    <property key="FormFieldTitle_completionDate">
-        <value xml:lang="en">Completion Date</value>
-        <value xml:lang="fr">Date d'achèvement</value>
-        <value xml:lang="zh">完成日期</value>
-    </property>
-    <property key="FormFieldTitle_task">
-        <value xml:lang="en">Task</value>
-        <value xml:lang="fr">Tâche</value>
-        <value xml:lang="zh">任务</value>
-    </property>
-    <property key="FormFieldTitle_phaseName">
-        <value xml:lang="en">Phase Name</value>
-        <value xml:lang="fr">Nom de phase</value>
-        <value xml:lang="zh">阶段名称</value>
-    </property>
-    <property key="FormFieldTitle_createdStamp">
-        <value xml:lang="en">Created Stamp</value>
-        <value xml:lang="fr">Estampille créée</value>
-        <value xml:lang="zh">创建时间</value>
-    </property>
-    <property key="FormFieldTitle_projectName">
-        <value xml:lang="en">Project Name</value>
-        <value xml:lang="fr">Nom de projet</value>
-        <value xml:lang="zh">项目名称</value>
-    </property>
-    <property key="FormFieldTitle_taskName">
-        <value xml:lang="en">Task Name</value>
-        <value xml:lang="fr">Nom de tâche</value>
-        <value xml:lang="zh">任务名称</value>
-    </property>
-    <property key="ProjectMgrUnbilledHours">
-        <value xml:lang="en">Unbilled hours</value>
-        <value xml:lang="fr">Heures non facturées</value>
-        <value xml:lang="zh">没记账工时</value>
-    </property>
-    <property key="cannotCancelledRequest">
-        <value xml:lang="en">Can not cancel request, the request is already being implemented.</value>
-        <value xml:lang="fr">Impossible d'annuler cette demande, elle est déjà implémentée</value>
-    </property>
-    <property key="ProjectMgrContentList">
-        <value xml:lang="en">Project Content List</value>
-        <value xml:lang="fr">Liste des contenus du projet</value>
-    </property>
-    <property key="TaskContentList">
-        <value xml:lang="en">Task Content List</value>
-        <value xml:lang="fr">Liste des contenus de la tâche</value>
-    </property>
-    <property key="PageTitleAddProjectContent">
-        <value xml:lang="en">Add Project Content</value>
-        <value xml:lang="fr">Ajouter un contenu au projet</value>
-        <value xml:lang="th">เพิ่มหัวข้อโปรเจ็ค</value>
-    </property>
-    <property key="PageTitleAddTaskContent">
-        <value xml:lang="en">Add Task Content</value>
-        <value xml:lang="fr">Ajouter un contenu à la tâche</value>
-        <value xml:lang="th">เพิ่มหัวข้องาน </value>
-    </property>
 </resource>
Index: specialpurpose/myportal/templates/appheader.ftl
===================================================================
--- specialpurpose/myportal/templates/appheader.ftl	(revision 735109)
+++ specialpurpose/myportal/templates/appheader.ftl	(working copy)
@@ -19,7 +19,7 @@
 
 <#assign selected = headerItem?default("void")>
 <div id="app-navigation">
-  <h2>${uiLabelMap.TitlePageMyportal} ${partyNameView.personalTitle?if_exists} ${partyNameView.firstName?if_exists} ${partyNameView.middleName?if_exists} ${partyNameView.lastName?if_exists} ${partyNameView.groupName?if_exists}</h2>
+  <h2>${uiLabelMap.PageTitleMyPortal} ${partyNameView.personalTitle?if_exists} ${partyNameView.firstName?if_exists} ${partyNameView.middleName?if_exists} ${partyNameView.lastName?if_exists} ${partyNameView.groupName?if_exists}</h2>
   <ul>
     <#if portalPages?has_content>
       <#list portalPages as page>
Index: specialpurpose/mypage/widget/MyPageForms.xml
===================================================================
--- specialpurpose/mypage/widget/MyPageForms.xml	(revision 735109)
+++ specialpurpose/mypage/widget/MyPageForms.xml	(working copy)
@@ -30,7 +30,7 @@
         <field name="roleTypeId" parameter-name="newRoleTypeId" title="${uiLabelMap.PartyRole}"><hidden value="${roleTypeId}"/></field>
         <field name="remove" title="${uiLabelMap.CommonRemove}"><hyperlink target="updateTaskAssigment?workEffortId=${workEffortId}&amp;partyId=${partyId}&amp;roleTypeId=${roleTypeId}&amp;fromDate=${fromDate}&amp;statusId=PAS_ENDED&amp;donePage=${parameters.donePage}" description="${uiLabelMap.CommonRemove}"/></field>
         <!-- better set to complete on the timesheet -->
-        <!-- field name="toComplete" title="${uiLabelMap.CommonStatustoComplete}"><hyperlink target="updateTaskAssigment?workEffortId=${workEffortId}&amp;partyId=${partyId}&amp;roleTypeId=${roleTypeId}&amp;fromDate=${fromDate}&amp;statusId=PAS_COMPLETED&amp;donePage=${parameters.donePage}" description="${uiLabelMap.CommonStatustoComplete}"/></field-->
+        <!-- field name="toComplete" title="${uiLabelMap.MyPageToComplete}"><hyperlink target="updateTaskAssigment?workEffortId=${workEffortId}&amp;partyId=${partyId}&amp;roleTypeId=${roleTypeId}&amp;fromDate=${fromDate}&amp;statusId=PAS_COMPLETED&amp;donePage=${parameters.donePage}" description="${uiLabelMap.MyPageToComplete}"/></field-->
     </form>
     
     <form name="EditWeekTimesheet" extends="EditWeekTimesheet" extends-resource="component://projectmgr/widget/forms/TimeSheetForms.xml">
@@ -54,8 +54,8 @@
         <field name="workEffortId"><hidden/></field>
         <field name="workEffortName" title="${uiLabelMap.WorkEffortEventName}"><display/></field>
         <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
-        <field name="actualStartDate" title="Date"><display type="date"/></field>
-        <field name="delete"><submit button-type="text-link"/></field>
+        <field name="actualStartDate" title="${uiLabelMap.MyPageTaskActStartDate}"><display type="date"/></field>
+        <field name="delete" title="${uiLabelMap.FormFieldTitle_deleteButton}"><submit button-type="text-link"/></field>
     </form>
     
     <form name="newEvent" type="single" target="createEvent">
@@ -64,17 +64,17 @@
         <field name="currentStatusId"><hidden value="_NA_"/></field>
         <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="actualStartDate" title="${uiLabelMap.MyPageTaskActStartDate}"><date-time type="date"/></field>
         <field name="add"><submit/></field>
     </form>
 
     <form name="preferences" type="single" target="updatePreferences" default-map-name="preferences.userPrefMap">
         <field name="userPrefGroupTypeId"><hidden value="MyPage"/></field>
-        <field name="myCommunications"><check/></field>
-        <field name="otherCommunications"><check/></field>
-        <field name="myCompanyComms"><check/></field>
-        <field name="myTasks"><check/></field>
-        <field name="myTimesheet"><check/></field>
+        <field name="myCommunications" title="${uiLabelMap.MyPageCommunications}"><check/></field>
+        <field name="otherCommunications" title="${uiLabelMap.MyPageOtherCommunications}"><check/></field>
+        <field name="myCompanyComms" title="${uiLabelMap.MyPageCompanyComms}"><check/></field>
+        <field name="myTasks" title="${uiLabelMap.MyPageTasks}"><check/></field>
+        <field name="myTimesheet" title="${uiLabelMap.MyPageTimeSheets}"><check/></field>
         <field name="updateButton"><submit/></field>
     </form>
     
@@ -98,7 +98,7 @@
         </field>
         <field name="statusId" entry-name="roleStatusId" widget-style="buttontext" widget-area-style="fieldWidth300">
             <display-entity entity-name="StatusItem" description="${description}">
-                <sub-hyperlink description="${uiLabelMap.${toComplete}}" target="setCommunicationEventRoleStatus?communicationEventId=${communicationEventId}&amp;partyId=${partyId}&amp;roleTypeId=${roleTypeId}&amp;statusId=COM_ROLE_COMPLETED&amp;donePage=${parameters.donePage}&amp;VIEW_SIZE=${parameters.VIEWSIZE}&amp;VIEW_INDEX=${parameters.VIEW_INDEX}"/>
+                <sub-hyperlink description="${uiLabelMap.MyPageToComplete}" target="setCommunicationEventRoleStatus?communicationEventId=${communicationEventId}&amp;partyId=${partyId}&amp;roleTypeId=${roleTypeId}&amp;statusId=COM_ROLE_COMPLETED&amp;donePage=${parameters.donePage}&amp;VIEW_SIZE=${parameters.VIEWSIZE}&amp;VIEW_INDEX=${parameters.VIEW_INDEX}"/>
             </display-entity>
         </field>
         <field name="createdStamp" entry-name="entryDate"/>
@@ -145,11 +145,11 @@
             </drop-down>
         </field>
         <field name="updateButton" widget-style="smallSubmit"><submit /></field>
-        <field name="currentStatusId" map-name="taskResult.taskInfo" title="${uiLabelMap.TaskStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
-        <field name="estimatedStartDate" map-name="taskResult.taskInfo" title="${uiLabelMap.TaskPlanStartDate}"><display type="date"/></field>
-        <field name="estimatedCompletionDate" map-name="taskResult.taskInfo" title="${uiLabelMap.TaskPlanEndDate}"><display type="date"/></field>
-        <field name="actualStartDate" map-name="taskResult.taskInfo" title="${uiLabelMap.TaskActStartDate}"><display type="date"/></field>
-        <field name="actualCompletionDate" map-name="taskResult.taskInfo" title="${uiLabelMap.TaskActEndDate}"><display type="date"/></field>
+        <field name="currentStatusId" map-name="taskResult.taskInfo" title="${uiLabelMap.MyPageTaskStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
+        <field name="estimatedStartDate" map-name="taskResult.taskInfo" title="${uiLabelMap.MyPageTaskPlanStartDate}"><display type="date"/></field>
+        <field name="estimatedCompletionDate" map-name="taskResult.taskInfo" title="${uiLabelMap.MyPageTaskPlanEndDate}"><display type="date"/></field>
+        <field name="actualStartDate" map-name="taskResult.taskInfo" title="${uiLabelMap.MyPageTaskActStartDate}"><display type="date"/></field>
+        <field name="actualCompletionDate" map-name="taskResult.taskInfo" title="${uiLabelMap.MyPageTaskActEndDate}"><display type="date"/></field>
         <field name="plannedHours" map-name="taskResult.taskInfo"><display/></field>
         <field name="actualHours" map-name="taskResult.taskInfo"><display/></field>
     </form>
Index: specialpurpose/myportal/widget/CommonScreens.xml
===================================================================
--- specialpurpose/myportal/widget/CommonScreens.xml	(revision 735109)
+++ specialpurpose/myportal/widget/CommonScreens.xml	(working copy)
@@ -25,6 +25,7 @@
             <actions>
                 <!-- base/top/specific map first, then more common map added for shared labels --> 
                 <property-map resource="MyPortalUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="MyPageUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/>
@@ -53,7 +54,7 @@
                 <entity-one entity-name="PartyNameView" value-name="partyNameView">
                     <field-map field-name="partyId" env-name="userLogin.partyId"/>
                 </entity-one>
-                <set field="applicationTitle" value="${uiLabelMap.TitlePageMyportalForNoLogin}"/>
+                <set field="applicationTitle" value="${uiLabelMap.PageTitleMyPortalForNoLogin}"/>
             </actions>
             <widgets>
                 <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
@@ -140,29 +141,29 @@
         </section>
     </screen>
 
-	<screen name="main">
-	    <section>
-	        <actions>
-	            <set field="parameters.portalPageId" value="MYPORTAL"/>
-	            <script location="component://common/webcommon/WEB-INF/actions/includes/ShowPortalPage.groovy"/>
-	            <set field="headerItem" from-field="parameters.portalPageId"/>
-	            <!--My Profile From Party-->
-	            <set field="titleProperty" value="PageTitleViewPartyProfile"/>
-	            <set field="tabButtonItem" value="viewprofile"/>
-	            <set field="labelTitleProperty" value="PartyTaxAuthInfos"/>
-	            <set field="parameters.partyId" from-field="userLogin.userLoginId"/>
-	            <script location="component://party/webapp/partymgr/WEB-INF/actions/party/ViewProfile.groovy"/>
-	            <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetUserLoginPrimaryEmail.groovy"/>
-	        </actions>
-	        <widgets>
-	            <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
-	                <decorator-section name="body">
-	                    <platform-specific><html><html-template location="component://common/webcommon/portal/showPortalPage.ftl"/></html></platform-specific>
-	                </decorator-section>
-	            </decorator-screen>
-	        </widgets>
-	    </section>
-	</screen>                 
+    <screen name="main">
+        <section>
+            <actions>
+                <set field="parameters.portalPageId" value="MYPORTAL"/>
+                <script location="component://common/webcommon/WEB-INF/actions/includes/ShowPortalPage.groovy"/>
+                <set field="headerItem" from-field="parameters.portalPageId"/>
+                <!--My Profile From Party-->
+                <set field="titleProperty" value="PageTitleViewPartyProfile"/>
+                <set field="tabButtonItem" value="viewprofile"/>
+                <set field="labelTitleProperty" value="PartyTaxAuthInfos"/>
+                <set field="parameters.partyId" from-field="userLogin.userLoginId"/>
+                <script location="component://party/webapp/partymgr/WEB-INF/actions/party/ViewProfile.groovy"/>
+                <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetUserLoginPrimaryEmail.groovy"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <platform-specific><html><html-template location="component://common/webcommon/portal/showPortalPage.ftl"/></html></platform-specific>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>                 
 
     <screen name="CommonRequestDecorator">
         <section>
Index: specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml
===================================================================
--- specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml	(revision 735109)
+++ specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml	(working copy)
@@ -112,7 +112,7 @@
                 </entity-options>
             </drop-down>
         </field>
-        <field name="productId" title="Part Id*" required-field="true"><lookup target-form-name="LookupPartsProduct"/></field>
+        <field name="productId" title="${uiLabelMap.AssetMaintPartId}*" required-field="true"><lookup target-form-name="LookupPartsProduct"/></field>
         <field name="quantity" position="1" title="${uiLabelMap.CommonQuantity}*"><text size="10"/></field>
         <field name="maintHistSeqId"><hidden/></field>
         <field name="fixedAssetId"><hidden/></field>
@@ -121,7 +121,7 @@
 
     <form name="ListItemIssuance"  title="PageTitleFixedAssetMaintItemIssuance" type="list"  list-name="itemIssuanceList" 
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
-        <field name="productId" title="Part Id"><display/></field>
+        <field name="productId" title="${uiLabelMap.AssetMaintPartId}"><display/></field>
         <field name="quantity" position="1" title="${uiLabelMap.CommonQuantity}"><display/></field>
         <field name="productName" position="1" title="${uiLabelMap.CommonName}"><display/></field>
         <field name="comments" position="1" title="${uiLabelMap.CommonComments}"><display/></field>
Index: applications/party/config/PartyUiLabels.xml
===================================================================
--- applications/party/config/PartyUiLabels.xml	(revision 735109)
+++ applications/party/config/PartyUiLabels.xml	(working copy)
@@ -297,10 +297,6 @@
         <value xml:lang="ru">Существующий заказчик</value>
         <value xml:lang="th">ลูกค้าที่มีอยู่</value>
     </property>
-    <property key="FormFieldTitle_externalId">
-        <value xml:lang="en">External Id</value>
-        <value xml:lang="it">Codice esterno</value>
-    </property>
     <property key="FormFieldTitle_firstName">
         <value xml:lang="de">Vorname</value>
         <value xml:lang="en">First Name</value>
@@ -6524,7 +6520,7 @@
         <value xml:lang="it">Codice soggetto</value>
         <value xml:lang="nl">Relatie-ID</value>
         <value xml:lang="pt">ID do Participante</value>
-	<value xml:lang="pt_PT">ID da Secção</value>
+        <value xml:lang="pt_PT">ID da Secção</value>
         <value xml:lang="ro">Cod Subiect</value>
         <value xml:lang="ru">Код участника</value>
         <value xml:lang="th">รหัสกลุ่มผู้ใช้</value>
Index: specialpurpose/pos/src/org/ofbiz/pos/event/PaymentEvents.java
===================================================================
--- specialpurpose/pos/src/org/ofbiz/pos/event/PaymentEvents.java	(revision 735109)
+++ specialpurpose/pos/src/org/ofbiz/pos/event/PaymentEvents.java	(working copy)
@@ -67,7 +67,7 @@
         } else if (paymentCheck == PosTransaction.EXTERNAL_PAYMENT) {
             if (ckInfo == null) {
                 input.setFunction("CHECK");
-                pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"REFNUM",Locale.getDefault()));
+                pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"PosRefNum",Locale.getDefault()));
                 return;
             } else {
                 processExternalPayment(pos, "PERSONAL_CHECK", ckInfo[1]);
@@ -92,7 +92,7 @@
         } else if (paymentCheck == PosTransaction.EXTERNAL_PAYMENT) {
             if (gcInfo == null) {
                 input.setFunction("GIFTCARD");
-                pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"REFNUM",Locale.getDefault()));
+                pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"PosRefNum",Locale.getDefault()));
                 clearInputPaymentFunctions(pos);
                 return;
             } else {
@@ -124,7 +124,7 @@
         } else if (paymentCheck == PosTransaction.EXTERNAL_PAYMENT) {
             if (crtInfo == null) {
                 input.setFunction("CREDIT");
-                pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"REFNUM",Locale.getDefault()));
+                pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"PosRefNum",Locale.getDefault()));
                 return;
             } else {
                 processExternalPayment(pos, "CREDIT_CARD", crtInfo[1]);
@@ -138,7 +138,7 @@
             input.clearLastFunction();
             input.setFunction("TOTAL");
             input.setFunction("CREDIT");
-            pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"CREDNO",Locale.getDefault()));
+            pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"PosCredNo",Locale.getDefault()));
         } else {
             Debug.log("Credit Func Info : " + crtInfo[1], module);
             if (msrInfo == null && (creditExpirationInfo == null))  {
@@ -147,7 +147,7 @@
                     input.clearLastFunction();
                     input.setFunction("CREDIT");
                     input.setFunction("CREDITEXP");
-                    pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"CREDEX",Locale.getDefault()));
+                    pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"PosCredex",Locale.getDefault()));
                 } else {
                     Debug.log("Invalid card number - " + input.value(), module);
                     clearInputPaymentFunctions(pos);
@@ -161,7 +161,7 @@
                     input.clearLastFunction();
                     input.setFunction("CREDITEXP");
                     input.setFunction("SECURITYCODE");
-                    pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"SECURITYCODE",Locale.getDefault()));
+                    pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"PosSecurityCode",Locale.getDefault()));
                 } else {
                     Debug.log("Invalid expiration date", module);
                     clearInputPaymentFunctions(pos);
@@ -176,7 +176,7 @@
                     input.clearLastFunction();
                     input.setFunction("SECURITYCODE");
                     input.setFunction("POSTALCODE");
-                    pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"POSTALCODE",Locale.getDefault()));
+                    pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"PosPostalCodePosProcessing",Locale.getDefault()));
                 } else {
                     clearInputPaymentFunctions(pos);
                     input.clearInput();
@@ -244,12 +244,12 @@
                         pos.refresh();
                         break;
                     case 1: // card number only found
-                        pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"CREDEX",Locale.getDefault()));
+                        pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"PosCredex",Locale.getDefault()));
                         break;
                     default:
                         Debug.log("Hit the default switch case [" + allInfo + "] refreshing.", module);
                         input.clearFunction("MSRINFO");
-                        pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"CREDNO",Locale.getDefault()));
+                        pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"PosCredNo",Locale.getDefault()));
                         break;
                 }
             }
@@ -277,7 +277,7 @@
         Input input = pos.getInput();
         String refNum = input.value();
         if (refNum == null) {
-            pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"REFNUM",Locale.getDefault()));
+            pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"PosRefNum",Locale.getDefault()));
             return;
         }
         input.clearInput();
@@ -330,7 +330,7 @@
         if (UtilValidate.isNotEmpty(idx) && UtilValidate.isEmpty(sku)) {
             String refNum = pos.getInput().value();
             if (UtilValidate.isEmpty(refNum)) {
-                pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"REFNUM",Locale.getDefault()));
+                pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"PosRefNum",Locale.getDefault()));
                 pos.getInput().setFunction("REFNUM");
             } else {
                 int index = -1;
@@ -352,7 +352,7 @@
     public static synchronized void processSale(PosScreen pos) {
         pos.setWaitCursor();
         PosTransaction trans = PosTransaction.getCurrentTx(pos.getSession());
-        PosScreen.currentScreen.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"Processing",Locale.getDefault()));
+        PosScreen.currentScreen.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"PosProcessing",Locale.getDefault()));
 
         if (trans.isEmpty()) {
             PosScreen newPos = pos.showPage("pospanel");
Index: specialpurpose/projectmgr/widget/Menus.xml
===================================================================
--- specialpurpose/projectmgr/widget/Menus.xml	(revision 735109)
+++ specialpurpose/projectmgr/widget/Menus.xml	(working copy)
@@ -86,7 +86,7 @@
             </condition>
             <link target="projectView?projectId=${projectId}"/>
         </menu-item>
-        <menu-item name="editproject" title="${uiLabelMap.ProjectMgrEditPoject}">
+        <menu-item name="editproject" title="${uiLabelMap.ProjectMgrEditProject}">
             <condition>
                 <and>
                     <if-compare field-name="hasUpdatePermission" operator="equals" value="true"/>
@@ -376,7 +376,7 @@
             </condition>
             <link target="setTaskStatus?workEffortId=${workEffortId}&amp;currentStatusId=PTS_CANCELLED"/>
         </menu-item>
-        <menu-item name="custRequestContent" title="Content">
+        <menu-item name="custRequestContent" title="${uiLabelMap.CommonContent}">
             <link target="EditCustRequestContent?custRequestId=${custRequest.custRequestId}"/>
         </menu-item>
     </menu>
Index: specialpurpose/pos/config/PosUiLabels.xml
===================================================================
--- specialpurpose/pos/config/PosUiLabels.xml	(revision 735109)
+++ specialpurpose/pos/config/PosUiLabels.xml	(working copy)
@@ -17,24 +17,9 @@
     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="(ItemDiscount)">
-        <value xml:lang="en">(Item discount)</value>
-        <value xml:lang="es">(Item discount)</value>
-        <value xml:lang="fr">Remise sur l'article</value>
-        <value xml:lang="it">(Item discount)</value>
-        <value xml:lang="ro">(Item discount)</value>
-        <value xml:lang="zh">(Item discount)</value>
-    </property>
-    <property key="(SalesDiscount)">
-        <value xml:lang="en">(Sale discount)</value>
-        <value xml:lang="es">(Sales discount)</value>
-        <value xml:lang="fr">Remise sur la vente</value>
-        <value xml:lang="it">(Sales discount)</value>
-        <value xml:lang="ro">(Sales discount)</value>
-        <value xml:lang="zh">(Sales discount)</value>
-    </property>
-    <property key="(adjustment)">
+-->
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <property key="PosAdjustment">
         <value xml:lang="en">(adjustment)</value>
         <value xml:lang="es">(adjustment)</value>
         <value xml:lang="fr">(ajustement)</value>
@@ -42,7 +27,7 @@
         <value xml:lang="ro">(adjustment)</value>
         <value xml:lang="zh">(adjustment)</value>
     </property>
-    <property key="AMT">
+    <property key="PosAmt">
         <value xml:lang="en">AMT</value>
         <value xml:lang="es">Precio</value>
         <value xml:lang="fr">Prix</value>
@@ -50,7 +35,7 @@
         <value xml:lang="ro">IMP</value>
         <value xml:lang="zh">金额</value>
     </property>
-    <property key="AUTHCD">
+    <property key="PosAuthCd">
         <value xml:lang="en">Enter Auth Code:</value>
         <value xml:lang="es">Ingrese el código secreto :</value>
         <value xml:lang="fr">Entrez le code secret :</value>
@@ -58,7 +43,7 @@
         <value xml:lang="ro">Introduceti Codul de Autorizatie:</value>
         <value xml:lang="zh">输入授权码:</value>
     </property>
-    <property key="CASH">
+    <property key="PosCash">
         <value xml:lang="en">CASH</value>
         <value xml:lang="es">CONTADO</value>
         <value xml:lang="fr">Espèces</value>
@@ -66,7 +51,7 @@
         <value xml:lang="ro">Numerar</value>
         <value xml:lang="zh">现金</value>
     </property>
-    <property key="CHANGE">
+    <property key="PosChange">
         <value xml:lang="en">Change Due:</value>
         <value xml:lang="es">Cambio :</value>
         <value xml:lang="fr">A rendre :</value>
@@ -74,7 +59,7 @@
         <value xml:lang="ro">Schimb Valutar:</value>
         <value xml:lang="zh">找零:</value>
     </property>
-    <property key="CHECK">
+    <property key="PosCheck">
         <value xml:lang="en">CHECK</value>
         <value xml:lang="es">CHEQUE</value>
         <value xml:lang="fr">Chèque(s)</value>
@@ -82,7 +67,41 @@
         <value xml:lang="ro">CEC</value>
         <value xml:lang="zh">支票</value>
     </property>
-    <property key="CREDCF">
+    <property key="PosClerk">
+        <value xml:lang="en">Clerk:</value>
+        <value xml:lang="es">Empleado</value>
+        <value xml:lang="fr">Vendeur :</value>
+        <value xml:lang="it">Impieg.:</value>
+        <value xml:lang="ro">Ang:</value>
+        <value xml:lang="zh">收银员:</value>
+    </property>
+    <property key="PosConfigureItem">
+        <value xml:lang="en">Item Configuration</value>
+        <value xml:lang="fr">Configuration de l'article</value>
+        <value xml:lang="it">Riga configurazione</value>
+    </property>
+    <property key="PosCreateOrChooseReasonInOut">
+        <value xml:lang="en">You have to create or choose a reason</value>
+        <value xml:lang="fr">Vous devez créer ou choisir le motif de ce mouvement de caisse</value>
+        <value xml:lang="it">Tu devi creare o scegliere una motivazione</value>
+    </property>
+    <property key="PosCredNo">
+        <value xml:lang="en">Enter Card Number:</value>
+        <value xml:lang="es">Ingrese número de tarjeta :</value>
+        <value xml:lang="fr">Entrez le n° de la carte :</value>
+        <value xml:lang="it">Inserire Numero Carta:</value>
+        <value xml:lang="ro">Introduceti Numarul Cartii:</value>
+        <value xml:lang="zh">输入卡号:</value>
+    </property>
+    <property key="PosCredZp">
+        <value xml:lang="en">Enter Billing ZipCode:</value>
+        <value xml:lang="es">Ingrese código postal de facturación</value>
+        <value xml:lang="fr">Entrez le code postal de facturation :</value>
+        <value xml:lang="it">Inserire C.A.P. Fatturazione:</value>
+        <value xml:lang="ro">Introduceti zipCod Facturare:</value>
+        <value xml:lang="zh">输入账单邮政编码:</value>
+    </property>
+    <property key="PosCredcf">
         <value xml:lang="en">Enter Last 4 Digits:</value>
         <value xml:lang="es">Ingrese los últimos 4 dígitos</value>
         <value xml:lang="fr">Entrez les 4 derniers chiffres :</value>
@@ -90,7 +109,7 @@
         <value xml:lang="ro">Introduceti ultimale 4 Numere:</value>
         <value xml:lang="zh">输入最后4位卡号:</value>
     </property>
-    <property key="CREDEX">
+    <property key="PosCredex">
         <value xml:lang="en">Enter Expiration Date (MMYY):</value>
         <value xml:lang="es">Ingrese fecha de expiración (MMYY)</value>
         <value xml:lang="fr">Entrez la date d'expiration (MMYY):</value>
@@ -98,7 +117,7 @@
         <value xml:lang="ro">Introduceti Data Expirarii (LLAA):</value>
         <value xml:lang="zh">输入到期日 (MMYY):</value>
     </property>
-    <property key="CREDIT_CARD">
+    <property key="PosCreditCard">
         <value xml:lang="en">CREDIT CARD</value>
         <value xml:lang="es">TARJETA DE CRÉDITO</value>
         <value xml:lang="fr">Carte(s) de crédit</value>
@@ -106,31 +125,7 @@
         <value xml:lang="ro">CARTE DE CREDIT</value>
         <value xml:lang="zh">信用卡</value>
     </property>
-    <property key="CREDNO">
-        <value xml:lang="en">Enter Card Number:</value>
-        <value xml:lang="es">Ingrese número de tarjeta :</value>
-        <value xml:lang="fr">Entrez le n° de la carte :</value>
-        <value xml:lang="it">Inserire Numero Carta:</value>
-        <value xml:lang="ro">Introduceti Numarul Cartii:</value>
-        <value xml:lang="zh">输入卡号:</value>
-    </property>
-    <property key="CREDZP">
-        <value xml:lang="en">Enter Billing ZipCode:</value>
-        <value xml:lang="es">Ingrese código postal de facturación</value>
-        <value xml:lang="fr">Entrez le code postal de facturation :</value>
-        <value xml:lang="it">Inserire C.A.P. Fatturazione:</value>
-        <value xml:lang="ro">Introduceti zipCod Facturare:</value>
-        <value xml:lang="zh">输入账单邮政编码:</value>
-    </property>
-    <property key="ConfigureItem">
-        <value xml:lang="en">Item Configuration</value>
-        <value xml:lang="fr">Configuration de l'article</value>
-    </property>
-    <property key="CreateOrChooseReasonInOut">
-        <value xml:lang="en">You have to create or choose a reason</value>
-        <value xml:lang="fr">Vous devez créer ou choisir le motif de ce mouvement de caisse</value>
-    </property>
-    <property key="DATE">
+    <property key="PosDate">
         <value xml:lang="en">DATE</value>
         <value xml:lang="es">FECHA</value>
         <value xml:lang="fr">Date</value>
@@ -138,15 +133,7 @@
         <value xml:lang="ro">DATA</value>
         <value xml:lang="zh">日期</value>
     </property>
-    <property key="DRWR">
-        <value xml:lang="en">TILL</value>
-        <value xml:lang="es">Caja</value>
-        <value xml:lang="fr">Caisse</value>
-        <value xml:lang="it">CASSIERE</value>
-        <value xml:lang="ro">CASIER</value>
-        <value xml:lang="zh">钞箱</value>
-    </property>
-    <property key="DateFormat">
+    <property key="PosDateFormat">
         <value xml:lang="en">EEE MMM dd</value>
         <value xml:lang="es">EEE MMM dd</value>
         <value xml:lang="fr">EE dd MMM</value>
@@ -154,13 +141,30 @@
         <value xml:lang="ro">EEE MMM dd</value>
         <value xml:lang="zh">EEE MMM dd</value>
     </property>
-    <property key="DateTimeFormat">
+    <property key="PosDateTimeFormat">
         <value xml:lang="en">'the' yyyy MMMMM dd 'at'  hh:mm:ss aaa</value>
         <value xml:lang="es">'the' yyyy MMMMM dd 'at'  hh:mm:ss aaa</value>
         <value xml:lang="fr">'le' dd MMMMM yyyy 'à'  HH:mm:ss</value>
+        <value xml:lang="it">'il' yyyy MMMMM dd 'alle'  hh:mm:ss aaa</value>
         <value xml:lang="ro">yyyy MMMMM dd 'la' hh:mm:ss aaa </value>
     </property>
-    <property key="EMPL">
+    <property key="PosDraw">
+        <value xml:lang="en">Dr:</value>
+        <value xml:lang="es">Dr.</value>
+        <value xml:lang="fr">Tiroir :</value>
+        <value xml:lang="it">Cass.:</value>
+        <value xml:lang="ro">Cas:</value>
+        <value xml:lang="zh">钞箱:</value>
+    </property>
+    <property key="PosDrwr">
+        <value xml:lang="en">TILL</value>
+        <value xml:lang="es">Caja</value>
+        <value xml:lang="fr">Caisse</value>
+        <value xml:lang="it">CASSIERE</value>
+        <value xml:lang="ro">CASIER</value>
+        <value xml:lang="zh">钞箱</value>
+    </property>
+    <property key="PosEmpl">
         <value xml:lang="en">EMPL</value>
         <value xml:lang="es">VENDEDOR</value>
         <value xml:lang="fr">Vendeur</value>
@@ -168,7 +172,7 @@
         <value xml:lang="ro">Angajat</value>
         <value xml:lang="zh">收银员</value>
     </property>
-    <property key="ENTCAS">
+    <property key="PosEntCas">
         <value xml:lang="en">Enter Cash Amount:</value>
         <value xml:lang="es">Ingrese monto en efectivo</value>
         <value xml:lang="fr">Entrez le montant en espèce :</value>
@@ -176,7 +180,7 @@
         <value xml:lang="ro">Introduceti Valoare Numerar:</value>
         <value xml:lang="zh">输入现金额:</value>
     </property>
-    <property key="ENTCHK">
+    <property key="PosEntChk">
         <value xml:lang="en">Enter Check Amount:</value>
         <value xml:lang="es">Ingrese monto en cheque</value>
         <value xml:lang="fr">Entrez le montant en chèque :</value>
@@ -184,7 +188,7 @@
         <value xml:lang="ro">Introduceti Valoare  CEC:</value>
         <value xml:lang="zh">输入支票额:</value>
     </property>
-    <property key="ENTCRC">
+    <property key="PosEntCrc">
         <value xml:lang="en">Enter Credit Card Amount:</value>
         <value xml:lang="es">Ingrese monto en tarjeta de crédito</value>
         <value xml:lang="fr">Entrez le montant en carte de crédit :</value>
@@ -192,7 +196,7 @@
         <value xml:lang="ro">Introduceti Valoare Carte de Credit:</value>
         <value xml:lang="zh">输入信用卡额:</value>
     </property>
-    <property key="ENTGFC">
+    <property key="PosEntGfc">
         <value xml:lang="en">Enter Gift Card Amount:</value>
         <value xml:lang="es">Ingrese monto de certificado de regalo: </value>
         <value xml:lang="fr">Entrez le montant en bon d'achat :</value>
@@ -200,7 +204,7 @@
         <value xml:lang="ro">Introduceti Valoare Carte Omagiu:</value>
         <value xml:lang="zh">输入礼品卡额:</value>
     </property>
-    <property key="ENTOTH">
+    <property key="PosEntOth">
         <value xml:lang="en">Enter Other Payment Amount:</value>
         <value xml:lang="es">Ingrese monto de otros pagos</value>
         <value xml:lang="fr">Entrez le mt en autre moyen de paiement :</value>
@@ -208,10 +212,11 @@
         <value xml:lang="ro">Introduceti Valoare Alte Plati:</value>
         <value xml:lang="zh">输入其他付款额:</value>
     </property>
-    <property key="ENTPROMOCODE">
+    <property key="PosEntPromoCode">
         <value xml:lang="en">Enter Promo Code:</value>
+        <value xml:lang="it">Inserire codice promozione:</value>
     </property>
-    <property key="GIFT_CARD">
+    <property key="PosGiftCard">
         <value xml:lang="en">GIFT CARD</value>
         <value xml:lang="es">Certificado de regalo</value>
         <value xml:lang="fr">Bon(s) d'achat</value>
@@ -219,7 +224,15 @@
         <value xml:lang="ro">CARTE OMAGIU</value>
         <value xml:lang="zh">礼品卡</value>
     </property>
-    <property key="GROSS_SALES">
+    <property key="PosGrandTotal">
+        <value xml:lang="en">Grand Total</value>
+        <value xml:lang="es">Gran total</value>
+        <value xml:lang="fr">Total</value>
+        <value xml:lang="it">Totale Generale</value>
+        <value xml:lang="ro">Total General</value>
+        <value xml:lang="zh">总计</value>
+    </property>
+    <property key="PosGrossSales">
         <value xml:lang="en">GROSS SALES</value>
         <value xml:lang="es">Total</value>
         <value xml:lang="fr">Total</value>
@@ -227,15 +240,15 @@
         <value xml:lang="ro">Valoare BRUTA-VANZARE</value>
         <value xml:lang="zh">毛销售额</value>
     </property>
-    <property key="Grand_Total">
-        <value xml:lang="en">Grand Total</value>
-        <value xml:lang="es">Gran total</value>
-        <value xml:lang="fr">Total</value>
-        <value xml:lang="it">Totale Generale</value>
-        <value xml:lang="ro">Total General</value>
-        <value xml:lang="zh">总计</value>
+    <property key="PosInvalidSelection">
+        <value xml:lang="en">Invalid Selection!</value>
+        <value xml:lang="es">Selección inválida</value>
+        <value xml:lang="fr">Sélection non valide !</value>
+        <value xml:lang="it">Selezione Non Valida!</value>
+        <value xml:lang="ro">Selectare InValida!</value>
+        <value xml:lang="zh">非法选项!</value>
     </property>
-    <property key="ISCLOSED">
+    <property key="PosIsClosed">
         <value xml:lang="en">Register Is Closed</value>
         <value xml:lang="es">El registro está cerrado</value>
         <value xml:lang="fr">Le registre est fermé.</value>
@@ -243,7 +256,7 @@
         <value xml:lang="ro">Registru de Casa este Inchis</value>
         <value xml:lang="zh">提示牌已关闭</value>
     </property>
-    <property key="ISOPEN">
+    <property key="PosIsOpen">
         <value xml:lang="en">Register Is Open</value>
         <value xml:lang="es">El registro está abierto</value>
         <value xml:lang="fr">Le registre est ouvert.</value>
@@ -251,7 +264,15 @@
         <value xml:lang="ro">Registru de Casa este Deschis</value>
         <value xml:lang="zh">提示牌已打开</value>
     </property>
-    <property key="ITEM">
+    <property key="PosItemDiscount">
+        <value xml:lang="en">(Item discount)</value>
+        <value xml:lang="es">(Item discount)</value>
+        <value xml:lang="fr">Remise sur l'article</value>
+        <value xml:lang="it">(Item discount)</value>
+        <value xml:lang="ro">(Item discount)</value>
+        <value xml:lang="zh">(Item discount)</value>
+    </property>
+    <property key="PosItem">
         <value xml:lang="en">ITEM</value>
         <value xml:lang="es">ITEM</value>
         <value xml:lang="fr">Désignation</value>
@@ -259,24 +280,18 @@
         <value xml:lang="ro">PRODUS</value>
         <value xml:lang="zh">项</value>
     </property>
-    <property key="Invalid_Selection">
-        <value xml:lang="en">Invalid Selection!</value>
-        <value xml:lang="es">Selección inválida</value>
-        <value xml:lang="fr">Sélection non valide !</value>
-        <value xml:lang="it">Selezione Non Valida!</value>
-        <value xml:lang="ro">Selectare InValida!</value>
-        <value xml:lang="zh">非法选项!</value>
-    </property>
-    <property key="LoadASale">
+    <property key="PosLoadASale">
         <value xml:lang="en">Load a sale</value>
         <value xml:lang="fr">Charger une vente</value>
+        <value xml:lang="it">Carica una vendita</value>
     </property>
-    <property key="LoadSaleListDblClickTip">
+    <property key="PosLoadSaleListDblClickTip">
         <value xml:lang="en">You may use a double click to replace the current sale and delete this one</value>
         <value xml:lang="fr">Vous pouvez utiliser le double-clic pour remplacer la vente en cours et supprimer celle ci</value>
+        <value xml:lang="it">Tu devi usare un doppio click per sostituire l'attuale vendita and cancellarla</value>
         <value xml:lang="ro">Poti folosi dublu click  pentru a rescrie vanzarea cruenta si pentru a o sterge.</value>
     </property>
-    <property key="OPDRAM">
+    <property key="PosOpDrAm">
         <value xml:lang="en">Starting Drawer Amount:</value>
         <value xml:lang="es">Monto inicial de la caja:</value>
         <value xml:lang="fr">Contenu initial du tiroir :</value>
@@ -284,7 +299,7 @@
         <value xml:lang="ro">Valoare Initiala Casierie:</value>
         <value xml:lang="zh">开始钞箱金额:</value>
     </property>
-    <property key="OTHER">
+    <property key="PosOther">
         <value xml:lang="en">OTHER</value>
         <value xml:lang="es">OTROS</value>
         <value xml:lang="fr">Autres</value>
@@ -292,7 +307,17 @@
         <value xml:lang="ro">ALTE</value>
         <value xml:lang="zh">其他</value>
     </property>
-    <property key="PAYFIN">
+    <property key="PosPaidInTitle">
+        <value xml:lang="en">Enter amount to paid in and create or choose a reason</value>
+        <value xml:lang="fr">Entrez le montant à remettre en caisse et créez ou choisissez un motif</value>
+        <value xml:lang="it">Inserire importo da pagare in ingresso e creare o scegliere una motivazione</value>
+    </property>
+    <property key="PosPaidOutTitle">
+        <value xml:lang="en">Enter amount to withdraw and create or choose a reason</value>
+        <value xml:lang="fr">Entrez le montant à retirer et créez ou choisissez un motif</value>
+        <value xml:lang="it">Inserire un'importo da prelevare e crea o scegliere una motivazione</value>
+    </property>
+    <property key="PosPayFin">
         <value xml:lang="en">Press Finish To Complete Sale</value>
         <value xml:lang="es">Presione FINISH para completar la venta</value>
         <value xml:lang="fr">Appuyez sur [Fin] pour terminer la vente !</value>
@@ -300,19 +325,12 @@
         <value xml:lang="ro">Apasa Terminare(FINISH) Pentru a Completa Vanzarea</value>
         <value xml:lang="zh">按完成键结束销售</value>
     </property>
-    <property key="POSTALCODE">
+    <property key="PosPostalCode">
         <value xml:lang="en">Enter the billing postal code:</value>
         <value xml:lang="fr">Entrez le code postal :</value>
+        <value xml:lang="it">Inserire il codice postale di fatturazione:</value>
     </property>
-    <property key="PaidInTitle">
-        <value xml:lang="en">Enter amount to paid in and create or choose a reason</value>
-        <value xml:lang="fr">Entrez le montant à remettre en caisse et créez ou choisissez un motif</value>
-    </property>
-    <property key="PaidOutTitle">
-        <value xml:lang="en">Enter amount to withdraw and create or choose a reason</value>
-        <value xml:lang="fr">Entrez le montant à retirer et créez ou choisissez un motif</value>
-    </property>
-    <property key="Processing">
+    <property key="PosProcessing">
         <value xml:lang="en">Processing payments...</value>
         <value xml:lang="es">Procesando pagos...</value>
         <value xml:lang="fr">Traitement du paiement...</value>
@@ -320,7 +338,7 @@
         <value xml:lang="ro">Executie plati...</value>
         <value xml:lang="zh">处理支付...</value>
     </property>
-    <property key="QTY">
+    <property key="PosQty">
         <value xml:lang="en">QTY</value>
         <value xml:lang="es">Cantidad</value>
         <value xml:lang="fr">Nb</value>
@@ -328,7 +346,7 @@
         <value xml:lang="ro">CANT</value>
         <value xml:lang="zh">件数</value>
     </property>
-    <property key="REFNUM">
+    <property key="PosRefNum">
         <value xml:lang="en">Enter Reference Number:</value>
         <value xml:lang="es">Ingrese número  de referencia</value>
         <value xml:lang="fr">Entrez la référence (nombre) :</value>
@@ -336,19 +354,15 @@
         <value xml:lang="ro">Introduceti Numar de Referinta:</value>
         <value xml:lang="zh">输入流水号:</value>
     </property>
-    <property key="SECURITYCODE">
-        <value xml:lang="en">Enter security code:</value>
-        <value xml:lang="fr">Entrez votre code :</value>
+    <property key="PosSalesDiscount">
+        <value xml:lang="en">(Sale discount)</value>
+        <value xml:lang="es">(Sales discount)</value>
+        <value xml:lang="fr">Remise sur la vente</value>
+        <value xml:lang="it">(Sales discount)</value>
+        <value xml:lang="ro">(Sales discount)</value>
+        <value xml:lang="zh">(Sales discount)</value>
     </property>
-    <property key="SKU">
-        <value xml:lang="en">SKU</value>
-        <value xml:lang="es">SKU</value>
-        <value xml:lang="fr">Code</value>
-        <value xml:lang="it">CODICE PRODOTTO</value>
-        <value xml:lang="ro">COD PRODUS</value>
-        <value xml:lang="zh">SKU</value>
-    </property>
-    <property key="Sales_Tax">
+    <property key="PosSalesTax">
         <value xml:lang="en">Sales Tax</value>
         <value xml:lang="es">Impuestos de ventas</value>
         <value xml:lang="fr">TVA</value>
@@ -356,12 +370,13 @@
         <value xml:lang="ro">Taxe de Vanzare</value>
         <value xml:lang="zh">销售税</value>
     </property>
-    <property key="SaveASale">
+    <property key="PosSaveASale">
         <value xml:lang="en">Save current sale</value>
         <value xml:lang="fr">Sauver la vente en cours</value>
+        <value xml:lang="it">Salvare attuale vendita</value>
         <value xml:lang="ro">Salveaza vanzarea curenta</value>
     </property>
-    <property key="Saving">
+    <property key="PosSaving">
         <value xml:lang="en">Saving sale...</value>
         <value xml:lang="es">Usted ahorra....</value>
         <value xml:lang="fr">Enregistrement de la vente...</value>
@@ -369,15 +384,22 @@
         <value xml:lang="ro">Salveaza vanzarea...</value>
         <value xml:lang="zh">保存销售...</value>
     </property>
-    <property key="SelectAProduct">
+    <property key="PosSecurityCode">
+        <value xml:lang="en">Enter security code:</value>
+        <value xml:lang="fr">Entrez votre code :</value>
+        <value xml:lang="it">Inserire codice sicurezza:</value>
+    </property>
+    <property key="PosSelectAProduct">
         <value xml:lang="en">Select a product</value>
         <value xml:lang="fr">Sélectionnez un produit</value>
+        <value xml:lang="it">Selezionare un prodotto</value>
     </property>
-    <property key="SelectProductListDblClickTip">
+    <property key="PosSelectProductListDblClickTip">
         <value xml:lang="en">You may use a double click to select the current product</value>
         <value xml:lang="fr">Vous pouvez utiliser le double-clic pour choisir un produit</value>
+        <value xml:lang="it">Tu devi usare un doppio clieck per selezionare il prodotto corrente</value>
     </property>
-    <property key="Shutting_down">
+    <property key="PosShuttingDown">
         <value xml:lang="en">Shutting down...</value>
         <value xml:lang="es">Cerrando...</value>
         <value xml:lang="fr">Arrêt en cours...</value>
@@ -385,7 +407,23 @@
         <value xml:lang="ro">Inchidere...</value>
         <value xml:lang="zh">关闭...</value>
     </property>
-    <property key="TOTAL">
+    <property key="PosSku">
+        <value xml:lang="en">SKU</value>
+        <value xml:lang="es">SKU</value>
+        <value xml:lang="fr">Code</value>
+        <value xml:lang="it">CODICE PRODOTTO</value>
+        <value xml:lang="ro">COD PRODUS</value>
+        <value xml:lang="zh">SKU</value>
+    </property>
+    <property key="PosTerm">
+        <value xml:lang="en">Term:</value>
+        <value xml:lang="es">Terminal:</value>
+        <value xml:lang="fr">Terminal :</value>
+        <value xml:lang="it">Termine:</value>
+        <value xml:lang="ro">Term:</value>
+        <value xml:lang="zh">终端:</value>
+    </property>
+    <property key="PosTotal">
         <value xml:lang="en">TOTAL</value>
         <value xml:lang="es">Total</value>
         <value xml:lang="fr">Total</value>
@@ -393,7 +431,7 @@
         <value xml:lang="ro">TOTAL</value>
         <value xml:lang="zh">合计</value>
     </property>
-    <property key="TOTALD">
+    <property key="PosTotalD">
         <value xml:lang="en">Total Due:</value>
         <value xml:lang="es">Total debido:</value>
         <value xml:lang="fr">Total dû :</value>
@@ -401,7 +439,15 @@
         <value xml:lang="ro">Total(dovuto)?:</value>
         <value xml:lang="zh">合计额:</value>
     </property>
-    <property key="TXID">
+    <property key="PosTotalReport">
+        <value xml:lang="en">TOTALS REPORT</value>
+        <value xml:lang="es">REPORTE TOTAL:</value>
+        <value xml:lang="fr">TOTAUX</value>
+        <value xml:lang="it">TOTALI STAMPA</value>
+        <value xml:lang="ro">TOTAL REPORT</value>
+        <value xml:lang="zh">合计报表</value>
+    </property>
+    <property key="PosTxId">
         <value xml:lang="en">TXID</value>
         <value xml:lang="es">Número de venta</value>
         <value xml:lang="fr">N°vente</value>
@@ -409,7 +455,7 @@
         <value xml:lang="ro">IDTAX</value>
         <value xml:lang="zh">交易号</value>
     </property>
-    <property key="ULOGIN">
+    <property key="PosULogin">
         <value xml:lang="en">Enter User ID:</value>
         <value xml:lang="es">Ingrese su login:</value>
         <value xml:lang="fr">Entrez votre identifiant :</value>
@@ -417,7 +463,7 @@
         <value xml:lang="ro">Introduceti Id Utilizator:</value>
         <value xml:lang="zh">输入用户 ID:</value>
     </property>
-    <property key="UPASSW">
+    <property key="PosUPassw">
         <value xml:lang="en">Enter Password:</value>
         <value xml:lang="es">Ingrese password</value>
         <value xml:lang="fr">Entrez votre mot de passe :</value>
@@ -425,7 +471,7 @@
         <value xml:lang="ro">Introduceti Parola:</value>
         <value xml:lang="zh">输入口令:</value>
     </property>
-    <property key="UserNotmanager">
+    <property key="PosUserNotManager">
         <value xml:lang="en">User is not a valid manager!</value>
         <value xml:lang="es">El usuario no es administrador válido</value>
         <value xml:lang="fr">Cet utilisateur n'est pas un gérant !</value>
@@ -433,7 +479,7 @@
         <value xml:lang="ro">Utilizatorul nu este un manager valid!</value>
         <value xml:lang="zh">用户非合法管理员!</value>
     </property>
-    <property key="VOID">
+    <property key="PosVoid">
         <value xml:lang="en">Enter Order Number To Void:</value>
         <value xml:lang="es">Ingrese número de orden a anular</value>
         <value xml:lang="fr">Entrez le n° d'ordre à annuler :</value>
@@ -441,7 +487,7 @@
         <value xml:lang="ro">Introduceti Numarul Comenzii de Descarcat:</value>
         <value xml:lang="zh">输入要作废的订单号:</value>
     </property>
-    <property key="Validating">
+    <property key="PosValidating">
         <value xml:lang="en">Validating...</value>
         <value xml:lang="es">Validando...</value>
         <value xml:lang="fr">Validation...</value>
@@ -449,7 +495,7 @@
         <value xml:lang="ro">Validare...</value>
         <value xml:lang="zh">确认...</value>
     </property>
-    <property key="WaitingFinalSales">
+    <property key="PosWaitingFinalSales">
         <value xml:lang="en">Waiting for final sales data transmission...</value>
         <value xml:lang="es">Esperando transmisión de datos...</value>
         <value xml:lang="fr">En attente de transmission de données ...</value>
@@ -457,36 +503,4 @@
         <value xml:lang="ro">Asteptare pentru transmiterea datelor de vanzare finale...</value>
         <value xml:lang="zh">等待最终销售数据传输...</value>
     </property>
-    <property key="clerk">
-        <value xml:lang="en">Clerk:</value>
-        <value xml:lang="es">Empleado</value>
-        <value xml:lang="fr">Vendeur :</value>
-        <value xml:lang="it">Impieg.:</value>
-        <value xml:lang="ro">Ang:</value>
-        <value xml:lang="zh">收银员:</value>
-    </property>
-    <property key="draw">
-        <value xml:lang="en">Dr:</value>
-        <value xml:lang="es">Dr.</value>
-        <value xml:lang="fr">Tiroir :</value>
-        <value xml:lang="it">Cass.:</value>
-        <value xml:lang="ro">Cas:</value>
-        <value xml:lang="zh">钞箱:</value>
-    </property>
-    <property key="term">
-        <value xml:lang="en">Term:</value>
-        <value xml:lang="es">Terminal:</value>
-        <value xml:lang="fr">Terminal :</value>
-        <value xml:lang="it">Termine:</value>
-        <value xml:lang="ro">Term:</value>
-        <value xml:lang="zh">终端:</value>
-    </property>
-    <property key="total_report">
-        <value xml:lang="en">TOTALS REPORT</value>
-        <value xml:lang="es">REPORTE TOTAL:</value>
-        <value xml:lang="fr">TOTAUX</value>
-        <value xml:lang="it">TOTALI STAMPA</value>
-        <value xml:lang="ro">TOTAL REPORT</value>
-        <value xml:lang="zh">合计报表</value>
-    </property>
 </resource>
Index: specialpurpose/projectmgr/widget/TaskScreens.xml
===================================================================
--- specialpurpose/projectmgr/widget/TaskScreens.xml	(revision 735109)
+++ specialpurpose/projectmgr/widget/TaskScreens.xml	(working copy)
@@ -610,7 +610,7 @@
                                 </or>
                             </condition>
                             <widgets>
-                                <screenlet title="${uiLabelMap.TaskContentList}">
+                                <screenlet title="${uiLabelMap.ProjectMgrTaskContentList}">
                                     <container><link target="EditTaskContents?workEffortId=${workEffortId}" text="${uiLabelMap.CommonCreateNew}" style="smallSubmit"/></container>
                                     <include-form name="ListContents" location="component://projectmgr/widget/forms/ProjectForms.xml"/>
                                 </screenlet>
Index: specialpurpose/assetmaint/config/AssetMaintUiLabels.xml.mine
===================================================================
--- specialpurpose/assetmaint/config/AssetMaintUiLabels.xml.mine	(revision 0)
+++ specialpurpose/assetmaint/config/AssetMaintUiLabels.xml.mine	(revision 0)
@@ -0,0 +1,110 @@
+<?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="AssetMaintApplication">
+        <value xml:lang="de">Vermögensverwaltungsanwendung</value>
+        <value xml:lang="en">Asset Maintenance Application</value>
+        <value xml:lang="fr">Application de maintenance des biens</value>
+        <value xml:lang="it">Applicazione gestione cespiti</value>
+        <value xml:lang="th">บำรุงรักษาโปรแกรม</value>
+    </property>
+    <property key="AssetMaintCompanyName">
+        <value xml:lang="en">OFBiz: Asset Maintenance</value>
+        <value xml:lang="fr">OFBiz : maintenance des biens</value>
+        <value xml:lang="it">OFBiz: Gestione cespiti</value>
+        <value xml:lang="th">OFBiz: การบำรุงรักษา</value>
+    </property>
+    <property key="AssetMaintCompanySubtitle">
+        <value xml:lang="en">Maintenance Department</value>
+        <value xml:lang="fr">Service de maintenance</value>
+        <value xml:lang="it">Manutenzione dipartimento</value>
+        <value xml:lang="th">แผนกการดูแลรักษา</value>
+    </property>
+    <property key="AssetMaintItemIssuance">
+        <value xml:lang="en">Parts</value>
+        <value xml:lang="fr">Pièces</value>
+        <value xml:lang="it">Parti</value>
+        <value xml:lang="th">ส่วนหนึ่ง</value>
+    </property>
+    <property key="AssetMaintInvalidPartProductIdError">
+        <value xml:lang="en">"Part Id ${productId} provided is invalid please check and try again"</value>
+        <value xml:lang="fr">"La réf. de piéce ${productId} fournie n'est pas valable, SVP recommencez"</value>
+        <value xml:lang="it">"Codice parte ${productId} fornito non è valido perfavore controllare e provare nuovamente"</value>
+        <value xml:lang="th">รหัสส่วน ${productId} ใช้ไม่ได้ กรุณาตรวจสอบและลองอีกครั้ง</value>
+    </property>
+    <property key="AssetMaintLowPartInventoryError">
+        <value xml:lang="en">"Available Inventory level for ${productId} is ${quantity}"</value>
+        <value xml:lang="fr">"Le niveau de stock disponible pour ${productId} est ${quantity"</value>
+        <value xml:lang="it">"Livello inventario disponibile per ${productId} è ${quantity}"</value>
+        <value xml:lang="th">รดับสินค้าคงเหลือของ ${productId} คือ ${quantity}</value>
+    </property>
+    <property key="AssetMaintParentWorkEffort">
+        <value xml:lang="en">Parent Work Effort</value>
+        <value xml:lang="fr">"Tâche parente"</value>
+        <value xml:lang="it">Impegno di lavoro padre</value>
+    </property>
+    <property key="AssetMaintPartId">
+        <value xml:lang="en">Part Id</value>
+        <value xml:lang="it">Codice parte</value>
+    </property>
+    <property key="AssetMaintProductMaint">
+        <value xml:lang="en">Product Maint</value>
+        <value xml:lang="fr">Maintenance</value>
+        <value xml:lang="it">Manutenzione prodotto</value>
+    </property>
+    <property key="AssetMaintViewPermissionError">
+        <value xml:lang="en">View Permission Error</value>
+        <value xml:lang="fr">Afficher l'erreur d'autorisation</value>
+        <value xml:lang="it">Mostra errore permesso</value>
+        <value xml:lang="th">แสดงข้อผิดพลาดในการอนุญาต</value>
+    </property>
+    <property key="PageTitleAddItemIssuance">
+        <value xml:lang="en">Add Item Issuance</value>
+        <value xml:lang="fr">Ajouter une émission d'article</value>
+        <value xml:lang="it">Aggiungi riga prelievo</value>
+        <value xml:lang="th">เพิ่มรายการที่ออกมา</value>
+    </property>
+    <property key="PageTitleChildWorkEfforts">
+        <value xml:lang="en">Task Breakdown</value>
+        <value xml:lang="fr">Décomposition de tâche</value>
+        <value xml:lang="it">Compito breakdown</value>
+        <value xml:lang="th">งานหยุด</value>
+    </property>
+    <property key="PageTitleFindFixedAssetMaints">
+        <value xml:lang="de">Verwaltungen finden</value>
+        <value xml:lang="en">Find Maintenances</value>
+        <value xml:lang="fr">Chercher des maintenances</value>
+        <value xml:lang="it">Ricerca manutenzioni</value>
+        <value xml:lang="th">ค้นหาการบำรุงรักษา</value>
+    </property>
+    <property key="PageTitleFindFixedAssets">
+        <value xml:lang="en">Find Equipments</value>
+        <value xml:lang="fr">Chercher des équipements</value>
+        <value xml:lang="it">Ricerca cespite</value>
+        <value xml:lang="th">ค้นหาเครื่องมือ</value>
+    </property>
+    <property key="PageTitleListItemIssuance">
+        <value xml:lang="en">Parts List</value>
+        <value xml:lang="fr">Liste des pièces</value>
+        <value xml:lang="it">Lista soggetti</value>
+        <value xml:lang="th">ส่วนหนึ่งของรายการ</value>
+    </property>
+</resource>
Index: specialpurpose/pos/src/org/ofbiz/pos/event/PromoEvents.java
===================================================================
--- specialpurpose/pos/src/org/ofbiz/pos/event/PromoEvents.java	(revision 735109)
+++ specialpurpose/pos/src/org/ofbiz/pos/event/PromoEvents.java	(working copy)
@@ -43,7 +43,7 @@
         if (lastFunc == null || !"PROMOCODE".equals(lastFunc[0])) {
             Output output = pos.getOutput();
             input.setFunction("PROMOCODE");
-            output.print(UtilProperties.getMessage(PosTransaction.resource,"ENTPROMOCODE",Locale.getDefault()));
+            output.print(UtilProperties.getMessage(PosTransaction.resource,"PosEntPromoCode",Locale.getDefault()));
         } else if ("PROMOCODE".equals(lastFunc[0])) {
             String promoCode = input.value();
             if (UtilValidate.isNotEmpty(promoCode)) {
Index: applications/manufacturing/config/ManufacturingReportsUiLabels.xml
===================================================================
--- applications/manufacturing/config/ManufacturingReportsUiLabels.xml	(revision 735109)
+++ applications/manufacturing/config/ManufacturingReportsUiLabels.xml	(working copy)
@@ -55,15 +55,6 @@
         <value xml:lang="th">เป้าหมาย</value>
         <value xml:lang="zh">目的地</value>
     </property>
-    <property key="ManufacturingEstimatedCompletionDate">
-        <value xml:lang="en">Completion Date</value>
-        <value xml:lang="es">Fecha estimada de términación</value>
-        <value xml:lang="fr">Date d'achèvement</value>
-        <value xml:lang="it">Data Completamenteo Stimata</value>
-        <value xml:lang="ro">Data Complet Stimata</value>
-        <value xml:lang="th">วันที่ทำเสร็จ</value>
-        <value xml:lang="zh">完成日期</value>
-    </property>
     <property key="ManufacturingEstimatedShipDate">
         <value xml:lang="en">Completion Date</value>
         <value xml:lang="es">Fecha de Términación</value>
Index: applications/marketing/config/MarketingUiLabels.xml
===================================================================
--- applications/marketing/config/MarketingUiLabels.xml	(revision 735109)
+++ applications/marketing/config/MarketingUiLabels.xml	(working copy)
@@ -55,14 +55,6 @@
         <value xml:lang="en">Expected Revenue</value>
         <value xml:lang="it">Entrate aspettata</value>
     </property>
-    <property key="FormFieldTitle_estimatedCost">
-        <value xml:lang="en">Estimated Cost</value>
-        <value xml:lang="it">Costo stimato</value>
-    </property>
-    <property key="FormFieldTitle_isActive">
-        <value xml:lang="en">Is Active</value>
-        <value xml:lang="it">E' attivo</value>
-    </property>
     <property key="FormFieldTitle_numSent">
         <value xml:lang="en">Num Sent</value>
         <value xml:lang="it">Num. Invio</value>
@@ -75,10 +67,6 @@
         <value xml:lang="th">รหัสหมวดหมู่สินค้า</value>
         <value xml:lang="zh">产品目录标识</value>
     </property>
-    <property key="FormFieldTitle_startDate">
-        <value xml:lang="en">Start Date</value>
-        <value xml:lang="it">Data inizio</value>
-    </property>
     <property key="MarketingCampaign">
         <value xml:lang="en">Marketing Campaign</value>
         <value xml:lang="es">Campañas</value>
@@ -507,24 +495,6 @@
         <value xml:lang="th">รายละเอียด</value>
         <value xml:lang="zh">描述</value>
     </property>
-    <property key="MarketingSegmentGroupGeoAbbr">
-        <value xml:lang="en">Abbreviation</value>
-        <value xml:lang="es">Abreviación</value>
-        <value xml:lang="fr">Abbréviation</value>
-        <value xml:lang="it">Abbreviazione</value>
-        <value xml:lang="ro">Abreviere</value>
-        <value xml:lang="th">ชื่อย่อ</value>
-        <value xml:lang="zh">缩写</value>
-    </property>
-    <property key="MarketingSegmentGroupGeoCode">
-        <value xml:lang="en">Code</value>
-        <value xml:lang="es">Código</value>
-        <value xml:lang="fr">Code</value>
-        <value xml:lang="it">Codice</value>
-        <value xml:lang="ro">Cod</value>
-        <value xml:lang="th">รหัส</value>
-        <value xml:lang="zh">代码</value>
-    </property>
     <property key="MarketingSegmentGroupGeoCreate">
         <value xml:lang="en">Create New Segment Group Geo</value>
         <value xml:lang="es">Nueva ubicación</value>
@@ -534,42 +504,6 @@
         <value xml:lang="th">สร้างส่วนของโครงสร้างกลุ่มใหม่</value>
         <value xml:lang="zh">新建分区组地理</value>
     </property>
-    <property key="MarketingSegmentGroupGeoId">
-        <value xml:lang="en">Geo ID</value>
-        <value xml:lang="es">Código ubicación</value>
-        <value xml:lang="fr">Réf. de zone géographique</value>
-        <value xml:lang="it">Codice Geografia</value>
-        <value xml:lang="ro">Cod Geografie</value>
-        <value xml:lang="th">รหัสโครงสร้าง</value>
-        <value xml:lang="zh">地理标识</value>
-    </property>
-    <property key="MarketingSegmentGroupGeoName">
-        <value xml:lang="en">Name</value>
-        <value xml:lang="es">Nombre</value>
-        <value xml:lang="fr">Nom</value>
-        <value xml:lang="it">Nome</value>
-        <value xml:lang="ro">Nome</value>
-        <value xml:lang="th">ชื่อ</value>
-        <value xml:lang="zh">名称</value>
-    </property>
-    <property key="MarketingSegmentGroupGeoSecCode">
-        <value xml:lang="en">Secondary Code</value>
-        <value xml:lang="es">Código secundario</value>
-        <value xml:lang="fr">Code secondaire</value>
-        <value xml:lang="it">Codice Secondario</value>
-        <value xml:lang="ro">Cod Secundar</value>
-        <value xml:lang="th">รหัสที่สอง</value>
-        <value xml:lang="zh">第二代码</value>
-    </property>
-    <property key="MarketingSegmentGroupGeoTypeId">
-        <value xml:lang="en">Geo Type ID</value>
-        <value xml:lang="es">Tipo de ubicación</value>
-        <value xml:lang="fr">Réf. de type de zone géographique</value>
-        <value xml:lang="it">Tipo Geografia</value>
-        <value xml:lang="ro">Tip Geografie</value>
-        <value xml:lang="th">รหัสประเภทโครงสร้าง</value>
-        <value xml:lang="zh">地理类型标识</value>
-    </property>
     <property key="MarketingSegmentGroupNoSegmentGroupFoundWithId">
         <value xml:lang="en">No SegmentGroup found with ID:</value>
         <value xml:lang="es">No se encontraron segmentos con el ID:</value>
Index: specialpurpose/pos/src/org/ofbiz/pos/screen/ConfigureItem.java
===================================================================
--- specialpurpose/pos/src/org/ofbiz/pos/screen/ConfigureItem.java	(revision 735109)
+++ specialpurpose/pos/src/org/ofbiz/pos/screen/ConfigureItem.java	(working copy)
@@ -83,7 +83,7 @@
         // cache must be set to false because there's no method to remove actionhandlers
         m_dialog = (XDialog) pageMgr.loadPage(
                 m_pos.getScreenLocation() + "/dialog/ConfigureItem", false);
-        m_dialog.setCaption(UtilProperties.getMessage(PosTransaction.resource, "ConfigureItem", Locale.getDefault()));
+        m_dialog.setCaption(UtilProperties.getMessage(PosTransaction.resource, "PosConfigureItem", Locale.getDefault()));
 
         m_optionListPane = (XScrollPane) m_dialog.findComponent("optionListPane");
         m_configList = (XList) m_dialog.findComponent("configList");
Index: specialpurpose/projectmgr/widget/forms/ProjectForms.xml
===================================================================
--- specialpurpose/projectmgr/widget/forms/ProjectForms.xml	(revision 735109)
+++ specialpurpose/projectmgr/widget/forms/ProjectForms.xml	(working copy)
@@ -109,7 +109,7 @@
         <field name="timesheetId"><hyperlink description="${timesheetId}" target="Timesheet?timesheetId=${timesheetId}"/></field>
         <field name="hours"><display/></field>
         <field name="partyId"><display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName}"/></field>
-        <field name="rateTypeId"><display-entity entity-name="RateType" description="${description}"/></field>
+        <field name="rateTypeId" title="${uiLabelMap.ProjectMgrRateTypeId}"><display-entity entity-name="RateType" description="${description}"/></field>
         <field name="fromDate"><display type="date"/></field>
     </form>
     <form name="ListProjects" type="list" list-name="listIt" paginate-target="FindProject"
@@ -173,10 +173,10 @@
         </field>
         <field name="currentStatusId" title="${uiLabelMap.CommonStatus}" parameter-name="dummy"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
         <field name="priority" title="${uiLabelMap.CommonPriority}"><display/></field>
-        <field name="estimatedStartDate" title="${uiLabelMap.WorkEffortEstimatedStartDate}"><display type="date"/></field>
-        <field name="estimatedCompletionDate" title="${uiLabelMap.WorkEffortEstimatedCompletionDate}"><display type="date"/></field>
-        <field name="actualStartDate" title="${uiLabelMap.WorkEffortActualStartDate}"><display type="date"/></field>
-        <field name="actualCompletionDate" title="${uiLabelMap.WorkEffortActualCompletionDate}"><display type="date"/></field>
+        <field name="estimatedStartDate"><display type="date"/></field>
+        <field name="estimatedCompletionDate"><display type="date"/></field>
+        <field name="actualStartDate"><display type="date"/></field>
+        <field name="actualCompletionDate"><display type="date"/></field>
         <field name="plannedHours"><display/></field>
         <field name="actualHours"><display/></field>
         <field name="createdStamp"><display type="date"/></field>
Index: specialpurpose/pos/src/org/ofbiz/pos/component/Journal.java
===================================================================
--- specialpurpose/pos/src/org/ofbiz/pos/component/Journal.java	(revision 735109)
+++ specialpurpose/pos/src/org/ofbiz/pos/component/Journal.java	(working copy)
@@ -44,7 +44,7 @@
     protected XProject currentProject = (XProject)XProjectManager.getCurrentProject();
     
     private static String[] field = { "sku", "desc", "qty", "price" };
-    private static String[] name = { "SKU", "ITEM", "QTY", "AMT" };
+    private static String[] name = { "PosSku", "PosItem", "PosQty", "PosAmt" };
     private static int[] width = { 100, 170, 50, 90};
     private Locale defaultLocale = Locale.getDefault();
 
Index: specialpurpose/assetmaint/config/AssetMaintUiLabels.xml
===================================================================
--- specialpurpose/assetmaint/config/AssetMaintUiLabels.xml	(revision 735109)
+++ specialpurpose/assetmaint/config/AssetMaintUiLabels.xml	(working copy)
@@ -17,24 +17,25 @@
     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">
+-->
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <property key="AssetMaintApplication">
         <value xml:lang="de">Vermögensverwaltungsanwendung</value>
         <value xml:lang="en">Asset Maintenance Application</value>
         <value xml:lang="fr">Application de maintenance des biens</value>
-        <value xml:lang="it">Applicazione Manutenzione Beni</value>
+        <value xml:lang="it">Applicazione gestione cespiti</value>
         <value xml:lang="th">บำรุงรักษาโปรแกรม</value>
     </property>
     <property key="AssetMaintCompanyName">
         <value xml:lang="en">OFBiz: Asset Maintenance</value>
         <value xml:lang="fr">OFBiz : maintenance des biens</value>
-        <value xml:lang="it">OFBiz: Manutenzione Beni</value>
+        <value xml:lang="it">OFBiz: Gestione cespiti</value>
         <value xml:lang="th">OFBiz: การบำรุงรักษา</value>
     </property>
     <property key="AssetMaintCompanySubtitle">
         <value xml:lang="en">Maintenance Department</value>
         <value xml:lang="fr">Service de maintenance</value>
-        <value xml:lang="it">Manutenzione Dipartimento</value>
+        <value xml:lang="it">Manutenzione dipartimento</value>
         <value xml:lang="th">แผนกการดูแลรักษา</value>
     </property>
     <property key="AssetMaintItemIssuance">
@@ -52,51 +53,58 @@
     <property key="AssetMaintLowPartInventoryError">
         <value xml:lang="en">"Available Inventory level for ${productId} is ${quantity}"</value>
         <value xml:lang="fr">"Le niveau de stock disponible pour ${productId} est ${quantity"</value>
-        <value xml:lang="it">"Livello Inventario Disponibile per ${productId} è ${quantity}"</value>
+        <value xml:lang="it">"Livello inventario disponibile per ${productId} è ${quantity}"</value>
         <value xml:lang="th">รดับสินค้าคงเหลือของ ${productId} คือ ${quantity}</value>
     </property>
     <property key="AssetMaintParentWorkEffort">
         <value xml:lang="en">Parent Work Effort</value>
         <value xml:lang="fr">"Tâche parente"</value>
+        <value xml:lang="it">Impegno di lavoro padre</value>
     </property>
+    <property key="AssetMaintPartId">
+        <value xml:lang="en">Part Id</value>
+        <value xml:lang="it">Codice parte</value>
+    </property>
     <property key="AssetMaintProductMaint">
         <value xml:lang="en">Product Maint</value>
         <value xml:lang="fr">Maintenance</value>
+        <value xml:lang="it">Manutenzione prodotto</value>
     </property>
     <property key="AssetMaintViewPermissionError">
         <value xml:lang="en">View Permission Error</value>
         <value xml:lang="fr">Afficher l'erreur d'autorisation</value>
+        <value xml:lang="it">Mostra errore permesso</value>
         <value xml:lang="th">แสดงข้อผิดพลาดในการอนุญาต</value>
     </property>
     <property key="PageTitleAddItemIssuance">
         <value xml:lang="en">Add Item Issuance</value>
         <value xml:lang="fr">Ajouter une émission d'article</value>
-        <value xml:lang="it">Aggiungi Riga Prelievo</value>
+        <value xml:lang="it">Aggiungi riga prelievo</value>
         <value xml:lang="th">เพิ่มรายการที่ออกมา</value>
     </property>
     <property key="PageTitleChildWorkEfforts">
         <value xml:lang="en">Task Breakdown</value>
         <value xml:lang="fr">Décomposition de tâche</value>
-        <value xml:lang="it">Compito Breakdown</value>
+        <value xml:lang="it">Compito breakdown</value>
         <value xml:lang="th">งานหยุด</value>
     </property>
     <property key="PageTitleFindFixedAssetMaints">
         <value xml:lang="de">Verwaltungen finden</value>
         <value xml:lang="en">Find Maintenances</value>
         <value xml:lang="fr">Chercher des maintenances</value>
-        <value xml:lang="it">Ricerca Manutenzioni</value>
+        <value xml:lang="it">Ricerca manutenzioni</value>
         <value xml:lang="th">ค้นหาการบำรุงรักษา</value>
     </property>
     <property key="PageTitleFindFixedAssets">
         <value xml:lang="en">Find Equipments</value>
         <value xml:lang="fr">Chercher des équipements</value>
-        <value xml:lang="it">Ricerca Cespite</value>
+        <value xml:lang="it">Ricerca cespite</value>
         <value xml:lang="th">ค้นหาเครื่องมือ</value>
     </property>
     <property key="PageTitleListItemIssuance">
         <value xml:lang="en">Parts List</value>
         <value xml:lang="fr">Liste des pièces</value>
-        <value xml:lang="it">Lista Soggetti</value>
+        <value xml:lang="it">Lista soggetti</value>
         <value xml:lang="th">ส่วนหนึ่งของรายการ</value>
     </property>
 </resource>
Index: specialpurpose/pos/src/org/ofbiz/pos/component/Operator.java
===================================================================
--- specialpurpose/pos/src/org/ofbiz/pos/component/Operator.java	(revision 735109)
+++ specialpurpose/pos/src/org/ofbiz/pos/component/Operator.java	(working copy)
@@ -49,7 +49,7 @@
     public static final String[] OPER_TXID = { "oper_txid", "TXID" };
     public static final String[] OPER_DRWR = { "oper_drwr", "DRAWER" };    
     
-    public static SimpleDateFormat sdf = new SimpleDateFormat(UtilProperties.getMessage(PosTransaction.resource,"DateFormat",Locale.getDefault()));
+    public static SimpleDateFormat sdf = new SimpleDateFormat(UtilProperties.getMessage(PosTransaction.resource,"PosDateFormat",Locale.getDefault()));
     protected Component[] operatorField = null;
     protected XStyle titleStyle = null;
     protected XPanel operPanel = null;
@@ -131,15 +131,15 @@
 
     protected String getFieldTitle(String fieldName) {
         if (OPER_TOTAL[0].equals(fieldName)) {
-            return UtilProperties.getMessage(PosTransaction.resource,"TOTAL",defaultLocale);            
+            return UtilProperties.getMessage(PosTransaction.resource,"PosTotal",defaultLocale);
         } else if (OPER_DATE[0].equals(fieldName)) {
-        	return UtilProperties.getMessage(PosTransaction.resource,"DATE",defaultLocale);
+            return UtilProperties.getMessage(PosTransaction.resource,"PosDate",defaultLocale);
         } else if (OPER_EMPL[0].equals(fieldName)) {
-        	return UtilProperties.getMessage(PosTransaction.resource,"EMPL",defaultLocale);
+            return UtilProperties.getMessage(PosTransaction.resource,"PosEmpl",defaultLocale);
         } else if (OPER_TXID[0].equals(fieldName)) {
-        	return UtilProperties.getMessage(PosTransaction.resource,"TXID",defaultLocale);
+            return UtilProperties.getMessage(PosTransaction.resource,"PosTxId",defaultLocale);
         } else if (OPER_DRWR[0].equals(fieldName)) {
-        	return UtilProperties.getMessage(PosTransaction.resource,"DRWR",defaultLocale);
+            return UtilProperties.getMessage(PosTransaction.resource,"PosDrwr",defaultLocale);
         }
         return "";
     }
Index: applications/product/widget/facility/FacilityScreens.xml
===================================================================
--- applications/product/widget/facility/FacilityScreens.xml	(revision 735109)
+++ applications/product/widget/facility/FacilityScreens.xml	(working copy)
@@ -65,7 +65,7 @@
                                         <if-compare field-name="showScreen" value="ten" operator="equals"/>
                                     </condition>
                                     <widgets>
-                                        <label text="Facility Selection" style="h1"/>
+                                        <label text="${uiLabelMap.FacilitySelection}" style="h1"/>
                                         <section>
                                             <condition>
                                                 <if-service-permission service-name="facilityGenericPermission" main-action="CREATE"/>