### Eclipse Workspace Patch 1.0
#P ofbiz
Index: applications/workeffort/widget/WorkEffortForms.xml
===================================================================
--- applications/workeffort/widget/WorkEffortForms.xml	(revision 731372)
+++ applications/workeffort/widget/WorkEffortForms.xml	(working copy)
@@ -718,7 +718,7 @@
         <field name="workEffortId"><hidden/></field>
         <field name="fromDate"><hidden/></field>
         <field name="rateCurrencyUomId"><hidden/></field>
-        <field name="rateTypeId" title="${uiLabelMap.TimesheetRateType}"><display-entity entity-name="RateType"/></field>
+        <field name="rateTypeId" title="${uiLabelMap.WorkEffortTimesheetRateType}"><display-entity entity-name="RateType"/></field>
         <field name="rateAmount"><display type="currency" currency="${rateCurrencyUomId}"/></field>
         <field name="periodTypeId"><display-entity entity-name="PeriodType" description="${description}"/></field>
         <field name="deleteButton" widget-style="smallSubmit"><submit /></field>
@@ -730,7 +730,7 @@
             <set field="periodTypeId" value="RATE_HOUR"/>
         </actions>
         <field name="workEffortId"><hidden/></field>
-        <field name="rateTypeId" title="${uiLabelMap.TimesheetRateType}">
+        <field name="rateTypeId" title="${uiLabelMap.WorkEffortTimesheetRateType}">
             <drop-down no-current-selected-key="STANDARD">
                 <entity-options entity-name="RateType" description="${description}">
                     <entity-order-by field-name="description"/>
@@ -777,7 +777,7 @@
         </field>
         
         <field name="partyId" title="${uiLabelMap.PartyParty}"><lookup size="12" target-form-name="LookupPartyName" default-value="${timesheet.partyId}"/></field>
-        <field name="rateTypeId" title="${uiLabelMap.TimesheetRateType}">
+        <field name="rateTypeId" title="${uiLabelMap.WorkEffortTimesheetRateType}">
             <drop-down no-current-selected-key="STANDARD">
                 <entity-options entity-name="RateType" description="${description}">
                     <entity-order-by field-name="description"/>
@@ -807,7 +807,7 @@
         <field name="timesheetId"><lookup size="10" target-form-name="LookupTimesheet"/></field>
         
         <field name="partyId" title="${uiLabelMap.PartyParty}"><lookup target-form-name="LookupPartyName" default-value="${timesheet.partyId}"/></field>
-        <field name="rateTypeId" title="${uiLabelMap.TimesheetRateType}">
+        <field name="rateTypeId" title="${uiLabelMap.WorkEffortTimesheetRateType}">
             <drop-down no-current-selected-key="STANDARD">
                 <entity-options entity-name="RateType" description="${description}">
                     <entity-order-by field-name="description"/>
@@ -868,7 +868,7 @@
         <field name="noteId" use-when="noteId != null"><hidden/></field>
         <field name="workEffortId"><hidden/></field>
         <field name="noteInfo" title="${uiLabelMap.CommonNote}"><textarea cols="70" rows="5" /></field>
-        <field name="internalNote" title="${uiLabelMap.WorKEffortInternalNote}">
+        <field name="internalNote" title="${uiLabelMap.WorkEffortInternalNote}">
             <drop-down no-current-selected-key="">
                 <option key="Y" description="${uiLabelMap.CommonYes}"/>
                 <option key="N" description="${uiLabelMap.CommonNo}"/>                
Index: applications/party/config/PartyUiLabels.xml
===================================================================
--- applications/party/config/PartyUiLabels.xml	(revision 731372)
+++ applications/party/config/PartyUiLabels.xml	(working copy)
@@ -71,7 +71,9 @@
         <value xml:lang="fr">Détail des coordonées</value>
         <value xml:lang="it">Dettagli Contatto</value>
         <value xml:lang="nl">Details contactmech</value>
+        <value xml:lang="ro">Detaliu Contact</value>
         <value xml:lang="th">รายละเอียดในการติดต่อ</value>
+        <value xml:lang="zh">详细联系方式</value>
     </property>
     <property key="FormFieldTitle_commonName">
         <value xml:lang="de">Allgemeiner Name</value>
@@ -124,7 +126,7 @@
         <value xml:lang="en">Contact List Id</value>
         <value xml:lang="es">Codigo Lista de contactos</value>
         <value xml:lang="fr">Liste de contact</value>
-        <value xml:lang="it">Lista Contatto</value>
+        <value xml:lang="it">Lista contatto</value>
         <value xml:lang="nl">ID contactlijst</value>
         <value xml:lang="ro">Lista Contact</value>
         <value xml:lang="ru">Коди контактного списка</value>
@@ -160,7 +162,7 @@
         <value xml:lang="en">Contact Mech Type Id</value>
         <value xml:lang="es">Código Tipo Mecanismo de contacto</value>
         <value xml:lang="fr">Réf. type de coordonées</value>
-        <value xml:lang="it">Tipo Contatto</value>
+        <value xml:lang="it">Tipo contatto</value>
         <value xml:lang="nl">Soort contactmech</value>
         <value xml:lang="ro">Tip Contact</value>
         <value xml:lang="ru">Код типа способа связи</value>
@@ -253,7 +255,9 @@
         <value xml:lang="en">Default Rate</value>
         <value xml:lang="es">Tasa por defecto</value>
         <value xml:lang="fr">Taux par défaut</value>
+        <value xml:lang="it">Percentuale di Default</value>
         <value xml:lang="nl">Standaard tarief</value>
+        <value xml:lang="th">ค่าเริ่มต้นอัตรา</value>
         <value xml:lang="zh">默认费率</value>
     </property>
     <property key="FormFieldTitle_disabledDateTime">
@@ -7519,6 +7523,14 @@
         <value xml:lang="th">รหัสประเภทสถานะกลุ่มผู้ใช้จาก (ใหม่)</value>
         <value xml:lang="zh">会员角色类型标识来自 (新)</value>
     </property>
+    <property key="PartyRoleTypeIdMissing">
+        <value xml:lang="en">Role Type ID is missing.</value>
+        <value xml:lang="fr">Réf. de type de rôle manquant</value>
+        <value xml:lang="it">Tipo ruolo è mancante.</value>
+        <value xml:lang="ro">Tip Rol lipseste.</value>
+        <value xml:lang="th">ไม่พบรหัสประเภทสถานะ</value>
+        <value xml:lang="zh">没有找到角色类型标识。</value>
+    </property>
     <property key="PartyRoleTypeIdTo">
         <value xml:lang="de">Akteur Rolle Typ ID an (neu)</value>
         <value xml:lang="en">Party Role Type Id To (NEW)</value>
Index: applications/workeffort/widget/WorkEffortMenus.xml
===================================================================
--- applications/workeffort/widget/WorkEffortMenus.xml	(revision 731372)
+++ applications/workeffort/widget/WorkEffortMenus.xml	(working copy)
@@ -24,10 +24,10 @@
         default-selected-style="selected" title="${uiLabelMap.WorkEffortWorkEffortManagerApplication}">
         <menu-item name="task" title="${uiLabelMap.WorkEffortTaskList}"><link target="mytasks"/></menu-item>
         <menu-item name="calendar" title="${uiLabelMap.WorkEffortCalendar}"><link target="day"/></menu-item>
-        <menu-item name="mytime" title="${uiLabelMap.TimesheetMyTime}"><link target="MyTimesheets"/></menu-item>
+        <menu-item name="mytime" title="${uiLabelMap.WorkEffortTimesheetMyTime}"><link target="MyTimesheets"/></menu-item>
         <menu-item name="request" title="${uiLabelMap.WorkEffortRequestList}"><link target="requestlist"/></menu-item>
         <menu-item name="workeffort" title="${uiLabelMap.WorkEffortWorkEffort}"><link target="FindWorkEffort"/></menu-item>
-        <menu-item name="timesheet" title="${uiLabelMap.Timesheet}"><link target="FindTimesheet"/></menu-item>
+        <menu-item name="timesheet" title="${uiLabelMap.WorkEffortTimesheet}"><link target="FindTimesheet"/></menu-item>
         <menu-item name="userJobs" title="${uiLabelMap.WorkEffortJobList}"><link target="UserJobs"/></menu-item>
         
         <menu-item name="Logout" title="Logout" align-style="opposed">
@@ -53,7 +53,7 @@
         <menu-item name="WorkEffortPartyAssigns" title="${uiLabelMap.WorkEffortParties}">
             <link target="ListWorkEffortPartyAssigns?workEffortId=${workEffortId}"/>
         </menu-item>
-        <menu-item name="WorkEffortRates" title="${uiLabelMap.TimesheetRates}">
+        <menu-item name="WorkEffortRates" title="${uiLabelMap.WorkEffortTimesheetRates}">
             <link target="EditWorkEffortRates?workEffortId=${workEffortId}"/>
         </menu-item>
         <menu-item name="WorkEffortCommEvents" title="${uiLabelMap.WorkEffortCommEvents}">
@@ -74,7 +74,7 @@
         <menu-item name="WorkEffortOrderHeaders" title="${uiLabelMap.WorkEffortOrderHeaders}">
             <link target="ListWorkEffortOrderHeaders?workEffortId=${workEffortId}"/>
         </menu-item>
-        <menu-item name="WorkEffortTimeEntries" title="${uiLabelMap.TimesheetTimeEntries}">
+        <menu-item name="WorkEffortTimeEntries" title="${uiLabelMap.WorkEffortTimesheetTimeEntries}">
             <link target="EditWorkEffortTimeEntries?workEffortId=${workEffortId}"/>
         </menu-item>
         <menu-item name="WorkEffortNotes" title="${uiLabelMap.WorkEffortNotes}">
Index: applications/manufacturing/config/ManufacturingUiLabels.xml
===================================================================
--- applications/manufacturing/config/ManufacturingUiLabels.xml	(revision 731372)
+++ applications/manufacturing/config/ManufacturingUiLabels.xml	(working copy)
@@ -19,26 +19,6 @@
     under the License.
 -->
 <resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <property key="FormFieldTitle_actualCompletionDate">
-        <value xml:lang="de">Ist-Fertigstellungs-Datum</value>
-        <value xml:lang="en">Actual Completion Date</value>
-        <value xml:lang="es">Fecha de terminación real</value>
-        <value xml:lang="fr">Date exacte d'achèvement</value>
-        <value xml:lang="it">Data Completamento Attuale</value>
-        <value xml:lang="ro">Data Terminare Actuala</value>
-        <value xml:lang="th">วันที่ทำเสร็จจริง</value>
-        <value xml:lang="zh">实际结束日期</value>
-    </property>
-    <property key="FormFieldTitle_actualStartDate">
-        <value xml:lang="de">Ist-Start-Datum</value>
-        <value xml:lang="en">Actual Start Date</value>
-        <value xml:lang="es">Fecha de comienzo real</value>
-        <value xml:lang="fr">Date de début réelle</value>
-        <value xml:lang="it">Data Inizio Attuale</value>
-        <value xml:lang="ro">Data initiere Actuala</value>
-        <value xml:lang="th">วันที่เริ่มจริง</value>
-        <value xml:lang="zh">实际开始日期</value>
-    </property>
     <property key="FormFieldTitle_allocatedCost">
         <value xml:lang="de">Verrechnete Kosten</value>
         <value xml:lang="en">Allocated Cost</value>
@@ -67,7 +47,7 @@
         <value xml:lang="en">Cancel Date Time</value>
         <value xml:lang="es">Fecha y hora de cancelación</value>
         <value xml:lang="fr">Date et heure d'annulation</value>
-        <value xml:lang="it">Data/Ora di Annullamento</value>
+        <value xml:lang="it">Data/ora di annullamento</value>
         <value xml:lang="th">ยกเลิกวัน เวลา</value>
     </property>
     <property key="FormFieldTitle_costCustomMethodId">
@@ -98,16 +78,6 @@
         <value xml:lang="it">Scostamento Anni Di Default</value>
         <value xml:lang="th">ค่าชดเชยปีที่ผิดสัญญา</value>
     </property>
-    <property key="FormFieldTitle_estimatedCompletionDate">
-        <value xml:lang="de">Geschätztes Fertigstellungsdatum</value>
-        <value xml:lang="en">Estimated Completion Date</value>
-        <value xml:lang="es">Fecha de terminación estimada</value>
-        <value xml:lang="fr">Date prévue d'achèvement</value>
-        <value xml:lang="it">Data Completamento Stimata</value>
-        <value xml:lang="ro">Data Terminare Stimata</value>
-        <value xml:lang="th">วันที่คาดว่าจะเสร็จ</value>
-        <value xml:lang="zh">预计结束日期</value>
-    </property>
     <property key="FormFieldTitle_estimatedDuration">
         <value xml:lang="de">Geschätzte Dauer</value>
         <value xml:lang="en">Estimated Duration</value>
@@ -116,26 +86,6 @@
         <value xml:lang="it">Durata Stimata</value>
         <value xml:lang="th">ประมาณเวลา</value>
     </property>
