svn commit: r1859056 - in /ofbiz/ofbiz-framework/branches/release18.12: ./ applications/datamodel/data/seed/ContentSeedData.xml framework/common/config/CommonEntityLabels.xml

Author: jleroux
Date: Fri May 10 05:15:56 2019
New Revision: 1859056

URL: http://svn.apache.org/viewvc?rev=1859056&view=rev
Log:
"Applied fix from trunk for revision: 1859055 "
------------------------------------------------------------------------
r1859055 | jleroux | 2019-05-10 07:15:28 +0200 (ven. 10 mai 2019) | 4 lignes

Fixed: no functional changes

Fixes typos

------------------------------------------------------------------------

Modified:
    ofbiz/ofbiz-framework/branches/release18.12/   (props changed)
    ofbiz/ofbiz-framework/branches/release18.12/applications/datamodel/data/seed/ContentSeedData.xml
    ofbiz/ofbiz-framework/branches/release18.12/framework/common/config/CommonEntityLabels.xml

Propchange: ofbiz/ofbiz-framework/branches/release18.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 10 05:15:56 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,1855497,1855501,1855898,1856212,1856405,1856455,1856459-1856460,1856484,1856598,1856610,1856613,1856617,1856667,1857088,1857099,1857152,1857154,1857173,1857180,1857213,1857392,1857617,1857692,1857813,1858035,1858092,1858180,1858250,1858256,1858275,1858319,1858347,1858432,1858444,1858483,1858523,1858539,1858965,1858980,1859033
+/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,1855501,1855898,1856212,1856405,1856455,1856459-1856460,1856484,1856598,1856610,1856613,1856617,1856667,1857088,1857099,1857152,1857154,1857173,1857180,1857213,1857392,1857617,1857692,1857813,1858035,1858092,1858180,1858250,1858256,1858275,1858319,1858347,1858432,1858444,1858483,1858523,1858539,1858965,1858980,1859033,1859055

Modified: ofbiz/ofbiz-framework/branches/release18.12/applications/datamodel/data/seed/ContentSeedData.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/applications/datamodel/data/seed/ContentSeedData.xml?rev=1859056&r1=1859055&r2=1859056&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release18.12/applications/datamodel/data/seed/ContentSeedData.xml (original)
+++ ofbiz/ofbiz-framework/branches/release18.12/applications/datamodel/data/seed/ContentSeedData.xml Fri May 10 05:15:56 2019
@@ -176,12 +176,12 @@ under the License.
     <StatusItem description="Available" sequenceId="10" statusCode="AVAILABLE" statusId="CTNT_AVAILABLE" statusTypeId="CONTENT_STATUS"/>
 
     <StatusValidChange statusId="CTNT_IN_PROGRESS" statusIdTo="CTNT_INITIAL_DRAFT" transitionName="First draft"/>
-    <StatusValidChange statusId="CTNT_IN_PROGRESS" statusIdTo="CTNT_PUBLISHED" transitionName="Publised, not revised"/>
+    <StatusValidChange statusId="CTNT_IN_PROGRESS" statusIdTo="CTNT_PUBLISHED" transitionName="published, not revised"/>
     <StatusValidChange statusId="CTNT_IN_PROGRESS" statusIdTo="CTNT_AVAILABLE" transitionName="Available"/>
     <StatusValidChange statusId="CTNT_INITIAL_DRAFT" statusIdTo="CTNT_REVISED_DRAFT" transitionName="Draft revised"/>
-    <StatusValidChange statusId="CTNT_INITIAL_DRAFT" statusIdTo="CTNT_PUBLISHED" transitionName="Initial draft Publised"/>
+    <StatusValidChange statusId="CTNT_INITIAL_DRAFT" statusIdTo="CTNT_PUBLISHED" transitionName="Initial draft published"/>
     <StatusValidChange statusId="CTNT_REVISED_DRAFT" statusIdTo="CTNT_FINAL_DRAFT" transitionName="Final draft"/>
-    <StatusValidChange statusId="CTNT_REVISED_DRAFT" statusIdTo="CTNT_PUBLISHED" transitionName="Revised draft Publised"/>
+    <StatusValidChange statusId="CTNT_REVISED_DRAFT" statusIdTo="CTNT_PUBLISHED" transitionName="Revised draft published"/>
     <StatusValidChange statusId="CTNT_FINAL_DRAFT" statusIdTo="CTNT_PUBLISHED" transitionName="Final draft Published"/>
     <StatusValidChange statusId="CTNT_PUBLISHED" statusIdTo="CTNT_DEACTIVATED" transitionName="Deactivated"/>
     <StatusValidChange statusId="CTNT_AVAILABLE" statusIdTo="CTNT_DEACTIVATED" transitionName="Available to Deactivated"/>

Modified: ofbiz/ofbiz-framework/branches/release18.12/framework/common/config/CommonEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/framework/common/config/CommonEntityLabels.xml?rev=1859056&r1=1859055&r2=1859056&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release18.12/framework/common/config/CommonEntityLabels.xml (original)
+++ ofbiz/ofbiz-framework/branches/release18.12/framework/common/config/CommonEntityLabels.xml Fri May 10 05:15:56 2019
@@ -14790,7 +14790,7 @@
     </property>
     <property key="StatusValidChange.transitionName.CTNT_INITIAL_DRAFT.CTNT_PUBLISHED">
         <value xml:lang="de">Erster Entwurf publiziert</value>
-        <value xml:lang="en">Initial draft Publised</value>
+        <value xml:lang="en">Initial draft published</value>
         <value xml:lang="es">Esbozo inicial publicado</value>
         <value xml:lang="fr">Brouillon initial publié</value>
         <value xml:lang="it">Bozza iniziale pubblicata</value>
@@ -14838,7 +14838,7 @@
     </property>
     <property key="StatusValidChange.transitionName.CTNT_IN_PROGRESS.CTNT_PUBLISHED">
         <value xml:lang="de">Publiziert, nicht überarbeitet</value>
-        <value xml:lang="en">Publised, not revised</value>
+        <value xml:lang="en">published, not revised</value>
         <value xml:lang="es">Publicado, sin revisar</value>
         <value xml:lang="fr">Publié, non corrigé</value>
         <value xml:lang="it">Pubblicato, non corretta</value>
@@ -14886,7 +14886,7 @@
     </property>
     <property key="StatusValidChange.transitionName.CTNT_REVISED_DRAFT.CTNT_PUBLISHED">
         <value xml:lang="de">Überarbeiteter Entwurf publiziert</value>
-        <value xml:lang="en">Revised draft Publised</value>
+        <value xml:lang="en">Revised draft published</value>
         <value xml:lang="es">Esbozo revisado publicado</value>
         <value xml:lang="fr">Brouillon corrigé et publié</value>
         <value xml:lang="it">Bozza corretta pubblicata</value>