You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mr...@apache.org on 2008/05/15 22:58:36 UTC

svn commit: r656832 [1/3] - in /ofbiz/trunk/applications: ecommerce/config/ ecommerce/webapp/ecommerce/cart/ ecommerce/webapp/ecommerce/catalog/ ecommerce/webapp/ecommerce/content/ ecommerce/webapp/ecommerce/customer/ ecommerce/webapp/ecommerce/forum/ ...

Author: mrisaliti
Date: Thu May 15 13:58:35 2008
New Revision: 656832

URL: http://svn.apache.org/viewvc?rev=656832&view=rev
Log:
Third patch applied for clean up labels between order and ecommerce application (OFBIZ-1780)

Modified:
    ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml
    ofbiz/trunk/applications/ecommerce/webapp/ecommerce/cart/microcart.ftl
    ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/advancedsearch.ftl
    ofbiz/trunk/applications/ecommerce/webapp/ecommerce/content/ContentForms.xml
    ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/digitalproductedit.ftl
    ofbiz/trunk/applications/ecommerce/webapp/ecommerce/forum/ForumForms.xml
    ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderitems.ftl
    ofbiz/trunk/applications/ecommerce/widget/blog/BlogMenus.xml
    ofbiz/trunk/applications/order/config/OrderUiLabels.xml
    ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/minicart.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoUseDetailsInline.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotioncategories.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/advancedsearch.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl
    ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml

Modified: ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml?rev=656832&r1=656831&r2=656832&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml (original)
+++ ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml Thu May 15 13:58:35 2008
@@ -1278,433 +1278,617 @@
         <value xml:lang="th">รายการที่สั่งซื้อสินค้าเด็ก</value>
         <value xml:lang="zh">子购物列表</value>
     </property>
-    <property key="EcommerceClearSearchHistory">
-        <value xml:lang="en">Clear Search History</value>
-        <value xml:lang="fr">Effacer l'historique de recherche</value>
-        <value xml:lang="hi_IN">ख़ोज इतिहास मिटाऐं</value>
-        <value xml:lang="ja">検索履歴を消去</value>
-        <value xml:lang="th">ยกเลิกการค้นหาข้อมูล</value>
-    </property>
-    <property key="EcommerceClearSearchHistoryNote">
-        <value xml:lang="en">Clear Search History Note</value>
-        <value xml:lang="fr">Note au sujet de l'effacement l'historique de recherche</value>
-        <value xml:lang="hi_IN">(यह जान लिजीये कि जाने के बाद ख़ोज इतिहास मिटा दिया जाएगा)</value>
-        <value xml:lang="ja">(注: このサイトからログアウトすることで、履歴は自動的に消去されます)</value>
-        <value xml:lang="th">Note : หมายเหตุ หลังจากที่คุณออกจากการทำรายการนี้ข้อมูลการค้นหาของคุณจะถูกยกเลิกโดยอัตโนมัติ</value>
-    </property>
     <property key="EcommerceCompleted">
         <value xml:lang="en">Completed</value>
+        <value xml:lang="es">Completado</value>
         <value xml:lang="fr">Terminé</value>
         <value xml:lang="hi_IN">समाप्त - धन्यवाद</value>
+        <value xml:lang="it">Completato - Grazie!</value>
         <value xml:lang="ja">Completed - Thank-you!</value>
+        <value xml:lang="nl">Volledig ingevuld, bedankt!</value>
+        <value xml:lang="ro">Indeplinit - Multumesc!</value>
+        <value xml:lang="ru">Завершена - Спасибо!</value>
         <value xml:lang="th">เสร็จสมบูรณ์</value>
-    </property>
-    <property key="EcommerceConfigure">
-        <value xml:lang="en">Configure</value>
-        <value xml:lang="fr">Configurer</value>
-        <value xml:lang="hi_IN">रूप दिजिये</value>
-        <value xml:lang="ja">カストマイズする</value>
-        <value xml:lang="th">ปรับปรุง</value>
+        <value xml:lang="zh">完成了 - 谢谢您！</value>
     </property>
     <property key="EcommerceContentFor">
         <value xml:lang="en">Content For</value>
+        <value xml:lang="es">Contenido para</value>
         <value xml:lang="fr">Contenu pour</value>
         <value xml:lang="hi_IN">अंतर्वस्तु अंश</value>
+        <value xml:lang="it">Contenuto per</value>
         <value xml:lang="ja">Content for</value>
+        <value xml:lang="nl">Content voor</value>
+        <value xml:lang="ro">Continut pentru </value>
+        <value xml:lang="ru">Содержимое для</value>
         <value xml:lang="th">หัวข้อสำหรับ</value>
+        <value xml:lang="zh">内容用于</value>
     </property>
     <property key="EcommerceContentInformation">
         <value xml:lang="en">Content Information</value>
+        <value xml:lang="es">Información del contenido</value>
         <value xml:lang="fr">Contenu d'information</value>
         <value xml:lang="hi_IN">अंतर्वस्तु अंश जानकारी</value>
+        <value xml:lang="it">Informazione Contenuto</value>
         <value xml:lang="ja">Content Information</value>
+        <value xml:lang="nl">Content informatie</value>
+        <value xml:lang="ro">Informatie Continut</value>
+        <value xml:lang="ru">Информация о содержимом</value>
         <value xml:lang="th">ข้อมูลหัวข้อ</value>
+        <value xml:lang="zh">内容信息</value>
     </property>
     <property key="EcommerceContentName">
         <value xml:lang="en">Content Name</value>
+        <value xml:lang="es">Nombre del contenido</value>
         <value xml:lang="fr">Contenu du nom</value>
+        <value xml:lang="it">Nome Contenuto</value>
         <value xml:lang="hi_IN">अंतर्वस्तु अंश नाम</value>
         <value xml:lang="ja">Content Name</value>
+        <value xml:lang="nl">Content naam</value>
+        <value xml:lang="ro">Nume Continut</value>
+        <value xml:lang="ru">Имя содержимого</value>
         <value xml:lang="th">ชื่อหัวข้อ</value>
