You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2008/12/22 13:52:24 UTC

svn commit: r728669 - in /ofbiz/trunk: applications/content/config/ applications/humanres/config/ applications/humanres/widget/ applications/humanres/widget/forms/ applications/product/config/ framework/common/config/

Author: jleroux
Date: Mon Dec 22 04:52:20 2008
New Revision: 728669

URL: http://svn.apache.org/viewvc?rev=728669&view=rev
Log:
Last touch to Human Res i18n, French l10n

Modified:
    ofbiz/trunk/applications/content/config/ContentUiLabels.xml
    ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml
    ofbiz/trunk/applications/humanres/widget/GlobalHRSettingScreens.xml
    ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml
    ofbiz/trunk/applications/product/config/ProductUiLabels.xml
    ofbiz/trunk/framework/common/config/CommonUiLabels.xml

Modified: ofbiz/trunk/applications/content/config/ContentUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/config/ContentUiLabels.xml?rev=728669&r1=728668&r2=728669&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/config/ContentUiLabels.xml (original)
+++ ofbiz/trunk/applications/content/config/ContentUiLabels.xml Mon Dec 22 04:52:20 2008
@@ -1586,16 +1586,6 @@
         <value xml:lang="th">ผลตอบรับทั่วไป</value>
         <value xml:lang="zh">常用反馈</value>
     </property>
-    <property key="FormFieldTitle_hasTable">
-        <value xml:lang="ar">يحوز على جدول</value>
-        <value xml:lang="de">Hat Tabelle</value>
-        <value xml:lang="en">Has Table</value>
-        <value xml:lang="fr">A une table</value>
-        <value xml:lang="it">Ha Tabella</value>
-        <value xml:lang="ro">Are Tabelul</value>
-        <value xml:lang="th">มีตาราง</value>
-        <value xml:lang="zh">有数据库表</value>
-    </property>
     <property key="FormFieldTitle_hint">
         <value xml:lang="ar">مساعدة</value>
         <value xml:lang="de">Hinweis</value>

Modified: ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml?rev=728669&r1=728668&r2=728669&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml (original)
+++ ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml Mon Dec 22 04:52:20 2008
@@ -152,25 +152,25 @@
     </property>
     <property key="FormFieldTitle_emplPositionTypeId">
         <value xml:lang="en">Empl Position Type Id</value>
-        <value xml:lang="fr">Réf. du type de position l'employé</value>
+        <value xml:lang="fr">Réf. du type de position</value>
         <value xml:lang="it">Tipo Posizione Impiegato</value>
         <value xml:lang="th">รหัสประเภทตำแหน่งพนักงาน</value>
     </property>
     <property key="FormFieldTitle_employeePartyId">
         <value xml:lang="en">Employee Party Id</value>
-        <value xml:lang="fr">Réf. de l'employé </value>
+        <value xml:lang="fr">Réf. de l'employé</value>
         <value xml:lang="it">Soggetto Impiegato</value>
         <value xml:lang="th">รหัสกลุ่มพนักงาน</value>
     </property>
     <property key="FormFieldTitle_employeeRoleTypeId">
         <value xml:lang="en">Employee Role Type Id</value>
-        <value xml:lang="fr">Type de rôle de 'employé </value>
+        <value xml:lang="fr">Type de rôle de l'employé</value>
         <value xml:lang="it">Tipo Ruolo Impiegato</value>
         <value xml:lang="th">รหัสประเภทสถานะพนักงาน</value>
     </property>
     <property key="FormFieldTitle_employmentAppSourceTypeId">
         <value xml:lang="en">Employment App Source Type Id</value>
-        <value xml:lang="fr">Réf. de type d'origine de demande d'emploi </value>
+        <value xml:lang="fr">Réf. de type d'origine de demande d'emploi</value>
         <value xml:lang="it">Tipo Origine Applicazione Impiegato</value>
         <value xml:lang="th">รหัสประเภทแหล่งที่มาการจ้างงาน</value>
     </property>
@@ -188,7 +188,7 @@
     </property>
     <property key="FormFieldTitle_exemptFlag">
         <value xml:lang="en">Exempt Flag</value>
-        <value xml:lang="fr">Balise d'exemption </value>
+        <value xml:lang="fr">Balise d'exemption</value>
         <value xml:lang="it">Flag Esenzione</value>
         <value xml:lang="th">Exempt Flag</value>
     </property>
