svn commit: r748732 [1/2] - in /ofbiz/trunk/framework: common/config/ security/config/ webtools/config/ webtools/servicedef/ webtools/src/org/ofbiz/webtools/labelmanager/ webtools/webapp/webtools/WEB-INF/ webtools/webapp/webtools/labelmanager/ webtools...

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

svn commit: r748732 [1/2] - in /ofbiz/trunk/framework: common/config/ security/config/ webtools/config/ webtools/servicedef/ webtools/src/org/ofbiz/webtools/labelmanager/ webtools/webapp/webtools/WEB-INF/ webtools/webapp/webtools/labelmanager/ webtools...

jleroux@apache.org
Author: jleroux
Date: Fri Feb 27 23:01:41 2009
New Revision: 748732

URL: http://svn.apache.org/viewvc?rev=748732&view=rev
Log:
LabelReferences4.patch from Marco "New tool to get labels information" https://issues.apache.org/jira/browse/OFBIZ-2070 OFBIZ-2070

Modified:
    ofbiz/trunk/framework/common/config/CommonEntityLabels.xml
    ofbiz/trunk/framework/common/config/CommonUiLabels.xml
    ofbiz/trunk/framework/security/config/SecurityEntityLabels.xml
    ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml
    ofbiz/trunk/framework/webtools/servicedef/services.xml
    ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelManagerFactory.java
    ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelReferences.java
    ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml
    ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/SearchLabels.ftl
    ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/UpdateLabel.ftl
    ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/ViewFile.ftl
    ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/ViewLabels.ftl
    ofbiz/trunk/framework/webtools/webapp/webtools/labelmanager/ViewReferences.ftl
    ofbiz/trunk/framework/webtools/widget/EntityScreens.xml

Modified: ofbiz/trunk/framework/common/config/CommonEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonEntityLabels.xml?rev=748732&r1=748731&r2=748732&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonEntityLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonEntityLabels.xml Fri Feb 27 23:01:41 2009
@@ -52,6 +52,14 @@
         <value xml:lang="th">Bom formula for linear components</value>
         <value xml:lang="zh">用于线性组件的材料清单公式</value>
     </property>
+    <property key="CustomMethod.description.DBL_DECL_DEP_FORMULA">
+        <value xml:lang="en">Double decline depreciatiion algorithm for fixed asset((NetBookValue - salvageCost)*2/remainingLifeInYears)</value>
+        <value xml:lang="it">Declina algoritmo doppio svalutazione per cespiti((NetBookValue - salvageCost)*2/remainingLifeInYears)</value>
+    </property>
+    <property key="CustomMethod.description.STR_LINE_DEP_FORMULA">
+        <value xml:lang="en">Straight Line depreciatiion algorithm for fixed asset((purchaseCost - salvageCost)/expectedLifeInYears)</value>
+        <value xml:lang="it">Riga semplice algoritmo svalutazione per cespiti((purchaseCost - salvageCost)/expectedLifeInYears)</value>
+    </property>
     <property key="DataSource.description.ECOMMERCE_SITE">
         <value xml:lang="en">ECOMMERCE_SITE</value>
         <value xml:lang="fr">Site de commerce électronique</value>
@@ -5880,6 +5888,10 @@
         <value xml:lang="th">ตัวแทน</value>
         <value xml:lang="zh">已委托</value>
     </property>
+    <property key="StatusItem.description.CAL_IN_PLANNING">
+        <value xml:lang="en">In Planning</value>
+        <value xml:lang="it">In pianificazione</value>
+    </property>
     <property key="StatusItem.description.CAL_NEEDS_ACTION">
         <value xml:lang="de">Benötigt Massnahmen</value>
         <value xml:lang="en">Needs Action</value>
@@ -5892,6 +5904,10 @@
         <value xml:lang="th">ต้องการปฏิบัติการ</value>
         <value xml:lang="zh">需要行动</value>
     </property>
+    <property key="StatusItem.description.CAL_PLANNED">
+        <value xml:lang="en">Planned</value>
+        <value xml:lang="it">Pianificato</value>
+    </property>
     <property key="StatusItem.description.CAL_SENT">
         <value xml:lang="de">Übermittelt</value>
         <value xml:lang="en">Sent</value>
@@ -5928,6 +5944,10 @@
         <value xml:lang="th">ยอมรับ</value>
         <value xml:lang="zh">已接受</value>
     </property>
+    <property key="StatusItem.description.CLPT_IN_USE">
+        <value xml:lang="en">In Use</value>
+        <value xml:lang="it">In uso</value>
+    </property>
     <property key="StatusItem.description.CLPT_PENDING">
         <value xml:lang="de">Wartend auf Annahme</value>
         <value xml:lang="en">Pending Acceptance</value>
@@ -5952,6 +5972,30 @@
         <value xml:lang="th">ผู้ปฏิเสธ</value>
         <value xml:lang="zh">已拒绝</value>
     </property>
+    <property key="StatusItem.description.CNTAP_APPROVED">
+        <value xml:lang="en">Approved</value>
+        <value xml:lang="it">Approvato</value>
+    </property>
+    <property key="StatusItem.description.CNTAP_IN_PROCESS">
+        <value xml:lang="en">Approval In Process</value>
+        <value xml:lang="it">Approvazione in corso</value>
+    </property>
+    <property key="StatusItem.description.CNTAP_NOT_READY">
+        <value xml:lang="en">Not Ready for Approval</value>
+        <value xml:lang="it">Non pronto per l'approvazione</value>
+    </property>
+    <property key="StatusItem.description.CNTAP_READY">
+        <value xml:lang="en">Ready for Approval</value>
+        <value xml:lang="it">Pronto per l'approvazione</value>
+    </property>
+    <property key="StatusItem.description.CNTAP_REJECTED">
+        <value xml:lang="en">Rejected</value>
+        <value xml:lang="it">Rifiutato</value>
+    </property>
+    <property key="StatusItem.description.CNTAP_SOFT_REJ">
+        <value xml:lang="en">Soft Rejected</value>
+        <value xml:lang="it">Rifiutato leggermente</value>
+    </property>
     <property key="StatusItem.description.COM_CANCELLED">
         <value xml:lang="de">Annulliert</value>
         <value xml:lang="en">Cancelled</value>
@@ -6048,6 +6092,18 @@
         <value xml:lang="th">แก้ปัญหา</value>
         <value xml:lang="zh">已解决</value>
     </property>
+    <property key="StatusItem.description.COM_ROLE_COMPLETED">
+        <value xml:lang="en">Closed</value>
+        <value xml:lang="it">Chiuso</value>
+    </property>
+    <property key="StatusItem.description.COM_ROLE_CREATED">
+        <value xml:lang="en">Created</value>
+        <value xml:lang="it">Creato</value>
+    </property>
+    <property key="StatusItem.description.COM_ROLE_READ">
+        <value xml:lang="en">Read</value>
+        <value xml:lang="it">Letto</value>
+    </property>
     <property key="StatusItem.description.COM_UNKNOWN_PARTY">
         <value xml:lang="de">Unbekannter Akteur</value>
         <value xml:lang="en">Unknown Party</value>
@@ -6132,6 +6188,10 @@
         <value xml:lang="th">เสนอ</value>
         <value xml:lang="zh">已提交</value>
     </property>
+    <property key="StatusItem.description.CTNT_AVAILABLE">
+        <value xml:lang="en">Available</value>
+        <value xml:lang="it">Disponibile</value>
+    </property>
     <property key="StatusItem.description.CTNT_DEACTIVATED">
         <value xml:lang="de">Deaktiviert</value>
         <value xml:lang="en">Deactivated</value>
@@ -6204,6 +6264,18 @@
         <value xml:lang="th">แก้ไขเอกสารฉบับร่าง</value>
         <value xml:lang="zh">修订方案</value>
     </property>
+    <property key="StatusItem.description.EMPL_POS_ACTIVE">
+        <value xml:lang="en">Active/Open</value>
+        <value xml:lang="it">Attivo/Aperto</value>
+    </property>
+    <property key="StatusItem.description.EMPL_POS_INACTIVE">
+        <value xml:lang="en">Inactive/Closed</value>
+        <value xml:lang="it">Inattivo/Chiuso</value>
+    </property>
+    <property key="StatusItem.description.EMPL_POS_PLANNEDFOR">
+        <value xml:lang="en">Planned For</value>
+        <value xml:lang="it">Pianificato per</value>
+    </property>
     <property key="StatusItem.description.ESR_COMPLETE">
         <value xml:lang="en">ESR_COMPLETE</value>
         <value xml:lang="es">Completado</value>
@@ -6253,6 +6325,34 @@
         <value xml:lang="it">Errore servizio</value>
         <value xml:lang="th">บริการผิดพลาด</value>
     </property>
+    <property key="StatusItem.description.EXST_APPROVED">
+        <value xml:lang="en">Approved</value>
+        <value xml:lang="it">Approvato</value>
+    </property>
+    <property key="StatusItem.description.EXST_CANCELLED">
+        <value xml:lang="en">Cancelled</value>
+        <value xml:lang="it">Cancellato</value>
+    </property>
+    <property key="StatusItem.description.EXST_COMPLETE">
+        <value xml:lang="en">Complete</value>
+        <value xml:lang="it">Completato</value>
+    </property>
+    <property key="StatusItem.description.EXST_DEFINED">
+        <value xml:lang="en">Defined</value>
+        <value xml:lang="it">Definito</value>
+    </property>
+    <property key="StatusItem.description.EXST_IMPLEMENTED">
+        <value xml:lang="en">Implemented</value>
+        <value xml:lang="it">Implementato</value>
+    </property>
+    <property key="StatusItem.description.EXST_IN_DESIGN">
+        <value xml:lang="en">In Design</value>
+        <value xml:lang="it">In progettazione</value>
+    </property>
+    <property key="StatusItem.description.EXST_TESTED">
+        <value xml:lang="en">Tested</value>
+        <value xml:lang="it">Testato</value>
+    </property>
     <property key="StatusItem.description.FAM_CANCELLED">
         <value xml:lang="de">Annulliert</value>
         <value xml:lang="en">Cancelled</value>
