Index: applications/ecommerce/config/EcommerceUiLabels.xml
===================================================================
--- applications/ecommerce/config/EcommerceUiLabels.xml	(revision 655353)
+++ applications/ecommerce/config/EcommerceUiLabels.xml	(working copy)
@@ -1025,68 +1025,89 @@
         <value xml:lang="th">‡∏Ç‡∏≠‡∏á‡∏Ñ‡∏∏‡∏ì</value>
     </property>
     <property key="EcommerceAccountLogin">
-        <value xml:lang="en">Account Login</value>
-        <value xml:lang="fr">Compte identifiant</value>
+        <value xml:lang="en">Your account login is:</value>
+        <value xml:lang="es">Usuario</value>
+        <value xml:lang="fr">Votre identifiant est :</value>
         <value xml:lang="hi_IN">‡§Ü‡§™‡§ï‡§æ ‡§™‡•ç‡§∞‡§µ‡•á‡§∂ ‡§ñ‡§º‡§æ‡§§‡§æ ‡§π‡•à:</value>
+        <value xml:lang="it">Il tuo utente √® :</value>
         <value xml:lang="ja">Your account login is:</value>
-        <value xml:lang="th">‡∏ä‡∏∑‡πà‡∏≠‡∏ú‡∏π‡πâ‡πÄ‡∏Ç‡πâ‡∏≤‡∏™‡∏π‡πà‡∏£‡∏∞‡∏ö‡∏ö</value>
+        <value xml:lang="nl">Uw loginnaam is:</value>
+        <value xml:lang="ro">Utilizatorul logat este :</value>
+        <value xml:lang="ru">–í–∞—à–µ –∏–º—è –¥–ª—è —É—á–µ—Ç–Ω–æ–π –∑–∞–ø–∏—Å–∏:</value>
+        <value xml:lang="th">‡∏ö‡∏±‡∏ç‡∏ä‡∏µ‡∏Ç‡∏≠‡∏á‡∏Ñ‡∏∏‡∏ì‡∏•‡∏≠‡∏Å‡∏≠‡∏¥‡∏ô‡πÄ‡∏Ç‡πâ‡∏≤‡∏™‡∏π‡πà‡∏£‡∏∞‡∏ö‡∏ö‡∏Ñ‡∏∑‡∏≠</value>
+        <value xml:lang="zh">‰Ω†ÁôªÂΩïÁöÑË¥¶Êà∑ÊòØÔºö</value>
     </property>
     <property key="EcommerceActive">
         <value xml:lang="cs">V√°≈° E-mail</value>
+        <value xml:lang="de">Aktiv</value>
         <value xml:lang="en">Active</value>
+        <value xml:lang="es">Activo</value>
         <value xml:lang="fr">Actif</value>
         <value xml:lang="hi_IN">‡§∏‡§ï‡•ç‡§∞‡§ø‡§Ø</value>
+        <value xml:lang="it">Attivo</value>
         <value xml:lang="ja">Active</value>
-        <value xml:lang="th">‡∏õ‡∏è‡∏¥‡∏ö‡∏±‡∏ï‡∏¥</value>
+        <value xml:lang="nl">Aktief</value>
+        <value xml:lang="ro">Activ</value>
+        <value xml:lang="ru">–ê–∫—Ç–∏–≤–Ω—ã–π</value>
+        <value xml:lang="th">‡∏ó‡∏≥‡∏á‡∏≤‡∏ô‡∏≠‡∏¢‡∏π‡πà</value>
+        <value xml:lang="zh">ÊúâÊïà</value>
     </property>