+        <value xml:lang="zh">内容名称</value>
     </property>
     <property key="EcommerceContinueShopping">
         <value xml:lang="cs">Pokračovat v nákupu</value>
+        <value xml:lang="de">Einkauf fortsetzen</value>
         <value xml:lang="en">Continue Shopping</value>
+        <value xml:lang="es">Continuar comprando</value>
         <value xml:lang="fr">Continuer l'achat</value>
         <value xml:lang="hi_IN">ख़रीदारी जारी</value>
+        <value xml:lang="it">Continua Acquisto</value>
         <value xml:lang="ja">買い物を続ける</value>
+        <value xml:lang="nl">door gaan met winkelen</value>
+        <value xml:lang="pt_PT">Continuar as Compras</value>
+        <value xml:lang="ro">Continua Cumparare</value>
+        <value xml:lang="ru">Продолжить покупки</value>
         <value xml:lang="th">ทำการซื้อสินค้าต่อไป</value>
-    </property>
-    <property key="EcommerceCustomerReviews">
-        <value xml:lang="cs">Hodnocení zákazníka</value>
-        <value xml:lang="en">Customer Reviews </value>
-        <value xml:lang="fr">Opinion de la clientèle</value>
-        <value xml:lang="hi_IN">ग्राहक पुनरवलोकन</value>
-        <value xml:lang="ja">Customer Reviews</value>
-        <value xml:lang="th">ตรวจสอบลูกค้า</value>
-    </property>
-    <property key="EcommerceCustomerTaxID">
-        <value xml:lang="en">Customer Tax ID</value>
-        <value xml:lang="fr">Ref. de taxe du client</value>
-        <value xml:lang="hi_IN">ग्राहक कर नम्बर</value>
-        <value xml:lang="ja">Customer Tax ID</value>
-        <value xml:lang="th">หมายเลขผู้เสียภาษี</value>
+        <value xml:lang="zh">继续购物</value>
     </property>
     <property key="EcommerceDataResourceId">
         <value xml:lang="en">Data Resource Id</value>
+        <value xml:lang="es">Código de Data Resource</value>
         <value xml:lang="fr">Ref. de ressource de données</value>
         <value xml:lang="hi_IN">आंकड़े सहारा नम्बर</value>
+        <value xml:lang="it">Codice Risorsa Dati</value>
         <value xml:lang="ja">Data Resource Id</value>
+        <value xml:lang="nl">Data Bron Id</value>
+        <value xml:lang="ro">Cod Resursa Date</value>
+        <value xml:lang="ru">Data Resource Id</value>
         <value xml:lang="th">หมายเลขแหล่งที่มา</value>
+        <value xml:lang="zh">数据资源标识</value>
     </property>
     <property key="EcommerceDigitalAddFromMyFiles">
         <value xml:lang="en">Digital Add From My Files</value>
         <value xml:lang="fr">Ajout numérique depuis mes fichiers</value>
         <value xml:lang="hi_IN">मेरे फाइल से जोड़ें</value>
+        <value xml:lang="it">Aggiungi Dai Miei Files</value>
+        <value xml:lang="ro">Adauga Din Fisierele mele</value>
+        <value xml:lang="ru">Добавить из моих файлов</value>
         <value xml:lang="th">สินค้าดิจิตัลที่เพิ่มจากไฟล์ของฉัน</value>
+        <value xml:lang="zh">从我的文件添加</value>
     </property>
     <property key="EcommerceDigitalNewProduct">
         <value xml:lang="en">Digital New Product</value>
         <value xml:lang="fr">Nouveau produit numérique</value>
         <value xml:lang="hi_IN">नया डिजीटल सामान</value>
+        <value xml:lang="it">Nuovo Prodotto Digitale</value>
+        <value xml:lang="ro">Nou Produs Digital</value>
+        <value xml:lang="ru">Новый цифровой продукт</value>
         <value xml:lang="th">สินค้าดิจิตัลใหม่</value>
+        <value xml:lang="zh">新建数字产品</value>
     </property>
     <property key="EcommerceDigitalProductFiles">
         <value xml:lang="en">Digital Product Files</value>
         <value xml:lang="fr">Fichiers de produit numérique</value>
         <value xml:lang="hi_IN">डिजीटल सामान फाइल</value>
+        <value xml:lang="it">Files Prodotti Digitali</value>
+        <value xml:lang="ro">Fisiere Produse Digitale</value>
+        <value xml:lang="ru">Файлы цифровых продуктов</value>
         <value xml:lang="th">ไฟล์สินค้าดิจิตัล</value>
+        <value xml:lang="zh">数字产品文件</value>
     </property>
     <property key="EcommerceDigitalProductPurchaseHistoryCommission">
         <value xml:lang="en">Digital Product Purchase History Commission</value>
         <value xml:lang="fr">Historique des commissions sur l'achats de produit numérique</value>
         <value xml:lang="hi_IN">डिजीटल सामान ख़रीदारी का इतिहास व दलाली</value>
+        <value xml:lang="it">Storia Acquisti e Provvigioni Prodotti Digitali</value>
+        <value xml:lang="ro">Storia Cumparari si  Provizioane Produse Digitale</value>
+        <value xml:lang="ru">История и комиссии приобретения цифровых продуктов</value>
         <value xml:lang="th">ข้อมูลค่าคอมมิชชั่นในการสั่งซื้อสินค้าดิจิตัล</value>
-    </property>
-    <property key="EcommerceDownloadFilesTitle">
-        <value xml:lang="en">Download Files Title</value>
-        <value xml:lang="fr">Intitulé des téléchargements</value>
-        <value xml:lang="hi_IN">सामान की फाइलें प्राप्त करें</value>
-        <value xml:lang="th">โหลดไฟล์หัวข้อ</value>
+        <value xml:lang="zh">数字产品购买历史记录和佣金</value>
     </property>
     <property key="EcommerceDownloadNotFound">
         <value xml:lang="en">Download Not Found</value>
+        <value xml:lang="es">No se encontraron archivos descargables</value>
         <value xml:lang="fr">Téléchargement non trouvé</value>
         <value xml:lang="hi_IN">प्राप्त योग्य फाइलें नहीं मिली</value>