-    <property key="FormFieldTitle_estimatedMilliSeconds">
-        <value xml:lang="de">Geschätzte Millisekunden</value>
-        <value xml:lang="en">Estimated Milli Seconds</value>
-        <value xml:lang="es">Milisegundos estimados</value>
-        <value xml:lang="fr">Estimation en millisecondes</value>
-        <value xml:lang="it">Milli Secondi Stimati</value>
-        <value xml:lang="ro">Milisecunde Stimate</value>
-        <value xml:lang="th">ประมาณเป็นพันวินาที</value>
-        <value xml:lang="zh">预计毫秒数</value>
-    </property>
-    <property key="FormFieldTitle_estimatedSetupMillis">
-        <value xml:lang="de">Geschätzte Rüstzeit (Millisekunden)</value>
-        <value xml:lang="en">Estimated Setup Millis</value>
-        <value xml:lang="es">Tiempo de setup en milisegundos</value>
-        <value xml:lang="fr">Configuration estimée en millisecondes</value>
-        <value xml:lang="it">Configurazione Stimata in Milli secondi</value>
-        <value xml:lang="ro">Configuratie Stimata in Milisecunde</value>
-        <value xml:lang="th">ประมาณการติดตั้ง</value>
-        <value xml:lang="zh">预计安装毫秒数</value>
-    </property>
     <property key="FormFieldTitle_estimatedStartDate">
         <value xml:lang="de">Geschätztes Start-Datum</value>
         <value xml:lang="en">Estimated Start Date</value>
@@ -154,14 +104,6 @@
         <value xml:lang="it">Fallisce se i Prodotti Non Sono Disponibili</value>
         <value xml:lang="th">เกิดความผิดพลาดถ้าไม่มีสินค้าอยู่</value>
     </property>
-    <property key="FormFieldTitle_finishDateTime">
-        <value xml:lang="de">Fertigstellungszeit</value>
-        <value xml:lang="en">Finish Date Time</value>
-        <value xml:lang="es">Fecha de terminación</value>
-        <value xml:lang="fr">Date et heure de fin</value>
-        <value xml:lang="it">Data/Ora di Termine</value>
-        <value xml:lang="th">วัน เวลาที่เสร็จ</value>
-    </property>
     <property key="FormFieldTitle_fixedAssetId">
         <value xml:lang="de">Anlagen-Nr.</value>
         <value xml:lang="en">Fixed Asset Id</value>
@@ -213,7 +155,7 @@
         <value xml:lang="en">Job Id</value>
         <value xml:lang="es">Código del trabajo</value>
         <value xml:lang="fr">Réf. du job</value>
-        <value xml:lang="it">Numero Lavoro</value>
+        <value xml:lang="it">Numero lavoro</value>
         <value xml:lang="th">รหัสงาน</value>
     </property>
     <property key="FormFieldTitle_jobName">
@@ -221,7 +163,7 @@
         <value xml:lang="en">Job Name</value>
         <value xml:lang="es">Nombre del trabajo</value>
         <value xml:lang="fr">Nom du job</value>
-        <value xml:lang="it">Nome Lavoro</value>
+        <value xml:lang="it">Nome lavoro</value>
         <value xml:lang="th">ชื่องาน</value>
     </property>
     <property key="FormFieldTitle_manufacturingTask">
@@ -237,9 +179,8 @@
         <value xml:lang="en">Max Retry</value>
         <value xml:lang="es">Número máximo de intentos</value>
         <value xml:lang="fr">Nb de tentatives max</value>
-        <value xml:lang="it">Tentativi Massimi</value>
-        <value xml:lang="th">ทดสอบใหม่มากสุด
-        </value>
+        <value xml:lang="it">Tentativi massimi</value>
+        <value xml:lang="th">ทดสอบใหม่มากสุด</value>
     </property>
     <property key="FormFieldTitle_mondayCapacity">
         <value xml:lang="de">Montagskapazität</value>
@@ -327,16 +268,6 @@
         <value xml:lang="th">การผลิตสินค้า</value>
         <value xml:lang="zh">生产运行</value>
     </property>
-    <property key="FormFieldTitle_quantityProduced">
-        <value xml:lang="de">Produzierte Menge</value>
-        <value xml:lang="en">Quantity Produced</value>
-        <value xml:lang="es">Cantidad fabricada</value>
-        <value xml:lang="fr">Quantité produite</value>
-        <value xml:lang="it">Quantità Prodotta</value>
-        <value xml:lang="ro">Cantitate Produsa</value>
-        <value xml:lang="th">จำนวนสินค้า</value>
-        <value xml:lang="zh">已生产的数量</value>
-    </property>
     <property key="FormFieldTitle_quantityToProduce">
         <value xml:lang="de">Zu produzierende Menge</value>
         <value xml:lang="en">Quantity To Produce</value>
@@ -576,7 +507,7 @@
         <value xml:lang="en">Completion Date</value>
         <value xml:lang="es">Fecha de fin real</value>
         <value xml:lang="fr">Date d'achèvement</value>
-        <value xml:lang="it">Data Completamento</value>
+        <value xml:lang="it">Data completamento</value>
         <value xml:lang="ro">Data Completament</value>
         <value xml:lang="th">วันที่ทำเสร็จ</value>
         <value xml:lang="zh">完成日期</value>
@@ -614,7 +545,7 @@
         <value xml:lang="en">Start Date</value>
         <value xml:lang="es">Fecha de inicio real</value>
         <value xml:lang="fr">Date de début</value>
-        <value xml:lang="it">Data Inizio</value>
+        <value xml:lang="it">Data inizio</value>
         <value xml:lang="ro">Data Initiala</value>
         <value xml:lang="th">วันที่เริ่มต้น</value>
         <value xml:lang="zh">开始日期</value>
Index: applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRun.fo.ftl
===================================================================
--- applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRun.fo.ftl	(revision 731372)
+++ applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRun.fo.ftl	(working copy)
@@ -74,7 +74,7 @@
                 <fo:table-body>
                     <fo:table-row>
                         <fo:table-cell padding="2pt">
-                            <fo:block>${uiLabelMap.FormFieldTitle_estimatedStartDate}:</fo:block>
+                            <fo:block> title="${uiLabelMap.ManufacturingStartDate}":</fo:block>
                         </fo:table-cell>
                         <fo:table-cell padding="2pt">
                             <fo:block><#if productionRunData.estimatedStartDate?exists>${Static["org.ofbiz.base.util.UtilDateTime"].toDateString(productionRunData.estimatedStartDate, "dd/MM/yyyy")}</#if></fo:block>
@@ -88,7 +88,7 @@
                     </fo:table-row>
                     <fo:table-row>
                         <fo:table-cell padding="2pt">
-                            <fo:block>${uiLabelMap.FormFieldTitle_estimatedCompletionDate}:</fo:block>
+                            <fo:block>${uiLabelMap.ManufacturingEstimatedCompletionDate}:</fo:block>
                         </fo:table-cell>
                         <fo:table-cell padding="2pt">
                             <fo:block><#if productionRunData.estimatedCompletionDate?exists>${Static["org.ofbiz.base.util.UtilDateTime"].toDateString(productionRunData.estimatedCompletionDate, "dd/MM/yyyy")}</#if></fo:block>
Index: applications/party/webapp/partymgr/party/PartyForms.xml
===================================================================
--- applications/party/webapp/partymgr/party/PartyForms.xml	(revision 731372)
+++ applications/party/webapp/partymgr/party/PartyForms.xml	(working copy)
@@ -318,7 +318,7 @@
             <set field="periodTypeId" value="RATE_HOUR"/>
         </actions>
         <field name="partyId"><hidden/></field>
-        <field name="rateTypeId" title="${uiLabelMap.TimesheetRateType}">
+        <field name="rateTypeId" title="${uiLabelMap.WorkEffortTimesheetRateType}">
             <drop-down no-current-selected-key="STANDARD" allow-empty="false">
                 <entity-options entity-name="RateType" description="${description}">
                     <entity-order-by field-name="description"/>
@@ -362,7 +362,7 @@
         <field name="fromDate"><hidden/></field>
         <field name="rateAmountFromDate"><hidden/></field>
         <field name="rateCurrencyUomId"><hidden/></field>
-        <field name="rateTypeId" title="${uiLabelMap.TimesheetRateType}"><display-entity entity-name="RateType" also-hidden="true"/></field>
+        <field name="rateTypeId" title="${uiLabelMap.WorkEffortTimesheetRateType}"><display-entity entity-name="RateType" also-hidden="true"/></field>
         <field name="periodTypeId"><display-entity entity-name="PeriodType" description="${description}"/></field>
         <field name="rateDefaultAmount" use-when="&quot;workEffort&quot;.equals(rateLevel)" tooltip="Value from workeffort level"><display type="currency" currency="${rateCurrencyUomId}"/></field>
         <field name="rateDefaultAmount" use-when="&quot;party&quot;.equals(rateLevel)" tooltip="Value from party level"><display type="currency" currency="${rateCurrencyUomId}"/></field>
Index: applications/workeffort/config/WorkEffortUiLabels.xml
===================================================================
--- applications/workeffort/config/WorkEffortUiLabels.xml	(revision 731372)
+++ applications/workeffort/config/WorkEffortUiLabels.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_actualCompletionDate">
         <value xml:lang="de">Tatsächliches Erledigungsdatum</value>
         <value xml:lang="en">Actual Completion Date</value>
@@ -65,20 +66,10 @@
         <value xml:lang="th">วันที่เริ่มตามความจริง</value>
         <value xml:lang="zh">实际开始日期</value>
     </property>
-    <property key="FormFieldTitle_allocatedCost">
-        <value xml:lang="en">Allocated Cost</value>
-        <value xml:lang="fr">Coût alloué</value>
-    </property>
     <property key="FormFieldTitle_availabilityStatusId">
         <value xml:lang="en">Availability</value>
         <value xml:lang="fr">Disponibilité</value>
     </property>
-    <property key="FormFieldTitle_cancelDateTime">
-        <value xml:lang="en">Cancel Date Time</value>
-        <value xml:lang="fr">Date-heure de fermeture</value>
-        <value xml:lang="it">Data/Ora Annullamento</value>
-        <value xml:lang="th">ยกเลิกวันเวลา</value>
-    </property>
     <property key="FormFieldTitle_clientPartyId">
         <value xml:lang="en">Client Party Id</value>
         <value xml:lang="fr">Réf. du client</value>
@@ -88,15 +79,6 @@
         <value xml:lang="th">รหัสกลุ่มลูกข่าย</value>
         <value xml:lang="zh">客户会员标识</value>
     </property>
-    <property key="FormFieldTitle_contactMechTypeId">
-        <value xml:lang="en">Contact Mech Type Id</value>
-        <value xml:lang="fr">Réf. de type de coordonnée</value>
-        <value xml:lang="it">Tipo Contatto</value>
-        <value xml:lang="nl">Soort relatie Id</value>
-        <value xml:lang="ro">Tip Contact</value>
-        <value xml:lang="th">รหัสประเภทวิธีการติดต่อ</value>
-        <value xml:lang="zh">联系方式类型标识</value>
-    </property>
     <property key="FormFieldTitle_createdByUserLogin">
         <value xml:lang="en">Created By User Login</value>
         <value xml:lang="fr">Créé par l'identifiant de connexion</value>
@@ -124,21 +106,6 @@
         <value xml:lang="th">รายละเอียดประเภทคำร้องของลูกค้า</value>
         <value xml:lang="zh">客户请求类型描述</value>
     </property>
-    <property key="FormFieldTitle_defaultRate">
-        <value xml:lang="en">Default Rate</value>
-        <value xml:lang="fr">Taux de défaut</value>
-        <value xml:lang="it">Percentuale di Default</value>
-        <value xml:lang="th">ค่าเริ่มต้นอัตรา</value>
-    </property>
-    <property key="FormFieldTitle_estimateCalcMethod">
-        <value xml:lang="en">Estimate Calc Method</value>
-        <value xml:lang="fr">Méthode de calcul d'estimation</value>
-        <value xml:lang="it">Metodo Calcolo Stimato</value>
-        <value xml:lang="nl">Estimate Calc Method</value>
-        <value xml:lang="ro">Metoda Calcul Stimata</value>
-        <value xml:lang="th">วิธีการคำนวนโดยประมาณ</value>
-        <value xml:lang="zh">预计计算方法</value>
-    </property>
     <property key="FormFieldTitle_estimatedCompletionDate">
         <value xml:lang="de">Soll-Enddatum</value>
         <value xml:lang="en">Estimated Completion Date</value>
@@ -149,15 +116,6 @@
         <value xml:lang="th">วันที่สำเร็จประมาณ</value>
         <value xml:lang="zh">预计完成日期</value>
     </property>
-    <property key="FormFieldTitle_estimatedDeliveryDate">
-        <value xml:lang="en">Estimated Delivery Date</value>
-        <value xml:lang="fr">Date de livraison prévue</value>
-        <value xml:lang="it">Data Consegna Stimata</value>
-        <value xml:lang="nl">Verwachtte leverdatum</value>
-        <value xml:lang="ro">Data Livrare Stimata</value>
-        <value xml:lang="th">วันที่ส่งประมาณ</value>
-        <value xml:lang="zh">预计交付日期</value>
-    </property>
     <property key="FormFieldTitle_estimatedMilliSeconds">
         <value xml:lang="en">Estimated Milli Seconds</value>
         <value xml:lang="fr">Millisecondes estimées</value>
@@ -187,30 +145,12 @@
         <value xml:lang="th">เริ่มประมาณวันที่</value>
         <value xml:lang="zh">预计开始日期</value>
     </property>
