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/11/19 21:11:42 UTC
svn commit: r719049 - in /ofbiz/trunk/applications: ecommerce/config/
ecommerce/templates/email/ ecommerce/webapp/ecommerce/content/
ecommerce/webapp/ecommerce/customer/ ecommerce/webapp/ecommerce/order/
ecommerce/webapp/ecommerce/quote/ ecommerce/weba...
Author: mrisaliti
Date: Wed Nov 19 12:11:42 2008
New Revision: 719049
URL: http://svn.apache.org/viewvc?rev=719049&view=rev
Log:
Renamed some labels from EcommerceUiLabels.xml (Clean up labels between order and ecommerce application OFBIZ-1780)
Modified:
ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml
ofbiz/trunk/applications/ecommerce/templates/email/ShipmentNotificationEmail.ftl
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/content/factoids.ftl
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/messagelist.ftl
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/quote/QuoteList.ftl
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/request/RequestList.ftl
ofbiz/trunk/applications/order/config/OrderUiLabels.xml
ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl
ofbiz/trunk/applications/product/config/ProductUiLabels.xml
ofbiz/trunk/applications/product/webapp/catalog/find/advancedsearch.ftl
Modified: ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml?rev=719049&r1=719048&r2=719049&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml (original)
+++ ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml Wed Nov 19 12:11:42 2008
@@ -463,6 +463,7 @@
<property key="EcommerceClickHereToEdit">
<value xml:lang="de">Hier klicken um zu Bearbeiten</value>
<value xml:lang="en">Click here to edit</value>
+ <value xml:lang="it">Clicca qui per aggiornare</value>
<value xml:lang="fr">Cliquez-ici pour modifier</value>
</property>
<property key="EcommerceCompleted">
@@ -540,6 +541,7 @@
<property key="EcommerceContinueToStep">
<value xml:lang="de">Fortfahren mit Schritt</value>
<value xml:lang="en">Continue to step</value>
+ <value xml:lang="it">Continua al passo</value>
<value xml:lang="fr">Continuer (prochaine étape)</value>
</property>
<property key="EcommerceDataResourceId">
@@ -704,6 +706,7 @@
<property key="EcommerceEnterPromoCode">
<value xml:lang="de">Aktionscode angeben</value>
<value xml:lang="en">Enter Promo Code</value>
+ <value xml:lang="it">Inserire codice promozione</value>
<value xml:lang="fr">Saisissez votre code de promotion</value>
</property>
<property key="EcommerceEnterQueryParameters">
@@ -818,6 +821,17 @@
<value xml:lang="th">à¸à¸³à¸à¸§à¸à¸à¸±à¸§à¸à¸¢à¹à¸²à¸</value>
<value xml:lang="zh">被å
é¤çéé¢</value>
</property>
+ <property key="EcommerceFactoids">
+ <value xml:lang="cs">VÄdÄli jste ?</value>
+ <value xml:lang="de">Wussten Sie schon?</value>
+ <value xml:lang="en">Did you know?</value>
+ <value xml:lang="fr">Le saviez-vous ?</value>
+ <value xml:lang="it">Sapevi che...?</value>
+ <value xml:lang="ro">Factoids</value>
+ <value xml:lang="ru">ФакÑÑ</value>
+ <value xml:lang="th">à¸à¸¸à¸à¸à¸£à¸²à¸à¸«à¸£à¸·à¸à¹à¸¡à¹ ?</value>
+ <value xml:lang="zh">ä½ ç¥éåï¼</value>
+ </property>
<property key="EcommerceFileManager">
<value xml:lang="de">Dateiverwaltung</value>
<value xml:lang="en">File Manager</value>
@@ -1319,6 +1333,10 @@
<value xml:lang="th">รายà¸à¸²à¸£à¸à¹à¸à¸ªà¸±à¸à¹à¸à¸</value>
<value xml:lang="zh">注æï¼å½ä½ 注åä¸ä¸ªçµåé®ä»¶èç³»å表ï¼ä½ 伿¶å°ä¸ä¸ªå¸¦æéªè¯ç åä¸ä¸ªé¾æ¥ççµåé®ä»¶ä»¥ä¾¿éªè¯ä½ ççµåé®ä»¶ææãä½ä¸ºé£ä¸ªé¾æ¥çæ¿ä»£æ¹å¼ï¼ä½ å¯ä»¥å¨è¿éè¾å
¥ä½ çéªè¯ç ã</value>
</property>
+ <property key="EcommerceLocation">
+ <value xml:lang="en">Location</value>
+ <value xml:lang="it">Luogo</value>
+ </property>
<property key="EcommerceLoggedToPost">
<value xml:lang="de">(Sie müssen angemeldet sein um Nachrichten zu schreiben)</value>
<value xml:lang="en">(You must be logged in to post)</value>
@@ -2064,6 +2082,7 @@
</property>
<property key="EcommerceRegister">
<value xml:lang="en">Register</value>
+ <value xml:lang="it">Registrati</value>
</property>
<property key="EcommerceRemoveSelected">
<value xml:lang="cs">ZruÅ¡it výbÄr</value>
@@ -2460,6 +2479,7 @@
<property key="EcommerceStep">
<value xml:lang="de">Schritt</value>
<value xml:lang="en">Step</value>
+ <value xml:lang="it">Passo</value>
<value xml:lang="fr">Etape</value>
</property>
<property key="EcommerceSubject">
@@ -2913,25 +2933,6 @@
<value xml:lang="th">à¹à¸¡à¹à¸¡à¸µà¸à¸²à¸£à¸à¸·à¹à¸à¸ªà¸´à¸à¸à¹à¸²à¸¥à¸à¸à¸°à¸à¸£à¹à¸²à¸à¸à¸à¸à¸¸à¸</value>
<value xml:lang="zh">ä½ çè´ç©è½¦æ¯ç©ºç</value>
</property>
- <property key="Factoids">
- <value xml:lang="cs">VÄdÄli jste ?</value>
- <value xml:lang="de">Wussten Sie schon?</value>
- <value xml:lang="en">Did you know?</value>
- <value xml:lang="fr">Le saviez-vous ?</value>
- <value xml:lang="it">Sapevi che...?</value>
- <value xml:lang="ro">Factoids</value>
- <value xml:lang="ru">ФакÑÑ</value>
- <value xml:lang="th">à¸à¸¸à¸à¸à¸£à¸²à¸à¸«à¸£à¸·à¸à¹à¸¡à¹ ?</value>
- <value xml:lang="zh">ä½ ç¥éåï¼</value>
- </property>
- <property key="ListPriceRange">
- <value xml:lang="de">Listenpreis Bereich</value>
- <value xml:lang="en">List Price Range</value>
- <value xml:lang="fr">Liste de fourchette de prix</value>
- <value xml:lang="it">Range prezzo di listino</value>
- <value xml:lang="ru">Ðиапазон Ñен</value>
- <value xml:lang="th">ราà¸à¸²</value>
- </property>
<property key="PageTitleAddContent">
<value xml:lang="de">Inhalt hinzufügen</value>
<value xml:lang="en">Add Content</value>
@@ -6528,7 +6529,7 @@
<value xml:lang="th">à¸à¸¥à¸à¸²à¸£à¸à¹à¸à¸«à¸²à¸à¸à¸à¸à¸¸à¸</value>
<value xml:lang="zh">ä½ æç´¢</value>
</property>
- <property key="QuoteHistory">
+ <property key="EcommerceQuoteHistory">
<value xml:lang="de">Angebot Historie</value>
<value xml:lang="en">Quote History</value>
<value xml:lang="fr">Historique des devis</value>
@@ -6539,7 +6540,7 @@
<value xml:lang="th">à¸à¹à¸à¸¡à¸¹à¸¥à¸à¹à¸²à¸à¸à¸´à¸</value>
<value xml:lang="zh">询价åå²è®°å½</value>
</property>
- <property key="RequestHistory">
+ <property key="EcommerceRequestHistory">
<value xml:lang="de">Anfrage Historie</value>
<value xml:lang="en">Request History</value>
<value xml:lang="fr">Historique des demandes</value>
@@ -6550,7 +6551,7 @@
<value xml:lang="th">à¸à¹à¸à¸¡à¸¹à¸¥à¸à¸³à¸£à¹à¸à¸</value>
<value xml:lang="zh">请æ±åå²è®°å½</value>
</property>
- <property key="ShipmentItems">
+ <property key="EcommerceShipmentItems">
<value xml:lang="de">Lieferpositionen</value>
<value xml:lang="en">Shipment Items</value>
<value xml:lang="fr">Articles en expédition</value>
Modified: ofbiz/trunk/applications/ecommerce/templates/email/ShipmentNotificationEmail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/templates/email/ShipmentNotificationEmail.ftl?rev=719049&r1=719048&r2=719049&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/templates/email/ShipmentNotificationEmail.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/templates/email/ShipmentNotificationEmail.ftl Wed Nov 19 12:11:42 2008
@@ -40,7 +40,7 @@
</table>
<br/>
<div class="screenlet-header">
- <div class="boxhead"><b>${uiLabelMap.ShipmentItems}</b></div>
+ <div class="boxhead"><b>${uiLabelMap.EcommerceShipmentItems}</b></div>
</div>
<div class="screenlet-body">
<table width="100%" border="0" cellpadding="0">
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/content/factoids.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/content/factoids.ftl?rev=719049&r1=719048&r2=719049&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/content/factoids.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/content/factoids.ftl Wed Nov 19 12:11:42 2008
@@ -32,7 +32,7 @@
<div id="factoids" class="screenlet">
<div class="screenlet-header">
- <div class="boxhead">${uiLabelMap.Factoids}</div>
+ <div class="boxhead">${uiLabelMap.EcommerceFactoids}</div>
</div>
<div class="screenlet-body">
<#assign count_1=0/>
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/messagelist.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/messagelist.ftl?rev=719049&r1=719048&r2=719049&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/messagelist.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/messagelist.ftl Wed Nov 19 12:11:42 2008
@@ -34,9 +34,9 @@
<td><div class="tabletext">${communicationEvent.subject?default("")}</div></td>
<td><div class="tabletext">${communicationEvent.entryDate}</div></td>
<td align="right">
- <a href="<@o...@ofbizUrl>" class="buttontext">[${uiLabelMap.EcommerceRead}]</a>
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.EcommerceRead}</a>
<#if isSentMessage>
- <a href="<@o...@ofbizUrl>" class="buttontext">[${uiLabelMap.PartyReply}]</a>
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.PartyReply}</a>
</#if>
</td>
</tr>
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl?rev=719049&r1=719048&r2=719049&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl Wed Nov 19 12:11:42 2008
@@ -220,7 +220,7 @@
<table>
<tbody>
<tr>
- <td valign="top" width="10%">Ship To:</td>
+ <td valign="top" width="10%">${uiLabelMap.OrderShipTo}:</td>
<td valign="top" width="30%">
<div>
<div id="completedShipToAttn"></div>
@@ -228,7 +228,7 @@
<div id="completedEmailAddress"></div>
</div>
</td>
- <td width="10%" valign="top">Location:</td>
+ <td width="10%" valign="top">${uiLabelMap.EcommerceLocation}:</td>
<td width="50%" valign="top">
<div>
<div id="completedShipToAddress1"></div>
@@ -433,7 +433,7 @@
<table width="35%" align="center">
<tbody>
<tr>
- <td valign="top" width="5%">Bill To:</td>
+ <td valign="top" width="5%">${uiLabelMap.OrderBillUpTo}:</td>
<td valign="top" width="20%">
<div>
<div id="completedBillToAttn"></div>
@@ -442,7 +442,7 @@
<div id="completedExpiryDate"></div>
</div>
</td>
- <td valign="top" width="5%">Location:</td>
+ <td valign="top" width="5%">${uiLabelMap.EcommerceLocation}:</td>
<td valign="top" width="50%">
<div>
<div id="completedBillToAddress1"></div>
@@ -452,7 +452,7 @@
</td>
</tr>
<tr>
- <td valign="top">Payment Method:</td>
+ <td valign="top">${uiLabelMap.AccountingPaymentMethodId}:</td>
<td valign="top"><div><div id="paymentMethod"></div></div></td>
</tr>
</tbody>
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/quote/QuoteList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/quote/QuoteList.ftl?rev=719049&r1=719048&r2=719049&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/quote/QuoteList.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/quote/QuoteList.ftl Wed Nov 19 12:11:42 2008
@@ -19,7 +19,7 @@
<div class="screenlet">
<div class="screenlet-header">
- <div class="boxhead">${uiLabelMap.QuoteHistory}</div>
+ <div class="boxhead">${uiLabelMap.EcommerceQuoteHistory}</div>
</div>
<div class="screenlet-body">
<table width="100%" cellpadding="1" cellspacing="0" border="0">
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/request/RequestList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/request/RequestList.ftl?rev=719049&r1=719048&r2=719049&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/request/RequestList.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/request/RequestList.ftl Wed Nov 19 12:11:42 2008
@@ -19,7 +19,7 @@
<div class="screenlet">
<div class="screenlet-header">
- <div class="boxhead">${uiLabelMap.RequestHistory}</div>
+ <div class="boxhead">${uiLabelMap.EcommerceRequestHistory}</div>
</div>
<div class="screenlet-body">
<table width="100%" cellpadding="1" cellspacing="0" border="0">
Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels.xml?rev=719049&r1=719048&r2=719049&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderUiLabels.xml (original)
+++ ofbiz/trunk/applications/order/config/OrderUiLabels.xml Wed Nov 19 12:11:42 2008
@@ -1926,7 +1926,7 @@
<property key="OrderBillUpTo">
<value xml:lang="cs">Faktura na</value>
<value xml:lang="de">Abbuchung bis</value>
- <value xml:lang="en">Bill Up To</value>
+ <value xml:lang="en">Bill To</value>
<value xml:lang="es">Facturar hasta</value>
<value xml:lang="fr">Facturé à </value>
<value xml:lang="hi_IN">यहाठतठà¤à¤¾ मà¥à¤²à¥à¤¯</value>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl?rev=719049&r1=719048&r2=719049&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl Wed Nov 19 12:11:42 2008
@@ -27,7 +27,7 @@
<fo:table-header>
<fo:table-row>
- <fo:table-cell><fo:block font-weight="bold">${uiLabelMap.ProductProduct}</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block font-weight="bold">${uiLabelMap.OrderProduct}</fo:block></fo:table-cell>
<fo:table-cell text-align="center"><fo:block font-weight="bold">${uiLabelMap.OrderQuantity}</fo:block></fo:table-cell>
<fo:table-cell text-align="center"><fo:block font-weight="bold">${uiLabelMap.OrderUnitList}</fo:block></fo:table-cell>
<fo:table-cell text-align="center"><fo:block font-weight="bold">${uiLabelMap.OrderSubTotal}</fo:block></fo:table-cell>
Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=719049&r1=719048&r2=719049&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Wed Nov 19 12:11:42 2008
@@ -4578,13 +4578,13 @@
<value xml:lang="th">à¸à¸¸à¸à¹à¸¡à¹à¸à¹à¸à¸à¸¡à¸µà¸à¸²à¸£à¸à¸à¸¸à¸à¸²à¸à¹à¸à¸à¸²à¸£à¸à¸³à¹à¸à¸´à¸à¸à¸²à¸£ ${methodShortDescription}. ("CATALOG${securityAction}" หรืภ"CATALOG_ADMIN" needed)</value>
<value xml:lang="zh">ä½ æ²¡ææéè¿è¡ ${methodShortDescription}ã(éè¦"CATALOG${securityAction}" æ "CATALOG_ADMIN")</value>
</property>
- <property key="ListPriceRange">
- <value xml:lang="de">Bereich Listenpreis</value>
+ <property key="ProductListPriceRange">
+ <value xml:lang="de">Listenpreis Bereich</value>
<value xml:lang="en">List Price Range</value>
<value xml:lang="es">Listar rango de precios</value>
- <value xml:lang="fr">Fourchette de prix</value>
- <value xml:lang="it">Intervallo Prezzo di Listino</value>
- <value xml:lang="ru">Ðиапазон пÑейÑкÑÑанÑнÑÑ
Ñен</value>
+ <value xml:lang="fr">Liste de fourchette de prix</value>
+ <value xml:lang="it">Range prezzo di listino</value>
+ <value xml:lang="ru">Ðиапазон Ñен</value>
<value xml:lang="th">à¸à¸±à¸à¸£à¸²à¸£à¸²à¸¢à¸à¸²à¸£à¸£à¸²à¸à¸²</value>
</property>
<property key="NoProductSpecifiedForUomConversion">
Modified: ofbiz/trunk/applications/product/webapp/catalog/find/advancedsearch.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/find/advancedsearch.ftl?rev=719049&r1=719048&r2=719049&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/find/advancedsearch.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/find/advancedsearch.ftl Wed Nov 19 12:11:42 2008
@@ -167,7 +167,7 @@
</tr>
<tr>
<td class="label" align="right" valign="top">
- ${uiLabelMap.ListPriceRange}:
+ ${uiLabelMap.ProductListPriceRange}:
</td>
<td valign="middle">
<div>