-    <property key="EcommerceAddAlltoCart">
-        <value xml:lang="cs">P≈ôidat v≈°echno do ko≈°√≠ku</value>
-        <value xml:lang="en">Add All to Cart</value>
-        <value xml:lang="fr">Tout ajouter au panier</value>
-        <value xml:lang="en_GB">Add All to basket</value>
-        <value xml:lang="hi_IN">‡§∏‡§≠‡•Ä ‡§ï‡•ã ‡§ü‡•ã‡§ï‡§∞‡•Ä ‡§Æ‡•á‡§Ç ‡§°‡§æ‡§≤‡•á‡§Ç</value>
-        <value xml:lang="ja">Add All to Cart</value>
-        <value xml:lang="th">‡πÄ‡∏û‡∏¥‡πà‡∏°‡∏£‡∏≤‡∏¢‡∏Å‡∏≤‡∏£‡∏ó‡∏±‡πâ‡∏á‡∏´‡∏°‡∏î‡∏•‡∏á‡∏ï‡∏∞‡∏Å‡∏£‡πâ‡∏≤</value>
-    </property>
-    <property key="EcommerceAddCheckedToCart">
-        <value xml:lang="cs">p≈ôidat vybran√© do ko≈°√≠ku</value>
-        <value xml:lang="en">Add Checked To Cart</value>
-        <value xml:lang="fr">Ajouter la s√©lection au panier</value>
-        <value xml:lang="en_GB">Add selected to basket</value>
-        <value xml:lang="hi_IN">‡§∏‡§π‡•Ä ‡§®‡§ø‡§∂‡§æ‡§® ‡§µ‡§æ‡§≤‡•á ‡§ï‡•ã ‡§ü‡•ã‡§ï‡§∞‡•Ä ‡§Æ‡•á‡§Ç ‡§°‡§æ‡§≤‡•á‡§Ç</value>
-        <value xml:lang="ja">Add Checked to Cart</value>
-        <value xml:lang="th">‡πÄ‡∏û‡∏¥‡πà‡∏°‡∏£‡∏≤‡∏¢‡∏Å‡∏≤‡∏£‡∏ó‡∏µ‡πà‡πÄ‡∏•‡∏∑‡∏≠‡∏Å‡∏•‡∏á‡∏ï‡∏∞‡∏Å‡∏£‡πâ‡∏≤</value>
-    </property>
     <property key="EcommerceAddChildListsToCart">
         <value xml:lang="cs">P≈ôidejte tento seznam a dal≈°√≠ seznam(-y) do ko≈°√≠ku</value>
-        <value xml:lang="en">Add Child Lists To Cart</value>
-        <value xml:lang="fr">Ajouter les sous-listes au panier</value>
+        <value xml:lang="de">F√ºgen Sie diese Liste mit Unterliste(n) zum Warenkorb hinzu</value>
+        <value xml:lang="en">Add This List And Child List(s) To Cart</value>
         <value xml:lang="en_GB">Add This List And Child List(s) To basket</value>
+        <value xml:lang="es">A√±adir listas hijas al carro</value>
+        <value xml:lang="fr">Ajouter la liste et sous liste(s) au panier</value>
         <value xml:lang="hi_IN">‡§á‡§∏ ‡§™‡•Ç‡§∞‡•Ä ‡§∏‡•Ç‡§ö‡•Ä ‡§ï‡•ã ‡§ü‡•ã‡§ï‡§∞‡•Ä ‡§Æ‡•á‡§Ç ‡§°‡§æ‡§≤‡•á‡§Ç</value>
+        <value xml:lang="it">Aggiungi Questa Lista e la(e) Lista(e) Figlie al Carrello</value>
         <value xml:lang="ja">Add This List And Child List(s) To Cart</value>
-        <value xml:lang="th">‡πÄ‡∏û‡∏¥‡πà‡∏°‡∏£‡∏≤‡∏¢‡∏Å‡∏≤‡∏£‡∏™‡∏¥‡∏ô‡∏Ñ‡πâ‡∏≤‡πÄ‡∏î‡πá‡∏Å‡∏•‡∏á‡∏ï‡∏∞‡∏Å‡∏£‡πâ‡∏≤</value>
+        <value xml:lang="nl">Voeg deze (sub)lijsten toe aan de winkelwagen</value>
+        <value xml:lang="pt_PT">Adicionar Esta Lista E Sua(s) Derivada(s) Ao Cesto</value>
+        <value xml:lang="ro">Adauga Aceasta Lista si Lista(le) Fica(e) in Cos</value>
+        <value xml:lang="ru">–î–æ–±–∞–≤–∏—Ç—å —ç—Ç–æ—Ç –∏ –ø–æ–¥—á–∏–Ω–µ–Ω–Ω—ã–π —Å–ø–∏—Å–æ–∫(–∫–∏) –≤ –∫–æ—Ä–∑–∏–Ω—É</value>
+        <value xml:lang="th">‡πÄ‡∏û‡∏¥‡πà‡∏°‡∏£‡∏≤‡∏¢‡∏Å‡∏≤‡∏£‡∏ô‡∏µ‡πâ‡πÅ‡∏•‡∏∞‡∏£‡∏≤‡∏¢‡∏Å‡∏≤‡∏£‡πÄ‡∏î‡πá‡∏Å‡∏•‡∏á‡∏ï‡∏£‡∏∞‡∏Å‡∏£‡πâ‡∏≤</value>
+        <value xml:lang="zh">ÊääËøô‰∏™ÂàóË°®ÂèäÂ≠êÂàóË°®ÊîæÂÖ•Ë¥≠Áâ©ËΩ¶</value>
     </property>
     <property key="EcommerceAddListToCart">
         <value xml:lang="cs">P≈ôidat seznam do ko≈°√≠ku</value>
+        <value xml:lang="de">Liste zum Warenkorb hinzuf√ºgen</value>
         <value xml:lang="en">Add List To Cart</value>
+        <value xml:lang="en_GB">Add List To basket</value>
+        <value xml:lang="es">A√±adir lista al carro</value>
         <value xml:lang="fr">Ajouter la liste au panier</value>