@@ -428,6 +428,12 @@
         <value xml:lang="it">Motivazione Licenziamento</value>
         <value xml:lang="th">รหัสขอบเขตเหตุผล</value>
     </property>
+    <property key="FormFieldTitle_terminationTypeId">
+        <value xml:lang="en">Termination Type Id</value>
+        <value xml:lang="fr">Réf. de type de fin de contrat</value>
+        <value xml:lang="it">Tipo Licenziamento</value>
+        <value xml:lang="th">รหัสประเภทขอบเขตเหตุผล</value>
+    </property>
     <property key="FormFieldTitle_title">
         <value xml:lang="en">Title</value>
         <value xml:lang="fr">Titre</value>
@@ -438,7 +444,7 @@
     </property>    
     <property key="FormFieldTitle_unemploymentClaimDate">
         <value xml:lang="en">Unemployment Claim Date</value>
-        <value xml:lang="fr">Date de demande du chômage </value>
+        <value xml:lang="fr">Date de demande du chômage</value>
         <value xml:lang="it">Data Reclamo Disoccupazione</value>
         <value xml:lang="th">จำนวนผู้ว่างงานเรียกร้องวันที่</value>
     </property>
@@ -464,7 +470,7 @@
     </property>
     <property key="HumanResAddEmplLeaveType">
         <value xml:lang="en">Add EmplLeave Types</value>
-        <value xml:lang="fr">Ajoutez les types de congé</value>
+        <value xml:lang="fr">Ajouter un type de congé</value>
     </property>
     <property key="HumanResAddEmplPositionFulfillment">
         <value xml:lang="en">Add Position Fulfillment</value>
@@ -514,10 +520,18 @@
         <value xml:lang="en">Add Salary Step</value>
         <value xml:lang="fr">Ajouter l'augmentation de salaire</value>
     </property>
+    <property key="HumanResAddSkillType">
+        <value xml:lang="en">Add Skill Type</value>
+        <value xml:lang="fr">Ajouter un type de compétence</value>
+    </property>    
     <property key="HumanResAddTerminationReason">
         <value xml:lang="en">Add Termination Reason</value>
         <value xml:lang="fr">Ajouter la raison de la fin de contrat</value>
     </property>
+    <property key="HumanResAddTerminationType">
+        <value xml:lang="en">Add Termination Type</value>
+        <value xml:lang="fr">Ajouter un type de fin de contrat</value>
+    </property>
     <property key="HumanResAddUnemploymentClaim">
         <value xml:lang="en">Add Unemployment Claim</value>
         <value xml:lang="fr">Ajouter la demande de chômage</value>
@@ -786,7 +800,7 @@
     <property key="HumanResListPartyBenefits">
         <value xml:lang="en">List Party Benefits</value>
         <value xml:lang="fr">Liste d'avantages de l'acteur</value>
-        <value xml:lang="it">Lista Benefits Soggetto </value>
+        <value xml:lang="it">Lista Benefits Soggetto</value>
         <value xml:lang="th">รายการกลุ่มผลประโยชน์</value>
     </property>
     <property key="HumanResListPayHistories">
@@ -1030,6 +1044,10 @@
         <value xml:lang="it">Codice Soggetto A</value>
         <value xml:lang="th">ถึงรหัสกลุ่มผู้ใช้</value>
     </property>
+    <property key="HumanResFindPositionTypes">
+        <value xml:lang="en">Find Position Types</value>
+        <value xml:lang="fr">Rechercher les types de position</value>
+    </property>    
     <property key="HumanResNewPartySkill">
         <value xml:lang="en">New Party Skill</value>
         <value xml:lang="fr">Nouvelle compétence de l'acteur</value>
@@ -1058,6 +1076,10 @@
         <value xml:lang="en">New Person Training</value>
         <value xml:lang="fr">Nouvelle formation</value>
     </property>
+    <property key="HumanResNewEmplPositionType">
+        <value xml:lang="en">New Position Type</value>
+        <value xml:lang="fr">Nouveau type de position</value>
+    </property>    
     <property key="HumanResNewSalaryStep">
         <value xml:lang="en">New Salary Step</value>
         <value xml:lang="fr">Nouvelle augmentation de salaire</value>