+        <value xml:lang="it">Nessun Download di Files Trovato</value>
+        <value xml:lang="ro">Nici-un Download de Fisiere Gasit</value>
+        <value xml:lang="ru">Нет файлов для загрузки</value>
         <value xml:lang="th">ไม่พบที่ดาวโหลด</value>
+        <value xml:lang="zh">没有找到下载文件</value>
     </property>
     <property key="EcommerceDownloadsAvailableTitle">
         <value xml:lang="en">Downloads Available Title </value>
+        <value xml:lang="es">Descargar los archivos disponibles</value>
         <value xml:lang="fr">Intitulé des téléchargements valables </value>
         <value xml:lang="hi_IN">प्राप्त योग्य फाइलें उपस्थित</value>
+        <value xml:lang="it">Download di Files Disponibile</value>
+        <value xml:lang="ro">Download de Fisiere Disponibile</value>
+        <value xml:lang="ru">Доступны файлы для загрузки</value>
         <value xml:lang="th">โหลดหัวข้อที่มีอยู่</value>
-    </property>
-    <property key="EcommerceEcludeCategories">
-        <value xml:lang="en">Exclude Categories</value>
-        <value xml:lang="fr">Catégories à exclure</value>
-        <value xml:lang="hi_IN">जो न हो इन श्रेणी में</value>
-        <value xml:lang="th">ไม่มีหมวดหมู่</value>
-    </property>
-    <property key="EcommerceEcommerce">
-        <value xml:lang="en">Ecommerce</value>
-        <value xml:lang="fr">Commerce électronique</value>
-        <value xml:lang="ja">Ecommerce</value>
-        <value xml:lang="th">พาณิชย์อิเล็กทรอนิกส์</value>
+        <value xml:lang="zh">可用的下载文件</value>
     </property>
     <property key="EcommerceEmptyBody">
         <value xml:lang="en">Empty Body</value>
+        <value xml:lang="es">Contenido vacío</value>
         <value xml:lang="fr">Corps vide</value>
         <value xml:lang="hi_IN">ख़ाली शरीर</value>
         <value xml:lang="ja">Empty Body</value>
+        <value xml:lang="it">Corpo Messaggio Vuoto</value>
+        <value xml:lang="nl">Geen inhoud</value>
+        <value xml:lang="ro">Corp Gol</value>
+        <value xml:lang="ru">Пусто</value>
         <value xml:lang="th">ไม่มีข้อมูล</value>
+        <value xml:lang="zh">清空主体</value>
     </property>
     <property key="EcommerceEmptyCart">
         <value xml:lang="cs">Vyprázdnit koš</value>
+        <value xml:lang="de">Warenkorb leeren</value>
         <value xml:lang="en">Empty Cart</value>
-        <value xml:lang="fr">Panier vide</value>
         <value xml:lang="en_GB">Empty basket</value>
+        <value xml:lang="es">Limpiar canasta</value>
+        <value xml:lang="fr">Panier vide</value>
         <value xml:lang="hi_IN">ख़ाली टोकरी</value>
+        <value xml:lang="it">Carrello Vuoto</value>
         <value xml:lang="ja">Empty Cart</value>
+        <value xml:lang="nl">Leeg winkelwagen</value>
+        <value xml:lang="pt_PT">Cesto Vazio</value>
+        <value xml:lang="ro">Cos Gol</value>
+        <value xml:lang="ru">Корзина пустая</value>
         <value xml:lang="th">ตะกร้าว่างเปล่า</value>
+        <value xml:lang="zh">清空购物车</value>
     </property>
     <property key="EcommerceEnterQueryParameters">
         <value xml:lang="en">Enter Query Parameters</value>
+        <value xml:lang="es">Ingrese parámetros de búsqueda</value>
         <value xml:lang="fr">Entrer vos paramètres de recherche</value>
         <value xml:lang="hi_IN">पूछताछ प्राचल दें</value>
+        <value xml:lang="it">Inserisci i parametri di ricerca</value>
         <value xml:lang="ja">Enter query parameters</value>
+        <value xml:lang="nl">Vul zoek parameters in</value>
+        <value xml:lang="ro">Introdu parametrii de cautare</value>
+        <value xml:lang="ru">Введите параметры запроса</value>
         <value xml:lang="th">เข้าไปดูคำถาม</value>
-    </property>
-    <property key="EcommerceErrorNoPromotionFoundWithID">
-        <value xml:lang="en">ERROR: No promotion found with ID</value>
-        <value xml:lang="fr">ERREUR: aucune promotion avec cette ref.</value>
-        <value xml:lang="hi_IN">गलत: नम्बर से मिलता प्रोत्साहन नहीं</value>
-        <value xml:lang="ja">ERROR: No promotion found with ID</value>
-        <value xml:lang="th">Error: ผิดพลาด !ไม่มีโปรโมชั่นของหมายเลขนี้</value>
+        <value xml:lang="zh">输入查询参数</value>
     </property>
     <property key="EcommerceEvery3rd">
         <value xml:lang="en">Every 3rd</value>
+        <value xml:lang="es">Cada 3</value>
         <value xml:lang="fr">Chaque 3ème</value>
         <value xml:lang="hi_IN">हर तीसरा</value>
+        <value xml:lang="it">Ogni 3°</value>
         <value xml:lang="ja">Every 3rd</value>
+        <value xml:lang="nl">Elke derde</value>
+        <value xml:lang="ro">La fiecare a-3-a</value>
+        <value xml:lang="ru">Каждый 3-й</value>
         <value xml:lang="th">ทุก ๆ วันที่ 3</value>
+        <value xml:lang="zh">每3天</value>
     </property>
     <property key="EcommerceEvery6th">
         <value xml:lang="en">Every 6th</value>
+        <value xml:lang="es">Cada 6</value>
         <value xml:lang="fr">Chaque 6ème</value>
         <value xml:lang="hi_IN">हर छठा</value>
+        <value xml:lang="it">Ogni 6°</value>
         <value xml:lang="ja">Every 6th</value>