-        <value xml:lang="en_GB">Add List To basket</value>
         <value xml:lang="hi_IN">‡§∏‡•Ç‡§ö‡•Ä ‡§ï‡•ã ‡§ü‡•ã‡§ï‡§∞‡•Ä ‡§Æ‡•á‡§Ç ‡§°‡§æ‡§≤‡•á‡§Ç</value>
+        <value xml:lang="it">Aggiungi Lista al Carrello</value>
         <value xml:lang="ja">Add List To Cart</value>
-        <value xml:lang="th">‡πÄ‡∏û‡∏¥‡πà‡∏°‡∏£‡∏≤‡∏¢‡∏Å‡∏≤‡∏£‡∏•‡∏á‡∏ï‡∏∞‡∏Å‡∏£‡πâ‡∏≤</value>
+        <value xml:lang="nl">Voeg deze Lijst toe aan de winkelwagen</value>
+        <value xml:lang="pt_PT">Adicionar Lista Ao Cesto</value>
+        <value xml:lang="ro">Adauga Lista la Cos</value>
+        <value xml:lang="ru">–î–æ–±–∞–≤–∏—Ç—å —Å–ø–∏—Å–æ–∫ –≤ –∫–æ—Ä–∑–∏–Ω—É</value>
+        <value xml:lang="th">‡πÄ‡∏û‡∏¥‡πà‡∏°‡∏£‡∏≤‡∏¢‡∏Å‡∏≤‡∏£‡∏•‡∏á‡∏ï‡∏£‡∏∞‡∏Å‡∏£‡πâ‡∏≤</value>
+        <value xml:lang="zh">ÊääÂàóË°®ÊîæÂÖ•Ë¥≠Áâ©ËΩ¶</value>
     </property>
     <property key="EcommerceAddNewDigitalProduct">
         <value xml:lang="en">Add New Digital Product</value>
         <value xml:lang="fr">Ajouter le nouveau produit num√©rique</value>
         <value xml:lang="hi_IN">‡§®‡§Ø‡•Ä ‡§°‡§ø‡§ú‡•Ä‡§ü‡§≤ ‡§´‡§≤ ‡§ú‡•ã‡§°‡•á‡§Ç</value>
+        <value xml:lang="it">Aggiungi Nuovo Prodotto Digitale</value>
+        <value xml:lang="ro">Adauga Nou Produs Digital</value>
+        <value xml:lang="ru">–î–æ–±–∞–≤–∏—Ç—å –Ω–æ–≤—ã–π —Ü–∏—Ñ—Ä–æ–≤–æ–π –ø—Ä–æ–¥—É–∫—Ç</value>
         <value xml:lang="th">‡πÄ‡∏û‡∏¥‡πà‡∏°‡∏™‡∏¥‡∏ô‡∏Ñ‡πâ‡∏≤‡∏î‡∏¥‡∏à‡∏¥‡∏ï‡∏±‡∏•‡πÉ‡∏´‡∏°‡πà</value>
+        <value xml:lang="zh">Êñ∞Âª∫Êï∞Â≠ó‰∫ßÂìÅ</value>
     </property>
     <property key="EcommerceAddResponseFor">
         <value xml:lang="en">Add Response For</value>
+        <value xml:lang="es">A√±adir respuesta para</value>
         <value xml:lang="fr">Ajouter la r√©ponse pour</value>
         <value xml:lang="hi_IN">‡§â‡§§‡•ç‡§§‡§∞ ‡§ú‡•ã‡§°‡•á‡§Ç</value>
+        <value xml:lang="it">Aggiungi risponste per</value>
         <value xml:lang="ja">Add response for</value>
+        <value xml:lang="nl">Voeg antwoord toe aan</value>
+        <value xml:lang="ro">Adauga raspunsuri pentru EcommerceAddSelectedtoList=Adauga Selectionat La Lista</value>
+        <value xml:lang="ru">–î–æ–±–∞–≤–∏—Ç—å –æ—Ç–≤–µ—Ç –Ω–∞</value>
         <value xml:lang="th">‡πÄ‡∏û‡∏¥‡πà‡∏°‡∏Ñ‡∏≥‡∏ï‡∏≠‡∏ö‡∏™‡∏≥‡∏´‡∏£‡∏±‡∏ö</value>
+        <value xml:lang="zh">Êñ∞Âª∫Á≠îÊ°àÁî®‰∫é</value>
     </property>
     <property key="EcommerceAddSelectedtoList">
         <value xml:lang="cs">P≈ôidat vybran√© do seznamu</value>
