Author: jleroux
Date: Thu Apr 23 08:24:55 2009
New Revision: 767848
URL:
http://svn.apache.org/viewvc?rev=767848&view=revLog:
Applied fix from trunk for revision: 767845 (issues merged by hand)
Modified:
ofbiz/branches/release09.04/ (props changed)
ofbiz/branches/release09.04/framework/common/config/CommonUiLabels.xml
Propchange: ofbiz/branches/release09.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 23 08:24:55 2009
@@ -1 +1 @@
-/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822
+/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845
Modified: ofbiz/branches/release09.04/framework/common/config/CommonUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/common/config/CommonUiLabels.xml?rev=767848&r1=767847&r2=767848&view=diff==============================================================================
--- ofbiz/branches/release09.04/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/branches/release09.04/framework/common/config/CommonUiLabels.xml Thu Apr 23 08:24:55 2009
@@ -1995,7 +1995,7 @@
<value xml:lang="zh_CN">çµåé®ä»¶</value>
</property>
<property key="CommonEmptyHeader">
- <value xml:lang="en"> </value>
+ <value xml:lang="en"> </value>
</property>
<property key="CommonEnabled">
<value xml:lang="ar">شغاÙ</value>
@@ -8032,6 +8032,7 @@
<property key="FormFieldTitle_rejectButton">
<value xml:lang="ar">إضاÙØ©</value>
<value xml:lang="en">Reject</value>
+ <value xml:lang="fr">Rejeter</value>
</property>
<property key="FormFieldTitle_removeButton">
<value xml:lang="ar">Ùزع</value>
@@ -8047,6 +8048,10 @@
<value xml:lang="th">ลà¸</value>
<value xml:lang="zh">å é¤</value>
</property>
+ <property key="FormFieldTitle_saveButton">
+ <value xml:lang="en">Save</value>
+ <value xml:lang="fr">Conserver</value>
+ </property>
<property key="FormFieldTitle_searchButton">
<value xml:lang="ar">اÙبØØ«</value>
<value xml:lang="de">Suchen</value>