RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changed some labels in the order elements tab and updated i18n files with the latest modifications.

Browse source 
FEA: ItEr63S05PerformanceOrderEdition
This commit is contained in:
Jacobo Aragunde Pérez 2010-11-08 19:34:57 +01:00
parent 15eb449c48
commit 87a087cd23
5 changed files with 127 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java
View file

@ -146,7 +146,7 @@ public abstract class TreeComponent extends HtmlMacroComponent {
}
public String getAddElementLabel() {
return _("New order element");
return _("Add");
}
public boolean isCreateTemplateEnabled() {

48
navalplanner-webapp/src/main/resources/i18n/es.po
View file

@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-10-27 12:44+0200\n"
"PO-Revision-Date: 2010-10-27 13:10+0200\n"
"POT-Creation-Date: 2010-11-08 19:55+0100\n"
"PO-Revision-Date: 2010-11-08 19:55+0100\n"
"Last-Translator: Jacobo Aragunde Pérez <jaragunde@igalia.com>\n"
"Language-Team: Spanish <>\n"
"MIME-Version: 1.0\n"
@ -4233,10 +4233,6 @@ msgstr "Recurso limitante"
msgid "Calendar allocation"
msgstr "Asignación de calendario"
#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:145
msgid "Choose a order element from which create a template from"
msgstr "Elija un elemento de pedido a partir del cual crear una plantilla"
#: navalplanner-webapp/src/main/webapp/materials/materials.zul:85
#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:32
#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:33
@ -6667,6 +6663,46 @@ msgstr "Permitida edición de todos los pedidos"
msgid "Order creation allowed"
msgstr "Permitida creación de pedidos"
#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:39
msgid "Add From Template"
msgstr "Añadir a partir de plantilla"
#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:44
msgid "Operations with selected order element:"
msgstr "Operaciones con el elemento de pedido seleccionado:"
#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:46
msgid "Edit selected order element"
msgstr "Editar elemento de pedido seleccionado"
#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:50
msgid "Create template from selected order element"
msgstr "Crear plantilla a partir de elemento de pedido seleccionado"
#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:54
msgid "Move selected order element down"
msgstr "Mover elemento de pedido seleccionado hacia abajo"
#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:58
msgid "Move selected order element up"
msgstr "Mover elemento de pedido seleccionado hacia arriba"
#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:62
msgid "Unindent selected order element"
msgstr "Desindentar elemento de pedido seleccionado"
#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:66
msgid "Indent selected order element"
msgstr "Indentar elemento de pedido seleccionado"
#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:70
msgid "Delete selected order element"
msgstr "Borrar elemento de pedido seleccionado"
#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:196
msgid "Choose an order element to operate on it"
msgstr "Elija un elemento de pedido para operar sobre él"
#~ msgid "Name/Code"
#~ msgstr "Nombre/Código"

48
navalplanner-webapp/src/main/resources/i18n/gl.po
View file

@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-10-27 12:44+0200\n"
"PO-Revision-Date: 2010-10-27 13:26+0200\n"
"POT-Creation-Date: 2010-11-08 19:55+0100\n"
"PO-Revision-Date: 2010-11-08 20:08+0100\n"
"Last-Translator: Jacobo Aragunde Pérez <jaragunde@igalia.com>\n"
"Language-Team: Galician <>\n"
"MIME-Version: 1.0\n"
@ -4219,10 +4219,6 @@ msgstr "Recurso limitante"
msgid "Calendar allocation"
msgstr "Asignación de calendario"
#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:145
msgid "Choose a order element from which create a template from"
msgstr "Seleccione un elemento de pedido a partir do que crear unha plantilla"
#: navalplanner-webapp/src/main/webapp/materials/materials.zul:85
#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:32
#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:33
@ -6647,6 +6643,46 @@ msgstr "Permitida edición de tódolos pedidos"
msgid "Order creation allowed"
msgstr "Permitida creación de pedidos"
#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:39
msgid "Add From Template"
msgstr "Engadir a partir de modelo"
#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:44
msgid "Operations with selected order element:"
msgstr "Operacións co elemento de pedido seleccionado:"
#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:46
msgid "Edit selected order element"
msgstr "Editar elemento de pedido seleccionado"
#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:50
msgid "Create template from selected order element"
msgstr "Crear modelo a partir de elemento de pedido seleccionado"
#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:54
msgid "Move selected order element down"
msgstr "Mover elemento de pedido seleccionado cara abaixo"
#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:58
msgid "Move selected order element up"
msgstr "Mover elemento de pedido seleccionado cara arriba"
#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:62
msgid "Unindent selected order element"
msgstr "Desindentar elemento de pedido seleccionado"
#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:66
msgid "Indent selected order element"
msgstr "Indentar elemento de pedido seleccionado"
#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:70
msgid "Delete selected order element"
msgstr "Borrar elemento de pedido seleccionado"
#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:196
msgid "Choose an order element to operate on it"
msgstr "Seleccione un elemento de pedido para operar sobre el"
#~ msgid "Name/Code"
#~ msgstr "Nome/Código"

46
navalplanner-webapp/src/main/resources/i18n/keys.pot
View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-10-27 12:44+0200\n"
"POT-Creation-Date: 2010-11-08 19:55+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -4142,10 +4142,6 @@ msgstr ""
msgid "Calendar allocation"
msgstr ""
#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:145
msgid "Choose a order element from which create a template from"
msgstr ""
#: navalplanner-webapp/src/main/webapp/materials/materials.zul:85
#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:32
#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:33
@ -6493,3 +6489,43 @@ msgstr ""
#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:37
msgid "Order creation allowed"
msgstr ""
#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:39
msgid "Add From Template"
msgstr ""
#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:44
msgid "Operations with selected order element:"
msgstr ""
#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:46
msgid "Edit selected order element"
msgstr ""
#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:50
msgid "Create template from selected order element"
msgstr ""
#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:54
msgid "Move selected order element down"
msgstr ""
#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:58
msgid "Move selected order element up"
msgstr ""
#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:62
msgid "Unindent selected order element"
msgstr ""
#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:66
msgid "Indent selected order element"
msgstr ""
#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:70
msgid "Delete selected order element"
msgstr ""
#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:196
msgid "Choose an order element to operate on it"
msgstr ""

2
navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul
View file

@ -36,7 +36,7 @@
constraint="no negative" disabled="true" />
<button id="btnNew" label="${treeComponent.addElementLabel}"
onClick="treeController.addElement(self.parent);" disabled="true" />
<button id="btnNewFromTemplate" label="${i18n:_('Create From Template')}"
<button id="btnNewFromTemplate" label="${i18n:_('Add From Template')}"
onClick="treeController.createFromTemplate();" disabled="true"
visible="${treeComponent.createFromTemplateEnabled}"/>
</hbox>