@@ -1144,6 +1165,12 @@
         <value xml:lang="ja">Always view cart after adding an item</value>
         <value xml:lang="th">‡∏î‡∏π‡∏£‡∏≤‡∏¢‡∏Å‡∏≤‡∏£‡πÉ‡∏ô‡∏ï‡∏∞‡∏Å‡∏£‡πâ‡∏≤‡∏´‡∏•‡∏±‡∏á‡∏à‡∏≤‡∏Å‡πÄ‡∏û‡∏¥‡πà‡∏°‡∏™‡∏¥‡∏ô‡∏Ñ‡πâ‡∏≤‡πÄ‡∏™‡∏°‡∏≠</value>
     </property>
+    <property key="EcommerceANew">
+        <value xml:lang="en">a new</value>
+        <value xml:lang="fr">un nouvel</value>
+        <value xml:lang="it">una nuova</value>
+        <value xml:lang="th">‡πÉ‡∏´‡∏°‡πà</value>
+    </property>
     <property key="EcommerceAnonymous">
         <value xml:lang="cs">anonymn√≠</value>
         <value xml:lang="en">Anonymous</value>
Index: applications/ecommerce/webapp/ecommerce/order/orderitems.ftl
===================================================================
--- applications/ecommerce/webapp/ecommerce/order/orderitems.ftl	(revision 655353)
+++ applications/ecommerce/webapp/ecommerce/order/orderitems.ftl	(working copy)
@@ -27,7 +27,7 @@
             <#assign numColumns = 8>
             <#if maySelectItems?default("N") == "Y" && roleTypeId?if_exists == "PLACING_CUSTOMER">
                 <#assign numColumns = 11>
-                <a href="javascript:document.addCommonToCartForm.add_all.value='true';document.addCommonToCartForm.submit()" class="submenutext">${uiLabelMap.EcommerceAddAlltoCart}</a><a href="javascript:document.addCommonToCartForm.add_all.value='false';document.addCommonToCartForm.submit()" class="submenutext">${uiLabelMap.EcommerceAddCheckedToCart}</a><a href="<@ofbizUrl>createShoppingListFromOrder?orderId=${orderHeader.orderId}&frequency=6&intervalNumber=1&shoppingListTypeId=SLT_AUTO_REODR</@ofbizUrl>" class="submenutextright">${uiLabelMap.OrderSendMeThisEveryMonth}</a>
+                <a href="javascript:document.addCommonToCartForm.add_all.value='true';document.addCommonToCartForm.submit()" class="submenutext">${uiLabelMap.OrderAddAllToCart}</a><a href="javascript:document.addCommonToCartForm.add_all.value='false';document.addCommonToCartForm.submit()" class="submenutext">${uiLabelMap.OrderAddCheckedToCart}</a><a href="<@ofbizUrl>createShoppingListFromOrder?orderId=${orderHeader.orderId}&frequency=6&intervalNumber=1&shoppingListTypeId=SLT_AUTO_REODR</@ofbizUrl>" class="submenutextright">${uiLabelMap.OrderSendMeThisEveryMonth}</a>
             </#if>
         </div>
         <div class="boxhead">&nbsp; ${uiLabelMap.OrderOrderItems}</div>
Index: applications/ecommerce/webapp/ecommerce/order/requestreturn.ftl
===================================================================
--- applications/ecommerce/webapp/ecommerce/order/requestreturn.ftl	(revision 655353)
+++ applications/ecommerce/webapp/ecommerce/order/requestreturn.ftl	(working copy)
@@ -21,7 +21,7 @@
     <div class="screenlet-header">
         <div class="boxlink">
           <#if maySelectItems?default(false)>
-              <a href="javascript:document.addCommonToCartForm.add_all.value='true';document.addCommonToCartForm.submit()" class="submenutext">${uiLabelMap.EcommerceAddAlltoCart}</a><a href="javascript:document.addCommonToCartForm.add_all.value='false';document.addCommonToCartForm.submit()" class="submenutextright">${uiLabelMap.EcommerceAddCheckedToCart}</a>
+              <a href="javascript:document.addCommonToCartForm.add_all.value='true';document.addCommonToCartForm.submit()" class="submenutext">${uiLabelMap.OrderAddAllToCart}</a><a href="javascript:document.addCommonToCartForm.add_all.value='false';document.addCommonToCartForm.submit()" class="submenutextright">${uiLabelMap.OrderAddCheckedToCart}</a>
           </#if>
         </div>
         <div class="boxhead">&nbsp;${uiLabelMap.OrderReturnItems}</div>
Index: applications/order/config/OrderUiLabels.xml
===================================================================
--- applications/order/config/OrderUiLabels.xml	(revision 655353)
+++ applications/order/config/OrderUiLabels.xml	(working copy)
@@ -196,111 +196,6 @@
         <value xml:lang="en">Added item to order: </value>
         <value xml:lang="fr">Article ajout√© √† la commande : </value>
     </property>