Modified: ofbiz/trunk/applications/humanres/widget/GlobalHRSettingScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/GlobalHRSettingScreens.xml?rev=728669&r1=728668&r2=728669&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/GlobalHRSettingScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/GlobalHRSettingScreens.xml Mon Dec 22 04:52:20 2008
@@ -31,7 +31,7 @@
             <widgets>
                 <decorator-screen name="GlobalHRSettingsDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">                                                                                       
-                        <screenlet id="AddSkillTypePanel" title="${uiLabelMap.CommonAdd} ${uiLabelMap.ProjectMgrSkillType}" collapsible="true">
+                        <screenlet id="AddSkillTypePanel" title="${uiLabelMap.HumanResAddSkillType}" collapsible="true">
                             <include-form name="AddSkillType" location="component://humanres/widget/forms/GlobalHRSettingForms.xml"/>
                         </screenlet> 
                         <include-form name="ListSkillTypes" location="component://humanres/widget/forms/GlobalHRSettingForms.xml"/>
@@ -71,7 +71,7 @@
             <widgets>
                 <decorator-screen name="GlobalHRSettingsDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">                                                                                       
-                        <screenlet id="AddTerminationTypePanel" title="${uiLabelMap.CommonAdd} ${uiLabelMap.HumanResTerminationType}" collapsible="true">
+                        <screenlet id="AddTerminationTypePanel" title="${uiLabelMap.HumanResAddTerminationType}" collapsible="true">
                             <include-form name="AddTerminationType" location="component://humanres/widget/forms/GlobalHRSettingForms.xml"/>
                         </screenlet>
                         <include-form name="ListTerminationTypes" location="component://humanres/widget/forms/GlobalHRSettingForms.xml"/>
@@ -83,7 +83,7 @@
     <screen name="FindEmplPositionTypes">
         <section>
             <actions>
-                <set field="titleProperty" value="FindPositionTypes"/>
+                <set field="titleProperty" value="HumanResFindPositionTypes"/>
                 <set field="headerItem" value="EmplPositionTypes"/>
                 <set field="tabButtonItem" value="EmplPositionTypes"/>                
                 <set field="emplPositionTypeId" from-field="parameters.emplPositionTypeId"/>
@@ -95,7 +95,7 @@
                         <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
                             <decorator-section name="menu-bar">
                                 <container style="button-bar">
-                                    <link target="EditEmplPositionTypes" text="${uiLabelMap.CommonNew} ${uiLabelMap.HumanResEmplPositionType}" style="buttontext"/>
+                                    <link target="EditEmplPositionTypes" text="${uiLabelMap.HumanResNewEmplPositionType}" style="buttontext"/>
                                 </container>
                             </decorator-section>
                             <decorator-section name="search-options">
@@ -113,7 +113,7 @@
     <screen name="EditEmplPositionTypes">
         <section>
             <actions>
-                <set field="titleProperty" value="FindPositionTypes"/>
+                <set field="titleProperty" value="${uiLabelMap.HumanResEditFindPositionTypes}"/>
                 <set field="headerItem" value="EmplPositionTypes"/>
                 <set field="tabButtonItem" value="EmplPositionTypes"/>  
                 <set field="tabButtonItem2" value="EditEmplPositionType"/>
@@ -133,7 +133,7 @@
                                 <include-menu location="component://humanres/widget/Menus.xml" name="EmplPositionTypeTabBar"/>
                             </widgets>
                         </section>
-                        <screenlet title="${uiLabelMap.CommonEdit} ${uiLabelMap.HumanResEmplPositionType}">
+                        <screenlet title="${uiLabelMap.HumanResEditEmplPositionType}">
                             <section>
                                 <widgets>
                                     <include-form name="EditEmplPositionTypes" location="component://humanres/widget/forms/GlobalHRSettingForms.xml"/>

Modified: ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml?rev=728669&r1=728668&r2=728669&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml Mon Dec 22 04:52:20 2008
@@ -37,7 +37,7 @@
         <field name="fromDate"><date-find/></field>
         <field name="thruDate"><date-find/></field>
         <field name="terminationReasonId" title="${uiLabelMap.HumanResTerminationReasonId}"><lookup target-form-name="LookupTerminationReason"/></field>
-        <field name="terminationTypeId" title="${uiLabelMap.HumanResTerminationTypeId}">
+        <field name="terminationTypeId">
             <drop-down allow-empty="true" current-description="">
                 <entity-options description="${description}" key-field-name="terminationTypeId" entity-name="TerminationType">
                     <entity-order-by field-name="description"/>