@@ -6313,6 +6413,58 @@
         <value xml:lang="th">ตารางเวลา</value>
         <value xml:lang="zh">已列入计划</value>
     </property>
+    <property key="StatusItem.description.FA_ASGN_ASSIGNED">
+        <value xml:lang="en">Assigned</value>
+        <value xml:lang="it">Assegnato</value>
+    </property>
+    <property key="StatusItem.description.FA_ASGN_DENIED">
+        <value xml:lang="en">Request Denied</value>
+        <value xml:lang="it">Richiesta negata</value>
+    </property>
+    <property key="StatusItem.description.FA_ASGN_REQUESTED">
+        <value xml:lang="en">Requested</value>
+        <value xml:lang="it">Richiesta</value>
+    </property>
+    <property key="StatusItem.description.FNACT_ACTIVE">
+        <value xml:lang="en">Active</value>
+        <value xml:lang="it">Attivo</value>
+    </property>
+    <property key="StatusItem.description.FNACT_CANCELLED">
+        <value xml:lang="en">Cancelled</value>
+        <value xml:lang="it">Cancellato</value>
+    </property>
+    <property key="StatusItem.description.FNACT_MANFROZEN">
+        <value xml:lang="en">Manually Frozen</value>
+        <value xml:lang="it">Congelato manualmente</value>
+    </property>
+    <property key="StatusItem.description.FNACT_NEGPENDREPL">
+        <value xml:lang="en">Negative Pending Replenishment</value>
+        <value xml:lang="it">Rifornimento in attesa negativo</value>
+    </property>
+    <property key="StatusItem.description.HR_DS_COMPLETE">
+        <value xml:lang="en">Completed</value>
+        <value xml:lang="it">Completato</value>
+    </property>
+    <property key="StatusItem.description.HR_DS_DEFERRED">
+        <value xml:lang="en">Deferred</value>
+        <value xml:lang="it">Rinviato</value>
+    </property>
+    <property key="StatusItem.description.HR_DS_INCOMPLETE">
+        <value xml:lang="en">Incomplete</value>
+        <value xml:lang="it">Incompleto</value>
+    </property>
+    <property key="StatusItem.description.HR_JS_CONTRACTOR">
+        <value xml:lang="en">Contractor</value>
+        <value xml:lang="it">Imprenditore</value>
+    </property>
+    <property key="StatusItem.description.HR_JS_FULLTIME">
+        <value xml:lang="en">Full time</value>
+        <value xml:lang="it">Tempo pieno</value>
+    </property>
+    <property key="StatusItem.description.HR_JS_PARTTIME">
+        <value xml:lang="en">Part time</value>
+        <value xml:lang="it">Part time</value>
+    </property>
     <property key="StatusItem.description.INVOICE_APPROVED">
         <value xml:lang="de">Genehmigt</value>
         <value xml:lang="en">Approved</value>
@@ -6417,6 +6569,10 @@
         <value xml:lang="th">เขียนทันที</value>
         <value xml:lang="zh">丢失</value>
     </property>
+    <property key="StatusItem.description.INV_ACTIVATED">
+        <value xml:lang="en">Activated</value>
+        <value xml:lang="it">Attivato</value>
+    </property>
     <property key="StatusItem.description.INV_AVAILABLE">
         <value xml:lang="de">Verfügbar</value>
         <value xml:lang="en">Available</value>
@@ -6453,6 +6609,10 @@
         <value xml:lang="th">การเปลี่ยนคุณสมบัติ (ยืนยัน)</value>
         <value xml:lang="zh">正在递送(已承诺)</value>
     </property>
+    <property key="StatusItem.description.INV_DEACTIVATED">
+        <value xml:lang="en">Deactivated</value>
+        <value xml:lang="it">Disattivato</value>
+    </property>
     <property key="StatusItem.description.INV_DEFECTIVE">
         <value xml:lang="de">Defekt</value>
         <value xml:lang="en">Defective</value>
@@ -6477,6 +6637,14 @@
         <value xml:lang="th">การส่ง</value>
         <value xml:lang="zh">已投递</value>
     </property>
+    <property key="StatusItem.description.INV_NS_DEFECTIVE">
+        <value xml:lang="en">Defective (Non-Serialized)</value>
+        <value xml:lang="it">Difettoso (non-serializzato)</value>
+    </property>
+    <property key="StatusItem.description.INV_NS_ON_HOLD">
+        <value xml:lang="en">On Hold (Non-Serialized)</value>
+        <value xml:lang="it">In attesa (non-serializzato)</value>
+    </property>
     <property key="StatusItem.description.INV_ON_HOLD">
         <value xml:lang="de">In Wartestellung</value>
         <value xml:lang="en">On Hold</value>
@@ -6642,6 +6810,18 @@
         <value xml:lang="th">ตารางเวลา</value>
         <value xml:lang="zh">已计划</value>
     </property>
+    <property key="StatusItem.description.LEAD_ASSIGNED">
+        <value xml:lang="en">Assigned</value>
+        <value xml:lang="it">Assegnato</value>
+    </property>
+    <property key="StatusItem.description.LEAD_CONVERTED">
+        <value xml:lang="en">Converted</value>
+        <value xml:lang="it">Convertito</value>
+    </property>
+    <property key="StatusItem.description.LEAD_QUALIFIED">
+        <value xml:lang="en">Qualified</value>
+        <value xml:lang="it">Qualificato</value>
+    </property>
     <property key="StatusItem.description.MKTG_CAMP_APPROVED">
         <value xml:lang="de">Genehmigt</value>
         <value xml:lang="en">Approved</value>
@@ -6715,6 +6895,58 @@
         <value xml:lang="th">ไม่เกิดขึ้นเวลาเดียวกัน</value>
         <value xml:lang="zh">没有同步</value>
     </property>
+    <property key="StatusItem.description.OAGMP_ERRCONFSENT">
+        <value xml:lang="en">Error Confirm Sent</value>
+        <value xml:lang="it">Errore conferma inviata</value>
+    </property>
+    <property key="StatusItem.description.OAGMP_OGEN_ERROR">
+        <value xml:lang="en">Out Generated - Error</value>
+        <value xml:lang="it">Errore genereato fuori</value>
+    </property>
+    <property key="StatusItem.description.OAGMP_OGEN_SUCCESS">
+        <value xml:lang="en">Out Generated - Success</value>
+        <value xml:lang="it">Successo genereato fuori</value>
+    </property>
+    <property key="StatusItem.description.OAGMP_PROC_ERROR">
+        <value xml:lang="en">In Processed - Error</value>
+        <value xml:lang="it">Errore durante l'esecuzione</value>
+    </property>
+    <property key="StatusItem.description.OAGMP_PROC_SUCCESS">
+        <value xml:lang="en">In Processed - Success</value>
+        <value xml:lang="it">Successo durante l'esecuzione</value>
+    </property>
+    <property key="StatusItem.description.OAGMP_RECEIVED">
+        <value xml:lang="en">In Message Received</value>
+        <value xml:lang="it">Ricevuto messaggo in entrata</value>
+    </property>
+    <property key="StatusItem.description.OAGMP_RECEIVEDOAGMP_RECEIVED">
+        <value xml:lang="en">In Message Received</value>
+        <value xml:lang="it">Messaggio in ingresso ricevuto</value>
+    </property>
+    <property key="StatusItem.description.OAGMP_REC_ERR_CON">
+        <value xml:lang="en">Received Error Confirm</value>
+        <value xml:lang="it">Conferma errore ricevuto</value>
+    </property>
+    <property key="StatusItem.description.OAGMP_REC_SUC_CON">
+        <value xml:lang="en">Received Success Confirm</value>
+        <value xml:lang="it">Conferma successo ricevuto</value>
+    </property>
+    <property key="StatusItem.description.OAGMP_SEND_ERROR">
+        <value xml:lang="en">Out Message Send Error</value>
+        <value xml:lang="it">Errore invio messaggio all'esterno</value>
+    </property>
+    <property key="StatusItem.description.OAGMP_SENT">
+        <value xml:lang="en">Out Message Sent</value>
+        <value xml:lang="it">Messaggio inviato all'esterno</value>
+    </property>
+    <property key="StatusItem.description.OAGMP_SYS_ERROR">
+        <value xml:lang="en">System Error</value>
+        <value xml:lang="it">Errore di sistema</value>
+    </property>
+    <property key="StatusItem.description.OAGMP_TRIGGERED">
+        <value xml:lang="en">Out Message Triggered</value>
+        <value xml:lang="it">Intercettato messaggio dall'esterno</value>
+    </property>
     <property key="StatusItem.description.ODS_ACCEPTED">
         <value xml:lang="de">Angenommen</value>
         <value xml:lang="en">Accepted</value>
@@ -6868,6 +7100,34 @@
         <value xml:lang="th">ส่ง</value>
         <value xml:lang="zh">已发送</value>
     </property>