-    <property key="EcommerceANew">
-        <value xml:lang="en">a new</value>
-        <value xml:lang="fr">un nouvel</value>
-        <value xml:lang="th">‡πÉ‡∏´‡∏°‡πà</value>
-    </property>
-    <property key="EcommerceAccountLogin">
-        <value xml:lang="en">Your account login is:</value>
-        <value xml:lang="es">Usuario</value>
-        <value xml:lang="fr">Votre identifiant est :</value>
-        <value xml:lang="it">Il tuo utente loggato √® :</value>
-        <value xml:lang="nl">Uw loginnaam is:</value>
-        <value xml:lang="ro">Utilizatorul logat este :</value>
-        <value xml:lang="ru">–í–∞—à–µ –∏–º—è –¥–ª—è —É—á–µ—Ç–Ω–æ–π –∑–∞–ø–∏—Å–∏:</value>
-        <value xml:lang="th">‡∏ö‡∏±‡∏ç‡∏ä‡∏µ‡∏Ç‡∏≠‡∏á‡∏Ñ‡∏∏‡∏ì‡∏•‡∏≠‡∏Å‡∏≠‡∏¥‡∏ô‡πÄ‡∏Ç‡πâ‡∏≤‡∏™‡∏π‡πà‡∏£‡∏∞‡∏ö‡∏ö‡∏Ñ‡∏∑‡∏≠</value>
-        <value xml:lang="zh">‰Ω†ÁôªÂΩïÁöÑË¥¶Êà∑ÊòØÔºö</value>
-    </property>
-    <property key="EcommerceActive">
-        <value xml:lang="de">Aktiv</value>
-        <value xml:lang="en">Active</value>
-        <value xml:lang="es">Activo</value>
-        <value xml:lang="fr">Actif</value>
-        <value xml:lang="it">Attivo</value>
-        <value xml:lang="nl">Aktief</value>
-        <value xml:lang="ro">Activ</value>
-        <value xml:lang="ru">–ê–∫—Ç–∏–≤–Ω—ã–π</value>
-        <value xml:lang="th">‡∏ó‡∏≥‡∏á‡∏≤‡∏ô‡∏≠‡∏¢‡∏π‡πà</value>
-        <value xml:lang="zh">ÊúâÊïà</value>
-    </property>
-    <property key="EcommerceAddAlltoCart">
-        <value xml:lang="de">Alles in den Warenkorb legen</value>
-        <value xml:lang="en">Add All to Cart</value>
-        <value xml:lang="es">A√±adir todo al carro</value>
-        <value xml:lang="fr">Ajouter tout au panier</value>
-        <value xml:lang="it">Aggiungi Tutto al Carrello</value>
-        <value xml:lang="nl">Alles aan de winkelwagen toevoegen</value>
-        <value xml:lang="pt_PT">Adicionar Todos ao Cesto</value>
-        <value xml:lang="ro">Adauga Ttotul in Cos</value>
-        <value xml:lang="ru">–î–æ–±–∞–≤–∏—Ç—å –≤ –∫–æ—Ä–∑–∏–Ω—É –≤—Å–µ</value>
-        <value xml:lang="th">‡πÄ‡∏û‡∏¥‡πà‡∏°‡∏ó‡∏±‡πâ‡∏á‡∏´‡∏°‡∏î‡∏•‡∏á‡∏ï‡∏£‡∏∞‡∏Å‡∏£‡πâ‡∏≤</value>
-        <value xml:lang="zh">ÂÖ®ÈÉ®ÊîæÂÖ•Ë¥≠Áâ©ËΩ¶</value>
-    </property>
-    <property key="EcommerceAddCheckedToCart">
-        <value xml:lang="de">Ausgew√§hlte Artikel in den Warenkorb legen</value>
-        <value xml:lang="en">Add Checked to Cart</value>
-        <value xml:lang="es">A√±adir selecci√≥n al carro</value>
-        <value xml:lang="fr">Ajouter ceux coch√©s au panier</value>
-        <value xml:lang="it">Aggiungi Scelte al Carrello</value>
-        <value xml:lang="nl">Voeg aangevinkt toe aan de winkelwagen</value>
-        <value xml:lang="pt_PT">Adicionar Seleccionados ao Cesto</value>
-        <value xml:lang="ro">Adauga optiuni in Cos</value>
-        <value xml:lang="ru">–î–æ–±–∞–≤–∏—Ç—å –≤ –∫–æ—Ä–∑–∏–Ω—É –æ—Ç–º–µ—á–µ–Ω–Ω–æ–µ</value>
-        <value xml:lang="th">‡πÄ‡∏ä‡πá‡∏Ñ‡πÄ‡∏û‡∏¥‡πà‡∏°‡πÉ‡∏ô‡∏ï‡∏£‡∏∞‡∏Å‡∏£‡πâ‡∏≤</value>
-        <value xml:lang="zh">ÊääÈÄâ‰∏≠ÁöÑÊîæÂÖ•Ë¥≠Áâ©ËΩ¶</value>
-    </property>
-    <property key="EcommerceAddCheckedtoCart">
-        <value xml:lang="de">Ausgew√§hlte Artikel in den Warenkorb legen</value>
-        <value xml:lang="en">Add Checked to Cart</value>
-        <value xml:lang="es">Agregar √≠tems seleccionados al carro</value>
-        <value xml:lang="th">‡πÄ‡∏ä‡πá‡∏Ñ‡πÄ‡∏û‡∏¥‡πà‡∏°‡πÉ‡∏ô‡∏ï‡∏£‡∏∞‡∏Å‡∏£‡πâ‡∏≤</value>
-    </property>
-    <property key="EcommerceAddChildListsToCart">
-        <value xml:lang="de">F√ºgen Sie diese Liste mit Unterliste(n) zum Warenkorb hinzu</value>
-        <value xml:lang="en">Add This List And Child List(s) To Cart</value>
-        <value xml:lang="es">A√±adir listas hijas al carro</value>
-        <value xml:lang="fr">Ajouter la liste et sous liste(s) au panier</value>
-        <value xml:lang="it">Aggiungi Questa Lista e la(e) Lista(e) Figlie al Carrello</value>
-        <value xml:lang="nl">Voeg deze (sub)lijsten toe aan de winkelwagen</value>
-        <value xml:lang="pt_PT">Adicionar Esta Lista E Sua(s) Derivada(s) Ao Cesto</value>
-        <value xml:lang="ro">Adauga Aceasta Lista si Lista(le) Fica(e) in Cos</value>
-        <value xml:lang="ru">–î–æ–±–∞–≤–∏—Ç—å —ç—Ç–æ—Ç –∏ –ø–æ–¥—á–∏–Ω–µ–Ω–Ω—ã–π —Å–ø–∏—Å–æ–∫(–∫–∏) –≤ –∫–æ—Ä–∑–∏–Ω—É</value>
-        <value xml:lang="th">‡πÄ‡∏û‡∏¥‡πà‡∏°‡∏£‡∏≤‡∏¢‡∏Å‡∏≤‡∏£‡∏ô‡∏µ‡πâ‡πÅ‡∏•‡∏∞‡∏£‡∏≤‡∏¢‡∏Å‡∏≤‡∏£‡πÄ‡∏î‡πá‡∏Å‡∏•‡∏á‡∏ï‡∏£‡∏∞‡∏Å‡∏£‡πâ‡∏≤</value>
-        <value xml:lang="zh">ÊääËøô‰∏™ÂàóË°®ÂèäÂ≠êÂàóË°®ÊîæÂÖ•Ë¥≠Áâ©ËΩ¶</value>
-    </property>
-    <property key="EcommerceAddListToCart">
-        <value xml:lang="de">Liste zum Warenkorb hinzuf√ºgen</value>
-        <value xml:lang="en">Add List To Cart</value>
-        <value xml:lang="es">A√±adir lista al carro</value>
-        <value xml:lang="fr">Ajouter la liste au panier</value>
-        <value xml:lang="it">Aggiungi Lista al Carrello</value>
-        <value xml:lang="nl">Voeg deze Lijst toe aan de winkelwagen</value>
-        <value xml:lang="pt_PT">Adicionar Lista Ao Cesto</value>
-        <value xml:lang="ro">Adauga Lista la Cos</value>
-        <value xml:lang="ru">–î–æ–±–∞–≤–∏—Ç—å —Å–ø–∏—Å–æ–∫ –≤ –∫–æ—Ä–∑–∏–Ω—É</value>
-        <value xml:lang="th">‡πÄ‡∏û‡∏¥‡πà‡∏°‡∏£‡∏≤‡∏¢‡∏Å‡∏≤‡∏£‡∏•‡∏á‡∏ï‡∏£‡∏∞‡∏Å‡∏£‡πâ‡∏≤</value>
-        <value xml:lang="zh">ÊääÂàóË°®ÊîæÂÖ•Ë¥≠Áâ©ËΩ¶</value>
-    </property>
-    <property key="EcommerceAddNewDigitalProduct">
-        <value xml:lang="en">Add New Digital Product</value>
-        <value xml:lang="it">Aggiungi Nuovo Prodotto Digitale</value>
-        <value xml:lang="ro">Adauga Nou Produs Digital</value>
-        <value xml:lang="ru">–î–æ–±–∞–≤–∏—Ç—å –Ω–æ–≤—ã–π —Ü–∏—Ñ—Ä–æ–≤–æ–π –ø—Ä–æ–¥—É–∫—Ç</value>
-        <value xml:lang="th">‡πÄ‡∏û‡∏¥‡πà‡∏°‡∏™‡∏¥‡∏ô‡∏Ñ‡πâ‡∏≤‡∏î‡∏¥‡∏à‡∏¥‡∏ï‡∏≠‡∏•‡πÉ‡∏´‡∏°‡πà</value>
-        <value xml:lang="zh">Êñ∞Âª∫Êï∞Â≠ó‰∫ßÂìÅ</value>
-    </property>
-    <property key="EcommerceAddResponseFor">
-        <value xml:lang="en">Add response for</value>
-        <value xml:lang="es">A√±adir respuesta para</value>
-        <value xml:lang="fr">Ajoutez une r√©ponse pour</value>
-        <value xml:lang="it">Aggiungi risponste per</value>
-        <value xml:lang="nl">Voeg antwoord toe aan</value>
-        <value xml:lang="ro">Adauga raspunsuri pentru EcommerceAddSelectedtoList=Adauga Selectionat La Lista</value>
-        <value xml:lang="ru">–î–æ–±–∞–≤–∏—Ç—å –æ—Ç–≤–µ—Ç –Ω–∞</value>
-        <value xml:lang="th">‡πÄ‡∏û‡∏¥‡πà‡∏°‡∏Ñ‡∏≥‡∏ï‡∏≠‡∏ö‡∏™‡∏≥‡∏´‡∏£‡∏±‡∏ö</value>
-        <value xml:lang="zh">Êñ∞Âª∫Á≠îÊ°àÁî®‰∫é</value>
-    </property>
     <property key="EcommerceAddSelectedtoList">
         <value xml:lang="de">Ausgew√§hlte Artikel in Liste aufnehmen</value>
         <value xml:lang="en">Add Selected To List</value>
