svn commit: r1855498 - in /ofbiz/ofbiz-framework/branches/release18.12: ./ framework/common/config/CommonUiLabels.xml

[Deepak Dixit-5]

Author: deepak
Date: Thu Mar 14 09:26:30 2019
New Revision: 1855498

URL: http://svn.apache.org/viewvc?rev=1855498&view=rev
Log:
Applied fix from trunk for revision: 1855497
===

Reverted: Changes done at r#1854306, Removed the extra space from CommonBranch uiLabel values

Modified:
    ofbiz/ofbiz-framework/branches/release18.12/   (props changed)
    ofbiz/ofbiz-framework/branches/release18.12/framework/common/config/CommonUiLabels.xml

Propchange: ofbiz/ofbiz-framework/branches/release18.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 14 09:26:30 2019
@@ -10,4 +10,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1849931,1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850914,1850918,1850921,1850948,1850953,1851006,1851013,1851068,1851074,1851130,1851158,1851200,1851224,1851247,1851254,1851315,1851319,1851350,1851353,1851433,1851500,1851805,1851885,1851998,1852503,1852587,1852818,1852882,1853070,1853109,1853691,1853745,1853750,1854306,1854457,1854683,1855078,1855083,1855287,1855371,1855403,1855488,1855492
+/ofbiz/ofbiz-framework/trunk:1849931,1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850914,1850918,1850921,1850948,1850953,1851006,1851013,1851068,1851074,1851130,1851158,1851200,1851224,1851247,1851254,1851315,1851319,1851350,1851353,1851433,1851500,1851805,1851885,1851998,1852503,1852587,1852818,1852882,1853070,1853109,1853691,1853745,1853750,1854306,1854457,1854683,1855078,1855083,1855287,1855371,1855403,1855488,1855492,1855497

Modified: ofbiz/ofbiz-framework/branches/release18.12/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/framework/common/config/CommonUiLabels.xml?rev=1855498&r1=1855497&r2=1855498&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release18.12/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/ofbiz-framework/branches/release18.12/framework/common/config/CommonUiLabels.xml Thu Mar 14 09:26:30 2019
@@ -1389,9 +1389,9 @@
         <value xml:lang="zh-TW">回報</value>
     </property>
     <property key="CommonBranch">
-        <value xml:lang="en"> branch</value>
-        <value xml:lang="es"> rama</value>
-        <value xml:lang="fr"> branche</value>
+        <value xml:lang="en">branch</value>
+        <value xml:lang="es">rama</value>
+        <value xml:lang="fr">branche</value>
     </property>
     <property key="CommonBuiltOn">
         <value xml:lang="en">built on</value>