Index: applications/ecommerce/config/EcommerceUiLabels.xml
===================================================================
--- applications/ecommerce/config/EcommerceUiLabels.xml	(revision 729636)
+++ applications/ecommerce/config/EcommerceUiLabels.xml	(working copy)
@@ -19,18 +19,6 @@
     under the License.
 -->
 <resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <property key="CommonDigitalProductUpload">
-        <value xml:lang="de">Digitales Produkt hochladen</value>
-        <value xml:lang="en">Digital Product Upload</value>
-        <value xml:lang="es">carga de productos digitales</value>
-        <value xml:lang="fr">Téléchargement du produit numérique vers le serveur</value>
-        <value xml:lang="hi_IN">अंकीय फल अपलोड</value>
-        <value xml:lang="it">Upload prodotto digitale</value>
-        <value xml:lang="ro">Upload Produs Digital</value>
-        <value xml:lang="ru">–ó–∞–≥—Ä—É–∑–∫–∞ —Ü–∏—Ñ—Ä–æ–≤–æ–π –ø—Ä–æ–¥—É–∫—Ü–∏–∏</value>
-        <value xml:lang="th">โหลดสินค้าดิจิตัล</value>
-        <value xml:lang="zh">数字产品上传</value>
-    </property>
     <property key="CommonLessThan">
         <value xml:lang="de">weniger als</value>
         <value xml:lang="en">less than</value>
@@ -59,64 +47,6 @@
         <value xml:lang="ru">–±–æ–ª—å—à–µ —á–µ–º</value>
         <value xml:lang="th">มากกว่า</value>
     </property>
-    <property key="CommonNewListSubscription">
-        <value xml:lang="de">Neue Liste abonnieren</value>
-        <value xml:lang="en">New List Subscription</value>
-        <value xml:lang="es">Nueva lista de subscripción</value>
-        <value xml:lang="fr">Nouvelle liste de souscription</value>
-        <value xml:lang="it">Nuova lista di sottoscrizione</value>
-        <value xml:lang="ro">Noua Lista Subscriere </value>
-        <value xml:lang="ru">–ù–æ–≤–∞—è –ø–æ–¥–ø–∏—Å–∫–∞ –Ω–∞ —Ä–∞—Å—Å—ã–ª–∫—É</value>
-        <value xml:lang="th">รายการสั่งซื้อใหม่</value>
-        <value xml:lang="zh">新注册列表</value>
-    </property>
-    <property key="CommonSubscribe">
-        <value xml:lang="de">Abonnieren</value>
-        <value xml:lang="en">Subscribe</value>
-        <value xml:lang="es">Subscricir</value>
-        <value xml:lang="fr">S'inscrire</value>
-        <value xml:lang="it">Sottoscrivi</value>
-        <value xml:lang="ro">Subscrie </value>
-        <value xml:lang="ru">–ü–æ–¥–ø–∏—Å–∞—Ç—å—Å—è</value>
-        <value xml:lang="th">ชำระค่าสั่งซื้อ</value>
-        <value xml:lang="zh">注册</value>
-    </property>
-    <property key="CommonUnknown">
-        <value xml:lang="de">Unbekannt</value>
-        <value xml:lang="en">Unknown</value>
-        <value xml:lang="fr">Inconnu</value>
-        <value xml:lang="it">Sconosciuto</value>
-        <value xml:lang="th">ไม่ทราบ</value>
-    </property>
-    <property key="CommonUnsubscribe">
-        <value xml:lang="de">Abonnement beenden</value>
-        <value xml:lang="en">Unsubscribe</value>
-        <value xml:lang="es">des-Subscribir</value>
-        <value xml:lang="fr">Se désinscrire</value>
-        <value xml:lang="it">Annulla sottoscrizione</value>
-        <value xml:lang="ro">Sterge Subscrierea</value>
-        <value xml:lang="ru">–û—Ç–º–µ–Ω–∏—Ç—å –ø–æ–¥–ø–∏—Å–∫—É</value>
-        <value xml:lang="th">ไม่ได้ชำระค่าสั่งซื้อ</value>
-        <value xml:lang="zh">注销</value>
-    </property>
-    <property key="CommonVerifySubscription">
-        <value xml:lang="de">Abonnement prüfn</value>
-        <value xml:lang="en">Verify Subscription</value>
-        <value xml:lang="es">Verificar subscripción</value>
-        <value xml:lang="fr">Vérifier son inscription</value>
-        <value xml:lang="it">Verifica sottoscrizione</value>
-        <value xml:lang="ro">Verifica Subscrierea</value>
-        <value xml:lang="ru">–ü—Ä–æ–≤–µ—Ä–∏—Ç—å –ø–æ–¥–ø–∏—Å–∫—É</value>
-        <value xml:lang="th">ตรวจสอบการชำระค่าสั่งซื้อ</value>
-        <value xml:lang="zh">验证注册</value>
-    </property>
-    <property key="CommonYour">
-        <value xml:lang="de">Ihr</value>
-        <value xml:lang="en">your</value>
-        <value xml:lang="fr">Votre</value>
-        <value xml:lang="it">tuo</value>
-        <value xml:lang="th">ของคุณ</value>
-    </property>
     <property key="EcommerceAccountLogin">
         <value xml:lang="de">Ihre Benutzeranmeldung ist:</value>
         <value xml:lang="en">Your account login is:</value>