+    <property key="StatusItem.description.PARTYINV_ACCEPTED">
+        <value xml:lang="en">Invitation Accepted</value>
+        <value xml:lang="it">Invito accettato</value>
+    </property>
+    <property key="StatusItem.description.PARTYINV_CANCELLED">
+        <value xml:lang="en">Invitation Cancelled</value>
+        <value xml:lang="it">Invito cancellato</value>
+    </property>
+    <property key="StatusItem.description.PARTYINV_DECLINED">
+        <value xml:lang="en">Invitation Declined</value>
+        <value xml:lang="it">Invito declinato</value>
+    </property>
+    <property key="StatusItem.description.PARTYINV_PENDING">
+        <value xml:lang="en">Invitation Pending</value>
+        <value xml:lang="it">Invito in attesa</value>
+    </property>
+    <property key="StatusItem.description.PARTYINV_SENT">
+        <value xml:lang="en">Invitation Sent</value>
+        <value xml:lang="it">Invito inviato</value>
+    </property>
+    <property key="StatusItem.description.PARTY_DISABLED">
+        <value xml:lang="en">Disabled</value>
+        <value xml:lang="it">Disabilitato</value>
+    </property>
+    <property key="StatusItem.description.PARTY_ENABLED">
+        <value xml:lang="en">Enabled</value>
+        <value xml:lang="it">Abilitato</value>
+    </property>
     <property key="StatusItem.description.PAS_ASSIGNED">
         <value xml:lang="de">Zugewiesen</value>
         <value xml:lang="en">Assigned</value>
@@ -6956,6 +7216,10 @@
         <value xml:lang="th">ยอมรับ</value>
         <value xml:lang="zh">已接收</value>
     </property>
+    <property key="StatusItem.description.PAYMENT_REFUNDED">
+        <value xml:lang="en">Refunded</value>
+        <value xml:lang="it">Rimborsato</value>
+    </property>
     <property key="StatusItem.description.PAYMENT_SETTLED">
         <value xml:lang="de">Beglichen</value>
         <value xml:lang="en">Settled</value>
@@ -6968,6 +7232,18 @@
         <value xml:lang="th">ตัดสินใจ</value>
         <value xml:lang="zh">已结清</value>
     </property>
+    <property key="StatusItem.description.PICKITEM_CANCELLED">
+        <value xml:lang="en">Cancelled</value>
+        <value xml:lang="it">Cancellata</value>
+    </property>
+    <property key="StatusItem.description.PICKITEM_COMPLETED">
+        <value xml:lang="en">Completed</value>
+        <value xml:lang="it">Completata</value>
+    </property>
+    <property key="StatusItem.description.PICKITEM_PENDING">
+        <value xml:lang="en">Pending</value>
+        <value xml:lang="it">In attesa</value>
+    </property>
     <property key="StatusItem.description.PICKLIST_ASSIGNED">
         <value xml:lang="de">Zugewiesen</value>
         <value xml:lang="en">Assigned</value>
@@ -7016,6 +7292,10 @@
         <value xml:lang="th">เลือก</value>
         <value xml:lang="zh">已分拣</value>
     </property>
+    <property key="StatusItem.description.PICKLIST_PRINTED">
+        <value xml:lang="en">Printed</value>
+        <value xml:lang="it">Stampata</value>
+    </property>
     <property key="StatusItem.description.PMNT_CANCELLED">
         <value xml:lang="de">Annulliert</value>
         <value xml:lang="en">Cancelled</value>
@@ -7095,6 +7375,14 @@
         <value xml:lang="it">Chiusa</value>
         <value xml:lang="th">ปิด</value>
     </property>
+    <property key="StatusItem.description.POSTX_PAID_IN">
+        <value xml:lang="en">PaidIn</value>
+        <value xml:lang="it">Pagamento in entrata</value>
+    </property>
+    <property key="StatusItem.description.POSTX_PAID_OUT">
+        <value xml:lang="en">PaidOut</value>
+        <value xml:lang="it">Pagamento in uscita</value>
+    </property>
     <property key="StatusItem.description.POSTX_RETURNED">
         <value xml:lang="en">POSTX_RETURNED</value>
         <value xml:lang="es">Devuelto</value>
@@ -7116,22 +7404,35 @@
         <value xml:lang="it">Annullata</value>
         <value xml:lang="th">โมฆะ</value>
     </property>
+    <property key="StatusItem.description.PQV_NOT_VERIFIED">
+        <value xml:lang="en">Not verified</value>
+        <value xml:lang="it">Non verificato</value>
+    </property>
+    <property key="StatusItem.description.PQV_VERIFIED">
+        <value xml:lang="en">Verified</value>
+        <value xml:lang="it">Verificato</value>
+    </property>
+    <property key="StatusItem.description.PRJ_ACTIVE">
+        <value xml:lang="en">Active</value>
+        <value xml:lang="it">Attivo</value>
+    </property>
+    <property key="StatusItem.description.PRJ_CLOSED">
+        <value xml:lang="en">Closed</value>
+        <value xml:lang="it">Chiuso</value>
+    </property>
     <property key="StatusItem.description.PRR_APPROVED">
-        <value xml:lang="en">PRR_APPROVED</value>
-        <value xml:lang="es">Aprobado</value>
-        <value xml:lang="fr">Approuvé</value>
-        <value xml:lang="it">Approvata</value>
-        <value xml:lang="th">เห็นด้วย</value>
+        <value xml:lang="en">Approved</value>
+        <value xml:lang="it">Approvato</value>
     </property>
     <property key="StatusItem.description.PRR_DELETED">
-        <value xml:lang="en">PRR_DELETED</value>
+        <value xml:lang="en">Deleted</value>
         <value xml:lang="es">Suprimido</value>
         <value xml:lang="fr">Supprimé</value>
         <value xml:lang="it">Cancellata</value>
         <value xml:lang="th">ลบ</value>
     </property>
     <property key="StatusItem.description.PRR_PENDING">
-        <value xml:lang="en">PRR_PENDING</value>
+        <value xml:lang="en">Pending</value>
         <value xml:lang="es">Pendiente</value>
         <value xml:lang="fr">En attente</value>
         <value xml:lang="it">Sospesa</value>
@@ -7245,6 +7546,10 @@
         <value xml:lang="th">ดำเนินการ</value>
         <value xml:lang="zh">正在运行</value>
     </property>
+    <property key="StatusItem.description.PRUN_SCHEDULED">
+        <value xml:lang="en">Scheduled</value>
+        <value xml:lang="it">Schedulato</value>
+    </property>
     <property key="StatusItem.description.PTS_CANCELLED">
         <value xml:lang="de">Annulliert</value>
         <value xml:lang="en">Cancelled</value>
@@ -7478,6 +7783,10 @@
         <value xml:lang="th">เสร็จสมบูรณ์</value>
         <value xml:lang="zh">已完成</value>
     </property>
+    <property key="StatusItem.description.RETURN_MAN_REFUND">
+        <value xml:lang="en">Manual Refund Required</value>
+        <value xml:lang="it">Reso manual richiesto</value>
+    </property>
     <property key="StatusItem.description.RETURN_RECEIVED">
         <value xml:lang="de">Erhalten</value>
         <value xml:lang="en">Received</value>
@@ -7518,46 +7827,47 @@
     </property>
     <property key="StatusItem.description.SERVICE_CANCELLED">
         <value xml:lang="de">Annulliert</value>
-        <value xml:lang="en">SERVICE_CANCELLED</value>
+        <value xml:lang="en">Cancelled</value>
         <value xml:lang="es">Anulado</value>
         <value xml:lang="fr">Annulé</value>
         <value xml:lang="it">Annullato</value>
         <value xml:lang="th">ยกเลิก</value>
     </property>
     <property key="StatusItem.description.SERVICE_CRASHED">
-        <value xml:lang="en">SERVICE_CRASHED</value>
+        <value xml:lang="en">Crashed</value>
         <value xml:lang="es">Caído</value>
         <value xml:lang="fr">Planté</value>
         <value xml:lang="it">Bloccato</value>
         <value xml:lang="th">เงินสด</value>
     </property>
     <property key="StatusItem.description.SERVICE_FAILED">
-        <value xml:lang="en">SERVICE_FAILED</value>
+        <value xml:lang="en">Failed</value>
         <value xml:lang="es">Fallado</value>
         <value xml:lang="fr">Échoué</value>
         <value xml:lang="it">Fallito</value>
         <value xml:lang="th">ผิดพลาด</value>
     </property>
     <property key="StatusItem.description.SERVICE_FINISHED">
-        <value xml:lang="en">SERVICE_FINISHED</value>
+        <value xml:lang="en">Finished</value>
         <value xml:lang="es">Finalizado</value>
         <value xml:lang="fr">Fini</value>
         <value xml:lang="it">Finito</value>
         <value xml:lang="th">เสร็จสิ้น</value>
     </property>
     <property key="StatusItem.description.SERVICE_PENDING">
-        <value xml:lang="en">SERVICE_PENDING</value>
+        <value xml:lang="en">Pending</value>
         <value xml:lang="es">Pendiente</value>
         <value xml:lang="fr">En attente</value>
         <value xml:lang="it">Sospeso</value>
         <value xml:lang="th">ยังค้างอยู่</value>
     </property>
+    <property key="StatusItem.description.SERVICE_QUEUED">
+        <value xml:lang="en">Running</value>
+        <value xml:lang="it">In esecuzione</value>
+    </property>
     <property key="StatusItem.description.SERVICE_RUNNING">
-        <value xml:lang="en">SERVICE_RUNNING</value>
-        <value xml:lang="es">En ejecución</value>
-        <value xml:lang="fr">En fonction</value>
+        <value xml:lang="en">Queued</value>
         <value xml:lang="it">In esecuzione</value>
-        <value xml:lang="th">ดำเนินการ</value>
     </property>
     <property key="StatusItem.description.SHIPMENT_CANCELLED">
         <value xml:lang="de">Annulliert</value>
