### Eclipse Workspace Patch 1.0
#P ofbiz
Index: applications/marketing/widget/TrackingCodeScreens.xml
===================================================================
--- applications/marketing/widget/TrackingCodeScreens.xml	(revision 733928)
+++ applications/marketing/widget/TrackingCodeScreens.xml	(working copy)
@@ -83,7 +83,7 @@
                                     <container style="screenlet-body">
                                         <section>
                                             <widgets>
-                                                <container><link  text="${uiLabelMap.TrackingCodeCreate}" target="/EditTrackingCode?DONE_PAGE=${donePage}" style="buttontext"/></container>
+                                                <container><link  text="${uiLabelMap.MarketingTrackingCodeCreate}" target="/EditTrackingCode?DONE_PAGE=${donePage}" style="buttontext"/></container>
                                                 <include-form name="EditTrackingCode" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml"/>
                                             </widgets>
                                         </section>
@@ -135,7 +135,7 @@
                             <container style="screenlet-body">
                                 <section>
                                     <widgets>
-                                        <container><link text="${uiLabelMap.TrackingCodeCreate}" target="/EditTrackingCode?DONE_PAGE=${donePage}" style="buttontext"/></container>
+                                        <container><link text="${uiLabelMap.MarketingTrackingCodeCreate}" target="/EditTrackingCode?DONE_PAGE=${donePage}" style="buttontext"/></container>
                                         <include-form name="ListTrackingCode" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml"/>
                                     </widgets>
                                 </section>
@@ -231,7 +231,7 @@
                         <container style="screenlet">
                             <container style="screenlet-title-bar">
                                 <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleListTrackingCodeOrdersFor} ${uiLabelMap.TrackingCodeTrackingCodeId}=${trackingCodeId}"/>
+                                    <label text="${uiLabelMap.PageTitleListTrackingCodeOrdersFor} ${uiLabelMap.MarketingTrackingCodeTrackingCodeId}=${trackingCodeId}"/>
                                 </container>
                             </container>
                             <container style="screenlet-body">
@@ -336,7 +336,7 @@
                         <container style="screenlet">
                             <container style="screenlet-title-bar">
                                 <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleListTrackingCodeFor} ${uiLabelMap.TrackingCodeTrackingCodeId}=${trackingCodeId}"/>
+                                    <label text="${uiLabelMap.PageTitleListTrackingCodeFor} ${uiLabelMap.MarketingTrackingCodeTrackingCodeId}=${trackingCodeId}"/>
                                 </container>
                             </container>
                             <container style="screenlet-body">
@@ -455,7 +455,7 @@
                                     <container style="screenlet-body">
                                         <section>
                                             <widgets>
-                                                <container><link  text="${uiLabelMap.TrackingCodeTypeCreate}" target="/EditTrackingCodeType?DONE_PAGE=${donePage}" style="buttontext"/></container>
+                                                <container><link  text="${uiLabelMap.MarketingTrackingCodeTypeCreate}" target="/EditTrackingCodeType?DONE_PAGE=${donePage}" style="buttontext"/></container>
                                                 <include-form name="EditTrackingCodeType" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml"/>
                                             </widgets>
                                         </section>
@@ -508,7 +508,7 @@
                             <container style="screenlet-body">
                                 <section>
                                     <widgets>
-                                        <container><link text="${uiLabelMap.TrackingCodeTypeCreate}" target="/EditTrackingCodeType?DONE_PAGE=${donePage}" style="buttontext"/></container>
+                                        <container><link text="${uiLabelMap.MarketingTrackingCodeTypeCreate}" target="/EditTrackingCodeType?DONE_PAGE=${donePage}" style="buttontext"/></container>
                                         <include-form name="ListTrackingCodeType" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml"/>
                                     </widgets>
                                 </section>
Index: applications/marketing/widget/ReportForms.xml
===================================================================
--- applications/marketing/widget/ReportForms.xml	(revision 733928)
+++ applications/marketing/widget/ReportForms.xml	(working copy)
@@ -30,7 +30,7 @@
             <date-time type="timestamp"/>
         </field>
 
-        <field name="trackingCodeId" title="${uiLabelMap.TrackingCode}">
+        <field name="trackingCodeId" title="${uiLabelMap.MarketingTrackingCode}">
             <drop-down allow-empty="true">
                 <option key="" description="- ${uiLabelMap.CommonAny} -"/>
                 <entity-options entity-name="TrackingCode" description="${trackingCodeId}">
@@ -65,9 +65,9 @@
         </field>
     </form>
 
-    <form name="TrackingCodeReport" list-name="trackingCodeVisitAndOrders" target="" title="${uiLabelMap.TrackingCodeReportTitle}" type="list" paginate-target="TrackingCodeReport"
+    <form name="TrackingCodeReport" list-name="trackingCodeVisitAndOrders" target="" title="${uiLabelMap.MarketingTrackingCodeReportTitle}" type="list" paginate-target="TrackingCodeReport"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
-        <field name="trackingCodeId" title="${uiLabelMap.TrackingCode}">
+        <field name="trackingCodeId" title="${uiLabelMap.MarketingTrackingCode}">
             <display-entity entity-name="TrackingCode" key-field-name="trackingCodeId" description="${description} [${trackingCodeId}]"/>
         </field>
         <field name="visits" title="${uiLabelMap.MarketingVisits}"><display/></field>
Index: applications/marketing/widget/MarketingCampaignScreens.xml
===================================================================
--- applications/marketing/widget/MarketingCampaignScreens.xml	(revision 733928)
+++ applications/marketing/widget/MarketingCampaignScreens.xml	(working copy)
@@ -59,6 +59,7 @@
    <screen name="EditMarketingCampaign">
         <section>
             <actions>
+                <property-map resource="OrderUiLabels" map-name="uiLabelMap" />
                 <set field="titleProperty" value="PageTitleEditMarketingCampaign"/>
                 <set field="campaignTabButtonItem" value="MarketingCampaign"/>
                 <set field="labelTitleProperty" value="PageTitleEditMarketingCampaign"/>
Index: applications/party/webapp/partymgr/lookup/LookupForms.xml
===================================================================
--- applications/party/webapp/partymgr/lookup/LookupForms.xml	(revision 733928)
+++ applications/party/webapp/partymgr/lookup/LookupForms.xml	(working copy)
@@ -318,7 +318,7 @@
 
     <form name="LookupCommEvent" type="single" target="LookupCommEvent"
         header-row-style="header-row" default-table-style="basic-table">
-        <field name="communicationEventId" title="${uiLabelMap.ContactListCommEventId}"><text-find/></field>
+        <field name="communicationEventId" title="${uiLabelMap.MarketingContactListCommEventId}"><text-find/></field>
         <field name="partyIdFrom" title="${uiLabelMap.PartyPartyFrom}"><lookup target-form-name="LookupPartyName"/></field>
         <field name="partyIdTo" title="${uiLabelMap.PartyPartyTo}"><lookup target-form-name="LookupPartyName"/></field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}">
@@ -328,7 +328,7 @@
                 </entity-options>
             </drop-down>
         </field>
-        <field name="contactMechTypeId" title="${uiLabelMap.ContactListContactMechTypeId}">
+        <field name="contactMechTypeId" title="${uiLabelMap.MarketingContactListContactMechTypeId}">
             <drop-down allow-empty="true">
                 <entity-options description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId">
                     <entity-order-by field-name="description"/>
@@ -366,7 +366,7 @@
                 <field-map field-name="entityName" value="CommunicationEvent"/>
             </service>
         </actions>
-        <field name="communicationEventId" title="${uiLabelMap.ContactListCommEventId}" widget-style="smallSubmit">
+        <field name="communicationEventId" title="${uiLabelMap.MarketingContactListCommEventId}" widget-style="smallSubmit">
             <hyperlink also-hidden="false" description="${communicationEventId}" target="javascript:set_value('${communicationEventId}')" target-type="plain"/>
         </field>
         <field name="partyIdFrom" title="${uiLabelMap.PartyPartyFrom}">
@@ -376,7 +376,7 @@
             <display-entity description="${firstName} ${lastName} ${groupName} [${partyId}]" entity-name="PartyNameView" key-field-name="partyId"/>
         </field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity description="${description}" entity-name="StatusItem" key-field-name="statusId"/></field>
-        <field name="contactMechTypeId" title="${uiLabelMap.ContactListContactMechTypeId}"><display-entity description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/></field>
+        <field name="contactMechTypeId" title="${uiLabelMap.MarketingContactListContactMechTypeId}"><display-entity description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/></field>
         <field name="roleTypeIdFrom" title="${uiLabelMap.PartyRoleTypeIdFrom}"><display-entity description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/></field>
         <field name="roleTypeIdTo" title="${uiLabelMap.PartyRoleTypeIdTo}"><display-entity description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/></field>
         <field name="custRequestId" position="1" title="${uiLabelMap.PartyServicemgntCustRequestId}"><display/></field>
Index: applications/marketing/webapp/marketing/segment/SegmentMenus.xml
===================================================================
--- applications/marketing/webapp/marketing/segment/SegmentMenus.xml	(revision 733928)
+++ applications/marketing/webapp/marketing/segment/SegmentMenus.xml	(working copy)
@@ -21,16 +21,16 @@
 
     <menu name="SegmentGroupTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
           default-menu-item-name="Segment" selected-menuitem-context-field-name="segmentTabButtonItem">
-        <menu-item name="SegmentGroup" title="${uiLabelMap.SegmentGroupSegmentGroup}">
+        <menu-item name="SegmentGroup" title="${uiLabelMap.MarketingSegmentGroupSegmentGroup}">
             <link target="viewSegmentGroup?segmentGroupId=${segmentGroupId}"/>
         </menu-item>
-        <menu-item name="SegmentGroupClassification" title="${uiLabelMap.SegmentGroupSegmentGroupClassification}">
+        <menu-item name="SegmentGroupClassification" title="${uiLabelMap.MarketingSegmentGroupSegmentGroupClassification}">
             <link target="listSegmentGroupClass?segmentGroupId=${segmentGroupId}"/>
         </menu-item>
-        <menu-item name="SegmentGroupGeo" title="${uiLabelMap.SegmentGroupSegmentGroupGeo}">
+        <menu-item name="SegmentGroupGeo" title="${uiLabelMap.MarketingSegmentGroupSegmentGroupGeo}">
             <link target="listSegmentGroupGeo?segmentGroupId=${segmentGroupId}"/>
         </menu-item>
-        <menu-item name="SegmentGroupRole" title="${uiLabelMap.SegmentGroupSegmentGroupRole}">
+        <menu-item name="SegmentGroupRole" title="${uiLabelMap.MarketingSegmentGroupSegmentGroupRole}">
             <link target="listSegmentGroupRole?segmentGroupId=${segmentGroupId}"/>
         </menu-item>
     </menu>
Index: applications/marketing/webapp/marketing/trackingcode/TrackingCodeMenus.xml
===================================================================
--- applications/marketing/webapp/marketing/trackingcode/TrackingCodeMenus.xml	(revision 733928)
+++ applications/marketing/webapp/marketing/trackingcode/TrackingCodeMenus.xml	(working copy)
@@ -21,10 +21,10 @@
 
     <menu name="TrackingCodeTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
           default-menu-item-name="TrackingCode" selected-menuitem-context-field-name="trackingCodeTabButtonItem">
-        <menu-item name="TrackingCode" title="${uiLabelMap.TrackingCode}">
+        <menu-item name="TrackingCode" title="${uiLabelMap.MarketingTrackingCode}">
             <link target="/FindTrackingCode"/>
         </menu-item>
-        <menu-item name="TrackingCodeOrder" title="${uiLabelMap.TrackingCodeOrder}">
+        <menu-item name="TrackingCodeOrder" title="${uiLabelMap.MarketingTrackingCodeOrder}">
         <condition>
             <not>
                 <if-empty field-name="trackingCodeId"/>
@@ -32,7 +32,7 @@
         </condition>
             <link target="/FindTrackingCodeOrders?trackingCodeId=${trackingCodeId}"/>
         </menu-item>
-        <menu-item name="TrackingCodeVisit" title="${uiLabelMap.TrackingCodeVisit}">
+        <menu-item name="TrackingCodeVisit" title="${uiLabelMap.MarketingTrackingCodeVisit}">
         <condition>
             <not>
                 <if-empty field-name="trackingCodeId"/>
@@ -40,7 +40,7 @@
         </condition>
             <link target="/FindTrackingCodeVisits?trackingCodeId=${trackingCodeId}"/>
         </menu-item>
-        <menu-item name="TrackingCodeType" title="${uiLabelMap.TrackingCodeType}">
+        <menu-item name="TrackingCodeType" title="${uiLabelMap.MarketingTrackingCodeType}">
             <link target="/FindTrackingCodeType"/>
         </menu-item>
     </menu>
Index: applications/marketing/webapp/marketing/segment/SegmentForms.xml
===================================================================
--- applications/marketing/webapp/marketing/segment/SegmentForms.xml	(revision 733928)
+++ applications/marketing/webapp/marketing/segment/SegmentForms.xml	(working copy)
@@ -30,12 +30,12 @@
                 <field-map field-name="noConditionFind" value="Y"/>
             </service>
         </actions>
-        <field name="segmentGroupId" widget-style="buttontext" title="${uiLabelMap.SegmentGroupSegmentGroupId}">
+        <field name="segmentGroupId" widget-style="buttontext" title="${uiLabelMap.MarketingSegmentGroupSegmentGroupId}">
             <hyperlink also-hidden="false" description="${segmentGroupId}" target="viewSegmentGroup?segmentGroupId=${segmentGroupId}"/>
         </field>
-        <field name="segmentGroupTypeId" title="${uiLabelMap.SegmentGroupSegmentGroupTypeId}"><display-entity entity-name="SegmentGroupType" description="${description}"/></field>
+        <field name="segmentGroupTypeId" title="${uiLabelMap.MarketingSegmentGroupSegmentGroupTypeId}"><display-entity entity-name="SegmentGroupType" description="${description}"/></field>
         <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
-        <field name="productStoreId" title="${uiLabelMap.SegmentGroupProductStoreId}"><display/></field>
+        <field name="productStoreId" title="${uiLabelMap.MarketingSegmentGroupProductStoreId}"><display/></field>
         <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
             <hyperlink target="deleteSegmentGroup?segmentGroupId=${segmentGroupId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
         </field>
@@ -45,11 +45,11 @@
         header-row-style="header-row" default-table-style="basic-table">
         <alt-target use-when="segmentGroup==null" target="createSegmentGroup"/>
         
-        <field use-when="segmentGroup!=null" name="segmentGroupId" title="${uiLabelMap.SegmentGroupSegmentGroupId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
-        <field use-when="segmentGroup==null&amp;&amp;segmentGroupId==null" name="segmentGroupId" title="${uiLabelMap.SegmentGroupSegmentGroupId}"><ignored/></field>
-        <field use-when="segmentGroup==null&amp;&amp;segmentGroupId!=null" name="segmentGroupId" title="${uiLabelMap.SegmentGroupSegmentGroupId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${segmentGroupId}]"><display/></field>
+        <field use-when="segmentGroup!=null" name="segmentGroupId" title="${uiLabelMap.MarketingSegmentGroupSegmentGroupId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
+        <field use-when="segmentGroup==null&amp;&amp;segmentGroupId==null" name="segmentGroupId" title="${uiLabelMap.MarketingSegmentGroupSegmentGroupId}"><ignored/></field>
+        <field use-when="segmentGroup==null&amp;&amp;segmentGroupId!=null" name="segmentGroupId" title="${uiLabelMap.MarketingSegmentGroupSegmentGroupId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${segmentGroupId}]"><display/></field>
 
-        <field name="segmentGroupTypeId" title="${uiLabelMap.SegmentGroupSegmentGroupTypeId}">
+        <field name="segmentGroupTypeId" title="${uiLabelMap.MarketingSegmentGroupSegmentGroupTypeId}">
             <drop-down>
                 <entity-options description="${description}" entity-name="SegmentGroupType" key-field-name="segmentGroupTypeId">
                     <entity-order-by field-name="description"/>
@@ -101,7 +101,7 @@
         
         <field name="segmentGroupId"><hidden/></field>
         
-        <field name="geoId" title="${uiLabelMap.SegmentGroupGeoId}"><lookup target-form-name="LookupGeo"/></field>
+        <field name="geoId" title="${uiLabelMap.MarketingSegmentGroupGeoId}"><lookup target-form-name="LookupGeo"/></field>
         <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field>
     </form>
     <form name="listSegmentGroupGeo" list-name="segmentGroupGeos" target="" title="" type="list" paginate-target="listSegmentGroupGeo"
@@ -112,7 +112,7 @@
             </entity-and>
         </actions>
         <field name="segmentGroupId"><hidden/></field>
-        <field name="geoId" title="${uiLabelMap.SegmentGroupGeoId}"><display-entity entity-name="Geo" description="${geoName} [Code:${geoCode}][ID:${geoId}]"/></field>
+        <field name="geoId" title="${uiLabelMap.MarketingSegmentGroupGeoId}"><display-entity entity-name="Geo" description="${geoName} [Code:${geoCode}][ID:${geoId}]"/></field>
         <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
             <hyperlink target="deleteSegmentGroupGeo?segmentGroupId=${segmentGroupId}&amp;geoId=${geoId}"
                 description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
Index: applications/ecommerce/webapp/ecommerce/customer/profile/NewCustomer.ftl
===================================================================
--- applications/ecommerce/webapp/ecommerce/customer/profile/NewCustomer.ftl	(revision 733928)
+++ applications/ecommerce/webapp/ecommerce/customer/profile/NewCustomer.ftl	(working copy)
@@ -48,7 +48,7 @@
       </div>
     </div>
     <div class="center right">
-      <div class="screenlet-header"><div class='boxhead'>&nbsp;${uiLabelMap.AccountInformation}</div></div>
+      <div class="screenlet-header"><div class='boxhead'>&nbsp;${uiLabelMap.EcommerceAccountInformation}</div></div>
       <div id="userNameAndPasswordPanel">
         <div class="form-row">
           <div class="field-label"><label for="userName">${uiLabelMap.CommonUsername}* <span id="advice-required-username" style="display: none" class="errorMessage">(required)</span></label></div>
Index: applications/marketing/config/MarketingUiLabels.xml
===================================================================
--- applications/marketing/config/MarketingUiLabels.xml	(revision 733928)
+++ applications/marketing/config/MarketingUiLabels.xml	(working copy)
@@ -19,27 +19,162 @@
     under the License.
 -->
 <resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <property key="AccountAnnualRevenue">
-        <value xml:lang="de">Jahreseinkommen</value>
-        <value xml:lang="en">Annual Revenue</value>
-        <value xml:lang="es">Ingresos anuales</value>
-        <value xml:lang="fr">Revenu annuel</value>
+    <property key="FormFieldTitle_actualCost">
+        <value xml:lang="en">Actual Cost</value>
+        <value xml:lang="fr">Coût réel</value>
+        <value xml:lang="it">Costo Attuale</value>
+        <value xml:lang="ro">Cost Actual</value>
+        <value xml:lang="th">ราคาจริง</value>
+        <value xml:lang="zh">实际费用</value>
     </property>
-    <property key="AccountInformation">
-        <value xml:lang="en">Account Information</value>
-        <value xml:lang="fr">Information sur le compte</value>
+    <property key="FormFieldTitle_budgetedCost">
+        <value xml:lang="en">Budgeted Cost</value>
+        <value xml:lang="fr">Coût budgetisé</value>
+        <value xml:lang="it">Costo A Budget</value>
+        <value xml:lang="ro">Cost la Buget</value>
+        <value xml:lang="th">งบประมาณ</value>
+        <value xml:lang="zh">已预算的费用</value>
     </property>
-    <property key="AccountName">
-        <value xml:lang="de">Kontoname</value>
-        <value xml:lang="en">Account Name</value>
-        <value xml:lang="fr">Nom du compte</value>
+    <property key="FormFieldTitle_convertedLeads">
+        <value xml:lang="en">Converted Leads</value>
+        <value xml:lang="it">Leads convertiti</value>
     </property>
-    <property key="AccountTickerSymbol">
-        <value xml:lang="en">Ticker Symbol</value>
-        <value xml:lang="es">Símbolo ticker</value>
-        <value xml:lang="fr">Symbole téléscripteur</value>
+    <property key="FormFieldTitle_custReqestId">
+        <value xml:lang="en">Cust Reqest Id</value>
+        <value xml:lang="fr">Réf. de requête de client</value>
+        <value xml:lang="it">Numero Richiesta Soggetto</value>
+        <value xml:lang="ro">Numar Cerere Subiect</value>
+        <value xml:lang="th">รหัสคำร้องของลูกค้า</value>
+        <value xml:lang="zh">客户请求标识</value>
     </property>