+        <value xml:lang="nl">Elke zesde</value>
+        <value xml:lang="ro">La fiecare a-6-a</value>
+        <value xml:lang="ru">Каждый 6-й</value>
         <value xml:lang="th">ทุก ๆ วันที่ 6</value>
+        <value xml:lang="zh">每6天</value>
     </property>
     <property key="EcommerceEvery9th">
         <value xml:lang="en">Every 9th</value>
+        <value xml:lang="es">Cada 9</value>
         <value xml:lang="fr">Chaque 9ème</value>
         <value xml:lang="hi_IN">हर नवां</value>
+        <value xml:lang="it">Ogni 9°</value>
         <value xml:lang="ja">Every 9th</value>
+        <value xml:lang="nl">Elke negende</value>
+        <value xml:lang="ro">La fiecare a-9-a</value>
+        <value xml:lang="ru">Каждый 9-й</value>
         <value xml:lang="th">ทุก ๆ วันที่ 9</value>
+        <value xml:lang="zh">每9天</value>
     </property>
     <property key="EcommerceEveryDay">
-        <value xml:lang="en">EveryDay</value>
+        <value xml:lang="en">Every Day</value>
+        <value xml:lang="es">Todos los días</value>
         <value xml:lang="fr">Chaque jour</value>
         <value xml:lang="hi_IN">हर</value>
         <value xml:lang="ja">Every</value>
+        <value xml:lang="it">Ogni </value>
+        <value xml:lang="nl">Elke</value>
+        <value xml:lang="ro">In fiecare zi</value>
+        <value xml:lang="ru">Каждый</value>
         <value xml:lang="th">ทุก ๆ วัน</value>
+        <value xml:lang="zh">每天</value>
     </property>
     <property key="EcommerceEveryOther">
         <value xml:lang="en">Every Other</value>
+        <value xml:lang="es">Todo lo otro</value>
         <value xml:lang="fr">Chaque dernier</value>
         <value xml:lang="hi_IN">हर दूसरे</value>
+        <value xml:lang="it">Ogni Altro</value>
         <value xml:lang="ja">Every Other</value>
+        <value xml:lang="nl">Elke andere</value>
+        <value xml:lang="ro">Oricand</value>
+        <value xml:lang="ru">Каждый другой</value>
         <value xml:lang="th">ทุกครั้ง</value>
+        <value xml:lang="zh">隔天</value>
     </property>
     <property key="EcommerceExemptAmount">
         <value xml:lang="en">Exempt Amount</value>
+        <value xml:lang="es">Cantidad exenta</value>
         <value xml:lang="fr">Exempter le montant</value>
         <value xml:lang="hi_IN">बचा हुआ राशी</value>
+        <value xml:lang="it">Importo Esente</value>
         <value xml:lang="ja">Exempt Amount</value>
+        <value xml:lang="nl">Uitegsloten hoeveel heid</value>
+        <value xml:lang="ro">Valoare Scutita</value>
+        <value xml:lang="ru">Безналоговая сумма</value>
         <value xml:lang="th">จำนวนตัวอย่าง</value>
+        <value xml:lang="zh">被免除的金额</value>
     </property>
     <property key="EcommerceFileManager">
         <value xml:lang="en">File Manager</value>
+        <value xml:lang="es">Administrador de archivos</value>
         <value xml:lang="fr">Gestionnaire de fichiers</value>
         <value xml:lang="hi_IN">फाइल संचालक</value>
+        <value xml:lang="it">Gestione File</value>
         <value xml:lang="ja">File Manager</value>
+        <value xml:lang="nl">Bestandsbeheerder</value>
+        <value xml:lang="ro">Gestiune Fisier</value>
+        <value xml:lang="ru">Менеджер файлов</value>
         <value xml:lang="th">จัดการไฟล์</value>
+        <value xml:lang="zh">文件管理</value>
     </property>
     <property key="EcommerceFollowingMessage">
         <value xml:lang="en">Following Message</value>
+        <value xml:lang="es">ha pedido que le enviemos el siguiente mensaje :</value>
         <value xml:lang="fr">Message suivant</value>
+        <value xml:lang="it">come richiesto noi ti inviamo questo link con il seguente messaggio:</value>
         <value xml:lang="ja">has requested we send you this link with the following message:</value>
+        <value xml:lang="nl">is aangevraagd dat we je deze link sturen met het bericht:</value>
+        <value xml:lang="ro">dupa cum ati cerut noi iti trimitem acest link cu urmatorul mesaj:</value>
+        <value xml:lang="ru">запрошен, мы посылаем вам эту ссылку со следующим сообщением:</value>
         <value xml:lang="th">ข้อความ</value>
+        <value xml:lang="zh">要求我们发送给你这个带有下列消息的链接：</value>
     </property>
     <property key="EcommerceFromParentArticle">
         <value xml:lang="en">From Parent Article</value>
+        <value xml:lang="es">De artículo padre</value>
         <value xml:lang="fr">De l'article parent</value>
         <value xml:lang="hi_IN">पिता लेख से</value>
+        <value xml:lang="it">Dall'Articolo Padre</value>
         <value xml:lang="ja">From Parent Article</value>
+        <value xml:lang="nl">Van het moeder artikel</value>
+        <value xml:lang="ro">De La Articolul Parinte</value>
+        <value xml:lang="ru">От родительской статьи</value>
         <value xml:lang="th">จากครอบครัว</value>
+        <value xml:lang="zh">来自上级文章</value>
     </property>
     <property key="EcommerceFromSite">
         <value xml:lang="en">From Site</value>
+        <value xml:lang="es">De sitio :</value>
         <value xml:lang="fr">Du site</value>
         <value xml:lang="hi_IN">किस साइट से</value>
+        <value xml:lang="it">Dal Sito:</value>
         <value xml:lang="ja">From Site:</value>
+        <value xml:lang="nl">Van de website:</value>
+        <value xml:lang="ro">De la Sit:</value>
+        <value xml:lang="ru">От сайта:</value>
         <value xml:lang="th">จากที่ทำงาน</value>
+        <value xml:lang="zh">来自站点：</value>
     </property>
     <property key="EcommerceGiftAmount">
         <value xml:lang="en">Gift Amount</value>