-    <property key="FormFieldTitle_facilityId">
-        <value xml:lang="en">Facility Id</value>
-        <value xml:lang="fr">Réf. de lieu de stockage</value>
-        <value xml:lang="it">Codice Stabilimento</value>
-        <value xml:lang="nl">Facility Id</value>
-        <value xml:lang="ro">Cod Compartiment</value>
-        <value xml:lang="th">รหัสคลังสินค้า</value>
-        <value xml:lang="zh">场所标识</value>
-    </property>
     <property key="FormFieldTitle_finishDateTime">
         <value xml:lang="en">Finish Date Time</value>
         <value xml:lang="fr">Date-heure de fin</value>
         <value xml:lang="it">Data/Ora Fine</value>
         <value xml:lang="th">วันเวลาที่เสร็จ</value>
     </property>
-    <property key="FormFieldTitle_fixedAssetId">
-        <value xml:lang="en">Fixed Asset Id</value>
-        <value xml:lang="fr">Réf. d'immobilisation</value>
-        <value xml:lang="it">Numero Cespite</value>
-        <value xml:lang="nl">Fixed Asset Id</value>
-        <value xml:lang="ro">Numar Mijloc Fix</value>
-        <value xml:lang="th">รหัสทรัพย์สินไม่หมุนเวียน</value>
-        <value xml:lang="zh">固定资产标识</value>
-    </property>
     <property key="FormFieldTitle_hours">
         <value xml:lang="en">Hours</value>
         <value xml:lang="fr">Heures</value>
@@ -253,18 +193,6 @@
         <value xml:lang="th">ฉบับวันที่</value>
         <value xml:lang="zh">发布日期</value>
     </property>
-    <property key="FormFieldTitle_jobId">
-        <value xml:lang="en">Job Id</value>
-        <value xml:lang="fr">Réf. du job</value>
-        <value xml:lang="it">Numero Lavoro</value>
-        <value xml:lang="th">รหัสงาน</value>
-    </property>
-    <property key="FormFieldTitle_jobName">
-        <value xml:lang="en">Job Name</value>
-        <value xml:lang="fr">Nom du job</value>
-        <value xml:lang="it">Nome Lavoro</value>
-        <value xml:lang="th">ชื่องาน</value>
-    </property>
     <property key="FormFieldTitle_lastModifiedByUserLogin">
         <value xml:lang="en">Last Modified By User Login</value>
         <value xml:lang="fr">Dernière modification par l'identifiant de connexion</value>
@@ -311,12 +239,6 @@
         <value xml:lang="th">รหัสแผนการตลาด</value>
         <value xml:lang="zh">市场攻势标识</value>
     </property>
-    <property key="FormFieldTitle_maxRetry">
-        <value xml:lang="en">Max Retry</value>
-        <value xml:lang="fr">Nb d'essais maximum</value>
-        <value xml:lang="it">Massimo Tentativi di Riprova</value>
-        <value xml:lang="th">การทดสอบจำนวนมาก</value>
-    </property>
     <property key="FormFieldTitle_mustRsvp">
         <value xml:lang="en">Must Rsvp</value>
         <value xml:lang="fr">Répondez S'il Vous Plaît</value>
@@ -335,31 +257,12 @@
         <value xml:lang="th">รายละเอียดประเภทรายการสั่งซื้อ</value>
         <value xml:lang="zh">订单类型描述</value>
     </property>
-    <property key="FormFieldTitle_percentComplete">
-        <value xml:lang="en">Percent Complete</value>
-        <value xml:lang="fr">Pourcentage de complétion</value>
-        <value xml:lang="it">Percentuale Completata</value>
-        <value xml:lang="nl">Percentage afgehandeld</value>
-        <value xml:lang="ro">Procent Indeplinit</value>
-        <value xml:lang="th">เปอร์เซ็นต์ที่สำเร็จ</value>
-        <value xml:lang="zh">完成的百分比</value>
-    </property>
     <property key="FormFieldTitle_postedAnonymous">
         <value xml:lang="en">Posted Anonymous</value>
         <value xml:lang="fr">Envoyé anonymement</value>
         <value xml:lang="it">Inviato da Anonimo</value>
         <value xml:lang="th">ไม่ระบุชื่อการโพสต์</value>
     </property>
-    <property key="FormFieldTitle_priority">
-        <value xml:lang="de">Dringlichkeit</value>
-        <value xml:lang="en">Priority</value>
-        <value xml:lang="fr">Priorité</value>
-        <value xml:lang="it">Priorità</value>
-        <value xml:lang="nl">Prioriteit</value>
-        <value xml:lang="ro">Prioritate </value>
-        <value xml:lang="th">สิทธิพิเศษ</value>
-        <value xml:lang="zh">优先级</value>
-    </property>
     <property key="FormFieldTitle_productProductId">
         <value xml:lang="de">Produkt ID</value>
         <value xml:lang="en">Product Id</value>
@@ -379,15 +282,6 @@
         <value xml:lang="th">จำนวนผลผลิต</value>
         <value xml:lang="zh">已产生的数量</value>
     </property>
-    <property key="FormFieldTitle_quantityRejected">
-        <value xml:lang="en">Quantity Rejected</value>
-        <value xml:lang="fr">Quantité rejetée</value>
-        <value xml:lang="it">Quantità Rifiutate</value>
-        <value xml:lang="nl">Aantal geweigers</value>
-        <value xml:lang="ro">Cantitatea Refuzata</value>
-        <value xml:lang="th">จำนวนปฏิเสธ</value>
-        <value xml:lang="zh">已拒绝的数量</value>
-    </property>
     <property key="FormFieldTitle_quantityToProduce">
         <value xml:lang="en">Quantity To Produce</value>
         <value xml:lang="fr">Quantité à produire</value>
@@ -450,16 +344,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="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="nl">Aanvraag start datum</value>
-        <value xml:lang="ro">Data Initiala Necesar</value>
-        <value xml:lang="th">วันที่ต้องการเริ่ม</value>
-        <value xml:lang="zh">需求开始日期</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>
@@ -508,12 +392,6 @@
         <value xml:lang="th">หมายเลขการแก้ไขใหม่</value>
         <value xml:lang="zh">修订序号</value>
     </property>
-    <property key="FormFieldTitle_runTime">
-        <value xml:lang="en">Run Time</value>
-        <value xml:lang="fr">Moment d'exécution</value>
-        <value xml:lang="it">Tempo di Esecuzione</value>
-        <value xml:lang="th">เวลาการดำเนินการ</value>
-    </property>
     <property key="FormFieldTitle_scopeEnumId">
         <value xml:lang="en">Scope</value>
         <value xml:lang="fr">Possibilité d'accès</value>
@@ -550,13 +428,6 @@
         <value xml:lang="th">ช่วงระยะเวลาพิเศษ</value>
         <value xml:lang="zh">特别条款</value>
     </property>
-    <property key="FormFieldTitle_startDateTime">
-        <value xml:lang="en">Start Date Time</value>
-        <value xml:lang="es">Fecha/hora de comienzo</value>
-        <value xml:lang="fr">Date-heure de début</value>
-        <value xml:lang="it">Data/Ora Inizio</value>
-        <value xml:lang="th">เริ่มวันเวลา</value>
-    </property>
     <property key="FormFieldTitle_statusDateTime">
         <value xml:lang="en">Status Date Time</value>
         <value xml:lang="fr">Date-heure de statut</value>
@@ -1339,546 +1210,6 @@
         <value xml:lang="th">งานรายการซื้อสินค้า</value>
         <value xml:lang="zh">人工服务购买列表</value>
     </property>
