svn commit: r1226964 - in /ofbiz/trunk/applications: accounting/config/AccountingEntityLabels.xml accounting/entitydef/entitymodel.xml workeffort/config/WorkEffortUiLabels.xml

[erwan]

Author: erwan
Date: Tue Jan  3 21:57:24 2012
New Revision: 1226964

URL: http://svn.apache.org/viewvc?rev=1226964&view=rev
Log:
OFBIZ-4640 French translation for RateType description and for WorkEffortTimesheetAlreadyExists label - A patch from Olivier Heintz

Modified:
    ofbiz/trunk/applications/accounting/config/AccountingEntityLabels.xml
    ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml
    ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml

Modified: ofbiz/trunk/applications/accounting/config/AccountingEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingEntityLabels.xml?rev=1226964&r1=1226963&r2=1226964&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingEntityLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingEntityLabels.xml Tue Jan  3 21:57:24 2012
@@ -3919,6 +3919,30 @@
         <value xml:lang="zh">供应商预付款</value>
         <value xml:lang="zh_TW">供應商預付款</value>
     </property>
+    <property key="RateType.description.AVERAGE_PAY_RATE">
+        <value xml:lang="en">Average Pay Rate</value>
+        <value xml:lang="fr">Prix moyen</value>
+    </property>
+    <property key="RateType.description.DISCOUNTED">
+        <value xml:lang="en">Discounted Rate</value>
+        <value xml:lang="fr">Réduit</value>
+    </property>
+    <property key="RateType.description.HIGH_PAY_RATE">
+        <value xml:lang="en">Highest Pay Rate</value>
+        <value xml:lang="fr">Prix haut</value>
+    </property>
+    <property key="RateType.description.LOW_PAY_RATE">
+        <value xml:lang="en">Lowest Pay Rate</value>
+        <value xml:lang="fr">Prix bas</value>
+    </property>
+    <property key="RateType.description.OVERTIME">
+        <value xml:lang="en">Overtime Rate</value>
+        <value xml:lang="fr">Majoré</value>
+    </property>
+    <property key="RateType.description.STANDARD">
+        <value xml:lang="en">Standard Rate</value>
+        <value xml:lang="fr">Standard</value>
+    </property>
     <property key="TaxAuthorityAssocType.description.COLLECT_AGENT">
         <value xml:lang="en">Collection Agent</value>
         <value xml:lang="fr">Agent percepteur</value>

Modified: ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml?rev=1226964&r1=1226963&r2=1226964&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml Tue Jan  3 21:57:24 2012
@@ -3904,7 +3904,7 @@ under the License.
     </view-entity>
 
   <entity entity-name="RateType" package-name="org.ofbiz.accounting.rate"
-    title="Rate Type Entity">
+    title="Rate Type Entity" default-resource-name="AccountingEntityLabels">
     <field name="rateTypeId" type="id-ne"></field>
     <field name="description" type="description"></field>
     <prim-key field="rateTypeId"/>

Modified: ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml?rev=1226964&r1=1226963&r2=1226964&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml (original)
+++ ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml Tue Jan  3 21:57:24 2012
@@ -4135,6 +4135,7 @@
     </property>
     <property key="WorkEffortTimesheetAlreadyExists">
         <value xml:lang="en">Time sheet already exist, not created an other one.</value>
+        <value xml:lang="fr">La feuille d'activité existe déjà, pas de nouvelle création.</value>
         <value xml:lang="it">Timbratura già esistente, non crearne un'altra.</value>
         <value xml:lang="zh">已经存在时间表，不能再建一个。</value>
     </property>