-    <property key="ContactList">
+    <property key="FormFieldTitle_expectedResponsePercent">
+        <value xml:lang="en">Expected Response Percent</value>
+        <value xml:lang="it">Percentuale risposta aspettata</value>
+    </property>
+    <property key="FormFieldTitle_expectedRevenue">
+        <value xml:lang="en">Expected Revenue</value>
+        <value xml:lang="it">Entrate aspettata</value>
+    </property>
+    <property key="FormFieldTitle_estimatedCost">
+        <value xml:lang="en">Estimated Cost</value>
+        <value xml:lang="it">Costo stimato</value>
+    </property>
+    <property key="FormFieldTitle_isActive">
+        <value xml:lang="en">Is Active</value>
+        <value xml:lang="it">E' attivo</value>
+    </property>
+    <property key="FormFieldTitle_numSent">
+        <value xml:lang="en">Num Sent</value>
+        <value xml:lang="it">Num. Invio</value>
+    </property>
+    <property key="FormFieldTitle_prodCatalogId">
+        <value xml:lang="en">Product Catalog Id</value>
+        <value xml:lang="fr">Réf. de catalogue</value>
+        <value xml:lang="it">Catalogo Prodotti</value>
+        <value xml:lang="ro">Catalog Produse</value>
+        <value xml:lang="th">รหัสหมวดหมู่สินค้า</value>
+        <value xml:lang="zh">产品目录标识</value>
+    </property>
+    <property key="FormFieldTitle_startDate">
+        <value xml:lang="en">Start Date</value>
+        <value xml:lang="it">Data inizio</value>
+    </property>
+    <property key="MarketingCampaign">
+        <value xml:lang="en">Marketing Campaign</value>
+        <value xml:lang="es">Campañas</value>
+        <value xml:lang="fr">Campagne marketing</value>
+        <value xml:lang="it">Campagna Vendita</value>
+        <value xml:lang="ro">Campania Vanzare</value>
+        <value xml:lang="th">การวางแผนทางการตลาด</value>
+        <value xml:lang="zh">市场攻势</value>
+    </property>
+    <property key="MarketingCampaignCreate">
+        <value xml:lang="en">Create Marketing Campaign</value>
+        <value xml:lang="es">Crear campaña de marketing</value>
+        <value xml:lang="fr">Nouvelle campagne marketing</value>
+        <value xml:lang="it">Creare Campagna Vendita</value>
+        <value xml:lang="ro">Creare Campanie Vanzare</value>
+        <value xml:lang="th">สร้างการวางแผนทางการตลาด</value>
+        <value xml:lang="zh">新建市场攻势</value>
+    </property>
+    <property key="MarketingCampaignId">
+        <value xml:lang="en">Marketing Campaign Id</value>
+        <value xml:lang="es">Campaña</value>
+        <value xml:lang="fr">Réf. de campagne marketing</value>
+        <value xml:lang="it">Codice Campagna Vendita</value>
+        <value xml:lang="ro">Cod Campanie Vanzare</value>
+        <value xml:lang="th">รหัสการวางแผนทางการตลาด</value>
+        <value xml:lang="zh">市场攻势标识</value>
+    </property>
+    <property key="MarketingCampaignInvalidEmailInput">
+        <value xml:lang="en">Invalid email address entered.</value>
+        <value xml:lang="fr">Entrée d'adresse courriel invalide</value>
+        <value xml:lang="it">Indirizzo email inserito invalido.</value>
+        <value xml:lang="th">เข้าสู่ที่อยู่ของอีเมล์ไม่ได้</value>
+        <value xml:lang="zh">输入的电子邮件地址无效。</value>
+    </property>
+    <property key="MarketingCampaignName">
+        <value xml:lang="en">Campaign Name</value>
+        <value xml:lang="es">Nombre de la campaña</value>
+        <value xml:lang="fr">Nom de la campagne</value>
+        <value xml:lang="it">Nome Campagna</value>
+        <value xml:lang="ro">Nume Campanie</value>
+        <value xml:lang="th">ชื่อโครงการ</value>
+        <value xml:lang="zh">攻势名称</value>
+    </property>
+    <property key="MarketingCampaignReportTitle">
+        <value xml:lang="en">Marketing Campaign Report</value>
+        <value xml:lang="es">Informe de campañas de marketing</value>
+        <value xml:lang="fr">Rapport des campagnes de marketing</value>
+        <value xml:lang="it">Stampe Campagne di Vendita</value>
+        <value xml:lang="ro">Tiparire Campanie de Vanzare</value>
+        <value xml:lang="th">รายงานการวางแผนทางการตลาด</value>
+        <value xml:lang="zh">市场攻势报告</value>
+    </property>
+    <property key="MarketingCampaignRoleCreate">
+        <value xml:lang="en">Create Marketing Campaign Role</value>
+        <value xml:lang="es">Crear rol de campaña de marketing</value>
+        <value xml:lang="fr">Créer le rôle de la campagne marketing</value>
+        <value xml:lang="it">Creare Ruolo Campagna Vendita</value>
+        <value xml:lang="ro">Creare Rol Campanie Vanzare</value>
+        <value xml:lang="th">สร้างสถานะการวางแผนทางการตลาด</value>
+        <value xml:lang="zh">新建市场攻势角色</value>
+    </property>
+    <property key="MarketingCampaignSummary">
+        <value xml:lang="en">Campaign Summary</value>
+        <value xml:lang="es">Descripción de la campaña</value>
+        <value xml:lang="fr">Résumé de la campagne</value>
+        <value xml:lang="it">Sommario Campagna</value>
+        <value xml:lang="ro">Sumar Campanie</value>
+        <value xml:lang="th">สรุปโครงการ</value>
+        <value xml:lang="zh">攻势摘要</value>
+    </property>
+    <property key="MarketingCompanyName">
+        <value xml:lang="en">OFBiz: Marketing Manager</value>
+        <value xml:lang="es">OFBiz: Gestión de Marketing</value>
+        <value xml:lang="fr">OFBiz: Gestion du Marketing</value>
+        <value xml:lang="it">OFBiz: Gestione vendite</value>
+        <value xml:lang="ro">OFBiz: Gestione Vendite</value>
+        <value xml:lang="th">OFBiz: การจัดการทางการตลาด</value>
+        <value xml:lang="zh">OFBiz: 市场宣传管理</value>
+    </property>
+    <property key="MarketingCompanySubtitle">
+        <value xml:lang="ar">جزء من عائلة أوفبيز للتطبيقات الحرة للتسيير</value><!--value xml:lang="ar">جزء من عائلة أوفبيز للبرمجيات الحرة</value-->
+        <value xml:lang="de">Teil der Open For Business Familie von Open Source Software</value>
+        <value xml:lang="en">Part of the Open For Business Family of Open Source Software</value>
+        <value xml:lang="es">Parte de la familia de software Open For Business de código abierto</value><!--value xml:lang="es">Parte de la familia "Open for Bussiness" de Software Libre</value-->
+        <value xml:lang="fr">Un module de la famille Open For Business, logiciel libre de gestion d'entreprise.</value>
+        <value xml:lang="it">Part of the Open For Business Family of Open Source Software</value>
+        <value xml:lang="nl">Deel van de Open For Business-suite van Open Source Software</value><!--value xml:lang="nl">Onderdeel van de Open For Business'-suite</value-->
+        <value xml:lang="pt_BR">Parte da família OfBiz de software de fonte aberta</value>
+        <value xml:lang="pt_PT">Parte da família OfBiz de software de fonte aberta</value><!--value xml:lang="pt_PT">Parte do Software de Fonte Aberta para Grupos Abertos Para o Negócio</value-->
+        <value xml:lang="ro">Partea de Deschidere Pentru Afaceri Familiale din Open Source Software</value><!--value xml:lang="ro">Parte accesibila pentru Business Family of Open Source Software</value--><!--value xml:lang="ro">Parte din Open for Business Family of Open Source Software</value-->
+        <value xml:lang="ru">Входит в состав семейства Open For Business</value><!--value xml:lang="ru">Часть семейства ПО Open For Business</value--><!--value xml:lang="ru">Часть семейства "Open For Business Family" программных продуктов Open Source </value-->
+        <value xml:lang="th">ส่วนหนึ่งของธุรกิจแบบครอบครัวที่เป็นซอฟต์แวร์โอเพนซอส</value><!--value xml:lang="th">เป็นส่วนหนึ่งของธุรกิจแบบครอบครัวที่เป็นซอฟต์แวร์โอเพนซอส</value-->
+        <value xml:lang="zh">开源软件OFBiz家族的一部分</value><!--value xml:lang="zh">开源软件OFBiz的组成部分</value--><!--value xml:lang="zh">开源软件OFBiz的组成部分</value-->
+        <value xml:lang="zh_CN">OFBiz的一部分</value>
+    </property>
+    <property key="MarketingContactList">
         <value xml:lang="en">Contact List</value>
         <value xml:lang="es">Lista de contactos</value>
         <value xml:lang="fr">Liste de contacts</value>
@@ -48,7 +183,7 @@
         <value xml:lang="th">รายการติดต่อ</value>
         <value xml:lang="zh">联系列表</value>
     </property>
-    <property key="ContactListCommEventCreate">
+    <property key="MarketingContactListCommEventCreate">
         <value xml:lang="en">Create New Contact List Comm Event</value>
         <value xml:lang="es">Crear evento de comunicación</value>
         <value xml:lang="fr">Nouvel évènement de communication de la liste de contact</value>
@@ -57,7 +192,7 @@
         <value xml:lang="th">สร้างรายการผลการติดต่อใหม่</value>
         <value xml:lang="zh">新建联系列表沟通事件</value>
     </property>
-    <property key="ContactListCommEventId">
+    <property key="MarketingContactListCommEventId">
         <value xml:lang="en">Communication Event Id</value>
         <value xml:lang="es">Código de evento</value>
         <value xml:lang="fr">Réf. d'évènement de communication</value>
@@ -66,7 +201,7 @@
         <value xml:lang="th">รหัสผลการติดต่อ</value>
         <value xml:lang="zh">沟通事件标识</value>
     </property>
-    <property key="ContactListCommEventTypeId">
+    <property key="MarketingContactListCommEventTypeId">
         <value xml:lang="en">Communication Event Type Id</value>
         <value xml:lang="es">Tipo de evento</value>
         <value xml:lang="fr">Réf. du type d'événement de communication</value>
@@ -75,7 +210,7 @@
         <value xml:lang="th">รหัสประเภทผลการติดต่อ</value>
         <value xml:lang="zh">沟通事件类型标识</value>
     </property>
-    <property key="ContactListContactListId">
+    <property key="MarketingContactListContactListId">
         <value xml:lang="en">Contact List Id</value>
         <value xml:lang="es">Código de lista</value>
         <value xml:lang="fr">Réf. de la liste de contact</value>
@@ -84,7 +219,7 @@
         <value xml:lang="th">รหัสรายการติดต่อ</value>
         <value xml:lang="zh">联系列表标识</value>
     </property>
-    <property key="ContactListContactListName">
+    <property key="MarketingContactListContactListName">
         <value xml:lang="en">Contact List Name</value>
         <value xml:lang="es">Nombre de lista</value>
         <value xml:lang="fr">Nom de la liste de contact</value>
@@ -93,7 +228,7 @@
         <value xml:lang="th">รายชื่อที่ติดต่อ</value>
         <value xml:lang="zh">联系列表名称</value>
     </property>
-    <property key="ContactListContactListTypeId">
+    <property key="MarketingContactListContactListTypeId">
         <value xml:lang="en">Contact List Type Id</value>
         <value xml:lang="es">Tipo de lista</value>
         <value xml:lang="fr">Réf. du type de liste de contact</value>
@@ -102,7 +237,7 @@
         <value xml:lang="th">รหัสประเภทรายการติดต่อ</value>
         <value xml:lang="zh">联系列表类型标识</value>
     </property>
-    <property key="ContactListContactMechTypeId">
+    <property key="MarketingContactListContactMechTypeId">
         <value xml:lang="en">Contact Mechanism Type Id</value>
         <value xml:lang="es">Mecanismo de contacto</value>
         <value xml:lang="fr">Type de mécanisme de contact </value>
@@ -111,7 +246,7 @@
         <value xml:lang="th">รหัสประเภทวิธีการติดต่อ</value>
         <value xml:lang="zh">联系方式类型标识</value>
     </property>
-    <property key="ContactListCreate">
+    <property key="MarketingContactListCreate">
         <value xml:lang="en">Create New Contact List</value>
         <value xml:lang="es">Crear nueva lista de contactos</value>
         <value xml:lang="fr">Nouvelle liste de contact</value>
@@ -120,7 +255,7 @@
         <value xml:lang="th">สร้างรายการติดต่อใหม่</value>
         <value xml:lang="zh">新建联系列表</value>
     </property>
-    <property key="ContactListFindContactLists">
+    <property key="MarketingContactListFindContactLists">
         <value xml:lang="en">Find Contact Lists</value>
         <value xml:lang="fr">Rechercher les listes de contact</value>
         <value xml:lang="it">Ricerca Liste Contatto</value>
@@ -128,7 +263,7 @@
         <value xml:lang="th">ค้นหารายการติดต่อ</value>
         <value xml:lang="zh">查找联系列表</value>
     </property>
-    <property key="ContactListIsPublic">
+    <property key="MarketingContactListIsPublic">
         <value xml:lang="en">Is Public ?</value>
         <value xml:lang="es">Es pública ?</value>
         <value xml:lang="fr">Est publique ?</value>
@@ -137,7 +272,7 @@
         <value xml:lang="th">เป็นสาธารณะ ?</value>
         <value xml:lang="zh">公开吗?</value>
     </property>
-    <property key="ContactListIsSingleUse">
+    <property key="MarketingContactListIsSingleUse">
         <value xml:lang="en">Is Single Use ?</value>
         <value xml:lang="fr">Est à usage unique ?</value>
         <value xml:lang="it">E' Uso Singolo ?</value>
@@ -145,7 +280,7 @@
         <value xml:lang="th">ใช้ได้ครั้งเดียว ?</value>
         <value xml:lang="zh">单一用途吗?</value>
     </property>
-    <property key="ContactListNotFound">
+    <property key="MarketingContactListNotFound">
         <value xml:lang="en">Could not find email list [${contactListId}].</value>
         <value xml:lang="fr">Aucune liste de courriel [${contactListId}] trouvée.</value>
         <value xml:lang="it">Non è possibile trovare la lista e-mail [${contactListId}].</value>
@@ -153,7 +288,7 @@
         <value xml:lang="th">ไม่สามารถค้นหารายการติดต่อ [${contactListId}]</value>
         <value xml:lang="zh">无法找到电子邮件列表 [${contactListId}]。</value>
     </property>
-    <property key="ContactListOptInVerifyCode">
+    <property key="MarketingContactListOptInVerifyCode">
         <value xml:lang="en">Opt-In Verify Code</value>
         <value xml:lang="es">Código de verificación Opt-in</value>
         <value xml:lang="fr">Code de vérification d'inscription volontaire (Opt-in)</value>
@@ -162,7 +297,7 @@
         <value xml:lang="th">ทางเลือกในการตรวจสอบรหัส</value>
         <value xml:lang="zh">兴趣验证码</value>
     </property>
-    <property key="ContactListOwnerPartyId">
+    <property key="MarketingContactListOwnerPartyId">
         <value xml:lang="en">Owner Party Id</value>
         <value xml:lang="es">Propietario</value>
         <value xml:lang="fr">Réf. d'acteur propriétaire</value>
@@ -171,7 +306,7 @@
         <value xml:lang="th">รหัสของกลุ่มผู้ใช้</value>
         <value xml:lang="zh">拥有人会员标识</value>
     </property>
-    <property key="ContactListParty">
+    <property key="MarketingContactListParty">
         <value xml:lang="en">Contact List Party</value>
         <value xml:lang="es">Participantes</value>
         <value xml:lang="fr">Abonné à la liste de contact</value>
@@ -180,7 +315,7 @@
         <value xml:lang="th">รายการติดต่อกลุ่มผู้ใช้</value>
         <value xml:lang="zh">联系列表会员</value>
     </property>
-    <property key="ContactListPartyCreate">
+    <property key="MarketingContactListPartyCreate">
         <value xml:lang="en">Create New Contact List Party</value>
         <value xml:lang="es">Asociar participante</value>
         <value xml:lang="fr">Créer un nouvel abonné à  la liste de contact</value>
@@ -189,7 +324,7 @@
         <value xml:lang="th">สร้างรายการติดต่อกลุ่มผู้ใช้ใหม่</value>
         <value xml:lang="zh">新建联系列表会员</value>
     </property>
-    <property key="ContactListPartyId">
+    <property key="MarketingContactListPartyId">
         <value xml:lang="de">Teilnehmer ID</value>
         <value xml:lang="en">Party Id</value>
         <value xml:lang="es">Código de participante</value>
@@ -199,7 +334,7 @@
         <value xml:lang="th">รหัสกลุ่มผู้ใช้</value>
         <value xml:lang="zh">会员标识</value>
     </property>
-    <property key="ContactListPreferredContactMech">
+    <property key="MarketingContactListPreferredContactMech">
         <value xml:lang="en">Preferred Contact Mechanism</value>
         <value xml:lang="es">Mecanismo de contacto</value>
         <value xml:lang="fr">Mécanisme de contact favori</value>
@@ -208,7 +343,7 @@
         <value xml:lang="th">วิธีการติดติดต่อลำดับแรก</value>
         <value xml:lang="zh">优先使用的联系方式</value>
     </property>
-    <property key="ContactListVerifyEmailFrom">
+    <property key="MarketingContactListVerifyEmailFrom">
         <value xml:lang="en">Verify Email From</value>
         <value xml:lang="es">E-mail de verificación</value>
         <value xml:lang="fr">Adresse courriel de vérification</value>
@@ -217,7 +352,7 @@
         <value xml:lang="th">ตรวจสอบอีเมล์จาก</value>
         <value xml:lang="zh">验证电子邮件来自</value>
     </property>
-    <property key="ContactListVerifyEmailScreen">
+    <property key="MarketingContactListVerifyEmailScreen">
         <value xml:lang="en">Verify Email Screen</value>
         <value xml:lang="es">Pantalla de verificación</value>
         <value xml:lang="fr">Ecran de vérification du courriel</value>
@@ -226,7 +361,7 @@
         <value xml:lang="th">ตรวจสอบอีเมล์</value>
         <value xml:lang="zh">验证电子邮件屏幕</value>
     </property>
-    <property key="ContactListVerifyEmailSubject">
+    <property key="MarketingContactListVerifyEmailSubject">
         <value xml:lang="en">Verify Email Subject</value>
         <value xml:lang="es">Título del mensaje</value>
         <value xml:lang="fr">Sujet du courriel de vérification</value>
@@ -235,7 +370,7 @@
         <value xml:lang="th">ตรวจสอบหัวข้ออีเมล์</value>
         <value xml:lang="zh">验证电子邮件主题</value>
     </property>
-    <property key="ContactListVerifyEmailWebSiteId">
+    <property key="MarketingContactListVerifyEmailWebSiteId">
         <value xml:lang="en">Verify Email WebSite Id</value>
         <value xml:lang="es">Sitio web de verificación</value>
         <value xml:lang="fr">Réf. du site Internet du courriel de vérification</value>
@@ -244,136 +379,6 @@
         <value xml:lang="th">ตรวจสอบรหัสอีเมล์ในเว็บไซต์</value>
         <value xml:lang="zh">验证电子邮件站点标识</value>
     </property>
-    <property key="DataSourceLabel">
-        <value xml:lang="en">Source</value>
-        <value xml:lang="fr">Origine</value>
-    </property>
-    <property key="FormFieldTitle_actualCost">
-        <value xml:lang="en">Actual Cost</value>
-        <value xml:lang="fr">Coût réel</value>
-        <value xml:lang="it">Costo Attuale</value>
-        <value xml:lang="ro">Cost Actual</value>
-        <value xml:lang="th">ราคาจริง</value>
-        <value xml:lang="zh">实际费用</value>
-    </property>
-    <property key="FormFieldTitle_budgetedCost">
-        <value xml:lang="en">Budgeted Cost</value>
-        <value xml:lang="fr">Coût budgetisé</value>
-        <value xml:lang="it">Costo A Budget</value>
-        <value xml:lang="ro">Cost la Buget</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>
-        <value xml:lang="it">Numero Richiesta Soggetto</value>
-        <value xml:lang="ro">Numar Cerere Subiect</value>
-        <value xml:lang="th">รหัสคำร้องของลูกค้า</value>
-        <value xml:lang="zh">客户请求标识</value>
-    </property>
-    <property key="FormFieldTitle_prodCatalogId">
-        <value xml:lang="en">Product Catalog Id</value>
-        <value xml:lang="fr">Réf. de catalogue</value>
-        <value xml:lang="it">Catalogo Prodotti</value>
-        <value xml:lang="ro">Catalog Produse</value>
-        <value xml:lang="th">รหัสหมวดหมู่สินค้า</value>
-        <value xml:lang="zh">产品目录标识</value>
-    </property>
-    <property key="MarketingCampaign">
-        <value xml:lang="en">Marketing Campaign</value>
-        <value xml:lang="es">Campañas</value>
-        <value xml:lang="fr">Campagne marketing</value>
-        <value xml:lang="it">Campagna Vendita</value>
-        <value xml:lang="ro">Campania Vanzare</value>
-        <value xml:lang="th">การวางแผนทางการตลาด</value>
-        <value xml:lang="zh">市场攻势</value>
-    </property>
-    <property key="MarketingCampaignCreate">
-        <value xml:lang="en">Create Marketing Campaign</value>
-        <value xml:lang="es">Crear campaña de marketing</value>
-        <value xml:lang="fr">Nouvelle campagne marketing</value>
-        <value xml:lang="it">Creare Campagna Vendita</value>
-        <value xml:lang="ro">Creare Campanie Vanzare</value>
-        <value xml:lang="th">สร้างการวางแผนทางการตลาด</value>
-        <value xml:lang="zh">新建市场攻势</value>
-    </property>
-    <property key="MarketingCampaignId">
-        <value xml:lang="en">Marketing Campaign Id</value>
-        <value xml:lang="es">Campaña</value>
-        <value xml:lang="fr">Réf. de campagne marketing</value>
-        <value xml:lang="it">Codice Campagna Vendita</value>
-        <value xml:lang="ro">Cod Campanie Vanzare</value>
-        <value xml:lang="th">รหัสการวางแผนทางการตลาด</value>
-        <value xml:lang="zh">市场攻势标识</value>
-    </property>
-    <property key="MarketingCampaignInvalidEmailInput">
-        <value xml:lang="en">Invalid email address entered.</value>
-        <value xml:lang="fr">Entrée d'adresse courriel invalide</value>
-        <value xml:lang="th">เข้าสู่ที่อยู่ของอีเมล์ไม่ได้</value>
-        <value xml:lang="zh">输入的电子邮件地址无效。</value>
-    </property>
-    <property key="MarketingCampaignName">
-        <value xml:lang="en">Campaign Name</value>
-        <value xml:lang="es">Nombre de la campaña</value>
-        <value xml:lang="fr">Nom de la campagne</value>
-        <value xml:lang="it">Nome Campagna</value>
-        <value xml:lang="ro">Nume Campanie</value>
-        <value xml:lang="th">ชื่อโครงการ</value>
-        <value xml:lang="zh">攻势名称</value>
-    </property>
-    <property key="MarketingCampaignReportTitle">
-        <value xml:lang="en">Marketing Campaign Report</value>
-        <value xml:lang="es">Informe de campañas de marketing</value>
-        <value xml:lang="fr">Rapport des campagnes de marketing</value>
-        <value xml:lang="it">Stampe Campagne di Vendita</value>
-        <value xml:lang="ro">Tiparire Campanie de Vanzare</value>
-        <value xml:lang="th">รายงานการวางแผนทางการตลาด</value>
-        <value xml:lang="zh">市场攻势报告</value>
-    </property>
-    <property key="MarketingCampaignRoleCreate">
-        <value xml:lang="en">Create Marketing Campaign Role</value>
-        <value xml:lang="es">Crear rol de campaña de marketing</value>
-        <value xml:lang="fr">Créer le rôle de la campagne marketing</value>
-        <value xml:lang="it">Creare Ruolo Campagna Vendita</value>
-        <value xml:lang="ro">Creare Rol Campanie Vanzare</value>
-        <value xml:lang="th">สร้างสถานะการวางแผนทางการตลาด</value>
-        <value xml:lang="zh">新建市场攻势角色</value>
-    </property>
-    <property key="MarketingCampaignSummary">
-        <value xml:lang="en">Campaign Summary</value>
-        <value xml:lang="es">Descripción de la campaña</value>
-        <value xml:lang="fr">Résumé de la campagne</value>
-        <value xml:lang="it">Sommario Campagna</value>
-        <value xml:lang="ro">Sumar Campanie</value>
-        <value xml:lang="th">สรุปโครงการ</value>
-        <value xml:lang="zh">攻势摘要</value>
-    </property>
-    <property key="MarketingCompanyName">
-        <value xml:lang="en">OFBiz: Marketing Manager</value>
-        <value xml:lang="es">OFBiz: Gestión de Marketing</value>
-        <value xml:lang="fr">OFBiz: Gestion du Marketing</value>
-        <value xml:lang="it">OFBiz: Gestione Vendite</value>
-        <value xml:lang="ro">OFBiz: Gestione Vendite</value>
-        <value xml:lang="th">OFBiz: การจัดการทางการตลาด</value>
-        <value xml:lang="zh">OFBiz: 市场宣传管理</value>
-    </property>
-    <property key="MarketingCompanySubtitle">
-        <value xml:lang="ar">جزء من عائلة أوفبيز للتطبيقات الحرة للتسيير</value><!--value xml:lang="ar">جزء من عائلة أوفبيز للبرمجيات الحرة</value-->
-        <value xml:lang="de">Teil der Open For Business Familie von Open Source Software</value>
-        <value xml:lang="en">Part of the Open For Business Family of Open Source Software</value>
-        <value xml:lang="es">Parte de la familia de software Open For Business de código abierto</value><!--value xml:lang="es">Parte de la familia "Open for Bussiness" de Software Libre</value-->
-        <value xml:lang="fr">Un module de la famille Open For Business, logiciel libre de gestion d'entreprise.</value>
-        <value xml:lang="it">Part of the Open For Business Family of Open Source Software</value>
-        <value xml:lang="nl">Deel van de Open For Business-suite van Open Source Software</value><!--value xml:lang="nl">Onderdeel van de Open For Business'-suite</value-->
-        <value xml:lang="pt_BR">Parte da família OfBiz de software de fonte aberta</value>
-        <value xml:lang="pt_PT">Parte da família OfBiz de software de fonte aberta</value><!--value xml:lang="pt_PT">Parte do Software de Fonte Aberta para Grupos Abertos Para o Negócio</value-->
-        <value xml:lang="ro">Partea de Deschidere Pentru Afaceri Familiale din Open Source Software</value><!--value xml:lang="ro">Parte accesibila pentru Business Family of Open Source Software</value--><!--value xml:lang="ro">Parte din Open for Business Family of Open Source Software</value-->
-        <value xml:lang="ru">Входит в состав семейства Open For Business</value><!--value xml:lang="ru">Часть семейства ПО Open For Business</value--><!--value xml:lang="ru">Часть семейства "Open For Business Family" программных продуктов Open Source </value-->
-        <value xml:lang="th">ส่วนหนึ่งของธุรกิจแบบครอบครัวที่เป็นซอฟต์แวร์โอเพนซอส</value><!--value xml:lang="th">เป็นส่วนหนึ่งของธุรกิจแบบครอบครัวที่เป็นซอฟต์แวร์โอเพนซอส</value-->
-        <value xml:lang="zh">开源软件OFBiz家族的一部分</value><!--value xml:lang="zh">开源软件OFBiz的组成部分</value--><!--value xml:lang="zh">开源软件OFBiz的组成部分</value-->
-        <value xml:lang="zh_CN">OFBiz的一部分</value>
-    </property>
     <property key="MarketingConversionRate">
         <value xml:lang="en">Conversion Rate</value>
         <value xml:lang="es">Factor de conversión</value>