@@ -7671,6 +7981,26 @@
         <value xml:lang="it">Annullato</value>
         <value xml:lang="th">โมฆะ</value>
     </property>
+    <property key="StatusItem.description.SUP_RETURN_ACCEPTED">
+        <value xml:lang="en">Accepted</value>
+        <value xml:lang="it">Accettato</value>
+    </property>
+    <property key="StatusItem.description.SUP_RETURN_CANCELLED">
+        <value xml:lang="en">Cancelled</value>
+        <value xml:lang="it">Cancellato</value>
+    </property>
+    <property key="StatusItem.description.SUP_RETURN_COMPLETED">
+        <value xml:lang="en">Completed</value>
+        <value xml:lang="it">Completato</value>
+    </property>
+    <property key="StatusItem.description.SUP_RETURN_REQUESTED">
+        <value xml:lang="en">Requested</value>
+        <value xml:lang="it">Richiesto</value>
+    </property>
+    <property key="StatusItem.description.SUP_RETURN_SHIPPED">
+        <value xml:lang="en">Shipped</value>
+        <value xml:lang="it">Spedito</value>
+    </property>
     <property key="StatusItem.description.SYNCHRONIZED">
         <value xml:lang="de">Synchronisiert</value>
         <value xml:lang="en">Synchronized</value>
@@ -7684,6 +8014,82 @@
         <value xml:lang="th">เกิดขึ้นเวลาเดียวกัน</value>
         <value xml:lang="zh">已同步</value>
     </property>
+    <property key="StatusItem.description.TIMESHEET_APPROVED">
+        <value xml:lang="en">Approved</value>
+        <value xml:lang="it">Approvato</value>
+    </property>
+    <property key="StatusItem.description.TIMESHEET_COMPLETED">
+        <value xml:lang="en">Completed</value>
+        <value xml:lang="it">Completato</value>
+    </property>
+    <property key="StatusItem.description.TIMESHEET_IN_PROCESS">
+        <value xml:lang="en">In-Process</value>
+        <value xml:lang="it">In attesa</value>
+    </property>
+    <property key="StatusItem.description.WEFA_AVAILABLE">
+        <value xml:lang="en">Available</value>
+        <value xml:lang="it">Disponibile</value>
+    </property>
+    <property key="StatusItem.description.WEFA_IN_USE">
+        <value xml:lang="en">In Use</value>
+        <value xml:lang="it">In uso</value>
+    </property>
+    <property key="StatusItem.description.WEGS_CANCELLED">
+        <value xml:lang="en">Cancelled</value>
+        <value xml:lang="it">Cancellato</value>
+    </property>
+    <property key="StatusItem.description.WEGS_COMPLETED">
+        <value xml:lang="en">Completed</value>
+        <value xml:lang="it">Completato</value>
+    </property>
+    <property key="StatusItem.description.WEGS_CREATED">
+        <value xml:lang="en">Created</value>
+        <value xml:lang="it">Creato</value>
+    </property>
+    <property key="StatusItem.description.WEPA_AV_AVAILABLE">
+        <value xml:lang="en">Available</value>
+        <value xml:lang="it">Disponibile</value>
+    </property>
+    <property key="StatusItem.description.WEPA_AV_AWAY">
+        <value xml:lang="en">Away</value>
+        <value xml:lang="it">Lontano</value>
+    </property>
+    <property key="StatusItem.description.WEPA_AV_BUSY">
+        <value xml:lang="en">Busy</value>
+        <value xml:lang="it">Occupato</value>
+    </property>
+    <property key="StatusItem.description.WEPR_CANCELLED">
+        <value xml:lang="en">Cancelled</value>
+        <value xml:lang="it">Cancellato</value>
+    </property>
+    <property key="StatusItem.description.WEPR_COMPLETE">
+        <value xml:lang="en">Complete</value>
+        <value xml:lang="it">Completo</value>
+    </property>
+    <property key="StatusItem.description.WEPR_IN_PROGRESS">
+        <value xml:lang="en">In Progress</value>
+        <value xml:lang="it">In corso</value>
+    </property>
+    <property key="StatusItem.description.WEPR_ON_HOLD">
+        <value xml:lang="en">On Hold</value>
+        <value xml:lang="it">In attesa</value>
+    </property>
+    <property key="StatusItem.description.WEPR_PLANNING">
+        <value xml:lang="en">Planning</value>
+        <value xml:lang="it">Pianificato</value>
+    </property>
+    <property key="StatusItem.description.WERV_APPROVED">
+        <value xml:lang="en">Approved</value>
+        <value xml:lang="it">Approvato</value>
+    </property>
+    <property key="StatusItem.description.WERV_DELETED">
+        <value xml:lang="en">Deleted</value>
+        <value xml:lang="it">Cancellato</value>
+    </property>
+    <property key="StatusItem.description.WERV_PENDING">
+        <value xml:lang="en">Pending</value>
+        <value xml:lang="it">In attesa</value>
+    </property>
     <property key="StatusItem.description.WF_ABORTED">
         <value xml:lang="de">Abgebrochen</value>
         <value xml:lang="en">Aborted</value>
@@ -12659,6 +13065,10 @@
         <value xml:lang="th">แคนเดลา (หน่วยวัดความเข้มของแสง)</value>
         <value xml:lang="zh">烛光 -发光度 (发光强度)</value>
     </property>
+    <property key="Uom.description.OTH_ea">
+        <value xml:lang="en">Each</value>
+        <value xml:lang="it">Ciascuno</value>
+    </property>
     <property key="Uom.description.OTH_mol">
         <value xml:lang="de">Mol - Stoffmenge</value>
         <value xml:lang="en">Mole - Substance (molecule)</value>
@@ -12671,6 +13081,10 @@
         <value xml:lang="th">โมล - สสาร (โมเลกุล)</value>
         <value xml:lang="zh">摩尔 -物质  (分子)</value>
     </property>
+    <property key="Uom.description.OTH_pp">
+        <value xml:lang="en">Per Person</value>
+        <value xml:lang="it">Per persona</value>
+    </property>
     <property key="Uom.description.PAB">
         <value xml:lang="de">Balboa Panama</value>
         <value xml:lang="en">Panamanian Balboa</value>

Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.xml?rev=748732&r1=748731&r2=748732&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonUiLabels.xml Fri Feb 27 23:01:41 2009
@@ -1387,7 +1387,7 @@
     <property key="CommonCopyright">
         <value xml:lang="en">Copyright</value>
         <value xml:lang="fr">Droit d'auteur</value>
-    </property>    
+    </property>
     <property key="CommonCouldBeUsedAs">
         <value xml:lang="ar">يحتمل استعمالها ك</value>
         <value xml:lang="cs">Může být použit jako</value>
@@ -3416,6 +3416,16 @@
         <value xml:lang="zh">查找</value>
         <value xml:lang="zh_CN">查找</value>
     </property>
+    <property key="CommonLookupAnywho">
+        <value xml:lang="en">lookup:anywho.com</value>
+        <value xml:lang="fr">A qui est ce n° ?</value>
+        <value xml:lang="it">lookup:anywho.com</value>
+    </property>
+    <property key="CommonLookupAnywhoLink">
+        <value xml:lang="en">http://www.anywho.com/qry/wp_rl?npa=${telecomNumber.areaCode?if_exists}&amp;telephone=${telecomNumber.contactNumber?if_exists}&amp;btnsubmit.x=20&amp;btnsubmit.y=8</value>
+        <value xml:lang="fr">http://www.pagesjaunes.fr/quidonc/aquiestcenumero.do</value>
+        <value xml:lang="it">http://www.anywho.com/qry/wp_rl?npa=${telecomNumber.areaCode?if_exists}&amp;telephone=${telecomNumber.contactNumber?if_exists}&amp;btnsubmit.x=20&amp;btnsubmit.y=8</value>
+    </property>
     <property key="CommonLookupWhitepages">
         <value xml:lang="en">Look up White pages</value>
         <value xml:lang="es">Páginas Blancas</value>
@@ -3433,16 +3443,8 @@
     </property>
     <property key="CommonLookupWhitepagesTelNumberLink">
         <value xml:lang="en">http://whitepages.com/find_person_results.pl?fid=p&amp;ac=${telecomNumber.areaCode?if_exists}&amp;s=&amp;p=${telecomNumber.contactNumber?if_exists}&amp;pt=b&amp;x=40&amp;y=9</value>
-            <value xml:lang="fr">http://www.pagesjaunes.fr/quidonc/aquiestcenumero.do</value>
-    </property>    
-    <property key="CommonLookupAnywho">
-        <value xml:lang="en">lookup:anywho.com</value>
-        <value xml:lang="fr">A qui est ce n° ?</value>
-    </property>
-    <property key="CommonLookupAnywhoLink">
-        <value xml:lang="en">http://www.anywho.com/qry/wp_rl?npa=${telecomNumber.areaCode?if_exists}&amp;telephone=${telecomNumber.contactNumber?if_exists}&amp;btnsubmit.x=20&amp;btnsubmit.y=8</value>
         <value xml:lang="fr">http://www.pagesjaunes.fr/quidonc/aquiestcenumero.do</value>
-    </property>    
+    </property>
     <property key="CommonMain">
         <value xml:lang="ar">الرئيسية</value>
         <value xml:lang="cs">Úvodní stránka</value>
@@ -4729,12 +4731,6 @@
         <value xml:lang="zh">人员</value>
         <value xml:lang="zh_CN">人</value>
     </property>