-    <property key="PartyAddContactInformationParty">
-        <value xml:lang="en">Add this contact information to party</value>
-        <value xml:lang="es">Agregar esta información del contacto al participante</value>
-        <value xml:lang="fr">Ajout cette coordonnées à l'acteur</value>
-        <value xml:lang="it">Aggiungi questa informazione contatto al Soggetto</value>
-        <value xml:lang="nl">Voeg deze contact informatie toe aan relatie</value>
-        <value xml:lang="ro">Adauga aceasta informatie contact la Subiect</value>
-        <value xml:lang="ru">Добавить информацию об этом контакте к участнику</value>
-        <value xml:lang="th">เพิ่มข้อมูลการติดต่อนี้ถึงกลุ่มผู้ใช้</value>
-        <value xml:lang="zh">把这个联系信息添加到会员</value>
-    </property>
-    <property key="PartyAddPurpose">
-        <value xml:lang="en">Add Purpose</value>
-        <value xml:lang="es">Añadir un propósito</value>
-        <value xml:lang="fr">Ajouter un but</value>
-        <value xml:lang="it">Aggiungi Funzione</value>
-        <value xml:lang="nl">Nieuw Doel</value>
-        <value xml:lang="ro">Adauga Functie</value>
-        <value xml:lang="ru">Добавить цель</value>
-        <value xml:lang="th">เพิ่มเป้าหมาย</value>
-        <value xml:lang="zh">添加目的</value>
-    </property>
-    <property key="PartyAddWorkEffort">
-        <value xml:lang="en">Add Work Effort</value>
-        <value xml:lang="es">Añadir esfuerzo de trabajo</value>
-        <value xml:lang="it">Aggiungi Impegno di Lavoro</value>
-        <value xml:lang="nl">Nieuwe actie</value>
-        <value xml:lang="ro">Adauga Sarcina de Lucru </value>
-        <value xml:lang="th">เพิ่มงาน</value>
-        <value xml:lang="zh">添加人工服务</value>
-    </property>
-    <property key="PartyAddressLine1">
-        <value xml:lang="en">Address Line 1</value>
-        <value xml:lang="es">Dirección (línea 1)</value>
-        <value xml:lang="fr">Ligne d'adresse 1</value>
-        <value xml:lang="it">Indirizzo riga 1</value>
-        <value xml:lang="nl">Adres lijn 1</value>
-        <value xml:lang="ro">Adresa Linia 1</value>
-        <value xml:lang="ru">Строка 1 для адреса</value>
-        <value xml:lang="th">ที่อยู่ที่ 1</value>
-        <value xml:lang="zh">地址行1</value>
-    </property>
-    <property key="PartyAddressLine2">
-        <value xml:lang="en">Address Line 2</value>
-        <value xml:lang="es">Dirección (línea 2)</value>
-        <value xml:lang="fr">Ligne d'adresse 2</value>
-        <value xml:lang="it">Indirizzo riga 2</value>
-        <value xml:lang="nl">Adres Lijn 2</value>
-        <value xml:lang="ro">Adresa Linia 2</value>
-        <value xml:lang="ru">Строка 2 для адреса</value>
-        <value xml:lang="th">ที่อยู่ที่ 2</value>
-        <value xml:lang="zh">地址行2</value>
-    </property>
-    <property key="PartyAreaCode">
-        <value xml:lang="en">Area Code</value>
-        <value xml:lang="es">Código de área</value>
-        <value xml:lang="fr">Indicatif régional</value>
-        <value xml:lang="it">Codice Area</value>
-        <value xml:lang="nl">Gemeente</value>
-        <value xml:lang="ro">Cod Arie</value>
-        <value xml:lang="ru">Тлф код города</value>
-        <value xml:lang="th">รหัสพื้นที่</value>
-        <value xml:lang="zh">地区代码</value>
-    </property>
-    <property key="PartyAttentionName">
-        <value xml:lang="en">Attention Name</value>
-        <value xml:lang="es">A la atención de</value>
-        <value xml:lang="fr">A l'attention de</value>
-        <value xml:lang="it">Attenzione Di</value>
-        <value xml:lang="nl">T.a.v</value>
-        <value xml:lang="ro">Atentie </value>
-        <value xml:lang="ru">Имя в поле "Вниманию"</value>
-        <value xml:lang="th">การพิจารณาชื่อ</value>
-        <value xml:lang="zh">收件人</value>
-    </property>
-    <property key="PartyCity">
-        <value xml:lang="en">City</value>
-        <value xml:lang="es">Ciudad</value>
-        <value xml:lang="fr">Ville</value>
-        <value xml:lang="it">Città</value>
-        <value xml:lang="nl">Plaats</value>
-        <value xml:lang="ro">Oras</value>
-        <value xml:lang="ru">Город</value>
-        <value xml:lang="th">เมือง</value>
-        <value xml:lang="zh">城市</value>
-    </property>
-    <property key="PartyContactExt">
-        <value xml:lang="en">ext</value>
-        <value xml:lang="es">ext.</value>
-        <value xml:lang="fr">ext.</value>
-        <value xml:lang="it">int.</value>
-        <value xml:lang="nl">ext</value>
-        <value xml:lang="ro">int.</value>
-        <value xml:lang="ru">Доб.</value>
-        <value xml:lang="th">ext</value>
-        <value xml:lang="zh">扩展</value>
-    </property>
-    <property key="PartyContactInformation">
-        <value xml:lang="en">Contact Information</value>
-        <value xml:lang="es">Información de contacto</value>
-        <value xml:lang="fr">Coordonnées</value>
-        <value xml:lang="it">Informazione Contatto</value>
-        <value xml:lang="nl">Contact Informatie</value>
-        <value xml:lang="ro">Informatie Contact</value>
-        <value xml:lang="ru">Информация о контакте</value>
-        <value xml:lang="th">ข้อมูลการติดต่อ</value>
-        <value xml:lang="zh">联系信息</value>
-    </property>
-    <property key="PartyContactNumber">
-        <value xml:lang="en">Contact Number</value>
-        <value xml:lang="es">Número de contacto</value>
-        <value xml:lang="fr">Numéro</value>
-        <value xml:lang="it">Numero Contatto</value>
-        <value xml:lang="nl">Contact Nummer</value>
-        <value xml:lang="ro">Numar Contact</value>
-        <value xml:lang="ru">Номер контакта</value>
-        <value xml:lang="th">หมายเลขการติดต่อ</value>
-        <value xml:lang="zh">联系编号</value>
-    </property>
-    <property key="PartyContactPurposes">
-        <value xml:lang="en">Contact Purposes</value>
-        <value xml:lang="es">Propósito del contacto</value>
-        <value xml:lang="fr">Objet des coordonnées</value>
-        <value xml:lang="it">Funzioni Contatto</value>
-        <value xml:lang="nl">Contact doel</value>
-        <value xml:lang="ro">Functii Contacto</value>
-        <value xml:lang="ru">Цель контакта</value>
-        <value xml:lang="th">เป้าหมายการติดต่อ</value>
-        <value xml:lang="zh">联系目的</value>
-    </property>
-    <property key="PartyCountry">
-        <value xml:lang="en">Country</value>
-        <value xml:lang="es">País</value>
-        <value xml:lang="fr">Pays</value>
-        <value xml:lang="it">Paese</value>
-        <value xml:lang="nl">Land</value>
-        <value xml:lang="ro">Tara</value>
-        <value xml:lang="ru">Страна</value>
-        <value xml:lang="th">ประเทศ</value>
-        <value xml:lang="zh">国家</value>
-    </property>
-    <property key="PartyCountryCode">
-        <value xml:lang="en">Country Code</value>
-        <value xml:lang="es">Código de país</value>
-        <value xml:lang="fr">Code pays</value>
-        <value xml:lang="it">Codice Paese</value>
-        <value xml:lang="nl">Landcode</value>
-        <value xml:lang="ro">Cod Tara</value>
-        <value xml:lang="ru">Тлф код страны</value>
-        <value xml:lang="th">รหัสประเทศ</value>
-        <value xml:lang="zh">国家代码</value>
-    </property>
-    <property key="PartyCreateAdditionalContactInformation">
-        <value xml:lang="en">Create additional contact information</value>
-        <value xml:lang="es">Crear información adicional de contacto</value>
-        <value xml:lang="fr">Créer des coordonnées additionnelles</value>
-        <value xml:lang="it">Creare informazioni contatto aggiuntive</value>
-        <value xml:lang="nl">Nieuwe extra contact information</value>
-        <value xml:lang="ro">Creare informatii contact suplimentare</value>
-        <value xml:lang="ru">Создать дополнительную информацию о контакте</value>
-        <value xml:lang="th">สร้างการเพิ่มข้อมูลการติดต่อ</value>
-        <value xml:lang="zh">新建附加联系信息</value>
-    </property>
-    <property key="PartyCreateNewContact">
-        <value xml:lang="en">Create new contact information</value>
-        <value xml:lang="es">Crear nueva información de contacto</value>
-        <value xml:lang="fr">Créer de nouvelles coordonnées</value>
-        <value xml:lang="it">Creare nuova informazione contatto</value>
-        <value xml:lang="nl">Nieuw contact informatie</value>
-        <value xml:lang="ro">Creare noua informatie contact</value>
-        <value xml:lang="ru">Создать новую информацию о контакте</value>
-        <value xml:lang="th">สร้างข้อมูลการติดต่อใหม่</value>
-        <value xml:lang="zh">新建联系信息</value>
-    </property>
-    <property key="PartyEditContactInformation">
-        <value xml:lang="en">Edit Contact Information</value>
-        <value xml:lang="es">Editar información de contacto</value>
-        <value xml:lang="fr">Modifier les coordonnées</value>
-        <value xml:lang="it">Aggiorna Informazione Contatto</value>
-        <value xml:lang="nl">Wijzig contact informatie</value>
-        <value xml:lang="ro">Actualizeaza Informatie Contact</value>
-        <value xml:lang="ru">Редактировать информацию о контакте</value>
-        <value xml:lang="th">แก้ไขข้อมูลการติดต่อ</value>
-        <value xml:lang="zh">编辑联系信息</value>
-    </property>
-    <property key="PartyEditWorkEffort">
-        <value xml:lang="en">Edit Work Effort</value>
-        <value xml:lang="es">Editar esfuerzo de trabajo</value>
-        <value xml:lang="fr">Modifier la tâche</value>
-        <value xml:lang="it">Aggiorna Impegno di Lavoro</value>
-        <value xml:lang="nl">Wijzig actie</value>
-        <value xml:lang="ro">Actualizeaza Sarcina de Lucru </value>
-        <value xml:lang="th">แก้ไขงาน</value>
-        <value xml:lang="zh">编辑人工服务</value>
-    </property>
-    <property key="PartyEmailAddress">
-        <value xml:lang="en">Email Address</value>
-        <value xml:lang="es">E-mail</value>
-        <value xml:lang="fr">Adresse courriel</value>
-        <value xml:lang="it">Indirizzo Email</value>
-        <value xml:lang="nl">Emailadres</value>
-        <value xml:lang="ro">Adresa Email</value>
-        <value xml:lang="ru">e-mail</value>
-        <value xml:lang="th">ที่อยู่อีเมล</value>
-        <value xml:lang="zh">电子邮件地址</value>
-    </property>
-    <property key="PartyErrorContactInformation">
-        <value xml:lang="en">The contact information specified does not belong to you, you may not view or edit it.</value>
-        <value xml:lang="es">La información de contacto especificada no le pertenece, por tanto no podrá editarla.</value>
-        <value xml:lang="fr">Les coordonnées spécifiées ne vous appartiennent pas, vous ne pouvez ni les voir, ni les modifier.</value>
-        <value xml:lang="it">L'informazione contatto specificata non corrisponde a te, tu non puoi vederla o modificarla.</value>
-        <value xml:lang="nl">The contact information specified does not belong to you, you may not view or edit it.</value>
-        <value xml:lang="ro">Informatia contact specificata nu iti corespunde, nu  poti vedea sau modifica.</value>
-        <value xml:lang="ru">Данная информация о контакте не принадлежит Вам. Просмотр и редуктирование недоступны.</value>
-        <value xml:lang="th">ข้อมูลการติดต่อระบุไม่เป็นส่วนหนึ่งของคุณ, คุณอาจจะไม่แสดงหรือแก้ไขมัน.</value>
-        <value xml:lang="zh">指定的联系方式不属于你，你不能浏览和编辑它。</value>
-    </property>
-    <property key="PartyGroupPartyId">
-        <value xml:lang="en">Group Party ID</value>
-        <value xml:lang="es">Código de grupo de participante</value>
-        <value xml:lang="fr">Réf. de groupe d'acteur</value>
-        <value xml:lang="it">Codice Gruppo Soggetto</value>
-        <value xml:lang="nl">Group Party ID</value>
-        <value xml:lang="ro">Cod Grup Subiect</value>
-        <value xml:lang="ru">ID группы участника</value>
-        <value xml:lang="th">รหัสกลุ่มผู้ใช้</value>
-        <value xml:lang="zh">组会员标识</value>
-    </property>
-    <property key="PartyIdMissing">
-        <value xml:lang="en">Party ID is missing.</value>
-        <value xml:lang="fr">Réf. d'acteur manquante</value>
-        <value xml:lang="it">Soggetto è mancante.</value>
-        <value xml:lang="ro">Subiect lipseste.</value>
-        <value xml:lang="th">ซึ่งไม่พบกลุ่มผู้ใช้</value>
-        <value xml:lang="zh">找不到会员标识</value>
-    </property>
-    <property key="PartyName">
-        <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="nl">Name</value>
-        <value xml:lang="ro">Nume</value>
-        <value xml:lang="ru">Имя</value>
-        <value xml:lang="th">ชื่อ</value>
-        <value xml:lang="zh">名字</value>
-    </property>
-    <property key="PartyNoContactInformationParty">
-        <value xml:lang="en">No contact information was found for the party with ID ${partyId}</value>
-        <value xml:lang="es">No se encontró información de contacto para el participante con código ${partyId}</value>
-        <value xml:lang="fr">Aucune coordonnées trouvées pour l'acteur avec la réf.: ${partyId}</value>
-        <value xml:lang="it">Nessuna informazione contatto è stata trovata per il Soggetto con Codice ${partyId}</value>
-        <value xml:lang="nl">No contact information was found for the party with ID ${partyId}</value>
-        <value xml:lang="ro">Nici-o informatie contact a fost gasita pentru  Subiectul cu Cod ${partyId}</value>
-        <value xml:lang="ru">Не найдено никакой контактной информации для участника с ID ${partyId}</value>
-        <value xml:lang="th">ไม่พบข้อมูลการติดต่อสำหรับกลุ่มผู้ใช้ด้วยรหัส ${partyId}</value>
-        <value xml:lang="zh">没有找到标识为${partyId}的会员的联系信息</value>
-    </property>
-    <property key="PartyNoteNewContactInformation">
-        <value xml:lang="en">Note: this new contact information will have the purpose</value>
-        <value xml:lang="es">Nota: esta nueva información de contacto tendrá el propósito de</value>
-        <value xml:lang="fr">Note: ces nouvelles coordonnées seront destinées à ce but</value>
-        <value xml:lang="it">Nota: questo nuova informazione contatto che avrà la funzione</value>
-        <value xml:lang="nl">Opmerking: dit nieuwe contact this new contact information will have the purpose</value>
-        <value xml:lang="ro">Nota: aceasta noua informatie contact va avea functia</value>
-        <value xml:lang="ru">Внимание: этому новому контакту будет приписана цель</value>
-        <value xml:lang="th">Note: หมายเหตุ นี่คือข้อมูลการติดต่อใหม่จะมีเป้าหมาย</value>
-        <value xml:lang="zh">注意：这个新的联系信息的目的是</value>
-    </property>
-    <property key="PartyParties">
-        <value xml:lang="en">Parties</value>
-        <value xml:lang="es">Participantes</value>
-        <value xml:lang="fr">Acteurs</value>
-        <value xml:lang="it">Soggetti</value>
-        <value xml:lang="nl">Relaties</value>
-        <value xml:lang="ro">Subiecti</value>
-        <value xml:lang="ru">Участники</value>
-        <value xml:lang="th">กลุ่มผู้ใช้</value>
-        <value xml:lang="zh">会员</value>
-    </property>
-    <property key="PartyPartyAssignmentStatus">
-        <value xml:lang="en">Party Assignment Status</value>
-        <value xml:lang="es">Estado de asignación del participante</value>
-        <value xml:lang="fr">Etat de l'affectation de l'acteur</value>
-        <value xml:lang="it">Stato Soggetto Assegnato</value>
-        <value xml:lang="nl">Toekkenen status relatie</value>
-        <value xml:lang="ro">Stare Subiect Atribuit</value>
-        <value xml:lang="ru">Статус назначения участника</value>
-        <value xml:lang="th">สถานะกลุ่มการมอบหมายงาน</value>
-        <value xml:lang="zh">会员指派状态</value>
-    </property>
-    <property key="PartyPartyAssignmentsDetail">
-        <value xml:lang="en">Party Assignments Detail</value>
-        <value xml:lang="es">Detalle de asignaciones del participante</value>
-        <value xml:lang="fr">Détail des affectations de l'acteur</value>
-        <value xml:lang="it">Dettaglio Soggetto Assegnati</value>
-        <value xml:lang="nl">Toekennen relatie detail</value>
-        <value xml:lang="ro">Subiect Atribuiri Detaliu </value>
-        <value xml:lang="ru">Подробности назначения участника</value>
-        <value xml:lang="th">รายละเอียดกลุ่มการมอบหมาย</value>
-        <value xml:lang="zh">会员指派详细</value>
-    </property>
-    <property key="PartyPartyId">
-        <value xml:lang="de">Vertragspartner ID</value>
-        <value xml:lang="en">Party ID</value>
-        <value xml:lang="es">Código del participante</value>
-        <value xml:lang="fr">Réf. de l'acteur</value>
-        <value xml:lang="it">Codice Soggetto</value>
-        <value xml:lang="nl">Relatie ID</value>
-        <value xml:lang="ro">Cod Subiect </value>
-        <value xml:lang="ru">ID участника</value>
-        <value xml:lang="th">รหัสกลุ่มผู้ใช้</value>
-        <value xml:lang="zh">会员标识</value>
-    </property>
-    <property key="PartyPhoneNumber">
-        <value xml:lang="en">Phone Number</value>
-        <value xml:lang="es">Número de teléfono</value>
-        <value xml:lang="fr">Numéro de téléphone</value>
-        <value xml:lang="it">Numero Telefono</value>
-        <value xml:lang="nl">Telefoonnummer</value>
-        <value xml:lang="ro">Numar Telefon</value>
-        <value xml:lang="ru">Тлф</value>
-        <value xml:lang="th">หมายเลขโทรศัพท์</value>
-        <value xml:lang="zh">电话号码</value>
-    </property>
-    <property key="PartyPurposeTypeNotFound">
-        <value xml:lang="en">Purpose Type not found with ID</value>
-        <value xml:lang="es">No se encontró el tipo de propósito con código</value>
-        <value xml:lang="fr">Type de but non trouvé avec cette réf.</value>
-        <value xml:lang="it">Tipo Funzione non trovato con Codice</value>
-        <value xml:lang="nl">Soort doel niet gevonden met ID</value>
-        <value xml:lang="ro">Nu gaseste Tip Functie cu Cod</value>
-        <value xml:lang="ru">Для этого ID цель указанного типа не найдена</value>
-        <value xml:lang="th">ไม่พบประเภทเป้าหมายด้วยรหัส</value>
-        <value xml:lang="zh">没有找到目的类型：目的标识</value>
-    </property>
-    <property key="PartyRoleId">
-        <value xml:lang="en">Role ID</value>
-        <value xml:lang="es">Código de rol</value>
-        <value xml:lang="fr">Réf. du rôle</value>
-        <value xml:lang="it">Codice Ruolo</value>
-        <value xml:lang="nl">Rol ID</value>
-        <value xml:lang="ro">Cod Rol</value>
-        <value xml:lang="ru">ID роли</value>
-        <value xml:lang="th">รหัสสถานะ</value>
-        <value xml:lang="zh">角色标识</value>
-    </property>
-    <property key="PartyRoleTypeId">
-        <value xml:lang="de">Funktionstyp ID</value>
-        <value xml:lang="en">RoleType ID</value>
-        <value xml:lang="es">Código de tipo de rol</value>
-        <value xml:lang="fr">Réf. de type de rôle</value>
-        <value xml:lang="it">Tipo Ruolo</value>
-        <value xml:lang="nl">Soort Rol ID</value>
-        <value xml:lang="ro">Tip Rol</value>
-        <value xml:lang="ru">ID типа роли</value>
-        <value xml:lang="th">รหัสประเภทสถานะ</value>
-        <value xml:lang="zh">角色类型标识</value>
-    </property>
-    <property key="PartyRoleTypeIdMissing">
-        <value xml:lang="en">Role Type ID is missing.</value>
-        <value xml:lang="fr">Réf. de type de rôle manquant</value>
-        <value xml:lang="it">Tipo Ruolo è mancante.</value>
-        <value xml:lang="ro">Tip Rol lipseste.</value>
-        <value xml:lang="th">ไม่พบรหัสประเภทสถานะ</value>
-        <value xml:lang="zh">没有找到角色类型标识。</value>
-    </property>
-    <property key="PartySendEmail">
-        <value xml:lang="en">Send Email</value>
-        <value xml:lang="es">Enviar un e-mail</value>
-        <value xml:lang="fr">Envoyer le courriel</value>
-        <value xml:lang="it">Invia Email</value>
-        <value xml:lang="nl">Stuur email</value>
-        <value xml:lang="ro">Trimite Email</value>
-        <value xml:lang="ru">Отправить e-mail</value>
-        <value xml:lang="th">ส่งอีเมล
-</value>
-        <value xml:lang="zh">发送电子邮件</value>
-    </property>
-    <property key="PartyStateProvince">
-        <value xml:lang="en">State/Province</value>
-        <value xml:lang="es">Estado/Provincia</value>
-        <value xml:lang="fr">Région/Province</value>
-        <value xml:lang="it">Stato/Provincia</value>
-        <value xml:lang="nl">Provincie</value>
-        <value xml:lang="ro">Stat/Provincie</value>
-        <value xml:lang="ru">Область, край, республика</value>
-        <value xml:lang="th">รัฐ/จังหวัด</value>
-        <value xml:lang="zh">州/省</value>
-    </property>
-    <property key="PartyToName">
-        <value xml:lang="en">To Name</value>
-        <value xml:lang="es">Nombre:</value>
-        <value xml:lang="fr">Nom destination</value>
-        <value xml:lang="it">Al Nome</value>
-        <value xml:lang="nl">T.a.v.</value>
-        <value xml:lang="ro">La Nume </value>
-        <value xml:lang="ru">Кому</value>
-        <value xml:lang="th">ถึงชื่อ</value>
-        <value xml:lang="zh">名字</value>
-    </property>
-    <property key="PartyZipPostalCode">
-        <value xml:lang="en">Zip/Postal Code</value>
-        <value xml:lang="es">Código postal</value>
-        <value xml:lang="fr">Code postal</value>
-        <value xml:lang="it">C.A.P.</value>
-        <value xml:lang="nl">Postcode</value>
-        <value xml:lang="ro">C.A.P.</value>
-        <value xml:lang="ru">Почтовый индекс</value>
-        <value xml:lang="th">รหัสไปรษณีย์</value>
-        <value xml:lang="zh">邮政编码</value>
-    </property>
-    <property key="PriorityFormatNotCorrect">
-        <value xml:lang="en">Priority format is incorrect</value>
-        <value xml:lang="fr">Le format prioritaire est incorrect</value>
-        <value xml:lang="th">รูปแบบสิทธิพิเศษไม่ถูกต้อง</value>
-    </property>
-    <property key="Timesheet">
-        <value xml:lang="en">Timesheet</value>
-        <value xml:lang="es">Hoja de tiempos</value>
-        <value xml:lang="fr">Feuille d'activité</value>
-        <value xml:lang="it">Timbratura</value>
-        <value xml:lang="nl">Tijdschema</value>
-        <value xml:lang="ro">Pontaj</value>
-        <value xml:lang="th">ตารางเวลาการทำงาน</value>
-        <value xml:lang="zh">工单</value>
-    </property>
-    <property key="TimesheetCreate">
-        <value xml:lang="en">Create Timesheet</value>
-        <value xml:lang="es">Crear hoja de tiempos</value>
-        <value xml:lang="fr">Créer la feuille d'activité</value>
-        <value xml:lang="it">Creare Timbratura</value>
-        <value xml:lang="nl">Nieuw tijdschema</value>
-        <value xml:lang="ro">Creare Pontaj</value>
-        <value xml:lang="th">สร้างตารางการทำงาน</value>
-        <value xml:lang="zh">新建工单</value>
-    </property>
-    <property key="TimesheetHours">
-        <value xml:lang="en">Hours</value>
-        <value xml:lang="fr">Heures</value>
-        <value xml:lang="it">Ore</value>
-        <value xml:lang="nl">Uren</value>
-        <value xml:lang="ro">Ore</value>
-        <value xml:lang="th">ชั่งโมง</value>
-        <value xml:lang="zh">小时</value>
-    </property>
-    <property key="TimesheetMyTime">
-        <value xml:lang="en">My Time</value>
-        <value xml:lang="es">Mi tiempo</value>
-        <value xml:lang="fr">Mon temps</value>
-        <value xml:lang="it">Mio Tempo</value>
-        <value xml:lang="nl">Mijn tijd</value>
-        <value xml:lang="ro">Timpul Meu</value>
-        <value xml:lang="th">เวลาของฉัน</value>
-        <value xml:lang="zh">我的时间</value>
-    </property>
-    <property key="TimesheetQuickTimeEntry">
-        <value xml:lang="en">Quick Time Entry</value>
-        <value xml:lang="fr">Entrée rapide d'une ligne d'activité</value>
-        <value xml:lang="it">Inserimento Veloce Ore</value>
-        <value xml:lang="nl">Snel een tijd invoeren</value>
-        <value xml:lang="ro">Introducere Rapida Ore</value>
-        <value xml:lang="th">กรอกข้อมูลเวลาอย่างรวดเร็ว</value>
-        <value xml:lang="zh">快速时间记录</value>
-    </property>
-    <property key="TimesheetRateType">
-        <value xml:lang="en">Rate Type</value>
-        <value xml:lang="es">Tipo de tasa</value>
-        <value xml:lang="fr">Type de taux</value>
-        <value xml:lang="it">Tipo Percentuale</value>
-        <value xml:lang="nl">Soort tarief</value>
-        <value xml:lang="ro">Tip Procent</value>
-        <value xml:lang="th">ประเภทอัตรา</value>
-        <value xml:lang="zh">费率类型</value>
-    </property>
-    <property key="TimesheetRates">
-        <value xml:lang="de">Raten</value>
-        <value xml:lang="en">Rates</value>
-        <value xml:lang="es">Tasas</value>
-        <value xml:lang="fr">Taux</value>
-        <value xml:lang="it">Percentuali</value>
-        <value xml:lang="nl">Tarieven</value>
-        <value xml:lang="ro">Procente</value>
-        <value xml:lang="th">อัตรา</value>
-        <value xml:lang="zh">费率</value>
-    </property>
-    <property key="TimesheetTimeEntries">
-        <value xml:lang="en">Time Entries</value>
-        <value xml:lang="es">Entradas de tiempo</value>
-        <value xml:lang="fr">Lignes d'activité</value>
-        <value xml:lang="it">Righe Tempo</value>
-        <value xml:lang="nl">Invoer tijden</value>
-        <value xml:lang="ro">Linie Timp</value>
-        <value xml:lang="th">ตารางเวลา</value>
-        <value xml:lang="zh">时间记录</value>
-    </property>
-    <property key="TimesheetTimeEntry">
-        <value xml:lang="en">Time Entry</value>
-        <value xml:lang="es">Entrada de tiempo</value>
-        <value xml:lang="fr">Ligne d'activité</value>
-        <value xml:lang="it">Riga Tempo</value>
-        <value xml:lang="nl">Tijd invoer</value>
-        <value xml:lang="ro">Linie Timp</value>
-        <value xml:lang="th">ตารางเวลา</value>
-        <value xml:lang="zh">时间记录</value>
-    </property>
-    <property key="TimesheetTimesheetId">
-        <value xml:lang="en">Timesheet ID</value>
-        <value xml:lang="es">Código de hoja de tiempos</value>
-        <value xml:lang="fr">Réf. de feuille d'activité</value>
-        <value xml:lang="it">Numero Timbratura</value>
-        <value xml:lang="nl">Tijdschema ID</value>
-        <value xml:lang="ro">Numar Pontaj</value>
-        <value xml:lang="th">รหัสตารางเวลาการทำงาน</value>
-        <value xml:lang="zh">工单编号</value>
-    </property>
-    <property key="TimesheetTimsheetEdit">
-        <value xml:lang="en">Edit Timesheet</value>
-        <value xml:lang="fr">Modifier la feuille d'activité</value>
-        <value xml:lang="th">แก้ไขตารางเวลาการทำงาน</value>
-    </property>
-    <property key="TitleAddWorkEffortQuote">
-        <value xml:lang="en">Add  WorkEffort  Quote</value>
-        <value xml:lang="fr">Ajouter un devis à la tâche</value>
-        <value xml:lang="ro">Adauga Sarcina de Lucru Preventiva</value>
-        <value xml:lang="th">เพิ่มการอ้างอิงงาน</value>
-    </property>
-    <property key="WorKEffortInternalNote">
-        <value xml:lang="en">Internal Note</value>
-        <value xml:lang="fr">Note interne</value>
-        <value xml:lang="it">Nota Interna</value>
-        <value xml:lang="th">ข้อความภายใน</value>
-        <value xml:lang="zh">内部便笺</value>
-    </property>
-    <property key="WorkEffort">
-        <value xml:lang="en">WorkEffort</value>
-        <value xml:lang="es">Esfuerzo de trabajo</value>
-        <value xml:lang="fr">Tâche</value>
-        <value xml:lang="th">งาน</value>
-    </property>
     <property key="WorkEffortAcceptAssignment">
         <value xml:lang="en">Accept Assignment</value>
         <value xml:lang="es">Aceptar tarea</value>