@@ -635,6 +565,18 @@
         <value xml:lang="th">ข้อมูลค่าคอมมิชชั่นในการสั่งซื้อสินค้าดิจิตัล</value>
         <value xml:lang="zh">数字产品购买历史记录和佣金</value>
     </property>
+    <property key="EcommerceDigitalProductUpload">
+        <value xml:lang="de">Digitales Produkt hochladen</value>
+        <value xml:lang="en">Digital Product Upload</value>
+        <value xml:lang="es">carga de productos digitales</value>
+        <value xml:lang="fr">Téléchargement du produit numérique vers le serveur</value>
+        <value xml:lang="hi_IN">अंकीय फल अपलोड</value>
+        <value xml:lang="it">Upload prodotto digitale</value>
+        <value xml:lang="ro">Upload Produs Digital</value>
+        <value xml:lang="ru">–ó–∞–≥—Ä—É–∑–∫–∞ —Ü–∏—Ñ—Ä–æ–≤–æ–π –ø—Ä–æ–¥—É–∫—Ü–∏–∏</value>
+        <value xml:lang="th">โหลดสินค้าดิจิตัล</value>
+        <value xml:lang="zh">数字产品上传</value>
+    </property>
     <property key="EcommerceDownloadNotFound">
         <value xml:lang="de">Datei zum Herunterladen nicht gefunden</value>
         <value xml:lang="en">Download Not Found</value>
@@ -1607,6 +1549,17 @@
         <value xml:lang="th">บัญชีธนาคารใหม่</value>
         <value xml:lang="zh">新建电子资金转账账户</value>
     </property>
+    <property key="EcommerceNewListSubscription">
+        <value xml:lang="de">Neue Liste abonnieren</value>
+        <value xml:lang="en">New List Subscription</value>
+        <value xml:lang="es">Nueva lista de subscripción</value>
+        <value xml:lang="fr">Nouvelle liste de souscription</value>
+        <value xml:lang="it">Nuova lista di sottoscrizione</value>
+        <value xml:lang="ro">Noua Lista Subscriere </value>
+        <value xml:lang="ru">–ù–æ–≤–∞—è –ø–æ–¥–ø–∏—Å–∫–∞ –Ω–∞ —Ä–∞—Å—Å—ã–ª–∫—É</value>
+        <value xml:lang="th">รายการสั่งซื้อใหม่</value>
+        <value xml:lang="zh">新注册列表</value>
+    </property>
     <property key="EcommerceNoDigitalProductsFound">
         <value xml:lang="de">Keine digitalen Produkte gefunden</value>
         <value xml:lang="en">No Digital Products Found</value>
@@ -2527,6 +2480,17 @@
         <value xml:lang="th">หัวข้อ</value>
         <value xml:lang="zh">主题</value>
     </property>
+    <property key="EcommerceSubscribe">
+        <value xml:lang="de">Abonnieren</value>
+        <value xml:lang="en">Subscribe</value>
+        <value xml:lang="es">Subscricir</value>
+        <value xml:lang="fr">S'inscrire</value>
+        <value xml:lang="it">Sottoscrivi</value>
+        <value xml:lang="ro">Subscrie </value>
+        <value xml:lang="ru">–ü–æ–¥–ø–∏—Å–∞—Ç—å—Å—è</value>
+        <value xml:lang="th">ชำระค่าสั่งซื้อ</value>
+        <value xml:lang="zh">注册</value>
+    </property>
     <property key="EcommerceSummary">
         <value xml:lang="de">Zusammenfassung</value>
         <value xml:lang="en">Summary</value>
@@ -2706,6 +2670,17 @@
         <value xml:lang="th">ราคาต่อหน่วย</value>
         <value xml:lang="zh">单价</value>
     </property>
+    <property key="EcommerceUnsubscribe">
+        <value xml:lang="de">Abonnement beenden</value>
+        <value xml:lang="en">Unsubscribe</value>
+        <value xml:lang="es">des-Subscribir</value>
+        <value xml:lang="fr">Se désinscrire</value>
+        <value xml:lang="it">Annulla sottoscrizione</value>
+        <value xml:lang="ro">Sterge Subscrierea</value>
+        <value xml:lang="ru">–û—Ç–º–µ–Ω–∏—Ç—å –ø–æ–¥–ø–∏—Å–∫—É</value>
+        <value xml:lang="th">ไม่ได้ชำระค่าสั่งซื้อ</value>
+        <value xml:lang="zh">注销</value>
+    </property>
     <property key="EcommerceUnsupportedQuestionType">
         <value xml:lang="de">Nicht unterstützter Fragetyp</value>
         <value xml:lang="en">Unsupported Question Type</value>