-    <property key="PortalPageNotFound">
-        <value xml:lang="en">This page (${parameters.portalPageId}) could not be found!</value>
-    </property>
-    <property key="PortalPageNotOwned">
-        <value xml:lang="en">The page '${portalPage.portalPageName}' [${portalPage.portalPageId}] is not owned by you, so cannot be changed!</value>
-    </property>
     <property key="CommonPostedBy">
         <value xml:lang="ar">مرسلة من</value>
         <value xml:lang="de">Übermittelt von</value>
@@ -4764,7 +4760,7 @@
     <property key="CommonPoweredBy">
         <value xml:lang="en">Powered by</value>
         <value xml:lang="fr">Fonctionne grâce à </value>
-    </property>    
+    </property>
     <property key="CommonPreferences">
         <value xml:lang="de">Einstellungen</value>
         <value xml:lang="en">Preferences</value>
@@ -8169,6 +8165,10 @@
         <value xml:lang="fr">Mon portail</value>
         <value xml:lang="it">Mio portale</value>
     </property>
+    <property key="OFBiz Site">
+        <value xml:lang="en">OFBiz Site</value>
+        <value xml:lang="fr">Site officiel d'OFBiz</value>
+    </property>
     <property key="Oagis">
         <value xml:lang="de">Oagis</value>
         <value xml:lang="en">Oagis</value>
@@ -8177,10 +8177,6 @@
         <value xml:lang="it">Oagis</value>
         <value xml:lang="th">การรวมภาษาทางธุรกิจ</value>
     </property>
-    <property key="OFBiz Site">
-        <value xml:lang="en">OFBiz Site</value>
-        <value xml:lang="fr">Site officiel d'OFBiz</value>
-    </property>
     <property key="Order">
         <value xml:lang="ar">طلبية</value>
         <value xml:lang="de">Bestellung</value>
@@ -8342,6 +8338,12 @@
         <value xml:lang="zh">会员</value>
         <value xml:lang="zh_CN">团体</value>
     </property>
+    <property key="PortalPageNotFound">
+        <value xml:lang="en">This page (${parameters.portalPageId}) could not be found!</value>
+    </property>
+    <property key="PortalPageNotOwned">
+        <value xml:lang="en">The page '${portalPage.portalPageName}' [${portalPage.portalPageId}] is not owned by you, so cannot be changed!</value>
+    </property>
     <property key="Project">
         <value xml:lang="de">Projekt</value>
         <value xml:lang="en">Project</value>

Modified: ofbiz/trunk/framework/security/config/SecurityEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/security/config/SecurityEntityLabels.xml?rev=748732&r1=748731&r2=748732&view=diff
==============================================================================
--- ofbiz/trunk/framework/security/config/SecurityEntityLabels.xml (original)
+++ ofbiz/trunk/framework/security/config/SecurityEntityLabels.xml Fri Feb 27 23:01:41 2009
@@ -19,6 +19,14 @@
     under the License.
 -->
 <resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <property key="SecurityGroup.description.ASSETMAINTADMIN">
+        <value xml:lang="en">Asset Maintenance Admin group, has all maintenance permissions.</value>
+        <value xml:lang="it">Gruppo permesso manutenzione cespiti, ha tutti i permessi di manutenzione.</value>
+    </property>
+    <property key="SecurityGroup.description.ASSETMAINTTECH">
+        <value xml:lang="en">Asset Maintenance Technician group, has view and update.</value>
+        <value xml:lang="it">Gruppo permesso manutenzione tecnica cespiti, ha i permessi di visualizzazione e aggiornamento.</value>
+    </property>
     <property key="SecurityGroup.description.BIZADMIN">
         <value xml:lang="en">Full Business Applications permission group, has all business app admin permissions, not technical permissions.</value>
         <value xml:lang="es">Permisos completos para las Aplicaciones de Negocio, no posee permisos técnicos.</value>
@@ -42,6 +50,10 @@
         <value xml:lang="ru">Группа 'Ограниченный администратор каталога', содержит ограниченные права на каталог.</value>
         <value xml:lang="th">กลุ่มผู้ดูแลระบบหมวดหมู่จำกัด, มีการอนุญาตหมวดหมู่จำกัด.</value>
     </property>
+    <property key="SecurityGroup.description.COMPDOCADMIN">
+        <value xml:lang="en">CompDoc admin group, all permissions.</value>
+        <value xml:lang="it">Gruppo permesso amministratore composizione documenti, ha tutti permessi di manutenzione.</value>
+    </property>
     <property key="SecurityGroup.description.CONTENT_USER">
         <value xml:lang="en">Content user group; all limited content permissions.</value>
         <value xml:lang="es">Grupo de usuarios de contenidos; todos los permisos de contenido limitados</value>
@@ -64,6 +76,30 @@
         <value xml:lang="ru">Группа 'Полный администратор', содержит все общие права.</value>
         <value xml:lang="th">Full Admin group, has all general permissions.</value>
     </property>
+    <property key="SecurityGroup.description.MYPAGE_CUSTOMER">
+        <value xml:lang="en">Customer user of mypage, Limited access to own custRequests, and project</value>
+        <value xml:lang="it">Utente di mypage, accesso limitato al proprietario delle richieste cliente, e progetti</value>
+    </property>
+    <property key="SecurityGroup.description.MYPAGE_EMPL-NOEMAIL">
+        <value xml:lang="en">Employee user of mypage, Limited access to the projectmgr and comms, custReq, no email</value>
+        <value xml:lang="it">Utente impiegato di mypage, accesso limitato ai progetti e comunicazioni, richieste cliente, no email</value>
+    </property>
+    <property key="SecurityGroup.description.MYPAGE_EMPLOYEE">
+        <value xml:lang="en">Employee user of mypage, Limited access to the projectmgr, comms,custRequests</value>
+        <value xml:lang="it">Utente impiegato di mypage, accesso limitato ai progetti e comunicazioni, richieste cliente</value>
+    </property>
+    <property key="SecurityGroup.description.MYPORTAL_CUSTOMER">
+        <value xml:lang="en">Customer user of MYPORTAL, Limited access to own custRequests, and project</value>
+        <value xml:lang="it">Utente di myportal, accesso limitato al proprietario delle richieste cliente, e progetti</value>
+    </property>
+    <property key="SecurityGroup.description.MYPORTAL_EMPL-NOEML">
+        <value xml:lang="en">Employee user of MYPORTAL, Limited access to the projectmgr and comms, custReq, no email</value>
+        <value xml:lang="it">Utente impiegato di myportal, accesso limitato ai progetti e comunicazioni, richieste cliente, no email</value>
+    </property>
+    <property key="SecurityGroup.description.MYPORTAL_EMPLOYEE">
+        <value xml:lang="en">Employee user of myportal, Limited access to the projectmgr, comms,custRequests</value>
+        <value xml:lang="it">Utente impiegato di myportal, accesso limitato ai progetti e comunicazioni, richieste cliente</value>
+    </property>
     <property key="SecurityGroup.description.ORDERADMIN">
         <value xml:lang="en">Order Admin group, has all order permissions.</value>
         <value xml:lang="es">Administrador de Órdenes, tiene todos los permisos de Órdenes.</value>
@@ -136,6 +172,14 @@
         <value xml:lang="ru">Служащий POS</value>
         <value xml:lang="th">พนักงาน ณ.จุดขาย</value>
     </property>
+    <property key="SecurityGroup.description.PROJECTADMIN">
+        <value xml:lang="en">Project Admin group, has update access to own projects.</value>
+        <value xml:lang="it">Gruppo permesso amministrazione progetti, ha accesso in aggiornamento come proprietario progetti.</value>
+    </property>
+    <property key="SecurityGroup.description.PROJECTUSER">
+        <value xml:lang="en">Project User group, has read, task create/assign and timesheet create/update access to own projects.</value>
+        <value xml:lang="it">Gruppo permesso utente progetti, può leggere, creare/assegnare compiti e creare/aggiornare timbrature accedere ai propri progetti.</value>
+    </property>
     <property key="SecurityGroup.description.SECURITYADMIN">
         <value xml:lang="en">Security Admin group, has all permissions to modify security settings in party manager.</value>
         <value xml:lang="es">Grupo de administradores de seguridad, tiene todos los permisos para modificar ajustes de seguridad en el gestor de participantes.</value>
@@ -260,6 +304,10 @@
         <value xml:lang="ru">Операции просмотра в приложении Управление учетом.</value>
         <value xml:lang="th">แสดงการทำงานในการจัดการบัญชี</value>
     </property>
+    <property key="SecurityPermission.description.ACCTG_ATX_ADMIN">
+        <value xml:lang="en">ALL operations involving general ledger accounting transactions and entries.</value>
+        <value xml:lang="it">Tutte le operazioni che coinvolgono transazioni e voci di contabilità</value>
+    </property>
     <property key="SecurityPermission.description.ACCTG_ATX_CREATE">
         <value xml:lang="en">Create general ledger accounting transaction and entries.</value>
         <value xml:lang="es">Creación de transacciones y entradas de contabilidad de libro mayor.</value>
@@ -292,7 +340,11 @@
         <value xml:lang="ru">Обновление проводок и занесений главной книги.</value>
         <value xml:lang="th">อัพเดทรายการบัญชีแยกประเภททั่วไปและสิทธิในการเข้า</value>
     </property>
-    <property key="SecurityPermission.description.ACCTG_FX_ENTRY">
+    <property key="SecurityPermission.description.ACCTG_ATX_VIEW">
+        <value xml:lang="en">View general ledger accounting transaction and entries.</value>
+        <value xml:lang="it">Visualizzare le transazioni nella contabilità generale.</value>
+    </property>
+    <property key="SecurityPermission.description.ACCTG_FX_UPDATE">
         <value xml:lang="en">Set foreign exchange rates.</value>
         <value xml:lang="es">Establecer tasas de cambio de divisa.</value>
         <value xml:lang="fr">Fixer les taux de devises étrangères.</value>