@@ -396,10 +401,12 @@
         <value xml:lang="en">No of Employees</value>
         <value xml:lang="es">Nº Empleados</value>
         <value xml:lang="fr">N° des employés</value>
+        <value xml:lang="it">N. di impiegati</value>
     </property>
     <property key="MarketingFindAccounts">
         <value xml:lang="en">Find SFA Accounts</value>
         <value xml:lang="fr">Rechercher les comptes de ventes</value>
+        <value xml:lang="it">Ricerca utenze SFA</value>
     </property>
     <property key="MarketingMainPage">
         <value xml:lang="de">Haupt</value>
@@ -415,7 +422,7 @@
         <value xml:lang="en">Marketing Manager Application</value>
         <value xml:lang="es">Gestión de Marketing</value>
         <value xml:lang="fr">Application de gestion marketing</value>
-        <value xml:lang="it">Applicazione Gestione Vendite</value>
+        <value xml:lang="it">Applicazione gestione vendite</value>
         <value xml:lang="ro">Aplicatie Gestiune Vanzare</value>
         <value xml:lang="th">โปรแกรมประยุกต์การจัดการทางการตลาด</value>
         <value xml:lang="zh">市场管理应用程序</value>
@@ -423,7 +430,7 @@
     <property key="MarketingManagerWelcome">
         <value xml:lang="en">Welcome to the Marketing Manager!</value>
         <value xml:lang="fr">Bienvenue dans l'application de gestion du marketing !</value>
-        <value xml:lang="it">Benvenuto nell'Applicazione Gestione Vendite!</value>
+        <value xml:lang="it">Benvenuto nell'applicazione gestione vendite!</value>
         <value xml:lang="th">ยินดีต้อนรับสู่การจัดการทางการตลาด</value>
     </property>
     <property key="MarketingOrderAmount">
@@ -463,12 +470,371 @@
         <value xml:lang="th">รายงาน</value>
         <value xml:lang="zh">报告</value>
     </property>
+    <property key="MarketingSegment">
+        <value xml:lang="en">Segment</value>
+        <value xml:lang="es">Segmentos</value>
+        <value xml:lang="fr">Segment</value>
+        <value xml:lang="it">Segmento</value>
+        <value xml:lang="ro">Segment</value>
+        <value xml:lang="th">กลุ่ม</value>
+        <value xml:lang="zh">分区</value>
+    </property>
+    <property key="MarketingSegmentGroupClassCreate">
+        <value xml:lang="en">Create New Segment Group Classification</value>
+        <value xml:lang="es">Nueva clasificación de segmento</value>
+        <value xml:lang="fr">Créer une nouvelle classification de groupe de segment</value>
+        <value xml:lang="it">Creare Nuova Classificazione Gruppo Segmento</value>
+        <value xml:lang="ro">Creare Noua Clasificare Grup Segment</value>
+        <value xml:lang="th">สร้างการจัดแบ่งประเภทของกลุ่มใหม่</value>
+        <value xml:lang="zh">新建分区组分类</value>
+    </property>
+    <property key="MarketingSegmentGroupCreate">
+        <value xml:lang="en">Create New Segment Group</value>
+        <value xml:lang="es">Nuevo segmento</value>
+        <value xml:lang="fr">Créer un nouveau groupe de segment</value>
+        <value xml:lang="it">Creare Nuovo Gruppo Segmento</value>
+        <value xml:lang="ro">Creare Nou Grup Segment</value>
+        <value xml:lang="th">สร้างส่วนของกลุ่มใหม่</value>
+        <value xml:lang="zh">新建分区组</value>
+    </property>
+    <property key="MarketingSegmentGroupDescription">
+        <value xml:lang="de">Beschreibung</value>
+        <value xml:lang="en">Description</value>
+        <value xml:lang="es">Descripción</value>
+        <value xml:lang="fr">Description</value>
+        <value xml:lang="it">Descrizione</value>
+        <value xml:lang="ro">Descriere</value>
+        <value xml:lang="th">รายละเอียด</value>
+        <value xml:lang="zh">描述</value>
+    </property>
+    <property key="MarketingSegmentGroupGeoAbbr">
+        <value xml:lang="en">Abbreviation</value>
+        <value xml:lang="es">Abreviación</value>
+        <value xml:lang="fr">Abbréviation</value>
+        <value xml:lang="it">Abbreviazione</value>
+        <value xml:lang="ro">Abreviere</value>
+        <value xml:lang="th">ชื่อย่อ</value>
+        <value xml:lang="zh">缩写</value>
+    </property>
+    <property key="MarketingSegmentGroupGeoCode">
+        <value xml:lang="en">Code</value>
+        <value xml:lang="es">Código</value>
+        <value xml:lang="fr">Code</value>
+        <value xml:lang="it">Codice</value>
+        <value xml:lang="ro">Cod</value>
+        <value xml:lang="th">รหัส</value>
+        <value xml:lang="zh">代码</value>
+    </property>
+    <property key="MarketingSegmentGroupGeoCreate">
+        <value xml:lang="en">Create New Segment Group Geo</value>
+        <value xml:lang="es">Nueva ubicación</value>
+        <value xml:lang="fr">Créer une nouvelle zone géographique de groupe de segment</value>
+        <value xml:lang="it">Creare Nuovo Gruppo Segmento Geografia</value>
+        <value xml:lang="ro">Creare Nou Grup Segment Geografie</value>
+        <value xml:lang="th">สร้างส่วนของโครงสร้างกลุ่มใหม่</value>
+        <value xml:lang="zh">新建分区组地理</value>
+    </property>
+    <property key="MarketingSegmentGroupGeoId">
+        <value xml:lang="en">Geo ID</value>
+        <value xml:lang="es">Código ubicación</value>
+        <value xml:lang="fr">Réf. de zone géographique</value>
+        <value xml:lang="it">Codice Geografia</value>
+        <value xml:lang="ro">Cod Geografie</value>
+        <value xml:lang="th">รหัสโครงสร้าง</value>
+        <value xml:lang="zh">地理标识</value>
+    </property>
+    <property key="MarketingSegmentGroupGeoName">
+        <value xml:lang="en">Name</value>
+        <value xml:lang="es">Nombre</value>
+        <value xml:lang="fr">Nom</value>
+        <value xml:lang="it">Nome</value>
+        <value xml:lang="ro">Nome</value>
+        <value xml:lang="th">ชื่อ</value>
+        <value xml:lang="zh">名称</value>
+    </property>
+    <property key="MarketingSegmentGroupGeoSecCode">
+        <value xml:lang="en">Secondary Code</value>
+        <value xml:lang="es">Código secundario</value>
+        <value xml:lang="fr">Code secondaire</value>
+        <value xml:lang="it">Codice Secondario</value>
+        <value xml:lang="ro">Cod Secundar</value>
+        <value xml:lang="th">รหัสที่สอง</value>
+        <value xml:lang="zh">第二代码</value>
+    </property>
+    <property key="MarketingSegmentGroupGeoTypeId">
+        <value xml:lang="en">Geo Type ID</value>
+        <value xml:lang="es">Tipo de ubicación</value>
+        <value xml:lang="fr">Réf. de type de zone géographique</value>
+        <value xml:lang="it">Tipo Geografia</value>
+        <value xml:lang="ro">Tip Geografie</value>
+        <value xml:lang="th">รหัสประเภทโครงสร้าง</value>
+        <value xml:lang="zh">地理类型标识</value>
+    </property>
+    <property key="MarketingSegmentGroupNoSegmentGroupFoundWithId">
+        <value xml:lang="en">No SegmentGroup found with ID:</value>
+        <value xml:lang="es">No se encontraron segmentos con el ID:</value>
+        <value xml:lang="fr">Aucun groupe de segment trouvé pour la réf. : </value>
+        <value xml:lang="it">Nessun Gruppo Segmento trovato con il codice:</value>
+        <value xml:lang="ro">Nici-un Grup Segment gasit cu codul:</value>
+        <value xml:lang="th">ไม่มีส่วนของกลุ่มที่พบจากรหัสนี้ :</value>
+        <value xml:lang="zh">没有找到分区组，标识：</value>
+    </property>
+    <property key="MarketingSegmentGroupProductStoreId">
+        <value xml:lang="de">Produktgeschäfts-ID</value>
+        <value xml:lang="en">Product Store Id</value>
+        <value xml:lang="es">Tienda</value>
+        <value xml:lang="fr">Réf. de centre de profit</value>
+        <value xml:lang="it">Codice Negozio</value>
+        <value xml:lang="ro">Cod Magazin</value>
+        <value xml:lang="th">รหัสคลังสินค้า</value>
+        <value xml:lang="zh">产品店铺标识</value>
+    </property>
+    <property key="MarketingSegmentGroupRoleCreate">
+        <value xml:lang="en">Create New Segment Group Role</value>
+        <value xml:lang="es">Nuevo rol de segmento</value>
+        <value xml:lang="fr">Créer un nouveau rôle de groupe de segment</value>
+        <value xml:lang="it">Creare Nuovo Ruolo Gruppo Segmento</value>
+        <value xml:lang="ro">Creare Nou Rol Grup Segment</value>
+        <value xml:lang="th">สร้างสถานะของกลุ่มใหม่</value>
+        <value xml:lang="zh">新建分区组角色</value>
+    </property>
+    <property key="MarketingSegmentGroupSegmentGroup">
+        <value xml:lang="en">Segment</value>
+        <value xml:lang="es">Segmentos</value>
+        <value xml:lang="fr">Segment</value>
+        <value xml:lang="it">Segmento</value>
+        <value xml:lang="ro">Segment</value>
+        <value xml:lang="th">กลุ่ม</value>
+        <value xml:lang="zh">分区</value>
+    </property>
+    <property key="MarketingSegmentGroupSegmentGroupClassification">
+        <value xml:lang="en">Classification</value>
+        <value xml:lang="es">Clasificación</value>
+        <value xml:lang="fr">Classification</value>
+        <value xml:lang="it">Classificazione</value>
+        <value xml:lang="ro">Clasificare</value>
+        <value xml:lang="th">จัดแบ่งประเภทหมวดหมู่</value>
+        <value xml:lang="zh">分类</value>
+    </property>
+    <property key="MarketingSegmentGroupSegmentGroupGeo">
+        <value xml:lang="de">Gebiet</value>
+        <value xml:lang="en">Geo</value>
+        <value xml:lang="es">Ubicación</value>
+        <value xml:lang="fr">Zone géographique</value>
+        <value xml:lang="it">Geografia</value>
+        <value xml:lang="ro">Geografie</value>
+        <value xml:lang="th">โครงสร้าง</value>
+        <value xml:lang="zh">地理</value>
+    </property>
+    <property key="MarketingSegmentGroupSegmentGroupId">
+        <value xml:lang="en">Segment Group Id</value>
+        <value xml:lang="es">Código de segmento</value>
+        <value xml:lang="fr">Réf. du groupe de segment</value>
+        <value xml:lang="it">Codice Gruppo Segmento</value>
+        <value xml:lang="ro">Cod Grup Segment</value>
+        <value xml:lang="th">รหัสส่วนของกลุ่ม</value>
+        <value xml:lang="zh">分区组标识</value>
+    </property>
+    <property key="MarketingSegmentGroupSegmentGroupLookup">
+        <value xml:lang="en">Find</value>
+        <value xml:lang="es">Buscar</value>
+        <value xml:lang="fr">Rechercher</value>
+        <value xml:lang="it">Ricerca</value>
+        <value xml:lang="ro">Cauta</value>
+        <value xml:lang="th">ค้นหา</value>
+        <value xml:lang="zh">查找</value>
+    </property>
+    <property key="MarketingSegmentGroupSegmentGroupRole">
+        <value xml:lang="de">Funktion</value>
+        <value xml:lang="en">Role</value>
+        <value xml:lang="es">Rol</value>
+        <value xml:lang="fr">Rôle</value>
+        <value xml:lang="it">Ruolo</value>
+        <value xml:lang="ro">Rol</value>
+        <value xml:lang="th">สถานะ</value>
+        <value xml:lang="zh">角色</value>
+    </property>
+    <property key="MarketingSegmentGroupSegmentGroupType">
+        <value xml:lang="de">Art</value>
+        <value xml:lang="en">Type</value>
+        <value xml:lang="es">Tipo</value>
+        <value xml:lang="fr">Type</value>
+        <value xml:lang="it">Tipo</value>
+        <value xml:lang="ro">Tip</value>
+        <value xml:lang="th">ประเภท</value>
+        <value xml:lang="zh">类型</value>
+    </property>
+    <property key="MarketingSegmentGroupSegmentGroupTypeId">
+        <value xml:lang="en">Segment Group Type Id</value>
+        <value xml:lang="es">Tipo de segmento</value>
+        <value xml:lang="fr">Réf. du type de groupe de segment</value>
+        <value xml:lang="it">Tipo Gruppo Segmento</value>
+        <value xml:lang="ro">Tip Grup Segment</value>
+        <value xml:lang="th">รหัสประเภทของกลุ่ม</value>
+        <value xml:lang="zh">分区组类型标识</value>
+    </property>
     <property key="MarketingServiceError">
         <value xml:lang="en">There was a problem processing your request.  Please try again.  If the problem persists, please contact us.</value>
         <value xml:lang="fr">Il y a eu un problème durant le traitement de votre demande. SVP, essayez encore. Si le problème persiste, contactez-nous, merci.</value>
+        <value xml:lang="it">C'è stato un problema durante l'esecuzione della tua richiesta.  Perfavore riprovare.  Se il problema persiste, perfavore contattaci.</value>
         <value xml:lang="th">มีปัญหาในการประมวลผลคำร้องของคุณ กรุณาลองอีกครั้ง ถ้ายังเกิดปัญหาเหมือนเดิม กรุณาติดต่อเรา</value>
         <value xml:lang="zh">处理你的请求时出错。请重试。如果仍然出错，请与我们联系。</value>
     </property>
+    <property key="MarketingTracking">
+        <value xml:lang="en">Tracking</value>
+        <value xml:lang="es">Seguimiento</value>
+        <value xml:lang="fr">Suivi</value>
+        <value xml:lang="it">Tracciatura</value>
+        <value xml:lang="ro">Traseu</value>
+        <value xml:lang="th">การติดตาม</value>
+        <value xml:lang="zh">跟踪</value>
+    </property>
+    <property key="MarketingTrackingCode">
+        <value xml:lang="en">Tracking Code</value>
+        <value xml:lang="es">Seguimiento</value>
+        <value xml:lang="fr">Code de suivi</value>
+        <value xml:lang="it">Codice Tracciatura</value>
+        <value xml:lang="ro">Cod Traseu</value>
+        <value xml:lang="th">รหัส Tracking</value>
+        <value xml:lang="zh">跟踪码</value>
+    </property>
+    <property key="MarketingTrackingCodeBillableLifetime">
+        <value xml:lang="en">Billable Lifetime</value>
+        <value xml:lang="es">Tiempo de facturación</value>
+        <value xml:lang="fr">Durée de vie facturable</value>
+        <value xml:lang="it">Tempo di Vita Fatturabile</value>
+        <value xml:lang="ro">Timp de Viata Facturabila</value>
+        <value xml:lang="th">ใบเสร็จรับเงินใช้ได้ตลอดเวลา</value>
+        <value xml:lang="zh">可记账期限</value>
+    </property>
+    <property key="MarketingTrackingCodeComments">
+        <value xml:lang="de">Kommentare</value>
+        <value xml:lang="en">Comments</value>
+        <value xml:lang="es">Comentarios</value>
+        <value xml:lang="fr">Commentaires</value>
+        <value xml:lang="it">Commenti</value>
+        <value xml:lang="ro">Comentarii</value>
+        <value xml:lang="th">ความคิดเห็น</value>
+        <value xml:lang="zh">评论</value>
+    </property>
+    <property key="MarketingTrackingCodeCreate">
+        <value xml:lang="en">Create Tracking Code</value>
+        <value xml:lang="es">Crear seguimiento</value>
+        <value xml:lang="fr">Nouveau code de suivi</value>
+        <value xml:lang="it">Creare Codice Tracciatura</value>
+        <value xml:lang="ro">Creare Cod Traseu</value>
+        <value xml:lang="th">สร้างรหัส Tracking</value>
+        <value xml:lang="zh">新建跟踪码</value>
+    </property>
+    <property key="MarketingTrackingCodeDefaultProdCatalogId">
+        <value xml:lang="en">Default Product Catalog Id</value>
+        <value xml:lang="es">Catálogo</value>
+        <value xml:lang="fr">Réf. du catalogue produit par défault</value>
+        <value xml:lang="it">Codice Catalogo Default</value>
+        <value xml:lang="ro">Cod Catalog Default</value>
+        <value xml:lang="th">รหัสหมวดหมู่สินค้าทั่วไป</value>
+        <value xml:lang="zh">缺省产品目录标识</value>
+    </property>
+    <property key="MarketingTrackingCodeDescription">
+        <value xml:lang="de">Beschreibung</value>
+        <value xml:lang="en">Description</value>
+        <value xml:lang="es">Descripción</value>
+        <value xml:lang="fr">Description</value>
+        <value xml:lang="it">Descrizione</value>
+        <value xml:lang="ro">Descriere</value>
+        <value xml:lang="th">รายละเอียด</value>
+        <value xml:lang="zh">描述</value>
+    </property>
+    <property key="MarketingTrackingCodeGroupId">
+        <value xml:lang="en">Group Id</value>
+        <value xml:lang="es">Grupo</value>
+        <value xml:lang="fr">Réf. du groupe</value>
+        <value xml:lang="it">Codice Gruppo</value>
+        <value xml:lang="ro">Cod Grup</value>
+        <value xml:lang="th">รหัสกลุ่ม</value>
+        <value xml:lang="zh">组标识</value>
+    </property>
+    <property key="MarketingTrackingCodeInSeconds">
+        <value xml:lang="en">Seconds</value>
+        <value xml:lang="es">Segundos</value>
+        <value xml:lang="fr">Secondes</value>
+        <value xml:lang="it">Secondi</value>
+        <value xml:lang="ro">Secunde</value>
+        <value xml:lang="th">ลำดับที่สอง</value>
+        <value xml:lang="zh">秒</value>
+    </property>
+    <property key="MarketingTrackingCodeNoOverrideIfEmpty">
+        <value xml:lang="en">No override (co-brand) if empty</value>
+        <value xml:lang="es">Si este campo queda vacío no se reemplazará</value>
+        <value xml:lang="fr">Aucun remplacement (marque associée) si vide</value>
+        <value xml:lang="it">Nessuna sovrapposizione (co-brand) se vuoto</value>
+        <value xml:lang="ro">Nu se poate suprascrie (marca-asociata) daca este gol.</value>
+        <value xml:lang="th">ไม่มีการยกเลิก (ยี่ห้อสินค้าร่วมกัน) ถ้าว่าง</value>
+        <value xml:lang="zh">如果为空，不作替代 (联合品牌)</value>
+    </property>
+    <property key="MarketingTrackingCodeNoRedirectIfEmpty">
+        <value xml:lang="en">No redirect if empty</value>
+        <value xml:lang="es">Si este campo queda vacío no habrá redirección</value>
+        <value xml:lang="fr">Aucune redirection si vide</value>
+        <value xml:lang="it">Nessun redirect se vuoto</value>
+        <value xml:lang="ro">Daca este gol nu poate fi redirectionat</value>
+        <value xml:lang="th">ไม่มีการเปลี่ยนถ้าว่าง</value>
+        <value xml:lang="zh">如果为空，不重定向</value>
+    </property>
+    <property key="MarketingTrackingCodeOrder">
+        <value xml:lang="en">Tracking Code Orders</value>
+        <value xml:lang="es">Órdenes de seguimiento</value>
+        <value xml:lang="fr">Codes de suivi des commandes</value>
+        <value xml:lang="it">Codice Tracciatura Ordini</value>
+        <value xml:lang="ro">Cod Traseu Comenzi</value>
+        <value xml:lang="th">รหัส Tracking การสั่งซื้อสินค้า</value>
+        <value xml:lang="zh">跟踪码定订单</value>
+    </property>
+    <property key="MarketingTrackingCodeOrderIsBilliable">
+        <value xml:lang="en">Is Billable ?</value>
+        <value xml:lang="es">Es facturable ?</value>
+        <value xml:lang="fr">Facturable ?</value>
+        <value xml:lang="it">E' Fatturabile ?</value>
+        <value xml:lang="ro">Este Facturabil ?</value>
+        <value xml:lang="th">เป็นใบเสร็จที่ใช้ได้ ?</value>
+        <value xml:lang="zh">可记账吗?</value>
+    </property>
+    <property key="MarketingTrackingCodeOrderOrderId">
+        <value xml:lang="en">Order Id</value>
+        <value xml:lang="es">Código de orden</value>
+        <value xml:lang="fr">Réf. de l'ordre</value>
+        <value xml:lang="it">Numero Ordine</value>
+        <value xml:lang="ro">Numar Comanda</value>
+        <value xml:lang="th">รหัสการสั่งซื้อสินค้า</value>
+        <value xml:lang="zh">订单标识</value>
+    </property>
+    <property key="MarketingTrackingCodeOverrideCss">
+        <value xml:lang="en">Override CSS URL</value>
+        <value xml:lang="es">CSS</value>
+        <value xml:lang="fr">URL de la CSS de remplacement</value>
+        <value xml:lang="it">Sostituzione URL CSS</value>
+        <value xml:lang="ro">Substitutie URL CSS</value>
+        <value xml:lang="th">ยกเลิก CSS URL</value>
+        <value xml:lang="zh">替代风格页网址</value>
+    </property>
+    <property key="MarketingTrackingCodeOverrideLogo">
+        <value xml:lang="en">Override Logo URL</value>
+        <value xml:lang="es">Logo</value>
+        <value xml:lang="fr">URL de l'image logo de remplacement</value>
+        <value xml:lang="it">Sostituzione URL Logo</value>
+        <value xml:lang="ro">Substitutie URL Logo</value>
+        <value xml:lang="th">ยกเลิกโลโก้ URL</value>
+        <value xml:lang="zh">替代徽标网址</value>
+    </property>
+    <property key="MarketingTrackingCodeRedirectUrl">
+        <value xml:lang="en">Redirect URL</value>
+        <value xml:lang="es">URL</value>
+        <value xml:lang="fr">URL de redirection</value>
+        <value xml:lang="it">Ridirezione URL</value>
+        <value xml:lang="ro">Redirectie URL</value>
+        <value xml:lang="th">เปลี่ยน URL</value>
+        <value xml:lang="zh">重定向网址</value>
+    </property>
     <property key="MarketingTrackingCodeReportTitle">
         <value xml:lang="en">Tracking Code Report</value>
         <value xml:lang="es">Informe de seguimientos</value>
@@ -478,6 +844,171 @@
         <value xml:lang="th">รหัส Tracking</value>
         <value xml:lang="zh">跟踪码报告</value>
     </property>