@@ -2789,6 +2764,17 @@
         <value xml:lang="th">เปลี่ยนแปลงสู่ตะกร้า</value>
         <value xml:lang="zh">的选择到购物车</value>
     </property>
+    <property key="EcommerceVerifySubscription">
+        <value xml:lang="de">Abonnement prüfn</value>
+        <value xml:lang="en">Verify Subscription</value>
+        <value xml:lang="es">Verificar subscripción</value>
+        <value xml:lang="fr">Vérifier son inscription</value>
+        <value xml:lang="it">Verifica sottoscrizione</value>
+        <value xml:lang="ro">Verifica Subscrierea</value>
+        <value xml:lang="ru">–ü—Ä–æ–≤–µ—Ä–∏—Ç—å –ø–æ–¥–ø–∏—Å–∫—É</value>
+        <value xml:lang="th">ตรวจสอบการชำระค่าสั่งซื้อ</value>
+        <value xml:lang="zh">验证注册</value>
+    </property>
     <property key="EcommerceViewAll">
         <value xml:lang="de">Alle anzeigen</value>
         <value xml:lang="en">View All</value>
@@ -2905,6 +2891,13 @@
         <value xml:lang="th">สิ่งที่น่าสนใจ</value>
         <value xml:lang="zh">你可能会喜欢</value>
     </property>
+    <property key="EcommerceYour">
+        <value xml:lang="de">Ihr</value>
+        <value xml:lang="en">your</value>
+        <value xml:lang="fr">Votre</value>
+        <value xml:lang="it">tuo</value>
+        <value xml:lang="th">ของคุณ</value>
+    </property>
     <property key="EcommerceYourCardNumber">
         <value xml:lang="de">Ihre Kartennummer:</value>
         <value xml:lang="en">Your Card Number</value>
Index: applications/securityext/email/default/passwordemail.ftl
===================================================================
--- applications/securityext/email/default/passwordemail.ftl	(revision 729636)
+++ applications/securityext/email/default/passwordemail.ftl	(working copy)
@@ -21,7 +21,7 @@
 <head>
 </head>
 <body>
-  <div>${uiLabelMap.EcommerceThisEmailIsInResponseToYourRequestToHave} <#if useEncryption>${uiLabelMap.EcommerceANew}<#else>${uiLabelMap.CommonYour}</#if> ${uiLabelMap.EcommercePasswordSentToYou}.</div>
+  <div>${uiLabelMap.EcommerceThisEmailIsInResponseToYourRequestToHave} <#if useEncryption>${uiLabelMap.EcommerceANew}<#else>${uiLabelMap.EcommerceYour}</#if> ${uiLabelMap.EcommercePasswordSentToYou}.</div>
   <br/>
   <div>
       <#if useEncryption>
Index: applications/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl
===================================================================
--- applications/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl	(revision 729636)
+++ applications/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl	(working copy)
@@ -48,7 +48,7 @@
                         </#list>

                     </select>

 

-                    <input type="submit" value="${uiLabelMap.CommonSubscribe}" class="smallSubmit"/>

+                    <input type="submit" value="${uiLabelMap.EcommerceSubscribe}" class="smallSubmit"/>

                 </form>

             <#else>

                 <#-- Not logged in so ask them to log in and then sign up or clear the user association -->

@@ -62,7 +62,7 @@
                 <span class="tabletext">${uiLabelMap.EcommerceSignUpForContactListComments}</span>

                 <@contactList publicEmailContactLists=publicEmailContactLists/>

                 <input size="20" maxlength="255" name="email" class="inputBox" value="" type="text">

-                <input type="submit" value="${uiLabelMap.CommonSubscribe}" class="smallSubmit"/>

+                <input type="submit" value="${uiLabelMap.EcommerceSubscribe}" class="smallSubmit"/>

             </form>

         </#if>

     </div>

Index: applications/ecommerce/webapp/ecommerce/customer/viewprofile.ftl
===================================================================
--- applications/ecommerce/webapp/ecommerce/customer/viewprofile.ftl	(revision 729636)
+++ applications/ecommerce/webapp/ecommerce/customer/viewprofile.ftl	(working copy)
@@ -41,7 +41,7 @@
         <a href="<@ofbizUrl>viewprofile?SHOW_OLD=true</@ofbizUrl>" class="buttontext">${uiLabelMap.PartyShowOld}</a>&nbsp;&nbsp;
       </#if>
       <#if (productStore.enableDigProdUpload)?if_exists == "Y">