+        <value xml:lang="es">Cantidad de regalo :</value>
         <value xml:lang="fr">Montant du cadeau</value>
         <value xml:lang="hi_IN">उपहार कुल:</value>
+        <value xml:lang="it">Importo Omaggio :</value>
         <value xml:lang="ja">Gift Amount:</value>
+        <value xml:lang="nl">Geschenk saldo:</value>
+        <value xml:lang="ro">Valoare Omagiu :</value>
+        <value xml:lang="ru">Сумма подарков:</value>
         <value xml:lang="th">จำนวนของขวัญ</value>
+        <value xml:lang="zh">礼品金额     :</value>
     </property>
     <property key="EcommerceGiftCardFrom">
         <value xml:lang="en">Gift Card From</value>
+        <value xml:lang="es">Certificado de regalo</value>
         <value xml:lang="fr">Carte cadeau de</value>
         <value xml:lang="hi_IN">उपहार कार्ड के द्वरा</value>
+        <value xml:lang="it">Carta Omaggio da</value>
         <value xml:lang="ja">Gift Card from</value>
+        <value xml:lang="nl">Geschenkkaart van</value>
+        <value xml:lang="ro">Carte Omagiu de la</value>
+        <value xml:lang="ru">Дисконтная карта от</value>
         <value xml:lang="th">รูปแบบบัตรของขวัญ</value>
+        <value xml:lang="zh">礼品卡来自</value>
     </property>
     <property key="EcommerceGiftCardNewBalance">
         <value xml:lang="en">Gift Card New Balance</value>
+        <value xml:lang="es">El nuevo balance es :</value>
         <value xml:lang="fr">Nouveau solde de la carte cadeau</value>
         <value xml:lang="hi_IN">आपका नया शेष है:</value>
+        <value xml:lang="it">Il nuovo bilancio è :</value>
         <value xml:lang="ja">The new balance is :</value>
+        <value xml:lang="nl">Het nieuwe saldo is :</value>
+        <value xml:lang="ro">Noul bilant este :</value>
+        <value xml:lang="ru">Новый баланс :</value>
         <value xml:lang="th">ยอดใหม่ของบัตรของขวัญ</value>
+        <value xml:lang="zh">新的余额是：</value>
     </property>
     <property key="EcommerceGiftCardRefunded">
         <value xml:lang="en">Gift Card Refunded</value>
+        <value xml:lang="es">Su orden ha sido marcada para ser reembolsada</value>
         <value xml:lang="fr">Carte cadeau remboursée</value>
         <value xml:lang="hi_IN">आपके आदेश को वापस करने के लिए चुना गया है</value>
+        <value xml:lang="it">Il tuo ordine è stato impostato per essere rimborsato.</value>
         <value xml:lang="ja">Your order has been flagged to be refunded.</value>
+        <value xml:lang="nl">Uw bestelling is gemarkeerd om terug te worden betaald.</value>
+        <value xml:lang="ro">Comanda ta a fost setata pentru a fi rambursata.</value>
+        <value xml:lang="ru">Ваш заказ помечен как возвращенный.</value>
         <value xml:lang="th">ชดใช้บัตรของขวัญ</value>
+        <value xml:lang="zh">你的订单已经标记为退款。</value>
     </property>
     <property key="EcommerceGiftCardReloadFailed">
         <value xml:lang="en">Gift Card Reload Failed</value>
+        <value xml:lang="es">Recarga de certificado de regalo fallida. El código del error es:</value>
         <value xml:lang="fr">Le rechargement de la carte cadeau a échoué</value>
         <value xml:lang="hi_IN">उपहार कार्ड क्रिया असफल, जवाबी कोड है:</value>
+        <value xml:lang="it">Processo di Ricarica Carta Omaggio Fallito con il codice di risposta:</value>
         <value xml:lang="ja">Gift Card Reload Process Failed with response code:</value>
+        <value xml:lang="nl">Geschenkkaart opwaardering mislukt met de antwoord kode:</value>
+        <value xml:lang="ro">Proces de Reincarcare Carte Omagiu Falita cu  cod de raspuns:</value>
+        <value xml:lang="ru">Перезагрузка дисконтной карты не удалась с кодом ответа:</value>
         <value xml:lang="th">เกิดความผิดพลาดในการใส่บัตรของขวัญเพิ่ม</value>
+        <value xml:lang="zh">礼品卡充值过程失败，响应码为：</value>
     </property>
     <property key="EcommerceGiftCardReloaded">
         <value xml:lang="en">Gift Card Reloaded</value>
+        <value xml:lang="es">ha sido recargada.</value>
         <value xml:lang="fr">Carte cadeau rechargée</value>
         <value xml:lang="hi_IN">को लोड किया जा चुका है.</value>
+        <value xml:lang="it">Carta Regalo è stata ricaricata.</value>
+        <value xml:lang="nl">is heropgewaardeerd</value>
+        <value xml:lang="ro">a fost reincarcata.</value>
+        <value xml:lang="ru">перезагружена.</value>
         <value xml:lang="ja">has been reloaded.</value>
         <value xml:lang="th">ใส่บัตรของขวัญเพิ่ม</value>
+        <value xml:lang="zh">已经充值了。</value>
     </property>
     <property key="EcommerceGiftWrapAllItems">
         <value xml:lang="en">Gift Wrap All Items</value>
+        <value xml:lang="es">Empaquetar todos los items</value>
         <value xml:lang="fr">Emballage cadeau pour tous les articles</value>
         <value xml:lang="hi_IN">सारे सामान को पैक उपहार पैक कराऐं</value>
+        <value xml:lang="it">Omaggio Ingloba Tutte le Righe</value>
         <value xml:lang="ja">Gift Wrap All Items</value>
+        <value xml:lang="nl">Geschenkverpakking voor alle items</value>
+        <value xml:lang="ro">Omagiul Inglobeaza Toate Liniile</value>
+        <value xml:lang="ru">Подарочная упаковка для всех позиций</value>
         <value xml:lang="th">ห่อของขวัญทั้งหมด</value>