+    <property key="MarketingTrackingCodeSubgroupId">
+        <value xml:lang="en">Sub-Group Id</value>
+        <value xml:lang="es">Sub-grupo</value>
+        <value xml:lang="fr">Réf. du sous-groupe</value>
+        <value xml:lang="it">Codice Sotto-Gruppo</value>
+        <value xml:lang="ro">Cod Sub-Grup</value>
+        <value xml:lang="th">รหัสกลุ่มย่อย</value>
+        <value xml:lang="zh">下级组标识</value>
+    </property>
+    <property key="MarketingTrackingCodeTrackableLifetime">
+        <value xml:lang="en">Trackable Lifetime</value>
+        <value xml:lang="es">Tiempo de vida</value>
+        <value xml:lang="fr">Durée de vie du suivi</value>
+        <value xml:lang="it">Tracciatura Tempo di Vita</value>
+        <value xml:lang="ro">Traseu Timp de Viata</value>
+        <value xml:lang="th">เส้นทางที่ใช้ได้ตลอดเวลา</value>
+        <value xml:lang="zh">可跟踪期限</value>
+    </property>
+    <property key="MarketingTrackingCodeTrackingCodeId">
+        <value xml:lang="en">Tracking Code Id</value>
+        <value xml:lang="es">Código</value>
+        <value xml:lang="fr">Réf. du code de suivi</value>
+        <value xml:lang="it">Codice Tracciatura</value>
+        <value xml:lang="ro">Code Traseu</value>
+        <value xml:lang="th">รหัส Tracking</value>
+        <value xml:lang="zh">跟踪码标识</value>
+    </property>
+    <property key="MarketingTrackingCodeTrackingCodeTypeId">
+        <value xml:lang="en">Tracking Code Type Id</value>
+        <value xml:lang="es">Tipo de código</value>
+        <value xml:lang="fr">Type de code de suivi</value>
+        <value xml:lang="it">Tipo Tracciatura</value>
+        <value xml:lang="ro">Tip Traseu</value>
+        <value xml:lang="th">รหัสประเภทรหัส Tracking</value>
+        <value xml:lang="zh">跟踪码类型标识</value>
+    </property>
+    <property key="MarketingTrackingCodeType">
+        <value xml:lang="en">Tracking Code Type</value>
+        <value xml:lang="es">Tipo de seguimiento</value>
+        <value xml:lang="fr">Type de code de suivi</value>
+        <value xml:lang="it">Tipo Codice Tracciatura</value>
+        <value xml:lang="ro">Tip Cod Traseu</value>
+        <value xml:lang="th">ประเภทรหัส Tracking</value>
+        <value xml:lang="zh">跟踪码类型</value>
+    </property>
+    <property key="MarketingTrackingCodeTypeCreate">
+        <value xml:lang="en">Create Tracking Code Type</value>
+        <value xml:lang="es">Crear tipo de seguimiento</value>
+        <value xml:lang="fr">Nouveau type de code de suivi</value>
+        <value xml:lang="it">Creare Tipo Tracciatura</value>
+        <value xml:lang="ro">Creare Tip Traseu</value>
+        <value xml:lang="th">สร้างประเภทรหัส Tracking</value>
+        <value xml:lang="zh">新建跟踪码类型</value>
+    </property>
+    <property key="MarketingTrackingCodeTypeDescription">
+        <value xml:lang="de">Beschreibung</value>
+        <value xml:lang="en">Description</value>
+        <value xml:lang="es">Descripción</value>
+        <value xml:lang="fr">Description</value>
+        <value xml:lang="it">Descrizione</value>
+        <value xml:lang="ro">Descriere</value>
+        <value xml:lang="th">รายละเอียด</value>
+        <value xml:lang="zh">描述</value>
+    </property>
+    <property key="MarketingTrackingCodeVisit">
+        <value xml:lang="en">Tracking Code Visits</value>
+        <value xml:lang="es">Visitas de seguimiento</value>
+        <value xml:lang="fr">Codes de suivi des visites</value>
+        <value xml:lang="it">Codice Tracciatura Visite</value>
+        <value xml:lang="ro">Cod Traseu Vizite</value>
+        <value xml:lang="th">รหัส Tracking ของการเยี่ยมชม</value>
+        <value xml:lang="zh">跟踪码访问</value>
+    </property>
+    <property key="MarketingTrackingCodeVisitClientHostName">
+        <value xml:lang="en">Client Hostname</value>
+        <value xml:lang="es">Host</value>
+        <value xml:lang="fr">Nom d'hôte du client</value>
+        <value xml:lang="it">Nome Host Client</value>
+        <value xml:lang="ro">Nume Host Client</value>
+        <value xml:lang="th">ชื่อเจ้าของเครื่องคอมพิวเตอร์ในเครือข่าย</value>
+        <value xml:lang="zh">客户端主机名</value>
+    </property>
+    <property key="MarketingTrackingCodeVisitClientIpAddress">
+        <value xml:lang="en">Client IP Address</value>
+        <value xml:lang="es">Dirección IP</value>
+        <value xml:lang="fr">Adresse IP du client</value>
+        <value xml:lang="it">Indirizzo IP Client</value>
+        <value xml:lang="ro">Adresa IP Client</value>
+        <value xml:lang="th">ที่อยู่ IP ของเครื่องคอมพิวเตอร์ในเครือข่าย</value>
+        <value xml:lang="zh">客户端IP地址</value>
+    </property>
+    <property key="MarketingTrackingCodeVisitContactMechTypeId">
+        <value xml:lang="en">Contact Mechanism Type</value>
+        <value xml:lang="es">Mecanismo de contacto</value>
+        <value xml:lang="fr">Type de coordonnées</value>
+        <value xml:lang="it">Tipo Contatto</value>
+        <value xml:lang="ro">Tip Contact</value>
+        <value xml:lang="th">ประเภทวิธีการสื่อสาร</value>
+        <value xml:lang="zh">联系方式类型</value>
+    </property>
+    <property key="MarketingTrackingCodeVisitPartyId">
+        <value xml:lang="de">Teilnehmer ID</value>
+        <value xml:lang="en">Party Id</value>
+        <value xml:lang="es">Participante</value>
+        <value xml:lang="fr">Réf. de l'acteur</value>
+        <value xml:lang="it">Codice Soggetto</value>
+        <value xml:lang="ro">Cod Subiect</value>
+        <value xml:lang="th">รหัสกลุ่มผู้ใช้</value>
+        <value xml:lang="zh">会员标识</value>
+    </property>
+    <property key="MarketingTrackingCodeVisitRoleTypeId">
+        <value xml:lang="de">Funktionstyp ID</value>
+        <value xml:lang="en">Role Type Id</value>
+        <value xml:lang="es">Tipo de rol</value>
+        <value xml:lang="fr">Type de rôle</value>
+        <value xml:lang="it">Tipo Ruolo</value>
+        <value xml:lang="ro">Tip Rol</value>
+        <value xml:lang="th">รหัสประเภทสถานะ</value>
+        <value xml:lang="zh">角色类型标识</value>
+    </property>
+    <property key="MarketingTrackingCodeVisitSessionId">
+        <value xml:lang="en">Session Id</value>
+        <value xml:lang="es">Código de sesión</value>
+        <value xml:lang="fr">Réf. de la session</value>
+        <value xml:lang="it">Numero Sessione</value>
+        <value xml:lang="ro">Numar Seziune</value>
+        <value xml:lang="th">รหัสการประชุม</value>
+        <value xml:lang="zh">会话标识</value>
+    </property>
+    <property key="MarketingTrackingCodeVisitSourceEnumId">
+        <value xml:lang="en">Source Id</value>
+        <value xml:lang="es">Código de fuente de la visita</value>
+        <value xml:lang="fr">Réf. de l'origine</value>
+        <value xml:lang="it">Numero Origine</value>
+        <value xml:lang="ro">Numar Origine</value>
+        <value xml:lang="th">รหัสแหล่งที่มา</value>
+        <value xml:lang="zh">源标识</value>
+    </property>
+    <property key="MarketingTrackingCodeVisitVisitId">
+        <value xml:lang="en">Visit Id</value>
+        <value xml:lang="es">Código de visita</value>
+        <value xml:lang="fr">Réf. de la visite</value>
+        <value xml:lang="it">Numero Visita</value>
+        <value xml:lang="ro">Numar Vizita</value>
+        <value xml:lang="th">รหัสการเยี่ยมชม</value>
+        <value xml:lang="zh">访问标识</value>
+    </property>
+    <property key="MarketingTrackingCodeVisitVisitorId">
+        <value xml:lang="en">Visitor Id</value>
+        <value xml:lang="es">Código de visitante</value>
+        <value xml:lang="fr">Réf. du visiteur</value>
+        <value xml:lang="it">Codice Visitatore</value>
+        <value xml:lang="ro">Cod Vizita</value>
+        <value xml:lang="th">รหัสผู้เยี่ยมชม</value>
+        <value xml:lang="zh">访问者标识</value>
+    </property>
+    <property key="MarketingTrackingCodeVisitWebappName">
+        <value xml:lang="en">Webapp Name</value>
+        <value xml:lang="es">Nombre de aplicación web</value>
+        <value xml:lang="fr">Nom de l'application Web</value>
+        <value xml:lang="it">Nome Applicazione Web</value>
+        <value xml:lang="ro">Nume Aplicatie Web</value>
+        <value xml:lang="th">ชื่อโปรแกรมประยุต์บนเว็บ</value>
+        <value xml:lang="zh">Web应用名称</value>
+    </property>
     <property key="MarketingViewPermissionError">
         <value xml:lang="en">View Permission Error</value>
         <value xml:lang="es">Usted no cuenta con permiso de acceso</value>
@@ -498,6 +1029,7 @@
     <property key="PageTitleAccountSummary">
         <value xml:lang="en">Account Summary</value>
         <value xml:lang="fr">Résumé de compte</value>
+        <value xml:lang="it">Sommario utente</value>
     </property>
     <property key="PageTitleAddContactList">
         <value xml:lang="en">Add Contact List</value>
@@ -539,36 +1071,42 @@
         <value xml:lang="en">Create New Account</value>
         <value xml:lang="es">Crear nueva cuenta</value>
         <value xml:lang="fr">Créer un nouveau compte</value>
+        <value xml:lang="it">Creare una nuova utenza</value>
     </property>
     <property key="PageTitleCreateContact">
         <value xml:lang="en">Create New Contact</value>
         <value xml:lang="es">Crear nuevo contacto</value>
         <value xml:lang="fr">Créer un nouveau contact</value>
+        <value xml:lang="it">Creare un nuovo contatto</value>
     </property>
     <property key="PageTitleCreateContactFromVCard">
         <value xml:lang="en">Create contact from vCard</value>
         <value xml:lang="fr">Créer un contact depuis la vCard</value>
+        <value xml:lang="it">Creare contatto dalla vCard</value>
     </property>
     <property key="PageTitleCreateLead">
         <value xml:lang="en">Create New Lead</value>
         <value xml:lang="es">Crear nuevo lead</value>
         <value xml:lang="fr">Créer un nouveau prospect</value>
+        <value xml:lang="it">Creare nuovo lead</value>
     </property>
     <property key="PageTitleCreateLeadFromVCard">
         <value xml:lang="en">Create Lead from vCard</value>
         <value xml:lang="es">Crear nuevo lead desde vCard</value>
         <value xml:lang="fr">Créer un prospect depuis la vCard</value>
+        <value xml:lang="it">Creare lead dalla vCard</value>
     </property>
     <property key="PageTitleEditAccount">
         <value xml:lang="en">Edit Account</value>
         <value xml:lang="es">Editar cuenta</value>
         <value xml:lang="fr">Modifier le compte</value>
+        <value xml:lang="it">Aggiornare utente</value>
     </property>
     <property key="PageTitleEditContactList">
         <value xml:lang="en">Edit Contact List</value>
         <value xml:lang="es">Editar lista de contactos</value>
         <value xml:lang="fr">Modifier la liste de contact</value>
-        <value xml:lang="it">Aggiorna Lista Contatto</value>
+        <value xml:lang="it">Aggiorna lista contatto</value>
         <value xml:lang="ro">Editeaza Lista Contacte</value>
         <value xml:lang="th">แก้ไขรายการติดต่อ</value>
         <value xml:lang="zh">编辑联系列表</value>
@@ -612,10 +1150,12 @@
     <property key="PageTitleEditSalesForecast">
         <value xml:lang="en">Edit Sales Forecast</value>
         <value xml:lang="fr">Modifier la prévision de ventes</value>
+        <value xml:lang="it">Aggiorna previsioni di vendita</value>
     </property>
     <property key="PageTitleEditSalesForecastDetail">
         <value xml:lang="en">Edit Sales Forecast Detail</value>
         <value xml:lang="fr">Modifier le détail de la prévision de ventes</value>
+        <value xml:lang="it">Aggiorna dettagli previsioni di vendita</value>
     </property>
     <property key="PageTitleEditSegmentGroup">
         <value xml:lang="en">Edit Segment Group</value>
@@ -728,6 +1268,7 @@
     <property key="PageTitleFindSalesForecast">
         <value xml:lang="en">Find Sales Forecast</value>
         <value xml:lang="fr">Rechercher la prévision des ventes</value>
+        <value xml:lang="it">Ricerca previsioni di vendita</value>
     </property>
     <property key="PageTitleFindSegmentGroup">
         <value xml:lang="en">Find Segment Group</value>
@@ -905,6 +1446,7 @@
     <property key="PageTitleLookupSalesForecast">
         <value xml:lang="en">Lookup Sales Forecast</value>
         <value xml:lang="fr">Consulter la prévision des ventes</value>
+        <value xml:lang="it">Ricerca previsioni di vendita</value>
     </property>
     <property key="PageTitleLookupSegmentGroup">
         <value xml:lang="en">Lookup Segment Group</value>
@@ -950,760 +1492,296 @@
         <value xml:lang="th">วิธีการติดต่อ</value>
         <value xml:lang="zh">优先使用的联系方式</value>
     </property>
-    <property key="Segment">
-        <value xml:lang="en">Segment</value>
-        <value xml:lang="es">Segmentos</value>
-        <value xml:lang="fr">Segment</value>
-        <value xml:lang="it">Segmento</value>
-        <value xml:lang="ro">Segment</value>
-        <value xml:lang="th">กลุ่ม</value>
-        <value xml:lang="zh">分区</value>
-    </property>
-    <property key="SegmentGroupClassCreate">
-        <value xml:lang="en">Create New Segment Group Classification</value>
-        <value xml:lang="es">Nueva clasificación de segmento</value>
-        <value xml:lang="fr">Créer une nouvelle classification de groupe de segment</value>
-        <value xml:lang="it">Creare Nuova Classificazione Gruppo Segmento</value>
-        <value xml:lang="ro">Creare Noua Clasificare Grup Segment</value>
-        <value xml:lang="th">สร้างการจัดแบ่งประเภทของกลุ่มใหม่</value>
-        <value xml:lang="zh">新建分区组分类</value>
-    </property>
-    <property key="SegmentGroupCreate">
-        <value xml:lang="en">Create New Segment Group</value>
-        <value xml:lang="es">Nuevo segmento</value>
-        <value xml:lang="fr">Créer un nouveau groupe de segment</value>
-        <value xml:lang="it">Creare Nuovo Gruppo Segmento</value>
-        <value xml:lang="ro">Creare Nou Grup Segment</value>
-        <value xml:lang="th">สร้างส่วนของกลุ่มใหม่</value>
-        <value xml:lang="zh">新建分区组</value>
-    </property>
-    <property key="SegmentGroupDescription">
-        <value xml:lang="de">Beschreibung</value>
-        <value xml:lang="en">Description</value>
-        <value xml:lang="es">Descripción</value>
-        <value xml:lang="fr">Description</value>
-        <value xml:lang="it">Descrizione</value>
-        <value xml:lang="ro">Descriere</value>
-        <value xml:lang="th">รายละเอียด</value>
-        <value xml:lang="zh">描述</value>
-    </property>
-    <property key="SegmentGroupGeoAbbr">
-        <value xml:lang="en">Abbreviation</value>
-        <value xml:lang="es">Abreviación</value>
-        <value xml:lang="fr">Abbréviation</value>
-        <value xml:lang="it">Abbreviazione</value>
-        <value xml:lang="ro">Abreviere</value>
-        <value xml:lang="th">ชื่อย่อ</value>
-        <value xml:lang="zh">缩写</value>
-    </property>
-    <property key="SegmentGroupGeoCode">
-        <value xml:lang="en">Code</value>
-        <value xml:lang="es">Código</value>
-        <value xml:lang="fr">Code</value>
-        <value xml:lang="it">Codice</value>
-        <value xml:lang="ro">Cod</value>
-        <value xml:lang="th">รหัส</value>
-        <value xml:lang="zh">代码</value>
-    </property>
-    <property key="SegmentGroupGeoCreate">
-        <value xml:lang="en">Create New Segment Group Geo</value>
-        <value xml:lang="es">Nueva ubicación</value>
-        <value xml:lang="fr">Créer une nouvelle zone géographique de groupe de segment</value>
-        <value xml:lang="it">Creare Nuovo Gruppo Segmento Geografia</value>
-        <value xml:lang="ro">Creare Nou Grup Segment Geografie</value>
-        <value xml:lang="th">สร้างส่วนของโครงสร้างกลุ่มใหม่</value>
-        <value xml:lang="zh">新建分区组地理</value>
-    </property>
-    <property key="SegmentGroupGeoId">
-        <value xml:lang="en">Geo ID</value>
-        <value xml:lang="es">Código ubicación</value>
-        <value xml:lang="fr">Réf. de zone géographique</value>
-        <value xml:lang="it">Codice Geografia</value>
-        <value xml:lang="ro">Cod Geografie</value>
-        <value xml:lang="th">รหัสโครงสร้าง</value>
-        <value xml:lang="zh">地理标识</value>
-    </property>
-    <property key="SegmentGroupGeoName">
-        <value xml:lang="en">Name</value>
-        <value xml:lang="es">Nombre</value>
-        <value xml:lang="fr">Nom</value>
-        <value xml:lang="it">Nome</value>
-        <value xml:lang="ro">Nome</value>
-        <value xml:lang="th">ชื่อ</value>
-        <value xml:lang="zh">名称</value>
-    </property>
-    <property key="SegmentGroupGeoSecCode">
-        <value xml:lang="en">Secondary Code</value>
-        <value xml:lang="es">Código secundario</value>
-        <value xml:lang="fr">Code secondaire</value>
-        <value xml:lang="it">Codice Secondario</value>
-        <value xml:lang="ro">Cod Secundar</value>
-        <value xml:lang="th">รหัสที่สอง</value>
-        <value xml:lang="zh">第二代码</value>
-    </property>
-    <property key="SegmentGroupGeoTypeId">
-        <value xml:lang="en">Geo Type ID</value>
-        <value xml:lang="es">Tipo de ubicación</value>
-        <value xml:lang="fr">Réf. de type de zone géographique</value>
-        <value xml:lang="it">Tipo Geografia</value>
-        <value xml:lang="ro">Tip Geografie</value>
-        <value xml:lang="th">รหัสประเภทโครงสร้าง</value>
-        <value xml:lang="zh">地理类型标识</value>
-    </property>
-    <property key="SegmentGroupNoSegmentGroupFoundWithId">
-        <value xml:lang="en">No SegmentGroup found with ID:</value>
-        <value xml:lang="es">No se encontraron segmentos con el ID:</value>
-        <value xml:lang="fr">Aucun groupe de segment trouvé pour la réf. : </value>
-        <value xml:lang="it">Nessun Gruppo Segmento trovato con il codice:</value>
-        <value xml:lang="ro">Nici-un Grup Segment gasit cu codul:</value>
-        <value xml:lang="th">ไม่มีส่วนของกลุ่มที่พบจากรหัสนี้ :</value>
-        <value xml:lang="zh">没有找到分区组，标识：</value>
-    </property>
-    <property key="SegmentGroupProductStoreId">
-        <value xml:lang="de">Produktgeschäfts-ID</value>
-        <value xml:lang="en">Product Store Id</value>
-        <value xml:lang="es">Tienda</value>
-        <value xml:lang="fr">Réf. de centre de profit</value>
-        <value xml:lang="it">Codice Negozio</value>
-        <value xml:lang="ro">Cod Magazin</value>
-        <value xml:lang="th">รหัสคลังสินค้า</value>
-        <value xml:lang="zh">产品店铺标识</value>
-    </property>
-    <property key="SegmentGroupRoleCreate">
-        <value xml:lang="en">Create New Segment Group Role</value>
-        <value xml:lang="es">Nuevo rol de segmento</value>
-        <value xml:lang="fr">Créer un nouveau rôle de groupe de segment</value>
-        <value xml:lang="it">Creare Nuovo Ruolo Gruppo Segmento</value>
-        <value xml:lang="ro">Creare Nou Rol Grup Segment</value>
-        <value xml:lang="th">สร้างสถานะของกลุ่มใหม่</value>
-        <value xml:lang="zh">新建分区组角色</value>
-    </property>
-    <property key="SegmentGroupSegmentGroup">
-        <value xml:lang="en">Segment</value>
-        <value xml:lang="es">Segmentos</value>
-        <value xml:lang="fr">Segment</value>
-        <value xml:lang="it">Segmento</value>
-        <value xml:lang="ro">Segment</value>
-        <value xml:lang="th">กลุ่ม</value>
-        <value xml:lang="zh">分区</value>
-    </property>
-    <property key="SegmentGroupSegmentGroupClassification">
-        <value xml:lang="en">Classification</value>
-        <value xml:lang="es">Clasificación</value>
-        <value xml:lang="fr">Classification</value>
-        <value xml:lang="it">Classificazione</value>
-        <value xml:lang="ro">Clasificare</value>
-        <value xml:lang="th">จัดแบ่งประเภทหมวดหมู่</value>
-        <value xml:lang="zh">分类</value>
-    </property>
-    <property key="SegmentGroupSegmentGroupGeo">
-        <value xml:lang="de">Gebiet</value>
-        <value xml:lang="en">Geo</value>
-        <value xml:lang="es">Ubicación</value>
-        <value xml:lang="fr">Zone géographique</value>
-        <value xml:lang="it">Geografia</value>
-        <value xml:lang="ro">Geografie</value>
-        <value xml:lang="th">โครงสร้าง</value>
-        <value xml:lang="zh">地理</value>
-    </property>
-    <property key="SegmentGroupSegmentGroupId">
-        <value xml:lang="en">Segment Group Id</value>
-        <value xml:lang="es">Código de segmento</value>
-        <value xml:lang="fr">Réf. du groupe de segment</value>
-        <value xml:lang="it">Codice Gruppo Segmento</value>
-        <value xml:lang="ro">Cod Grup Segment</value>
-        <value xml:lang="th">รหัสส่วนของกลุ่ม</value>
-        <value xml:lang="zh">分区组标识</value>
-    </property>
-    <property key="SegmentGroupSegmentGroupLookup">
-        <value xml:lang="en">Find</value>
-        <value xml:lang="es">Buscar</value>
-        <value xml:lang="fr">Rechercher</value>
-        <value xml:lang="it">Ricerca</value>
-        <value xml:lang="ro">Cauta</value>
-        <value xml:lang="th">ค้นหา</value>
-        <value xml:lang="zh">查找</value>
-    </property>
-    <property key="SegmentGroupSegmentGroupRole">
-        <value xml:lang="de">Funktion</value>
-        <value xml:lang="en">Role</value>
-        <value xml:lang="es">Rol</value>
-        <value xml:lang="fr">Rôle</value>
-        <value xml:lang="it">Ruolo</value>
-        <value xml:lang="ro">Rol</value>
-        <value xml:lang="th">สถานะ</value>
-        <value xml:lang="zh">角色</value>
-    </property>
-    <property key="SegmentGroupSegmentGroupType">
-        <value xml:lang="de">Art</value>
-        <value xml:lang="en">Type</value>
-        <value xml:lang="es">Tipo</value>
-        <value xml:lang="fr">Type</value>
-        <value xml:lang="it">Tipo</value>
-        <value xml:lang="ro">Tip</value>
-        <value xml:lang="th">ประเภท</value>
-        <value xml:lang="zh">类型</value>
-    </property>
-    <property key="SegmentGroupSegmentGroupTypeId">
-        <value xml:lang="en">Segment Group Type Id</value>
-        <value xml:lang="es">Tipo de segmento</value>
-        <value xml:lang="fr">Réf. du type de groupe de segment</value>
-        <value xml:lang="it">Tipo Gruppo Segmento</value>
-        <value xml:lang="ro">Tip Grup Segment</value>
-        <value xml:lang="th">รหัสประเภทของกลุ่ม</value>
-        <value xml:lang="zh">分区组类型标识</value>
-    </property>
     <property key="SfaAcccounts">
         <value xml:lang="en">Accounts</value>
         <value xml:lang="fr">Comptes</value>
+        <value xml:lang="it">Utenze</value>
     </property>
     <property key="SfaAddSalesForecastDetail">
         <value xml:lang="en">Add Sales Forcast Detail</value>
         <value xml:lang="fr">Ajouter le détail de la prévision des ventes</value>
+        <value xml:lang="it">Aggiungi dettagli previsioni di vendita</value>
     </property>
     <property key="SfaAutoCreateContactByImportingVCard">
         <value xml:lang="en">Automatically create a new contact by importing a vCard</value>
         <value xml:lang="fr">Créez automatiquement un nouveau contact par import d'une vCard</value>
+        <value xml:lang="it">Creazione automatica di un nuovo contatto importando una vCard</value>
     </property>
     <property key="SfaAutoCreateLeadByImportingVCard">
         <value xml:lang="en">Automatically create a new lead by importing a vCard</value>
         <value xml:lang="es">Crear nuevo lead automaticamente importando vCard</value>
         <value xml:lang="fr">Créez automatiquement un nouveau prospect par import d'une vCard</value>
+        <value xml:lang="it">Creazione automatica di un nuovo lead importando una vCard</value>
     </property>
     <property key="SfaAccountName">
         <value xml:lang="de">Kontoname</value>
         <value xml:lang="en">Account Name</value>
         <value xml:lang="es">Nombre de cuenta</value>
         <value xml:lang="fr">Nom de compte</value>