-      &nbsp;<a href="<@ofbizUrl>digitalproductlist</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDigitalProductUpload}</a>
+      &nbsp;<a href="<@ofbizUrl>digitalproductlist</@ofbizUrl>" class="buttontext">${uiLabelMap.EcommerceDigitalProductUpload}</a>
       </#if>
     </td>
   </tr>
@@ -493,7 +493,7 @@
               <td width="5">&nbsp;</td>
               <td width="20%" nowrap>
               <#if (contactListParty.statusId?if_exists == "CLPT_ACCEPTED")>
-                <a href="<@ofbizUrl>updateContactListParty?partyId=${party.partyId}&amp;contactListId=${contactListParty.contactListId}&amp;fromDate=${contactListParty.fromDate}&amp;statusId=CLPT_REJECTED</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonUnsubscribe}</a>
+                <a href="<@ofbizUrl>updateContactListParty?partyId=${party.partyId}&amp;contactListId=${contactListParty.contactListId}&amp;fromDate=${contactListParty.fromDate}&amp;statusId=CLPT_REJECTED</@ofbizUrl>" class="buttontext">${uiLabelMap.EcommerceUnsubscribe}</a>
               <#elseif (contactListParty.statusId?if_exists == "CLPT_PENDING")>
                 <form method="post" action="<@ofbizUrl>updateContactListParty</@ofbizUrl>" name="clistAcceptForm${contactListParty_index}">
                   <input type="hidden" name="partyId" value="${party.partyId}"/>
@@ -501,10 +501,10 @@
                   <input type="hidden" name="fromDate" value="${contactListParty.fromDate}"/>
                   <input type="hidden" name="statusId" value="CLPT_ACCEPTED"/>
                   <input type="text" size="10" name="optInVerifyCode" value="" class="inputBox"/>
-                  <input type="submit" value="${uiLabelMap.CommonVerifySubscription}" class="smallSubmit"/>
+                  <input type="submit" value="${uiLabelMap.EcommerceVerifySubscription}" class="smallSubmit"/>
                 </form>
               <#elseif (contactListParty.statusId?if_exists == "CLPT_REJECTED")>
-                <a href="<@ofbizUrl>updateContactListParty?partyId=${party.partyId}&amp;contactListId=${contactListParty.contactListId}&amp;fromDate=${contactListParty.fromDate}&amp;statusId=CLPT_PENDING</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonSubscribe}</a>
+                <a href="<@ofbizUrl>updateContactListParty?partyId=${party.partyId}&amp;contactListId=${contactListParty.contactListId}&amp;fromDate=${contactListParty.fromDate}&amp;statusId=CLPT_PENDING</@ofbizUrl>" class="buttontext">${uiLabelMap.EcommerceSubscribe}</a>
               </#if>
               </td>
             </tr>
@@ -515,7 +515,7 @@
           <form method="post" action="<@ofbizUrl>createContactListParty</@ofbizUrl>" name="clistPendingForm">
             <input type="hidden" name="partyId" value="${party.partyId}"/>
             <input type="hidden" name="statusId" value="CLPT_PENDING"/>
-            <span class="tableheadtext">${uiLabelMap.CommonNewListSubscription}: </span>
+            <span class="tableheadtext">${uiLabelMap.EcommerceNewListSubscription}: </span>
             <select name="contactListId" class="selectBox">
               <#list publicContactLists as publicContactList>
                 <#-- <#assign publicContactListType = publicContactList.getRelatedOneCache("ContactListType")> -->
@@ -529,7 +529,7 @@
                 <option value="${partyAndContactMech.contactMechId}"><#if partyAndContactMech.infoString?has_content>${partyAndContactMech.infoString}<#elseif partyAndContactMech.tnContactNumber?has_content>${partyAndContactMech.tnCountryCode?if_exists}-${partyAndContactMech.tnAreaCode?if_exists}-${partyAndContactMech.tnContactNumber}<#elseif partyAndContactMech.paAddress1?has_content>${partyAndContactMech.paAddress1}, ${partyAndContactMech.paAddress2?if_exists}, ${partyAndContactMech.paCity?if_exists}, ${partyAndContactMech.paStateProvinceGeoId?if_exists}, ${partyAndContactMech.paPostalCode?if_exists}, ${partyAndContactMech.paPostalCodeExt?if_exists} ${partyAndContactMech.paCountryGeoId?if_exists}</#if></option>
               </#list>
             </select>
-            <input type="submit" value="${uiLabelMap.CommonSubscribe}" class="smallSubmit"/>
+            <input type="submit" value="${uiLabelMap.EcommerceSubscribe}" class="smallSubmit"/>
           </form>
         </div>
         <div class="tabletext">