+        <value xml:lang="zh">礼品包装全部明细</value>
     </property>
     <property key="EcommerceGoToList">
         <value xml:lang="cs">Jdi na seznam</value>
+        <value xml:lang="de">Zur Liste</value>
         <value xml:lang="en">GoToList</value>
+         <value xml:lang="es">Ir a la lista</value>
         <value xml:lang="fr">Aller à la liste</value>
         <value xml:lang="hi_IN">सुची पर जाऐं</value>
+        <value xml:lang="it">Vai Alla Lista</value>
         <value xml:lang="ja">Go To List</value>
+        <value xml:lang="nl">Ga naar de lijst</value>
+        <value xml:lang="pt_PT">Ir à Lista</value>
+        <value xml:lang="ro">Dute La Lista</value>
+        <value xml:lang="ru">Перейти к списку</value>
         <value xml:lang="th">ไปยังรายการ</value>
+        <value xml:lang="zh">转到列表</value>
     </property>
     <property key="EcommerceGold">
         <value xml:lang="en">Gold</value>
+        <value xml:lang="es">Oro</value>
         <value xml:lang="fr">Or</value>
         <value xml:lang="hi_IN">स्वर्ण</value>
+        <value xml:lang="it">Oro</value>
         <value xml:lang="ja">Gold</value>
+        <value xml:lang="nl">Goud</value>
+        <value xml:lang="ro">Aur</value>
+        <value xml:lang="ru">Золотой</value>
         <value xml:lang="th">สีทอง</value>
+        <value xml:lang="zh">金牌</value>
     </property>
     <property key="EcommerceHighToLow">
         <value xml:lang="en">High To Low</value>
+        <value xml:lang="es">de mayor a menor</value>
         <value xml:lang="fr">De haut en bas</value>
         <value xml:lang="hi_IN">ज्यादा से कम</value>
+        <value xml:lang="it">Dall'Alto al Basso</value>
         <value xml:lang="ja">High to Low</value>
+        <value xml:lang="nl">Hoog tot laag</value>
+        <value xml:lang="ro">De Sus in Jos</value>
+        <value xml:lang="ru">От высокого к низкому</value>
         <value xml:lang="th">สูงถึงต่ำ</value>
+        <value xml:lang="zh">从高到低</value>
     </property>
     <property key="EcommerceImage">
         <value xml:lang="en">Image</value>
+        <value xml:lang="es">Imagen</value>
         <value xml:lang="fr">Image</value>
         <value xml:lang="hi_IN">तस्वीर</value>
+        <value xml:lang="it">Immagine</value>
         <value xml:lang="ja">Image</value>
+        <value xml:lang="nl">Plaatje</value>
+        <value xml:lang="ro">Imagine</value>
+        <value xml:lang="ru">Изображение</value>
         <value xml:lang="th">รูปภาพ</value>
+        <value xml:lang="zh">图像</value>
     </property>
     <property key="EcommerceImageCenteredAbove">
         <value xml:lang="en">Image Centered Above</value>
+        <value xml:lang="es">Imagen centrada</value>
         <value xml:lang="fr">Image centrée au dessus</value>
         <value xml:lang="hi_IN">तस्वीर उपर बीच में है</value>
+        <value xml:lang="it">Immagine centrata sotto</value>
         <value xml:lang="ja">Image centered above</value>
+        <value xml:lang="nl">Plaatje gecentreerd erboven</value>
+        <value xml:lang="ro">Imagine centrata dedesubt</value>
+        <value xml:lang="ru">Изображение по центру ниже</value>
         <value xml:lang="th">จัดภาพไว้ด้านบนตรงกลาง</value>
+        <value xml:lang="zh">图像居中顶对齐</value>
     </property>
     <property key="EcommerceImageCenteredAboveFile">
         <value xml:lang="en">Image Centered Above File</value>
+        <value xml:lang="es">Imagen centrada desde archivo</value>
         <value xml:lang="fr">Image centrée au dessus du fichier</value>
         <value xml:lang="hi_IN">फाइल का तस्वीर बीच में है</value>
+        <value xml:lang="it">Immagine centrata sotto il file</value>
         <value xml:lang="ja">Image centered above from file</value>
+        <value xml:lang="nl">Plaatjes gecentreerd boven het bestand</value>
+        <value xml:lang="ro">Imagine centrata sub fisier</value>
+        <value xml:lang="ru">Изображение из файла по центру ниже</value>
         <value xml:lang="th">จัดภาพไว้ตรงกลางบนไฟล์</value>
+        <value xml:lang="zh">图像居中顶对齐来自文件</value>
     </property>
     <property key="EcommerceImageFileName">
         <value xml:lang="en">Image File Name</value>
+        <value xml:lang="es">Nombre de la imagen</value>
         <value xml:lang="fr">Nom du fichier image </value>
         <value xml:lang="hi_IN">फाइल की तस्वीर का नाम</value>
+        <value xml:lang="it">Name File Immagine</value>
         <value xml:lang="ja">Image File Name</value>
+        <value xml:lang="nl">Bestandsnaam van het plaatje</value>
+        <value xml:lang="ro">Nume Fisier Imagine</value>
+        <value xml:lang="ru">Имя файла изображения</value>
         <value xml:lang="th">ชื่อรูปภาพ</value>
+        <value xml:lang="zh">图像文件名</value>
     </property>
     <property key="EcommerceImageInformation">
         <value xml:lang="en">Image Information</value>
+        <value xml:lang="es">Información de la imagen</value>
         <value xml:lang="fr">Information sur l'image</value>
         <value xml:lang="hi_IN">तस्वीर जानकारी</value>
+        <value xml:lang="it">Informazioni Immagine</value>
         <value xml:lang="ja">Image Information</value>
+        <value xml:lang="nl">Informatie over het plaatje</value>
+        <value xml:lang="ro">Informatii Imagine</value>
+        <value xml:lang="ru">Информация об изображении</value>
         <value xml:lang="th">ข้อมูลรูปภาพ</value>
+        <value xml:lang="zh">图像信息</value>
     </property>
     <property key="EcommerceImageLeft">
         <value xml:lang="en">Image Left</value>