@@ -2236,8 +1567,7 @@
         <value xml:lang="nl">Calendar Up-Coming Events View</value>
         <value xml:lang="ro">Afiseaza Evenimente Calendar care vor fi  </value>
         <value xml:lang="ru">Список наступающих событий</value>
-        <value xml:lang="th">แสดงผลที่ได้จากปฏิทินล่วงหน้า
-</value>
+        <value xml:lang="th">แสดงผลที่ได้จากปฏิทินล่วงหน้า</value>
         <value xml:lang="zh">浏览日历即将到来的事件</value>
     </property>
     <property key="WorkEffortCalendarWeekView">
@@ -2646,6 +1976,13 @@
         <value xml:lang="th">สำหรับการสนใจบางสิ่งทำให้มั่นใจ, คุณพยายามลอกอินเข้าสู่ระบบ : ชื่อผู้เข้าใช้;Admin;รหัสผ่าน Ofbiz</value>
         <value xml:lang="zh">如果你对某些内容感兴趣，你需要登录系统，可以尝试用户名：admin;密码：Ofbiz</value>
     </property>
+    <property key="WorkEffortInternalNote">
+        <value xml:lang="en">Internal Note</value>
+        <value xml:lang="fr">Note interne</value>
+        <value xml:lang="it">Nota interna</value>
+        <value xml:lang="th">ข้อความภายใน</value>
+        <value xml:lang="zh">内部便笺</value>
+    </property>
     <property key="WorkEffortItem">
         <value xml:lang="en">Item</value>
         <value xml:lang="es">Artículo</value>
@@ -3268,6 +2605,12 @@
         <value xml:lang="th">สิทธิพิเศษ</value>
         <value xml:lang="zh">优先级</value>
     </property>
+    <property key="WorkEffortPriorityFormatNotCorrect">
+        <value xml:lang="en">Priority format is incorrect</value>
+        <value xml:lang="fr">Le format prioritaire est incorrect</value>
+        <value xml:lang="it">Formato priorità non è corretto</value>
+        <value xml:lang="th">รูปแบบสิทธิพิเศษไม่ถูกต้อง</value>
+    </property>
     <property key="WorkEffortPriorityHigh">
         <value xml:lang="en">High</value>
         <value xml:lang="fr">Haute</value>
@@ -3866,12 +3209,118 @@
         <value xml:lang="th">ใบเสร็จรับเงินถึงกลุ่มผู้ใช้</value>
         <value xml:lang="zh">账单到会员</value>
     </property>