@@ -4271,6 +4166,40 @@
         <value xml:lang="th">‡∏£‡∏´‡∏±‡∏™‡πÄ‡∏ß‡πá‡∏ö‡πÑ‡∏ã‡∏ï‡πå</value>
         <value xml:lang="zh">ÁΩëÁ´ôÊ†áËØÜ</value>
     </property>
+    <property key="OrderAddAllToCart">
+        <value xml:lang="cs">P≈ôidat v≈°echno do ko≈°√≠ku</value>
+        <value xml:lang="de">Alles in den Warenkorb legen</value>
+        <value xml:lang="en">Add All to Cart</value>
+        <value xml:lang="en_GB">Add All to basket</value>
+        <value xml:lang="es">A√±adir todo al carro</value>
+        <value xml:lang="fr">Ajouter tout au panier</value>
+        <value xml:lang="hi_IN">‡§∏‡§≠‡•Ä ‡§ï‡•ã ‡§ü‡•ã‡§ï‡§∞‡•Ä ‡§Æ‡•á‡§Ç ‡§°‡§æ‡§≤‡•á‡§Ç</value>
+        <value xml:lang="it">Aggiungi Tutto al Carrello</value>
+        <value xml:lang="ja">Add All to Cart</value>
+        <value xml:lang="nl">Alles aan de winkelwagen toevoegen</value>
+        <value xml:lang="pt_PT">Adicionar Todos ao Cesto</value>
+        <value xml:lang="ro">Adauga Ttotul in Cos</value>
+        <value xml:lang="ru">–î–æ–±–∞–≤–∏—Ç—å –≤ –∫–æ—Ä–∑–∏–Ω—É –≤—Å–µ</value>
+        <value xml:lang="th">‡πÄ‡∏û‡∏¥‡πà‡∏°‡∏ó‡∏±‡πâ‡∏á‡∏´‡∏°‡∏î‡∏•‡∏á‡∏ï‡∏£‡∏∞‡∏Å‡∏£‡πâ‡∏≤</value>
+        <value xml:lang="zh">ÂÖ®ÈÉ®ÊîæÂÖ•Ë¥≠Áâ©ËΩ¶</value>
+    </property>
+    <property key="OrderAddCheckedToCart">
+        <value xml:lang="cs">p≈ôidat vybran√© do ko≈°√≠ku</value>
+        <value xml:lang="de">Ausgew√§hlte Artikel in den Warenkorb legen</value>
+        <value xml:lang="en">Add Checked to Cart</value>
+        <value xml:lang="en_GB">Add selected to basket</value>
+        <value xml:lang="es">A√±adir selecci√≥n al carro</value>
+        <value xml:lang="fr">Ajouter ceux coch√©s au panier</value>
+        <value xml:lang="hi_IN">‡§∏‡§π‡•Ä ‡§®‡§ø‡§∂‡§æ‡§® ‡§µ‡§æ‡§≤‡•á ‡§ï‡•ã ‡§ü‡•ã‡§ï‡§∞‡•Ä ‡§Æ‡•á‡§Ç ‡§°‡§æ‡§≤‡•á‡§Ç</value>
+        <value xml:lang="it">Aggiungi Scelte al Carrello</value>
+        <value xml:lang="ja">Add Checked to Cart</value>
+        <value xml:lang="nl">Voeg aangevinkt toe aan de winkelwagen</value>
+        <value xml:lang="pt_PT">Adicionar Seleccionados ao Cesto</value>
+        <value xml:lang="ro">Adauga optiuni in Cos</value>
+        <value xml:lang="ru">–î–æ–±–∞–≤–∏—Ç—å –≤ –∫–æ—Ä–∑–∏–Ω—É –æ—Ç–º–µ—á–µ–Ω–Ω–æ–µ</value>
+        <value xml:lang="th">‡πÄ‡∏ä‡πá‡∏Ñ‡πÄ‡∏û‡∏¥‡πà‡∏°‡πÉ‡∏ô‡∏ï‡∏£‡∏∞‡∏Å‡∏£‡πâ‡∏≤</value>
+        <value xml:lang="zh">ÊääÈÄâ‰∏≠ÁöÑÊîæÂÖ•Ë¥≠Áâ©ËΩ¶</value>
+    </property>
     <property key="OrderAddCode">
         <value xml:lang="de">Code hinzuf√ºgen</value>
         <value xml:lang="en">Add Code</value>