+        <value xml:lang="es">Imagen a la izquierda</value>
         <value xml:lang="fr">Image gauche</value>
         <value xml:lang="hi_IN">तस्वीर बाऐं, लिख़ीत आजू बाजू</value>
+        <value xml:lang="it">Immagine sinistra, flusso del testo intorno.</value>
         <value xml:lang="ja">Image left, text flows around.</value>
+        <value xml:lang="nl">Plaatje links, de tekst wordt er omheen gegroepeerd</value>
+        <value xml:lang="ro">Imagine stanga, flux de text imrejur.</value>
+        <value xml:lang="ru">Изображение слева, текст обтекает вокруг.</value>
         <value xml:lang="th">รูปทางซ้าย</value>
+        <value xml:lang="zh">图像居左、文字环绕。</value>
     </property>
     <property key="EcommerceInResponseTo">
         <value xml:lang="en">In Response To</value>
+        <value xml:lang="es">En respuesta a :</value>
         <value xml:lang="fr">En réponse à</value>
         <value xml:lang="hi_IN">सेवा में:</value>
+        <value xml:lang="it">In risposta a:</value>
         <value xml:lang="ja">In response to:</value>
+        <value xml:lang="nl">In antwoord op:</value>
+        <value xml:lang="ro">In timpul raspunsului la:</value>
+        <value xml:lang="ru">В ответ на:</value>
         <value xml:lang="th">คำตอบถึง</value>
-    </property>
-    <property key="EcommerceIncludes">
-        <value xml:lang="cs">včetně</value>
-        <value xml:lang="en">Includes</value>
-        <value xml:lang="fr">Inclut</value>
-        <value xml:lang="hi_IN">संयुक्त करना</value>
-        <value xml:lang="ja">Includes</value>
-        <value xml:lang="th">รวม</value>
-    </property>
-    <property key="EcommerceIsAPromotionalItem">
-        <value xml:lang="en">Is A Promotional Item</value>
-        <value xml:lang="fr">C'est un article en prommotion</value>
-        <value xml:lang="hi_IN">एक प्रोत्साहन सामान है</value>
-        <value xml:lang="ja">Is a Promotional Item</value>
-        <value xml:lang="th">เป็นโปรโมชั่นของสิ่งนี้ใช่หรือไม่</value>
+        <value xml:lang="zh">回答：</value>
     </property>
     <property key="EcommerceIsDefault">
         <value xml:lang="en">Is Default</value>
+        <value xml:lang="es">es default</value>
         <value xml:lang="fr">Valeur par défaut</value>
         <value xml:lang="hi_IN">सामान्य है</value>
+        <value xml:lang="it">E' di Default</value>
         <value xml:lang="ja">Is Default</value>
+        <value xml:lang="nl">Is Default</value>
+        <value xml:lang="ro">Este de Default</value>
+        <value xml:lang="ru">по умолчанию</value>
         <value xml:lang="th">นี่คือค่าที่เลือกใช่หรือไม่</value>
-    </property>
-    <property key="EcommerceItem">
-        <value xml:lang="cs">Položka</value>
-        <value xml:lang="en">Item </value>
-        <value xml:lang="en">Article </value>
-        <value xml:lang="hi_IN">सामान</value>
-        <value xml:lang="ja">Item</value>
-        <value xml:lang="th">รายการ</value>
-    </property>
-    <property key="EcommerceItemN">
-        <value xml:lang="en">ItemN</value>
-        <value xml:lang="fr">Article n°</value>
-        <value xml:lang="hi_IN">सामान #</value>
-        <value xml:lang="ja">Item #</value>
-        <value xml:lang="th">รายการ #</value>
+        <value xml:lang="zh">缺省</value>
     </property>
     <property key="EcommerceItemTotal">
         <value xml:lang="cs">Položka celkem</value>
+        <value xml:lang="de">Gesamtsumme</value>
         <value xml:lang="en">Item Total</value>
+        <value xml:lang="es">Total</value>
         <value xml:lang="fr">Total article</value>
         <value xml:lang="hi_IN">कुल सामान</value>
+        <value xml:lang="it">Totale Riga</value>
         <value xml:lang="ja">Item Total</value>
+        <value xml:lang="nl">Item Totaal</value>
+        <value xml:lang="pt_PT">Total de Itens</value>
+        <value xml:lang="ro">Total Linie</value>
+        <value xml:lang="ru">Позиций всего</value>
         <value xml:lang="th">รายการรวม</value>
-    </property>
-    <property key="EcommerceItems">
-        <value xml:lang="cs">Položky</value>
-        <value xml:lang="en">Items</value>
-        <value xml:lang="fr">Articles</value>
-        <value xml:lang="hi_IN">सामान</value>
-        <value xml:lang="ja">Items</value>
-        <value xml:lang="th">รายการ</value>
+        <value xml:lang="zh">明细合计</value>
     </property>
     <property key="EcommerceItemsfromShopingList">
         <value xml:lang="cs">Položky z nákupního seznamu; aktualizovat počty ze stránky sezamu</value>
+        <value xml:lang="de">Artikel von einer Einkaufsliste; Mengen auf der Listenseite aktualisieren</value>
         <value xml:lang="en">Items from Shoping List</value>
+        <value xml:lang="es">Items de la lista de compras, actualizar cantidades desde la página de listas</value>
         <value xml:lang="fr">Articles de la liste d'achats</value>
         <value xml:lang="hi_IN">ख़रीदीरी सूची से सामान, सूची पृष्ठ से सामान ठीक करें</value>
+        <value xml:lang="it">Righe da una lista di acquisto; aggiorna le quantità dalla lista di pagina</value>
         <value xml:lang="ja">Items from a shopping list; update quantities from list page</value>
+        <value xml:lang="nl">Items van een boodschappenlijst, modificeer van de lijst pagina</value>
+        <value xml:lang="pt_PT">Itens de uma Lista de Compras; actualizar quantidades da lista na página</value>
+        <value xml:lang="ro">Linii dintr-o lista de cumparari; actualizeaza cantitatile de la lista din pagina</value>
+        <value xml:lang="ru">Позиций из списка покупок; обновить количество со страницы списка</value>
         <value xml:lang="th">สินค้าจากรายการที่ซื้อ</value>
