svn commit: r693543 - in /ofbiz/trunk/specialpurpose/projectmgr: config/ProjectMgrUiLabels.xml webapp/projectmgr/project/EditTimeEntry.ftl widget/TaskScreens.xml widget/forms/TaskForms.xml

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r693543 - in /ofbiz/trunk/specialpurpose/projectmgr: config/ProjectMgrUiLabels.xml webapp/projectmgr/project/EditTimeEntry.ftl widget/TaskScreens.xml widget/forms/TaskForms.xml

jleroux@apache.org
Author: jleroux
Date: Tue Sep  9 11:14:56 2008
New Revision: 693543

URL: http://svn.apache.org/viewvc?rev=693543&view=rev
Log:
Some more cleaning and French translation

Modified:
    ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml
    ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/EditTimeEntry.ftl
    ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml

Modified: ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml?rev=693543&r1=693542&r2=693543&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml Tue Sep  9 11:14:56 2008
@@ -123,13 +123,6 @@
         <value xml:lang="th">เพิ่มข้อความงาน</value>
         <value xml:lang="zh">增加任务备注</value>
     </property>
-    <property key="PageTitleAddTimeEntry">
-        <value xml:lang="en">Add Time Entry</value>
-        <value xml:lang="fr">Ajouter une échéance</value>
-        <value xml:lang="it">Aggiungi Voce Tempo</value>
-        <value xml:lang="th">เพิ่มตารางเวลา</value>
-        <value xml:lang="zh">增加时间条目</value>
-    </property>
     <property key="PageTitleCreateTaskbyRequest">
         <value xml:lang="en">Create a new Task for this Request</value>
         <value xml:lang="fr">Créer une nouvelle tâche pour cette demande</value>
@@ -1166,54 +1159,33 @@
     </property>    
     <property key="ReviewedCustomerRequestTaskList">
         <value xml:lang="en">Reviewed but not completed Customer Request list with task assigned'</value>
+        <value xml:lang="fr">Liste des demandes client vérifiée mais incomplète et ayant une tâche affectée</value>
     </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="zh">新的时间表Id</value>
     </property>
     <property key="FormFieldTitle_fromPartyId">
         <value xml:lang="en">From Party Id</value>
+        <value xml:lang="fr">Depuis l'acteur de réf.</value>
         <value xml:lang="zh">来自会员</value>
     </property>
     <property key="ProjectMgrAddTimeEntry">
         <value xml:lang="en">Add Time Entry</value>
-        <value xml:lang="zh">增加工时</value>
+        <value xml:lang="fr">Ajouter une échéance</value>
+        <value xml:lang="it">Aggiungi Voce Tempo</value>
+        <value xml:lang="th">เพิ่มตารางเวลา</value>
+        <value xml:lang="zh">增加时间条目</value>
     </property>  
     <property key="ProjectMgrPrivateOrPublic">
         <value xml:lang="en">Private/Public</value>
+        <value xml:lang="fr">Privé/Public</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>
         <value xml:lang="zh">没记账工时</value>
     </property>
-    <property key="de">
-        <value xml:lang="en">German</value>
-        <value xml:lang="it">Tedesco</value>
-        <value xml:lang="th">เยอรมัน</value>
-    </property>
-    <property key="en">
-        <value xml:lang="en">English</value>
-        <value xml:lang="it">Inglese</value>
-        <value xml:lang="th">อังกฤษ</value>
-    </property>
-    <property key="fr">
-        <value xml:lang="en">French</value>
-        <value xml:lang="it">Francese</value>
-        <value xml:lang="th">ฝรั่งเศส</value>
-    </property>
-    <property key="it">
-        <value xml:lang="en">Italian</value>
-        <value xml:lang="it">Italiano</value>
-        <value xml:lang="th">อีตาเลียน</value>
-    </property>
-    <property key="nl">
-        <value xml:lang="en">Dutch</value>
-        <value xml:lang="it">Olandese</value>
-        <value xml:lang="th">เนเธอร์แลนด์</value>
-    </property>
-    <property key="zh">
-        <value xml:lang="en">Chinese</value>
-        <value xml:lang="zh">中文</value>
-    </property>
 </resource>

Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/EditTimeEntry.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/EditTimeEntry.ftl?rev=693543&r1=693542&r2=693543&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/EditTimeEntry.ftl (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/EditTimeEntry.ftl Tue Sep  9 11:14:56 2008
@@ -19,7 +19,7 @@
 <div class="screenlet">
   <div class="screenlet-title-bar">
     <ul>      
-        <li class="h3">&nbsp;${uiLabelMap.PageTitleAddTimeEntry}</li>
+        <li class="h3">&nbsp;${uiLabelMap.ProjectMgrAddTimeEntry}</li>
     </ul>
     <br class="clear" />
   </div>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml?rev=693543&r1=693542&r2=693543&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml Tue Sep  9 11:14:56 2008
@@ -320,7 +320,7 @@
                         <screenlet title="${uiLabelMap.${titleProperty}} ${workEffortId}">
                             <include-form name="ListTimeEntries" location="component://projectmgr/widget/forms/TaskForms.xml"/>
                         </screenlet>
-                        <screenlet title="${uiLabelMap.PorjectMgrAddTimeEntry}">
+                        <screenlet title="${uiLabelMap.ProjectMgrAddTimeEntry}">
                             <include-form name="createTimeEntry" location="component://projectmgr/widget/forms/TaskForms.xml"/>
                         </screenlet>
                     </decorator-section>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=693543&r1=693542&r2=693543&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Tue Sep  9 11:14:56 2008
@@ -486,10 +486,10 @@
         <field name="workEffortId"><hidden/></field>
         <field name="noteParty" title="${uiLabelMap.CommonBy}"><display description="${bsh:org.ofbiz.party.party.PartyHelper.getPartyName(delegator, noteParty, true)} at ${bsh: org.ofbiz.base.util.UtilDateTime.timeStampToString(noteDateTime, &quot;dd-MM-yyyy HH:mm&quot;, TimeZone.getDefault(), context.get(&quot;locale&quot;))}"/></field>
     
-        <field name="Private/Public" widget-style="buttontext" title="${uiLabelMap.PorjectMgrPrivateOrPublic}" use-when="internalNote.equals(&quot;N&quot;)">
+        <field name="Private/Public" widget-style="buttontext" title="${uiLabelMap.ProjectMgrPrivateOrPublic}" use-when="internalNote.equals(&quot;N&quot;)">
             <hyperlink target="updateTaskNote?workEffortId=${workEffortId}&amp;noteId=${noteId}&amp;internalNote=Y" description="${uiLabelMap.OrderNotesPrivate}"></hyperlink>
         </field>
-        <field name="Private/Public" widget-style="buttontext" title="${uiLabelMap.PorjectMgrPrivateOrPublic}" use-when="internalNote.equals(&quot;Y&quot;)">
+        <field name="Private/Public" widget-style="buttontext" title="${uiLabelMap.ProjectMgrPrivateOrPublic}" use-when="internalNote.equals(&quot;Y&quot;)">
             <hyperlink target="updateTaskNote?workEffortId=${workEffortId}&amp;noteId=${noteId}&amp;internalNote=N" description="${uiLabelMap.OrderNotesPublic}"></hyperlink>
         </field>
     </form>