+        <value xml:lang="it">Nome utente</value>
     </property>
     <property key="SfaCampaigns">
         <value xml:lang="en">Campaigns</value>
         <value xml:lang="es">Campañas</value>
         <value xml:lang="fr">Campagnes de ventes</value>
+        <value xml:lang="it">Campagne</value>
     </property>
     <property key="SfaCloneLead">
         <value xml:lang="en">Clone Lead</value>
         <value xml:lang="es">Clonar lead</value>
         <value xml:lang="fr">Dupliquer un prospect</value>
+        <value xml:lang="it">Clona lead</value>
     </property>
     <property key="SfaCloseDate">
         <value xml:lang="en">Close Date</value>
         <value xml:lang="es">Fecha de cierre</value>
         <value xml:lang="fr">Fermer la date</value>
+        <value xml:lang="it">Data di chiusura</value>
     </property>
     <property key="SfaCompanyName">
         <value xml:lang="en">OFBiz: SFA Manager</value>
         <value xml:lang="es">Gestor de fuerzas de ventas</value>
         <value xml:lang="fr">OFBiz: gestion des ventes</value>
+        <value xml:lang="it">OFBiz: Gestione forze di vendita</value>
     </property>
     <property key="SfaCanNotMergeSameContact">
         <value xml:lang="en">Failed to merge contacts. You have selected same contact to merge.</value>
         <value xml:lang="fr">Echec à la fusion des contacts. Vous avez choisi le même contact à fusionner.</value>
+        <value xml:lang="it">Fallito il merce dei contatti. Tu devi selezionare lo stesso contatto per fare il merge.</value>
     </property>
     <property key="SfaCanNotMergeSameLeads">
         <value xml:lang="en">Failed to merge Leads. You have selected same Lead to merge.</value>
         <value xml:lang="es">No se ha podido unir leads. Ha seleccionado el mismo lead.</value>
         <value xml:lang="fr">Echec à la fusion des prospects. Vous avez choisi le même prospect pour fusionner</value>
+        <value xml:lang="it">Fallito il merce dei leads. Tu devi selezionare lo stesso lead per fare il merge.</value>
     </property>
     <property key="SfaCompetitors">
         <value xml:lang="en">Competitors &amp; Partners </value>
         <value xml:lang="fr">Concurrents &amp; Associés</value>
+        <value xml:lang="it">Competitori e soci</value>
     </property>
     <property key="SfaContact">
         <value xml:lang="en">Contact</value>
         <value xml:lang="fr">Contact</value>
+        <value xml:lang="it">Contatto</value>
     </property>
     <property key="SfaContacts">
         <value xml:lang="en">Contacts</value>
         <value xml:lang="fr">Contacts</value>
+        <value xml:lang="it">Contatti</value>
     </property>
     <property key="SfaConvertLead">
         <value xml:lang="en">Convert Lead</value>
         <value xml:lang="es">Convertir lead</value>
         <value xml:lang="fr">Convertir le prospect</value>
+        <value xml:lang="it">Converti lead</value>
     </property>
     <property key="SfaCreateContactForLead">
         <value xml:lang="en">Create contact for lead</value>
         <value xml:lang="es">Crear contacto para lead</value>
         <value xml:lang="fr">Créer un contact pour le prospect</value>
+        <value xml:lang="it">Creare contatto per il lead</value>
     </property>
     <property key="SfaCreateContactFromVCard">
         <value xml:lang="en">Create from vCard</value>
         <value xml:lang="fr">Créer depuis la vCard</value>
+        <value xml:lang="it">Creare contatto dalla vCard</value>
     </property>
     <property key="SfaDocuments">
         <value xml:lang="en">Documents</value>
         <value xml:lang="fr">Documents</value>
+        <value xml:lang="it">Documenti</value>
     </property>
+    <property key="SfaDataSourceLabel">
+        <value xml:lang="en">Source</value>
+        <value xml:lang="fr">Origine</value>
+        <value xml:lang="it">Origine</value>
+    </property>
     <property key="SfaEditOpportunity">
         <value xml:lang="en">Edit Opportunity</value>
         <value xml:lang="fr">Modifier l'opportunité</value>
+        <value xml:lang="it">Aggiorna opportunità</value>
     </property>
     <property key="SfaEditSalesForecast">
         <value xml:lang="en">Create/Update Sales Forecast</value>
         <value xml:lang="fr">Créer/Mise à jour des prévisions de ventes</value>
+        <value xml:lang="it">Crea/Aggiorna previsioni di vendita</value>
     </property>
     <property key="SfaEstimatedAmount">
         <value xml:lang="en">Estimated Amount</value>
         <value xml:lang="fr">Montant estimé</value>
+        <value xml:lang="it">Importo stimato</value>
     </property>
     <property key="SfaEvents">
         <value xml:lang="en">Events</value>
         <value xml:lang="fr">Évènements</value>
+        <value xml:lang="it">Eventi</value>
     </property>
     <property key="SfaFindContacts">
         <value xml:lang="en">Find Contacts</value>
         <value xml:lang="fr">Rechercher les contacts</value>
+        <value xml:lang="it">Ricerca contatti</value>
     </property>
     <property key="SfaFindLeads">
         <value xml:lang="en">Find Leads</value>
         <value xml:lang="es">Buscar leads</value>
         <value xml:lang="fr">Recherchers les prospects</value>
+        <value xml:lang="it">Ricerca leads</value>
     </property>
     <property key="SfaFindOpportunities">
         <value xml:lang="en">Find Opportunities</value>
         <value xml:lang="es">Buscar oportunidades</value>
         <value xml:lang="fr">Rechercher les opportunités</value>
+        <value xml:lang="it">Ricerca opportunità</value>
     </property>
     <property key="SfaFindResults">
         <value xml:lang="en">Find Results</value>
         <value xml:lang="es">Buscar resultados</value>
         <value xml:lang="fr">Rechercher les résultats</value>
+        <value xml:lang="it">Ricerca risultati</value>
     </property>
     <property key="SfaFirstContact">
         <value xml:lang="en">First Contact</value>
         <value xml:lang="es">Primer contacto</value>
         <value xml:lang="fr">Premier contact</value>
+        <value xml:lang="it">Primo contatto</value>
     </property>
     <property key="SfaForecasts">
         <value xml:lang="en">Forecast</value>
         <value xml:lang="es">Previsión</value>
         <value xml:lang="fr">Prévision</value>
+        <value xml:lang="it">Previsioni</value>
     </property>
     <property key="SfaImportLead">
         <value xml:lang="en">Import Lead</value>
         <value xml:lang="es">Importar lead</value>
         <value xml:lang="fr">Importer le prospect</value>
+        <value xml:lang="it">Importo lead</value>
     </property>
     <property key="SfaInitialAccount">
         <value xml:lang="en">Initial Account</value>
         <value xml:lang="fr">Compte initial</value>
+        <value xml:lang="it">Utente iniziale</value>
     </property>
     <property key="SfaInitialStage">
         <value xml:lang="en">Initial Stage</value>
         <value xml:lang="fr">Phase initiale</value>
+        <value xml:lang="it">Stage iniziale</value>
     </property>
     <property key="SfaLead">
         <value xml:lang="en">Lead</value>
         <value xml:lang="fr">Prospect</value>
+        <value xml:lang="it">Lead</value>
     </property>
     <property key="SfaLeads">
         <value xml:lang="en">Leads</value>
         <value xml:lang="fr">Prospects</value>
+        <value xml:lang="it">Leads</value>
     </property>
     <property key="SfaLeadSource">
         <value xml:lang="en">Lead Source</value>
         <value xml:lang="fr">Origine du prospect</value>
+        <value xml:lang="it">Lead origine</value>
     </property>
     <property key="SfaListSalesForecastDetail">
         <value xml:lang="en">List Sales Forecast Details</value>
         <value xml:lang="fr">Liste des détails de prévision des ventes</value>
+        <value xml:lang="it">Lista dettagli previsioni di vendita</value>
     </property>
     <property key="SfaManagerApplication">
         <value xml:lang="en">SFA Manager Application</value>
         <value xml:lang="fr">Application de gestion des ventes</value>
+        <value xml:lang="it">Applicazione gestione forze esterne</value>
     </property>
     <property key="SfaManagerWelcome">
         <value xml:lang="en">Welcome to the Sales Force Automation Manager Application. This is an application in progress so not completed yet.&lt;br/&gt;&lt;br/&gt;A &lt;a href="http://docs.ofbiz.org/download/attachments/4008/IfCrmPlanEstimate.pdf" target=blank&gt;design document&lt;/a&gt; and &lt;a href="https://issues.apache.org/jira/browse/OFBIZ-1640" target=blank&gt;Jira documents&lt;/a&gt; are available.</value>
         <value xml:lang="fr">Bienvenue dans l'application de gestion des ventes. Cette application est en cours de développement .&lt;br/&gt;&lt;br/&gt;Un &lt;a href="http://docs.ofbiz.org/download/attachments/4008/IfCrmPlanEstimate.pdf" target=blank&gt;document d'analyse détaillée&lt;/a&gt; et &lt;a href="https://issues.apache.org/jira/browse/OFBIZ-1640" target=blank&gt;un document de gestion de projet Jira&lt;/a&gt; sont disponibles</value>
+        <value xml:lang="it">Benvenuto all'applicazione di gestione delle forze esterne. Questa è un'applicazione in sviluppo e non è ancora completata.&lt;br/&gt;&lt;br/&gt;Un &lt;a href="http://docs.ofbiz.org/download/attachments/4008/IfCrmPlanEstimate.pdf" target=blank&gt;design document&lt;/a&gt; e &lt;a href="https://issues.apache.org/jira/browse/OFBIZ-1640" target=blank&gt;documenti di Jira&lt;/a&gt; sono disponibili.</value>
     </property>
     <property key="SfaMergeContacts">
         <value xml:lang="en">Merge Contacts</value>
         <value xml:lang="fr">Fusionner les contacts</value>
+        <value xml:lang="it">Merge Contatti</value>
     </property>
     <property key="SfaMergeLeads">
         <value xml:lang="en">Merge Leads</value>
         <value xml:lang="fr">Fusionner les prospects</value>
+        <value xml:lang="it">Merge Leads</value>
     </property>
     <property key="SfaNextStep">
         <value xml:lang="en">Next Step</value>
         <value xml:lang="fr">Prochaine étape</value>
+        <value xml:lang="it">Passo successivo</value>
     </property>
     <property key="SfaNoLeadsSelectedToMerged">
         <value xml:lang="en">No leads selected to merge</value>
         <value xml:lang="fr">Aucun prospect sélectionné pour la fusion</value>
+        <value xml:lang="it">Nessun leads selezionato da fare merge</value>
     </property>
     <property key="SfaOpportunities">
         <value xml:lang="en">Opportunities</value>
         <value xml:lang="fr">Opportunités</value>
+        <value xml:lang="it">Opportunità</value>
     </property>
     <property key="SfaOpportunityId">
         <value xml:lang="en">Opportunity ID</value>
         <value xml:lang="fr">Réf. d'opportunité</value>
+        <value xml:lang="it">N. Opportunità</value>
     </property>
     <property key="SfaOpportunityInfo">
         <value xml:lang="en">Opportunity Information</value>
         <value xml:lang="fr">Information sur l'opportunité</value>
+        <value xml:lang="it">Informazioni oppportunità</value>
     </property>
     <property key="SfaOpportunityName">
         <value xml:lang="en">Opportunity Name</value>
         <value xml:lang="fr">Nom d'opportunité</value>
+        <value xml:lang="it">Nome opportunità</value>
     </property>
     <property key="SfaOpportunitySummary">
         <value xml:lang="en">Opportunity Summary</value>
         <value xml:lang="fr">Résumé d'opportunité</value>
+        <value xml:lang="it">Sommario opportunità</value>
     </property>
     <property key="SfaProbability">
         <value xml:lang="en">Probability(%)</value>
         <value xml:lang="fr">Probabilité (%)</value>
+        <value xml:lang="it">Probabilità(%)</value>
     </property>
     <property key="SfaQuickAddContact">
         <value xml:lang="en">Quick Add Contact</value>
         <value xml:lang="fr">Ajout rapide d'un contact</value>
+        <value xml:lang="it">Aggiunta veloce contatto</value>
     </property>
     <property key="SfaQuickAddLead">
         <value xml:lang="en">Quick Add Lead</value>
         <value xml:lang="fr">Ajout rapide d'un prospect</value>
+        <value xml:lang="it">Aggiunta veloce lead</value>
     </property>
     <property key="SfaSalesForecast">
         <value xml:lang="en">Sales Forecast</value>
         <value xml:lang="fr">Prévision des ventes</value>
+        <value xml:lang="it">Previsioni di vendita</value>
     </property>
     <property key="SfaSecondContact">
         <value xml:lang="en">Second Contact</value>
         <value xml:lang="fr">Deuxième contact</value>
+        <value xml:lang="it">Secondo contatto</value>
     </property>
     <property key="SfaSelectExistingAccountOrLeaveBlankToCreateNew">
         <value xml:lang="en">Either select existing account or leave blank to create new account"</value>
         <value xml:lang="fr">Sélectionner un compte existant ou laissez un espace vide pour créer un nouveau compte"</value>
+        <value xml:lang="it">Selezione entrambi utente esistente o lasciare vuoto per creare un nuovo utente</value>
     </property>
     <property key="SfaType">
         <value xml:lang="de">Art</value>
         <value xml:lang="en">Type</value>
         <value xml:lang="fr">Type</value>
+        <value xml:lang="it">Tipo</value>
     </property>
     <property key="SfaUploadVCard">
         <value xml:lang="en">Upload vCard</value>
         <value xml:lang="fr">Téléchargement de la vCard vers le serveur</value>
+        <value xml:lang="it">Carica vCard</value>
     </property>
-    <property key="Tracking">
-        <value xml:lang="en">Tracking</value>
-        <value xml:lang="es">Seguimiento</value>
-        <value xml:lang="fr">Suivi</value>
-        <value xml:lang="it">Tracciatura</value>
-        <value xml:lang="ro">Traseu</value>
-        <value xml:lang="th">การติดตาม</value>
-        <value xml:lang="zh">跟踪</value>
-    </property>
-    <property key="TrackingCode">
-        <value xml:lang="en">Tracking Code</value>
-        <value xml:lang="es">Seguimiento</value>
-        <value xml:lang="fr">Code de suivi</value>
-        <value xml:lang="it">Codice Tracciatura</value>
-        <value xml:lang="ro">Cod Traseu</value>
-        <value xml:lang="th">รหัส Tracking</value>
-        <value xml:lang="zh">跟踪码</value>
-    </property>
-    <property key="TrackingCodeBillableLifetime">
-        <value xml:lang="en">Billable Lifetime</value>
-        <value xml:lang="es">Tiempo de facturación</value>
-        <value xml:lang="fr">Durée de vie facturable</value>
-        <value xml:lang="it">Tempo di Vita Fatturabile</value>
-        <value xml:lang="ro">Timp de Viata Facturabila</value>
-        <value xml:lang="th">ใบเสร็จรับเงินใช้ได้ตลอดเวลา</value>
-        <value xml:lang="zh">可记账期限</value>
-    </property>
-    <property key="TrackingCodeComments">
-        <value xml:lang="de">Kommentare</value>
-        <value xml:lang="en">Comments</value>
-        <value xml:lang="es">Comentarios</value>
-        <value xml:lang="fr">Commentaires</value>
-        <value xml:lang="it">Commenti</value>
-        <value xml:lang="ro">Comentarii</value>
-        <value xml:lang="th">ความคิดเห็น</value>
-        <value xml:lang="zh">评论</value>
-    </property>
-    <property key="TrackingCodeCreate">
-        <value xml:lang="en">Create Tracking Code</value>
-        <value xml:lang="es">Crear seguimiento</value>
-        <value xml:lang="fr">Nouveau code de suivi</value>
-        <value xml:lang="it">Creare Codice Tracciatura</value>
-        <value xml:lang="ro">Creare Cod Traseu</value>
-        <value xml:lang="th">สร้างรหัส Tracking</value>
-        <value xml:lang="zh">新建跟踪码</value>
-    </property>
-    <property key="TrackingCodeDefaultProdCatalogId">
-        <value xml:lang="en">Default Product Catalog Id</value>
-        <value xml:lang="es">Catálogo</value>
-        <value xml:lang="fr">Réf. du catalogue produit par défault</value>
-        <value xml:lang="it">Codice Catalogo Default</value>
-        <value xml:lang="ro">Cod Catalog Default</value>
-        <value xml:lang="th">รหัสหมวดหมู่สินค้าทั่วไป</value>
-        <value xml:lang="zh">缺省产品目录标识</value>
-    </property>
-    <property key="TrackingCodeDescription">
-        <value xml:lang="de">Beschreibung</value>
-        <value xml:lang="en">Description</value>
-        <value xml:lang="es">Descripción</value>
-        <value xml:lang="fr">Description</value>
-        <value xml:lang="it">Descrizione</value>
-        <value xml:lang="ro">Descriere</value>
-        <value xml:lang="th">รายละเอียด</value>
-        <value xml:lang="zh">描述</value>
-    </property>
-    <property key="TrackingCodeGroupId">
-        <value xml:lang="en">Group Id</value>
-        <value xml:lang="es">Grupo</value>
-        <value xml:lang="fr">Réf. du groupe</value>
-        <value xml:lang="it">Codice Gruppo</value>
-        <value xml:lang="ro">Cod Grup</value>
-        <value xml:lang="th">รหัสกลุ่ม</value>
-        <value xml:lang="zh">组标识</value>
-    </property>
-    <property key="TrackingCodeInSeconds">
-        <value xml:lang="en">Seconds</value>
-        <value xml:lang="es">Segundos</value>
-        <value xml:lang="fr">Secondes</value>
-        <value xml:lang="it">Secondi</value>
-        <value xml:lang="ro">Secunde</value>
-        <value xml:lang="th">ลำดับที่สอง</value>
-        <value xml:lang="zh">秒</value>
-    </property>
-    <property key="TrackingCodeNoOverrideIfEmpty">
-        <value xml:lang="en">No override (co-brand) if empty</value>
-        <value xml:lang="es">Si este campo queda vacío no se reemplazará</value>
-        <value xml:lang="fr">Aucun remplacement (marque associée) si vide</value>
-        <value xml:lang="it">Nessuna sovrapposizione (co-brand) se vuoto</value>
-        <value xml:lang="ro">Nu se poate suprascrie (marca-asociata) daca este gol.</value>
-        <value xml:lang="th">ไม่มีการยกเลิก (ยี่ห้อสินค้าร่วมกัน) ถ้าว่าง</value>
-        <value xml:lang="zh">如果为空，不作替代 (联合品牌)</value>
-    </property>
-    <property key="TrackingCodeNoRedirectIfEmpty">
-        <value xml:lang="en">No redirect if empty</value>
-        <value xml:lang="es">Si este campo queda vacío no habrá redirección</value>
-        <value xml:lang="fr">Aucune redirection si vide</value>
-        <value xml:lang="it">Nessun redirect se vuoto</value>
-        <value xml:lang="ro">Daca este gol nu poate fi redirectionat</value>
-        <value xml:lang="th">ไม่มีการเปลี่ยนถ้าว่าง</value>
-        <value xml:lang="zh">如果为空，不重定向</value>
-    </property>
-    <property key="TrackingCodeOrder">
-        <value xml:lang="en">Tracking Code Orders</value>
-        <value xml:lang="es">Órdenes de seguimiento</value>
-        <value xml:lang="fr">Codes de suivi des commandes</value>
-        <value xml:lang="it">Codice Tracciatura Ordini</value>
-        <value xml:lang="ro">Cod Traseu Comenzi</value>
-        <value xml:lang="th">รหัส Tracking การสั่งซื้อสินค้า</value>
-        <value xml:lang="zh">跟踪码定订单</value>
-    </property>
-    <property key="TrackingCodeOrderIsBilliable">
-        <value xml:lang="en">Is Billable ?</value>
-        <value xml:lang="es">Es facturable ?</value>
-        <value xml:lang="fr">Facturable ?</value>
-        <value xml:lang="it">E' Fatturabile ?</value>
-        <value xml:lang="ro">Este Facturabil ?</value>
-        <value xml:lang="th">เป็นใบเสร็จที่ใช้ได้ ?</value>
-        <value xml:lang="zh">可记账吗?</value>
-    </property>
-    <property key="TrackingCodeOrderOrderId">
-        <value xml:lang="en">Order Id</value>
-        <value xml:lang="es">Código de orden</value>
-        <value xml:lang="fr">Réf. de l'ordre</value>
-        <value xml:lang="it">Numero Ordine</value>
-        <value xml:lang="ro">Numar Comanda</value>
-        <value xml:lang="th">รหัสการสั่งซื้อสินค้า</value>
-        <value xml:lang="zh">订单标识</value>
-    </property>
-    <property key="TrackingCodeOverrideCss">
-        <value xml:lang="en">Override CSS URL</value>
-        <value xml:lang="es">CSS</value>
-        <value xml:lang="fr">URL de la CSS de remplacement</value>
-        <value xml:lang="it">Sostituzione URL CSS</value>
-        <value xml:lang="ro">Substitutie URL CSS</value>
-        <value xml:lang="th">ยกเลิก CSS URL</value>
-        <value xml:lang="zh">替代风格页网址</value>
-    </property>
-    <property key="TrackingCodeOverrideLogo">
-        <value xml:lang="en">Override Logo URL</value>
-        <value xml:lang="es">Logo</value>
-        <value xml:lang="fr">URL de l'image logo de remplacement</value>
-        <value xml:lang="it">Sostituzione URL Logo</value>
-        <value xml:lang="ro">Substitutie URL Logo</value>
-        <value xml:lang="th">ยกเลิกโลโก้ URL</value>
-        <value xml:lang="zh">替代徽标网址</value>
-    </property>
-    <property key="TrackingCodeRedirectUrl">
-        <value xml:lang="en">Redirect URL</value>
-        <value xml:lang="es">URL</value>
-        <value xml:lang="fr">URL de redirection</value>
-        <value xml:lang="it">Ridirezione URL</value>
-        <value xml:lang="ro">Redirectie URL</value>
-        <value xml:lang="th">เปลี่ยน URL</value>
-        <value xml:lang="zh">重定向网址</value>
-    </property>
-    <property key="TrackingCodeSubgroupId">
-        <value xml:lang="en">Sub-Group Id</value>
-        <value xml:lang="es">Sub-grupo</value>
-        <value xml:lang="fr">Réf. du sous-groupe</value>
-        <value xml:lang="it">Codice Sotto-Gruppo</value>
-        <value xml:lang="ro">Cod Sub-Grup</value>
-        <value xml:lang="th">รหัสกลุ่มย่อย</value>
-        <value xml:lang="zh">下级组标识</value>
-    </property>
-    <property key="TrackingCodeTrackableLifetime">
-        <value xml:lang="en">Trackable Lifetime</value>
-        <value xml:lang="es">Tiempo de vida</value>
-        <value xml:lang="fr">Durée de vie du suivi</value>
-        <value xml:lang="it">Tracciatura Tempo di Vita</value>
-        <value xml:lang="ro">Traseu Timp de Viata</value>
-        <value xml:lang="th">เส้นทางที่ใช้ได้ตลอดเวลา</value>
-        <value xml:lang="zh">可跟踪期限</value>
-    </property>
-    <property key="TrackingCodeTrackingCodeId">
-        <value xml:lang="en">Tracking Code Id</value>
-        <value xml:lang="es">Código</value>
-        <value xml:lang="fr">Réf. du code de suivi</value>
-        <value xml:lang="it">Codice Tracciatura</value>
-        <value xml:lang="ro">Code Traseu</value>
-        <value xml:lang="th">รหัส Tracking</value>
-        <value xml:lang="zh">跟踪码标识</value>
-    </property>
-    <property key="TrackingCodeTrackingCodeTypeId">
-        <value xml:lang="en">Tracking Code Type Id</value>
-        <value xml:lang="es">Tipo de código</value>
-        <value xml:lang="fr">Type de code de suivi</value>
-        <value xml:lang="it">Tipo Tracciatura</value>
-        <value xml:lang="ro">Tip Traseu</value>
-        <value xml:lang="th">รหัสประเภทรหัส Tracking</value>
-        <value xml:lang="zh">跟踪码类型标识</value>
-    </property>
-    <property key="TrackingCodeType">
-        <value xml:lang="en">Tracking Code Type</value>
-        <value xml:lang="es">Tipo de seguimiento</value>
-        <value xml:lang="fr">Type de code de suivi</value>
-        <value xml:lang="it">Tipo Codice Tracciatura</value>
-        <value xml:lang="ro">Tip Cod Traseu</value>
-        <value xml:lang="th">ประเภทรหัส Tracking</value>
-        <value xml:lang="zh">跟踪码类型</value>
-    </property>
-    <property key="TrackingCodeTypeCreate">
-        <value xml:lang="en">Create Tracking Code Type</value>
-        <value xml:lang="es">Crear tipo de seguimiento</value>
-        <value xml:lang="fr">Nouveau type de code de suivi</value>
-        <value xml:lang="it">Creare Tipo Tracciatura</value>
-        <value xml:lang="ro">Creare Tip Traseu</value>
-        <value xml:lang="th">สร้างประเภทรหัส Tracking</value>
-        <value xml:lang="zh">新建跟踪码类型</value>
-    </property>
-    <property key="TrackingCodeTypeDescription">
-        <value xml:lang="de">Beschreibung</value>
-        <value xml:lang="en">Description</value>
-        <value xml:lang="es">Descripción</value>
-        <value xml:lang="fr">Description</value>
-        <value xml:lang="it">Descrizione</value>
-        <value xml:lang="ro">Descriere</value>
-        <value xml:lang="th">รายละเอียด</value>
-        <value xml:lang="zh">描述</value>
-    </property>
-    <property key="TrackingCodeVisit">
-        <value xml:lang="en">Tracking Code Visits</value>
-        <value xml:lang="es">Visitas de seguimiento</value>
-        <value xml:lang="fr">Codes de suivi des visites</value>
-        <value xml:lang="it">Codice Tracciatura Visite</value>
-        <value xml:lang="ro">Cod Traseu Vizite</value>
-        <value xml:lang="th">รหัส Tracking ของการเยี่ยมชม</value>
-        <value xml:lang="zh">跟踪码访问</value>
-    </property>
-    <property key="TrackingCodeVisitClientHostName">
-        <value xml:lang="en">Client Hostname</value>
-        <value xml:lang="es">Host</value>
-        <value xml:lang="fr">Nom d'hôte du client</value>
-        <value xml:lang="it">Nome Host Client</value>
-        <value xml:lang="ro">Nume Host Client</value>
-        <value xml:lang="th">ชื่อเจ้าของเครื่องคอมพิวเตอร์ในเครือข่าย</value>
-        <value xml:lang="zh">客户端主机名</value>
-    </property>
-    <property key="TrackingCodeVisitClientIpAddress">
-        <value xml:lang="en">Client IP Address</value>
-        <value xml:lang="es">Dirección IP</value>
-        <value xml:lang="fr">Adresse IP du client</value>
-        <value xml:lang="it">Indirizzo IP Client</value>
-        <value xml:lang="ro">Adresa IP Client</value>
-        <value xml:lang="th">ที่อยู่ IP ของเครื่องคอมพิวเตอร์ในเครือข่าย</value>
-        <value xml:lang="zh">客户端IP地址</value>
-    </property>
-    <property key="TrackingCodeVisitContactMechTypeId">
-        <value xml:lang="en">Contact Mechanism Type</value>
-        <value xml:lang="es">Mecanismo de contacto</value>
-        <value xml:lang="fr">Type de coordonnées</value>
-        <value xml:lang="it">Tipo Contatto</value>
-        <value xml:lang="ro">Tip Contact</value>
-        <value xml:lang="th">ประเภทวิธีการสื่อสาร</value>
-        <value xml:lang="zh">联系方式类型</value>
-    </property>
-    <property key="TrackingCodeVisitPartyId">
-        <value xml:lang="de">Teilnehmer ID</value>
-        <value xml:lang="en">Party Id</value>
-        <value xml:lang="es">Participante</value>
-        <value xml:lang="fr">Réf. de l'acteur</value>
-        <value xml:lang="it">Codice Soggetto</value>
-        <value xml:lang="ro">Cod Subiect</value>
-        <value xml:lang="th">รหัสกลุ่มผู้ใช้</value>
-        <value xml:lang="zh">会员标识</value>
-    </property>
-    <property key="TrackingCodeVisitRoleTypeId">
-        <value xml:lang="de">Funktionstyp ID</value>
-        <value xml:lang="en">Role Type Id</value>
-        <value xml:lang="es">Tipo de rol</value>
-        <value xml:lang="fr">Type de rôle</value>
-        <value xml:lang="it">Tipo Ruolo</value>
-        <value xml:lang="ro">Tip Rol</value>
-        <value xml:lang="th">รหัสประเภทสถานะ</value>
-        <value xml:lang="zh">角色类型标识</value>
-    </property>
-    <property key="TrackingCodeVisitSessionId">
-        <value xml:lang="en">Session Id</value>
-        <value xml:lang="es">Código de sesión</value>
-        <value xml:lang="fr">Réf. de la session</value>
-        <value xml:lang="it">Numero Sessione</value>
-        <value xml:lang="ro">Numar Seziune</value>
-        <value xml:lang="th">รหัสการประชุม</value>
-        <value xml:lang="zh">会话标识</value>
-    </property>
-    <property key="TrackingCodeVisitSourceEnumId">
-        <value xml:lang="en">Source Id</value>
-        <value xml:lang="es">Código de fuente de la visita</value>
-        <value xml:lang="fr">Réf. de l'origine</value>
-        <value xml:lang="it">Numero Origine</value>
-        <value xml:lang="ro">Numar Origine</value>
-        <value xml:lang="th">รหัสแหล่งที่มา</value>
-        <value xml:lang="zh">源标识</value>
-    </property>
-    <property key="TrackingCodeVisitVisitId">
-        <value xml:lang="en">Visit Id</value>
-        <value xml:lang="es">Código de visita</value>
-        <value xml:lang="fr">Réf. de la visite</value>
-        <value xml:lang="it">Numero Visita</value>
-        <value xml:lang="ro">Numar Vizita</value>
-        <value xml:lang="th">รหัสการเยี่ยมชม</value>
-        <value xml:lang="zh">访问标识</value>
-    </property>
-    <property key="TrackingCodeVisitVisitorId">
-        <value xml:lang="en">Visitor Id</value>
-        <value xml:lang="es">Código de visitante</value>
-        <value xml:lang="fr">Réf. du visiteur</value>
-        <value xml:lang="it">Codice Visitatore</value>
-        <value xml:lang="ro">Cod Vizita</value>
-        <value xml:lang="th">รหัสผู้เยี่ยมชม</value>
-        <value xml:lang="zh">访问者标识</value>
-    </property>
-    <property key="TrackingCodeVisitWebappName">
-        <value xml:lang="en">Webapp Name</value>
-        <value xml:lang="es">Nombre de aplicación web</value>
-        <value xml:lang="fr">Nom de l'application Web</value>
-        <value xml:lang="it">Nome Applicazione Web</value>
-        <value xml:lang="ro">Nume Aplicatie Web</value>
-        <value xml:lang="th">ชื่อโปรแกรมประยุต์บนเว็บ</value>
-        <value xml:lang="zh">Web应用名称</value>
-    </property>
 </resource>