Index: applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl
===================================================================
--- applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl	(revision 655353)
+++ applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl	(working copy)
@@ -61,7 +61,7 @@
   <form method="post" action="<@ofbizUrl>addtocartbulk</@ofbizUrl>" name="bulkaddform" style='margin: 0;'>
     <input type='hidden' name='category_id' value='${categoryId}'>
     <div class="tabletext" align="right">
-      <a href="javascript:document.bulkaddform.submit()" class="buttontext"><span style="white-space: nowrap;">${uiLabelMap.EcommerceAddAlltoCart}</span></a>
+      <a href="javascript:document.bulkaddform.submit()" class="buttontext"><span style="white-space: nowrap;">${uiLabelMap.OrderAddAllToCart}</span></a>
     </div>     
     <table border='1' cellpadding='2' cellspacing='0'>      
       <#list productCategoryMembers as productCategoryMember>
@@ -73,7 +73,7 @@
       </#list> 
     </table>
     <div class="tabletext" align="right">
-      <a href="javascript:document.bulkaddform.submit()" class="buttontext"><span style="white-space: nowrap;">${uiLabelMap.EcommerceAddAlltoCart}</span></a>
+      <a href="javascript:document.bulkaddform.submit()" class="buttontext"><span style="white-space: nowrap;">${uiLabelMap.OrderAddAllToCart}</span></a>
     </div>      
   </form>
   </center>