-    <property key="WorkEffortTimeSheetNotInRolePermissionError">
+    
+    <property key="WorkEffortTimesheet">
+        <value xml:lang="en">Timesheet</value>
+        <value xml:lang="es">Hoja de tiempos</value>
+        <value xml:lang="fr">Feuille d'activité</value>
+        <value xml:lang="it">Timbratura</value>
+        <value xml:lang="nl">Tijdschema</value>
+        <value xml:lang="ro">Pontaj</value>
+        <value xml:lang="th">ตารางเวลาการทำงาน</value>
+        <value xml:lang="zh">工单</value>
+    </property>
+    <property key="WorkEffortTimesheetCreate">
+        <value xml:lang="en">Create Timesheet</value>
+        <value xml:lang="es">Crear hoja de tiempos</value>
+        <value xml:lang="fr">Créer la feuille d'activité</value>
+        <value xml:lang="it">Creare timbratura</value>
+        <value xml:lang="nl">Nieuw tijdschema</value>
+        <value xml:lang="ro">Creare Pontaj</value>
+        <value xml:lang="th">สร้างตารางการทำงาน</value>
+        <value xml:lang="zh">新建工单</value>
+    </property>
+    <property key="WorkEffortTimesheetHours">
+        <value xml:lang="en">Hours</value>
+        <value xml:lang="fr">Heures</value>
+        <value xml:lang="it">Ore</value>
+        <value xml:lang="nl">Uren</value>
+        <value xml:lang="ro">Ore</value>
+        <value xml:lang="th">ชั่งโมง</value>
+        <value xml:lang="zh">小时</value>
+    </property>
+    <property key="WorkEffortTimesheetMyTime">
+        <value xml:lang="en">My Time</value>
+        <value xml:lang="es">Mi tiempo</value>
+        <value xml:lang="fr">Mon temps</value>
+        <value xml:lang="it">Mio tempo</value>
+        <value xml:lang="nl">Mijn tijd</value>
+        <value xml:lang="ro">Timpul Meu</value>
+        <value xml:lang="th">เวลาของฉัน</value>
+        <value xml:lang="zh">我的时间</value>
+    </property>
+    <property key="WorkEffortTimesheetNotInRolePermissionError">
         <value xml:lang="en">Security Error: to run ${resourceDescription} you must be in ${roleTypeId} role with WorkEffort: ${workEffortId}</value>
         <value xml:lang="fr">Erreur de sécurité: pour exécuter ${resourceDescription} vous devez être dans le rôle ${roleTypeId} avec la tâche ${workEffortId}</value>
         <value xml:lang="it">Errore Sicurezza: per eseguire ${resourceDescription} tu devi avere il ruolo ${roleTypeId} con l'Impegno di Lavoro: ${workEffortId}</value>
         <value xml:lang="th">Security Error: ความปลอดภัยผิดพลาด ! การดำเนินการ ${resourceDescription} คุณต้องเป็น ${roleTypeId} ด้วยสถานะงาน: ${workEffortId}</value>
     </property>
+    <property key="WorkEffortTimesheetQuickTimeEntry">
+        <value xml:lang="en">Quick Time Entry</value>
+        <value xml:lang="fr">Entrée rapide d'une ligne d'activité</value>
+        <value xml:lang="it">Inserimento veloce ore</value>
+        <value xml:lang="nl">Snel een tijd invoeren</value>
+        <value xml:lang="ro">Introducere Rapida Ore</value>
+        <value xml:lang="th">กรอกข้อมูลเวลาอย่างรวดเร็ว</value>
+        <value xml:lang="zh">快速时间记录</value>
+    </property>
+    <property key="WorkEffortTimesheetRateType">
+        <value xml:lang="en">Rate Type</value>
+        <value xml:lang="es">Tipo de tasa</value>
+        <value xml:lang="fr">Type de taux</value>
+        <value xml:lang="it">Tipo percentuale</value>
+        <value xml:lang="nl">Soort tarief</value>
+        <value xml:lang="ro">Tip Procent</value>
+        <value xml:lang="th">ประเภทอัตรา</value>
+        <value xml:lang="zh">费率类型</value>
+    </property>
+    <property key="WorkEffortTimesheetRates">
+        <value xml:lang="de">Raten</value>
+        <value xml:lang="en">Rates</value>
+        <value xml:lang="es">Tasas</value>
+        <value xml:lang="fr">Taux</value>
+        <value xml:lang="it">Percentuali</value>
+        <value xml:lang="nl">Tarieven</value>
+        <value xml:lang="ro">Procente</value>
+        <value xml:lang="th">อัตรา</value>
+        <value xml:lang="zh">费率</value>
+    </property>
+    <property key="WorkEffortTimesheetTimeEntries">
+        <value xml:lang="en">Time Entries</value>
+        <value xml:lang="es">Entradas de tiempo</value>
+        <value xml:lang="fr">Lignes d'activité</value>
+        <value xml:lang="it">Voci timbrature</value>
+        <value xml:lang="nl">Invoer tijden</value>
+        <value xml:lang="ro">Linie Timp</value>
+        <value xml:lang="th">ตารางเวลา</value>
+        <value xml:lang="zh">时间记录</value>
+    </property>
+    <property key="WorkEffortTimesheetTimeEntry">
+        <value xml:lang="en">Time Entry</value>
+        <value xml:lang="es">Entrada de tiempo</value>
+        <value xml:lang="fr">Ligne d'activité</value>
+        <value xml:lang="it">Voce timbratura</value>
+        <value xml:lang="nl">Tijd invoer</value>
+        <value xml:lang="ro">Linie Timp</value>
+        <value xml:lang="th">ตารางเวลา</value>
+        <value xml:lang="zh">时间记录</value>
+    </property>
+    <property key="WorkEffortTimesheetTimesheetId">
+        <value xml:lang="en">Timesheet ID</value>
+        <value xml:lang="es">Código de hoja de tiempos</value>
+        <value xml:lang="fr">Réf. de feuille d'activité</value>
+        <value xml:lang="it">Numero timbratura</value>
+        <value xml:lang="nl">Tijdschema ID</value>
+        <value xml:lang="ro">Numar Pontaj</value>
+        <value xml:lang="th">รหัสตารางเวลาการทำงาน</value>
+        <value xml:lang="zh">工单编号</value>
+    </property>
+    <property key="WorkEffortTimesheetTimsheetEdit">
+        <value xml:lang="en">Edit Timesheet</value>
+        <value xml:lang="fr">Modifier la feuille d'activité</value>
+        <value xml:lang="it">Aggiorna timbratura</value>
+        <value xml:lang="th">แก้ไขตารางเวลาการทำงาน</value>
+    </property>
     <property key="WorkEffortUpcomingEvents">
         <value xml:lang="en">Upcoming Events</value>
         <value xml:lang="es">Eventos próximos</value>
Index: applications/workeffort/script/org/ofbiz/workeffort/permission/WorkEffortPermissionServices.xml
===================================================================
--- applications/workeffort/script/org/ofbiz/workeffort/permission/WorkEffortPermissionServices.xml	(revision 731372)
+++ applications/workeffort/script/org/ofbiz/workeffort/permission/WorkEffortPermissionServices.xml	(working copy)
@@ -222,7 +222,7 @@
         <call-simple-method method-name="workEffortGenericPermission"/>
         <check-errors/>
         <if-compare-field operator="not-equals" field="parameters.partyId" to-field="userLogin.partyId">
-            <property-to-field resource="WorkEffortUiLabels" property="WorkEffortTimeSheetNotInRolePermissionError" field="failMessage"/>
+            <property-to-field resource="WorkEffortUiLabels" property="WorkEffortTimesheetNotInRolePermissionError" field="failMessage"/>
             <set field="hasPermission" type="Boolean" value="false"/>
             <field-to-result field="hasPermission"/>
             <field-to-result field="failMessage"/>
@@ -233,7 +233,7 @@
             <find-by-and entity-name="WorkEffortPartyAssignByRole" map="lookupRoleWorkEffortMap" list="roleParties"/>                    
             <filter-list-by-date list="roleParties"/>
             <if-empty field="roleParties">
-                <property-to-field resource="WorkEffortUiLabels" property="WorkEffortTimeSheetNotInRolePermissionError" field="failMessage"/>
+                <property-to-field resource="WorkEffortUiLabels" property="WorkEffortTimesheetNotInRolePermissionError" field="failMessage"/>
                 <set field="hasPermission" type="Boolean" value="false"/>
                 <field-to-result field="hasPermission"/>
                 <field-to-result field="failMessage"/>
Index: applications/workeffort/widget/TimesheetForms.xml
===================================================================
--- applications/workeffort/widget/TimesheetForms.xml	(revision 731372)
+++ applications/workeffort/widget/TimesheetForms.xml	(working copy)
@@ -28,7 +28,7 @@
             </entity-and>
         </actions>
         <auto-fields-entity entity-name="Timesheet"/>
-        <field name="timesheetId" title="${uiLabelMap.TimesheetTimesheetId}" widget-style="buttontext">
+        <field name="timesheetId" title="${uiLabelMap.WorkEffortTimesheetTimesheetId}" widget-style="buttontext">
             <hyperlink description="${timesheetId}" target="EditTimesheet?timesheetId=${timesheetId}" also-hidden="false"/>
         </field>
         <field name="partyId"><hidden/></field>
@@ -43,14 +43,14 @@
             </entity-and>
         </actions>
         <auto-fields-entity entity-name="PartyRate" default-field-type="display"/>
-        <field name="rateTypeId" title="${uiLabelMap.TimesheetRateType}"><display-entity entity-name="RateType"/></field>
+        <field name="rateTypeId" title="${uiLabelMap.WorkEffortTimesheetRateType}"><display-entity entity-name="RateType"/></field>
         <field name="partyId"><hidden/></field>
     </form>
     <form name="QuickCreateTimeEntry" target="createQuickTimeEntry" title="" type="single"
         header-row-style="header-row" default-table-style="basic-table">
         <field name="timesheetId" map-name="currentTimesheet"><hidden/></field>
         <field name="partyId" map-name="userLogin"><hidden/></field>
-        <field name="rateTypeId" title="${uiLabelMap.TimesheetRateType}">
+        <field name="rateTypeId" title="${uiLabelMap.WorkEffortTimesheetRateType}">
             <drop-down no-current-selected-key="STANDARD" >
                 <entity-options entity-name="RateType" description="${description}">
                     <entity-order-by field-name="description"/>
@@ -81,7 +81,7 @@
             </service>
         </actions>
         <auto-fields-entity entity-name="Timesheet"/>
-        <field name="timesheetId" title="${uiLabelMap.TimesheetTimesheetId}" widget-style="buttontext">
+        <field name="timesheetId" title="${uiLabelMap.WorkEffortTimesheetTimesheetId}" widget-style="buttontext">
             <hyperlink description="${timesheetId}" target="EditTimesheet?timesheetId=${timesheetId}" also-hidden="false"/>
         </field>
         <field name="partyId" title="${uiLabelMap.PartyParty}"><display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName} [${partyId}]"/></field>
@@ -92,9 +92,9 @@
         <alt-target target="createTimesheet" use-when="timesheet==null"/>
         <auto-fields-service service-name="updateTimesheet"/>
         
-        <field name="timesheetId" use-when="timesheet!=null" title="${uiLabelMap.TimesheetTimesheetId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
-        <field name="timesheetId" use-when="timesheet==null&amp;&amp;timesheetId==null" title="${uiLabelMap.TimesheetTimesheetId}"><ignored/></field>
-        <field name="timesheetId" use-when="timesheet==null&amp;&amp;timesheetId!=null" title="${uiLabelMap.TimesheetTimesheetId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${timesheetId}]"><display also-hidden="false"/></field>
+        <field name="timesheetId" use-when="timesheet!=null" title="${uiLabelMap.WorkEffortTimesheetTimesheetId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
+        <field name="timesheetId" use-when="timesheet==null&amp;&amp;timesheetId==null" title="${uiLabelMap.WorkEffortTimesheetTimesheetId}"><ignored/></field>
+        <field name="timesheetId" use-when="timesheet==null&amp;&amp;timesheetId!=null" title="${uiLabelMap.WorkEffortTimesheetTimesheetId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${timesheetId}]"><display also-hidden="false"/></field>
 
         <field name="partyId" title="${uiLabelMap.PartyParty}*"><lookup target-form-name="LookupPartyName"/></field>
         <field name="clientPartyId"><lookup target-form-name="LookupPartyName"/></field>
@@ -124,7 +124,7 @@
         <field name="timesheetId"><hidden/></field>
         
         <field name="partyId" title="${uiLabelMap.PartyParty}"/>
-        <field name="rateTypeId" title="${uiLabelMap.TimesheetRateType}"><display-entity entity-name="RateType"/></field>
+        <field name="rateTypeId" title="${uiLabelMap.WorkEffortTimesheetRateType}"><display-entity entity-name="RateType"/></field>
         <field name="workEffortId"><display-entity entity-name="WorkEffort" description="${workEffortName}"><sub-hyperlink target="WorkEffortSummary?workEffortId=${workEffortId}" description="${workEffortId}" link-style="buttontext"/></display-entity></field>
         <field name="invoiceId" widget-style="buttontext"><hyperlink target="/accounting/control/invoiceOverview?invoiceId=${invoiceId}" target-type="inter-app" description="${invoiceId}"/></field>
     </form>
@@ -194,7 +194,7 @@
         <field name="timesheetId"><hidden/></field>
         
         <field name="partyId" title="${uiLabelMap.PartyParty}"><lookup size="12" target-form-name="LookupPartyName" default-value="${timesheet.partyId}"/></field>
-        <field name="rateTypeId" title="${uiLabelMap.TimesheetRateType}">
+        <field name="rateTypeId" title="${uiLabelMap.WorkEffortTimesheetRateType}">
             <drop-down>
                 <entity-options entity-name="RateType" description="${description}">
                     <entity-order-by field-name="description"/>
