svn commit: r1729100 - in /ofbiz/branches/release15.12: ./ applications/order/config/OrderUiLabels.xml framework/common/config/SecurityUiLabels.xml

Author: jleroux
Date: Mon Feb  8 08:40:32 2016
New Revision: 1729100

URL: http://svn.apache.org/viewvc?rev=1729100&view=rev
Log:
"Applied fix from trunk for revision: 1726486"  (jleroux: I also fixed OrderOrderQuotePrices by hand, not sure from where it came)
------------------------------------------------------------------------
r1726486 | nmalin | 2016-01-24 13:50:01 +0100 (dim. 24 janv. 2016) | 1 ligne

correct locale (en to fr) associate to french translation
------------------------------------------------------------------------

Modified:
    ofbiz/branches/release15.12/   (props changed)
    ofbiz/branches/release15.12/applications/order/config/OrderUiLabels.xml
    ofbiz/branches/release15.12/framework/common/config/SecurityUiLabels.xml

Propchange: ofbiz/branches/release15.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb  8 08:40:32 2016
@@ -9,4 +9,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724954,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726493,1726828,1728398,1728411,1729005,1729078
+/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724954,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1728398,1728411,1729005,1729078

Modified: ofbiz/branches/release15.12/applications/order/config/OrderUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/order/config/OrderUiLabels.xml?rev=1729100&r1=1729099&r2=1729100&view=diff
==============================================================================
--- ofbiz/branches/release15.12/applications/order/config/OrderUiLabels.xml (original)
+++ ofbiz/branches/release15.12/applications/order/config/OrderUiLabels.xml Mon Feb  8 08:40:32 2016
@@ -8690,7 +8690,6 @@
         <value xml:lang="en">Quote Prices</value>
         <value xml:lang="fr">Prix du devis</value>
         <value xml:lang="es">Precios del presupuesto</value>
-        <value xml:lang="fr">Prix du devis</value>
         <value xml:lang="it">Prezzi Preventivo</value>
         <value xml:lang="ja">見積価格</value>
         <value xml:lang="nl">Offerte-prijzen</value>

Modified: ofbiz/branches/release15.12/framework/common/config/SecurityUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/framework/common/config/SecurityUiLabels.xml?rev=1729100&r1=1729099&r2=1729100&view=diff
==============================================================================
--- ofbiz/branches/release15.12/framework/common/config/SecurityUiLabels.xml (original)
+++ ofbiz/branches/release15.12/framework/common/config/SecurityUiLabels.xml Mon Feb  8 08:40:32 2016
@@ -85,7 +85,7 @@
     </property>
     <property key="AnswerSecurityQuestion">
         <value xml:lang="en">Answer your Security Question</value>
-        <value xml:lang="en">Répondez à votre question de sécurité</value>
+        <value xml:lang="fr">Répondez à votre question de sécurité</value>
     </property>
     <property key="CertComponent">
         <value xml:lang="de">Komponente</value>
@@ -701,7 +701,7 @@
     </property>
     <property key="SecurityAnswer">
         <value xml:lang="en">Security Answer</value>
-        <value xml:lang="en">Réponse de sécurité</value>
+        <value xml:lang="fr">Réponse de sécurité</value>
     </property>
     <property key="SecurityGroups">
         <value xml:lang="de">Sicherheitsgruppen</value>
@@ -739,7 +739,7 @@
     </property>
     <property key="SecurityQuestion">
         <value xml:lang="en">Security Question</value>
-        <value xml:lang="en">Question de sécurité</value>
+        <value xml:lang="fr">Question de sécurité</value>
     </property>
     <property key="SecurityViewPermissionError">
         <value xml:lang="de">Sicherheitsfehler: Sie haben nicht die Berechtigung diese Seite anzusehen. ("SECURITY_VIEW" oder "SECURITY_ADMIN" benötigt) </value>