Index: applications/marketing/src/org/ofbiz/marketing/marketing/MarketingServices.java
===================================================================
--- applications/marketing/src/org/ofbiz/marketing/marketing/MarketingServices.java	(revision 733928)
+++ applications/marketing/src/org/ofbiz/marketing/marketing/MarketingServices.java	(working copy)
@@ -62,7 +62,7 @@
             Map<String, Object> input = UtilMisc.<String, Object>toMap("contactListId", contactListId);
             GenericValue contactList = delegator.findByPrimaryKey("ContactList", input);
             if (contactList == null) {
-                String error = UtilProperties.getMessage(resourceMarketing, "ContactListNotFound", input, locale);
+                String error = UtilProperties.getMessage(resourceMarketing, "MarketingContactListNotFound", input, locale);
                 return ServiceUtil.returnError(error);
             }
 
Index: applications/marketing/widget/SegmentScreens.xml
===================================================================
--- applications/marketing/widget/SegmentScreens.xml	(revision 733928)
+++ applications/marketing/widget/SegmentScreens.xml	(working copy)
@@ -57,7 +57,7 @@
                                     <container style="screenlet-body">
                                         <section>
                                             <widgets>
-                                                <container><link text="${uiLabelMap.SegmentGroupCreate}" target="viewSegmentGroup" style="buttontext"/></container>
+                                                <container><link text="${uiLabelMap.MarketingSegmentGroupCreate}" target="viewSegmentGroup" style="buttontext"/></container>
                                                 <include-form name="FindSegmentGroup" location="component://marketing/webapp/marketing/segment/SegmentForms.xml"/>
                                             </widgets>
                                         </section>
@@ -96,7 +96,7 @@
                                     <condition><not><if-empty field-name="segmentGroupId"/></not></condition>
                                     <widgets>
                                         <include-menu location="component://marketing/webapp/marketing/segment/SegmentMenus.xml" name="SegmentGroupTabBar"/>
-                                        <container><link text="${uiLabelMap.SegmentGroupCreate}" target="viewSegmentGroup" style="buttontext"/></container>
+                                        <container><link text="${uiLabelMap.MarketingSegmentGroupCreate}" target="viewSegmentGroup" style="buttontext"/></container>
                                     </widgets>
                                 </section>
 
@@ -176,7 +176,7 @@
                                 <if-has-permission permission="MARKETING" action="_VIEW"/>
                             </condition>
                             <widgets>
-                                <screenlet id="AddSegmentGroupClassPanel" title="${uiLabelMap.SegmentGroupClassCreate}" collapsible="true">
+                                <screenlet id="AddSegmentGroupClassPanel" title="${uiLabelMap.MarketingSegmentGroupClassCreate}" collapsible="true">
                                     <include-form name="AddSegmentGroupClass" location="component://marketing/webapp/marketing/segment/SegmentForms.xml"/>
                                 </screenlet>
                                 <include-form name="listSegmentGroupClass" location="component://marketing/webapp/marketing/segment/SegmentForms.xml"/>
Index: applications/marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml
===================================================================
--- applications/marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml	(revision 733928)
+++ applications/marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml	(working copy)
@@ -24,13 +24,13 @@
         header-row-style="header-row" default-table-style="basic-table">
         <alt-target use-when="trackingCode==null" target="createTrackingCode"/>
         
-        <field use-when="trackingCode!=null" name="trackingCodeId" title="${uiLabelMap.TrackingCodeTrackingCodeId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
-        <field use-when="trackingCode==null&amp;&amp;trackingCodeId==null" name="trackingCodeId" title="${uiLabelMap.TrackingCodeTrackingCodeId}"><text/></field>
-        <field use-when="trackingCode==null&amp;&amp;trackingCodeId!=null" name="trackingCodeId" title="${uiLabelMap.TrackingCodeTrackingCodeId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${trackingCodeId}]"><display/></field>
+        <field use-when="trackingCode!=null" name="trackingCodeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
+        <field use-when="trackingCode==null&amp;&amp;trackingCodeId==null" name="trackingCodeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeId}"><text/></field>
+        <field use-when="trackingCode==null&amp;&amp;trackingCodeId!=null" name="trackingCodeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${trackingCodeId}]"><display/></field>
 
-        <field name="description" title="${uiLabelMap.TrackingCodeDescription}"><text/></field>
-        <field name="comments" title="${uiLabelMap.TrackingCodeComments}"><textarea/></field>
-        <field name="trackingCodeTypeId" title="${uiLabelMap.TrackingCodeTrackingCodeTypeId}">
+        <field name="description" title="${uiLabelMap.MarketingTrackingCodeDescription}"><text/></field>
+        <field name="comments" title="${uiLabelMap.MarketingTrackingCodeComments}"><textarea/></field>
+        <field name="trackingCodeTypeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeTypeId}">
             <drop-down>
                 <entity-options description="${description}" entity-name="TrackingCodeType" key-field-name="trackingCodeTypeId">
                     <entity-order-by field-name="description"/>
@@ -44,7 +44,7 @@
                 </entity-options>
             </drop-down>
         </field>
-        <field name="prodCatalogId" title="${uiLabelMap.TrackingCodeDefaultProdCatalogId}" tooltip="${uiLabelMap.TrackingCodeNoOverrideIfEmpty}">
+        <field name="prodCatalogId" title="${uiLabelMap.MarketingTrackingCodeDefaultProdCatalogId}" tooltip="${uiLabelMap.MarketingTrackingCodeNoOverrideIfEmpty}">
             <drop-down allow-empty="true">
                 <entity-options description="${catalogName}" entity-name="ProdCatalog" key-field-name="prodCatalogId">
                     <entity-order-by field-name="catalogName"/>
@@ -54,13 +54,13 @@
         <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><date-time/></field>
         <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-time/></field>
  
-        <field name="redirectUrl" title="${uiLabelMap.TrackingCodeRedirectUrl}" tooltip="${uiLabelMap.TrackingCodeNoRedirectIfEmpty}"><text size="40"/></field>
-        <field name="overrideLogo" title="${uiLabelMap.TrackingCodeOverrideLogo}" tooltip="${uiLabelMap.TrackingCodeNoOverrideIfEmpty}"><text size="60"/></field>
-        <field name="overrideCss" title="${uiLabelMap.TrackingCodeOverrideCss}" tooltip="${uiLabelMap.TrackingCodeNoOverrideIfEmpty}"><text size="60"/></field>
-        <field name="trackableLifetime" title="${uiLabelMap.TrackingCodeTrackableLifetime}" tooltip="${uiLabelMap.TrackingCodeInSeconds}"><text size="10"/></field>
-        <field name="billableLifetime" title="${uiLabelMap.TrackingCodeBillableLifetime}" tooltip="${uiLabelMap.TrackingCodeInSeconds}"><text size="10"/></field>
-        <field name="groupId" title="${uiLabelMap.TrackingCodeGroupId}"><text size="10"/></field>
-        <field name="subgroupId" title="${uiLabelMap.TrackingCodeSubgroupId}"><text size="10"/></field>
+        <field name="redirectUrl" title="${uiLabelMap.MarketingTrackingCodeRedirectUrl}" tooltip="${uiLabelMap.MarketingTrackingCodeNoRedirectIfEmpty}"><text size="40"/></field>
+        <field name="overrideLogo" title="${uiLabelMap.MarketingTrackingCodeOverrideLogo}" tooltip="${uiLabelMap.MarketingTrackingCodeNoOverrideIfEmpty}"><text size="60"/></field>
+        <field name="overrideCss" title="${uiLabelMap.MarketingTrackingCodeOverrideCss}" tooltip="${uiLabelMap.MarketingTrackingCodeNoOverrideIfEmpty}"><text size="60"/></field>
+        <field name="trackableLifetime" title="${uiLabelMap.MarketingTrackingCodeTrackableLifetime}" tooltip="${uiLabelMap.MarketingTrackingCodeInSeconds}"><text size="10"/></field>
+        <field name="billableLifetime" title="${uiLabelMap.MarketingTrackingCodeBillableLifetime}" tooltip="${uiLabelMap.MarketingTrackingCodeInSeconds}"><text size="10"/></field>
+        <field name="groupId" title="${uiLabelMap.MarketingTrackingCodeGroupId}"><text size="10"/></field>
+        <field name="subgroupId" title="${uiLabelMap.MarketingTrackingCodeSubgroupId}"><text size="10"/></field>
         
         <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field>
         <!-- <field name="DONE_PAGE"><hidden value="${donePage}"/></field> -->
@@ -72,11 +72,11 @@
         <actions>
             <entity-condition entity-name="TrackingCode"/>
         </actions>
-        <field name="trackingCodeId"  widget-style="buttontext" title="${uiLabelMap.TrackingCodeTrackingCodeId}">
+        <field name="trackingCodeId"  widget-style="buttontext" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeId}">
             <hyperlink target="EditTrackingCode?trackingCodeId=${trackingCodeId}" description="${trackingCodeId}" also-hidden="false"/>
         </field>
-        <field name="description" title="${uiLabelMap.TrackingCodeDescription}"><display/></field>
-        <field name="trackingCodeTypeId" title="${uiLabelMap.TrackingCodeTrackingCodeTypeId}"><display-entity entity-name="TrackingCodeType"/></field>
+        <field name="description" title="${uiLabelMap.MarketingTrackingCodeDescription}"><display/></field>
+        <field name="trackingCodeTypeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeTypeId}"><display-entity entity-name="TrackingCodeType"/></field>
         <field name="marketingCampaignId" title="${uiLabelMap.MarketingCampaignId}"><display-entity description="${campaignName}" entity-name="MarketingCampaign"/></field>
         <field name="prodCatalogId"><display-entity description="${catalogName}" entity-name="ProdCatalog"/></field>
 
@@ -92,9 +92,9 @@
         header-row-style="header-row" default-table-style="basic-table">
         <alt-target use-when="trackingCodeOrder==null" target="createTrackingCodeOrder"/>
         
-        <field name="trackingCodeId" title="${uiLabelMap.TrackingCodeTrackingCodeId}"><display/></field>
-        <field name="orderId" title="${uiLabelMap.TrackingCodeOrderOrderId}"><display/></field>
-        <field name="trackingCodeTypeId" title="${uiLabelMap.TrackingCodeTrackingCodeTypeId}">
+        <field name="trackingCodeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeId}"><display/></field>
+        <field name="orderId" title="${uiLabelMap.MarketingTrackingCodeOrderOrderId}"><display/></field>
+        <field name="trackingCodeTypeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeTypeId}">
             <drop-down>
                 <entity-options description="${description}" entity-name="TrackingCodeType" key-field-name="trackingCodeTypeId">
                     <entity-order-by field-name="description"/>
@@ -102,7 +102,7 @@
             </drop-down>
         </field>
         
-        <field name="isBillable" title="${uiLabelMap.TrackingCodeOrderIsBilliable}">
+        <field name="isBillable" title="${uiLabelMap.MarketingTrackingCodeOrderIsBilliable}">
             <drop-down allow-empty="true">
                 <option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/>
             </drop-down>
@@ -113,9 +113,9 @@
         
     <form name="FindTrackingCodeOrders" type="single" target="ListTrackingCodeOrders" title=""
         header-row-style="header-row" default-table-style="basic-table">
-        <field name="trackingCodeId" title="${uiLabelMap.TrackingCodeTrackingCodeId}"><text-find/></field>
-        <field name="orderId" title="${uiLabelMap.TrackingCodeOrderOrderId}"><lookup target-form-name="LookupOrderName"/></field>
-        <field name="trackingCodeTypeId" title="${uiLabelMap.TrackingCodeTrackingCodeTypeId}">
+        <field name="trackingCodeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeId}"><text-find/></field>
+        <field name="orderId" title="${uiLabelMap.MarketingTrackingCodeOrderOrderId}"><lookup target-form-name="LookupOrderName"/></field>
+        <field name="trackingCodeTypeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeTypeId}">
             <drop-down>
                 <entity-options description="${description}" entity-name="TrackingCodeType" key-field-name="trackingCodeTypeId">
                     <entity-order-by field-name="description"/>
@@ -135,20 +135,20 @@
             </service>
         </actions>
         
-        <field name="trackingCodeId" title="${uiLabelMap.TrackingCodeTrackingCodeId}"><display/></field>
-        <field name="orderId" title="${uiLabelMap.TrackingCodeOrderOrderId}"><display-entity entity-name="OrderHeader" description="${orderDate} [${orderId}]"/></field>
-        <field name="trackingCodeTypeId" title="${uiLabelMap.TrackingCodeTrackingCodeTypeId}"><display-entity entity-name="TrackingCodeType" description="${description}"/></field>
-        <field name="isBillable" title="${uiLabelMap.TrackingCodeOrderIsBilliable}"><display/></field>
+        <field name="trackingCodeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeId}"><display/></field>
+        <field name="orderId" title="${uiLabelMap.MarketingTrackingCodeOrderOrderId}"><display-entity entity-name="OrderHeader" description="${orderDate} [${orderId}]"/></field>
+        <field name="trackingCodeTypeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeTypeId}"><display-entity entity-name="TrackingCodeType" description="${description}"/></field>
+        <field name="isBillable" title="${uiLabelMap.MarketingTrackingCodeOrderIsBilliable}"><display/></field>
     </form>
 
     <form name="EditTrackingCodeVisit" default-map-name="visit" target="updateTrackingCodeVisit" title="" type="single"
         header-row-style="header-row" default-table-style="basic-table">
         <alt-target target="createTrackingCodeVisit" use-when="visit==null"/>
-        <field name="tackingCodeId" title="${uiLabelMap.TrackingCodeTrackingCodeId}"><display/></field>
-        <field name="visitId" title="${uiLabelMap.TrackingCodeVisitVisitId}"><display/></field>
+        <field name="tackingCodeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeId}"><display/></field>
+        <field name="visitId" title="${uiLabelMap.MarketingTrackingCodeVisitVisitId}"><display/></field>
         <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field>
         
-        <field name="sourceEnumId" title="${uiLabelMap.TrackingCodeVisitSourceEnumId}">
+        <field name="sourceEnumId" title="${uiLabelMap.MarketingTrackingCodeVisitSourceEnumId}">
             <drop-down>
                 <entity-options description="${description}" entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" operator="equals" value=" TRACKINGCODE_SRC"/>
@@ -160,10 +160,10 @@
     </form>
     <form name="FindTrackingCodeVisits" target="ListTrackingCodeVisits" title="" type="single"
         header-row-style="header-row" default-table-style="basic-table">
-        <field name="trackingCodeId" title="${uiLabelMap.TrackingCodeTrackingCodeId}"><text/></field>
-        <field name="visitId" title="${uiLabelMap.TrackingCodeVisitVisitId}"><lookup target-form-name="LookupVisit"/></field>
+        <field name="trackingCodeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeId}"><text/></field>
+        <field name="visitId" title="${uiLabelMap.MarketingTrackingCodeVisitVisitId}"><lookup target-form-name="LookupVisit"/></field>
         <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><date-find/></field>
-        <field name="sourceEnumId" title="${uiLabelMap.TrackingCodeVisitSourceEnumId}">
+        <field name="sourceEnumId" title="${uiLabelMap.MarketingTrackingCodeVisitSourceEnumId}">
             <drop-down>
                 <entity-options description="${description}" entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" operator="equals" value=" TRACKINGCODE_SRC"/>
@@ -181,10 +181,10 @@
                 <field-map field-name="orderBy" value="-fromDate"/>
             </service>
         </actions>
-        <field name="visitId" title="${uiLabelMap.TrackingCodeVisitVisitId}">
+        <field name="visitId" title="${uiLabelMap.MarketingTrackingCodeVisitVisitId}">
             <hyperlink description="${visitId}" target="/partymgr/control/visitdetail?visitId=${visitId}&amp;DONE_PAGE=${donePage}" target-type="inter-app"/>
         </field>
-        <field name="sourceEnumId" title="${uiLabelMap.TrackingCodeVisitSourceEnumId}">
+        <field name="sourceEnumId" title="${uiLabelMap.MarketingTrackingCodeVisitSourceEnumId}">
             <display-entity description="${description} [${enumCode}]" entity-name="Enumeration" key-field-name="enumId"/>
         </field>
         <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field>
@@ -192,16 +192,16 @@
     
     <form name="LookupTrackingCode" default-map-name="trackingCode" target="LookupTrackingCode" title="" type="single"
         header-row-style="header-row" default-table-style="basic-table">
-        <field name="trackingCodeId" title="${uiLabelMap.TrackingCodeTrackingCodeId}"><text-find/></field>
-        <field name="description" title="${uiLabelMap.TrackingCodeDescription}"><text-find/></field>
-        <field name="trackingCodeTypeId" title="${uiLabelMap.TrackingCodeTrackingCodeTypeId}">
+        <field name="trackingCodeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeId}"><text-find/></field>
+        <field name="description" title="${uiLabelMap.MarketingTrackingCodeDescription}"><text-find/></field>
+        <field name="trackingCodeTypeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeTypeId}">
             <drop-down>
                 <entity-options description="${description}" entity-name="TrackingCodeType" key-field-name="trackingCodeTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
-        <field name="prodCatalogId" title="${uiLabelMap.TrackingCodeProdCatalogId}">
+        <field name="prodCatalogId" title="${uiLabelMap.MarketingTrackingCodeProdCatalogId}">
             <drop-down>
                 <entity-options description="${catalogName}" entity-name="ProdCatalog" key-field-name="prodCatalogId">
                     <entity-order-by field-name="catalogName"/>