@@ -300,6 +352,10 @@
         <value xml:lang="ru">Устанавливать курсы иностранных валют.</value>
         <value xml:lang="th">กำหนดอัตราการปริวรรตเงินตรา</value>
     </property>
+    <property key="SecurityPermission.description.ACCTG_PREF_ADMIN">
+        <value xml:lang="en">ALL organization accounting preferences operations</value>
+        <value xml:lang="it">Tutte le operazioni nelle preferenze di contabilità.</value>
+    </property>
     <property key="SecurityPermission.description.ACCTG_PREF_CREATE">
         <value xml:lang="en">Set organization accounting preferences.</value>
         <value xml:lang="es">Establecer preferencias contables de la organización.</value>
@@ -308,6 +364,42 @@
         <value xml:lang="ru">Устанавливать учетные параметры организации.</value>
         <value xml:lang="th">กำหนดสิทธิพิเศษให้บัญชีขององค์กร</value>
     </property>
+    <property key="SecurityPermission.description.ACCTG_PREF_DELETE">
+        <value xml:lang="en">Delete organization accounting preferences</value>
+        <value xml:lang="it">Operazioni di cancellazione nelle preferenze di contabilità.</value>
+    </property>
+    <property key="SecurityPermission.description.ACCTG_PREF_UPDATE">
+        <value xml:lang="en">Update organization accounting preferences</value>
+        <value xml:lang="it">Operazioni di aggiornamento nelle preferenze di contabilità.</value>
+    </property>
+    <property key="SecurityPermission.description.ACCTG_PREF_VIEW">
+        <value xml:lang="en">View organization accounting preferences</value>
+        <value xml:lang="it">Operazioni di visualizzazione nelle preferenze di contabilità.</value>
+    </property>
+    <property key="SecurityPermission.description.ARTIFACT_INFO_VIEW">
+        <value xml:lang="en">View the Artifact Info pages.</value>
+        <value xml:lang="it">Visualizzazione pagine informazioni artifatti.</value>
+    </property>
+    <property key="SecurityPermission.description.ASSETMAINT_ADMIN">
+        <value xml:lang="en">ALL Asset Maintenance operations.</value>
+        <value xml:lang="it">Tutte le operazioni per la gestione cespiti.</value>
+    </property>
+    <property key="SecurityPermission.description.ASSETMAINT_CREATE">
+        <value xml:lang="en">Asset Maintenance Create operations.</value>
+        <value xml:lang="it">Operazioni di creazione per la gestione cespiti.</value>
+    </property>
+    <property key="SecurityPermission.description.ASSETMAINT_DELETE">
+        <value xml:lang="en">Asset Maintenance Delete operations.</value>
+        <value xml:lang="it">Operazioni di cancellazione per la gestione cespiti.</value>
+    </property>
+    <property key="SecurityPermission.description.ASSETMAINT_UPDATE">
+        <value xml:lang="en">Asset Maintenance Update operations.</value>
+        <value xml:lang="it">Operazioni di aggiornamento per la gestione cespiti.</value>
+    </property>
+    <property key="SecurityPermission.description.ASSETMAINT_VIEW">
+        <value xml:lang="en">Asset Maintenance View permission.</value>
+        <value xml:lang="it">Operazioni di visualizzazione per la gestione cespiti.</value>
+    </property>
     <property key="SecurityPermission.description.CATALOG_ADMIN">
         <value xml:lang="en">ALL operations in the Catalog Manager.</value>
         <value xml:lang="es">TODAS las operaciones en el Administrador del Catálogo.</value>
@@ -340,6 +432,10 @@
         <value xml:lang="ru">Дополнительные права для редактирования ценовой информации, включая цены, акции и правила ценообразования.</value>
         <value xml:lang="th">ต้องการการอนุญาต, ในการเพิ่มถึงการอนุญาตการปฏิบัติอื่น ๆ, ถึงการรักษาราคาสินค้าข้อมูลการรวมราคา,โปรโมชัน,และข้อบังคับราคา</value>
     </property>
+    <property key="SecurityPermission.description.CATALOG_PURCHASE_ALLOW">
+        <value xml:lang="en">Allow create/update of 'Purchase Allow' in the Catalog Manager.</value>
+        <value xml:lang="it">Permetti la creazione/aggiornamento di gestione cataloghi di 'Permetti acquisto'.</value>
+    </property>
     <property key="SecurityPermission.description.CATALOG_ROLE_CREATE">
         <value xml:lang="en">Limited Create operations in the Catalog Manager.</value>
         <value xml:lang="es">Operaciones de Creación Limitadas en el Administrador del Catálogo.</value>
@@ -380,6 +476,26 @@
         <value xml:lang="ru">Операции просмотра в приложении Управление каталогом продуктов.</value>
         <value xml:lang="th">การแสดงการทำงานในการจัดการหมวดหมู่</value>
     </property>
+    <property key="SecurityPermission.description.CATALOG_VIEW_ALLOW">
+        <value xml:lang="en">Allow create/update of 'View Allow' in the Catalog Manager.</value>
+        <value xml:lang="it">Permetti la creazione/aggiornamento di gestione cataloghi di 'Visualizzazione permessa'.</value>
+    </property>
+    <property key="SecurityPermission.description.COMMON_CREATE">
+        <value xml:lang="en">Create operations in the Common Component.</value>
+        <value xml:lang="it">Operazioni di creazione nel componente Common.</value>
+    </property>
+    <property key="SecurityPermission.description.COMMON_DELETE">
+        <value xml:lang="en">Delete operations in the Common Component.</value>
+        <value xml:lang="it">Operazioni di cancellazione nel componente Common.</value>
+    </property>
+    <property key="SecurityPermission.description.COMMON_UPDATE">
+        <value xml:lang="en">Update operations in the Common Component.</value>
+        <value xml:lang="it">Operazioni di aggiornamento nel componente Common.</value>
+    </property>
+    <property key="SecurityPermission.description.COMMON_VIEW">
+        <value xml:lang="en">View operations in the Common Component.</value>
+        <value xml:lang="it">Operazioni di visualizzazione nel componente Common.</value>
+    </property>
     <property key="SecurityPermission.description.CONTENTMGR_ADMIN">
         <value xml:lang="en">ALL operations in the Content Manager.</value>
         <value xml:lang="es">TODAS las operaciones en el Administrador de Contenido.</value>
@@ -404,6 +520,22 @@
         <value xml:lang="ru">Операции удаления в приложении Управление каталогом продуктов.</value>
         <value xml:lang="th">การลบการทำงานในการจัดการหัวข้อ</value>
     </property>
+    <property key="SecurityPermission.description.CONTENTMGR_ROLE_CREATE">
+        <value xml:lang="en">Limited Create operations in the Content Manager.</value>
+        <value xml:lang="it">Operazioni limitate di creazione nella gestione contenuti.</value>
+    </property>
+    <property key="SecurityPermission.description.CONTENTMGR_ROLE_DELETE">
+        <value xml:lang="en">Limited Delete operations in the Content Manager.</value>
+        <value xml:lang="it">Operazioni limitate di cancellazione nella gestione contenuti.</value>
+    </property>
+    <property key="SecurityPermission.description.CONTENTMGR_ROLE_UPDATE">
+        <value xml:lang="en">Limited Update operations in the Content Manager.</value>
+        <value xml:lang="it">Operazioni limitate di aggiornamento nella gestione contenuti.</value>
+    </property>
+    <property key="SecurityPermission.description.CONTENTMGR_ROLE_VIEW">
+        <value xml:lang="en">Limited View operations in the Content Manager.</value>
+        <value xml:lang="it">Operazioni limitate di visualizzazione nella gestione contenuti.</value>
+    </property>
     <property key="SecurityPermission.description.CONTENTMGR_UPDATE">
         <value xml:lang="en">Update operations in the Content Manager.</value>
         <value xml:lang="es">Operaciones de Actualización en el Administrador de Contenido.</value>
@@ -428,6 +560,10 @@
         <value xml:lang="ru">Использование страниц Обслуживание файлов данных.</value>
         <value xml:lang="th">ใช้ไฟล์ข้อมูลในหน้าการบำรุงรักษา</value>
     </property>
+    <property key="SecurityPermission.description.EBAY_VIEW">
+        <value xml:lang="en">View operations in the eBay application.</value>
+        <value xml:lang="it">Operazioni di visualizzazione nell'applicazione eBay.</value>
+    </property>
     <property key="SecurityPermission.description.ENTITY_DATA_ADMIN">
         <value xml:lang="en">ALL with the Entity Data Maintenance pages.</value>
         <value xml:lang="es">TODO dentro de las páginas de Mantenimiento de Datos de Entidad.</value>
@@ -476,6 +612,10 @@
         <value xml:lang="ru">Использование страниц Обслуживание данных сущностей.</value>
         <value xml:lang="th">ใช้หน้าการรักษาสภาพเอนทิตี</value>
     </property>
+    <property key="SecurityPermission.description.ENTITY_SYNC_ADMIN">
+        <value xml:lang="en">Use the Entity Sync Admin pages.</value>
+        <value xml:lang="it">Usare le pagine di amministrazione sincronizzazione entità.</value>
+    </property>
     <property key="SecurityPermission.description.ENUM_STATUS_MAINT">
         <value xml:lang="en">Use the Enum and Status Maintenance pages.</value>
         <value xml:lang="es">Usar las páginas de Mantenimiento de Enumeraciones y Estados.</value>