Index: applications/order/webapp/ordermgr/entry/order/orderitems.ftl
===================================================================
--- applications/order/webapp/ordermgr/entry/order/orderitems.ftl	(revision 655353)
+++ applications/order/webapp/ordermgr/entry/order/orderitems.ftl	(working copy)
@@ -21,8 +21,8 @@
     <div class="screenlet-header">
         <div class="boxlink">
             <#if maySelectItems?default(false)>
-                <a href="javascript:document.addOrderToCartForm.add_all.value="true";document.addOrderToCartForm.submit()" class="lightbuttontext">${uiLabelMap.EcommerceAddAlltoCart}</a>
-                <a href="javascript:document.addOrderToCartForm.add_all.value="false";document.addOrderToCartForm.submit()" class="lightbuttontext">${uiLabelMap.EcommerceAddCheckedtoCart}</a>
+                <a href="javascript:document.addOrderToCartForm.add_all.value="true";document.addOrderToCartForm.submit()" class="lightbuttontext">${uiLabelMap.OrderAddAllToCart}</a>
+                <a href="javascript:document.addOrderToCartForm.add_all.value="false";document.addOrderToCartForm.submit()" class="lightbuttontext">${uiLabelMap.OrderAddCheckedToCart}</a>
             </#if>
         </div>
         <div class="boxhead">&nbsp;${uiLabelMap.OrderOrderItems}</div>
Index: applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl
===================================================================
--- applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl	(revision 655353)
+++ applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl	(working copy)
@@ -20,7 +20,7 @@
     <div class="screenlet-header">
         <div class="boxlink">
             <#if maySelectItems?default("N") == "Y">
-                <a href="javascript:document.addCommonToCartForm.add_all.value='true';document.addCommonToCartForm.submit()" class="buttontext">${uiLabelMap.EcommerceAddAlltoCart}</a>
+                <a href="javascript:document.addCommonToCartForm.add_all.value='true';document.addCommonToCartForm.submit()" class="buttontext">${uiLabelMap.OrderAddAllToCart}</a>
             </#if>
         </div>
         <div class="boxhead">&nbsp; ${uiLabelMap.OrderOrderQuoteItems}</div>