@@ -225,19 +225,19 @@
                 <field-map env-name="entityName" field-name="entityName"/>
             </service>
         </actions>
-        <field name="trackingCodeId" title="${uiLabelMap.TrackingCodeTrackingCodeId}" widget-style="buttontext">
+        <field name="trackingCodeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeId}" widget-style="buttontext">
             <hyperlink also-hidden="false" description="${trackingCodeId}" target="javascript:set_value('${trackingCodeId}')" target-type="plain"/>
         </field>
-        <field name="description" title="${uiLabelMap.TrackingCodeDescription}"><display/></field>
-        <field name="trackingCodeTypeId" title="${uiLabelMap.TrackingCodeTrackingCodeTypeId}"><display-entity entity-name="TrackingCodeType"/></field>
-        <field name="prodCatalogId" title="${uiLabelMap.TrackingCodeProdCatalogId}"><display-entity description="${catalogName}" entity-name="ProdCatalog"/></field>
+        <field name="description" title="${uiLabelMap.MarketingTrackingCodeDescription}"><display/></field>
+        <field name="trackingCodeTypeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeTypeId}"><display-entity entity-name="TrackingCodeType"/></field>
+        <field name="prodCatalogId" title="${uiLabelMap.MarketingTrackingCodeProdCatalogId}"><display-entity description="${catalogName}" entity-name="ProdCatalog"/></field>
         <field name="marketingCampaignId" title="${uiLabelMap.MarketingCampaignId}"><display-entity description="${campaignName}" entity-name="MarketingCampaign"/></field>
     </form>
     
     <form name="LookupVisit" target="LookupVisit" title="" type="single"
         header-row-style="header-row" default-table-style="basic-table">
-        <field name="visitId" title="${uiLabelMap.TrackingCodeVisitVisitId}"><text-find/></field>
-        <field name="partyId" title="${uiLabelMap.TrackingCodeVisitPartyId}"><lookup target-form-name="LookupPartyName"/></field>
+        <field name="visitId" title="${uiLabelMap.MarketingTrackingCodeVisitVisitId}"><text-find/></field>
+        <field name="partyId" title="${uiLabelMap.MarketingTrackingCodeVisitPartyId}"><lookup target-form-name="LookupPartyName"/></field>
         <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><date-find/></field>
         <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-find/></field>
         <field name="submitButton" title="${uiLabelMap.CommonFind}"><submit button-type="button"/></field>
@@ -250,34 +250,34 @@
                 <field-map env-name="entityName" field-name="entityName"/>
             </service>
         </actions>
-        <field name="visitId" title="${uiLabelMap.TrackingCodeVisitVisitId}" widget-style="buttontext">
+        <field name="visitId" title="${uiLabelMap.MarketingTrackingCodeVisitVisitId}" widget-style="buttontext">
             <hyperlink also-hidden="false" description="${visitId}" target="javascript:set_value('${visitId}')" target-type="plain"/>
         </field>
-        <field name="partyId" title="${uiLabelMap.TrackingCodeVisitPartyId}">
+        <field name="partyId" title="${uiLabelMap.MarketingTrackingCodeVisitPartyId}">
             <display-entity description="${partyId}" entity-name="Party" key-field-name="partyId"/>
         </field>
-        <field name="visitorId" title="${uiLabelMap.TrackingCodeVisitVisitorId}">
+        <field name="visitorId" title="${uiLabelMap.MarketingTrackingCodeVisitVisitorId}">
             <display-entity description="${partyId} ${userLoginId} [${visitorId}]" entity-name="Visitor" key-field-name="visitorId"/>
         </field>
-        <field name="contactMechTypeId" title="${uiLabelMap.TrackingCodeVisitContactMechTypeId}"><display-entity description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/></field>
-        <field name="roleTypeId" title="${uiLabelMap.TrackingCodeVisitRoleTypeId}"><display-entity description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/></field>
-        <field name="userLoginId" title="${uiLabelMap.TrackingCodeVisitUserLoginId}"><display/></field>
+        <field name="contactMechTypeId" title="${uiLabelMap.MarketingTrackingCodeVisitContactMechTypeId}"><display-entity description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/></field>
+        <field name="roleTypeId" title="${uiLabelMap.MarketingTrackingCodeVisitRoleTypeId}"><display-entity description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/></field>
+        <field name="userLoginId" title="${uiLabelMap.MarketingTrackingCodeVisitUserLoginId}"><display/></field>
         <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field>
         <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display/></field>
-        <field name="clientIpAddress" title="${uiLabelMap.TrackingCodeVisitClientIpAddress}"><display/></field>
-        <field name="clientHostName" title="${uiLabelMap.TrackingCodeVisitClientHostName}"><display/></field>
-        <field name="webappName" title="${uiLabelMap.TrackingCodeVisitWebappName}"><display/></field>
-        <field name="sessionId" title="${uiLabelMap.TrackingCodeVisitSessionId}"><display/></field>
+        <field name="clientIpAddress" title="${uiLabelMap.MarketingTrackingCodeVisitClientIpAddress}"><display/></field>
+        <field name="clientHostName" title="${uiLabelMap.MarketingTrackingCodeVisitClientHostName}"><display/></field>
+        <field name="webappName" title="${uiLabelMap.MarketingTrackingCodeVisitWebappName}"><display/></field>
+        <field name="sessionId" title="${uiLabelMap.MarketingTrackingCodeVisitSessionId}"><display/></field>
     </form>
     <form name="EditTrackingCodeType" type="single" target="updateTrackingCodeType" title="" default-map-name="trackingCodeType"
         header-row-style="header-row" default-table-style="basic-table">
         <alt-target use-when="trackingCodeType==null" target="createTrackingCodeType"/>
         
-        <field use-when="trackingCodeType!=null" name="trackingCodeTypeId" title="${uiLabelMap.TrackingCodeTrackingCodeTypeId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
-        <field use-when="trackingCodeType==null&amp;&amp;trackingCodeTypeId==null" name="trackingCodeTypeId" title="${uiLabelMap.TrackingCodeTrackingCodeTypeId}"><text/></field>
-        <field use-when="trackingCodeType==null&amp;&amp;trackingCodeTypeId!=null" name="trackingCodeTypeId" title="${uiLabelMap.TrackingCodeTrackingCodeTypeId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${trackingCodeTypeId}]"><display/></field>
+        <field use-when="trackingCodeType!=null" name="trackingCodeTypeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeTypeId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
+        <field use-when="trackingCodeType==null&amp;&amp;trackingCodeTypeId==null" name="trackingCodeTypeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeTypeId}"><text/></field>
+        <field use-when="trackingCodeType==null&amp;&amp;trackingCodeTypeId!=null" name="trackingCodeTypeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeTypeId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${trackingCodeTypeId}]"><display/></field>
 
-        <field name="description" title="${uiLabelMap.TrackingCodeTypeDescription}"><text/></field>
+        <field name="description" title="${uiLabelMap.MarketingTrackingCodeTypeDescription}"><text/></field>
         <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field>
         <!-- <field name="DONE_PAGE"><hidden value="${donePage}"/></field> -->
         <!-- <field name="cancelLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"><hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}" target-type="inter-app"/></field> -->
@@ -288,10 +288,10 @@
         <actions>
             <entity-condition entity-name="TrackingCodeType"/>
         </actions>
-        <field name="trackingCodeTypeId"  widget-style="buttontext" title="${uiLabelMap.TrackingCodeTrackingCodeTypeId}">
+        <field name="trackingCodeTypeId"  widget-style="buttontext" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeTypeId}">
             <hyperlink target="EditTrackingCodeType?trackingCodeTypeId=${trackingCodeTypeId}" description="${trackingCodeTypeId}" also-hidden="false"/>
         </field>
-        <field name="description" title="${uiLabelMap.TrackingCodeTypeDescription}"><display/></field>
+        <field name="description" title="${uiLabelMap.MarketingTrackingCodeTypeDescription}"><display/></field>
 
         <field name="deleteLink" title="&amp;nbsp;" widget-style="buttontext">
             <hyperlink target="deleteTrackingCodeType?trackingCodeTypeId=${trackingCodeTypeId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
@@ -299,8 +299,8 @@
     </form>
     <form name="LookupTrackingCodeType" default-map-name="trackingCode" target="LookupTrackingCodeType" title="" type="single"
         header-row-style="header-row" default-table-style="basic-table">
-        <field name="trackingCodeTypeId" title="${uiLabelMap.TrackingCodeTrackingCodeTypeId}"><text-find/></field>
-        <field name="description" title="${uiLabelMap.TrackingCodeTypeDescription}"><text-find/></field>
+        <field name="trackingCodeTypeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeTypeId}"><text-find/></field>
+        <field name="description" title="${uiLabelMap.MarketingTrackingCodeTypeDescription}"><text-find/></field>
         <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field>
     </form>
     <form name="ListLookupTrackingCodeType" target="" title="" type="list"
@@ -311,9 +311,9 @@
                 <field-map env-name="entityName" field-name="entityName"/>
             </service>
         </actions>
-        <field name="trackingCodeTypeId" title="${uiLabelMap.TrackingCodeTrackingCodeTypeId}" widget-style="buttontext">
+        <field name="trackingCodeTypeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeTypeId}" widget-style="buttontext">
             <hyperlink also-hidden="false" description="${trackingCodeTypeId}" target="javascript:set_value('${trackingCodeTypeId}')" target-type="plain"/>
         </field>
-        <field name="description" title="${uiLabelMap.TrackingCodeTypeDescription}"><display/></field>
+        <field name="description" title="${uiLabelMap.MarketingTrackingCodeTypeDescription}"><display/></field>
     </form>
 </forms>
Index: applications/marketing/webapp/marketing/contact/ContactListForms.xml
===================================================================
--- applications/marketing/webapp/marketing/contact/ContactListForms.xml	(revision 733928)
+++ applications/marketing/webapp/marketing/contact/ContactListForms.xml	(working copy)
@@ -24,30 +24,30 @@
         header-row-style="header-row" default-table-style="basic-table">
         <alt-target use-when="contactList==null" target="createContactList"/>
         
-        <field use-when="contactList!=null" name="contactListId" title="${uiLabelMap.ContactListContactListId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
-        <field use-when="contactList==null&amp;&amp;contactListId==null" name="contactListId" title="${uiLabelMap.ContactListContactListId}"><ignored/></field>
-        <field use-when="contactList==null&amp;&amp;contactListId!=null" name="contactListId" title="${uiLabelMap.ContactListContactListId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${contactListId}]"><display/></field>
+        <field use-when="contactList!=null" name="contactListId" title="${uiLabelMap.MarketingContactListContactListId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
+        <field use-when="contactList==null&amp;&amp;contactListId==null" name="contactListId" title="${uiLabelMap.MarketingContactListContactListId}"><ignored/></field>
+        <field use-when="contactList==null&amp;&amp;contactListId!=null" name="contactListId" title="${uiLabelMap.MarketingContactListContactListId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${contactListId}]"><display/></field>
 
-        <field name="contactListName" title="${uiLabelMap.ContactListContactListName}"><text/></field>
-        <field name="contactListTypeId" title="${uiLabelMap.ContactListContactListTypeId}">
+        <field name="contactListName" title="${uiLabelMap.MarketingContactListContactListName}"><text/></field>
+        <field name="contactListTypeId" title="${uiLabelMap.MarketingContactListContactListTypeId}">
             <drop-down>
                 <entity-options description="${description}" entity-name="ContactListType" key-field-name="contactListTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
-        <field name="isPublic" title="${uiLabelMap.ContactListIsPublic}">
+        <field name="isPublic" title="${uiLabelMap.MarketingContactListIsPublic}">
             <drop-down allow-empty="true">
                 <option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/>
             </drop-down>
         </field>
-        <field name="singleUse" title="${uiLabelMap.ContactListIsSingleUse}">
+        <field name="singleUse" title="${uiLabelMap.MarketingContactListIsSingleUse}">
             <drop-down allow-empty="true">
                 <option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/>
             </drop-down>
         </field>
         
-        <field name="contactMechTypeId" title="${uiLabelMap.ContactListContactMechTypeId}">
+        <field name="contactMechTypeId" title="${uiLabelMap.MarketingContactListContactMechTypeId}">
             <drop-down no-current-selected-key="EMAIL_ADDRESS">
                 <entity-options description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId">
                     <entity-order-by field-name="description"/>
@@ -62,12 +62,12 @@
             </drop-down>
         </field>
 
-        <field name="ownerPartyId" title="${uiLabelMap.ContactListOwnerPartyId}"><lookup target-form-name="LookupPartyName"/></field>
+        <field name="ownerPartyId" title="${uiLabelMap.MarketingContactListOwnerPartyId}"><lookup target-form-name="LookupPartyName"/></field>
  
-        <field name="verifyEmailFrom" title="${uiLabelMap.ContactListVerifyEmailFrom}"><text size="40"/></field>
-        <field name="verifyEmailScreen" title="${uiLabelMap.ContactListVerifyEmailScreen}"><text size="60"/></field>
-        <field name="verifyEmailSubject" title="${uiLabelMap.ContactListVerifyEmailSubject}"><text size="60"/></field>
-        <field name="verifyEmailWebSiteId" title="${uiLabelMap.ContactListVerifyEmailWebSiteId}">
+        <field name="verifyEmailFrom" title="${uiLabelMap.MarketingContactListVerifyEmailFrom}"><text size="40"/></field>
+        <field name="verifyEmailScreen" title="${uiLabelMap.MarketingContactListVerifyEmailScreen}"><text size="60"/></field>
+        <field name="verifyEmailSubject" title="${uiLabelMap.MarketingContactListVerifyEmailSubject}"><text size="60"/></field>
+        <field name="verifyEmailWebSiteId" title="${uiLabelMap.MarketingContactListVerifyEmailWebSiteId}">
             <drop-down allow-empty="true">
                 <entity-options entity-name="WebSite" key-field-name="webSiteId" description="${siteName} [${webSiteId}]">
                     <entity-order-by field-name="siteName"/>
@@ -83,16 +83,16 @@
     <form name="FindContactLists" target="ListContactLists" title="" type="single"
         header-row-style="header-row" default-table-style="basic-table">
         <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
-        <field name="contactListId" title="${uiLabelMap.ContactListContactListId}"><text size="20" maxlength="20"/></field>
-        <field name="contactListName" title="${uiLabelMap.ContactListContactListName}"><text-find/></field>
-        <field name="contactListTypeId" title="${uiLabelMap.ContactListContactListTypeId}">
+        <field name="contactListId" title="${uiLabelMap.MarketingContactListContactListId}"><text size="20" maxlength="20"/></field>
+        <field name="contactListName" title="${uiLabelMap.MarketingContactListContactListName}"><text-find/></field>
+        <field name="contactListTypeId" title="${uiLabelMap.MarketingContactListContactListTypeId}">
             <drop-down allow-empty="true">
                 <entity-options description="${description}" entity-name="ContactListType" key-field-name="contactListTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
-        <field name="contactMechTypeId" title="${uiLabelMap.ContactListContactMechTypeId}">
+        <field name="contactMechTypeId" title="${uiLabelMap.MarketingContactListContactMechTypeId}">
             <drop-down allow-empty="true">
                 <entity-options description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId">
                     <entity-order-by field-name="description"/>
@@ -118,15 +118,15 @@
                 <field-map field-name="entityName" value="ContactList"/>
             </service>
         </actions>
-        <field name="contactListId"  widget-style="buttontext" title="${uiLabelMap.ContactListContactListId}">
+        <field name="contactListId"  widget-style="buttontext" title="${uiLabelMap.MarketingContactListContactListId}">
             <hyperlink target="EditContactList?contactListId=${contactListId}" description="${contactListId}" also-hidden="false"/>
         </field>
-        <field name="contactListName" title="${uiLabelMap.ContactListContactListName}"><display/></field>
-        <field name="isPublic" title="${uiLabelMap.ContactListIsPublic}"><display/></field>
-        <field name="singleUse" title="${uiLabelMap.ContactListIsSingleUse}"><display/></field>
-        <field name="contactListTypeId" title="${uiLabelMap.ContactListContactListTypeId}"><display-entity entity-name="ContactListType"/></field>
+        <field name="contactListName" title="${uiLabelMap.MarketingContactListContactListName}"><display/></field>
+        <field name="isPublic" title="${uiLabelMap.MarketingContactListIsPublic}"><display/></field>
+        <field name="singleUse" title="${uiLabelMap.MarketingContactListIsSingleUse}"><display/></field>
+        <field name="contactListTypeId" title="${uiLabelMap.MarketingContactListContactListTypeId}"><display-entity entity-name="ContactListType"/></field>
         
-        <field name="contactMechTypeId" title="${uiLabelMap.ContactListContactMechTypeId}"><display-entity entity-name="ContactMechType"/></field>
+        <field name="contactMechTypeId" title="${uiLabelMap.MarketingContactListContactMechTypeId}"><display-entity entity-name="ContactMechType"/></field>
         <field name="marketingCampaignId" title="${uiLabelMap.MarketingCampaignId}"><display-entity entity-name="MarketingCampaign" description="${campaignName}"/></field>
         <!-- deleting contact lists is a bit more complicated than this... don't like have a link like this for top level entities
         <field name="deleteLink" title="&amp;nbsp;" widget-style="buttontext">
@@ -140,7 +140,7 @@
         <alt-target use-when="contactListParty==null" target="createContactListParty"/>
         
         <field name="contactListId"><hidden/></field>
-        <field name="partyId" title="${uiLabelMap.ContactListPartyId}"><lookup target-form-name="LookupPartyName"/></field>
+        <field name="partyId" title="${uiLabelMap.MarketingContactListPartyId}"><lookup target-form-name="LookupPartyName"/></field>
         <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><date-time/></field>
         <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-time/></field>
         
@@ -152,9 +152,9 @@
                 </entity-options>
             </drop-down>
         </field>
-        <field name="optInVerifyCode" map-name="parameters" title="${uiLabelMap.ContactListOptInVerifyCode}"><text size="10"/></field>
+        <field name="optInVerifyCode" map-name="parameters" title="${uiLabelMap.MarketingContactListOptInVerifyCode}"><text size="10"/></field>
         
-        <field name="preferredContactMechId" title="${uiLabelMap.ContactListPreferredContactMech}">
+        <field name="preferredContactMechId" title="${uiLabelMap.MarketingContactListPreferredContactMech}">
             <lookup target-form-name="LookupPreferredContactMech" target-parameter="partyId"/>
         </field>
         
@@ -163,8 +163,8 @@
         
     <form name="FindContactListParties" type="single" target="ListContactListParties" title=""
         header-row-style="header-row" default-table-style="basic-table">
-        <field name="contactListId" title="${uiLabelMap.ContactListContactListId}"><text-find/></field>
-        <field name="partyId" title="${uiLabelMap.ContactListPartyId}"><lookup target-form-name="LookupPartyName"/></field>
+        <field name="contactListId" title="${uiLabelMap.MarketingContactListContactListId}"><text-find/></field>
+        <field name="partyId" title="${uiLabelMap.MarketingContactListPartyId}"><lookup target-form-name="LookupPartyName"/></field>
         <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><date-find/></field>
         <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-find/></field>
         
@@ -176,7 +176,7 @@
                 </entity-options>
             </drop-down>
         </field>
-        <field name="preferredContactMechId" title="${uiLabelMap.ContactListPreferredContactMech}">
+        <field name="preferredContactMechId" title="${uiLabelMap.MarketingContactListPreferredContactMech}">
             <lookup target-form-name="LookupContactMech" target-parameter="partyId"/>
         </field>
         
@@ -193,11 +193,11 @@
         </actions>
         
         <field name="contactListId"><hidden/></field>
-        <field name="partyId" title="${uiLabelMap.ContactListPartyId}"><display-entity entity-name="PartyNameView" description="${firstName}  ${lastName} ${groupName} [${partyId}]"/></field>
+        <field name="partyId" title="${uiLabelMap.MarketingContactListPartyId}"><display-entity entity-name="PartyNameView" description="${firstName}  ${lastName} ${groupName} [${partyId}]"/></field>
         <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field>
         <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display/></field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity  entity-name="StatusItem"/></field>
-        <field name="preferredContactMechId" title="${uiLabelMap.ContactListPreferredContactMech}">
+        <field name="preferredContactMechId" title="${uiLabelMap.MarketingContactListPreferredContactMech}">
             <display-entity entity-name="ContactMechDetail" key-field-name="contactMechId" description="[${contactMechId}]: [${infoString}] [${tnCountryCode}-${tnAreaCode}-${tnContactNumber}] [${paAddress1}, ${paAddress1}, ${paCity}, ${paStateProvinceGeoId}, ${paPostalCode}, ${paPostalCodeExt} ${paCountryGeoId}]"/>
         </field>
         <field name="editLink" title="&amp;nbsp;" widget-style="buttontext">
@@ -209,8 +209,8 @@
     <form name="EditContactListCommEvent" default-map-name="communicationEvent"  target="updateContactListCommEvent" title="" type="single"
         header-row-style="header-row" default-table-style="basic-table">
         <alt-target target="createContactListCommEvent" use-when="communicationEvent==null"/>
-        <field name="communicationEventId" use-when="communicationEvent!=null" title="${uiLabelMap.ContactListCommEventId}"><display/></field>
-        <field name="communicationEventTypeId" title="${uiLabelMap.ContactListCommEventTypeId}">
+        <field name="communicationEventId" use-when="communicationEvent!=null" title="${uiLabelMap.MarketingContactListCommEventId}"><display/></field>
+        <field name="communicationEventTypeId" title="${uiLabelMap.MarketingContactListCommEventTypeId}">
             <drop-down no-current-selected-key="EMAIL_COMMUNICATION">
                 <entity-options entity-name="CommunicationEventType" description="${description}">
                     <entity-order-by field-name="description"/>
@@ -236,17 +236,17 @@
             </drop-down>
         </field>
         
-        <field name="contactMechTypeId" title="${uiLabelMap.ContactListContactMechTypeId}" use-when="commEventContactMechType!=null&amp;&amp;parentCommEventContactMechType==null">
+        <field name="contactMechTypeId" title="${uiLabelMap.MarketingContactListContactMechTypeId}" use-when="commEventContactMechType!=null&amp;&amp;parentCommEventContactMechType==null">
             <drop-down>
                 <entity-options description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/>
             </drop-down>
         </field>
-        <field name="contactMechTypeId" title="${uiLabelMap.ContactListContactMechTypeId}" use-when="commEventContactMechType==null&amp;&amp;parentCommEventContactMechType!=null">
+        <field name="contactMechTypeId" title="${uiLabelMap.MarketingContactListContactMechTypeId}" use-when="commEventContactMechType==null&amp;&amp;parentCommEventContactMechType!=null">
             <drop-down>
                 <entity-options description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/>
             </drop-down>
         </field>
-        <field name="contactMechTypeId" title="${uiLabelMap.ContactListContactMechTypeId}" use-when="commEventContactMechType==null&amp;&amp;parentCommEventContactMechType==null">
+        <field name="contactMechTypeId" title="${uiLabelMap.MarketingContactListContactMechTypeId}" use-when="commEventContactMechType==null&amp;&amp;parentCommEventContactMechType==null">
             <drop-down>
                 <entity-options description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/>
             </drop-down>
@@ -297,8 +297,8 @@
     </form>
     <form name="FindContactListCommEvents" target="ListContactListCommEvents" title="" type="single"
         header-row-style="header-row" default-table-style="basic-table">
-        <field name="contactListId" title="${uiLabelMap.ContactListContactListId}"><text/></field>
-        <field name="commEventId" title="${uiLabelMap.ContactListCommEventId}"><lookup target-form-name="LookupCommEvent"/></field>
+        <field name="contactListId" title="${uiLabelMap.MarketingContactListContactListId}"><text/></field>
+        <field name="commEventId" title="${uiLabelMap.MarketingContactListCommEventId}"><lookup target-form-name="LookupCommEvent"/></field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}">
             <drop-down allow-empty="true">
                 <entity-options description="${description}" entity-name="StatusItem">
@@ -318,7 +318,7 @@
                 <field-map field-name="entityName" value="CommunicationEvent"/>
             </service>
         </actions>
-        <field name="communicationEventId" title="${uiLabelMap.ContactListCommEventId}">
+        <field name="communicationEventId" title="${uiLabelMap.MarketingContactListCommEventId}">
             <hyperlink description="${communicationEventId}" target="EditContactListCommEvent?contactListId=${contactListId}&amp;communicationEventId=${communicationEventId}&amp;DONE_PAGE=${donePage}" target-type="intra-app"/>
         </field>
         <field name="partyIdFrom" title="${uiLabelMap.PartyPartyFrom}">