@@ -484,6 +624,26 @@
         <value xml:lang="ru">Использование страниц Обслуживание перечеслений и статусов.</value>
         <value xml:lang="th">Use the Enum and Status Maintenance pages.</value>
     </property>
+    <property key="SecurityPermission.description.EXAMPLE_ADMIN">
+        <value xml:lang="en">ALL operations in the Example Management Screens.</value>
+        <value xml:lang="it">Tutte le operazioni di gestione esempi.</value>
+    </property>
+    <property key="SecurityPermission.description.EXAMPLE_CREATE">
+        <value xml:lang="en">Create operations in the Example Management Screens.</value>
+        <value xml:lang="it">Operazioni di creazione nella gestione esempi.</value>
+    </property>
+    <property key="SecurityPermission.description.EXAMPLE_DELETE">
+        <value xml:lang="en">Delete operations in the Example Management Screens.</value>
+        <value xml:lang="it">Operazioni di cancellazione nella gestione esempi.</value>
+    </property>
+    <property key="SecurityPermission.description.EXAMPLE_UPDATE">
+        <value xml:lang="en">Update operations in the Example Management Screens.</value>
+        <value xml:lang="it">Operazioni di aggiornamento nella gestione esempi.</value>
+    </property>
+    <property key="SecurityPermission.description.EXAMPLE_VIEW">
+        <value xml:lang="en">View operations in the Example Management Screens.</value>
+        <value xml:lang="it">Operazioni di visualizzazione nella gestione esempi.</value>
+    </property>
     <property key="SecurityPermission.description.FACILITY_ADMIN">
         <value xml:lang="en">ALL operations in the Facility Manager.</value>
         <value xml:lang="es">TODAS las operaciones en el Administrador de Establecimientos.</value>
@@ -540,6 +700,30 @@
         <value xml:lang="ru">Операции просмотра в приложении Управление объектами.</value>
         <value xml:lang="th">การแสดงการทำงานในการจัดการคลังสินค้า</value>
     </property>
+    <property key="SecurityPermission.description.GOOGLEBASE_VIEW">
+        <value xml:lang="en">View operations in the Google Base application.</value>
+        <value xml:lang="it">Operazioni di visualizzazione nell'applicazione Google Base.</value>
+    </property>
+    <property key="SecurityPermission.description.HUMANRES_CREATE">
+        <value xml:lang="en">Create operations in the HumanRes Manager.</value>
+        <value xml:lang="it">Operazioni di creazione nella gestione risorse umane.</value>
+    </property>
+    <property key="SecurityPermission.description.HUMANRES_DELETE">
+        <value xml:lang="en">Delete operations in the HumanRes Manager.</value>
+        <value xml:lang="it">Operazioni di cancellazione nella gestione risorse umane.</value>
+    </property>
+    <property key="SecurityPermission.description.HUMANRES_UPDATE">
+        <value xml:lang="en">Update operations in the HumanRes Manager.</value>
+        <value xml:lang="it">Operazioni di aggiornamento nella gestione risorse umane.</value>
+    </property>
+    <property key="SecurityPermission.description.HUMANRES_VIEW">
+        <value xml:lang="en">View operations in the HumanRes Manager.</value>
+        <value xml:lang="it">Operazioni di visualizzazione nella gestione risorse umane.</value>
+    </property>
+    <property key="SecurityPermission.description.LABEL_MANAGER_VIEW">
+        <value xml:lang="en">View the Labels Info pages.</value>
+        <value xml:lang="it">Visualizzazione pagine per gestione labels.</value>
+    </property>
     <property key="SecurityPermission.description.MANUAL_PAYMENT">
         <value xml:lang="en">Manual Payment Transaction.</value>
         <value xml:lang="es">Pago Manual de Transacciones.</value>
@@ -644,6 +828,34 @@
         <value xml:lang="ru">Операции просмотра в приложении Управление маркетингом.</value>
         <value xml:lang="th">การแสดงการทำงานในการจัดการการตลาด</value>
     </property>
+    <property key="SecurityPermission.description.MYPAGE_CUSTOMER">
+        <value xml:lang="en">Use the customer screens in mypage.</value>
+        <value xml:lang="it">Usare la visualizzazione clienti in mypage.</value>
+    </property>
+    <property key="SecurityPermission.description.MYPAGE_EMPL-NOEMAIL">
+        <value xml:lang="en">Usage of the employee screens in mypage: projectmanager and internal notes.</value>
+        <value xml:lang="it">Usare la visualizzazione clienti in mypage: gestione progetti e note interne.</value>
+    </property>
+    <property key="SecurityPermission.description.MYPAGE_EMPLOYEE">
+        <value xml:lang="en">Use the employee screens in mypage.</value>
+        <value xml:lang="it">Usare la visualizzazione impiegati in mypage.</value>
+    </property>
+    <property key="SecurityPermission.description.MYPORTAL_CUSTOMER">
+        <value xml:lang="en">Use the customer screens in myportal.</value>
+        <value xml:lang="it">Usare la visualizzazione clienti in myportal.</value>
+    </property>
+    <property key="SecurityPermission.description.MYPORTAL_EMPL-NOEML">
+        <value xml:lang="en">Usage of the employee screens in myportal: projectmanager and internal notes.</value>
+        <value xml:lang="it">Usare la visualizzazione clienti in myportal: gestione progetti e note interne.</value>
+    </property>
+    <property key="SecurityPermission.description.MYPORTAL_EMPLOYEE">
+        <value xml:lang="en">Use the employee screens in myportal.</value>
+        <value xml:lang="it">Usare la visualizzazione impiegati in myportal.</value>
+    </property>
+    <property key="SecurityPermission.description.OAGIS_VIEW">
+        <value xml:lang="en">View operations in the Oagis application.</value>
+        <value xml:lang="it">Operazioni di visualizzazione nell'applicazione Oagis.</value>
+    </property>
     <property key="SecurityPermission.description.OFBTOOLS_VIEW">
         <value xml:lang="en">Permission to access the Stock OFBiz Manager Applications.</value>
         <value xml:lang="es">Permisos para acceder el menú de Herramientas Web.</value>
@@ -804,6 +1016,10 @@
         <value xml:lang="ru">Права на изменение цены в сбытовых заказах.</value>
         <value xml:lang="th">การอนุญาตการเปลี่ยนแปลงราคาสำหรับรายการขาย</value>
     </property>
+    <property key="SecurityPermission.description.ORDERMGR_SALES_UPDATE">
+        <value xml:lang="en">Update sales orders for all stores in the Order Manager.</value>
+        <value xml:lang="it">Permesso di aggiornamento ordini di vendita per tutti i negozi della gestione ordini.</value>
+    </property>
     <property key="SecurityPermission.description.ORDERMGR_SEND_CONFIRMATION">
         <value xml:lang="en">Send order confirmation notification.</value>
         <value xml:lang="es">Enviar notificación de confirmación de órden.</value>
@@ -836,6 +1052,22 @@
         <value xml:lang="ru">Все операции в приложении Управление участниками</value>
         <value xml:lang="th">การทำงานทั้งหมดในการจัดการกลุ่มผู้ใช้</value>
     </property>
+    <property key="SecurityPermission.description.PARTYMGR_CME-EMAIL_CREATE">
+        <value xml:lang="en">Can create Email communication events for logged-in user.</value>
+        <value xml:lang="it">Può creare eventi comunicazione email per l'utente autenticato.</value>
+    </property>
+    <property key="SecurityPermission.description.PARTYMGR_CME-EMAIL_DELETE">
+        <value xml:lang="en">Can delete Email communication events for logged-in user.</value>
+        <value xml:lang="it">Può cancellare eventi comunicazione email per l'utente autenticato.</value>
+    </property>
+    <property key="SecurityPermission.description.PARTYMGR_CME-EMAIL_UPDATE">
+        <value xml:lang="en">Can update Email communication events for logged-in user.</value>
+        <value xml:lang="it">Può aggiornare eventi comunicazione email per l'utente autenticato.</value>
+    </property>
+    <property key="SecurityPermission.description.PARTYMGR_CME-NOTE_CREATE">
+        <value xml:lang="en">Can create Internal note communication event for logged-in user.</value>
+        <value xml:lang="it">Può creare note interne eventi comunicazione per l'utente autenticato.</value>
+    </property>
     <property key="SecurityPermission.description.PARTYMGR_CME_CREATE">
         <value xml:lang="en">Create communication event.</value>
         <value xml:lang="es">Crear eventos de comunicación.</value>
@@ -1092,6 +1324,46 @@
         <value xml:lang="ru">Использование страниц Обслуживание периода.</value>
         <value xml:lang="th">ใช้หน้าการรักษาช่วงเวลา</value>
     </property>
