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/09/11 13:06:06 UTC
svn commit: r694216 - in /ofbiz/trunk: applications/accounting/config/
applications/humanres/config/ applications/manufacturing/config/
applications/order/config/ applications/product/config/
applications/workeffort/config/ framework/common/config/ fra...
Author: jleroux
Date: Thu Sep 11 04:06:04 2008
New Revision: 694216
URL: http://svn.apache.org/viewvc?rev=694216&view=rev
Log:
A bunch of i18n for Project and My Page, included French Translation
Also fix r693536
Modified:
ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml
ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml
ofbiz/trunk/applications/order/config/OrderUiLabels.xml
ofbiz/trunk/applications/product/config/ProductUiLabels.xml
ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml
ofbiz/trunk/framework/common/config/CommonUiLabels.xml
ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml
ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml
Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=694216&r1=694215&r2=694216&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Thu Sep 11 04:06:04 2008
@@ -7760,7 +7760,7 @@
<property key="FormFieldTitle_scheduleWorkEffortId">
<value xml:lang="en">Schedule Work Effort Id</value>
<value xml:lang="es">Id Planificación de esfuerzo de trabajo</value>
- <value xml:lang="fr">Programmer l'activité réf.</value>
+ <value xml:lang="fr">Planifier l'activité de réf.</value>
<value xml:lang="it">Schedulazione Impegno di Lavoro</value>
<value xml:lang="ro">Impaginare Sarcini de Serviciu</value>
<value xml:lang="ru">ÐапланиÑованное ÑобÑÑие</value>
@@ -8036,7 +8036,7 @@
</property>
<property key="FormFieldTitle_workEffortId">
<value xml:lang="en">Work Effort Id</value>
- <value xml:lang="fr">Réf. activité</value>
+ <value xml:lang="fr">Réf. d'activité</value>
<value xml:lang="it">Impegno di Lavoro</value>
<value xml:lang="ro">Sarcina de Lucru</value>
<value xml:lang="ru">Ðод задаÑи</value>
Modified: ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml?rev=694216&r1=694215&r2=694216&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml (original)
+++ ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml Thu Sep 11 04:06:04 2008
@@ -964,6 +964,7 @@
</property>
<property key="HumanResSkillTypeId">
<value xml:lang="en">Skill Type Id</value>
+ <value xml:lang="fr">Réf. de compétence</value>
<value xml:lang="it">Codice Tipo Abilità </value>
<value xml:lang="th">รหัสà¸à¸£à¸°à¹à¸ à¸à¸à¸±à¸à¸©à¸°</value>
<value xml:lang="zh">æè½ç±»åId</value>
Modified: ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml?rev=694216&r1=694215&r2=694216&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml (original)
+++ ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml Thu Sep 11 04:06:04 2008
@@ -29,6 +29,7 @@
<property key="FormFieldTitle_actualStartDate">
<value xml:lang="de">Ist-Start-Datum</value>
<value xml:lang="en">Actual Start Date</value>
+ <value xml:lang="fr">Date de début réelle</value>
<value xml:lang="it">Data Inizio Attuale</value>
<value xml:lang="ro">Data initiere Actuala</value>
<value xml:lang="th">วัà¸à¸à¸µà¹à¹à¸£à¸´à¹à¸¡à¸à¸£à¸´à¸</value>
@@ -82,6 +83,7 @@
<property key="FormFieldTitle_estimatedCompletionDate">
<value xml:lang="de">Geschätztes Fertigstellungsdatum</value>
<value xml:lang="en">Estimated Completion Date</value>
+ <value xml:lang="fr">Date de fin prévue</value>
<value xml:lang="it">Data Completamento Stimata</value>
<value xml:lang="ro">Data Terminare Stimata</value>
<value xml:lang="th">วัà¸à¸à¸µà¹à¸à¸²à¸à¸§à¹à¸²à¸à¸°à¹à¸ªà¸£à¹à¸</value>
@@ -112,6 +114,7 @@
<property key="FormFieldTitle_estimatedStartDate">
<value xml:lang="de">Geschätztes Start-Datum</value>
<value xml:lang="en">Estimated Start Date</value>
+ <value xml:lang="fr">Date de début prévue</value>
<value xml:lang="it">Data Inizio Stimata</value>
<value xml:lang="ro">Data Initiere Stimata</value>
<value xml:lang="th">à¸à¸£à¸°à¸¡à¸²à¸à¸§à¸±à¸à¹à¸£à¸´à¹à¸¡à¸à¹à¸</value>
@@ -1213,7 +1216,7 @@
<value xml:lang="de">Geschätztes Start-Datum</value>
<value xml:lang="en">Estimated Start Date</value>
<value xml:lang="es">Fecha de inicio estimada</value>
- <value xml:lang="fr">Estimated Start Date</value>
+ <value xml:lang="fr">Date de début prévue</value>
<value xml:lang="it">Data Inizio Stimata</value>
<value xml:lang="ro">Data Initiala Stimata</value>
<value xml:lang="th">à¸à¸£à¸°à¸¡à¸²à¸à¸§à¸±à¸à¸à¸µà¹à¹à¸£à¸´à¹à¸¡à¸à¹à¸</value>
@@ -1394,7 +1397,7 @@
<value xml:lang="de">Von-Datum</value>
<value xml:lang="en">From Date</value>
<value xml:lang="es">Fecha de inicio</value>
- <value xml:lang="fr">From Date</value>
+ <value xml:lang="fr">Date de début</value>
<value xml:lang="it">Da Data</value>
<value xml:lang="ro">De la Data</value>
<value xml:lang="th">à¸à¸²à¸à¸§à¸±à¸à¸à¸µà¹</value>
Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels.xml?rev=694216&r1=694215&r2=694216&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderUiLabels.xml (original)
+++ ofbiz/trunk/applications/order/config/OrderUiLabels.xml Thu Sep 11 04:06:04 2008
@@ -5284,7 +5284,7 @@
<value xml:lang="de">Offerte Kompetenztyp ID</value>
<value xml:lang="en">Quote Skill Type Id</value>
<value xml:lang="es">Tipo de habilidad</value>
- <value xml:lang="fr">Réf. de type de compétences</value>
+ <value xml:lang="fr">Réf. de compétence (devis)</value>
<value xml:lang="it">Tipo Skill Preventivo</value>
<value xml:lang="nl">Offerte Skill Type Id</value>
<value xml:lang="ro">Tip Skill Oferta</value>
@@ -5354,6 +5354,7 @@
<property key="OrderOrderQuoteWorkEffortId">
<value xml:lang="de">Offertarbeitseinsatz ID</value>
<value xml:lang="en">Quote Work Effort Id</value>
+ <value xml:lang="fr">Réf. d'activité de devis</value>
<value xml:lang="es">Código de esfuerzo de trabajo</value>
<value xml:lang="fr">Réf. de la tâche du devis</value>
<value xml:lang="it">Preventivo Impegno di Lavoro</value>
@@ -6754,7 +6755,7 @@
<value xml:lang="de">Liste Kundenanfragen</value>
<value xml:lang="en">Customer Request List</value>
<value xml:lang="es">Lista de pedidos</value>
- <value xml:lang="fr">Liste de demandes client</value>
+ <value xml:lang="fr">Liste des demandes client</value>
<value xml:lang="it">Lista Richieste</value>
<value xml:lang="nl">Request List</value>
<value xml:lang="ro">Lista Cerere</value>
Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=694216&r1=694215&r2=694216&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Thu Sep 11 04:06:04 2008
@@ -2046,7 +2046,7 @@
</property>
<property key="FormFieldTitle_maintTemplateWorkEffortId">
<value xml:lang="en">Maint Template Work Effort Id</value>
- <value xml:lang="fr">Réf. maint. de canevas de tâche</value>
+ <value xml:lang="fr">Réf. maint. de canevas d'activité</value>
<value xml:lang="it">Manutenzione Template Impegno di Lavoro</value>
<value xml:lang="ru">Ðод Ñаблона задаÑи обÑлÑживаниÑ</value>
<value xml:lang="th">รหัสà¸à¸²à¸à¸à¸²à¸£à¸£à¸±à¸à¸©à¸²à¸ªà¸ าà¸à¹à¸à¸¡à¹à¸à¸¥à¸</value>
@@ -3686,7 +3686,7 @@
</property>
<property key="FormFieldTitle_workEffortId">
<value xml:lang="en">Work Effort Id</value>
- <value xml:lang="fr">Réf. de tâche</value>
+ <value xml:lang="fr">Réf. d'activité</value>
<value xml:lang="it">Numero Impegno di Lavoro</value>
<value xml:lang="ro">Numar Sarcina de Lucru</value>
<value xml:lang="ru">Ðод ÑабоÑÑ</value>
Modified: ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml?rev=694216&r1=694215&r2=694216&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml (original)
+++ ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml Thu Sep 11 04:06:04 2008
@@ -52,6 +52,7 @@
</property>
<property key="FormFieldTitle_actualStartDate">
<value xml:lang="en">Actual Start Date</value>
+ <value xml:lang="fr">Date de début réelle</value>
<value xml:lang="it">Data Inizio Attuale</value>
<value xml:lang="nl">Actual Start Date</value>
<value xml:lang="ro">Data Initiere Actuala</value>
@@ -134,6 +135,7 @@
</property>
<property key="FormFieldTitle_estimatedCompletionDate">
<value xml:lang="en">Estimated Completion Date</value>
+ <value xml:lang="fr">Date de fin prévue</value>
<value xml:lang="it">Data Completamento Stimata</value>
<value xml:lang="nl">Estimated Completion Date</value>
<value xml:lang="ro">Data Finalizare Stimata</value>
@@ -166,6 +168,7 @@
</property>
<property key="FormFieldTitle_estimatedStartDate">
<value xml:lang="en">Estimated Start Date</value>
+ <value xml:lang="fr">Date de début prévue</value>
<value xml:lang="it">Data Inizio Stimata</value>
<value xml:lang="nl">Verwachtte start datum</value>
<value xml:lang="ro">Data Initiala Stimata</value>
@@ -195,6 +198,7 @@
</property>
<property key="FormFieldTitle_hours">
<value xml:lang="en">Hours</value>
+ <value xml:lang="fr">Heures</value>
<value xml:lang="it">Ore</value>
<value xml:lang="nl">Uren</value>
<value xml:lang="ro">Ore</value>
@@ -550,6 +554,7 @@
</property>
<property key="FormFieldTitle_timesheetId">
<value xml:lang="en">Timesheet Id</value>
+ <value xml:lang="fr">Réf. de feuille d'activité</value>
<value xml:lang="it">Numero Timbratura</value>
<value xml:lang="nl">Tijdschema Id</value>
<value xml:lang="ro">Numar Pontaj</value>
@@ -595,6 +600,7 @@
</property>
<property key="FormFieldTitle_workEffortId">
<value xml:lang="en">Work Effort Id</value>
+ <value xml:lang="fr">Réf. d'activité</value>
<value xml:lang="it">Numero Impegno di Lavoro</value>
<value xml:lang="nl">Activiteit Id</value>
<value xml:lang="ro">Numar Sarcina de Lucru </value>
@@ -603,6 +609,7 @@
</property>
<property key="FormFieldTitle_workEffortIdFrom">
<value xml:lang="en">Work Effort Id From</value>
+ <value xml:lang="fr">Réf. d'activité issue de</value>
<value xml:lang="it">Impegno di Lavoro Da</value>
<value xml:lang="nl">Actie Id van</value>
<value xml:lang="ro">Sarcina de Lucru De la</value>
@@ -611,6 +618,7 @@
</property>
<property key="FormFieldTitle_workEffortIdTo">
<value xml:lang="en">Work Effort Id To</value>
+ <value xml:lang="fr">Réf. d'activité allant vers</value>
<value xml:lang="it">Impegno di Lavoro A</value>
<value xml:lang="nl">Activiteit Id To</value>
<value xml:lang="ro">Sarcina de Lucru La</value>
@@ -1613,6 +1621,7 @@
<property key="Timesheet">
<value xml:lang="en">Timesheet</value>
<value xml:lang="es">Hoja de tiempos</value>
+ <value xml:lang="fr">Feuille d'activités</value>
<value xml:lang="it">Timbratura</value>
<value xml:lang="nl">Tijdschema</value>
<value xml:lang="ro">Pontaj</value>
@@ -1630,6 +1639,7 @@
</property>
<property key="TimesheetHours">
<value xml:lang="en">Hours</value>
+ <value xml:lang="fr">Heures</value>
<value xml:lang="it">Ore</value>
<value xml:lang="nl">Uren</value>
<value xml:lang="ro">Ore</value>
@@ -1639,6 +1649,7 @@
<property key="TimesheetMyTime">
<value xml:lang="en">My Time</value>
<value xml:lang="es">Mi tiempo</value>
+ <value xml:lang="fr">Mon temps</value>
<value xml:lang="it">Mio Tempo</value>
<value xml:lang="nl">Mijn tijd</value>
<value xml:lang="ro">Timpul Meu</value>
@@ -1691,6 +1702,7 @@
</property>
<property key="TimesheetTimesheetId">
<value xml:lang="en">Timesheet ID</value>
+ <value xml:lang="fr">Réf. de feuille d'activité</value>
<value xml:lang="es">Código de hoja de tiempos</value>
<value xml:lang="it">Numero Timbratura</value>
<value xml:lang="nl">Tijdschema ID</value>
@@ -2285,6 +2297,7 @@
</property>
<property key="WorkEffortEstimatedCompletionDate">
<value xml:lang="en">Estimated Completion Date</value>
+ <value xml:lang="fr">Date de fin prévue</value>
<value xml:lang="it">Data Completamento Stimata</value>
<value xml:lang="nl">Estimated Completion Date</value>
<value xml:lang="ro">Data Terminare Stimata</value>
@@ -2293,6 +2306,7 @@
</property>
<property key="WorkEffortEstimatedStartDate">
<value xml:lang="en">Estimated Start Date</value>
+ <value xml:lang="fr">Date de début prévue</value>
<value xml:lang="it">Data Inizio Stimata</value>
<value xml:lang="nl">Estimated Start Date</value>
<value xml:lang="ro">Data Initiere Stimata</value>
@@ -2590,7 +2604,7 @@
<property key="WorkEffortMyRequestList">
<value xml:lang="en">My Request List</value>
<value xml:lang="es">Mi lista de pedidos</value>
- <value xml:lang="fr">Ma liste de requête</value>
+ <value xml:lang="fr">Ma liste de demandes</value>
<value xml:lang="it">Mia Lista Richieste</value>
<value xml:lang="nl">My Request List</value>
<value xml:lang="ro">Lista mea de Cereri</value>
@@ -2601,7 +2615,7 @@
<property key="WorkEffortMyStatus">
<value xml:lang="en">My Status</value>
<value xml:lang="es">Mi estado</value>
- <value xml:lang="fr">Mon état</value>
+ <value xml:lang="fr">Mon statut</value>
<value xml:lang="it">Mio Stato</value>
<value xml:lang="nl">My Status</value>
<value xml:lang="ro">Starea Mea</value>
@@ -2611,6 +2625,7 @@
</property>
<property key="WorkEffortMyTasks">
<value xml:lang="en">My Tasks</value>
+ <value xml:lang="fr">Mes tâches</value>
<value xml:lang="it">Miei Compiti</value>
<value xml:lang="th">ภารà¸à¸´à¸à¸à¸à¸à¸à¸±à¸</value>
<value xml:lang="zh">æçä»»å¡</value>
@@ -2618,6 +2633,7 @@
<property key="WorkEffortMyTimesheets">
<value xml:lang="en">My Timesheets</value>
<value xml:lang="it">Mie Timbrature</value>
+ <value xml:lang="fr">Mes feuilles d'activité</value>
<value xml:lang="nl">My Timesheets</value>
<value xml:lang="ro">Pontajul Meu</value>
<value xml:lang="th">à¸à¸²à¸£à¸²à¸à¸à¸²à¸£à¸à¸³à¸à¸²à¸à¸à¸à¸à¸à¸±à¸</value>
@@ -3196,7 +3212,7 @@
<property key="WorkEffortRequestList">
<value xml:lang="en">Request List</value>
<value xml:lang="es">Lista de pedidos</value>
- <value xml:lang="fr">Liste de requête</value>
+ <value xml:lang="fr">Liste des demandes</value>
<value xml:lang="it">Lista Richiesta</value>
<value xml:lang="nl">Request List</value>
<value xml:lang="ro">Lista Cerere</value>
Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.xml?rev=694216&r1=694215&r2=694216&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonUiLabels.xml Thu Sep 11 04:06:04 2008
@@ -2460,7 +2460,7 @@
<value xml:lang="de">Von Datum</value>
<value xml:lang="en">From Date</value>
<value xml:lang="es">Desde la fecha</value>
- <value xml:lang="fr">de la date</value>
+ <value xml:lang="fr">Date de début</value>
<value xml:lang="it">Dalla Data</value>
<value xml:lang="nl">Van Datum</value>
<value xml:lang="pt">Data Origem</value>
@@ -2689,7 +2689,7 @@
<property key="CommonHelp">
<value xml:lang="de">Hilfe</value>
<value xml:lang="en">Help</value>
- <value xml:lang="en">Aide</value>
+ <value xml:lang="fr">Aide</value>
<value xml:lang="zh_CN">帮å©</value>
<value xml:lang="zh">帮å©</value>
</property>
@@ -5576,6 +5576,13 @@
<value xml:lang="zh_CN">ç¶æåå²</value>
<value xml:lang="zh">ç¶æåå²è®°å½</value>
</property>
+ <property key="CommonStatustoComplete">
+ <value xml:lang="en">Status to 'complete'</value>
+ <value xml:lang="fr">Mettre statut à terminé</value>
+ <value xml:lang="it">Stato a 'completo'</value>
+ <value xml:lang="th">สà¸à¸²à¸à¸°à¹à¸à¹à¸ 'à¹à¸ªà¸£à¹à¸à¸ªà¸¡à¸à¸¹à¸£à¸à¹'</value>
+ <value xml:lang="zh">ç½®ç¶æ为å®æ</value>
+ </property>
<property key="CommonSubTitle">
<value xml:lang="ar">اÙعÙÙا٠اÙثاÙÙÙ</value>
<value xml:lang="de">Untertitel</value>
Modified: ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml?rev=694216&r1=694215&r2=694216&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml (original)
+++ ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml Thu Sep 11 04:06:04 2008
@@ -2731,6 +2731,7 @@
</property>
<property key="WebtoolsWorkflowActualStartDate">
<value xml:lang="en">Actual Start Date</value>
+ <value xml:lang="fr">Date de début réelle</value>
<value xml:lang="it">Data Inizio Attuale</value>
<value xml:lang="th">วัà¸à¸à¸µà¹à¹à¸£à¸´à¹à¸¡à¸à¸²à¸à¸à¸£à¸´à¸</value>
</property>
Modified: ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml?rev=694216&r1=694215&r2=694216&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml Thu Sep 11 04:06:04 2008
@@ -18,23 +18,13 @@
under the License.
-->
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <property key="AcceptedCustomerRequestList">
- <value xml:lang="en">Accepted Customer Request list'</value>
- </property>
- <property key="CommonStatustoComplete">
- <value xml:lang="en">Status to 'complete'</value>
- <value xml:lang="fr">Status à 'complet'</value>
- <value xml:lang="it">Stato a 'completo'</value>
- <value xml:lang="th">สà¸à¸²à¸à¸°à¹à¸à¹à¸ 'à¹à¸ªà¸£à¹à¸à¸ªà¸¡à¸à¸¹à¸£à¸à¹'</value>
- <value xml:lang="zh">ç½®ç¶æ为å®æ</value>
- </property>
<property key="PageTitleAddProjectTimeToNewInvoice">
<value xml:lang="en">Add all reported/approved task time to a new invoice</value>
<value xml:lang="fr">Ajouter tout le temps de la tâche rapporté/approuvé à une nouvelle facture/</value>
</property>
<property key="PageTitleAddATimesheet">
<value xml:lang="en">Add a new weekly Timesheet</value>
- <value xml:lang="fr">Ajouter une nouvelle feuille de présence hebdomadaire</value>
+ <value xml:lang="fr">Ajouter une nouvelle feuille d'activité hebdomadaire</value>
<value xml:lang="it">Aggiungi una nuova Timbratura settimanale</value>
<value xml:lang="th">à¹à¸à¸´à¹à¸¡à¸à¸²à¸£à¸²à¸à¹à¸§à¸¥à¸²à¸£à¸²à¸¢à¸ªà¸±à¸à¸à¸²à¸«à¹à¹à¸«à¸¡à¹</value>
<value xml:lang="zh">å¢å æ°çå¨æ¶é´è¡¨</value>
@@ -132,7 +122,7 @@
</property>
<property key="PageTitleCurrentTimesheet">
<value xml:lang="en">Current Timesheet</value>
- <value xml:lang="fr">Feuille de présence courante</value>
+ <value xml:lang="fr">Feuille d'activité courante</value>
<value xml:lang="it">Timbratura Corrente</value>
<value xml:lang="th">à¸à¸²à¸£à¸²à¸à¹à¸§à¸¥à¸²à¸à¸µà¹à¹à¸à¹à¸à¸±à¸à¸à¸¢à¸¹à¹à¹à¸à¸à¸±à¸à¸à¸¸à¸à¸±à¸</value>
<value xml:lang="zh">å½åæ¶é´è¡¨</value>
@@ -146,7 +136,7 @@
</property>
<property key="PageTitleEditCurrentTimesheet">
<value xml:lang="en">Edit current timesheet</value>
- <value xml:lang="fr">Modifier la feuille de présence courante</value>
+ <value xml:lang="fr">Modifier la feuille d'activité courante</value>
<value xml:lang="it">Aggiorna timbratura correnti</value>
<value xml:lang="th">à¹à¸à¹à¹à¸à¸à¸²à¸£à¸²à¸à¹à¸§à¸¥à¸²à¸à¸µà¹à¹à¸à¹à¸à¸¢à¸¹à¹à¹à¸à¸à¸±à¸à¸à¸¸à¸à¸±à¸</value>
<value xml:lang="zh">ç¼è¾å½åæ¶é´è¡¨</value>
@@ -202,14 +192,14 @@
</property>
<property key="PageTitleFindProject">
<value xml:lang="en">Find Project</value>
- <value xml:lang="fr">Rechercher le projet</value>
+ <value xml:lang="fr">Recherche de projet(s)</value>
<value xml:lang="it">Ricerca Progetto</value>
<value xml:lang="th">à¸à¹à¸à¸«à¸²à¹à¸à¸£à¹à¸à¸</value>
<value xml:lang="zh">æ¥æ¾é¡¹ç®</value>
</property>
<property key="PageTitleFindProjectResults">
<value xml:lang="en">Find Project Results</value>
- <value xml:lang="fr">Rechercher les résultats du projet</value>
+ <value xml:lang="fr">Voir les résultats du projet</value>
<value xml:lang="th">à¸à¸¥à¸¥à¸±à¸à¸à¹à¸à¸µà¹à¹à¸à¹à¸à¸²à¸à¸à¸²à¸£à¸à¹à¸à¸«à¸²à¹à¸à¸£à¹à¸à¸</value>
<value xml:lang="zh">æ¥æ¾é¡¹ç®æ
åµ</value>
</property>
@@ -243,7 +233,7 @@
</property>
<property key="PageTitleFindTimeSheet">
<value xml:lang="en">Find TimeSheet</value>
- <value xml:lang="fr">Rechercher la feuille de présence</value>
+ <value xml:lang="fr">Rechercher une feuilled'activitée</value>
<value xml:lang="it">Ricerca Timbratura</value>
<value xml:lang="th">à¸à¹à¸à¸«à¸²à¸à¸²à¸£à¸²à¸à¹à¸§à¸¥à¸²</value>
<value xml:lang="zh">æ¥æ¾æ¶é´è¡¨</value>
@@ -365,14 +355,14 @@
</property>
<property key="PageTitleTimesheet">
<value xml:lang="en">Timesheet</value>
- <value xml:lang="fr">Feuille de présence</value>
+ <value xml:lang="fr">Feuille d'activité</value>
<value xml:lang="it">Timbratura</value>
<value xml:lang="th">à¸à¸²à¸£à¸²à¸à¹à¸§à¸¥à¸²</value>
<value xml:lang="zh">æ¶é´è¡¨</value>
</property>
<property key="PageTitleTimesheets">
<value xml:lang="en">Timesheet list</value>
- <value xml:lang="fr">Liste des feuilles de présence</value>
+ <value xml:lang="fr">Liste des feuilles d'activité</value>
<value xml:lang="it">Lista Timbrature</value>
<value xml:lang="th">à¹à¸ªà¸à¸à¸£à¸²à¸¢à¸à¸²à¸£à¸à¸²à¸£à¸²à¸à¹à¸§à¸¥à¸²</value>
<value xml:lang="zh">æ¶é´è¡¨å表</value>
@@ -384,6 +374,10 @@
<value xml:lang="th">à¹à¸¡à¹à¸à¸³à¸«à¸à¸à¸à¸²à¸</value>
<value xml:lang="zh">æªåé
ä»»å¡</value>
</property>
+ <property key="ProjectMgrAcceptedCustomerRequestList">
+ <value xml:lang="en">Accepted Customer Request list</value>
+ <value xml:lang="fr">Liste des demandes client acceptées</value>
+ </property>
<property key="ProjectMgrActualHours">
<value xml:lang="en">Actual Hours</value>
<value xml:lang="fr">Heures réelles</value>
@@ -596,7 +590,7 @@
</property>
<property key="ProjectMgrNoAccessToTimesheet">
<value xml:lang="en">You have no access to the timesheet#: ${timesheetId}</value>
- <value xml:lang="fr">Vous n'avez pas accès à la feuille de présence n° ${timesheetId}</value>
+ <value xml:lang="fr">Vous n'avez pas accès à la feuille d'activité n° ${timesheetId}</value>
<value xml:lang="it">Tu non hai accesso alla marcatura#: ${timesheetId}</value>
<value xml:lang="th">à¸à¸¸à¸à¹à¸¡à¹à¸¡à¸µà¸ªà¸´à¸à¸à¸´à¹à¹à¸à¸à¸²à¸£à¹à¸à¹à¸²à¸à¸¶à¸à¸à¸²à¸£à¸²à¸à¹à¸§à¸¥à¸²#: ${timesheetId}</value>
<value xml:lang="zh">ä½ æ²¡æ访é®è¯¥æ¶é´è¡¨çæéï¼${timesheetId}</value>
@@ -700,7 +694,7 @@
</property>
<property key="ProjectMgrProjectId">
<value xml:lang="en">Project Id</value>
- <value xml:lang="fr">Réf. du projet</value>
+ <value xml:lang="fr">Réf. de projet</value>
<value xml:lang="it">Progetto</value>
<value xml:lang="th">รหัสà¹à¸à¸£à¹à¸à¸</value>
<value xml:lang="zh">项ç®Id</value>
@@ -794,7 +788,7 @@
</property>
<property key="ProjectMgrPlanHours">
<value xml:lang="en">Plan Hours</value>
- <value xml:lang="fr">Planifier des heures</value>
+ <value xml:lang="fr">Heures planifiées</value>
<value xml:lang="zh">计åæ¶é´</value>
</property>
<property key="ProjectMgrWeekNumber">
@@ -875,7 +869,7 @@
</property>
<property key="ProjectMgrSkillType">
<value xml:lang="en">Skill Type</value>
- <value xml:lang="fr">Type de comptétence</value>
+ <value xml:lang="fr">Compétences</value>
<value xml:lang="it">Tipo Abilità </value>
<value xml:lang="th">à¸à¸£à¸°à¹à¸ à¸à¸à¸±à¸à¸©à¸°</value>
<value xml:lang="zh">æè½ç±»å«</value>
@@ -987,14 +981,14 @@
</property>
<property key="ProjectMgrTaskNoOpen1">
<value xml:lang="en">Currently no 'open' tasks are assigned to you.</value>
- <value xml:lang="fr">Actuellement aucune tâche ne vous est affectée</value>
+ <value xml:lang="fr">Actuellement, aucune tâche ne vous est affectée.</value>
<value xml:lang="it">Attualmente nessun compito 'aperto' è assegnato a te.</value>
<value xml:lang="th">à¹à¸à¸à¸±à¸à¸à¸¸à¸à¸±à¸à¹à¸¡à¹à¹à¸à¸´à¸à¹à¸à¸¢à¸à¸²à¸à¸à¸µà¹à¸¡à¸à¸à¸«à¸¡à¸²à¸¢à¹à¸«à¹à¸à¸¸à¸</value>
<value xml:lang="zh">å½å没æç»ä½ åé
å¼æ¾çä»»å¡</value>
</property>
<property key="ProjectMgrTaskNoOpen2">
<value xml:lang="en">Add an existing or a new task to a project you are member of.</value>
- <value xml:lang="fr">Ajouter une tâche, existante ou nouvelle, au projet dont vous êtes membre</value>
+ <value xml:lang="fr">Ajouter une tâche, existante ou nouvelle, à un projet dont vous êtes membre</value>
<value xml:lang="it">Aggiungere uno esistente o un nuovo compito al progetto che tu sei membro di.</value>
<value xml:lang="th">à¹à¸à¸´à¹à¸¡à¸à¸²à¸à¸à¸µà¹à¸¡à¸µà¸à¸¢à¸¹à¹à¸«à¸£à¸·à¸à¸à¸²à¸à¹à¸«à¸¡à¹à¹à¸à¸¢à¸±à¸à¹à¸à¸£à¹à¸à¸à¸à¸¸à¸à¹à¸à¹à¸à¸ªà¸¡à¸²à¸à¸´à¸à¸à¸à¸</value>
<value xml:lang="zh">ç»å±äºä½ ç项ç®å¢å ä¸ä¸ªæ°çæè
å·²ç»åå¨çä»»å¡</value>
@@ -1040,6 +1034,13 @@
<value xml:lang="th">à¸à¸±à¹à¸§à¹à¸¡à¸à¸à¸£à¸´à¸</value>
<value xml:lang="zh">å®é
å·¥æ¶</value>
</property>
+ <property key="ProjectMgrToComplete">
+ <value xml:lang="en">To complete</value>
+ <value xml:lang="fr">Changer pour 'terminé'</value>
+ <value xml:lang="it">Per Trovare il Progetto Inserire Intervallo</value>
+ <value xml:lang="th">à¸à¹à¸à¸«à¸²à¹à¸à¸£à¹à¸à¸à¹à¸ªà¸à¸à¸à¸à¸à¹à¸à¸</value>
+ <value xml:lang="zh">æ¥æ¾é¡¹ç®çèå´</value>
+ </property>
<property key="ProjectMgrToFindProject">
<value xml:lang="en">To Find Project Give Range</value>
<value xml:lang="fr">Pour trouver le projet donner un intervalle</value>
@@ -1114,7 +1115,6 @@
<value xml:lang="en">Id</value>
<value xml:lang="fr">Réf.</value>
<value xml:lang="it">Codice</value>
- <value xml:lang="th">รหัส</value>
<value xml:lang="zh">Id</value>
</property>
<property key="ProjectMgrWorkEffortIdFrom">
@@ -1140,7 +1140,7 @@
</property>
<property key="ProjectMgrWorkEffortScopeEnumId">
<value xml:lang="en">Scope</value>
- <value xml:lang="fr">Portée</value>
+ <value xml:lang="fr">Public concerné</value>
<value xml:lang="it">Scopo</value>
<value xml:lang="th">à¸à¸à¸à¹à¸à¸</value>
<value xml:lang="zh">èå´</value>
@@ -1163,7 +1163,7 @@
</property>
<property key="FormFieldTitle_newTimesheetId">
<value xml:lang="en">New Timesheet Id</value>
- <value xml:lang="fr">Liste des demandes client vérifiée mais incomplète et ayant une tâche affectée</value>
+ <value xml:lang="fr">Réf. de nouvelle feuille d'activité</value>
<value xml:lang="zh">æ°çæ¶é´è¡¨Id</value>
</property>
<property key="FormFieldTitle_fromPartyId">
@@ -1171,6 +1171,26 @@
<value xml:lang="fr">Depuis l'acteur de réf.</value>
<value xml:lang="zh">æ¥èªä¼å</value>
</property>
+ <property key="FormFieldTitle_actualHours">
+ <value xml:lang="en">Actual Hours</value>
+ <value xml:lang="fr">Heures réelles</value>
+ <value xml:lang="zh">å®é
å·¥æ¶</value>
+ </property>
+ <property key="FormFieldTitle_plannedHours">
+ <value xml:lang="en">Planned Hours</value>
+ <value xml:lang="fr">Heures planifiées</value>
+ <value xml:lang="zh">计åå·¥æ¶</value>
+ </property>
+ <property key="FormFieldTitle_relatedTasks">
+ <value xml:lang="en">Related Tasks</value>
+ <value xml:lang="fr">Tâches associées</value>
+ <value xml:lang="zh">ç¸å
³ä»»å¡</value>
+ </property>
+ <property key="FormFieldTitle_complete">
+ <value xml:lang="en">Complete</value>
+ <value xml:lang="fr">Terminé</value>
+ <value xml:lang="zh">å®æ</value>
+ </property>
<property key="ProjectMgrAddTimeEntry">
<value xml:lang="en">Add Time Entry</value>
<value xml:lang="fr">Ajouter une échéance</value>
@@ -1183,6 +1203,81 @@
<value xml:lang="fr">Privé/Public</value>
<value xml:lang="zh">ç§äºº/å
¬å¼</value>
</property>
+ <property key="FormFieldTitle_isPrintable">
+ <value xml:lang="en">is Printable</value>
+ <value xml:lang="fr">est imprimable</value>
+ <value xml:lang="zh">æ¯å¦å¯å°</value>
+ </property>
+ <property key="FormFieldTitle_templateId">
+ <value xml:lang="en">Template Id</value>
+ <value xml:lang="fr">Réf. de modèle</value>
+ <value xml:lang="zh">模æ¿Id</value>
+ </property>
+ <property key="FormFieldTitle_parentProjectName">
+ <value xml:lang="en">Parent Project Name</value>
+ <value xml:lang="fr">Nom du projet parent</value>
+ <value xml:lang="zh">ç¶é¡¹ç®å称</value>
+ </property>
+ <property key="ProjectMgrCustRequestCategoryId">
+ <value xml:lang="en">Cust Request Category Id</value>
+ <value xml:lang="fr">Réf. de catégorie de demande client</value>
+ <value xml:lang="zh">请æ±åç±»Id</value>
+ </property>
+ <property key="FormFieldTitle_openDateTime">
+ <value xml:lang="en">Open Date Time</value>
+ <value xml:lang="fr">Date/heure ouverte</value>
+ <value xml:lang="zh">å¼å¯æ¥æ</value>
+ </property>
+ <property key="FormFieldTitle_internalComment">
+ <value xml:lang="en">Internal Comment</value>
+ <value xml:lang="fr">Commentaire interne</value>
+ <value xml:lang="zh">å
é¨è¯è®º</value>
+ </property>
+ <property key="FormFieldTitle_closedDateTime">
+ <value xml:lang="en">Closed Date Time</value>
+ <value xml:lang="fr">Date/heure fermée</value>
+ <value xml:lang="zh">å
³éæ¥æ</value>
+ </property>
+ <property key="FormFieldTitle_phase">
+ <value xml:lang="en">Phase</value>
+ <value xml:lang="fr">Phase</value>
+ <value xml:lang="zh">项ç®é¶æ®µ</value>
+ </property>
+ <property key="FormFieldTitle_startDate">
+ <value xml:lang="en">Start Date</value>
+ <value xml:lang="fr">Date de début</value>
+ <value xml:lang="zh">å¼å§æ¥æ</value>
+ </property>
+ <property key="FormFieldTitle_completionDate">
+ <value xml:lang="en">Completion Date</value>
+ <value xml:lang="fr">Date d'achèvement</value>
+ <value xml:lang="zh">å®ææ¥æ</value>
+ </property>
+ <property key="FormFieldTitle_task">
+ <value xml:lang="en">Task</value>
+ <value xml:lang="fr">Tâche</value>
+ <value xml:lang="zh">ä»»å¡</value>
+ </property>
+ <property key="FormFieldTitle_phaseName">
+ <value xml:lang="en">Phase Name</value>
+ <value xml:lang="fr">Nom de phase</value>
+ <value xml:lang="zh">é¶æ®µå称</value>
+ </property>
+ <property key="FormFieldTitle_createdStamp">
+ <value xml:lang="en">Created Stamp</value>
+ <value xml:lang="fr">Estampille créée</value>
+ <value xml:lang="zh">å建æ¶é´</value>
+ </property>
+ <property key="FormFieldTitle_projectName">
+ <value xml:lang="en">Project Name</value>
+ <value xml:lang="fr">Nom de projet</value>
+ <value xml:lang="zh">项ç®å称</value>
+ </property>
+ <property key="FormFieldTitle_taskName">
+ <value xml:lang="en">Task Name</value>
+ <value xml:lang="fr">Nom de tâche</value>
+ <value xml:lang="zh">ä»»å¡å称</value>
+ </property>
<property key="ProjectMgrUnbilledHours">
<value xml:lang="en">Unbilled hours</value>
<value xml:lang="fr">Heures non facturées</value>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml?rev=694216&r1=694215&r2=694216&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml Thu Sep 11 04:06:04 2008
@@ -34,7 +34,7 @@
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <screenlet title="${uiLabelMap.AcceptedCustomerRequestList}" navigation-form-name="ListRequests">
+ <screenlet title="${uiLabelMap.ProjectMgrAcceptedCustomerRequestList}" navigation-form-name="ListRequests">
<link target="newrequest" text="${uiLabelMap.OrderNewRequest}" style="buttontext"/>
<include-form name="ListRequests" location="component://projectmgr/widget/forms/RequestForms.xml"/>
</screenlet>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml?rev=694216&r1=694215&r2=694216&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml Thu Sep 11 04:06:04 2008
@@ -57,6 +57,9 @@
<form name="ListTimeSheets" type="list" list-name="timesheets" paginate-target="MyTimesheet"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ <actions>
+ <set field="complete" value="${uiLabelMap.ProjectMgrToComplete}"/>
+ </actions>
<field name="timesheetId" title="${uiLabelMap.TimesheetTimesheetId}" widget-style="buttontext">
<hyperlink also-hidden="false" description="${timesheetId}" target="${my}Timesheet?timesheetId=${timesheetId}"/>
</field>
@@ -68,7 +71,7 @@
<field name="comments" title="${uiLabelMap.CommonComments}"><display/></field>
<field name="completeLink" title="${uiLabelMap.CommonStatustoComplete}" widget-style="buttontext">
<hyperlink target="${my}StatusToComplete?timesheetId=${timesheetId}&statusId=TIMESHEET_COMPLETED"
- description="${bsh:statusId.equals("TIMESHEET_IN_PROCESS")?"To Complete":""}" also-hidden="false"/>
+ description="${bsh:statusId.equals("TIMESHEET_IN_PROCESS")?complete:""}" also-hidden="false"/>
</field>
</form>
<form name="FindTimeSheet" target="FindTimeSheet" title="" type="single"
@@ -104,6 +107,7 @@
<field-map field-name="entityName" value="Timesheet"/>
<field-map field-name="orderBy" value="fromDate DESC"/>
</service>
+ <set field="complete" value="${uiLabelMap.ProjectMgrToComplete}"/>
</actions>
<field name="timesheetId" title="${uiLabelMap.TimesheetTimesheetId}" widget-style="buttontext">
<hyperlink also-hidden="false" description="${timesheetId}" target="Timesheet?timesheetId=${timesheetId}"/>
@@ -116,7 +120,7 @@
<!--field name="comments" title="${uiLabelMap.CommonComments}"><display/></field-->
<field name="completeLink" title="${uiLabelMap.CommonStatustoComplete}" widget-style="buttontext">
<hyperlink target="TimesheetToComplete?timesheetId=${timesheetId}&statusId=TIMESHEET_COMPLETED"
- description="${bsh:statusId.equals("TIMESHEET_IN_PROCESS")?"To complete":""}" also-hidden="false"/>
+ description="${bsh:statusId.equals("TIMESHEET_IN_PROCESS")?complete:""}" also-hidden="false"/>
</field>
</form>