@@ -228,7 +228,7 @@
         <field name="timesheetId"><hidden/></field>
         
         <field name="partyId" title="${uiLabelMap.PartyParty}"><lookup target-form-name="LookupPartyName" default-value="${timesheet.partyId}"/></field>
-        <field name="rateTypeId" title="${uiLabelMap.TimesheetRateType}">
+        <field name="rateTypeId" title="${uiLabelMap.WorkEffortTimesheetRateType}">
             <drop-down no-current-selected-key="STANDARD">
                 <entity-options entity-name="RateType" description="${description}">
                     <entity-order-by field-name="description"/>
Index: applications/workeffort/widget/TimesheetMenus.xml
===================================================================
--- applications/workeffort/widget/TimesheetMenus.xml	(revision 731372)
+++ applications/workeffort/widget/TimesheetMenus.xml	(working copy)
@@ -21,7 +21,7 @@
 
     <menu name="TimesheetTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
           default-menu-item-name="Timesheet">
-        <menu-item name="Timesheet" title="${uiLabelMap.Timesheet}">
+        <menu-item name="Timesheet" title="${uiLabelMap.WorkEffortTimesheet}">
             <link target="EditTimesheet?timesheetId=${timesheetId}"/>
         </menu-item>
         <menu-item name="TimesheetRoles" title="${uiLabelMap.PartyParties}">
Index: applications/order/config/OrderUiLabels.xml
===================================================================
--- applications/order/config/OrderUiLabels.xml	(revision 731372)
+++ applications/order/config/OrderUiLabels.xml	(working copy)
@@ -274,18 +274,6 @@
         <value xml:lang="th">รหัสลักษณะภายนอก</value>
         <value xml:lang="zh">外部标识</value>
     </property>
-    <property key="FormFieldTitle_facilityId">
-        <value xml:lang="de">Lager ID</value>
-        <value xml:lang="en">Facility Id</value>
-        <value xml:lang="es">Código de almacén</value>
-        <value xml:lang="fr">Réf. du lieu de stockage</value>
-        <value xml:lang="it">Codice Stabilimento </value>
-        <value xml:lang="nl">Faciliteit Id</value>
-        <value xml:lang="ro">Cod Compartiment </value>
-        <value xml:lang="ru">Код склада</value>
-        <value xml:lang="th">รหัสคลังสินค้า</value>
-        <value xml:lang="zh">场所标识</value>
-    </property>
     <property key="FormFieldTitle_facilityQuantityOnHandTotal">
         <value xml:lang="de">Lagermenge Verfügbar Total</value>
         <value xml:lang="en">Facility Quantity On Hand Total</value>
Index: applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkflowMapProcessors.xml
===================================================================
--- applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkflowMapProcessors.xml	(revision 731372)
+++ applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkflowMapProcessors.xml	(working copy)
@@ -23,7 +23,7 @@
   <simple-map-processor name="assignmentMap">
     <process field="workEffortId"><copy/><not-empty><fail-property resource="WorkEffortUiLabels" property="WorkEffortIdMissing"/></not-empty></process>
     <process field="partyId"><copy/><not-empty><fail-property resource="PartyUiLabels" property="PartyPartyIdMissing"/></not-empty></process>
-    <process field="roleTypeId"><copy/><not-empty><fail-property resource="WorkEffortUiLabels" property="PartyRoleTypeIdMissing"/></not-empty></process>
+    <process field="roleTypeId"><copy/><not-empty><fail-property resource="PartyUiLabels" property="PartyRoleTypeIdMissing"/></not-empty></process>
     <process field="fromDate">
         <convert type="Timestamp"><fail-property resource="WorkEffortUiLabels" property="WorkEffortFromDateIsNotValid"/></convert></process>
   </simple-map-processor>
@@ -35,7 +35,7 @@
     <process field="universalId"><copy/></process>
     <process field="scopeEnumId"><copy/></process>
     <process field="priority"><copy/>
-        <convert type="Long"><fail-property resource="WorkEffortUiLabels" property="PriorityFormatNotCorrect"/></convert>
+        <convert type="Long"><fail-property resource="WorkEffortUiLabels" property="WorkEffortPriorityFormatNotCorrect"/></convert>
     </process>
     <process field="percentComplete"><copy/></process>
     <process field="workEffortName"><copy/><not-empty><fail-property resource="WorkEffortUiLabels" property="WorkEffortNameIsMissing"/></not-empty></process>
Index: applications/workeffort/widget/TimesheetScreens.xml
===================================================================
--- applications/workeffort/widget/TimesheetScreens.xml	(revision 731372)
+++ applications/workeffort/widget/TimesheetScreens.xml	(working copy)
@@ -51,7 +51,7 @@
                             </container>
                             <container style="screenlet-body">
                                 <link text="${uiLabelMap.PageTitleCreateWeekTimesheet}" target="createTimesheetForThisWeek?partyId=${userLogin.partyId}" style="buttontext"/>
-                                <link text="${uiLabelMap.TimesheetCreate}" target="EditTimesheet?partyId=${userLogin.partyId}" style="buttontext"/>
+                                <link text="${uiLabelMap.WorkEffortTimesheetCreate}" target="EditTimesheet?partyId=${userLogin.partyId}" style="buttontext"/>
                                 <iterate-section entry-name="currentTimesheet" list-name="currentTimesheetList">
                                     <section>
                                         <actions>
@@ -64,7 +64,7 @@
                                         </actions>
                                         <widgets>
                                             <container>
-                                                <label style="tableheadtext" text="${uiLabelMap.Timesheet}: ${currentTimesheet.fromDate} ${uiLabelMap.CommonThru} ${currentTimesheet.thruDate} ${currentTimesheet.comments}"/>
+                                                <label style="tableheadtext" text="${uiLabelMap.WorkEffortTimesheet}: ${currentTimesheet.fromDate} ${uiLabelMap.CommonThru} ${currentTimesheet.thruDate} ${currentTimesheet.comments}"/>
                                                 <link target="EditTimesheet?timesheetId=${currentTimesheet.timesheetId}" text="${currentTimesheet.timesheetId}" style="buttontext"></link>
                                             </container>
                                             <iterate-section entry-name="currentTimeEntry" list-name="currentTimeEntryList">
@@ -76,8 +76,8 @@
                                                     </actions>
                                                     <widgets>
                                                         <container>
-                                                            <label style="tabletext" text="${uiLabelMap.TimesheetTimeEntry} ${uiLabelMap.CommonFor} ${currentTimeEntry.fromDate} "/>
-                                                            <label style="tableheadtext" text="${currentTimeEntry.hours} ${uiLabelMap.TimesheetHours} "/>
+                                                            <label style="tabletext" text="${uiLabelMap.WorkEffortTimesheetTimeEntry} ${uiLabelMap.CommonFor} ${currentTimeEntry.fromDate} "/>
+                                                            <label style="tableheadtext" text="${currentTimeEntry.hours} ${uiLabelMap.WorkEffortTimesheetHours} "/>
                                                             <label style="tabletext" text="${currentTimeEntry.comments} [${currentRateType.description}]"/>
                                                             <section>
                                                                 <condition><not><if-empty field-name="currentTimeEntry.workEffortId"/></not></condition>
@@ -94,8 +94,8 @@
                                                 </widgets>
                                                 <fail-widgets>
                                                     <container>
-                                                        <link target="MyTimesheets?showQuickEntry=${currentTimesheet.timesheetId}" text="${uiLabelMap.TimesheetQuickTimeEntry}" style="buttontext"></link>
-                                                        <link target="EditTimesheetEntries?timesheetId=${currentTimesheet.timesheetId}" text="${uiLabelMap.TimesheetTimeEntries}" style="buttontext"></link>
+                                                        <link target="MyTimesheets?showQuickEntry=${currentTimesheet.timesheetId}" text="${uiLabelMap.WorkEffortTimesheetQuickTimeEntry}" style="buttontext"></link>
+                                                        <link target="EditTimesheetEntries?timesheetId=${currentTimesheet.timesheetId}" text="${uiLabelMap.WorkEffortTimesheetTimeEntries}" style="buttontext"></link>
                                                     </container>
                                                 </fail-widgets>
                                             </section>
@@ -164,7 +164,7 @@
                                     <container style="screenlet-body">
                                         <section>
                                             <widgets>    
-                                                <container><link  text="${uiLabelMap.TimesheetCreate}" target="EditTimesheet" style="buttontext"/></container>
+                                                <container><link  text="${uiLabelMap.WorkEffortTimesheetCreate}" target="EditTimesheet" style="buttontext"/></container>
                                                 <include-form name="FindTimesheet" location="component://workeffort/widget/TimesheetForms.xml"/>
                                             </widgets>
                                         </section>
@@ -237,7 +237,7 @@
                                     <container style="screenlet-body">
                                         <section>
                                             <widgets>    
-                                                <container><link  text="${uiLabelMap.TimesheetCreate}" target="EditTimesheet" style="buttontext"/></container>
+                                                <container><link  text="${uiLabelMap.WorkEffortTimesheetCreate}" target="EditTimesheet" style="buttontext"/></container>
                                                 <include-form name="EditTimesheet" location="component://workeffort/widget/TimesheetForms.xml"/>
                                             </widgets>
                                         </section>
@@ -266,7 +266,7 @@
                                     <container style="screenlet-body">
                                         <section>
                                             <widgets>    
-                                                <container><link  text="${uiLabelMap.TimesheetCreate}" target="EditTimesheet" style="buttontext"/></container>
+                                                <container><link  text="${uiLabelMap.WorkEffortTimesheetCreate}" target="EditTimesheet" style="buttontext"/></container>
                                                 <include-form name="DisplayTimesheetEntries" location="component://workeffort/widget/TimesheetForms.xml"/>
                                             </widgets>
                                         </section>
@@ -315,7 +315,7 @@
                             <container style="screenlet-body">
                                 <section>
                                     <widgets>    
-                                        <container><link  text="${uiLabelMap.TimesheetCreate}" target="EditTimesheet" style="buttontext"/></container>
+                                        <container><link  text="${uiLabelMap.WorkEffortTimesheetCreate}" target="EditTimesheet" style="buttontext"/></container>
                                         <include-form name="ListTimesheetRoles" location="component://workeffort/widget/TimesheetForms.xml"/>
                                     </widgets>
                                 </section>
@@ -362,7 +362,7 @@
                             <container style="screenlet-body">
                                 <section>
                                     <widgets>    
-                                        <container><link  text="${uiLabelMap.TimesheetCreate}" target="EditTimesheet" style="buttontext"/></container>
+                                        <container><link  text="${uiLabelMap.WorkEffortTimesheetCreate}" target="EditTimesheet" style="buttontext"/></container>
                                         <include-form name="ListTimesheetEntries" location="component://workeffort/widget/TimesheetForms.xml"/>
                                     </widgets>
                                 </section>
Index: applications/marketing/config/MarketingUiLabels.xml
===================================================================
--- applications/marketing/config/MarketingUiLabels.xml	(revision 731372)
+++ applications/marketing/config/MarketingUiLabels.xml	(working copy)
@@ -264,22 +264,6 @@
         <value xml:lang="th">งบประมาณ</value>
         <value xml:lang="zh">已预算的费用</value>
     </property>
-    <property key="FormFieldTitle_cmDetail">
-        <value xml:lang="en">Contact Mech Detail</value>
-        <value xml:lang="fr">Détail des coordonnées</value>
-        <value xml:lang="it">Dettaglio Contatto</value>
-        <value xml:lang="ro">Detaliu Contact</value>
-        <value xml:lang="th">รายละเอียดวิธีการติดต่อ</value>
-        <value xml:lang="zh">详细联系方式</value>
-    </property>
-    <property key="FormFieldTitle_contactListId">
-        <value xml:lang="en">Contact List Id</value>
-        <value xml:lang="fr">Réf. de liste de contact</value>
-        <value xml:lang="it">Lista di Contatto</value>
-        <value xml:lang="ro">Lista de Contact</value>
-        <value xml:lang="th">รหัสรายการติดต่อ</value>
-        <value xml:lang="zh">联系列表标识</value>
-    </property>
     <property key="FormFieldTitle_custReqestId">
         <value xml:lang="en">Cust Reqest Id</value>
         <value xml:lang="fr">Réf. de requête de client</value>
@@ -288,14 +272,6 @@
         <value xml:lang="th">รหัสคำร้องของลูกค้า</value>
         <value xml:lang="zh">客户请求标识</value>
     </property>
-    <property key="FormFieldTitle_estimatedCost">
-        <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="ro">Cost Stimat</value>
-        <value xml:lang="th">ประมาณราคา</value>
-        <value xml:lang="zh">预计费用</value>
-    </property>
     <property key="FormFieldTitle_partyClassificationGroupId">
         <value xml:lang="en">Party Classification Group Id</value>
         <value xml:lang="fr">Groupe de classification d'acteur</value>
Index: applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml
===================================================================
--- applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml	(revision 731372)
+++ applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml	(working copy)
@@ -659,22 +659,22 @@
         <field name="workEffortName" entry-name="workEffortIdFrom">
             <display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName} " cache="true"/>
         </field>
-        <field name="quantityToProduce" entry-name="workEffortIdFrom">
+        <field name="quantityToProduce" title="${uiLabelMap.ManufacturingQuantityToProduce}" entry-name="workEffortIdFrom">
             <display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${quantityToProduce} " cache="true"/>
         </field>