@@ -64,7 +64,7 @@
         <field name="fromDate"><display also-hidden="true"/></field>
         <field name="thruDate"><display/></field>
         <field name="terminationReasonId" title="${uiLabelMap.HumanResTerminationReasonId}"><display/></field>
-        <field name="terminationTypeId" title="${uiLabelMap.HumanResTerminationTypeId}"><display/></field>
+        <field name="terminationTypeId"><display/></field>
         <field name="editLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
             <hyperlink target="EditEmployment?partyIdFrom=${partyIdFrom}&amp;partyIdTo=${partyIdTo}&amp;roleTypeIdFrom=${roleTypeIdFrom}&amp;fromDate=${fromDate}&amp;roleTypeIdTo=${roleTypeIdTo}" description="${uiLabelMap.CommonEdit}"/>
         </field>
@@ -84,7 +84,7 @@
         <field name="fromDate"><display also-hidden="true"/></field>
         <field name="thruDate"><display/></field>
         <field name="terminationReasonId" title="${uiLabelMap.HumanResTerminationReasonId}"><display/></field>
-        <field name="terminationTypeId" title="${uiLabelMap.HumanResTerminationTypeId}"><display/></field>
+        <field name="terminationTypeId"><display/></field>
         <field name="editLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
             <hyperlink target="EditEmployment?partyIdFrom=${partyIdFrom}&amp;partyIdTo=${partyIdTo}&amp;roleTypeIdFrom=${roleTypeIdFrom}&amp;fromDate=${fromDate}&amp;roleTypeIdTo=${roleTypeIdTo}" description="${uiLabelMap.CommonEdit}"/>
         </field>
@@ -115,7 +115,7 @@
                 </entity-options>
             </drop-down>
         </field>
-        <field name="terminationTypeId" use-when="employment!=null" title="${uiLabelMap.HumanResTerminationTypeId}">
+        <field name="terminationTypeId" use-when="employment!=null">
             <drop-down allow-empty="true" no-current-selected-key="------">
                 <entity-options description="${description}" key-field-name="terminationTypeId" entity-name="TerminationType">                    
                     <entity-order-by field-name="description"/>

Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=728669&r1=728668&r2=728669&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Mon Dec 22 04:52:20 2008
@@ -1922,17 +1922,6 @@
         <value xml:lang="th">รหัสโครงสร้าง</value>
         <value xml:lang="zh">地理标识</value>
     </property>
-    <property key="FormFieldTitle_hasTable">
-        <value xml:lang="de">Besitzt Tabelle</value>
-        <value xml:lang="en">Has Table</value>
-        <value xml:lang="es">Tiene tabla</value>
-        <value xml:lang="fr">A une table</value>
-        <value xml:lang="it">Ha Tabella</value>
-        <value xml:lang="ro">Are Tabela</value>
-        <value xml:lang="ru">Есть таблица?</value>
-        <value xml:lang="th">มีตาราง</value>
-        <value xml:lang="zh">有库表</value>
-    </property>
     <property key="FormFieldTitle_headerApprovedStatus">
         <value xml:lang="de">Kopfbereich Genehmigt Status</value>
         <value xml:lang="en">Header Approved Status</value>

Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.xml?rev=728669&r1=728668&r2=728669&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonUiLabels.xml Mon Dec 22 04:52:20 2008
@@ -7307,6 +7307,18 @@
         <value xml:lang="th">จากวันที่</value>
         <value xml:lang="zh">开始日期</value>
     </property>
+    <property key="FormFieldTitle_hasTable">
+        <value xml:lang="ar">يحوز على جدول</value>
+        <value xml:lang="de">Besitzt Tabelle</value><!--value xml:lang="de">Hat Tabelle</value-->
+        <value xml:lang="en">Has Table</value>
+        <value xml:lang="es">Tiene tabla</value>
+        <value xml:lang="fr">A une table</value>
+        <value xml:lang="it">Ha Tabella</value>
+        <value xml:lang="ro">Are Tabela</value><!--value xml:lang="ro">Are Tabelul</value-->
+        <value xml:lang="ru">Есть таблица?</value>
+        <value xml:lang="th">มีตาราง</value>
+        <value xml:lang="zh">有库表</value><!--value xml:lang="zh">有数据库表</value-->
+    </property>
     <property key="FormFieldTitle_lineTotal">
         <value xml:lang="ar">مجموع السطر</value>
         <value xml:lang="de">Zeilentotal</value>