+    <property key="SecurityPermission.description.PROJECTMGR_ADMIN">
+        <value xml:lang="en">ALL operations in the Project Manager.</value>
+        <value xml:lang="it">Tutte le operazioni nella gestione progetti.</value>
+    </property>
+    <property key="SecurityPermission.description.PROJECTMGR_ROLE_ADMIN">
+        <value xml:lang="en">All admin operations in the Project Manager for a project/phase/task the user is member of.</value>
+        <value xml:lang="it">Tutte le operazioni di amministrazione nella gestione progetti per un progetto/fase/compito di cui l'utente è membro.</value>
+    </property>
+    <property key="SecurityPermission.description.PROJECTMGR_ROLE_TASK_CREATE">
+        <value xml:lang="en">Be able to create a task (should be member of project)</value>
+        <value xml:lang="it">Essere autorizzato a creare un compito (dovrebbe essere membro del progetto)</value>
+    </property>
+    <property key="SecurityPermission.description.PROJECTMGR_ROLE_TIMESHEET_CREATE">
+        <value xml:lang="en">Be able to create a weekly timesheet for the loginid.</value>
+        <value xml:lang="it">Essere autorizzato a creare una timbratura settimanale per l'utente autenticato.</value>
+    </property>
+    <property key="SecurityPermission.description.PROJECTMGR_ROLE_TIMESHEET_UPDATE">
+        <value xml:lang="en">Be able to update(report) on an existing own timesheet</value>
+        <value xml:lang="it">Essere autorizzato ad aggiornare una timbratura esistente</value>
+    </property>
+    <property key="SecurityPermission.description.PROJECTMGR_ROLE_UPDATE">
+        <value xml:lang="en">Update operations in the Project Manager for a project/phase/task the user is member of.</value>
+        <value xml:lang="it">Operazioni di aggiornamento nella gestione progetti per un progetto/fase/compito ci cui l'utente è membro.</value>
+    </property>
+    <property key="SecurityPermission.description.PROJECTMGR_ROLE_VIEW">
+        <value xml:lang="en">All view operations in the Project Manager for a project/phase/task the user is member of..</value>
+        <value xml:lang="it">Tutte le perazioni di visualizzazione nella gestione progetti per un progetto/fase/compito ci cui l'utente è membro.</value>
+    </property>
+    <property key="SecurityPermission.description.PROJECTMGR_TIMESHEET_CREATE">
+        <value xml:lang="en">Be able to create any weekly timesheet.</value>
+        <value xml:lang="it">Essere autorizzato a creare qualiasi timbratura settimanale.</value>
+    </property>
+    <property key="SecurityPermission.description.PROJECTMGR_TIMESHEET_UPDATE">
+        <value xml:lang="en">Be able to update any weekly timesheet.</value>
+        <value xml:lang="it">Essere autorizzato ad aggiornare qualiasi timbratura settimanale.</value>
+    </property>
+    <property key="SecurityPermission.description.PROJECTMGR_VIEW">
+        <value xml:lang="en">ALL View operations in the Project Manager(but can be limited by ROLE_VIEW)</value>
+        <value xml:lang="it">Tutte le operazioni di visualizzazione nella gestione progetti (ma può essere limitato a ROLE_VIEW)</value>
+    </property>
     <property key="SecurityPermission.description.SECURITY_ADMIN">
         <value xml:lang="en">ALL operations in the Security Management Screens.</value>
         <value xml:lang="es">TODAS las operaciones en las pantallas de Administración de Seguridad.</value>
@@ -1228,6 +1500,14 @@
         <value xml:lang="ru">Операции просмотра в Редакторе налоговых ставок.</value>
         <value xml:lang="th">แสดงการทำงานในการแก้ไขอัตราภาษี</value>
     </property>
+    <property key="SecurityPermission.description.TEMPEXPR_ADMIN">
+        <value xml:lang="en">Temporal expression admin</value>
+        <value xml:lang="it">Amministrazione espressioni temporali</value>
+    </property>
+    <property key="SecurityPermission.description.USERPREF_ADMIN">
+        <value xml:lang="en">User preferences admin</value>
+        <value xml:lang="it">Amministrazione preferenze utente</value>
+    </property>
     <property key="SecurityPermission.description.UTIL_CACHE_EDIT">
         <value xml:lang="en">Edit a UtilCache instance.</value>
         <value xml:lang="es">Editar una instancia de UtilCache.</value>
@@ -1260,6 +1540,22 @@
         <value xml:lang="ru">Просмотр экземпляра UtilDebug.</value>
         <value xml:lang="th">View a UtilDebug instance.</value>
     </property>
+    <property key="SecurityPermission.description.VISUALTHEME_ADMIN">
+        <value xml:lang="en">ALL operations on Visual Themes and Visual Theme Resources.</value>
+        <value xml:lang="it">Tutte le operazioni sui temi visuali e risorse dei temi visuali</value>
+    </property>
+    <property key="SecurityPermission.description.VISUALTHEME_CREATE">
+        <value xml:lang="en">Create Visual Themes and Visual Theme Resources.</value>
+        <value xml:lang="it">Creare temi visuali e risorse dei temi visuali</value>
+    </property>
+    <property key="SecurityPermission.description.VISUALTHEME_DELETE">
+        <value xml:lang="en">Delete Visual Themes and Visual Theme Resources.</value>
+        <value xml:lang="it">Cancella temi visuali e risorse dei temi visuali</value>
+    </property>
+    <property key="SecurityPermission.description.VISUALTHEME_UPDATE">
+        <value xml:lang="en">Update Visual Themes and Visual Theme Resources.</value>
+        <value xml:lang="it">Aggiorna temi visuali e risorse dei temi visuali</value>
+    </property>
     <property key="SecurityPermission.description.WEBTOOLS_VIEW">
         <value xml:lang="en">Permission to access the WebTools Menu.</value>
         <value xml:lang="es">Permisos para acceder el menú de Herramientas Web.</value>
@@ -1292,6 +1588,22 @@
         <value xml:lang="ru">Операции удаления в приложении Организатор.</value>
         <value xml:lang="th">ลบการทำงานในการจัดการความพยายามในการทำงาน</value>
     </property>
+    <property key="SecurityPermission.description.WORKEFFORTMGR_ROLE_CREATE">
+        <value xml:lang="en">Limited Create operations in the Work Effort Manager.</value>
+        <value xml:lang="it">Operazioni limitate in creazione nelle gestione impegni di lavoro.</value>
+    </property>
+    <property key="SecurityPermission.description.WORKEFFORTMGR_ROLE_DELETE">
+        <value xml:lang="en">Limited Delete operations the Work Effort Manager.</value>
+        <value xml:lang="it">Operazioni limitate in cancellazione nelle gestione impegni di lavoro.</value>
+    </property>
+    <property key="SecurityPermission.description.WORKEFFORTMGR_ROLE_UPDATE">
+        <value xml:lang="en">Limited Update operations in the Work Effort Manager.</value>
+        <value xml:lang="it">Operazioni limitate in aggiornamento nelle gestione impegni di lavoro.</value>
+    </property>
+    <property key="SecurityPermission.description.WORKEFFORTMGR_ROLE_VIEW">
+        <value xml:lang="en">Limited View operations in the Work Effort Manager.</value>
+        <value xml:lang="it">Operazioni limitate in visualizzazione nelle gestione impegni di lavoro.</value>
+    </property>
     <property key="SecurityPermission.description.WORKEFFORTMGR_UPDATE">
         <value xml:lang="en">Update operations in the Work Effort Manager.</value>
         <value xml:lang="es">Operaciones de Actualización en el Administrador de Esfuerzos de Trabajo.</value>

Modified: ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml?rev=748732&r1=748731&r2=748732&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml (original)
+++ ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml Fri Feb 27 23:01:41 2009
@@ -194,6 +194,10 @@
         <value xml:lang="it">Importa i Dati da XML Readers</value>
         <value xml:lang="th">นำเข้าข้อมูลผู้ตรวจ</value>
     </property>
+    <property key="PageTitleEntityEoModelBundle">
+        <value xml:lang="en">Entity Eo Model Bundle</value>
+        <value xml:lang="it">Entità Eo Model Bundle</value>
+    </property>
     <property key="PageTitleEntitySQLProcessor">
         <value xml:lang="en">Entity SQL Processor</value>
         <value xml:lang="fr">Processeur d'entités SQL</value>
@@ -1502,6 +1506,10 @@
         <value xml:lang="fr">La traduction ${key} existe déjà dans le fichier ${fileName}</value>
         <value xml:lang="it">La label ${key} esiste già nel file ${fileName}</value>
     </property>
+    <property key="WebtoolsLabelManagerOnlyNotUsedLabels">
+        <value xml:lang="en">Only Not Used Labels</value>
+        <value xml:lang="it">Solo traduzioni non usate</value>
+    </property>
     <property key="WebtoolsLabelManagerOnlyMissingTranslations">
         <value xml:lang="en">Only Missing Translations</value>
         <value xml:lang="it">Solo traduzioni mancanti</value>

Modified: ofbiz/trunk/framework/webtools/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/servicedef/services.xml?rev=748732&r1=748731&r2=748732&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/servicedef/services.xml (original)
+++ ofbiz/trunk/framework/webtools/servicedef/services.xml Fri Feb 27 23:01:41 2009
@@ -141,4 +141,17 @@
         <attribute name="localeValues" type="List" mode="IN" optional="true"/>
         <attribute name="localeComments" type="List" mode="IN" optional="true"/>
     </service>
+    <service name="updateAndSaveLabelKey" engine="java" location="org.ofbiz.webtools.labelmanager.LabelManagerFactory"
+             invoke="updateAndSaveLabelKey" auth="true" use-transaction="false">
+        <description>Update Label Key</description>
+        <attribute name="key" type="String" mode="IN" optional="true"/>
+        <attribute name="keyComment" type="String" mode="IN" optional="true"/>
+        <attribute name="update_label" type="String" mode="IN" optional="false"/>
+        <attribute name="fileName" type="String" mode="IN" optional="false"/>
+        <attribute name="confirm" type="String" mode="IN" optional="true"/>
+        <attribute name="removeLabel" type="String" mode="IN" optional="true"/>
+        <attribute name="localeNames" type="List" mode="IN" optional="true"/>
+        <attribute name="localeValues" type="List" mode="IN" optional="true"/>
+        <attribute name="localeComments" type="List" mode="IN" optional="true"/>
+    </service>
 </services>