@@ -328,7 +328,7 @@
             <display-entity description="${firstName} ${lastName} [${partyId}]" entity-name="Person" key-field-name="partyId"/>
         </field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity description="${description}" entity-name="StatusItem" key-field-name="statusId"/></field>
-        <field name="contactMechTypeId" title="${uiLabelMap.ContactListContactMechTypeId}"><display-entity description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/></field>
+        <field name="contactMechTypeId" title="${uiLabelMap.MarketingContactListContactMechTypeId}"><display-entity description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/></field>
         <field name="roleTypeIdFrom" title="${uiLabelMap.PartyRoleTypeIdFrom}"><display-entity description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/></field>
         <field name="roleTypeIdTo" title="${uiLabelMap.PartyRoleTypeIdTo}"><display-entity description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/></field>
         <field name="custReqestId" position="1"><display/></field>
@@ -339,16 +339,16 @@
     
     <form name="LookupContactList" default-map-name="contactList" target="LookupContactList" title="" type="single"
         header-row-style="header-row" default-table-style="basic-table">
-        <field name="contactListId" title="${uiLabelMap.ContactListContactListId}"><text-find/></field>
-        <field name="contactListName" title="${uiLabelMap.ContactListContactListName}"><text-find/></field>
-        <field name="contactListTypeId" title="${uiLabelMap.ContactListContactListTypeId}">
+        <field name="contactListId" title="${uiLabelMap.MarketingContactListContactListId}"><text-find/></field>
+        <field name="contactListName" title="${uiLabelMap.MarketingContactListContactListName}"><text-find/></field>
+        <field name="contactListTypeId" title="${uiLabelMap.MarketingContactListContactListTypeId}">
             <drop-down allow-empty="true">
                 <entity-options description="${description}" entity-name="ContactListType" key-field-name="contactListTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
-        <field name="contactMechTypeId" title="${uiLabelMap.ContactListContactMechTypeId}">
+        <field name="contactMechTypeId" title="${uiLabelMap.MarketingContactListContactMechTypeId}">
             <drop-down allow-empty="true">
                 <entity-options description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId">
                     <entity-order-by field-name="description"/>
@@ -373,18 +373,18 @@
                 <field-map value="ContactList" field-name="entityName"/>
             </service>
         </actions>
-        <field name="contactListId" title="${uiLabelMap.ContactListContactListId}" widget-style="buttontext">
+        <field name="contactListId" title="${uiLabelMap.MarketingContactListContactListId}" widget-style="buttontext">
             <hyperlink also-hidden="false" description="${contactListId}" target="javascript:set_value('${contactListId}')" target-type="plain"/>
         </field>
-        <field name="contactListName" title="${uiLabelMap.ContactListContactListName}"><display/></field>
-        <field name="contactListTypeId" title="${uiLabelMap.ContactListContactListTypeId}"><display-entity entity-name="ContactListType"/></field>
-        <field name="contactMechTypeId" title="${uiLabelMap.ContactListContactMechTypeId}"><display-entity entity-name="ContactMechType"/></field>
+        <field name="contactListName" title="${uiLabelMap.MarketingContactListContactListName}"><display/></field>
+        <field name="contactListTypeId" title="${uiLabelMap.MarketingContactListContactListTypeId}"><display-entity entity-name="ContactListType"/></field>
+        <field name="contactMechTypeId" title="${uiLabelMap.MarketingContactListContactMechTypeId}"><display-entity entity-name="ContactMechType"/></field>
         <field name="marketingCampaignId" title="${uiLabelMap.MarketingCampaignId}"><display-entity description="${campaignName}" entity-name="MarketingCampaign"/></field>
     </form>
     
     <form name="LookupCommEvent"  target="LookupCommEvent" title="" type="single"
         header-row-style="header-row" default-table-style="basic-table">
-        <field name="communicationEventId" title="${uiLabelMap.ContactListCommEventId}"><text-find/></field>
+        <field name="communicationEventId" title="${uiLabelMap.MarketingContactListCommEventId}"><text-find/></field>
         <field name="partyIdFrom" title="${uiLabelMap.PartyPartyFrom}"><lookup target-form-name="LookupPartyName"/></field>
         <field name="partyIdTo" title="${uiLabelMap.PartyPartyTo}"><lookup target-form-name="LookupPartyName"/></field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}">
@@ -394,7 +394,7 @@
                 </entity-options>
             </drop-down>
         </field>
-        <field name="contactMechTypeId" title="${uiLabelMap.ContactListContactMechTypeId}">
+        <field name="contactMechTypeId" title="${uiLabelMap.MarketingContactListContactMechTypeId}">
             <drop-down allow-empty="true">
                 <entity-options description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/>
             </drop-down>
@@ -418,7 +418,7 @@
                 <field-map env-name="entityName" field-name="entityName"/>
             </service>
         </actions>
-        <field name="communicationEventId" title="${uiLabelMap.ContactListCommEventId}" widget-style="buttontext">
+        <field name="communicationEventId" title="${uiLabelMap.MarketingContactListCommEventId}" widget-style="buttontext">
             <hyperlink also-hidden="false" description="${communicationEventId}" target="javascript:set_value('${communicationEventId}')" target-type="plain"/>
         </field>
         <field name="partyIdFrom" title="${uiLabelMap.PartyPartyFrom}">
@@ -428,7 +428,7 @@
             <display-entity description="${firstName} ${lastName} [${partyId}]" entity-name="Person" key-field-name="partyId"/>
         </field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity description="${description}" entity-name="StatusItem" key-field-name="statusId"/></field>
-        <field name="contactMechTypeId" title="${uiLabelMap.ContactListContactMechTypeId}"><display-entity description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/></field>
+        <field name="contactMechTypeId" title="${uiLabelMap.MarketingContactListContactMechTypeId}"><display-entity description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/></field>
         <field name="roleTypeIdFrom" title="${uiLabelMap.PartyRoleTypeIdFrom}"><display-entity description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/></field>
         <field name="roleTypeIdTo" title="${uiLabelMap.PartyRoleTypeIdTo}"><display-entity description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/></field>
         <field name="custReqestId" position="1" title="{uiLabelMap.ServicemgntCustRequestId}"><text size="20"/></field>
@@ -446,7 +446,7 @@
         <field name="contactMechId"  widget-style="buttontext">
             <hyperlink description="${contactMechId}" target-type="plain" target="javascript:set_value('${contactMechId}')" also-hidden="false"/>
         </field>
-        <field name="contactMechTypeId" title="${uiLabelMap.ContactListContactMechTypeId}"><display-entity entity-name="ContactMechType"/></field>
+        <field name="contactMechTypeId" title="${uiLabelMap.MarketingContactListContactMechTypeId}"><display-entity entity-name="ContactMechType"/></field>
         <field name="cmDetail"><display description="[${infoString}] [${tnCountryCode}-${tnAreaCode}-${tnContactNumber}] [${paAddress1}, ${paAddress2}, ${paCity}, ${paStateProvinceGeoId}, ${paPostalCode}, ${paPostalCodeExt} ${paCountryGeoId}]" also-hidden="false"/></field>
     </form>
 </forms>
\ No newline at end of file
Index: applications/marketing/webapp/marketing/contact/ContactListMenus.xml
===================================================================
--- applications/marketing/webapp/marketing/contact/ContactListMenus.xml	(revision 733928)
+++ applications/marketing/webapp/marketing/contact/ContactListMenus.xml	(working copy)
@@ -21,7 +21,7 @@
 
     <menu name="ContactListTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
           default-menu-item-name="ContactList" selected-menuitem-context-field-name="contactListTabButtonItem">
-        <menu-item name="ContactList" title="${uiLabelMap.ContactList}">
+        <menu-item name="ContactList" title="${uiLabelMap.MarketingContactList}">
             <link target="/EditContactList?contactListId=${contactListId}"/>
         </menu-item>
         <menu-item name="ContactListParty" title="${uiLabelMap.PartyParties}">
Index: applications/marketing/widget/MarketingMenus.xml
===================================================================
--- applications/marketing/widget/MarketingMenus.xml	(revision 733928)
+++ applications/marketing/widget/MarketingMenus.xml	(working copy)
@@ -21,9 +21,9 @@
     <menu name="MarketingAppBar" title="${uiLabelMap.MarketingManagerApplication}" extends="CommonAppBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
         <menu-item name="DataSource" title="${uiLabelMap.DataSource}"><link target="FindDataSource"/></menu-item>
         <menu-item name="Campaign" title="${uiLabelMap.MarketingCampaign}"><link target="FindMarketingCampaign"/></menu-item>
-        <menu-item name="Tracking" title="${uiLabelMap.Tracking}"><link target="FindTrackingCode"/></menu-item>
-        <menu-item name="Segment" title="${uiLabelMap.Segment}"><link target="FindSegmentGroup"/></menu-item>
-        <menu-item name="ContactList" title="${uiLabelMap.ContactList}"><link target="FindContactLists"/></menu-item>
+        <menu-item name="Tracking" title="${uiLabelMap.MarketingTracking}"><link target="FindTrackingCode"/></menu-item>
+        <menu-item name="Segment" title="${uiLabelMap.MarketingSegment}"><link target="FindSegmentGroup"/></menu-item>
+        <menu-item name="ContactList" title="${uiLabelMap.MarketingContactList}"><link target="FindContactLists"/></menu-item>
         <menu-item name="Reports" title="${uiLabelMap.MarketingReports}"><link target="MarketingReport"/></menu-item>
     </menu>
 </menus>
\ No newline at end of file
Index: applications/marketing/widget/sfa/forms/OpportunityForms.xml
===================================================================
--- applications/marketing/widget/sfa/forms/OpportunityForms.xml	(revision 733928)
+++ applications/marketing/widget/sfa/forms/OpportunityForms.xml	(working copy)
@@ -102,7 +102,7 @@
             </drop-down>
         </field>
         <field name="estimatedProbability" position="1" title="${uiLabelMap.SfaProbability}"><text size="25"/></field>
-        <field name="dataSourceId" position="2" title="${uiLabelMap.DataSourceLabel}">
+        <field name="dataSourceId" position="2" title="${uiLabelMap.SfaDataSourceLabel}">
             <drop-down allow-empty="true">
                 <entity-options key-field-name="dataSourceId" description="${description}" entity-name="DataSource">
                     <entity-constraint name="dataSourceTypeId" operator="equals" value="SLSOPP_SRC"/>
@@ -115,7 +115,7 @@
                 </entity-options>
             </drop-down>
         </field>
-        <field name="description" title="${uiLabelMap.SegmentGroupDescription}"><textarea/></field>
+        <field name="description" title="${uiLabelMap.MarketingSegmentGroupDescription}"><textarea/></field>
         <field name="nextStep" title="${uiLabelMap.SfaNextStep}"><textarea/></field>
         <field name="submitButton" title="${uiLabelMap.CommonSave}" use-when="salesOpportunity==null"><submit button-type="button"/></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" use-when="salesOpportunity!=null"><submit button-type="button"/></field>
@@ -131,9 +131,9 @@
         <field name="estimatedCloseDate" position="1" title="${uiLabelMap.SfaCloseDate}"><display/></field>
         <field name="opportunityStageId" position="2" title="${uiLabelMap.SfaInitialStage}"><display/></field>
         <field name="estimatedProbability" position="1" title="${uiLabelMap.SfaProbability}"><display/></field>
-        <field name="dataSourceId" position="2" title="${uiLabelMap.DataSourceLabel}"><display/></field>
+        <field name="dataSourceId" position="2" title="${uiLabelMap.SfaDataSourceLabel}"><display/></field>
         <field name="marketingCampaignId" position="1" title="${uiLabelMap.MarketingCampaign}"><display/></field>
-        <field name="description" position="1" title="${uiLabelMap.SegmentGroupDescription}"><display/></field>
+        <field name="description" position="1" title="${uiLabelMap.MarketingSegmentGroupDescription}"><display/></field>
         <field name="nextStep" position="1" title="${uiLabelMap.SfaNextStep}"><display/></field>
     </form>
 </forms>
\ No newline at end of file
Index: applications/marketing/widget/CommonScreens.xml
===================================================================
--- applications/marketing/widget/CommonScreens.xml	(revision 733928)
+++ applications/marketing/widget/CommonScreens.xml	(working copy)
@@ -26,6 +26,7 @@
                 <!-- base/top/specific map first, then more common map added for shared labels --> 
                 <property-map resource="MarketingUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
 
                 <set field="layoutSettings.companyName" from-field="uiLabelMap.MarketingCompanyName" global="true"/>
@@ -69,7 +70,7 @@
                                     <widgets>
                                         <include-menu name="ContactListTabBar" location="component://marketing/webapp/marketing/contact/ContactListMenus.xml"/>
                                         <container>
-                                            <label style="h1">${uiLabelMap.ContactList} ${contactList.contactListName} [${contactListId}]</label>
+                                            <label style="h1">${uiLabelMap.MarketingContactList} ${contactList.contactListName} [${contactListId}]</label>
                                         </container>
                                     </widgets>
                                 </section>
Index: applications/ecommerce/config/EcommerceUiLabels.xml
===================================================================
--- applications/ecommerce/config/EcommerceUiLabels.xml	(revision 733928)
+++ applications/ecommerce/config/EcommerceUiLabels.xml	(working copy)
@@ -33,6 +33,11 @@
         <value xml:lang="th">บัญชีของคุณลอกอินเข้าสู่ระบบคือ</value>
         <value xml:lang="zh">你登录的账户是：</value>
     </property>
+    <property key="EcommerceAccountInformation">
+        <value xml:lang="en">Account Information</value>
+        <value xml:lang="fr">Information sur le compte</value>
+	    <value xml:lang="it">Informazioni utente</value>
+    </property>
     <property key="EcommerceActive">
         <value xml:lang="cs">Váš E-mail</value>
         <value xml:lang="de">Aktiv</value>
Index: applications/marketing/webapp/marketing/lookup/LookupForms.xml
===================================================================
--- applications/marketing/webapp/marketing/lookup/LookupForms.xml	(revision 733928)
+++ applications/marketing/webapp/marketing/lookup/LookupForms.xml	(working copy)
@@ -23,10 +23,10 @@
     <!-- SegmentGroup Lookup forms -->
     <form name="LookupSegmentGroup" target="LookupSegmentGroup" title="" type="single"
         header-row-style="header-row" default-table-style="basic-table">
-        <field name="segmentGroupId" title="${uiLabelMap.SegmentGroupSegmentGroupId}"><text-find/></field>
-        <field name="segmentGroupTypeId" title="${uiLabelMap.SegmentGroupSegmentGroupTypeId}"><text-find/></field>
+        <field name="segmentGroupId" title="${uiLabelMap.MarketingSegmentGroupSegmentGroupId}"><text-find/></field>
+        <field name="segmentGroupTypeId" title="${uiLabelMap.MarketingSegmentGroupSegmentGroupTypeId}"><text-find/></field>
         <field name="description" title="${uiLabelMap.CommonDescription}"><text-find/></field>
-        <field name="productStoreId" title="${uiLabelMap.SegmentGroupProductStoreId}"><text-find/></field>
+        <field name="productStoreId" title="${uiLabelMap.MarketingSegmentGroupProductStoreId}"><text-find/></field>
         <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> 
         <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
@@ -38,12 +38,12 @@
                 <field-map field-name="entityName" value="SegmentGroup"/>
             </service>
         </actions>
-        <field name="segmentGroupId"  widget-style="buttontext" title="${uiLabelMap.SegmentGroupSegmentGroupId}">
+        <field name="segmentGroupId"  widget-style="buttontext" title="${uiLabelMap.MarketingSegmentGroupSegmentGroupId}">
             <hyperlink also-hidden="false" target-type="plain" description="${segmentGroupId}" target="javascript:set_value('${segmentGroupId}')"/>
         </field>
-        <field name="segmentGroupTypeId" title="${uiLabelMap.SegmentGroupSegmentGroupTypeId}"><display/></field>
+        <field name="segmentGroupTypeId" title="${uiLabelMap.MarketingSegmentGroupSegmentGroupTypeId}"><display/></field>
         <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
-        <field name="productStoreId" title="${uiLabelMap.SegmentGroupProductStoreId}"><display/></field>
+        <field name="productStoreId" title="${uiLabelMap.MarketingSegmentGroupProductStoreId}"><display/></field>
     </form>
     
     <form name="listSegmentGroupClass" list-name="listIt" target="" title="" type="list" paginate-target="listSegmentGroupClass"
@@ -53,7 +53,7 @@
                 <field-map field-name="segmentGroupId" />
             </entity-and>
         </actions>
-        <field name="segmentGroupId"  widget-style="buttontext" title="${uiLabelMap.SegmentGroupSegmentGroupId}">
+        <field name="segmentGroupId"  widget-style="buttontext" title="${uiLabelMap.MarketingSegmentGroupSegmentGroupId}">
             <hyperlink also-hidden="false" target-type="intra-app" description="${segmentGroupId}" target="viewSegmentGroup?segmentGroupId=${segmentGroupId}"/>
         </field>
         <field name="partyClassificationGroupId" title="${uiLabelMap.SegmentGroupPartyClassificationGroupId}"><display/></field>
Index: applications/ecommerce/webapp/ecommerce/customer/profile/EditProfile.ftl
===================================================================
--- applications/ecommerce/webapp/ecommerce/customer/profile/EditProfile.ftl	(revision 733928)
+++ applications/ecommerce/webapp/ecommerce/customer/profile/EditProfile.ftl	(working copy)
@@ -51,7 +51,7 @@
       </div>
 
       <div class="center right">
-        <div class="screenlet-header"><div class='boxhead'>&nbsp;${uiLabelMap.AccountInformation}</div></div>
+        <div class="screenlet-header"><div class='boxhead'>&nbsp;${uiLabelMap.EcommerceAccountInformation}</div></div>
         <div class="screenlet-body">
           <div class="form-row">
             <div class="field-label"><label for="userName">${uiLabelMap.CommonUsername}*</label></div>
Index: applications/marketing/widget/ContactListScreens.xml
===================================================================
--- applications/marketing/widget/ContactListScreens.xml	(revision 733928)
+++ applications/marketing/widget/ContactListScreens.xml	(working copy)
@@ -24,7 +24,7 @@
    <screen name="FindContactLists">
        <section>
            <actions>
-               <set field="titleProperty" value="ContactListFindContactLists"/>
+               <set field="titleProperty" value="MarketingContactListFindContactLists"/>
                <set field="contactListTabButtonItem" value="ContactList"/>
                <set field="labelTitleProperty" value="PageTitleFindContactLists"/>
                <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/marketing/control/FindContactList"/>
@@ -35,13 +35,13 @@
                         <container style="screenlet">
                             <container style="screenlet-title-bar">
                                 <container style="h3">
-                                    <label text="${uiLabelMap.ContactListFindContactLists}"/>
+                                    <label text="${uiLabelMap.MarketingContactListFindContactLists}"/>
                                 </container>
                             </container>
                             <container style="screenlet-body">
                                 <section>
                                     <widgets>
-                                        <container><link  text="${uiLabelMap.ContactListCreate}" target="EditContactList?DONE_PAGE=${donePage}" style="buttontext"/></container>
+                                        <container><link  text="${uiLabelMap.MarketingContactListCreate}" target="EditContactList?DONE_PAGE=${donePage}" style="buttontext"/></container>
                                         <include-form name="FindContactLists" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/>
                                     </widgets>
                                 </section>
@@ -81,7 +81,7 @@
                                     <container style="screenlet-body">
                                         <section>
                                             <widgets>
-                                                <container><link  text="${uiLabelMap.ContactListCreate}" target="EditContactList?DONE_PAGE=${donePage}" style="buttontext"/></container>
+                                                <container><link  text="${uiLabelMap.MarketingContactListCreate}" target="EditContactList?DONE_PAGE=${donePage}" style="buttontext"/></container>
                                                 <include-form name="EditContactList" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/>
                                             </widgets>
                                         </section>
@@ -138,7 +138,7 @@
                             <container style="screenlet-body">
                                 <section>
                                     <widgets>
-                                        <container><link text="${uiLabelMap.ContactListCreate}" target="EditContactList?DONE_PAGE=${donePage}" style="buttontext"/></container>
+                                        <container><link text="${uiLabelMap.MarketingContactListCreate}" target="EditContactList?DONE_PAGE=${donePage}" style="buttontext"/></container>
                                         <include-form name="ListContactLists" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/>
                                     </widgets>
                                 </section>
@@ -182,7 +182,7 @@
                             <container style="screenlet-body">
                                 <section>
                                     <widgets>
-                                        <container><link  text="${uiLabelMap.ContactListPartyCreate}" target="EditContactListParty?contactListId=${contactListId}&amp;DONE_PAGE=${donePage}" style="buttontext"/></container>
+                                        <container><link  text="${uiLabelMap.MarketingContactListPartyCreate}" target="EditContactListParty?contactListId=${contactListId}&amp;DONE_PAGE=${donePage}" style="buttontext"/></container>
                                         <include-form name="EditContactListParty" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/>                        
                                         <container><label style="h2" text="${uiLabelMap.CommonStatusHistory}"/></container>
                                         <iterate-section entry-name="contactListPartyStatus" list-name="contactListPartyStatusList">
@@ -228,7 +228,7 @@
                             <container style="screenlet-body">
                                 <section>
                                     <widgets>
-                                        <container><link  text="${uiLabelMap.ContactListPartyCreate}" target="EditContactListParty?contactListId=${contactListId}&amp;DONE_PAGE=${donePage}" style="buttontext"/></container>
+                                        <container><link  text="${uiLabelMap.MarketingContactListPartyCreate}" target="EditContactListParty?contactListId=${contactListId}&amp;DONE_PAGE=${donePage}" style="buttontext"/></container>
                                         <include-form name="ListContactListParties" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/>
                                     </widgets>
                                 </section>
@@ -261,7 +261,7 @@
                             <container style="screenlet-body">
                                 <section>
                                     <widgets>
-                                        <container><link  text="${uiLabelMap.ContactListPartyCreate}" target="EditContactListParty?contactListId=${contactListId}&amp;DONE_PAGE=${donePage}" style="buttontext"/></container>
+                                        <container><link  text="${uiLabelMap.MarketingContactListPartyCreate}" target="EditContactListParty?contactListId=${contactListId}&amp;DONE_PAGE=${donePage}" style="buttontext"/></container>
                                         <include-form name="FindContactListParties" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/>
                                     </widgets>
                                 </section>
@@ -300,7 +300,7 @@
                             <container style="screenlet-body">
                                 <section>
                                     <widgets>
-                                        <container><link  text="${uiLabelMap.ContactListCommEventCreate}" target="EditContactListCommEvent?contactListId=${contactListId}&amp;DONE_PAGE=${donePage}" style="buttontext"/></container>
+                                        <container><link  text="${uiLabelMap.MarketingContactListCommEventCreate}" target="EditContactListCommEvent?contactListId=${contactListId}&amp;DONE_PAGE=${donePage}" style="buttontext"/></container>
                                         <include-form name="EditContactListCommEvent" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/>
                                     </widgets>
                                 </section>
@@ -337,7 +337,7 @@
                             <container style="screenlet-body">
                                 <section>
                                     <widgets>
-                                        <container><link  text="${uiLabelMap.ContactListCommEventCreate}" target="EditContactListCommEvent?contactListId=${contactListId}&amp;DONE_PAGE=${donePage}" style="buttontext"/></container>
+                                        <container><link  text="${uiLabelMap.MarketingContactListCommEventCreate}" target="EditContactListCommEvent?contactListId=${contactListId}&amp;DONE_PAGE=${donePage}" style="buttontext"/></container>
                                         <include-form name="ListContactListCommEvents" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/>
                                     </widgets>
                                 </section>
@@ -370,7 +370,7 @@
                             <container style="screenlet-body">
                                 <section>
                                     <widgets>
-                                        <container><link  text="${uiLabelMap.ContactListCommEventCreate}" target="EditContactListCommEvent?contactListId=${contactListId}&amp;DONE_PAGE=${donePage}" style="buttontext"/></container>
+                                        <container><link  text="${uiLabelMap.MarketingContactListCommEventCreate}" target="EditContactListCommEvent?contactListId=${contactListId}&amp;DONE_PAGE=${donePage}" style="buttontext"/></container>
                                         <include-form name="FindContactListCommEvents" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/>
                                     </widgets>
                                 </section>