This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new b3ae505 Improved: Quote - Action Triggers, Permissions & ux
(OFBIZ-12499)
b3ae505 is described below
commit b3ae5057149df6639e8fcf3f9043cb7d6a9ac692
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Thu Jan 20 19:53:27 2022 +0100
Improved: Quote - Action Triggers, Permissions & ux (OFBIZ-12499)
Before sligtly modifying labels in OrderMenus.xml in PR451, here are few
labels
enhancements.
Copies nl labels from CommonWorkEffort/s to WorkEffortWorkEffort/s
Removes duplicate and incomplete CommonWorkEffort/s labels in
CommonUiLabels.
---
applications/workeffort/config/WorkEffortUiLabels.xml | 6 +++---
framework/common/config/CommonUiLabels.xml | 14 --------------
2 files changed, 3 insertions(+), 17 deletions(-)
diff --git a/applications/workeffort/config/WorkEffortUiLabels.xml
b/applications/workeffort/config/WorkEffortUiLabels.xml
index 222ed3e..7f387a8 100644
--- a/applications/workeffort/config/WorkEffortUiLabels.xml
+++ b/applications/workeffort/config/WorkEffortUiLabels.xml
@@ -5364,7 +5364,7 @@
<value xml:lang="fr">Tâche</value>
<value xml:lang="it">Impegno di lavoro</value>
<value xml:lang="ja">作業成果</value>
- <value xml:lang="nl">Actie</value>
+ <value xml:lang="nl">Activiteit</value>
<value xml:lang="ro">Sarcina de Lucru</value>
<value xml:lang="th">งาน</value>
<value xml:lang="vi">Lượng giá nguồn lực</value>
@@ -5460,7 +5460,7 @@
<value xml:lang="fr">Tâches</value>
<value xml:lang="it">Impegni di lavoro</value>
<value xml:lang="ja">作業成果</value>
- <value xml:lang="nl">Acties</value>
+ <value xml:lang="nl">Activiteiten</value>
<value xml:lang="ro">Sarcini de Lucru </value>
<value xml:lang="th">งาน</value>
<value xml:lang="vi">Lượng giá nguồn lực</value>
@@ -5515,4 +5515,4 @@
<property key="WorkeffortErrorWhileInvokingService">
<value xml:lang="en">Error while invoking service :
${serviceName}</value>
</property>
-</resource>
\ No newline at end of file
+</resource>
diff --git a/framework/common/config/CommonUiLabels.xml
b/framework/common/config/CommonUiLabels.xml
index 5f431d5..3a71f7d 100644
--- a/framework/common/config/CommonUiLabels.xml
+++ b/framework/common/config/CommonUiLabels.xml
@@ -13525,20 +13525,6 @@
<value xml:lang="es">con</value>
<value xml:lang="fr">avec</value>
</property>
- <property key="CommonWorkEffort">
- <value xml:lang="en">Work Effort</value>
- <value xml:lang="es">Esfuerzo de Trabajo</value>
- <value xml:lang="es-MX">Esfuerzo de Trabajo</value>
- <value xml:lang="nl">Activiteit</value>
- <value xml:lang="zh">人工服务</value>
- </property>
- <property key="CommonWorkEfforts">
- <value xml:lang="en">Work Efforts</value>
- <value xml:lang="es">Esfuerzos de Trabajo</value>
- <value xml:lang="es-MX">Esfuerzos de Trabajo</value>
- <value xml:lang="nl">Activiteiten</value>
- <value xml:lang="zh">人工服务</value>
- </property>
<property key="CommonWorkflowActivityUser">
<value xml:lang="ar">مهام سيرورة العمل المعينة للمستخدم</value>
<value xml:lang="cs">Workflow aktivity přiřazené uživateli</value>