+        <value xml:lang="zh">明细来自购物清单；从列表页更新数量</value>
     </property>
     <property key="EcommerceLastCategories">
         <value xml:lang="cs">Poslední kategorie</value>
+        <value xml:lang="de">Letzte Kategorien</value>
         <value xml:lang="en">Last Categories</value>
+        <value xml:lang="es">Últimas categorías</value>
         <value xml:lang="fr">Dernières catégories</value>
         <value xml:lang="hi_IN">पिछली सूचि</value>
+        <value xml:lang="it">Ultime Categorie</value>
         <value xml:lang="ja">最近表示したカテゴリ</value>
+        <value xml:lang="nl">Laatste Categorien</value>
+        <value xml:lang="ro">Ultimele Categorii</value>
+        <value xml:lang="ru">Последние категории</value>
         <value xml:lang="th">หมวดหมู่สุดท้าย</value>
+        <value xml:lang="zh">最近浏览的分类</value>
     </property>
     <property key="EcommerceLastContent">
         <value xml:lang="en">Last Content</value>
+        <value xml:lang="es">Último contenido</value>
         <value xml:lang="fr">Dernier contenu</value>
         <value xml:lang="hi_IN">अतिंम अंतर्वस्तु अंश</value>
+        <value xml:lang="it">Ultime Contenuto</value>
+        <value xml:lang="nl">Laatste Inhoud</value>
+        <value xml:lang="ro">Ultimul  Continut</value>
+        <value xml:lang="ru">Последнее содержимое</value>
         <value xml:lang="ja">Last Content</value>
         <value xml:lang="th">หัวข้อสุดท้าย</value>
+        <value xml:lang="zh">最近浏览的内容</value>
     </property>
     <property key="EcommerceLastProducts">
         <value xml:lang="cs">Poslední výrobky</value>

Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/cart/microcart.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/cart/microcart.ftl?rev=656832&r1=656831&r2=656832&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/cart/microcart.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/cart/microcart.ftl Thu May 15 13:58:35 2008
@@ -26,7 +26,7 @@
     <div>
         <#if (shoppingCartSize > 0)>
             ${uiLabelMap.EcommerceCartHas} ${shoppingCart.getTotalQuantity()}
-            <#if shoppingCart.getTotalQuantity() == 1>${uiLabelMap.EcommerceItem}<#else/>${uiLabelMap.EcommerceItems}</#if>,
+            <#if shoppingCart.getTotalQuantity() == 1>${uiLabelMap.OrderItem}<#else/>${uiLabelMap.OrderItems}</#if>,
             <@ofbizCurrency amount=shoppingCart.getGrandTotal() isoCode=shoppingCart.getCurrency()/>
         <#else>
             ${uiLabelMap.EcommerceShoppingCartEmpty}

Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/advancedsearch.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/advancedsearch.ftl?rev=656832&r1=656831&r2=656832&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/advancedsearch.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/advancedsearch.ftl Thu May 15 13:58:35 2008
@@ -124,8 +124,8 @@
     <h2>${uiLabelMap.EcommerceLastSearches}...</h2>
   
     <div class="tabletext">
-      <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.EcommerceClearSearchHistory}</a>
-	${uiLabelMap.EcommerceClearSearchHistoryNote}
+      <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderClearSearchHistory}</a>
+	${uiLabelMap.OrderClearSearchHistoryNote}
     </div>
     <#list searchOptionsHistoryList as searchOptions>
     <#-- searchOptions type is ProductSearchSession.ProductSearchOptions -->

Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/content/ContentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/content/ContentForms.xml?rev=656832&r1=656831&r2=656832&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/content/ContentForms.xml (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/content/ContentForms.xml Thu May 15 13:58:35 2008
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file

Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/digitalproductedit.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/digitalproductedit.ftl?rev=656832&r1=656831&r2=656832&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/digitalproductedit.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/digitalproductedit.ftl Thu May 15 13:58:35 2008
@@ -72,7 +72,7 @@
 <#if supplierProduct?has_content>
 <div class="screenlet">
     <div class="screenlet-header">
-        <div class="boxhead">${uiLabelMap.EcommerceDigitalProductFiles}</div>
+        <div class="boxhead">${uiLabelMap.OrderDigitalProductFiles}</div>
     </div>
     <div class="screenlet-body">
         <#list productContentAndInfoList as productContentAndInfo>

Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/forum/ForumForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/forum/ForumForms.xml?rev=656832&r1=656831&r2=656832&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/forum/ForumForms.xml (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/forum/ForumForms.xml Thu May 15 13:58:35 2008
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file

Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderitems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderitems.ftl?rev=656832&r1=656831&r2=656832&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderitems.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderitems.ftl Thu May 15 13:58:35 2008
@@ -206,7 +206,7 @@
                         </#if>
                       </#if>
                       <#if orderItemAdjustment.sourcePercentage?exists><b>${uiLabelMap.EcommerceRate}:</b> ${orderItemAdjustment.sourcePercentage}</#if>
-                      <#if orderItemAdjustment.customerReferenceId?has_content><b>${uiLabelMap.CustomerTaxID}:</b> ${orderItemAdjustment.customerReferenceId}</#if>
+                      <#if orderItemAdjustment.customerReferenceId?has_content><b>${uiLabelMap.OrderCustomerTaxId}:</b> ${orderItemAdjustment.customerReferenceId}</#if>
                       <#if orderItemAdjustment.exemptAmount?exists><b>${uiLabelMap.EcommerceExemptAmount}:</b> ${orderItemAdjustment.exemptAmount}</#if>
                     </#if>
                   </div>

Modified: ofbiz/trunk/applications/ecommerce/widget/blog/BlogMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/widget/blog/BlogMenus.xml?rev=656832&r1=656831&r2=656832&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/widget/blog/BlogMenus.xml (original)
+++ ofbiz/trunk/applications/ecommerce/widget/blog/BlogMenus.xml Thu May 15 13:58:35 2008
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one
   or more contributor license agreements.  See the NOTICE file