-        <field name="quantityProduced" entry-name="workEffortIdFrom">
+        <field name="quantityProduced" title="${uiLabelMap.ManufacturingQuantityProduced}" entry-name="workEffortIdFrom">
             <display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${quantityProduced} " cache="true"/>
         </field>
-        <field name="estimatedStartDate" entry-name="workEffortIdFrom">
+        <field name="estimatedStartDate" title="${uiLabelMap.ManufacturingStartDate}" entry-name="workEffortIdFrom">
             <display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${estimatedStartDate} " cache="true"/>
         </field>
         <field name="estimatedCompletionDate" entry-name="workEffortIdFrom">
             <display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${estimatedCompletionDate} " cache="true"/>
         </field>
-        <field name="actualStartDate" entry-name="workEffortIdFrom">
+        <field name="actualStartDate" title="${uiLabelMap.ManufacturingActualStartDate}" entry-name="workEffortIdFrom">
             <display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${actualStartDate} " cache="true"/>
         </field>
-        <field name="actualCompletionDate" entry-name="workEffortIdFrom">
+        <field name="actualCompletionDate" title="${uiLabelMap.ManufacturingActualCompletionDate}" entry-name="workEffortIdFrom">
             <display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${actualCompletionDate} " cache="true"/>
         </field>
     </form>
@@ -686,22 +686,22 @@
         <field name="workEffortName" entry-name="workEffortIdTo">
             <display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName} " cache="true"/>
         </field>
-        <field name="quantityToProduce" entry-name="workEffortIdTo">
+        <field name="quantityToProduce" title="${uiLabelMap.ManufacturingQuantityToProduce}" entry-name="workEffortIdTo">
             <display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${quantityToProduce} " cache="true"/>
         </field>
-        <field name="quantityProduced" entry-name="workEffortIdTo">
+        <field name="quantityProduced" title="${uiLabelMap.ManufacturingQuantityProduced}" entry-name="workEffortIdTo">
             <display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${quantityProduced} " cache="true"/>
         </field>
-        <field name="estimatedStartDate" entry-name="workEffortIdTo">
+        <field name="estimatedStartDate" title="${uiLabelMap.ManufacturingStartDate}" entry-name="workEffortIdTo">
             <display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${estimatedStartDate} " cache="true"/>
         </field>
         <field name="estimatedCompletionDate" entry-name="workEffortIdTo">
             <display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${estimatedCompletionDate} " cache="true"/>
         </field>
-        <field name="actualStartDate" entry-name="workEffortIdTo">
+        <field name="actualStartDate" title="${uiLabelMap.ManufacturingActualStartDate}" entry-name="workEffortIdTo">
             <display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${actualStartDate} " cache="true"/>
         </field>
-        <field name="actualCompletionDate" entry-name="workEffortIdTo">
+        <field name="actualCompletionDate" title="${uiLabelMap.ManufacturingActualCompletionDate}" entry-name="workEffortIdTo">
             <display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${actualCompletionDate} " cache="true"/>
         </field>
     </form>
Index: applications/workeffort/widget/CommonScreens.xml
===================================================================
--- applications/workeffort/widget/CommonScreens.xml	(revision 731372)
+++ applications/workeffort/widget/CommonScreens.xml	(working copy)
@@ -109,7 +109,7 @@
                                     <condition><not><if-empty field-name="timesheetId"/></not></condition>
                                     <widgets>
                                         <include-menu name="TimesheetTabBar" location="component://workeffort/widget/TimesheetMenus.xml"/>
-                                        <container><label style="h1">${uiLabelMap.TimesheetTimesheetId} ${timesheetId}</label></container>
+                                        <container><label style="h1">${uiLabelMap.WorkEffortTimesheetTimesheetId} ${timesheetId}</label></container>
                                     </widgets>
                                 </section>
                                 
Index: applications/workeffort/widget/LookupForms.xml
===================================================================
--- applications/workeffort/widget/LookupForms.xml	(revision 731372)
+++ applications/workeffort/widget/LookupForms.xml	(working copy)
@@ -154,7 +154,7 @@
     <form name="lookupTimesheet" target="LookupTimesheet" title="" type="single"
         header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-entity entity-name="Timesheet" default-field-type="find"/>
-        <field name="timesheetId" title="${uiLabelMap.TimesheetTimesheetId}"><text-find/></field>
+        <field name="timesheetId" title="${uiLabelMap.WorkEffortTimesheetTimesheetId}"><text-find/></field>
         <field name="partyId"><lookup target-form-name="LookupPartyName"/></field>
         <field name="clientPartyId"><lookup target-form-name="LookupPartyName"/></field>
         
@@ -170,7 +170,7 @@
                 <field-map field-name="orderBy" value="timesheetId"/>
             </service>
         </actions>
-        <field name="timesheetId" title="${uiLabelMap.TimesheetTimesheetId}" widget-style="buttontext">
+        <field name="timesheetId" title="${uiLabelMap.WorkEffortTimesheetTimesheetId}" widget-style="buttontext">
             <hyperlink also-hidden="false" target-type="plain" description="${timesheetId}" target="javascript:set_value('${timesheetId}')"/>
         </field>
         <field name="partyId"><display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName} [${partyId}]"/></field>
Index: applications/manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml
===================================================================
--- applications/manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml	(revision 731372)
+++ applications/manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml	(working copy)
@@ -48,7 +48,7 @@
         </field>
         <field name="workEffortName" title="${uiLabelMap.ManufacturingRoutingName}"><display/></field>
         <field name="description"><display/></field>
-        <field name="quantityToProduce"><display/></field>
+        <field name="quantityToProduce" title="${uiLabelMap.ManufacturingQuantityToProduce}"><display/></field>
     </form>
     <form name="EditRouting" type="single" target="UpdateRouting" title="" default-map-name="routing"
         header-row-style="header-row" default-table-style="basic-table">
@@ -58,7 +58,7 @@
         <field name="workEffortId" use-when="routing!=null"><hidden/></field>
         <field name="workEffortName" title="${uiLabelMap.ManufacturingRoutingName}"><text/></field>
         <field name="description"><text/></field>
-        <field name="quantityToProduce"><text/></field>
+        <field name="quantityToProduce" title="${uiLabelMap.ManufacturingQuantityToProduce}"><text/></field>
         <field name="submitButton" title="${uiLabelMap.CommonSubmit}">
             <submit button-type="button"/>
         </field>
@@ -105,8 +105,8 @@
         <field name="fixedAssetId">
             <display-entity entity-name="FixedAsset" description="${fixedAssetName}"/>
         </field>
-        <field name="estimatedSetupMillis"><display/></field>
-        <field name="estimatedMilliSeconds"><display/></field>
+        <field name="estimatedSetupMillis" title="${uiLabelMap.ManufacturingTaskEstimatedSetupMillis}"><display/></field>
+        <field name="estimatedMilliSeconds" title="${uiLabelMap.ManufacturingTaskEstimatedMilliSeconds}"><display/></field>
     </form>
     <form name="EditRoutingTask" type="single" target="UpdateRoutingTask" title="" default-map-name="routingTask"
         header-row-style="header-row" default-table-style="basic-table">
@@ -130,8 +130,8 @@
                 </entity-options>
             </drop-down>
         </field>
-        <field name="estimatedSetupMillis"><text/></field>
-        <field name="estimatedMilliSeconds"><text/></field>
+        <field name="estimatedSetupMillis" title="${uiLabelMap.ManufacturingTaskEstimatedSetupMillis}"><text/></field>
+        <field name="estimatedMilliSeconds" title="${uiLabelMap.ManufacturingTaskEstimatedMilliSeconds}"><text/></field>
         <field name="estimateCalcMethod">
             <drop-down allow-empty="true">
                 <entity-options entity-name="CustomMethod" key-field-name="customMethodId" description="${description}">
Index: applications/workeffort/webapp/workeffort/task/mytasks.ftl
===================================================================
--- applications/workeffort/webapp/workeffort/task/mytasks.ftl	(revision 731372)
+++ applications/workeffort/webapp/workeffort/task/mytasks.ftl	(working copy)
@@ -50,7 +50,7 @@
         <td>${uiLabelMap.WorkEffortActivityStatus}</td>
         <td>${uiLabelMap.WorkEffortMyStatus}</td>
         <#-- <td>${uiLabelMap.PartyPartyId}</td> -->
-        <td>${uiLabelMap.PartyRoleId}</td>
+        <td>${uiLabelMap.PartyRole}</td>
         <td>${uiLabelMap.WorkEffortActivityName}</td>
         <td>${uiLabelMap.CommonEdit}</td>
       </tr>
@@ -80,7 +80,7 @@
         <td>${uiLabelMap.WorkEffortActivityStatus}</td>
         <td>${uiLabelMap.WorkEffortMyStatus}</td>
         <#-- <td>${uiLabelMap.PartyPartyId}</td> -->
-        <td>${uiLabelMap.PartyRoleId}</td>
+        <td>${uiLabelMap.PartyRole}</td>
         <td>${uiLabelMap.WorkEffortActivityName}</td>
         <td>${uiLabelMap.CommonEdit}</td>
       </tr>
@@ -110,7 +110,7 @@
         <td>${uiLabelMap.WorkEffortActivityStatus}</td>
         <td>${uiLabelMap.WorkEffortMyStatus}</td>
         <td>${uiLabelMap.PartyGroupPartyId}</td>
-        <#-- <td>${uiLabelMap.PartyRoleId}</td> -->
+        <#-- <td>${uiLabelMap.PartyRole}</td> -->
         <td>${uiLabelMap.WorkEffortActivityName}</td>
         <td>${uiLabelMap.CommonEdit}</td>
       </tr>
Index: applications/party/webapp/partymgr/party/profileblocks/mytasks.ftl
===================================================================
--- applications/party/webapp/partymgr/party/profileblocks/mytasks.ftl	(revision 731372)
+++ applications/party/webapp/partymgr/party/profileblocks/mytasks.ftl	(working copy)
@@ -57,7 +57,7 @@
         <td>${uiLabelMap.WorkEffortActivityStatus}</td>
         <td>${uiLabelMap.WorkEffortMyStatus}</td>
         <#-- <td>${uiLabelMap.PartyPartyId}</td> -->
-        <td>${uiLabelMap.PartyRoleId}</td>
+        <td>${uiLabelMap.PartyRole}</td>
         <td>${uiLabelMap.WorkEffortActivityName}</td>
         <td>${uiLabelMap.CommonEdit}</td>
       </tr>
@@ -86,7 +86,7 @@
         <td>${uiLabelMap.WorkEffortActivityStatus}</td>
         <td>${uiLabelMap.WorkEffortMyStatus}</td>
         <#-- <td>${uiLabelMap.PartyPartyId}</td> -->
-        <td>${uiLabelMap.PartyRoleId}</td>
+        <td>${uiLabelMap.PartyRole}</td>
         <td>${uiLabelMap.WorkEffortActivityName}</td>
         <td>${uiLabelMap.CommonEdit}</td>
       </tr>
@@ -115,7 +115,7 @@
         <td>${uiLabelMap.WorkEffortActivityStatus}</td>
         <td>${uiLabelMap.WorkEffortMyStatus}</td>
         <td>${uiLabelMap.PartyGroupPartyId}</td>
-        <#-- <td>${uiLabelMap.PartyRoleId}</td> -->
+        <#-- <td>${uiLabelMap.PartyRole}</td> -->
         <td>${uiLabelMap.WorkEffortActivityName}</td>
         <td>${uiLabelMap.CommonEdit}</td>
       </tr>
Index: applications/product/config/ProductUiLabels.xml
===================================================================
--- applications/product/config/ProductUiLabels.xml	(revision 731372)
+++ applications/product/config/ProductUiLabels.xml	(working copy)
@@ -1273,6 +1273,7 @@
         <value xml:lang="es">Método de cálculo estimado</value>
         <value xml:lang="fr">Methode de calcul estimé</value>
         <value xml:lang="it">Metodo Calcolo Stimato</value>
+        <value xml:lang="nl">Estimate Calc Method</value>
         <value xml:lang="ro">Metoda de Calcul Stimat</value>
         <value xml:lang="ru">Метод оценки</value>
         <value xml:lang="th">วิธีประมาณการคำนวน</value>
@@ -1283,7 +1284,7 @@
         <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>
+        <value xml:lang="it">Costo stimato</value>
         <value xml:lang="ro">Cost Stimat</value>
         <value xml:lang="ru">Оценка стоимости</value>
         <value xml:lang="th">ค่าใช้จ่ายประมาณ</value>
@@ -1294,7 +1295,7 @@
         <value xml:lang="en">Est. Deliver Date</value>
         <value xml:lang="es">Fecha de recepción estimada</value>
         <value xml:lang="fr">Date de livraison estimée</value>
-        <value xml:lang="it">Data Consegna Stimata</value>
+        <value xml:lang="it">Data consegna stimata</value>
         <value xml:lang="ro">Data Livrare Stimata</value>
         <value xml:lang="ru">Ожид. дата доставки</value>
         <value xml:lang="th">วันที่การส่งประมาณ</value>
@@ -1402,7 +1403,8 @@
         <value xml:lang="en">Facility Id</value>
         <value xml:lang="es">Código de almacén</value>
         <value xml:lang="fr">Réf. de lieu de stockage</value>
-        <value xml:lang="it">Codice Stabilimento</value>
+        <value xml:lang="it">Codice stabilimento</value>
+        <value xml:lang="nl">Faciliteit Id</value>
         <value xml:lang="ro">Cod Compartiment</value>
         <value xml:lang="ru">Код объекта</value>
         <value xml:lang="th">รหัสคลังสินค้า</value>