Author: jleroux
Date: Thu Jan 22 15:35:10 2015
New Revision: 1653916
URL:
http://svn.apache.org/r1653916Log:
No functional changes, fixes misc. typos while working on OFBIZ-1560
Modified:
ofbiz/trunk/applications/product/config/ProductUiLabels.xml
ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl
Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=1653916&r1=1653915&r2=1653916&view=diff==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Thu Jan 22 15:35:10 2015
@@ -11350,7 +11350,8 @@
<value xml:lang="zh-TW">æä½ååé¡,ç¨æ¼æä½</value>
</property>
<property key="ProductActionForRule">
- <value xml:lang="en">Action For Rule</value>
+ <value xml:lang="en">Actions For Rule</value>
+ <value xml:lang="fr">Actions pour la règle</value>
<value xml:lang="ja">ã«ã¼ã«ã«å¯¾ããã¢ã¯ã·ã§ã³</value>
<value xml:lang="vi">Ãp dụng cho ChÃnh sách</value>
<value xml:lang="zh">æä½ï¼ç¨äºè§å</value>
@@ -14510,6 +14511,7 @@
</property>
<property key="ProductConditionsForRule">
<value xml:lang="en">Conditions For Rule</value>
+ <value xml:lang="fr">Conditions pour la règle</value>
<value xml:lang="ja">ã«ã¼ã«ã«å¯¾ããæ¡ä»¶</value>
<value xml:lang="vi">Äiá»u kiá»n cho Luáºt áp dụng</value>
<value xml:lang="zh">æ¡ä»¶ï¼ç¨äºè§å</value>
Modified: ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl?rev=1653916&r1=1653915&r2=1653916&view=diff==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl Thu Jan 22 15:35:10 2015
@@ -388,7 +388,7 @@ under the License.
<div>${uiLabelMap.ProductNoActionProducts}</div>
</#if>
<div>
- <form method="post" action="<@ofbizUrl>createProductPromoProduct</@ofbizUrl>" name="createProductPromoProductActions">>
+ <form method="post" action="<@ofbizUrl>createProductPromoProduct</@ofbizUrl>" name="createProductPromoProductActions">
<input type="hidden" name="productPromoId" value="${productPromoId}" />
<input type="hidden" name="productPromoRuleId" value="${productPromoAction.productPromoRuleId}" />
<input type="hidden" name="productPromoActionSeqId" value="${productPromoAction.productPromoActionSeqId}" />