diff --git a/libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java b/libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java index 20495916d..9010c7b8f 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java +++ b/libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java @@ -80,7 +80,7 @@ public enum UserRole { ROLE_ESTIMATED_PLANNED_HOURS_PER_TASK_REPORT(_("Estimated/Planned Hours Per Task Report")), ROLE_PROJECT_COSTS_REPORT(_("Project Costs Report")), ROLE_TASK_SCHEDULING_STATUS_IN_PROJECT_REPORT(_("Task Scheduling Status In Project Report")), - ROLE_MATERIALS_NEED_AT_DATE_REPORT(_("Materials Needs At Date Report")), + ROLE_MATERIALS_NEED_AT_DATE_REPORT(_("Materials Needed At Date Report")), ROLE_PROJECT_STATUS_REPORT(_("Project Status Report")); private final String displayName; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java index 7efbce31e..c680966fb 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java @@ -502,7 +502,7 @@ public class CustomMenuController extends Div implements IMenuItemsRegister { } if (SecurityUtils .isSuperuserOrUserInRoles(UserRole.ROLE_MATERIALS_NEED_AT_DATE_REPORT)) { - reportsItems.add(subItem(_("Materials Needs At Date"), + reportsItems.add(subItem(_("Materials Needed At Date"), "/reports/timeLineMaterialReport.zul", "15-informes.html")); } if (SecurityUtils diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java index 82b9dd0f4..3a10854c0 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java @@ -372,7 +372,7 @@ public class SaveCommandBuilder { ConfirmCloseUtil .setConfirmClose( Executions.getCurrent().getDesktop(), - _("You are about to leave the planning edition, unsaved changes will be lost.")); + _("You are about to leave the planning editing. Unsaved changes will be lost!")); } } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java index 1f5784e77..de74b9be5 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java @@ -217,7 +217,7 @@ public class MultipleTabsPlannerController implements Composer, ConfirmCloseUtil .setConfirmClose( desktop, - _("You are about to leave the planning edition, unsaved changes will be lost.")); + _("You are about to leave the planning editing. Unsaved changes will be lost!")); } break; default: diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java index 09dcc4a07..0df7794c0 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java @@ -1140,7 +1140,7 @@ public class WorkerCRUDController extends GenericForwardComposer implements try { return Messagebox .show(_("Unsaved changes will be lost. Would you like to continue?"), - _("Confirm user edition"), Messagebox.OK + _("Confirm editing user"), Messagebox.OK | Messagebox.CANCEL, Messagebox.QUESTION); } catch (InterruptedException e) { throw new RuntimeException(e); @@ -1154,7 +1154,7 @@ public class WorkerCRUDController extends GenericForwardComposer implements public String getUserEditionButtonTooltip() { if (isNoRoleUserAccounts()) { - return _("You do not have permissions to go to user edition window"); + return _("You do not have permissions to go to edit user window"); } return ""; } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java index dc6d24aed..da39fc474 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java @@ -424,7 +424,7 @@ public class UserCRUDController extends BaseCRUDController implements try { return Messagebox .show(_("Unsaved changes will be lost. Would you like to continue?"), - _("Confirm worker edition"), Messagebox.OK + _("Confirm edit worker"), Messagebox.OK | Messagebox.CANCEL, Messagebox.QUESTION); } catch (InterruptedException e) { throw new RuntimeException(e); @@ -442,7 +442,7 @@ public class UserCRUDController extends BaseCRUDController implements public String getWorkerEditionButtonTooltip() { if (isNoRoleWorkers()) { - return _("You do not have permissions to go to worker edition window"); + return _("You do not have permissions to go to edit worker window"); } return ""; } diff --git a/libreplan-webapp/src/main/resources/i18n/ca.po b/libreplan-webapp/src/main/resources/i18n/ca.po index 9009628db..4c20d27f3 100644 --- a/libreplan-webapp/src/main/resources/i18n/ca.po +++ b/libreplan-webapp/src/main/resources/i18n/ca.po @@ -351,7 +351,7 @@ msgid "entity name not specified" msgstr "Nom de l'entitat no especificat" #: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:445 -msgid "You do not have permissions to go to worker edition window" +msgid "You do not have permissions to go to edit worker window" msgstr "No té permisos per a treballar amb la finestra d'edició" #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/NewAllocationSelector.java:51 @@ -1067,7 +1067,7 @@ msgstr "Full de treball personal" #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:493 #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:39 -msgid "Materials Needs At Date" +msgid "Materials Needed At Date" msgstr "Material necessari a la data" #: libreplan-webapp/src/main/webapp/common/configuration.zul:316 @@ -1937,7 +1937,7 @@ msgid "Yes" msgstr "Sí" #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:127 -msgid "Go to user edition window" +msgid "Go to edit user window" msgstr "Anar a la finestra d'edició d'usuari" #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:392 @@ -3950,7 +3950,7 @@ msgid "Edit Worker: {0}" msgstr "Editar treballador: {0}" #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:1143 -msgid "You do not have permissions to go to user edition window" +msgid "You do not have permissions to go to edit user window" msgstr "No té permís per a editar usuaris" #: libreplan-webapp/src/main/webapp/common/layout/login.zul:21 @@ -4692,7 +4692,7 @@ msgid "Value last progress measurement" msgstr "Últim valor del mesurament de progrés" #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:21 -msgid "LibrePlan: Materials Needs At Date" +msgid "LibrePlan: Materials Needed At Date" msgstr "LibrePlan: Materials necessaris a la data" #: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:44 @@ -4767,7 +4767,7 @@ msgstr "S'ha produït un error desant el projecte⏎ {0}" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:375 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:220 msgid "" -"You are about to leave the planning edition, unsaved changes will be lost." +"You are about to leave the planning editing. Unsaved changes will be lost!" msgstr "Vostè està a punt de sortir de l'edició de planificació, es perdran els canvis que no s'han guardat." #: libreplan-webapp/src/main/webapp/resources/machine/machines.zul:22 @@ -5935,7 +5935,7 @@ msgid "Any" msgstr "Qualsevol" #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:1129 -msgid "Confirm user edition" +msgid "Confirm editing user" msgstr "Confirmar edició d'usuari" #: libreplan-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:47 @@ -6748,7 +6748,7 @@ msgid "The end date cannot be before the start date" msgstr "La data de finalització no pot ser abans de la data d'inici" #: libreplan-webapp/src/main/webapp/users/_editUser.zul:115 -msgid "Go to worker edition window" +msgid "Go to edit worker window" msgstr "Anar a la finestra d'edició de treballadors" #: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:40 @@ -6951,7 +6951,7 @@ msgid "Priority" msgstr "Prioritat" #: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:47 -msgid "Apply changes and continue edition" +msgid "Apply changes and continue editing" msgstr "Aplicar modificacions i continuar editant" #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:221 @@ -7108,7 +7108,7 @@ msgid "Assign element to queue automatically" msgstr "Assignar elements a les cues automàticament" #: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:427 -msgid "Confirm worker edition" +msgid "Confirm edit worker" msgstr "Confirmar l'edició de treballadors" #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:74 @@ -8019,7 +8019,7 @@ msgid "Adapt planning according to timesheets" msgstr "Adaptar planificació segons fulls de treballs" #: libreplan-webapp/src/main/webapp/orders/_ordersTab.zul:36 -msgid "Cancel edition" +msgid "Cancel editing" msgstr "Cancel·lar edició" #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:32 @@ -8374,7 +8374,7 @@ msgid "Task Scheduling Status In Project Report" msgstr "Informe de projecte de l'estat de tasques planificades" #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:81 -msgid "Materials Needs At Date Report" +msgid "Materials Needed At Date Report" msgstr "Materials necessaris a la data de l'informe" #: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:345 diff --git a/libreplan-webapp/src/main/resources/i18n/cs.po b/libreplan-webapp/src/main/resources/i18n/cs.po index 7ef07ed44..474dfb3dc 100644 --- a/libreplan-webapp/src/main/resources/i18n/cs.po +++ b/libreplan-webapp/src/main/resources/i18n/cs.po @@ -345,7 +345,7 @@ msgid "entity name not specified" msgstr "není zadán název objektu" #: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:424 -msgid "You do not have permissions to go to worker edition window" +msgid "You do not have permissions to go to edit worker window" msgstr "Nemáte oprávnění k přístupu do okna úprav pracovníka" #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/NewAllocationSelector.java:51 @@ -1056,7 +1056,7 @@ msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:493 #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:39 -msgid "Materials Needs At Date" +msgid "Materials Needed At Date" msgstr "Potřeby materiálů k datu" #: libreplan-webapp/src/main/webapp/common/configuration.zul:305 @@ -1917,7 +1917,7 @@ msgid "Yes" msgstr "Ano" #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:127 -msgid "Go to user edition window" +msgid "Go to edit user window" msgstr "Přejít do okna úprav uživatele" #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:392 @@ -3916,7 +3916,7 @@ msgid "Edit Worker: {0}" msgstr "Upravit pracovníka: {0}" #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:1143 -msgid "You do not have permissions to go to user edition window" +msgid "You do not have permissions to go to edit user window" msgstr "Nemáte oprávnění ke vstupu do okna úprav uživatele" #: libreplan-webapp/src/main/webapp/common/layout/login.zul:21 @@ -4651,7 +4651,7 @@ msgid "Value last progress measurement" msgstr "Hodnota posledního měření postupu" #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:21 -msgid "LibrePlan: Materials Needs At Date" +msgid "LibrePlan: Materials Needed At Date" msgstr "LibrePlan: Potřeby materiálů k datu" #: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:44 @@ -5860,7 +5860,7 @@ msgid "Any" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:1129 -msgid "Confirm user edition" +msgid "Confirm editing user" msgstr "" #: libreplan-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:47 @@ -6666,7 +6666,7 @@ msgid "The end date cannot be before the start date" msgstr "" #: libreplan-webapp/src/main/webapp/users/_editUser.zul:114 -msgid "Go to worker edition window" +msgid "Go to edit worker window" msgstr "" #: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:40 @@ -6868,7 +6868,7 @@ msgid "Priority" msgstr "Priorita" #: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:47 -msgid "Apply changes and continue edition" +msgid "Apply changes and continue editing" msgstr "Použít změny a pokračovat v úpravách" #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:221 @@ -7025,7 +7025,7 @@ msgid "Assign element to queue automatically" msgstr "Prvek přidělovat do fronty automaticky" #: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:406 -msgid "Confirm worker edition" +msgid "Confirm edit worker" msgstr "" #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:74 @@ -7913,7 +7913,7 @@ msgid "List of materials for category: {0}" msgstr "Seznam materiálů pro kategorii: {0}" #: libreplan-webapp/src/main/webapp/orders/_ordersTab.zul:36 -msgid "Cancel edition" +msgid "Cancel editing" msgstr "Zrušit úpravu" #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:32 @@ -8269,7 +8269,7 @@ msgid "Task Scheduling Status In Project Report" msgstr "" #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:81 -msgid "Materials Needs At Date Report" +msgid "Materials Needed At Date Report" msgstr "" #: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:344 diff --git a/libreplan-webapp/src/main/resources/i18n/de.po b/libreplan-webapp/src/main/resources/i18n/de.po index cddee1d64..e0f3bc756 100644 --- a/libreplan-webapp/src/main/resources/i18n/de.po +++ b/libreplan-webapp/src/main/resources/i18n/de.po @@ -346,7 +346,7 @@ msgid "entity name not specified" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:424 -msgid "You do not have permissions to go to worker edition window" +msgid "You do not have permissions to go to edit worker window" msgstr "Sie haben keine Rechte um das Fenster zur Mitarbeiteränderung anzuwählen" #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/NewAllocationSelector.java:51 @@ -1057,7 +1057,7 @@ msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:493 #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:39 -msgid "Materials Needs At Date" +msgid "Materials Needed At Date" msgstr "Materialien benötigen ein Datum" #: libreplan-webapp/src/main/webapp/common/configuration.zul:305 @@ -1918,7 +1918,7 @@ msgid "Yes" msgstr "Ja" #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:127 -msgid "Go to user edition window" +msgid "Go to edit user window" msgstr "Gehe zu Benutzeränderungsfenster" #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:392 @@ -3917,7 +3917,7 @@ msgid "Edit Worker: {0}" msgstr "Bearbeiter Arbeiter: {0}" #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:1143 -msgid "You do not have permissions to go to user edition window" +msgid "You do not have permissions to go to edit user window" msgstr "Sie haben keine Rechte das Benutzeränderungsfenster auszuwählen" #: libreplan-webapp/src/main/webapp/common/layout/login.zul:21 @@ -4652,7 +4652,7 @@ msgid "Value last progress measurement" msgstr "" #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:21 -msgid "LibrePlan: Materials Needs At Date" +msgid "LibrePlan: Materials Needed At Date" msgstr "LibrePlan: Material wird gebraucht am" #: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:44 @@ -5861,7 +5861,7 @@ msgid "Any" msgstr "Alle" #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:1129 -msgid "Confirm user edition" +msgid "Confirm editing user" msgstr "Benutzeränderung bestätigen" #: libreplan-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:47 @@ -6667,7 +6667,7 @@ msgid "The end date cannot be before the start date" msgstr "Enddatum kann nicht vor dem Startdatum liegen" #: libreplan-webapp/src/main/webapp/users/_editUser.zul:114 -msgid "Go to worker edition window" +msgid "Go to edit worker window" msgstr "Gehe zu Mitarbeiteränderungsfenster" #: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:40 @@ -6869,7 +6869,7 @@ msgid "Priority" msgstr "Priorität" #: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:47 -msgid "Apply changes and continue edition" +msgid "Apply changes and continue editing" msgstr "Änderungen anwenden und Bearbeitung fortsetzen" #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:221 @@ -7026,7 +7026,7 @@ msgid "Assign element to queue automatically" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:406 -msgid "Confirm worker edition" +msgid "Confirm edit worker" msgstr "Mitarbeiteränderung bestätigen" #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:74 @@ -7914,7 +7914,7 @@ msgid "List of materials for category: {0}" msgstr "Liste der Materialie für Kategorie : {0}" #: libreplan-webapp/src/main/webapp/orders/_ordersTab.zul:36 -msgid "Cancel edition" +msgid "Cancel editing" msgstr "Bearbeitung abbrechen" #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:32 @@ -8270,7 +8270,7 @@ msgid "Task Scheduling Status In Project Report" msgstr "Report über Aufgabenplanungsstatus im Projekt" #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:81 -msgid "Materials Needs At Date Report" +msgid "Materials Needed At Date Report" msgstr "Materialien benötigt für Datumreport" #: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:344 diff --git a/libreplan-webapp/src/main/resources/i18n/es.po b/libreplan-webapp/src/main/resources/i18n/es.po index c37baf067..92450eeb1 100644 --- a/libreplan-webapp/src/main/resources/i18n/es.po +++ b/libreplan-webapp/src/main/resources/i18n/es.po @@ -365,7 +365,7 @@ msgid "entity name not specified" msgstr "nombre de la entidad no especificado" #: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:445 -msgid "You do not have permissions to go to worker edition window" +msgid "You do not have permissions to go to edit worker window" msgstr "No tiene permisos para ir a la ventana de edición de trabajadores" #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/NewAllocationSelector.java:55 @@ -1120,7 +1120,7 @@ msgstr "o nombres" #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:505 #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:39 -msgid "Materials Needs At Date" +msgid "Materials Needed At Date" msgstr "Necesidades de materiales en fecha" #: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:615 @@ -2065,7 +2065,7 @@ msgid "Yes" msgstr "Sí" #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:127 -msgid "Go to user edition window" +msgid "Go to edit user window" msgstr "Ir a la ventana de edición de usuarios" #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:397 @@ -4290,7 +4290,7 @@ msgid "Edit Worker: {0}" msgstr "Editar trabajador: {0}" #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:1157 -msgid "You do not have permissions to go to user edition window" +msgid "You do not have permissions to go to edit user window" msgstr "No tiene permisos para ir a la ventana de edición de usuarios" #: libreplan-webapp/src/main/webapp/common/layout/login.zul:21 @@ -5100,7 +5100,7 @@ msgid "Value last progress measurement" msgstr "Valor última medida de progreso" #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:21 -msgid "LibrePlan: Materials Needs At Date" +msgid "LibrePlan: Materials Needed At Date" msgstr "LibrePlan: Necesidad de materiales en fecha" #: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:44 @@ -5175,7 +5175,7 @@ msgstr "Error guardando un proyecto\n{0}" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:220 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:375 msgid "" -"You are about to leave the planning edition, unsaved changes will be lost." +"You are about to leave the planning editing. Unsaved changes will be lost!" msgstr "Estás a punto de salir de la edición de planificación, los cambios sin guardar se perderán." #: libreplan-webapp/src/main/webapp/resources/machine/machines.zul:22 @@ -6414,7 +6414,7 @@ msgid "Timesheets Templates" msgstr "Modelos de partes de trabajo" #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:1143 -msgid "Confirm user edition" +msgid "Confirm editing user" msgstr "Confirmar la edición del usuario" #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:117 @@ -7308,7 +7308,7 @@ msgid "The end date cannot be before the start date" msgstr "La fecha de fin no puede ser anterior a la fecha de inicio" #: libreplan-webapp/src/main/webapp/users/_editUser.zul:115 -msgid "Go to worker edition window" +msgid "Go to edit worker window" msgstr "Ir a la ventana de edición de trabajadores" #: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:95 @@ -7534,7 +7534,7 @@ msgid "Priority" msgstr "Prioridad" #: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:47 -msgid "Apply changes and continue edition" +msgid "Apply changes and continue editing" msgstr "Aplicar cambios y continuar la edición" #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:221 @@ -7703,7 +7703,7 @@ msgid "Tim product code" msgstr "Código de producto Tim" #: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:427 -msgid "Confirm worker edition" +msgid "Confirm edit worker" msgstr "Confirmar edición del trabajador" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/JiraSynchronizationController.java:302 @@ -8655,7 +8655,7 @@ msgid "Adapt planning according to timesheets" msgstr "Adaptar la planificación según los partes de trabajo" #: libreplan-webapp/src/main/webapp/orders/_ordersTab.zul:36 -msgid "Cancel edition" +msgid "Cancel editing" msgstr "Cancelar la edición" #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:32 @@ -9122,7 +9122,7 @@ msgid "Task Scheduling Status In Project Report" msgstr "Informe de estado de planificación de tareas en un proyecto" #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:83 -msgid "Materials Needs At Date Report" +msgid "Materials Needed At Date Report" msgstr "Informe de necesidades de materiales en fecha" #: libreplan-business/src/main/java/org/libreplan/business/orders/entities/SchedulingState.java:366 diff --git a/libreplan-webapp/src/main/resources/i18n/fr.po b/libreplan-webapp/src/main/resources/i18n/fr.po index 19dcfe587..fa7080f11 100644 --- a/libreplan-webapp/src/main/resources/i18n/fr.po +++ b/libreplan-webapp/src/main/resources/i18n/fr.po @@ -365,7 +365,7 @@ msgid "entity name not specified" msgstr "nom d'entité non indiqué" #: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:445 -msgid "You do not have permissions to go to worker edition window" +msgid "You do not have permissions to go to edit worker window" msgstr "Vous n'avez pas les permissions nécessaires pour accéder à la fenêtre de modification des travailleurs" #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/NewAllocationSelector.java:55 @@ -1120,7 +1120,7 @@ msgstr "ou noms" #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:505 #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:39 -msgid "Materials Needs At Date" +msgid "Materials Needed At Date" msgstr "Besoins matériels à une date donnée" #: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:615 @@ -2065,7 +2065,7 @@ msgid "Yes" msgstr "Oui" #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:127 -msgid "Go to user edition window" +msgid "Go to edit user window" msgstr "Aller à la fenêtre de modification utilisateur" #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:397 @@ -4290,7 +4290,7 @@ msgid "Edit Worker: {0}" msgstr "Modifier le participant: {0}" #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:1157 -msgid "You do not have permissions to go to user edition window" +msgid "You do not have permissions to go to edit user window" msgstr "Vous n'avez pas les permissions pou aller à la fenêtre de modification de l'utilisateur" #: libreplan-webapp/src/main/webapp/common/layout/login.zul:21 @@ -5100,7 +5100,7 @@ msgid "Value last progress measurement" msgstr "Renseigne la dernière mesure d'avancement" #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:21 -msgid "LibrePlan: Materials Needs At Date" +msgid "LibrePlan: Materials Needed At Date" msgstr "LibrePlan: Besoins matériels à la date" #: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:44 @@ -5175,7 +5175,7 @@ msgstr "Erreur lors de l'enregistrement du projet\n{0}" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:220 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:375 msgid "" -"You are about to leave the planning edition, unsaved changes will be lost." +"You are about to leave the planning editing. Unsaved changes will be lost!" msgstr "Vous êtes sur le point de quitter la modification de la planification, les changements non enregistrés seront perdus." #: libreplan-webapp/src/main/webapp/resources/machine/machines.zul:22 @@ -6414,7 +6414,7 @@ msgid "Timesheets Templates" msgstr "Canevas de feuille de temps" #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:1143 -msgid "Confirm user edition" +msgid "Confirm editing user" msgstr "Confirmer la modification de l'utilisateur" #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:117 @@ -7308,7 +7308,7 @@ msgid "The end date cannot be before the start date" msgstr "la date de fin ne peut pas être antérieure à la date de début" #: libreplan-webapp/src/main/webapp/users/_editUser.zul:115 -msgid "Go to worker edition window" +msgid "Go to edit worker window" msgstr "Aller à la fenêtre de modification des travailleurs" #: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:95 @@ -7534,7 +7534,7 @@ msgid "Priority" msgstr "Priorité" #: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:47 -msgid "Apply changes and continue edition" +msgid "Apply changes and continue editing" msgstr "Appliquer les changements et continuer l'édition" #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:221 @@ -7703,7 +7703,7 @@ msgid "Tim product code" msgstr "Code produit Tim" #: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:427 -msgid "Confirm worker edition" +msgid "Confirm edit worker" msgstr "Confirmer la modification du travailleur" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/JiraSynchronizationController.java:302 @@ -8655,7 +8655,7 @@ msgid "Adapt planning according to timesheets" msgstr "Adaptation de la planification selon les feuilles de temps" #: libreplan-webapp/src/main/webapp/orders/_ordersTab.zul:36 -msgid "Cancel edition" +msgid "Cancel editing" msgstr "Annuler l'édition" #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:32 @@ -9122,7 +9122,7 @@ msgid "Task Scheduling Status In Project Report" msgstr "Rapport d'état de prévision de tâche dans le projet" #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:83 -msgid "Materials Needs At Date Report" +msgid "Materials Needed At Date Report" msgstr "Rapport des besoins en matériel par date" #: libreplan-business/src/main/java/org/libreplan/business/orders/entities/SchedulingState.java:366 diff --git a/libreplan-webapp/src/main/resources/i18n/gl.po b/libreplan-webapp/src/main/resources/i18n/gl.po index fe8d3dda4..881e1bb8b 100644 --- a/libreplan-webapp/src/main/resources/i18n/gl.po +++ b/libreplan-webapp/src/main/resources/i18n/gl.po @@ -364,7 +364,7 @@ msgid "entity name not specified" msgstr "nome da entidade non especificado" #: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:445 -msgid "You do not have permissions to go to worker edition window" +msgid "You do not have permissions to go to edit worker window" msgstr "Non ten permisos para ir á ventá de edición de traballadores" #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/NewAllocationSelector.java:55 @@ -1119,7 +1119,7 @@ msgstr "ou nomes" #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:505 #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:39 -msgid "Materials Needs At Date" +msgid "Materials Needed At Date" msgstr "Necesidades de materiais en data" #: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:615 @@ -2064,7 +2064,7 @@ msgid "Yes" msgstr "Si" #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:127 -msgid "Go to user edition window" +msgid "Go to edit user window" msgstr "Ir á ventá de edición de usuarios" #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:397 @@ -4289,7 +4289,7 @@ msgid "Edit Worker: {0}" msgstr "Editar traballador: {0}" #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:1157 -msgid "You do not have permissions to go to user edition window" +msgid "You do not have permissions to go to edit user window" msgstr "Non ten permisos para ir á ventá de edición de usuarios" #: libreplan-webapp/src/main/webapp/common/layout/login.zul:21 @@ -5099,7 +5099,7 @@ msgid "Value last progress measurement" msgstr "Valor da última medida de progreso" #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:21 -msgid "LibrePlan: Materials Needs At Date" +msgid "LibrePlan: Materials Needed At Date" msgstr "LibrePlan: Necesidades de materiais en data" #: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:44 @@ -5174,7 +5174,7 @@ msgstr "Erro gardando un proxecto\n{0}" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:220 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:375 msgid "" -"You are about to leave the planning edition, unsaved changes will be lost." +"You are about to leave the planning editing. Unsaved changes will be lost!" msgstr "Estás a punto de saír da edición de planificación, os cambios sen gardar perderanse." #: libreplan-webapp/src/main/webapp/resources/machine/machines.zul:22 @@ -6413,7 +6413,7 @@ msgid "Timesheets Templates" msgstr "Modelos de partes de traballo" #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:1143 -msgid "Confirm user edition" +msgid "Confirm editing user" msgstr "Confirmar a edición do usuario" #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:117 @@ -7307,7 +7307,7 @@ msgid "The end date cannot be before the start date" msgstr "A data de fin non pode ser anterior á data de inicio" #: libreplan-webapp/src/main/webapp/users/_editUser.zul:115 -msgid "Go to worker edition window" +msgid "Go to edit worker window" msgstr "Ir a ventá de edición de traballadores" #: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:95 @@ -7533,7 +7533,7 @@ msgid "Priority" msgstr "Prioridade" #: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:47 -msgid "Apply changes and continue edition" +msgid "Apply changes and continue editing" msgstr "Aplicar cambios e continuar a edición" #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:221 @@ -7702,7 +7702,7 @@ msgid "Tim product code" msgstr "Código de produto Tim" #: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:427 -msgid "Confirm worker edition" +msgid "Confirm edit worker" msgstr "Confirmar edición do traballador" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/JiraSynchronizationController.java:302 @@ -8654,7 +8654,7 @@ msgid "Adapt planning according to timesheets" msgstr "Adaptar a planificación segundo os partes de traballo" #: libreplan-webapp/src/main/webapp/orders/_ordersTab.zul:36 -msgid "Cancel edition" +msgid "Cancel editing" msgstr "Cancelar a edición" #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:32 @@ -9121,7 +9121,7 @@ msgid "Task Scheduling Status In Project Report" msgstr "Informe de estado de planificación de tarefas en proxecto" #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:83 -msgid "Materials Needs At Date Report" +msgid "Materials Needed At Date Report" msgstr "Informe de necesidades de materiais en data" #: libreplan-business/src/main/java/org/libreplan/business/orders/entities/SchedulingState.java:366 diff --git a/libreplan-webapp/src/main/resources/i18n/it.po b/libreplan-webapp/src/main/resources/i18n/it.po index 2da9ff690..10c1d872c 100644 --- a/libreplan-webapp/src/main/resources/i18n/it.po +++ b/libreplan-webapp/src/main/resources/i18n/it.po @@ -362,7 +362,7 @@ msgid "entity name not specified" msgstr "nome entità non specificato" #: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:445 -msgid "You do not have permissions to go to worker edition window" +msgid "You do not have permissions to go to edit worker window" msgstr "Non hai i permessi per entrare nella finestra per modificare il lavoratore" #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/NewAllocationSelector.java:55 @@ -1117,7 +1117,7 @@ msgstr "o nomi" #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:505 #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:39 -msgid "Materials Needs At Date" +msgid "Materials Needed At Date" msgstr "Materiali necessari alla data" #: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:615 @@ -2062,7 +2062,7 @@ msgid "Yes" msgstr "Si" #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:127 -msgid "Go to user edition window" +msgid "Go to edit user window" msgstr "Vai alla finestra di modifica utente" #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:397 @@ -4287,7 +4287,7 @@ msgid "Edit Worker: {0}" msgstr "Modifica Lavoratore: {0}" #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:1157 -msgid "You do not have permissions to go to user edition window" +msgid "You do not have permissions to go to edit user window" msgstr "Non hai i permessi per accedere alla finestra di modifica degli utenti" #: libreplan-webapp/src/main/webapp/common/layout/login.zul:21 @@ -5097,7 +5097,7 @@ msgid "Value last progress measurement" msgstr "Valore dell'ultimo progresso misurato" #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:21 -msgid "LibrePlan: Materials Needs At Date" +msgid "LibrePlan: Materials Needed At Date" msgstr "LibrePlan: Materiali necessari alla data" #: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:44 @@ -5172,7 +5172,7 @@ msgstr "Errore durante il salvataggio del progetto\n{0}" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:220 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:375 msgid "" -"You are about to leave the planning edition, unsaved changes will be lost." +"You are about to leave the planning editing. Unsaved changes will be lost!" msgstr "Stai per uscire dalla modalità di modifica della pianificazione, i cambiamenti non salvati saranno persi." #: libreplan-webapp/src/main/webapp/resources/machine/machines.zul:22 @@ -6411,7 +6411,7 @@ msgid "Timesheets Templates" msgstr "Modelli dei fogli d'ore" #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:1143 -msgid "Confirm user edition" +msgid "Confirm editing user" msgstr "Conferma modifica utente" #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:117 @@ -7305,7 +7305,7 @@ msgid "The end date cannot be before the start date" msgstr "La data di fine non può essere precedente a quella d'inizio" #: libreplan-webapp/src/main/webapp/users/_editUser.zul:115 -msgid "Go to worker edition window" +msgid "Go to edit worker window" msgstr "Vai alla finestra di modifica lavoratore" #: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:95 @@ -7531,7 +7531,7 @@ msgid "Priority" msgstr "Priorità" #: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:47 -msgid "Apply changes and continue edition" +msgid "Apply changes and continue editing" msgstr "Applica le modifiche e continua a modificare" #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:221 @@ -7700,7 +7700,7 @@ msgid "Tim product code" msgstr "Codice prodotto di Tim" #: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:427 -msgid "Confirm worker edition" +msgid "Confirm edit worker" msgstr "Conferma modifica lavoratore" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/JiraSynchronizationController.java:302 @@ -8652,7 +8652,7 @@ msgid "Adapt planning according to timesheets" msgstr "Adatto la pianificazione in accordo col foglio ore" #: libreplan-webapp/src/main/webapp/orders/_ordersTab.zul:36 -msgid "Cancel edition" +msgid "Cancel editing" msgstr "Annulla le modifiche" #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:32 @@ -9119,7 +9119,7 @@ msgid "Task Scheduling Status In Project Report" msgstr "Rapporto Stato della Pianificazione dei Compiti nel Progetto" #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:83 -msgid "Materials Needs At Date Report" +msgid "Materials Needed At Date Report" msgstr "Rapporto Materiali Necessari Alla Data" #: libreplan-business/src/main/java/org/libreplan/business/orders/entities/SchedulingState.java:366 diff --git a/libreplan-webapp/src/main/resources/i18n/keys.pot b/libreplan-webapp/src/main/resources/i18n/keys.pot index aa0a9af00..5f9ef0927 100644 --- a/libreplan-webapp/src/main/resources/i18n/keys.pot +++ b/libreplan-webapp/src/main/resources/i18n/keys.pot @@ -360,7 +360,7 @@ msgid "entity name not specified" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:445 -msgid "You do not have permissions to go to worker edition window" +msgid "You do not have permissions to go to edit worker window" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/NewAllocationSelector.java:55 @@ -1115,7 +1115,7 @@ msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:505 #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:39 -msgid "Materials Needs At Date" +msgid "Materials Needed At Date" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:615 @@ -2060,7 +2060,7 @@ msgid "Yes" msgstr "" #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:127 -msgid "Go to user edition window" +msgid "Go to edit user window" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:397 @@ -4285,7 +4285,7 @@ msgid "Edit Worker: {0}" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:1157 -msgid "You do not have permissions to go to user edition window" +msgid "You do not have permissions to go to edit user window" msgstr "" #: libreplan-webapp/src/main/webapp/common/layout/login.zul:21 @@ -5095,7 +5095,7 @@ msgid "Value last progress measurement" msgstr "" #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:21 -msgid "LibrePlan: Materials Needs At Date" +msgid "LibrePlan: Materials Needed At Date" msgstr "" #: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:44 @@ -5170,7 +5170,7 @@ msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:220 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:375 msgid "" -"You are about to leave the planning edition, unsaved changes will be lost." +"You are about to leave the planning editing. Unsaved changes will be lost!" msgstr "" #: libreplan-webapp/src/main/webapp/resources/machine/machines.zul:22 @@ -6409,7 +6409,7 @@ msgid "Timesheets Templates" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:1143 -msgid "Confirm user edition" +msgid "Confirm editing user" msgstr "" #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:117 @@ -7303,7 +7303,7 @@ msgid "The end date cannot be before the start date" msgstr "" #: libreplan-webapp/src/main/webapp/users/_editUser.zul:115 -msgid "Go to worker edition window" +msgid "Go to edit worker window" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:95 @@ -7529,7 +7529,7 @@ msgid "Priority" msgstr "" #: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:47 -msgid "Apply changes and continue edition" +msgid "Apply changes and continue editing" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:221 @@ -7698,7 +7698,7 @@ msgid "Tim product code" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:427 -msgid "Confirm worker edition" +msgid "Confirm edit worker" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/JiraSynchronizationController.java:302 @@ -8649,7 +8649,7 @@ msgid "Adapt planning according to timesheets" msgstr "" #: libreplan-webapp/src/main/webapp/orders/_ordersTab.zul:36 -msgid "Cancel edition" +msgid "Cancel editing" msgstr "" #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:32 @@ -9116,7 +9116,7 @@ msgid "Task Scheduling Status In Project Report" msgstr "" #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:83 -msgid "Materials Needs At Date Report" +msgid "Materials Needed At Date Report" msgstr "" #: libreplan-business/src/main/java/org/libreplan/business/orders/entities/SchedulingState.java:366 diff --git a/libreplan-webapp/src/main/resources/i18n/nl.po b/libreplan-webapp/src/main/resources/i18n/nl.po index 1e2f63706..497441425 100644 --- a/libreplan-webapp/src/main/resources/i18n/nl.po +++ b/libreplan-webapp/src/main/resources/i18n/nl.po @@ -362,7 +362,7 @@ msgid "entity name not specified" msgstr "naam van entiteit niet gespecificeerd" #: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:445 -msgid "You do not have permissions to go to worker edition window" +msgid "You do not have permissions to go to edit worker window" msgstr "U heeft geen rechten om naar het werker wijzigingsscherm te gaan" #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/NewAllocationSelector.java:55 @@ -1117,7 +1117,7 @@ msgstr "of namen" #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:505 #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:39 -msgid "Materials Needs At Date" +msgid "Materials Needed At Date" msgstr "Benodigde materialen op datum" #: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:615 @@ -2062,7 +2062,7 @@ msgid "Yes" msgstr "Ja" #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:127 -msgid "Go to user edition window" +msgid "Go to edit user window" msgstr "Ga naar gebruiker wijzigingsvenster" #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:397 @@ -4287,7 +4287,7 @@ msgid "Edit Worker: {0}" msgstr "Wijzig werker: {0}" #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:1157 -msgid "You do not have permissions to go to user edition window" +msgid "You do not have permissions to go to edit user window" msgstr "U heeft geen rechten om naar het gebruikerswijzigenscherm te gaan" #: libreplan-webapp/src/main/webapp/common/layout/login.zul:21 @@ -5097,7 +5097,7 @@ msgid "Value last progress measurement" msgstr "Waarde laatste voortgangsmeting" #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:21 -msgid "LibrePlan: Materials Needs At Date" +msgid "LibrePlan: Materials Needed At Date" msgstr "LibrePlan: Materiaal nodig op datum" #: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:44 @@ -5172,7 +5172,7 @@ msgstr "Fout bij opslaan van het project⏎\n{0}" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:220 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:375 msgid "" -"You are about to leave the planning edition, unsaved changes will be lost." +"You are about to leave the planning editing. Unsaved changes will be lost!" msgstr "U gaat het planningsscherm verlaten, niet-opgeslagen wijzigingen zullen verloren gaan." #: libreplan-webapp/src/main/webapp/resources/machine/machines.zul:22 @@ -6411,7 +6411,7 @@ msgid "Timesheets Templates" msgstr "Urenstaat sjablonen" #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:1143 -msgid "Confirm user edition" +msgid "Confirm editing user" msgstr "Bevestig wijzigen gebruiker" #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:117 @@ -7305,7 +7305,7 @@ msgid "The end date cannot be before the start date" msgstr "De einddatum kan niet voor de startdatum liggen" #: libreplan-webapp/src/main/webapp/users/_editUser.zul:115 -msgid "Go to worker edition window" +msgid "Go to edit worker window" msgstr "Ga naar werker wijzigen scherm" #: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:95 @@ -7531,7 +7531,7 @@ msgid "Priority" msgstr "Prioriteit" #: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:47 -msgid "Apply changes and continue edition" +msgid "Apply changes and continue editing" msgstr "Voer wijzigingen door en ga verder met wijzigen" #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:221 @@ -7700,7 +7700,7 @@ msgid "Tim product code" msgstr "Tim productcode" #: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:427 -msgid "Confirm worker edition" +msgid "Confirm edit worker" msgstr "Bevestig wijzigen werker" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/JiraSynchronizationController.java:302 @@ -8652,7 +8652,7 @@ msgid "Adapt planning according to timesheets" msgstr "Pas planning aan op basis van urenstaten" #: libreplan-webapp/src/main/webapp/orders/_ordersTab.zul:36 -msgid "Cancel edition" +msgid "Cancel editing" msgstr "Afbreken editie" #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:32 @@ -9119,7 +9119,7 @@ msgid "Task Scheduling Status In Project Report" msgstr "Taakplanningsstatus in Project Rapport" #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:83 -msgid "Materials Needs At Date Report" +msgid "Materials Needed At Date Report" msgstr "Benodigde materialen op rapportdatum" #: libreplan-business/src/main/java/org/libreplan/business/orders/entities/SchedulingState.java:366 diff --git a/libreplan-webapp/src/main/resources/i18n/pl.po b/libreplan-webapp/src/main/resources/i18n/pl.po index 540e81a31..61f641b41 100644 --- a/libreplan-webapp/src/main/resources/i18n/pl.po +++ b/libreplan-webapp/src/main/resources/i18n/pl.po @@ -895,7 +895,7 @@ msgstr "Profil" #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:348 #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:37 -msgid "Materials Needs At Date" +msgid "Materials Needed At Date" msgstr "Materiały Potrzebne Na Dany Dzień" #: libreplan-webapp/src/main/webapp/common/configuration.zul:292 @@ -3823,7 +3823,7 @@ msgid "Value last progress measurement" msgstr "Wartość ostatniego pomiaru postępu" #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:21 -msgid "LibrePlan: Materials Needs At Date" +msgid "LibrePlan: Materials Needed At Date" msgstr "LibrePlan: Materiały Potrzebne na datę" #: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:44 @@ -5787,7 +5787,7 @@ msgid "instance not found" msgstr "Nie znaleziono instancji" #: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:47 -msgid "Apply changes and continue edition" +msgid "Apply changes and continue editing" msgstr "Zaakceptuj zmiany i kontynuuj edycje" #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:220 @@ -6697,7 +6697,7 @@ msgid "List of materials for category: {0}" msgstr "Lista materiałów dla kategorii: {0}" #: libreplan-webapp/src/main/webapp/orders/_ordersTab.zul:36 -msgid "Cancel edition" +msgid "Cancel editing" msgstr "Anuluj edycje" #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:32 diff --git a/libreplan-webapp/src/main/resources/i18n/pt.po b/libreplan-webapp/src/main/resources/i18n/pt.po index 095b13885..18094843d 100644 --- a/libreplan-webapp/src/main/resources/i18n/pt.po +++ b/libreplan-webapp/src/main/resources/i18n/pt.po @@ -353,7 +353,7 @@ msgid "entity name not specified" msgstr "Nome da entidade não especificado" #: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:445 -msgid "You do not have permissions to go to worker edition window" +msgid "You do not have permissions to go to edit worker window" msgstr "Você não tem permissão para ir à janela de edição de trabalhadores" #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/NewAllocationSelector.java:51 @@ -1069,7 +1069,7 @@ msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:493 #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:39 -msgid "Materials Needs At Date" +msgid "Materials Needed At Date" msgstr "Necesidades de Materiais para Data" #: libreplan-webapp/src/main/webapp/common/configuration.zul:316 @@ -1939,7 +1939,7 @@ msgid "Yes" msgstr "Sim" #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:127 -msgid "Go to user edition window" +msgid "Go to edit user window" msgstr "Ir para a janela de edição de usuário" #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:392 @@ -3952,7 +3952,7 @@ msgid "Edit Worker: {0}" msgstr "Editar Trabalhador: {0}" #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:1143 -msgid "You do not have permissions to go to user edition window" +msgid "You do not have permissions to go to edit user window" msgstr "Você não tem permissão para ir à janela de edição de usuários" #: libreplan-webapp/src/main/webapp/common/layout/login.zul:21 @@ -4694,7 +4694,7 @@ msgid "Value last progress measurement" msgstr "Valor da última medida de progresso" #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:21 -msgid "LibrePlan: Materials Needs At Date" +msgid "LibrePlan: Materials Needed At Date" msgstr "LibrePlan: Necessidades de Materiais para Data" #: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:44 @@ -4769,7 +4769,7 @@ msgstr "Erro ao guardar o projeto\n{0}" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:375 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:220 msgid "" -"You are about to leave the planning edition, unsaved changes will be lost." +"You are about to leave the planning editing. Unsaved changes will be lost!" msgstr "" #: libreplan-webapp/src/main/webapp/resources/machine/machines.zul:22 @@ -5937,7 +5937,7 @@ msgid "Any" msgstr "Algum" #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:1129 -msgid "Confirm user edition" +msgid "Confirm editing user" msgstr "Confirmar edição do usuário" #: libreplan-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:47 @@ -6750,7 +6750,7 @@ msgid "The end date cannot be before the start date" msgstr "" #: libreplan-webapp/src/main/webapp/users/_editUser.zul:115 -msgid "Go to worker edition window" +msgid "Go to edit worker window" msgstr "" #: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:40 @@ -6953,7 +6953,7 @@ msgid "Priority" msgstr "Prioridade" #: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:47 -msgid "Apply changes and continue edition" +msgid "Apply changes and continue editing" msgstr "Aplicar as alterações e continuar a edição" #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:221 @@ -7110,7 +7110,7 @@ msgid "Assign element to queue automatically" msgstr "Atribuir elemento à fila automaticamente" #: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:427 -msgid "Confirm worker edition" +msgid "Confirm edit worker" msgstr "Confirmar edição de trabalhadores" #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:74 @@ -8021,7 +8021,7 @@ msgid "Adapt planning according to timesheets" msgstr "" #: libreplan-webapp/src/main/webapp/orders/_ordersTab.zul:36 -msgid "Cancel edition" +msgid "Cancel editing" msgstr "Cancelar edição" #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:32 @@ -8376,7 +8376,7 @@ msgid "Task Scheduling Status In Project Report" msgstr "" #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:81 -msgid "Materials Needs At Date Report" +msgid "Materials Needed At Date Report" msgstr "" #: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:345 diff --git a/libreplan-webapp/src/main/resources/i18n/ru.po b/libreplan-webapp/src/main/resources/i18n/ru.po index c8e409c39..15eb4ae90 100644 --- a/libreplan-webapp/src/main/resources/i18n/ru.po +++ b/libreplan-webapp/src/main/resources/i18n/ru.po @@ -875,7 +875,7 @@ msgstr "Редактировать календарь" #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:339 #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:41 -msgid "Materials Needs At Date" +msgid "Materials Needed At Date" msgstr "Материалы требуемые на дату" #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:35 @@ -4493,7 +4493,7 @@ msgid "must be greater than finish date" msgstr "Должно быть больше чем дата окончания" #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:21 -msgid "LibrePlan: Materials Needs At Date" +msgid "LibrePlan: Materials Needed At Date" msgstr "LibrePlan: Материалы требуются к дате" #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:26 diff --git a/libreplan-webapp/src/main/resources/i18n/zh.po b/libreplan-webapp/src/main/resources/i18n/zh.po index e2de4e8a9..05c8efeab 100644 --- a/libreplan-webapp/src/main/resources/i18n/zh.po +++ b/libreplan-webapp/src/main/resources/i18n/zh.po @@ -351,7 +351,7 @@ msgid "entity name not specified" msgstr "不指定实体名称" #: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:445 -msgid "You do not have permissions to go to worker edition window" +msgid "You do not have permissions to go to edit worker window" msgstr "您没有权限去工人的编辑窗口" #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/NewAllocationSelector.java:51 @@ -1067,7 +1067,7 @@ msgstr "个人时间表" #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:493 #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:39 -msgid "Materials Needs At Date" +msgid "Materials Needed At Date" msgstr "物料需求日期" #: libreplan-webapp/src/main/webapp/common/configuration.zul:316 @@ -1937,7 +1937,7 @@ msgid "Yes" msgstr "是" #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:127 -msgid "Go to user edition window" +msgid "Go to edit user window" msgstr "用户编辑窗口" #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:392 @@ -3950,7 +3950,7 @@ msgid "Edit Worker: {0}" msgstr "编辑工作者：{0}" #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:1143 -msgid "You do not have permissions to go to user edition window" +msgid "You do not have permissions to go to edit user window" msgstr "您没有权限去用户编辑窗口" #: libreplan-webapp/src/main/webapp/common/layout/login.zul:21 @@ -4692,7 +4692,7 @@ msgid "Value last progress measurement" msgstr "值最后的进步测量" #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:21 -msgid "LibrePlan: Materials Needs At Date" +msgid "LibrePlan: Materials Needed At Date" msgstr "LibrePlan：材料需要在日期" #: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:44 @@ -4767,7 +4767,7 @@ msgstr "错误保存项目⏎ {0}" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:375 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:220 msgid "" -"You are about to leave the planning edition, unsaved changes will be lost." +"You are about to leave the planning editing. Unsaved changes will be lost!" msgstr "你即将离开的规划版本，未保存的更改将丢失。" #: libreplan-webapp/src/main/webapp/resources/machine/machines.zul:22 @@ -5935,7 +5935,7 @@ msgid "Any" msgstr "任何" #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:1129 -msgid "Confirm user edition" +msgid "Confirm editing user" msgstr "确认用户版" #: libreplan-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:47 @@ -6748,7 +6748,7 @@ msgid "The end date cannot be before the start date" msgstr "结束日期不得早于开始日期" #: libreplan-webapp/src/main/webapp/users/_editUser.zul:115 -msgid "Go to worker edition window" +msgid "Go to edit worker window" msgstr "工人的编辑窗口" #: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:40 @@ -6951,7 +6951,7 @@ msgid "Priority" msgstr "优先" #: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:47 -msgid "Apply changes and continue edition" +msgid "Apply changes and continue editing" msgstr "应用更改并继续编辑" #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:221 @@ -7108,7 +7108,7 @@ msgid "Assign element to queue automatically" msgstr "队列自动分配单元" #: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:427 -msgid "Confirm worker edition" +msgid "Confirm edit worker" msgstr "确认工人版" #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:74 @@ -8019,7 +8019,7 @@ msgid "Adapt planning according to timesheets" msgstr "根据时间表，适应规划" #: libreplan-webapp/src/main/webapp/orders/_ordersTab.zul:36 -msgid "Cancel edition" +msgid "Cancel editing" msgstr "取消版" #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:32 @@ -8374,7 +8374,7 @@ msgid "Task Scheduling Status In Project Report" msgstr "在项目报告中的任务调度状态" #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:81 -msgid "Materials Needs At Date Report" +msgid "Materials Needed At Date Report" msgstr "材料需要的日期报告" #: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:345 diff --git a/libreplan-webapp/src/main/webapp/common/img/cabecera.jpg b/libreplan-webapp/src/main/webapp/common/img/cabecera.jpg deleted file mode 100644 index 94ea1aa32..000000000 Binary files a/libreplan-webapp/src/main/webapp/common/img/cabecera.jpg and /dev/null differ diff --git a/libreplan-webapp/src/main/webapp/common/img/logo.gif b/libreplan-webapp/src/main/webapp/common/img/logo.gif deleted file mode 100644 index 7e91b4652..000000000 Binary files a/libreplan-webapp/src/main/webapp/common/img/logo.gif and /dev/null differ diff --git a/libreplan-webapp/src/main/webapp/common/img/logo2.gif b/libreplan-webapp/src/main/webapp/common/img/logo2.gif deleted file mode 100644 index 79b37add3..000000000 Binary files a/libreplan-webapp/src/main/webapp/common/img/logo2.gif and /dev/null differ diff --git a/libreplan-webapp/src/main/webapp/orders/_ordersTab.zul b/libreplan-webapp/src/main/webapp/orders/_ordersTab.zul index 1fbcf057a..17707f4d4 100644 --- a/libreplan-webapp/src/main/webapp/orders/_ordersTab.zul +++ b/libreplan-webapp/src/main/webapp/orders/_ordersTab.zul @@ -33,7 +33,7 @@ tooltiptext="${i18n:_('Save Project')}" />