From f64d62748233581750c88af547eda2d76a7c16a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20D=C3=ADaz=20Sa=C3=B1udo?= Date: Wed, 10 Oct 2012 17:36:54 +0200 Subject: [PATCH] i18n: Update Catalan translation --- ganttzk/src/main/resources/i18n/ca.po | 16 +- .../projectStatus_ca.properties | 11 + .../src/main/resources/i18n/ca.po | 1470 +++++++++-------- 3 files changed, 773 insertions(+), 724 deletions(-) create mode 100644 libreplan-webapp/src/main/jasper/projectStatus_Bundle/projectStatus_ca.properties diff --git a/ganttzk/src/main/resources/i18n/ca.po b/ganttzk/src/main/resources/i18n/ca.po index 1a78aac4e..7dc4c16d4 100644 --- a/ganttzk/src/main/resources/i18n/ca.po +++ b/ganttzk/src/main/resources/i18n/ca.po @@ -8,17 +8,17 @@ # Daniel Díaz Sañudo , 2012. msgid "" msgstr "" -"Project-Id-Version: LibrePlan\n" +"Project-Id-Version: libreplan-1.3.1\n" "Report-Msgid-Bugs-To: http://bugs.libreplan.org/\n" -"POT-Creation-Date: 2012-07-05 08:07+0200\n" -"PO-Revision-Date: 2012-08-08 07:38+0000\n" +"POT-Creation-Date: 2012-10-02 12:44+0200\n" +"PO-Revision-Date: 2012-09-20 07:32+0000\n" "Last-Translator: Daniel Díaz Sañudo \n" "Language-Team: Català\n" -"Language: ca\n" +"MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: ca\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:216 #: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:235 @@ -72,7 +72,7 @@ msgstr "Tasca" #: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:199 msgid "available effort: {0}, assigned effort: {1}" -msgstr "esforç disponible available effort: {0}, esforç assignat: {1}" +msgstr "esforç disponible: {0}, esforç assignat: {1}" #: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:64 msgid "Criterion" @@ -120,7 +120,7 @@ msgstr "Agrupar per" #: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:90 msgid "Generic allocation criteria" -msgstr "Criteris generics d'assignació" +msgstr "Criteris genèrics d'assignació" #: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:45 msgid "Quarter" @@ -218,7 +218,7 @@ msgstr "Gràfics" #: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:251 msgid "Set Start-Start" -msgstr "Ajus d'inici a inici" +msgstr "Ajust d'inici a inici" #: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:152 msgid "See resource allocation" diff --git a/libreplan-webapp/src/main/jasper/projectStatus_Bundle/projectStatus_ca.properties b/libreplan-webapp/src/main/jasper/projectStatus_Bundle/projectStatus_ca.properties new file mode 100644 index 000000000..0d8b8df50 --- /dev/null +++ b/libreplan-webapp/src/main/jasper/projectStatus_Bundle/projectStatus_ca.properties @@ -0,0 +1,11 @@ +# Locale for projectStatusReport.jrxml +title = Informe de l'estat del projecte +project = Projecte\: +project_estimated_hours = Hores estimades\: +project_planned_hours = Hores planificades\: +project_imputed_hours = Hores imputades\: +code = Codi +name = Nom +estimated_hours = Estimat +planned_hours = Planificat +imputed_hours = Imputat diff --git a/libreplan-webapp/src/main/resources/i18n/ca.po b/libreplan-webapp/src/main/resources/i18n/ca.po index 8a363ca6d..2149ece08 100644 --- a/libreplan-webapp/src/main/resources/i18n/ca.po +++ b/libreplan-webapp/src/main/resources/i18n/ca.po @@ -8,19 +8,19 @@ # Daniel Díaz Sañudo , 2012. msgid "" msgstr "" -"Project-Id-Version: LibrePlan\n" -"Report-Msgid-Bugs-To: libreplan-1.3.0\n" -"POT-Creation-Date: 2012-07-05 08:07+0200\n" -"PO-Revision-Date: 2012-08-16 15:43+0000\n" +"Project-Id-Version: libreplan-1.3.1\n" +"Report-Msgid-Bugs-To: http://bugs.libreplan.org/\n" +"POT-Creation-Date: 2012-10-02 12:44+0200\n" +"PO-Revision-Date: 2012-10-02 14:30+0000\n" "Last-Translator: Daniel Díaz Sañudo \n" "Language-Team: Català\n" -"Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Language: ca\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java:436 +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java:449 msgid "currency code not specified" msgstr "codi de moneda no especificat" @@ -32,7 +32,7 @@ msgstr "No té permisos per a crear nous usuaris" msgid "Availability ratio" msgstr "Rati de disponibilitat" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:358 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:367 msgid "Group path" msgstr "\"Path\" de grup" @@ -71,13 +71,13 @@ msgstr "Escollir data de l'informe" msgid "Create Virtual Worker" msgstr "Crear Treballador Virtual" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:824 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:825 #: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:105 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:81 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:28 #: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:30 #: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:36 -#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:32 +#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:31 #: libreplan-webapp/src/main/webapp/materials/materials.zul:63 #: libreplan-webapp/src/main/webapp/materials/materials.zul:88 #: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:58 @@ -113,11 +113,11 @@ msgstr "Crear Treballador Virtual" #: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:50 #: libreplan-webapp/src/main/webapp/templates/_advances.zul:39 #: libreplan-webapp/src/main/webapp/myaccount/_expensesArea.zul:40 -#: libreplan-webapp/src/main/webapp/myaccount/_monthlyTimesheetsArea.zul:37 +#: libreplan-webapp/src/main/webapp/myaccount/_personalTimesheetsArea.zul:37 #: libreplan-webapp/src/main/webapp/myaccount/_myTasksArea.zul:42 #: libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul:59 #: libreplan-webapp/src/main/webapp/subcontract/subcontractorCommunications.zul:60 -#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:58 +#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:57 #: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:52 #: libreplan-webapp/src/main/webapp/unittypes/_listUnitTypes.zul:29 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:258 @@ -143,7 +143,7 @@ msgstr "Crear Treballador Virtual" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:70 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:57 #: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:143 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:246 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:255 msgid "Operations" msgstr "Operacions" @@ -156,12 +156,16 @@ msgstr "Dades bàsiques" msgid "Select" msgstr "Seleccionar" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:498 +msgid "Project Status" +msgstr "Estat del projecte" + #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:345 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:180 msgid "Start date cannot be empty" msgstr "Data d'inici no pot ser buida" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:338 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:340 #: libreplan-webapp/src/main/webapp/materials/materials.zul:35 #: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:48 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:52 @@ -185,16 +189,16 @@ msgstr "Reassignar" msgid "Not bound" msgstr "No limitat" -#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/GlobalProgressChart.java:46 +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/GlobalProgressChart.java:62 msgid "By critical path hours" -msgstr "Hores pel camí crítc" +msgstr "Hores pel camí crític" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MonteCarloTabCreator.java:51 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MonteCarloTabCreator.java:159 msgid "MonteCarlo Method" msgstr "Mètode MonteCarlo" -#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:180 +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:183 #: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskDeadlineViolationStatusEnum.java:34 msgid "No deadline" msgstr "Sense termini" @@ -232,7 +236,7 @@ msgid "Predefined" msgstr "Predefinit" #: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:344 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:350 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:352 #: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:49 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:53 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:59 @@ -243,7 +247,7 @@ msgstr "Formularis de Qualitat" msgid "A stretch has lower or equal values than the previous stretch" msgstr "Un tram conté un valor menor o igual que el tram previ" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:495 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:502 msgid "Reports" msgstr "Informes" @@ -255,7 +259,7 @@ msgstr "L'assignació no es pot completar" msgid "Create task" msgstr "Crear tasca" -#: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:118 +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:122 msgid "username not specified" msgstr "nom d'usuari no especificat" @@ -267,8 +271,8 @@ msgstr "LibrePlan: Assignació avançada" msgid "Criterion requirements" msgstr "Criteri dels requisits" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1569 -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1575 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1570 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1576 msgid "please, select a timesheet template type" msgstr "si us plau, seleccioneu un tipus de plantilla de full d'horari" @@ -312,23 +316,23 @@ msgstr "Treball fet" msgid "Unassign" msgstr "Sense assignar" -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:36 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:37 msgid "Filter timesheet lines by" msgstr "Filtre de les línies del full d'horari per" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/ManualAllocationController.java:505 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/ManualAllocationController.java:506 msgid "Manual assignment" msgstr "Assignació manual" -#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:157 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:412 +#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:146 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:419 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:68 msgid "Companies" msgstr "Empreses" #: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:74 msgid "Quality form items list" -msgstr "Llista d'items del formulari de qualitat" +msgstr "Llista d'ítems del formulari de qualitat" #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:514 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:1047 @@ -336,11 +340,11 @@ msgstr "Llista d'items del formulari de qualitat" msgid "Create {0}: {1}" msgstr "Crear {0}: {1}" -#: libreplan-business/src/main/java/org/libreplan/business/common/entities/EntitySequence.java:193 +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/EntitySequence.java:192 msgid "entity name not specified" msgstr "Nom de l'entitat no especificat" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:414 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:424 msgid "You do not have permissions to go to worker edition window" msgstr "No té permisos per a treballar amb la finestra d'edició" @@ -349,7 +353,7 @@ msgid "generic workers allocation" msgstr "Assignació de treballador genèric" #: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:315 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:898 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:895 msgid "The project has no scheduled elements" msgstr "El projecte no té elements planificats" @@ -363,7 +367,7 @@ msgstr "Inici" msgid "cost assignment's category not specified" msgstr "Categoria d'assignació de cost no especificada" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:112 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:121 msgid "Check for updates" msgstr "Comprovar actualitzacions" @@ -413,7 +417,7 @@ msgstr "recurs no assignat" #: libreplan-business/src/main/java/org/libreplan/business/materials/entities/UnitType.java:76 msgid "measure not specified" -msgstr "mesura no especifida" +msgstr "mesura no especificada" #: libreplan-webapp/src/main/webapp/common/configuration.zul:64 msgid "Default calendar" @@ -424,8 +428,14 @@ msgstr "Calendari per defecte" msgid "criterion not specified" msgstr "criteri no especificat" +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:473 +msgid "" +"only one timesheet line per day and task is allowed in personal timesheets" +msgstr "Només una línia per tasca i dia per full de treball en el fulls de treball personals" + #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:180 #: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:181 +#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:87 #: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:220 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:210 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:88 @@ -445,6 +455,10 @@ msgstr "Calendari del projecte no especificat" msgid "Project Name" msgstr "Nom del projecte" +#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/TypeOfWorkHours.java:146 +msgid "type of work hours for personal timesheets cannot be disabled" +msgstr "No es pot inhabilitar el tipus de treball per hores en el full de treball personal" + #: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/ExternalCompany.java:166 msgid "Company ID already used. It must be unique" msgstr "Empresa ID ja en ús. Ha de ser únic" @@ -453,7 +467,13 @@ msgstr "Empresa ID ja en ús. Ha de ser únic" msgid "Cannot be higher than Ending Date" msgstr "No pot ser més gran la data de finalització" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1172 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:128 +msgid "" +"Roles of LDAP users cannot be managed because LDAP is enabled and LDAP roles" +" are being used." +msgstr "Els rols de LDAP no es poden manegar perquè LDAP està inhabilitat i els rols LDAP s’estan utilitzant." + +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1176 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:306 msgid "Indent" msgstr "Indent" @@ -462,7 +482,7 @@ msgstr "Indent" msgid "Reassignation" msgstr "Reassignació" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:331 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:340 msgid "Save passwords in database" msgstr "Desar paraula de pas a la base de dades" @@ -510,17 +530,21 @@ msgstr "El codi ha de ser únic." #: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:77 msgid "New quality form item" -msgstr "Nou item al formulari de Qualitat" +msgstr "Nou ítem al formulari de Qualitat" #: libreplan-webapp/src/main/webapp/labels/labelTypes.zul:21 msgid "LibrePlan: Labels" msgstr "LibrePlan: Etiquetes" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:253 +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:348 +msgid "You have exceeded the maximum limit of users" +msgstr "S’ha excedit en nombre màxim d’usuaris" + +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:254 msgid "LDAP connection was successful" msgstr "Connexió a LDAP correcte." -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:346 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:349 msgid "" "This resource allocation type is incompatible. The task has an associated " "order element which has a progress that is of type subcontractor. " @@ -530,7 +554,7 @@ msgstr "Aquest tipus d'assignació de recursos és incompatible. La tasca té as msgid "position not specified" msgstr "posició no especificada" -#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/GlobalProgressChart.java:56 +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/GlobalProgressChart.java:57 #: libreplan-webapp/src/main/webapp/resources/_criterions.zul:43 msgid "Current" msgstr "Actual" @@ -600,23 +624,23 @@ msgstr "Comprovat" msgid "a disabled resource has enabled subresources" msgstr "un recurs inhabilitat té subrecursos activats" -#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:29 +#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:28 #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:53 msgid "Client" msgstr "Client" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/limiting/allocation/LimitingResourceAllocationModel.java:153 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:661 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:660 msgid "" "there are no resources for required criteria: {0}. So the generic allocation" " can't be added" msgstr "No n'hi ha recursos pels criteris: {0}. L'assignació genèrica no es pot afegir" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1503 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1504 msgid "must be later than start date" msgstr "ha de ser més tard que la data d'inici" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:351 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:360 msgid "Role search strategy" msgstr "Estratègia de cerca de \"role\"" @@ -624,7 +648,7 @@ msgstr "Estratègia de cerca de \"role\"" msgid "fields should match with timesheet data if are shared by lines" msgstr "els camps han d'encaixar amb les dades del full de temps en cas de compartir-se per les línies" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractController.java:163 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractController.java:154 msgid "It already exists a deliver date with the same date. " msgstr "Ja existeix una data de lliurament amb la mateixa data. " @@ -636,7 +660,7 @@ msgstr "el nom de la categoria del material ha de ser únic. Aquest ja existeix" msgid "Imputed hours" msgstr "Hores imputades" -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractorCommunicationValue.java:74 +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractorCommunicationValue.java:73 msgid "progress should be greater than 0% and less than 100%" msgstr "el progrés ha de ser més gran que 0% i més petit que 100%" @@ -647,13 +671,13 @@ msgstr "Ja existeix un camp de descripció amb el mateix nom." #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:456 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:143 msgid "Confirm deleting this hour cost. Are you sure?" -msgstr "Confirmar que voleu esborrar aquest cost d'horar, està segur?" +msgstr "Confirmar que voleu esborrar aquest cost d'hora, està segur?" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/milestone/DeleteMilestoneCommand.java:59 msgid "Delete Milestone" msgstr "Esborrar Fita" -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractedTaskData.java:247 +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractedTaskData.java:248 msgid "external company should be subcontractor" msgstr "les empreses externes han de ser subcontractista" @@ -665,15 +689,15 @@ msgstr "Ubicació no assignada" msgid "Application URI" msgstr "URI de l'aplicació" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:353 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:362 msgid "Group strategy" msgstr "Estratègia de grup" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1071 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1085 msgid "Budget: {0}, Consumed: {1} ({2}%)" msgstr "Pressupost: {0}, Consumit: {1} ({2}%)" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1555 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1552 msgid "Configure" msgstr "Configurar" @@ -695,10 +719,10 @@ msgstr "LibrePlan: enviar a subcontractista" #: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:291 #: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:211 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:211 -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1220 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1221 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:451 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:200 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:829 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:826 msgid "Confirm deleting {0}. Are you sure?" msgstr "Confirmació d'esborrat {0}, estàs segur?" @@ -710,15 +734,20 @@ msgstr "Editar la tasca seleccionada" msgid "External code" msgstr "Codi extern" +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:193 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:644 +msgid "Personal timesheet saved" +msgstr "Full personal de treball desat" + #: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:51 msgid "View" msgstr "Vista" -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractedTaskData.java:225 +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractedTaskData.java:226 msgid "subcontratation date not specified" msgstr "data de subcontractació no especificada" -#: libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java:164 +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java:177 msgid "base not specified" msgstr "base no especificada" @@ -730,7 +759,7 @@ msgstr "Nova data de lliurament" msgid "Required materials" msgstr "Material demanat" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:315 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:312 msgid "Backwards" msgstr "Cap enrere" @@ -760,30 +789,25 @@ msgstr "Amunt" msgid "EAC" msgstr "EAC" -#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:39 -msgid "Predecessor" -msgstr "Predecessor" - -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:602 -msgid "Not workable day" -msgstr "Dia no laborable" - #: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:539 msgid "it already exists another expense sheet with the same code." msgstr "ja existeix un altre full de despesa amb el mateix codi." -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/TreeElementOperationsController.java:55 -msgid "Please select a task" -msgstr "Si us plau, seleccioneu una tasca" +#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:39 +msgid "Predecessor" +msgstr "Predecessor" + +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:601 +msgid "Not workable day" +msgstr "Dia no laborable" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:172 msgid "Some stretch has higher or equal values than the previous stretch" msgstr "Alguns trams tenen un valor igual o més gran que el tram previ" -#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:473 -msgid "" -"only one timesheet line per day and task is allowed in monthly timesheets" -msgstr "només està permès una línea del full d'horari per dia i tasca en els fulls mensuals" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/TreeElementOperationsController.java:55 +msgid "Please select a task" +msgstr "Si us plau, seleccioneu una tasca" #: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:101 msgid "" @@ -842,12 +866,12 @@ msgid "This project has already been added." msgstr "S'ha afegit aquest projecte." #: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:558 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:619 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:621 #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:326 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:32 #: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:39 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:36 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:134 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:143 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:54 msgid "Criteria" msgstr "Criteris" @@ -882,7 +906,7 @@ msgstr "Valor ha de ser un múltiple del valor de la precisió del tipus progré msgid "Set Filter Options" msgstr "Establir opcions de filtres" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:370 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:377 #: libreplan-webapp/src/main/webapp/myaccount/_expensesArea.zul:22 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:62 msgid "Expenses" @@ -925,23 +949,27 @@ msgstr "si us plau, seleccioneu un criteri" msgid "{0} annotation required on {1}" msgstr "{0} anotació necessària a {1}" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:234 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:239 msgid "Some sequences to be removed do not exist" msgstr "Algunes de les seqüèncis a esborrar no existeixen" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1297 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1301 msgid "Modified" msgstr "Modificat" +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:956 +msgid "cannot be negative" +msgstr "no pot ser negatiu" + #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:215 msgid "Add Criterion" msgstr "Afegir Criteri" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:664 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:665 msgid "format prefix invalid. It cannot be empty or contain whitespaces." msgstr "format del prefix no vàlid. No pot estar buit o tenir espais en blanc." -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1228 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1227 msgid "inherited exception can not be removed" msgstr "excepció heretada no pot ser esborrada" @@ -988,7 +1016,7 @@ msgstr "Llista de plantilles" msgid "Criteria: {0}" msgstr "Criteris: {0}" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:244 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:253 msgid "Last value" msgstr "Últim valor" @@ -1021,12 +1049,17 @@ msgstr "ítem" msgid "Profile" msgstr "Perfil" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:491 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:511 +#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:32 +msgid "Personal timesheet" +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" msgstr "Material necessari a la data" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:296 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:305 msgid "UserDn" msgstr "UsuariDn" @@ -1069,6 +1102,10 @@ msgstr "Hi ha una altre plantilla de full d'horari amb el mateix codi" msgid "Overload due to other assignments" msgstr "Sobrecàrrega degut a altres assignacions" +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/GlobalProgressChart.java:123 +msgid "Project progress percentage" +msgstr "Percentatge de progrés del projecte" + #: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:104 msgid "Expense properties" msgstr "Detalls de les Despeses" @@ -1091,17 +1128,11 @@ msgstr "Està segur de canviar el tipus de recurs? Perdrà tots els criteris amb msgid "This Criterion has already been added." msgstr "Aquest criteri s'ha afegit" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:226 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:235 msgid "add" msgstr "Afegir" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:952 -#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:86 -#: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:69 -msgid "Budget value cannot be negative" -msgstr "El valor del pressupost no pot ser negatiu" - -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:395 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:405 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:1128 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/TreeElementOperationsController.java:243 msgid "Unsaved changes will be lost. Would you like to continue?" @@ -1116,7 +1147,7 @@ msgstr "si us plau, seleccioneu un usuari limitat" msgid "Workers" msgstr "Treballadors" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:865 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:862 msgid "" "You can not remove the project \"{0}\" because it has time tracked at some " "of its tasks" @@ -1142,7 +1173,7 @@ msgstr "Any" msgid "{0} \"{1}\" could not be deleted, it was already removed" msgstr "{0} \"{1}\" no pot ser eliminat, ja s'havia fet" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:422 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:429 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:70 msgid "Received From Subcontractors" msgstr "Rebut dels subcontractistes" @@ -1163,7 +1194,7 @@ msgstr "Data d'inici" msgid "LibrePlan: Hours Types" msgstr "LibrePlan: Tipus d'hores" -#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/GlobalProgressChart.java:44 +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/GlobalProgressChart.java:61 msgid "By all tasks hours" msgstr "Per a totes les hores de les tasques" @@ -1195,8 +1226,8 @@ msgstr "No n'hi ha cap període vàlid per aquest calendari" msgid "Add role" msgstr "Afegir \"role\"" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:643 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1279 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:642 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1278 msgid "Exception end date should be greater or equals than start date" msgstr "Excepció Data final ha de ser més gran que la data d'inici" @@ -1218,7 +1249,8 @@ msgstr "Data del rang no ha de ser abans de la data d'inici de tasca:" msgid "Progress Types List" msgstr "Llista del tipus de progrés" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/AssignedMachineCriterionsModel.java:415 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/AssignedCriterionsModel.java:335 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/AssignedMachineCriterionsModel.java:398 msgid "" "The {0} can not be assigned to this resource. Its interval overlaps with " "other criterion" @@ -1237,25 +1269,21 @@ msgid "The code cannot be empty and it must be unique." msgstr "El codi no pot ser buit i ha de ser únic." #: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:124 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:401 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:408 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:67 msgid "Profiles" msgstr "Perfil" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/UserDashboardController.java:60 -msgid "Monthly timesheet \"{0}\" saved" -msgstr "Full d'hores mensual \"{0}\" desat" - #: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:46 #: libreplan-webapp/src/main/webapp/myaccount/_expensesArea.zul:35 msgid "First expense" msgstr "Primera despesa" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:275 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:284 msgid "Host" msgstr "\"Host\" / Amfitrió" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:198 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:207 msgid "Perspectives" msgstr "Perspectives" @@ -1292,6 +1320,10 @@ msgstr "Dividir una nova assignació" msgid "maxixum value of percentage progress type must be 100" msgstr "màxim valor del percentatge del tipus de progrés ha de ser 100" +#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:84 +msgid "Total personal timesheet" +msgstr "Total del full de treball personal" + #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:275 msgid "Expiry date" msgstr "Data de caducitat" @@ -1327,7 +1359,7 @@ msgstr "Detalls del projecte" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:167 msgid "Add new hours group" -msgstr "Afegir un nou group d'hores" +msgstr "Afegir un nou grup d'hores" #: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:44 msgid "Cancel changes and back to scheduling" @@ -1346,11 +1378,11 @@ msgstr "Tasca: {0}" msgid "Percentage" msgstr "Percentatge" -#: libreplan-webapp/src/main/webapp/dashboard/_costStatus.zul:52 +#: libreplan-webapp/src/main/webapp/dashboard/_costStatus.zul:55 msgid "Remaining time" msgstr "Temps que resta" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:88 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:97 msgid "Company logo URL" msgstr "URI del logotip de l'empresa" @@ -1358,16 +1390,16 @@ msgstr "URI del logotip de l'empresa" msgid "No worker selected" msgstr "No s'han seleccionats treballadors" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:224 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:242 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:233 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:251 msgid "Number of digits" msgstr "Nombre de dígits" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportQueryController.java:294 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportQueryController.java:290 msgid "Task not found" msgstr "Tasca no trobada" -#: libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java:136 +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java:149 msgid "company code cannot contain whitespaces" msgstr "codi d'empresa no pot tenir espais en blanc" @@ -1380,11 +1412,11 @@ msgstr "Capacitat total" msgid "Problems connecting with client web service" msgstr "Problemes connectat amb el web service del client" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:718 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:720 msgid "" "You cannot remove the task \"{0}\" because it has work reported on it or any" " of its children" -msgstr "no es pot eliminar la tasca \"{0}\" perquè ella o alguna de les tasques filles conté informes de trebrall" +msgstr "no es pot eliminar la tasca \"{0}\" perquè ella o alguna de les tasques filles conté informes de treball" #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:169 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:198 @@ -1404,21 +1436,21 @@ msgstr "Llista de perfils" msgid "both {0} of category {1} and {2} of category {3} have the same code" msgstr "totes dues {0} de la categoria {1} i{2} de la categoria {3} tenen el mateix codi" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1082 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1096 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:226 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:703 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:606 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:709 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:608 #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:336 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:76 #: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:46 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:50 #: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:50 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:138 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:147 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:56 msgid "Labels" msgstr "Etiquetes" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:438 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:441 msgid "Queue-based resource assignation" msgstr "Assignació de recursos basat en cues" @@ -1431,11 +1463,7 @@ msgstr "Data final comunicada per el subcontractista." msgid "New timesheet" msgstr "Nou full d'hores" -#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:39 -msgid "Data" -msgstr "Data" - -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:152 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportQueryController.java:374 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:195 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:68 msgid "Total hours" @@ -1445,20 +1473,20 @@ msgstr "Hores totals" msgid "Reassigning {0} projects" msgstr "Reassignació {0} projectes" +#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:39 +msgid "Data" +msgstr "Data" + #: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:57 msgid "Filter by task status" msgstr "Filtre per l'estat de les tasques" -#: libreplan-webapp/src/main/webapp/dashboard/_costStatus.zul:75 -msgid "BAC (Budget At Completion)" -msgstr "BAC (Budget At Completion)" - -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:490 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:491 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:418 msgid "Select date" msgstr "Seleccioneu data" -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractedTaskData.java:264 +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractedTaskData.java:265 msgid "state not specified" msgstr "Estat no especificat" @@ -1522,13 +1550,13 @@ msgstr "Activació de períodes" #: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:32 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:76 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:138 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:168 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:177 msgid "Calendar" msgstr "Calendari" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:355 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:357 #: libreplan-webapp/src/main/webapp/dashboard/_dashboardfororder.zul:76 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:148 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:157 msgid "Resources" msgstr "Recursos" @@ -1545,7 +1573,7 @@ msgstr "Lectura" #: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/TransferOrdersModel.java:153 msgid "Source and destination scenarios should be different" -msgstr "Els escanaris d'origen i destí han de ser diferents" +msgstr "Els escenaris d'origen i destí han de ser diferents" #: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:33 msgid "Overallocated" @@ -1560,7 +1588,7 @@ msgid "scenario" msgstr "escenari" #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:52 -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:59 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:58 #: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:42 #: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:42 #: libreplan-webapp/src/main/webapp/orders/_orderFilter.zul:29 @@ -1571,13 +1599,13 @@ msgstr "a" msgid "worker's first name not specified" msgstr "Nom del treballador no assignat" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1412 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1411 msgid "End date can only be deleted in the the last activation" msgstr "Data finalització només pot ser eliminada en l'última activació" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:354 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:363 msgid "Property strategy" -msgstr "Detalls de l'estrategia" +msgstr "Detalls de l'estratègia" #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:107 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:276 @@ -1628,7 +1656,7 @@ msgid "Last name" msgstr "Cognoms" #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:382 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/Util.java:575 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/Util.java:580 msgid "Remove" msgstr "Treure" @@ -1652,7 +1680,7 @@ msgstr "Tipus progrés" msgid "name not specified or empty" msgstr "nom buit o no especificat" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1304 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1301 msgid "Task contains consolidated progress. Cannot apply sigmoid function." msgstr "Les tasques contenen progrés consolidat. No es pot aplicar la funció sigmoid." @@ -1664,7 +1692,7 @@ msgstr "Data no pot incloure la següent setmana de treball" msgid "LibrePlan: Virtual Worker Groups" msgstr "LibrePlan: Grups de Treballadors Virtuals" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:324 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:333 msgid "UserId" msgstr "Usuari ID" @@ -1683,11 +1711,11 @@ msgstr "Data d'inici no és vàlida, la nova data d'inici ha de ser prèvia a la msgid "Create New Project" msgstr "Crear un nou projecte" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1439 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1436 msgid "Stretches list" msgstr "Llista trams" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:314 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:313 msgid "to {0}" msgstr "a {0}" @@ -1711,11 +1739,11 @@ msgstr "Zoom" #: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:64 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:94 #: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:131 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:185 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:183 #: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:125 -#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:136 #: libreplan-webapp/src/main/webapp/myaccount/changePassword.zul:89 #: libreplan-webapp/src/main/webapp/myaccount/settings.zul:127 +#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:133 #: libreplan-webapp/src/main/webapp/profiles/_editProfile.zul:70 #: libreplan-webapp/src/main/webapp/unittypes/unitTypes.zul:41 #: libreplan-webapp/src/main/webapp/calendars/calendars.zul:46 @@ -1728,28 +1756,28 @@ msgstr "Zoom" #: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:48 #: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:59 #: libreplan-webapp/src/main/webapp/typeofworkhours/_editTypeOfWorkHours.zul:77 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:399 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:408 msgid "Save" msgstr "Desar" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractController.java:156 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractController.java:147 msgid "" "It will only be possible to add a Deliver Date if all the deliver date " "exiting in the table have a CommunicationDate not empty. " -msgstr "Només serà possible afegir una data de lliurament si totes les dates de lliurament existents en la taula tenen un data de communicació que no sigui buida. " +msgstr "Només serà possible afegir una data de lliurament si totes les dates de lliurament existents en la taula tenen un data de comunicació que no sigui buida. " #: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:34 #: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:72 msgid "Standard Effort" msgstr "Esforç base" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:158 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:167 msgid "Material categories" msgstr "Categories dels materials" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:284 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:587 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:685 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:285 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:588 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:686 msgid "number of digits must be between {0} and {1}" msgstr "El número ha d'estar entre {0} i {1}" @@ -1768,7 +1796,7 @@ msgstr "Requisits dels criteris" #: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineConfigurationController.java:158 msgid "Criterion previously selected" -msgstr "Criteri previament seleccionat" +msgstr "Criteri prèviament seleccionat" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:909 msgid "" @@ -1776,7 +1804,7 @@ msgid "" "progress assignment from root task" msgstr "Propagació del progrés no pot ser modificat si hi ha una consolidació en l'assignació de la tasca arrel" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:316 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:313 msgid "Schedule from deadline to start" msgstr "Programació des de la data de termini i la d'inici" @@ -1789,10 +1817,6 @@ msgstr "Autoritzacions del usuaris" msgid "Problems connecting with subcontractor web service" msgstr "Problemes connectant amb el web service del subcontractista" -#: libreplan-webapp/src/main/webapp/myaccount/_monthlyTimesheetsArea.zul:22 -msgid "Monthly timesheets" -msgstr "Full d'hores mensual" - #: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:377 msgid "Delete template. Are you sure?" msgstr "Eliminar plantilla, està segur" @@ -1801,12 +1825,12 @@ msgstr "Eliminar plantilla, està segur" msgid "Expense date" msgstr "Data despesa" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:236 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:245 msgid "Entity type" msgstr "Tipus d'entitat" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1069 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:237 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1071 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:234 msgid "Unsaved changes will be lost. Are you sure?" msgstr "Canvis no desats es perdran, estàs segur?" @@ -1854,15 +1878,16 @@ msgstr "Expandir / Contraure tot" msgid "Overload due to current project" msgstr "Sobrecàrrega deguda al projecte actual" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1054 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1068 msgid "Name: {0}" msgstr "Nom: {0}" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1108 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1112 msgid "Move down" msgstr "Avall" #: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:118 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/ProjectStatusReportController.java:83 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:139 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:113 msgid "Please, select a project" @@ -1880,9 +1905,13 @@ msgstr "Full de despeses" msgid "Report structure" msgstr "Informe d'estructura" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:99 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:100 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:362 +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:523 +msgid "resource has to be bound to a user in personal timesheets" +msgstr "recurs està obligat per un usuari en full de treball personal" + +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:101 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:102 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:372 #: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionType.java:139 msgid "Yes" msgstr "Sí" @@ -1891,7 +1920,7 @@ msgstr "Sí" msgid "Go to user edition window" msgstr "Anar a la finestra d'edició d'usuari" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:385 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:392 #: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:46 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:44 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:157 @@ -1924,7 +1953,7 @@ msgstr "Calcular el nombre d'hores" msgid "Assign" msgstr "Assignar" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1283 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1276 msgid "Create Template" msgstr "Crear plantilla" @@ -1942,7 +1971,7 @@ msgid "last expense sheet line sequence code not specified" msgstr "L'últim codi de seqüència en la línia del full de despeses no s'ha especificat" #: libreplan-webapp/src/main/java/org/libreplan/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:149 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:840 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:837 msgid "Not enough permissions to edit this project" msgstr "No té permisos per a editar el projecte" @@ -1959,21 +1988,26 @@ msgstr "Cerca avançada" msgid "Filter by labels" msgstr "Filtrar per etiqueta" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:639 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:642 msgid "" "IMPORTANT: Don't forget to communicate to subcontractor that his contract " "has been cancelled" msgstr "IMPORTANT: No s'oblidi de comunicar a la subcontractista que el contracte s'ha cancel·lat" +#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:36 +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:82 +msgid "Project Status Report" +msgstr "Informe d’estat del projecte" + #: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:36 msgid "MonteCarlo chart" msgstr "Gràfic de Montecarlo" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:251 msgid "Schedule Variance" -msgstr "Programació variança" +msgstr "Programació variància" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:676 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:675 msgid "resources per day cannot be empty or less than zero" msgstr "recursos diaris no poden ser buits o menors que zero" @@ -1981,7 +2015,7 @@ msgstr "recursos diaris no poden ser buits o menors que zero" msgid "Criterion cannot be empty" msgstr "Criteri no pot ser buit" -#: libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java:131 +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java:144 msgid "company code not specified" msgstr "codi d'empresa no especificat" @@ -2002,9 +2036,9 @@ msgstr "Camps d'índex i etiquetes han de ser únics i consecutius" #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:103 #: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:391 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/AdvancedAllocationTaskController.java:73 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:571 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:609 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:640 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:574 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:612 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:643 #: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:155 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:150 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:472 @@ -2065,7 +2099,7 @@ msgstr "Tipus d'assignació" msgid "Duration (days)" msgstr "Duració (dies)" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:417 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:424 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:69 msgid "Send To Subcontractors" msgstr "Enviar a subcontractistes" @@ -2086,7 +2120,7 @@ msgstr "Tipus d'etiqueta ja assignat" msgid "Timesheets Template" msgstr "Plantilla de full d'hores" -#: libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java:144 +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java:157 msgid "host not specified" msgstr "\"host\"/amfitrió no especificat" @@ -2094,7 +2128,7 @@ msgstr "\"host\"/amfitrió no especificat" msgid "percentages in quality form items must be unique" msgstr "el percentatge en els ítems dels formularis de qualitat ha de ser únic" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:445 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:443 msgid "Edit queue-based resource element" msgstr "Editar elements dels recursos basats en cua" @@ -2107,13 +2141,13 @@ msgstr "Cost de despesa" msgid "" "Value is not valid.\n" " Code cannot contain chars like '_'." -msgstr "El valor no és vàlid.\n El codi no pot contenir caracters com '_'." +msgstr "El valor no és vàlid.\n El codi no pot contenir caràcters com '_'." #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:73 msgid "Node without children" msgstr "Node sense fills" -#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:152 +#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:141 #: libreplan-webapp/src/main/webapp/subcontract/subcontractorCommunications.zul:56 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:49 msgid "Company" @@ -2149,7 +2183,7 @@ msgstr "Cognom" msgid "calendars with zero hours are not allowed" msgstr "no es permeten calendaris amb cero hores" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:744 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:745 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:392 #: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:170 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:118 @@ -2161,8 +2195,8 @@ msgstr "no es permeten calendaris amb cero hores" #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:43 #: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:43 #: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:43 -#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:50 -#: libreplan-webapp/src/main/webapp/myaccount/_monthlyTimesheetsArea.zul:28 +#: libreplan-webapp/src/main/webapp/myaccount/_personalTimesheetsArea.zul:28 +#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:50 #: libreplan-webapp/src/main/webapp/subcontract/subcontractorCommunications.zul:69 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:46 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:69 @@ -2185,20 +2219,20 @@ msgstr "Afegir des de les plantilles" msgid "Expense Sheets List" msgstr "Llista de fulls de despeses" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:570 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:608 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:573 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:611 msgid "Assigned resources for this task will be deleted. Are you sure?" msgstr "S'eliminaren els recursos assignats en aquesta tasca, està segur?" #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:43 msgid "Filter by month" -msgstr "Filtre per mens" +msgstr "Filtre per mes" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:156 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:153 msgid "The code is not valid. There is another unit type with the same code" msgstr "El codi no és vàlid. Existeix una altre tipus d'unitat amb el mateix codi" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:259 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:268 msgid "Enable LDAP authentication" msgstr "Activar l'autenticació LDAP" @@ -2224,7 +2258,7 @@ msgid "Cannot calculate charts for current data" msgstr "No es pot calcular gràfic per la data actual" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:172 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1512 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1505 msgid "project name already being used" msgstr "el nom del projecte ja està en ús" @@ -2247,6 +2281,7 @@ msgstr "el percentatge ha de ser únic" #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:182 #: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:183 +#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:89 #: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:222 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:212 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:90 @@ -2277,6 +2312,10 @@ msgstr "Etiqueta" msgid "price cost not specified" msgstr "preu de cost no especificat" +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:218 +msgid "Task Completation Lead/Lag" +msgstr "Tasca complerta Avanç / Lag" + #: libreplan-webapp/src/main/webapp/users/_editUser.zul:126 #: libreplan-webapp/src/main/webapp/profiles/_editProfile.zul:51 msgid "Association with roles" @@ -2313,7 +2352,7 @@ msgstr "Dies des de l'inici fins la data de termini" msgid "Estimate At Completion" msgstr "Estimació a la conclusió" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportQueryController.java:266 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportQueryController.java:262 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:78 msgid "Indirect" msgstr "Indirecte" @@ -2326,14 +2365,18 @@ msgstr "data d'inici del cost d'assignació no especificada" msgid "No tasks available yet" msgstr "No n'hi tasques disponibles" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportQueryController.java:263 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1200 +#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:76 +msgid "Output format:" +msgstr "Format de sortida:" + +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportQueryController.java:259 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1199 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/CriterionRequirementWrapper.java:45 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:77 msgid "Direct" msgstr "Directe" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:822 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:823 #: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:104 #: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:51 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:86 @@ -2360,12 +2403,12 @@ msgstr "Treball setmanal" msgid "Please select a source scenario" msgstr "Si us plau, seleccioneu un escenari d'origen" -#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:28 +#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:27 #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:47 msgid "Company ID" msgstr "Empresa ID" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1589 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1582 msgid "" "It will only be possible to add an end date if all the exiting ones in the " "table have already been sent to the customer." @@ -2381,8 +2424,8 @@ msgstr "Entitat de seqüències" #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:768 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:408 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:236 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:677 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1321 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:679 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1314 msgid "must be after start date" msgstr "ha de ser després de la data d'inici" @@ -2401,7 +2444,7 @@ msgstr "Endarreriment des de l’inici (dies)" msgid "Total Hours" msgstr "Hores totals" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:389 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:398 msgid "LibrePlan Role" msgstr "LibrePlan \"Role\"" @@ -2409,24 +2452,20 @@ msgstr "LibrePlan \"Role\"" msgid "Must start after (days since project start)" msgstr "Ha de començar després (dies des de l'inici de projecte)" -#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:37 -msgid "Create Progress Type" -msgstr "Crear tipus de progrés" - #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionController.java:129 msgid "Confirm cancel" msgstr "Confirmar cancel·lació" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:468 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:470 #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:39 msgid "Work And Progress Per Task" msgstr "Progrés i treball per tasca" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1536 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1529 msgid "project code already being used" msgstr "Codi de projecte en ús" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:186 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:191 msgid "The {0} sequence prefixes cannot be repeated" msgstr "El {0} prefix de la seqüència no pot estar repetit" @@ -2438,15 +2477,15 @@ msgstr "tipus no especificat" msgid "WBS (tasks)" msgstr "WBS (tasques)" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:712 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:713 msgid "Deleting sequence" msgstr "Esborrar seqüència" -#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:104 +#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:104 msgid "Total extra" msgstr "Total extra" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:432 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:439 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:72 msgid "Received From Customers" msgstr "Rebut dels clients" @@ -2463,7 +2502,7 @@ msgstr "LibrePlan: Plantilles" msgid "Edit Virtual Workers Group: {0}" msgstr "Editar grup de treballadors virtuals: {0}" -#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:88 +#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:88 msgid "Total other" msgstr "Total altres" @@ -2479,12 +2518,12 @@ msgstr "LibrePlan: Despesa" msgid "Maximum/minimum of worked hours in finished applications" msgstr "Màxim/mínim d'hores treballades en l'aplicació finalitzada" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:333 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:331 msgid "Scheduling saved" msgstr "Programació desada" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:708 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:854 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:710 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:851 msgid "" "You can not remove the project \"{0}\" because this one has imputed expense " "sheets." @@ -2546,7 +2585,7 @@ msgstr "LibrePlan: Empreses" msgid "Queue-based" msgstr "Basat en cues" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:304 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:303 msgid "Derived of calendar {0}" msgstr "Derivat del calendari {0}" @@ -2555,7 +2594,7 @@ msgstr "Derivat del calendari {0}" msgid "Deliver date" msgstr "Data de lliurament" -#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:232 +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:235 msgid "" "Days Interval (Calculated as task completion end date minus estimated end " "date)" @@ -2585,11 +2624,11 @@ msgstr "Empresa externa" #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:68 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:28 -#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:32 +#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:34 #: libreplan-webapp/src/main/webapp/users/_editUser.zul:140 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:162 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:160 #: libreplan-webapp/src/main/webapp/profiles/_editProfile.zul:61 -#: libreplan-webapp/src/main/webapp/profiles/_listProfiles.zul:27 +#: libreplan-webapp/src/main/webapp/profiles/_listProfiles.zul:28 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:44 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:68 #: libreplan-webapp/src/main/webapp/typeofworkhours/_listTypesOfWorkHours.zul:30 @@ -2604,7 +2643,7 @@ msgstr "Excepcions" msgid "User settings" msgstr "Configuració d'usuari" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:800 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:801 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:110 msgid "Start hour" msgstr "Hora d'inici" @@ -2628,7 +2667,7 @@ msgstr "el format dels filtres no és vàlid" msgid "LibrePlan: Project Costs" msgstr "LibrePlan: Cost de projecte" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:292 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:294 msgid "Set Code as autogenerated to create a new project from templates" msgstr "Establir codi com autogenerat per a crear un nou projecte des de les plantilles" @@ -2645,11 +2684,11 @@ msgstr "Usuari limitat" msgid "Unallocated name" msgstr "Nom no localitzat" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1129 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1133 msgid "Move up" msgstr "Pujar" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:256 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:281 msgid "Password cannot be empty" msgstr "La paraula de pas no pot estar buida" @@ -2671,7 +2710,7 @@ msgstr "Crear {0}" msgid "Already exists another template with the same name" msgstr "Ja existeix una altra plantilla amb el mateix nom" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:221 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:220 msgid "Unlimited" msgstr "Il·limitat" @@ -2691,15 +2730,15 @@ msgstr "Pàgina amunt" msgid "Create new project" msgstr "Crear un nou projecte" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:766 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:767 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:362 msgid "date in the future" msgstr "data cap a el futur" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1063 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1077 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:31 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:31 -#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:57 +#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:56 #: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:51 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:104 #: libreplan-webapp/src/main/webapp/orders/_list.zul:35 @@ -2714,7 +2753,7 @@ msgstr "Ha de començar després" msgid "Fully, Partially or Unscheduled. (Drag and drop to move tasks)" msgstr "Complert, parcialment o sense programació. (Arrossega i desa per a moure la tasca)" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1315 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1312 msgid "Confirm change" msgstr "Confirmar modificacions" @@ -2733,19 +2772,19 @@ msgstr "Codi ja està inclòs dins dels codis d'hores de grup" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:131 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:303 #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:296 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:524 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:531 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:47 msgid "Planning" msgstr "Planificació" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:364 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:367 msgid "" "The task has got progress consolidations. To change resource allocation type" " all consolidations must be removed before" -msgstr "La tasca no té consolidació de progrés. Canviar el tipus d'assignació de recurs, previament, s'han de treure totes les consolidacions" +msgstr "La tasca no té consolidació de progrés. Canviar el tipus d'assignació de recurs, prèviament, s'han de treure totes les consolidacions" #: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ReportAdvancesController.java:199 -#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksController.java:218 +#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksController.java:207 msgid "Send" msgstr "Enviar" @@ -2762,7 +2801,7 @@ msgstr "LibrePlan: Materials" msgid "New task" msgstr "Nova tasca" -#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:31 +#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:30 msgid "Associated user" msgstr "Usuari associat" @@ -2770,7 +2809,7 @@ msgstr "Usuari associat" msgid "Type name" msgstr "Nom de tipus" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportQueryController.java:254 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportQueryController.java:250 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/TimeLineRequiredMaterialController.java:207 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:181 #: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:728 @@ -2786,7 +2825,7 @@ msgstr "Tot" msgid "Progress assignment" msgstr "Assignació de progrés" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:463 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:461 #: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:77 msgid "Manual" msgstr "Manual" @@ -2795,7 +2834,7 @@ msgstr "Manual" msgid "You cannot remove the default scenario \"{0}\"" msgstr "No es pot eliminar l'escenari per defecte \"{0}\"" -#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:176 +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:179 #: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskDeadlineViolationStatusEnum.java:36 msgid "On schedule" msgstr "En planificació" @@ -2816,14 +2855,14 @@ msgstr "Detalls personals" msgid "Workers List" msgstr "Llista de treballadors" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1198 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1197 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/CriterionRequirementWrapper.java:48 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:229 msgid "Inherited" msgstr "Heretat" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:521 -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:599 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:519 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:597 msgid "" "Cannot allocate selected element. There is not any queue that matches " "resource allocation criteria at any interval of time" @@ -2849,7 +2888,7 @@ msgstr "Usuari limitat a altre treballador" msgid "criterion name not specified" msgstr "Nom de criteri no especificat" -#: libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java:154 +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java:167 msgid "port not specified" msgstr "por no especificat" @@ -2861,18 +2900,25 @@ msgstr "Calendari no especificat" msgid "Start hour cannot be greater than finish hour" msgstr "Hora d'inici no pot ser més gran que l'hora de finalització" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:504 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:511 msgid "Preferences" msgstr "Preferències" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:366 -msgid "Role property" -msgstr "Detall de \"Role\"" +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:680 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:689 +msgid "" +"There are unsaved changes in the current personal timesheet, please save " +"before moving" +msgstr "Hi ha canvis no desats en el full de treball personal, si us plau, desar-ho abans de moure" #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:25 msgid "Manual allocation" msgstr "Assignació manual" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:375 +msgid "Role property" +msgstr "Detall de \"Role\"" + #: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceAssignment.java:75 msgid "progress type not specified" msgstr "Tipus de progrés no especificat" @@ -2902,7 +2948,7 @@ msgstr "Mesura de progrés no pot ser eliminat. Mesura de progrés consolidada" msgid "Recommended allocation" msgstr "Assignació recomanada" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:258 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:267 msgid "Activation" msgstr "Activació" @@ -2914,7 +2960,7 @@ msgstr "Progrés calculat no pot ser eliminat" msgid "Materials saved" msgstr "Materials desats" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:456 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:458 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:39 msgid "Total Worked Hours By Resource In A Month" msgstr "Hores totals treballades per recurs en un mes" @@ -2923,7 +2969,7 @@ msgstr "Hores totals treballades per recurs en un mes" msgid "LibrePlan: Access Forbidden" msgstr "LibrePlan: Accés prohibit" -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadModel.java:672 +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadModel.java:684 msgid "Other projects" msgstr "Altres projectes" @@ -2943,11 +2989,11 @@ msgstr "Codi no pot ser buit" msgid "Template cannot be removed because it has applications" msgstr "Plantilla no pot ser eliminada perquè té assignacions" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:182 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:187 msgid "At least one {0} sequence must be active" msgstr "Al menys una {0} seqüència ha d'estar activa" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:161 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:159 #: libreplan-webapp/src/main/webapp/profiles/_listProfiles.zul:26 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:42 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:66 @@ -2962,12 +3008,12 @@ msgstr "satisfacció de criteri amb data de finalització abans que d'inici" msgid "Disable Delete" msgstr "Inhabilitar elimina" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:474 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:476 #: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:39 msgid "Estimated/Planned Hours Per Task" msgstr "Hores Estimades/Planificades per tasca" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:177 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:182 msgid "At least one {0} sequence is needed" msgstr "Al menys una {0} seqüència es necessària" @@ -2979,11 +3025,11 @@ msgstr "LibrePlan: Categories de costos" msgid "Assigned" msgstr "Assignat" -#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:96 +#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:96 msgid "Total capacity" msgstr "Capacitat total" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:261 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:270 msgid "Use LDAP roles" msgstr "Utilitzar \"roles\" de LDAP" @@ -3002,6 +3048,10 @@ msgstr "Error: {0}" msgid "More options" msgstr "Més opcions" +#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:21 +msgid "LibrePlan: Personal timesheet" +msgstr "LibrePlan: Full de treball personal" + #: libreplan-webapp/src/main/java/org/libreplan/web/orders/TreeElementOperationsController.java:244 msgid "Confirm create template" msgstr "Confirmar crear plantilla" @@ -3014,17 +3064,11 @@ msgstr "Quantitat de treball" msgid "Parent" msgstr "Pares" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:36 -msgid "" -"Password cannot be managed for LDAP users because LDAP authentication is " -"being used" -msgstr "La paraula de pas no pot ser gestionada pels usuaris LDAP perquè l'autenticació LDAP està sent utilitzada" - #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:91 msgid "Earliest date" msgstr "Primera data" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:506 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:513 msgid "Change Password" msgstr "Modificar paraula de pas" @@ -3037,8 +3081,8 @@ msgstr "LibrePlan: Treball i progrés per tasca" msgid "Projects" msgstr "Projectes" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1070 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:238 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1072 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:235 msgid "Confirm exit dialog" msgstr "Diàleg de confirmació de sortida" @@ -3060,14 +3104,14 @@ msgstr "Codi de subcontractació" msgid "Material assignments" msgstr "Assignació de materials" -#: libreplan-business/src/main/java/org/libreplan/business/common/entities/EntitySequence.java:102 +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/EntitySequence.java:101 msgid "last value not specified" msgstr "Últim valor no especificat" #: libreplan-business/src/main/java/org/libreplan/business/expensesheet/entities/ExpenseSheetLine.java:110 #: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:176 #: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/TaskQualityForm.java:72 -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractedTaskData.java:120 +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractedTaskData.java:121 msgid "task not specified" msgstr "tasca no especificada" @@ -3075,6 +3119,12 @@ msgstr "tasca no especificada" msgid "Change password" msgstr "Modificar paraula de pas" +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:38 +msgid "" +"Password cannot be managed for LDAP users because LDAP authentication is " +"enabled." +msgstr "Paraula de pas no pot ser manegada per LDAP perquè l’autenticació d’usuaris en LDAP està habilitada." + #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1306 msgid "" "Progress measurement cannot be canged to {0}, because it is consolidated" @@ -3088,7 +3138,7 @@ msgstr "Camp de text" msgid "Question" msgstr "Qüestió" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:135 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:133 msgid "" "The meausure name is not valid. There is another unit type with the same " "measure name" @@ -3139,9 +3189,9 @@ msgstr "el tipus de recurs no permet criteris actius" #: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/TransferOrdersModel.java:148 msgid "Please, select a destination scenario" -msgstr "Si us plau, seleccioner un escenari de destí" +msgstr "Si us plau, seleccioneu un escenari de destí" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1061 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1063 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/assigntemplates/TemplateFinderPopup.java:126 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:116 #: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:97 @@ -3159,9 +3209,9 @@ msgstr "Si us plau, seleccioner un escenari de destí" #: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:42 #: libreplan-webapp/src/main/webapp/planner/order.zul:131 #: libreplan-webapp/src/main/webapp/planner/order.zul:166 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:189 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:187 #: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:129 -#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:142 +#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:139 #: libreplan-webapp/src/main/webapp/profiles/_editProfile.zul:74 #: libreplan-webapp/src/main/webapp/unittypes/unitTypes.zul:43 #: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:58 @@ -3175,11 +3225,11 @@ msgstr "Si us plau, seleccioner un escenari de destí" #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:135 #: libreplan-webapp/src/main/webapp/typeofworkhours/_editTypeOfWorkHours.zul:81 #: libreplan-webapp/src/main/webapp/common/layout/template.zul:104 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:402 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:411 msgid "Cancel" msgstr "Cancel·lar" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:39 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:36 msgid "General user data" msgstr "Dades generals d'usuari" @@ -3187,7 +3237,7 @@ msgstr "Dades generals d'usuari" msgid "Unschedule" msgstr "Sense programació" -#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksController.java:227 +#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksController.java:216 msgid "Subcontracted task sent successfully" msgstr "Tasca subcontractada enviada correctament" @@ -3195,17 +3245,13 @@ msgstr "Tasca subcontractada enviada correctament" msgid "Accumulated hours chart" msgstr "Gràfic d'hores acumulades" -#: libreplan-webapp/src/main/webapp/dashboard/_costStatus.zul:70 -msgid "EAC (Estimate At Completion)" -msgstr "EAC (Estimate At Completion)" - #: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:22 msgid "Machines List" msgstr "Llista de màquines" #: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:325 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:694 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:907 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:691 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:904 msgid "You don't have read access to this project" msgstr "No en té accés de lectura per aquest projecte" @@ -3256,9 +3302,9 @@ msgstr "descripció del valor: el full d'hores li falta algun camp de descripci msgid "Create new Workweek" msgstr "Crear nova setmana de treball" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:103 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:112 msgid "Autocomplete login form" -msgstr "Formulari de identenficicació d'autocompletar" +msgstr "Formulari d'identificació d'autocompletar" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesCommand.java:61 msgid "Task Properties" @@ -3292,11 +3338,11 @@ msgstr "{0} (màxim: {1})" msgid "Cost Category" msgstr "Categoria de cost" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:490 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:492 msgid "end" msgstr "fi" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:373 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:382 msgid "Role search query" msgstr "Consulta per cercar \"role\"" @@ -3329,7 +3375,7 @@ msgstr "Editar tasca {0}" msgid "LibrePlan: Timesheets" msgstr "LibrePlan: Full d'hores" -#: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:216 +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:231 msgid "username is already being used by another user" msgstr "el nom d'usuari ja s'està utilitzant per un altre usuari" @@ -3337,8 +3383,8 @@ msgstr "el nom d'usuari ja s'està utilitzant per un altre usuari" msgid "references" msgstr "referències" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractController.java:149 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1582 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractController.java:140 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1575 msgid "You must select a valid date. " msgstr "Seleccioneu una data vàlida." @@ -3368,13 +3414,13 @@ msgstr "Màxim valor per defecte" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:36 msgid "Add criterion requirement" -msgstr "Afegir requisisit al criteri" +msgstr "Afegir requisit al criteri" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:146 msgid "Percentage of estimated budget hours / hours consumed" msgstr "Percentatge del pressupost d'hores estimades / hores consumides" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:502 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:500 msgid "Automatic" msgstr "Automàtic" @@ -3382,14 +3428,13 @@ msgstr "Automàtic" msgid "Criterion Name" msgstr "Nom del criteri" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:768 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetController.java:561 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:769 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:563 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementBandboxFinder.java:52 #: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:127 #: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:167 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:193 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:93 -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:146 #: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:23 #: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:139 #: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:48 @@ -3409,11 +3454,11 @@ msgstr "LibrePlan: modificar paraula de pas" msgid "please, select a label" msgstr "si us plau, seleccioneu una etiqueta" -#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/GlobalProgressChart.java:57 +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/GlobalProgressChart.java:58 msgid "Expected" msgstr "Esperat" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:155 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:153 msgid "Add profile" msgstr "Afegir perfil" @@ -3447,7 +3492,7 @@ msgstr "valors no són vàlids i/o no poden ser null" msgid "Apply changes and go back to scheduling" msgstr "Aplicar modificacions i tornar a la planificació" -#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/GlobalProgressChart.java:42 +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/GlobalProgressChart.java:60 #: libreplan-business/src/main/java/org/libreplan/business/common/entities/ProgressType.java:36 msgid "Spreading progress" msgstr "Propagació progrés" @@ -3464,9 +3509,11 @@ msgid "cost assignment's resource not specified" msgstr "Assignació de cost de recurs no especificat" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:1091 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetController.java:557 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:559 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementBandboxFinder.java:51 #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:66 +#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:40 +#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:51 #: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:47 #: libreplan-webapp/src/main/webapp/myaccount/_myTasksArea.zul:31 #: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:138 @@ -3474,7 +3521,7 @@ msgstr "Assignació de cost de recurs no especificat" msgid "Project" msgstr "Projecte" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:374 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:371 msgid "" "Starting date cannot be empty because there is a task with constraint \"as " "soon as possible\"" @@ -3490,7 +3537,7 @@ msgid "" "already been reported to the customer" msgstr "Assignació avançada no es pot eliminar com si tingues mesures avançades que s'han informat al client" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetController.java:373 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:376 msgid "Extra" msgstr "Extra" @@ -3498,7 +3545,7 @@ msgstr "Extra" msgid "Unassigned" msgstr "Sense assignar" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1594 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1587 msgid "It already exists a end date with the same date. " msgstr "Ja existeix una data de finalització amb la mateixa data. " @@ -3522,17 +3569,13 @@ msgstr "Modificar la paraula de pas" msgid "label code is already being used" msgstr "Codi d'etiqueta ja està en ús" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:72 -msgid "Hours type for monthly timesheets" -msgstr "Tipus d'hores pel full d'hores mensual" - #: libreplan-webapp/src/main/webapp/materials/materials.zul:87 -#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:28 +#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:29 #: libreplan-webapp/src/main/webapp/users/_editUser.zul:78 msgid "Disabled" msgstr "Inhabilitat" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:707 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:708 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:324 msgid "Earned value" msgstr "Valor guanyat" @@ -3546,7 +3589,7 @@ msgstr "Esforç d'hores extraordinàries" msgid "Inherited from parent calendar" msgstr "Heretat del calendari pare" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportQueryController.java:342 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportQueryController.java:338 msgid "You do not have permissions to edit this timesheet" msgstr "No teniu permís per a editar aquest full d'hores" @@ -3567,15 +3610,15 @@ msgid "" msgstr "Les plantilles només es poden crear fora de les tasques existents. Està creant una plantilla fora d'una nova tasca.⏎ Si us plau deseu el projecte abans de continuar." #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:66 -#: libreplan-webapp/src/main/webapp/myaccount/_monthlyTimesheetsArea.zul:33 +#: libreplan-webapp/src/main/webapp/myaccount/_personalTimesheetsArea.zul:33 msgid "Total work" msgstr "Treball total" -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:1432 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:1445 msgid "a quality form cannot be assigned twice to the same task" msgstr "un formulari de qualitat no es pot assignar dos cops a la mateixa tasca" -#: libreplan-business/src/main/java/org/libreplan/business/common/entities/EntitySequence.java:146 +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/EntitySequence.java:145 msgid "number of digits out of range" msgstr "nombre de dígits fora del rang" @@ -3589,7 +3632,7 @@ msgstr "El codi de les línies del full d'hores ha de ser únic." msgid "Calendar Exception Days" msgstr "Excepció al calendari de dies" -#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:115 +#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:114 msgid "Time tracking" msgstr "Temps de seguiment" @@ -3599,19 +3642,11 @@ msgid "" " review it or click in the following link in order to go to initial page: " msgstr "En cas que hagi introduït la URL directament al navegador, si us plau, premeu el següent enllaç per anar-hi a la pàgina inicial" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1267 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1282 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1281 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1296 msgid "{0} not supported yet" msgstr "{0} no suportada" -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:151 -msgid "Total tasks" -msgstr "Total de tasques" - -#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:84 -msgid "Total monthly timesheet" -msgstr "Total del full d'hores mensual" - #: libreplan-webapp/src/main/webapp/common/layout/login.zul:144 msgid "is not supported for its use with LibrePlan." msgstr "no és compatible per al seu ús amb LibrePlan." @@ -3628,11 +3663,11 @@ msgstr "Nova entrada" msgid "Resources Load" msgstr "Càrrega de recursos" -#: libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java:174 +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java:187 msgid "userId not specified" msgstr "userId no especificat" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:225 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:226 msgid "Changes have been canceled" msgstr "S'ha cancel·lat les modificacions" @@ -3640,11 +3675,11 @@ msgstr "S'ha cancel·lat les modificacions" msgid "LibrePlan: Planning" msgstr "LibrePlan: planificació" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:188 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:197 msgid "Expense sheets" msgstr "Full de despeses" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:316 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:325 msgid "Authentication" msgstr "Autenticació" @@ -3654,7 +3689,7 @@ msgstr "Seleccioneu llenguatge" #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:104 msgid "Appropriative allocation" -msgstr "Assignació d'apropació" +msgstr "Assignació d'apropament" #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:187 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:186 @@ -3682,9 +3717,9 @@ msgstr "Filtres per criteris" msgid "Max value" msgstr "Valor màxim" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:99 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:100 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:364 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:101 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:102 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:374 #: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionType.java:139 msgid "No" msgstr "No" @@ -3718,11 +3753,11 @@ msgstr "Període" msgid "Spread" msgstr "Propagació" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:974 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:978 msgid "Disabled because of it contains more than one hours group" msgstr "Inhabilitat perquè conté més d'un grup d'hores" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:287 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:312 msgid "Confirm remove user" msgstr "Confirmar esborrar usuari" @@ -3730,7 +3765,7 @@ msgstr "Confirmar esborrar usuari" msgid "Select start date" msgstr "Seleccioneu data d'inici" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:885 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:882 msgid "Removed {0}" msgstr "Eliminat {0}" @@ -3774,7 +3809,7 @@ msgstr "El mateix recurs està assignat dos cops dins un interval" msgid "Value is not valid, the precision value must not be empty" msgstr "El valor no és vàlid, ja que no pot estar buit" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:830 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:831 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:472 msgid "h" msgstr "h" @@ -3815,7 +3850,7 @@ msgstr "Inici" msgid "Add new progress measurement" msgstr "Afegir una nova mesura de progrés" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:532 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:530 msgid "Select for automatic queuing" msgstr "Seleccioneu la cua automàtica" @@ -3831,7 +3866,7 @@ msgstr "Crear i Assignar" msgid "Calculated progress measurements cannot be removed" msgstr "Mesurament de progrés calculat no s'ha pogut eliminar" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1558 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1555 msgid "Not configurable" msgstr "No configurable" @@ -3843,17 +3878,17 @@ msgstr "Full d'hores no especificat" msgid "The length must be greater than 0 and not empty" msgstr "La longitud ha de ser més gran que 0 i no buida" -#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:276 +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:280 msgid "Task Status" msgstr "Estat tasca" -#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:31 +#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:33 #: libreplan-webapp/src/main/webapp/users/_editUser.zul:97 #: libreplan-webapp/src/main/webapp/users/_editUser.zul:109 msgid "Bound resource" msgstr "Recurs limitat" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:178 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:187 msgid "Calendar exception days" msgstr "Excepció al calendari de dies" @@ -3861,7 +3896,7 @@ msgstr "Excepció al calendari de dies" msgid "Advanced allocation" msgstr "Assignació avançada" -#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:243 +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:246 msgid "Estimation deviation on completed tasks" msgstr "Desviació estimada en les tasques completades" @@ -3871,7 +3906,7 @@ msgstr "Desviació estimada en les tasques completades" msgid "Consolidated" msgstr "Consolidat" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:200 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:209 msgid "MonteCarlo method" msgstr "Mètode MonteCarlo" @@ -3897,9 +3932,8 @@ msgstr "LibrePlan: Accés d'usuari" msgid "Customer" msgstr "Client" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:814 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:815 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:116 -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:149 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:34 msgid "Hours type" msgstr "Tipus d'hores" @@ -3918,11 +3952,11 @@ msgid "" "the Main Settings window before." msgstr "El calendari per defecte no es pot eliminar. Si us plau, modifica el calendari per defecte en Configuració General." -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:257 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:258 msgid "Cannot connect to LDAP server" msgstr "No es pot connectar al servidor LDAP" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1520 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1521 msgid "must be before end date" msgstr "ha de ser abans que la data de finalització" @@ -3930,9 +3964,11 @@ msgstr "ha de ser abans que la data de finalització" msgid "Add Exception" msgstr "Afegir excepció" -#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:121 #: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:123 #: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:125 +#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:127 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:128 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:148 #: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:310 #: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:193 #: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:197 @@ -3949,6 +3985,7 @@ msgstr "Afegir excepció" #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:413 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:438 #: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:223 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:952 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:144 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:148 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:205 @@ -3958,9 +3995,9 @@ msgstr "Afegir excepció" #: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:247 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignController.java:143 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:110 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:999 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1189 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1446 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:998 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1188 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1445 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:236 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:348 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:357 @@ -3978,10 +4015,10 @@ msgstr "Afegir excepció" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:126 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:394 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:320 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1505 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1529 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1498 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1522 #: libreplan-webapp/src/main/java/org/libreplan/web/montecarlo/MonteCarloController.java:159 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:749 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:750 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:45 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:53 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:89 @@ -4025,7 +4062,7 @@ msgid "Effort must be greater than zero" msgstr "Esforç ha de ser més gran que 0" #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:50 -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:55 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:54 #: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:40 #: libreplan-webapp/src/main/webapp/orders/_orderFilter.zul:27 msgid "from" @@ -4038,7 +4075,7 @@ msgstr "Capçalera dels camps" #: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:72 #: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:82 msgid "Progress type" -msgstr "Typus de progrés" +msgstr "Tipus de progrés" #: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportType.java:198 msgid "Assigned Label Type cannot be repeated in a Timesheet Template." @@ -4067,7 +4104,7 @@ msgstr "Expandir tasques de grup" #: libreplan-webapp/src/main/webapp/common/layout/template.zul:141 msgid "The admin's account password remains the default one. This is insecure" -msgstr "La paraula de pas per admin és la que està per defecte. Corregiu asquesta situació." +msgstr "La paraula de pas per admin és la que està per defecte. Corregiu aquesta situació." #: libreplan-webapp/src/main/webapp/orders/_ordersTab.zul:33 msgid "Save Project" @@ -4078,8 +4115,8 @@ msgstr "Desar projecte" msgid "Day is not valid" msgstr "Dia no és vàlid" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:628 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1264 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:627 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1263 msgid "You should select a start date for the exception" msgstr "S'ha de seleccionar una data d'inici per a l'excepció" @@ -4107,7 +4144,7 @@ msgstr "LibrePlan: Unitats del material" msgid "Virtual resources cannot be bound to any user" msgstr "Recursos virtuals no es poden limitar a qualsevol usuari" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:497 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:498 msgid "Code sequence is already in use and cannot be updated" msgstr "Codi de seqüència ja està en ús in no es pot actualitzar" @@ -4124,7 +4161,7 @@ msgid "effort not specified" msgstr "esforç no especificat" #: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:94 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:930 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:927 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:443 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:374 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ScenarioBandboxFinder.java:46 @@ -4139,7 +4176,7 @@ msgstr "esforç no especificat" #: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:27 #: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:31 #: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:50 -#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:27 +#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:26 #: libreplan-webapp/src/main/webapp/materials/materials.zul:60 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:43 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:134 @@ -4221,7 +4258,7 @@ msgstr "Segons" msgid "please, select an item" msgstr "si us plau, seleccioneu un ítem" -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:1146 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:1159 msgid "a label can not be assigned twice in the same branch" msgstr "una etiqueta no es pot assignar dos cops en la mateixa branca" @@ -4233,11 +4270,11 @@ msgstr "Dia de la setmana" msgid "Companies List" msgstr "Llista d'empreses" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:437 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:440 msgid "Normal resource assignment" msgstr "Assignació de recurs normal" -#: libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java:119 +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java:132 msgid "default calendar not specified" msgstr "Calendari per defecte no especificat" @@ -4245,34 +4282,29 @@ msgstr "Calendari per defecte no especificat" msgid "indirect progress assignments should have different types" msgstr "l'assignació de progrés indirecte ha de tenir tipus diferents" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1462 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1459 msgid "Stretches with Interpolation" msgstr "Tram amb interpolacions" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:449 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:451 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:39 msgid "Hours Worked Per Resource" msgstr "Hores treballades per recurs" #: libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialInfo.java:39 msgid "material not specified" -msgstr "maetrial no especificat" - -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:149 -msgid "" -"Profiles of LDAP users cannot be managed because LDAP roles are being used." -msgstr "Perfils dels usuaris de LDAP no poden ser gestionats perquè els \"roles\" de LDAP ja estan en ús." +msgstr "material no especificat" #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:26 #: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:36 msgid "Category name" msgstr "Nom de la categoria" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:754 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:755 msgid "Date must be inside visualization area" msgstr "Data ha d'estar dintre de l'àrea de visualització" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:115 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:124 msgid "Show a notification when new LibrePlan versions are released" msgstr "Mostrar notificació quan hi hagi una nova versió de LibrePlan" @@ -4288,7 +4320,7 @@ msgstr "MonteCarlo" msgid "Duration" msgstr "Duració" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:594 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:593 msgid "Exception: {0}" msgstr "Excepció: {0}" @@ -4298,7 +4330,7 @@ msgstr "Configurar paraula de pas" #: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/ExpensesAreaController.java:90 msgid "Delete expense sheet \"{0}\". Are you sure?" -msgstr "Eliminar full de despese \"{0}\". Està segur?" +msgstr "Eliminar full de despesa \"{0}\". Està segur?" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:150 #: libreplan-webapp/src/main/webapp/common/components/schedulingStateToggler.zul:29 @@ -4328,11 +4360,6 @@ msgstr "Connectar" msgid "Concept" msgstr "Concepte" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:128 -msgid "" -"Roles of LDAP users cannot be managed because LDAP roles are being used." -msgstr "\"Roles \" d'usuaris LDAP no poden ser gestionats perquè ja estan en ús." - #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:223 msgid "Allocation: [{0},{1}]" msgstr "Assignació: [{0},{1}]" @@ -4341,11 +4368,11 @@ msgstr "Assignació: [{0},{1}]" msgid "Virtual Workers Group" msgstr "Grup virtual de treballadors" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:209 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:210 msgid "Changes saved" msgstr "Modificacions desades" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1268 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1261 msgid "See scheduling" msgstr "Veure planificació" @@ -4370,7 +4397,7 @@ msgid "Relationship" msgstr "Relacions" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractCommand.java:53 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:439 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:442 #: libreplan-webapp/src/main/webapp/planner/editTask.zul:69 msgid "Subcontract" msgstr "Subcontractar" @@ -4381,26 +4408,22 @@ msgstr "Subcontractar" msgid "End" msgstr "Fi" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:480 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:482 #: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:39 msgid "Project Costs" -msgstr "Costos de projecte" +msgstr "Costos del projecte" #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:531 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:375 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:382 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:63 msgid "Cost Categories" msgstr "Categories de cost" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetController.java:313 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetController.java:582 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:316 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:586 msgid "Other" msgstr "Altres" -#: libreplan-webapp/src/main/webapp/dashboard/_costStatus.zul:37 -msgid "CV (Cost Variance)" -msgstr "CV (Cost Variance)" - #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:313 msgid "criterion type not specified" msgstr "tipus de criteri no especificat" @@ -4413,10 +4436,6 @@ msgstr "preu per defecte no especificat" msgid "timesheet template not specified" msgstr "plantilla de full d'hores no especificada" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:352 -msgid "LDAP" -msgstr "LDAP" - #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:216 msgid "Timesheet removed successfully" msgstr "Full d'hores eliminat correctament" @@ -4425,10 +4444,6 @@ msgstr "Full d'hores eliminat correctament" msgid "Users List" msgstr "Llista d'usuaris" -#: libreplan-webapp/src/main/webapp/dashboard/_costStatus.zul:47 -msgid "CPI (Cost Performance Index)" -msgstr "CPI (Cost Performance Index)" - #: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:27 #: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:56 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:55 @@ -4465,7 +4480,7 @@ msgid "Progress Types" msgstr "Tipus de progrés" #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceFilterEnum.java:29 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:184 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:193 msgid "Cost category" msgstr "Categoria de cost" @@ -4473,7 +4488,7 @@ msgstr "Categoria de cost" msgid "Quality form cannot be removed as it is spreading progress" msgstr "Formularia de qualitat no s'ha pogut eliminar mentre s'està estenen progrés" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:711 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:712 msgid "It can not be deleted. At least one sequence is necessary." msgstr "No s'ha pogut eliminar. Es necessita com a mínim una seqüència." @@ -4519,7 +4534,7 @@ msgstr "Codi de referència de client" msgid "Constraint" msgstr "Restriccions" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:393 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:390 msgid "" "Deadline cannot be empty because there is a task with constraint \"as late " "as possible\"" @@ -4540,21 +4555,21 @@ msgid "Customer reference" msgstr "Referència del client" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:363 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:366 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:712 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:369 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:709 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:160 #: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:316 #: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:326 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:695 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:841 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:899 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:908 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:935 -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:333 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:692 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:838 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:896 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:905 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:932 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:331 msgid "Information" msgstr "Informació" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:934 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:931 msgid "Sorry, you do not have permissions to access this project" msgstr "no té permís d'accés en aquest projecte" @@ -4568,13 +4583,13 @@ msgstr "Treballador desat" #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:35 msgid "Communications To Subcontractors" -msgstr "Comunicaions als subcontractistes" +msgstr "Comunicacions als subcontractistes" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementModel.java:206 msgid "New hours group " msgstr "Nou grup d'hores " -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:464 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:462 msgid "Assign element to queue manually" msgstr "Element assignat a la cua manualment" @@ -4617,7 +4632,7 @@ msgstr "Tipus d'hores" #: libreplan-webapp/src/main/java/org/libreplan/web/montecarlo/MonteCarloController.java:192 msgid "Percentages should sum 100" -msgstr "Percentage ha se sumar 100" +msgstr "Percentatge ha se sumar 100" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:81 msgid "Total task budget" @@ -4637,7 +4652,7 @@ msgstr "Últim valor del mesurament de progrés" #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:21 msgid "LibrePlan: Materials Needs At Date" -msgstr "LibrePlan: Materials necessaria a la data" +msgstr "LibrePlan: Materials necessaris a la data" #: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:44 msgid "Worker assignments" @@ -4675,7 +4690,7 @@ msgstr "ítems no es poden comprovar fins que no es comprovin els ítems previs. msgid "Code " msgstr "Codi " -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:596 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:595 msgid "Exception: {0} (Inh)" msgstr "Excepció: {0} (Inh)" @@ -4683,7 +4698,7 @@ msgstr "Excepció: {0} (Inh)" #: libreplan-webapp/src/main/webapp/myaccount/changePassword.zul:77 #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:153 msgid "Password confirmation" -msgstr "Confirm paraula de pas" +msgstr "Confirmar paraula de pas" #: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:72 msgid "Indent selected task" @@ -4694,7 +4709,7 @@ msgid "Regular" msgstr "Regular" #: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:39 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:79 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:88 msgid "Show progress" msgstr "Mostrar progrés" @@ -4712,16 +4727,17 @@ msgstr "S'ha produït un error desant el projecte⏎ {0}" msgid "LibrePlan: Machines" msgstr "LibrePlan: Màquines" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MyTasksAreaController.java:86 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MyTasksAreaController.java:87 +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/CostStatusController.java:117 msgid "{0} h" msgstr "{0} h" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:343 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:347 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:350 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionController.java:121 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1305 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1302 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:403 -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:630 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:628 msgid "Error" msgstr "Error" @@ -4783,7 +4799,7 @@ msgstr "Hi ha un altre plantilla de full d'hores amb el mateix nom" msgid "SPREAD" msgstr "Propagar" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:712 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:709 msgid "Changes applied" msgstr "Modificacions aplicades" @@ -4795,13 +4811,13 @@ msgstr "Cost de treball pressupostat planificat" msgid "criterion type does not allow hierarchy" msgstr "tipus de criteri no està permès jeràrquicament" -#: libreplan-webapp/src/main/webapp/dashboard/_costStatus.zul:62 +#: libreplan-webapp/src/main/webapp/dashboard/_costStatus.zul:66 msgid "Project closing previsions" msgstr "Tancar previsions del projecte" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:189 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:344 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:164 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:186 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:346 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:173 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:58 msgid "Material Units" msgstr "Unitats del material" @@ -4824,7 +4840,7 @@ msgstr "Configuració LDAP" msgid "progress type should must be defined if quality form reports progress" msgstr "tipus progrés ha d'estar definit per l'informe de progrés del formulari de qualitat" -#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:29 +#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:30 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:35 msgid "Superuser" msgstr "Superusuari" @@ -4854,18 +4870,18 @@ msgid "Cost Variance" msgstr "Cost Variance" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:625 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetController.java:253 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetController.java:590 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:256 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:594 #: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:50 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:92 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:95 -#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:92 #: libreplan-webapp/src/main/webapp/myaccount/_expensesArea.zul:33 +#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:92 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:182 msgid "Total" msgstr "Total" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:396 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:403 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:66 msgid "User Accounts" msgstr "Comptes d'usuari" @@ -4875,7 +4891,7 @@ msgstr "Comptes d'usuari" msgid "Invalidate" msgstr "Invalidar" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:285 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:310 msgid "" "User is bound to resource \"{0}\" and it will be unbound. Do you want to " "continue with user removal?" @@ -4885,10 +4901,6 @@ msgstr "L'usuari està limitat al recurs \"{0}\" i quedarà sense limitació. Vo msgid "Budget hours" msgstr "Hores pressupostades" -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:132 -msgid "Go to monthly timesheet" -msgstr "Anar al full d'hores mensual" - #: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/TaskQualityFormItem.java:78 msgid "percentage not specified" msgstr "percentatge no especificat" @@ -4897,7 +4909,7 @@ msgstr "percentatge no especificat" msgid "Edit task: {0}" msgstr "Editar tasca: {0}" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:120 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:129 msgid "" "Check this option if you would like to send feedback to LibrePlan developers" " about program usage" @@ -4924,8 +4936,8 @@ msgstr "no pot estar buit o més petit que 0" msgid "Check consolidated progresses" msgstr "Comprovar progressos consolidats" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractController.java:308 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractController.java:311 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractController.java:287 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractController.java:290 msgid "Update task end" msgstr "Actualització de tasca finalitzada" @@ -4951,7 +4963,7 @@ msgid "Apply tab changes" msgstr "Aplicar canvis de tabulador" #: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordController.java:99 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:235 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:260 msgid "passwords don't match" msgstr "la paraula de pas no coincideix" @@ -4959,7 +4971,7 @@ msgstr "la paraula de pas no coincideix" msgid "Day properties" msgstr "Detall de dia" -#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:267 +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:271 msgid " (%d tasks)" msgstr " (%d tasques)" @@ -4970,16 +4982,20 @@ msgstr " (%d tasques)" #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:785 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:425 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:253 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:695 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1338 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:697 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1331 msgid "must be lower than end date" msgstr "ha de ser més petit que la data de finalització" +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetDTO.java:120 +msgid "Week {0}" +msgstr "Setmana {0}" + #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:82 msgid "Hours groups" msgstr "Hores de grups" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:107 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:116 msgid "" "Enable/Disable autocomplete property in login form, if the admin password is" " still the default one" @@ -5007,7 +5023,7 @@ msgid "" "progress assignment" msgstr "Progrés de propagació no pot ser modificat en cas de tenir una consolidació de progrés assignada" -#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/GlobalProgressChart.java:48 +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/GlobalProgressChart.java:63 msgid "By critical path duration" msgstr "Per duració de camí crític" @@ -5031,7 +5047,7 @@ msgstr "Full d'hores" msgid "Show dependencies" msgstr "Mostrar dependències" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:313 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:310 msgid "Schedule from start to deadline" msgstr "Planificació des de l'inici fins el termini" @@ -5079,7 +5095,7 @@ msgid "" "subcontractor company." msgstr "Valors del subcontractista és de només lectura decidit per l'empresa subcontractista." -#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:162 +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:165 msgid "" "There is a margin of %d days with the project global deadline (%.2f %%)." msgstr "Hi ha un marge de %d dies amb la data de termini global del projecte (%.2f %%)." @@ -5088,7 +5104,7 @@ msgstr "Hi ha un marge de %d dies amb la data de termini global del projecte (%. msgid "CV" msgstr "CV" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetController.java:513 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:509 #: libreplan-webapp/src/main/webapp/myaccount/userDashboard.zul:35 msgid "My dashboard" msgstr "Quadre de comandament" @@ -5179,11 +5195,11 @@ msgstr "desar modificacions" msgid "Application settings" msgstr "Configuració de l'aplicació" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:289 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:298 msgid "Base" msgstr "Base" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:318 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:321 msgid "Total dedication" msgstr "Dedicació total" @@ -5195,7 +5211,7 @@ msgstr "Seleccioneu origen" msgid "Worker deleted" msgstr "Treballador eliminat" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:744 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:745 msgid "Select entity, please" msgstr "Seleccioneu entitat," @@ -5203,7 +5219,7 @@ msgstr "Seleccioneu entitat," msgid "LibrePlan: Profiles" msgstr "LibrePlan: perfil" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:804 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:805 msgid "Finish Hour" msgstr "Hora de finalització" @@ -5216,12 +5232,16 @@ msgstr "total no especificat" msgid "Last expense" msgstr "Última despesa" +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:132 +msgid "Go to personal timesheet" +msgstr "Anar al full de treball personal" + #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:108 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:197 msgid "Day" msgstr "Day" -#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:76 +#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:76 msgid "Timesheet summary" msgstr "Resum de full d'hores" @@ -5229,41 +5249,40 @@ msgstr "Resum de full d'hores" msgid "Current password" msgstr "Paraula de pas actual" -#: libreplan-business/src/main/java/org/libreplan/business/common/entities/EntitySequence.java:202 +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/EntitySequence.java:201 msgid "Only one sequence per entity can be active at the same time." msgstr "Només pot estar activa una seqüència per entitat al mateix temps." -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:915 -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1175 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:916 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1176 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:274 msgid "Please, select an item" msgstr "Si us plau, seleccioneu un ítem" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1090 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1091 msgid "Cannot be higher than finish hour" msgstr "No pot ser major que l'hora de finalització" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:221 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:240 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:230 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:249 msgid "Prefix" msgstr "Prefix" +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetDTO.java:123 +msgid "{0} 1st fortnight" +msgstr "{0} Primera quinzena" + #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeComponent.java:64 msgid "New Template element" msgstr "Nou element de la plantilla" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetController.java:515 -#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:32 -msgid "Monthly timesheet" -msgstr "Full d'hores mensual" - #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:211 msgid "Project: {0}" msgstr "Projecte: {0}" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:361 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:363 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:114 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:144 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:153 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:60 msgid "Timesheets" msgstr "Full d'hores" @@ -5293,7 +5312,7 @@ msgstr "Tipus de reassignació" msgid "There are repeated description values in the timesheet " msgstr "Hi ha descripció de valors repetits al mateix full d'hores " -#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:190 +#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:179 msgid "{0} \"{1}\" can not be deleted because of it is being used" msgstr "{0} \"{1}\" no es pot eliminar perquè ja està en ús" @@ -5322,7 +5341,7 @@ msgstr "Autenticació errònia" msgid "Edit task" msgstr "Editar tasca" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:95 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:104 msgid "Currency" msgstr "Moneda" @@ -5330,8 +5349,9 @@ msgstr "Moneda" msgid "End date is not valid, the new end date must be after the start date" msgstr "Data finalització no és vàlida, la nova data de finalització ha de ser després que la data d'inici" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:444 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:373 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:31 +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:73 msgid "Timesheet Lines List" msgstr "Llista de línies del full d'hores" @@ -5381,13 +5401,13 @@ msgstr "Dades del perfil" msgid "The name of the label is empty." msgstr "El nom de l'etiqueta està buit." -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:369 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:366 msgid "Starting date cannot be empty in forward mode" msgstr "La data d'inici no pot estar buida en mode Endavant" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:406 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:413 #: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:33 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:267 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:276 msgid "Configuration" msgstr "Configuració" @@ -5395,15 +5415,15 @@ msgstr "Configuració" msgid "cost category not specified" msgstr "categoria de cost no especificada" -#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:178 +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:181 msgid "Violated deadline" msgstr "Data de termini violada" #: libreplan-webapp/src/main/webapp/orders/_edition.zul:243 msgid "Delivery dates requested by customer. " -msgstr "Data de lliurament demanad pel client. " +msgstr "Data de lliurament demanada pel client. " -#: libreplan-webapp/src/main/webapp/common/configuration.zul:119 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:128 msgid "" "Help the project developers to collect information about which LibrePlan " "version you are using" @@ -5413,11 +5433,15 @@ msgstr "Permetre als desenvolupadors a recollir informació sobre quina versió msgid "LibrePlan: Workers" msgstr "LibrePlan: Treballadors" +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/UserDashboardController.java:64 +msgid "Personal timesheet \"{0}\" saved" +msgstr "Full de treball personal “{0}” desat" + #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:719 msgid "Create Virtual Workers Group" msgstr "Crear Grup virtual de treballadors" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:116 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:125 msgid "Enable/Disable warning about new LibrePlan versions available" msgstr "Habilitar/Inhabilitar advertències d'actualització de LibrePlan" @@ -5427,13 +5451,13 @@ msgid "" "applications" msgstr "camps d'iteració estan buits i l'empresa està marcada per a interactuar amb aplicacions" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:174 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:183 msgid "Timesheet templates" msgstr "Plantilles de fulls d'hores" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1058 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:692 -#: libreplan-webapp/src/main/webapp/dashboard/_costStatus.zul:41 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1072 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:698 +#: libreplan-webapp/src/main/webapp/dashboard/_costStatus.zul:42 msgid "Hours invested" msgstr "Hores invertides" @@ -5443,7 +5467,7 @@ msgstr "Hores invertides" msgid "Templates" msgstr "Plantilles" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:343 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:352 msgid "Authorization" msgstr "Autoritzacions" @@ -5456,7 +5480,7 @@ msgid "" "The name is not valid, there is another progress type with the same name. " msgstr "El nom no és vàlid, hi ha un altre tipus de progrés amb el mateix nom." -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:50 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:49 msgid "task" msgstr "tasca" @@ -5468,6 +5492,12 @@ msgstr "Es perdren totes les modificacions, està segur?" msgid "Sorry for the inconvenience." msgstr "Disculpi les molèsties." +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:149 +msgid "" +"Profiles of LDAP users cannot be managed because LDAP is enabled and LDAP " +"roles are being used." +msgstr "Els perfils dels usuaris d'LDAP no poden ser controlats ja que LDAP està habilitat i funcions LDAP s'utilitzen." + #: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityFormItem.java:81 msgid "quality form item position not specified" msgstr "posició de l'ítem del formulari de qualitat no especificat" @@ -5477,7 +5507,7 @@ msgstr "posició de l'ítem del formulari de qualitat no especificat" msgid "Machines" msgstr "Màquines" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetController.java:511 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:507 msgid "My account" msgstr "La meva compte" @@ -5490,7 +5520,7 @@ msgstr "Escenari destí" msgid "Company view" msgstr "Vista d'empresa" -#: libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java:445 +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java:458 msgid "currency symbol not specified" msgstr "símbol de la moneda no especificat" @@ -5539,7 +5569,7 @@ msgstr "Data de la categoria" msgid "Search" msgstr "Cercar" -#: libreplan-business/src/main/java/org/libreplan/business/common/entities/EntitySequence.java:107 +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/EntitySequence.java:106 msgid "Prefix cannot contain whitespaces" msgstr "El prefix no pot contenir espais en blancs" @@ -5593,7 +5623,7 @@ msgstr "Suma de despeses directes" msgid "Communications From Customers" msgstr "Comunicacions des de els clients" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:760 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:761 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:32 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceFilterEnumByResourceAndCriterion.java:31 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceAllocationFilterEnum.java:30 @@ -5604,16 +5634,15 @@ msgstr "Comunicacions des de els clients" #: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:171 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:185 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:81 -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:45 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:44 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:100 -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:145 -#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:69 +#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:69 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:33 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:86 msgid "Resource" msgstr "Recurs" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/UserDashboardController.java:67 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/UserDashboardController.java:71 msgid "Expense sheet \"{0}\" saved" msgstr "Full de despeses \"{0}\" desat" @@ -5638,7 +5667,7 @@ msgstr "Data de l'últim progrés informat" msgid "Could not load any resource" msgstr "No s'ha pogut carregar cap recurs" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:462 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:464 #: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:39 msgid "Work And Progress Per Project" msgstr "Progrés i treball per projecte" @@ -5649,7 +5678,7 @@ msgstr "total ha de ser més gran o igual que 0" #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:158 msgid "Default Label" -msgstr "Etiquete per defecte" +msgstr "Etiqueta per defecte" #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:187 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:85 @@ -5661,13 +5690,13 @@ msgstr "Tancat" msgid "LibrePlan: Timesheet Lines List" msgstr "LibrePlan: Llista de línies del full d'hores" -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadModel.java:945 +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadModel.java:957 msgid "Specific Allocations" msgstr "Assignació específica" #: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:444 msgid "label type: the timesheet has not assigned this label type" -msgstr "tipus d'etiqueta: el full d'hores no té assigant aquest tipus d'etiqueta" +msgstr "tipus d'etiqueta: el full d'hores no té assignat aquest tipus d'etiqueta" #: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:219 msgid "progress type marked as quality form but is updatable" @@ -5679,7 +5708,7 @@ msgstr "Moure la tasca seleccionada amunt" #: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:27 msgid "Select criteria set or specific resources for allocation" -msgstr "Seleccioneru criteris configurat o especificar assignació per recurs" +msgstr "Seleccioneu criteris configurat o especificar assignació per recurs" #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:350 msgid "Create copy" @@ -5689,15 +5718,12 @@ msgstr "Crear còpia" msgid "Company data" msgstr "Data de l'empresa" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:151 -msgid "Unit type code cannot be empty" -msgstr "El tipus d'unitat no pot ser buit" - -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:248 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:273 msgid "Users" msgstr "Usuaris" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/AssignedMachineCriterionsModel.java:418 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/AssignedCriterionsModel.java:340 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/AssignedMachineCriterionsModel.java:401 msgid "The {0} is not valid. Other value exists from the same criterion type" msgstr "El {0} no és vàlid. Ja existeis un altre valor amb el mateix tipus de criteri" @@ -5718,8 +5744,8 @@ msgstr "últim codi de seqüència d'hores de grup no especificada" msgid "label type name is already in use" msgstr "Nom del tipus d'etiqueta ja està en ús" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:636 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1272 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:635 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1271 msgid "Please, select an End Date for the Exception" msgstr "Si us plau, seleccioneu un data de finalització per l'Excepció" @@ -5743,7 +5769,7 @@ msgid "" "completed." msgstr "Un altre usuari ha modificat la mateixa data, així que l'operació no pot ser completada." -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1622 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1623 msgid "Please set a date" msgstr "Si us plau, configuri una data" @@ -5752,7 +5778,7 @@ msgstr "Si us plau, configuri una data" msgid "Template saved" msgstr "Plantilla desada" -#: libreplan-business/src/main/java/org/libreplan/business/common/entities/EntitySequence.java:94 +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/EntitySequence.java:93 msgid "prefix not specified" msgstr "prefix no especificat" @@ -5773,7 +5799,7 @@ msgstr "Alguna assignació de categoria de cost es solapa en temps" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:26 msgid "Imputed hours calculation" -msgstr "Càlcu d'hores imputades" +msgstr "Càlcul d'hores imputades" #: libreplan-webapp/src/main/webapp/common/error.zul:55 #: libreplan-webapp/src/main/webapp/common/event_error.zul:51 @@ -5789,7 +5815,7 @@ msgstr "Grup" #: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:30 msgid "Statistics list " -msgstr "Llist d'estadístiques " +msgstr "Llista d'estadístiques " #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:113 msgid "Apply filter to" @@ -5805,21 +5831,17 @@ msgstr "Aplicar filtre a" msgid "Enabled" msgstr "Habilitat" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1110 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1111 msgid "Please, enter a valid effort" msgstr "Si us plau, introduïu un esforç vàlid" -#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:519 -msgid "resource has to be bound to a user in monthly timesheets" -msgstr "recursos han de ser limitat a un usuari en el full d'hores mensuals" - #: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:321 msgid "" "Quality form should include an item with a value of 100% in order to report " "progress" msgstr "Formulari de qualitat hauria d'incloure un ítem amb el valor de 100% per a poder informar el progrés" -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractedTaskData.java:125 +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractedTaskData.java:126 msgid "external company not specified" msgstr "Empresa externa no especificada" @@ -5828,7 +5850,7 @@ msgid "Quality form name is already being used" msgstr "Nom del formulari de qualitat està en ús" #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:944 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:366 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:368 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:61 msgid "Timesheets Templates" msgstr "Plantilles de fulls d'hores" @@ -5849,7 +5871,7 @@ msgstr "Càrrega pel projecte actual" msgid "length not specified" msgstr "longitud no especificada" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MyTasksAreaController.java:163 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MyTasksAreaController.java:166 msgid "Track time" msgstr "Temps de seguiment" @@ -5857,7 +5879,7 @@ msgstr "Temps de seguiment" msgid "There must be at least 2 stretches for doing interpolation" msgstr "Ha de tenir com a mínim dos trams per a fer la interpolació" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:479 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:477 msgid "Remove queue-based resource element" msgstr "Eliminar element del recurs basat en cua" @@ -5878,9 +5900,9 @@ msgstr "El format de la dat és erroni. Si us plau, utilitzi el format: {0}" #: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:67 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:96 #: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:134 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:187 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:185 #: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:127 -#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:139 +#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:136 #: libreplan-webapp/src/main/webapp/profiles/_editProfile.zul:72 #: libreplan-webapp/src/main/webapp/unittypes/unitTypes.zul:42 #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:186 @@ -5911,7 +5933,11 @@ msgstr "Filtrar" msgid "Scheduling mode" msgstr "Mode de planificació" -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskMilestone.java:122 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:78 +msgid "Personal timesheets peridocity" +msgstr "Periodicitat de full de treball personal" + +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskMilestone.java:121 msgid "a milestone cannot have a task associated" msgstr "una fita no pot tenir una tasca associada" @@ -5920,7 +5946,7 @@ msgid "" "Invalid value. Precission value must be lower than the Default Max value." msgstr "Valor invàlid. El valor de la precisió ha de ser més petit que el valor màxim per defecte." -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1314 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1311 msgid "Assignment function will be changed. Are you sure?" msgstr "Funció d'assignació serà modificada. Està segur?" @@ -5947,11 +5973,15 @@ msgstr "Data de subcontractació" msgid "Report progress" msgstr "Informe de progrés" +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/GlobalProgressChart.java:124 +msgid "Progress percentage per progress type" +msgstr "Percentatge de progrés per tipus de progrés" + #: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:248 msgid "ACWP" msgstr "ACWP" -#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:30 +#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:31 #: libreplan-webapp/src/main/webapp/users/_editUser.zul:89 msgid "Authentication type" msgstr "Tipus d'autenticació" @@ -5983,7 +6013,7 @@ msgstr "Enrere" msgid "Our company username" msgstr "Nom d'usuari de la nostra empresa" -#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:30 +#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:29 #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:58 msgid "Subcontractor" msgstr "Subcontractista" @@ -6019,9 +6049,9 @@ msgstr "el projecte ha de tenir una data de tancament" #: libreplan-business/src/main/java/org/libreplan/business/labels/entities/LabelType.java:199 msgid "last label sequence code not specified" -msgstr "Codi de seqüència de l'última etiquesta no especificat" +msgstr "Codi de seqüència de l'última etiqueta no especificat" -#: libreplan-webapp/src/main/webapp/myaccount/_monthlyTimesheetsArea.zul:31 +#: libreplan-webapp/src/main/webapp/myaccount/_personalTimesheetsArea.zul:31 msgid "Available hours" msgstr "Hores disponibles" @@ -6048,7 +6078,7 @@ msgstr "Longitud" msgid "Task code" msgstr "Codi tasca" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetController.java:342 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:345 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:66 #: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:35 msgid "Capacity" @@ -6063,7 +6093,7 @@ msgstr "Crear derivat" msgid "Label Types" msgstr "Tipus d'etiqueta" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:637 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:636 msgid "it must be greater than zero" msgstr "ha de ser més gran que 0" @@ -6098,18 +6128,22 @@ msgstr "Full de despeses no especificat" msgid "LibrePlan: Timesheets Templates" msgstr "LibrePlan: Plantilles de full d'hores" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1073 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1066 msgid "Create project" msgstr "Crear projecte" -#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:64 +#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:63 msgid "Next" msgstr "Següent" +#: libreplan-webapp/src/main/webapp/myaccount/_personalTimesheetsArea.zul:22 +msgid "Personal timesheets" +msgstr "Full de treball personal" + #: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:51 msgid "" "Allow multiple values of this type of criterion in the same period of time" -msgstr "Permet valors múltiples d'aquest tipus de criter en el mateix període de temps" +msgstr "Permet valors múltiples d'aquest tipus de criteri en el mateix període de temps" #: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportType.java:421 msgid "" @@ -6130,7 +6164,7 @@ msgid "" "present." msgstr "No s'ha pogut afegir aquesta autorització a l'usuari {0} perquè ja la té assignada." -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:307 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:306 msgid "Root calendar" msgstr "Calendari arrel" @@ -6143,7 +6177,7 @@ msgstr "Sí" msgid "Select gap" msgstr "Seleccioneu buit" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:282 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:291 msgid "Port" msgstr "Port" @@ -6152,7 +6186,6 @@ msgid "Date Finish" msgstr "Data de lliurament" #: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:455 -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:147 msgid "From" msgstr "des de" @@ -6199,7 +6232,7 @@ msgstr "Assignació de categoria de cost" msgid "progress type name is already in use" msgstr "Nom del tipus de progrés ja està en ús" -#: libreplan-business/src/main/java/org/libreplan/business/common/entities/EntitySequence.java:141 +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/EntitySequence.java:140 msgid "number of digits not specified" msgstr "nombre de dígits no especificats" @@ -6207,10 +6240,14 @@ msgstr "nombre de dígits no especificats" msgid "task cannot be empty if it is shared by lines" msgstr "la tasca no pot estar buida en cas de estar les línies compartides" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1010 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1024 msgid "All workers" msgstr "Tots els treballadors" +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1189 +msgid "You have exceeded the maximum limit of resources" +msgstr "S’ha excedit el nombre màxim de recursos" + #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:766 msgid "The field name must be unique and not empty" msgstr "El nom del camp ha de ser únic i no pot estar buit" @@ -6225,17 +6262,11 @@ msgstr "Seleccioneu criteris o recursos" msgid "Select required criteria set and press filter button" msgstr "Seleccioneu criteris requerit i prémer botó de filtre" -#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/CostStatusController.java:112 -#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/CostStatusController.java:116 -#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/CostStatusController.java:120 -msgid "%s h" -msgstr "%s h" - #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:217 msgid "Timesheet lines" msgstr "Línies del full d'hores" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1522 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1521 msgid "It cannot be empty" msgstr "No pot estar buit" @@ -6258,7 +6289,7 @@ msgstr "Tipus d'unitat" msgid "Load due to other assignments" msgstr "Carregat per altres tasques" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:508 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:515 msgid "Personal area" msgstr "Àrea de personal" @@ -6302,7 +6333,7 @@ msgstr "Requisits de criteri" msgid "working hours not specified" msgstr "hores treballades no especificades" -#: libreplan-business/src/main/java/org/libreplan/business/common/entities/EntitySequence.java:156 +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/EntitySequence.java:155 msgid "format sequence code invalid. It must not contain '_'" msgstr "format del codi de seqüència invàlid. No pot tenir '_'" @@ -6353,13 +6384,13 @@ msgstr "SV" msgid "Label has already been added." msgstr "Etiqueta ja s'ha afegit." -#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:123 +#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:122 msgid "Add task" msgstr "Afegir tasca" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1055 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:691 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:626 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1069 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:697 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:628 #: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:45 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:49 #: libreplan-webapp/src/main/webapp/myaccount/_myTasksArea.zul:38 @@ -6381,7 +6412,7 @@ msgstr "Preu per hora" msgid "Last stretch should have 100% for length and amount of work" msgstr "Últim tram ha de tenir 100% de longitud i quantitat de treball" -#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:166 +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:169 msgid "No project deadline defined" msgstr "No s'ha definit data de tancament" @@ -6403,7 +6434,6 @@ msgid "" msgstr "Un altra tasca amb la mateixa branca ja ha informat progrés per aquest formulari de qualitat" #: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:457 -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:148 msgid "To" msgstr "a" @@ -6411,7 +6441,7 @@ msgstr "a" msgid "options" msgstr "opcions" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1201 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1198 msgid "Queue-based assignment" msgstr "Assignació de basat en cues" @@ -6423,7 +6453,7 @@ msgstr "Mostrar només criteris actuals" msgid "Latest date" msgstr "Última data" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:388 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:385 msgid "Deadline cannot be empty in backwards mode" msgstr "Data de termini no pot estar buida en la manera cap enrere" @@ -6435,13 +6465,13 @@ msgstr "Agrupació per setmanes" msgid "Full name" msgstr "Nom i cognoms" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:122 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:124 msgid "Default user \"admin\" cannot be removed as it is mandatory" msgstr "L'usuari per defecte \"admin\" no pot ser eliminat" #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:117 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:380 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:154 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:387 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:163 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:64 msgid "Hours Types" msgstr "Tipus d'hores" @@ -6467,17 +6497,13 @@ msgstr "Inici del planificat" msgid "Filter by projects" msgstr "Filtre per projecte" -#: libreplan-webapp/src/main/webapp/dashboard/_costStatus.zul:81 -msgid "VAC (Variance At Completion)" -msgstr "VAC (Variance At Completion)" - #: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/TaskQualityFormItem.java:69 msgid "Task Quality Form item name not specified" msgstr "Nom de l'ítem del formulari de qualitat de tasca no especificat" #: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:44 #: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:43 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:238 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:247 msgid "Active" msgstr "Activar" @@ -6488,14 +6514,14 @@ msgstr "Etiquetes heretades" #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:850 #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/ResourceType.java:31 msgid "Queue-based resource" -msgstr "Recurs basat en cues" +msgstr "Recursos basat en cues" -#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:56 +#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:55 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:249 msgid "Delivery date" -msgstr "Date de lliurament" +msgstr "Data de lliurament" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1151 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1155 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:292 msgid "Unindent" msgstr "Unindent" @@ -6536,7 +6562,7 @@ msgstr "Data d'inici estimada per a la tasca (prémer enter per a obrir popup or msgid "Show all reported hours" msgstr "Mostrar totes les hores informades" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:937 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:934 msgid "Efforts" msgstr "Esforços" @@ -6596,21 +6622,21 @@ msgstr "Anar a l'inici" #: libreplan-webapp/src/main/webapp/common/error.zul:54 #: libreplan-webapp/src/main/webapp/common/event_error.zul:50 msgid "Reload" -msgstr "Recàrregar" +msgstr "Recarregar" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:26 msgid "Profiles authorization" msgstr "Autorització de perfils" -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:71 -msgid "Assignation" -msgstr "Assignacions" - #: libreplan-webapp/src/main/webapp/myaccount/settings.zul:98 msgid "Planning charts expanded" msgstr "Gràfic de planificació ampliat" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:703 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:71 +msgid "Assignation" +msgstr "Assignacions" + +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:702 msgid "Inh" msgstr "Inh" @@ -6631,7 +6657,7 @@ msgstr "el nom no pot estar buit" msgid "Doing {0} reassignations" msgstr "realitzant {0} reassignacions" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:212 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:221 msgid "Select entity" msgstr "Seleccioneu entitat" @@ -6656,7 +6682,7 @@ msgstr "Valor invàlid. El valor per defecte no pot estar buit" msgid "Invalid Spread values. At least one value should be true" msgstr "Valor de propagació no és vàlid. Al menys un valor ha de ser verdader" -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:587 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:600 #: libreplan-business/src/main/java/org/libreplan/business/common/IntegrationEntity.java:48 msgid "code not specified" msgstr "codi no especificat" @@ -6671,6 +6697,7 @@ msgstr "últim codi de seqüència no especificat" #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:183 #: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:184 +#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:91 #: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:223 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:213 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:91 @@ -6680,7 +6707,7 @@ msgstr "últim codi de seqüència no especificat" msgid "if the report is not opened automatically" msgstr "en cas que l'informe no s'obri automàticament" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:662 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:663 msgid "" "Invalid format prefix. Format prefix cannot be empty, contain '_' or contain" " whitespaces." @@ -6690,8 +6717,8 @@ msgstr "Prefix del format no és vàlid. El prefix del format no pot estar buit, msgid "Create template from selected task" msgstr "Crear plantilla des de la tasca seleccionada" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:157 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:256 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:160 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:259 msgid "All projects" msgstr "Tots els projectes" @@ -6703,7 +6730,7 @@ msgstr "Completat: {0}%" #: libreplan-webapp/src/main/webapp/myaccount/changePassword.zul:49 #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:148 #: libreplan-webapp/src/main/webapp/common/layout/login.zul:84 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:303 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:312 msgid "Password" msgstr "Paraula de pas" @@ -6712,11 +6739,11 @@ msgstr "Paraula de pas" msgid "Observations" msgstr "Observacions" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:950 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:939 msgid "Edit project" msgstr "Editar projecte" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1076 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1090 msgid "Hours cost: {0}, Expenses cost: {1}" msgstr "Cost d'hores: {0}, Cost de despesa: {1}" @@ -6734,7 +6761,7 @@ msgstr "Formulari vàlid" msgid "Month" msgstr "Mes" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:910 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:909 msgid "{0} could not be allocated. Cannot allocate more than one resource" msgstr "{0} no es pot assignar. No es pot assignar més d'un recurs" @@ -6749,16 +6776,12 @@ msgstr "Paraula de pas actual no és correcte" #: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:366 msgid "Cannot insert material in general view. Please, select a category" -msgstr "No es pot insertar materia en la vista general. Si us plau, seleccioneu una categoria" +msgstr "No es pot insertar material en la vista general. Si us plau, seleccioneu una categoria" #: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:125 msgid "Expense lines" msgstr "Línies de despesa" -#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:495 -msgid "In monthly timesheets, all timesheet lines should be in the same month" -msgstr "En el full d'hores mensual, totes les línies del full han de estar en el mateix mes" - #: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:311 msgid "Delete {0} \"{1}\". Are you sure?" msgstr "Eliminar {0} \"{1}\". Estàs segur?" @@ -6780,14 +6803,14 @@ msgid "Accept" msgstr "Acceptar" #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:81 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:278 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:285 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:292 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:299 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:327 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:362 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:369 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:376 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:287 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:294 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:301 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:308 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:336 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:371 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:378 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:385 msgid "Example: {0}" msgstr "Exemple: {0}" @@ -6796,19 +6819,19 @@ msgid "" "Cannot delete timesheet template. There are some timesheets bound to it." msgstr "No es pot eliminar la plantilla del full d'hores perquè hi ha algun full d'hores depenent" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:618 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:617 msgid "Please, select type of exception" -msgstr "Si us plau, seleccioneu tipus d'exceció" +msgstr "Si us plau, seleccioneu tipus d'excepció" + +#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:86 +#: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:69 +msgid "cannot be negative or empty" +msgstr "no pot ser buit o negatiu" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:48 msgid "Calculated" msgstr "Calculat" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/AssignedCriterionsModel.java:335 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/AssignedCriterionsModel.java:341 -msgid " The " -msgstr " La/El " - #: libreplan-webapp/src/main/webapp/common/layout/login.zul:56 msgid "Access to the system" msgstr "Accedir al sistema" @@ -6821,7 +6844,7 @@ msgstr "Probabilitat" msgid "Report data" msgstr "Data d'informe" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:184 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:181 #: libreplan-webapp/src/main/webapp/unittypes/_listUnitTypes.zul:27 msgid "Material Unit" msgstr "Unitat del material" @@ -6830,13 +6853,6 @@ msgstr "Unitat del material" msgid "External load" msgstr "Càrrega externa" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetController.java:676 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetController.java:685 -msgid "" -"There are unsaved changes in the current monthly timesheet, please save " -"before moving" -msgstr "Hi ha modificacions que no s'han desat de l'actual full d'hores mensuals, si us plau, deseu abans de moure" - #: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ReportAdvancesController.java:207 msgid "Progress sent successfully" msgstr "Progrés enviat correctament" @@ -6853,9 +6869,9 @@ msgstr "Prioritat" #: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:47 msgid "Apply changes and continue edition" -msgstr "Applicar modificacions i continuar editant" +msgstr "Aplicar modificacions i continuar editant" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:222 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:221 #: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:80 msgid "Infinitely Over Assignable" msgstr "Infinitament sobre assignable" @@ -6864,7 +6880,7 @@ msgstr "Infinitament sobre assignable" msgid "Money spent" msgstr "Diners invertits" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:818 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:819 #: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:85 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:31 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:31 @@ -6913,11 +6929,6 @@ msgstr "Diners invertits" msgid "Code" msgstr "Codi" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:193 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetController.java:640 -msgid "Monthly timesheet saved" -msgstr "Full d'hores mensuals desat" - #: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:40 msgid "Add stretch" msgstr "Afegir tram" @@ -6931,7 +6942,7 @@ msgstr "L'assignació de progrés no pot ser modificada ni eliminada. Assignaci #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:70 msgid "Assignation type" -msgstr "Tipus d'assiganció" +msgstr "Tipus d'assignació" #: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:33 msgid "Show resource assignments" @@ -6970,7 +6981,7 @@ msgstr "No es pot fer l'operació" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:80 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:62 #: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:82 -#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:55 +#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:54 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:65 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:168 msgid "Budget" @@ -7009,11 +7020,11 @@ msgstr "Escriure" msgid "Number of applications" msgstr "Nombre d'aplicacions" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:503 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:501 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:396 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:406 msgid "Confirm worker edition" msgstr "Confirmar l'edició de treballadors" @@ -7021,13 +7032,13 @@ msgstr "Confirmar l'edició de treballadors" msgid "type" msgstr "tipus" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:605 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:604 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/ResourceAllocationBehaviour.java:38 #: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:43 msgid "Normal" msgstr "Normal" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:391 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:398 #: libreplan-webapp/src/main/webapp/common/configuration.zul:36 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:65 msgid "Main Settings" @@ -7047,7 +7058,7 @@ msgstr "Vista de projectes" msgid "Probability %" msgstr "Probabilitat %" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:706 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:707 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:323 #: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:854 #: libreplan-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:49 @@ -7059,7 +7070,7 @@ msgstr "Carregar" msgid "New criterion" msgstr "Nou criteri" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:696 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:702 #: libreplan-webapp/src/main/webapp/materials/materials.zul:83 #: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:54 #: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:87 @@ -7069,7 +7080,6 @@ msgstr "Nou criteri" #: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:77 #: libreplan-webapp/src/main/webapp/templates/_listTemplates.zul:31 #: libreplan-webapp/src/main/webapp/myaccount/_expensesArea.zul:29 -#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:54 #: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:36 #: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:62 #: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:67 @@ -7100,7 +7110,7 @@ msgstr "Tipus de comunicació" msgid "Selected node" msgstr "Node seleccionat" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:670 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:669 msgid "already exists an allocation for criteria {0}" msgstr "ja existeix una assignació pel criteri {0}" @@ -7112,7 +7122,7 @@ msgstr "Codi no pot estar buit" msgid "Project type" msgstr "Tipus de projecte" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:313 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:310 msgid "Forward" msgstr "Endavant" @@ -7128,15 +7138,15 @@ msgstr "Nombre d'aplicacions finalitzades" msgid "Invalid queue element" msgstr "Element de cua invàlid" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/ManualAllocationController.java:575 -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/ManualAllocationController.java:584 -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/ManualAllocationController.java:592 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/ManualAllocationController.java:576 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/ManualAllocationController.java:585 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/ManualAllocationController.java:593 msgid "Unnasigned" msgstr "Sense assignar" -#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:233 -#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:260 -#: libreplan-webapp/src/main/webapp/myaccount/_monthlyTimesheetsArea.zul:35 +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:236 +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:263 +#: libreplan-webapp/src/main/webapp/myaccount/_personalTimesheetsArea.zul:35 msgid "Number of tasks" msgstr "Nombre de tasques" @@ -7144,7 +7154,7 @@ msgstr "Nombre de tasques" msgid "At least one HoursGroup is needed" msgstr "Com a mínim és necessari un grup d'hores" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:243 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:268 #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:63 #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:116 #: libreplan-webapp/src/main/webapp/common/layout/login.zul:75 @@ -7166,7 +7176,7 @@ msgstr "Treballador virtual" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionController.java:343 msgid "Length percentage should be between 0 and 100" -msgstr "El percentatge de longitut ha de estar entre 0 i 100" +msgstr "El percentatge de longitud ha de estar entre 0 i 100" #: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:50 msgid "Multiple values per resource" @@ -7177,7 +7187,7 @@ msgstr "Valors múltiples per recurs" msgid "Split" msgstr "Dividir" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:436 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:443 msgid "Communications" msgstr "Comunicacions" @@ -7195,7 +7205,7 @@ msgstr "No es pot eliminar l'excepció de dia del calendari predefinit \"{0}\"" msgid "Supported Chrome, Firefox, Safari and Epiphany browsers" msgstr "Navegadors recomanats: Chrome, Firefox, Safari i Epiphany" -#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:175 +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:178 msgid "Task deadline violations" msgstr "Violació de la data de termini de la tasca" @@ -7212,25 +7222,28 @@ msgstr "Violació de la data de termini de la tasca" msgid "Starting date" msgstr "Data d'inicialització" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:913 +msgid "" +"Periocity cannot be changed because there is already any personal timesheet " +"stored" +msgstr "No es pot modificar la periodicitat ja que està en ús en algun full de treball personal emmagatzemat. " + #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:62 msgid "Add materials" msgstr "Afegir materials" -#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:21 -msgid "LibrePlan: Monthly timesheet" -msgstr "LibrePlan: full d'hores mensual" - #: libreplan-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:34 msgid "Load 100%" msgstr "Càrrega 100%" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:943 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:940 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:84 msgid "Function" msgstr "Funció" #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:158 #: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:159 +#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:66 #: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:196 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:190 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:66 @@ -7249,24 +7262,24 @@ msgid "label names must be unique inside a label type" msgstr "nom de l'etiqueta ha de ser únic en el tipus d'etiqueta" #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:79 -#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/CustomerCommunicationCRUDController.java:207 -#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractorCommunicationCRUDController.java:249 +#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/CustomerCommunicationCRUDController.java:196 +#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractorCommunicationCRUDController.java:241 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:366 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:504 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1236 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:506 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1229 #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:478 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/Util.java:556 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/Util.java:561 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:37 #: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:26 #: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:26 -#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:44 +#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:43 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:81 #: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:37 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:134 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:37 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:47 #: libreplan-webapp/src/main/webapp/templates/_listTemplates.zul:46 -#: libreplan-webapp/src/main/webapp/profiles/_listProfiles.zul:35 +#: libreplan-webapp/src/main/webapp/profiles/_listProfiles.zul:36 #: libreplan-webapp/src/main/webapp/unittypes/_editUnitType.zul:25 #: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:47 #: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:42 @@ -7289,12 +7302,20 @@ msgstr "Prémer el següent enllaç per a tornar a la pàgina d'inici:" msgid "New password" msgstr "Nova paraula de pas" +#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:20 +msgid "LibrePlan: Project Status Report" +msgstr "LibrePlan: Informe d’estat de projecte" + #: libreplan-webapp/src/main/java/org/libreplan/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:159 msgid "" "The planning of this task is not in the current scenenario.\n" "You should change to any of the following scenarios: {0}" msgstr "La planificació d'aquesta tasca no existeix a l'escenari actual.⏎ S'ha de canviar a un dels següents escenaris: {0}" +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetDTO.java:124 +msgid "{0} 2nd fortnight" +msgstr "{0} Segona quinzena" + #: libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul:20 msgid "LibrePlan: Received From Customers" msgstr "LibrePlan: Rebut dels clients" @@ -7320,7 +7341,7 @@ msgid "Unit price" msgstr "Unitat de preu" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:288 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1293 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1286 msgid "Not enough permissions to create templates" msgstr "No té permisos per a crear plantilles" @@ -7328,7 +7349,7 @@ msgstr "No té permisos per a crear plantilles" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1350 msgid "" "Invalid value. Value must be greater than the value of previous progress." -msgstr "Valor invàlid. El valor ha se der més gran que el valor del progrés previ." +msgstr "Valor invàlid. El valor ha de ser més gran que el valor del progrés previ." #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:109 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:126 @@ -7349,7 +7370,7 @@ msgstr "Codi de projecte" msgid "Reassigning" msgstr "Reassignant" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:643 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:642 msgid "{0} already assigned to resource allocation list" msgstr "{0} ja està assignat a la llista d'assignació de recursos" @@ -7361,6 +7382,10 @@ msgstr "Sense valoracions" msgid "Label Types List" msgstr "Llista de tipus d'etiquetes" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:72 +msgid "Hours type for personal timesheets" +msgstr "Tipus d’hores pel full de treball personal" + #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/QualityFormBandboxFinder.java:51 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/LabelBandboxFinder.java:52 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceInExpenseSheetBandboxFinder.java:44 @@ -7369,7 +7394,6 @@ msgstr "Llista de tipus d'etiquetes" #: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:56 #: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:91 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:154 -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:150 #: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:35 #: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:51 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:79 @@ -7414,11 +7438,11 @@ msgstr "Refrescar" msgid "Two Hour Cost of the same type overlap in time" msgstr "Dos costes per hora del mateix tipus se superposen en el temps" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:501 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:508 msgid "Home" msgstr "Inici" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:105 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:114 msgid "Enable/Disable" msgstr "Habilitar/Inhabilitar" @@ -7443,6 +7467,10 @@ msgstr "percentatge ha d'estar entre 1 i 100" msgid "Communication Date" msgstr "Data de comunicació" +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractedTaskData.java:281 +msgid "delivery date not specified" +msgstr "data de lliurament no indicada" + #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:1009 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:578 msgid "no" @@ -7472,19 +7500,19 @@ msgstr "Criteri" msgid "Edit Timesheet" msgstr "Editar full d'hores" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:105 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:104 msgid "unl" msgstr "unl" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1628 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1629 msgid "Please select a worker" msgstr "Si us plau, seleccioneu un treballador" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:309 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:318 msgid "Test LDAP connection" msgstr "Comprovar la connexió LDAP" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:125 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:134 msgid "Generate code for" msgstr "Generar codi per" @@ -7496,7 +7524,7 @@ msgstr "Generar codi per" #: libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderElementTemplate.java:365 #: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/BaseCalendar.java:160 #: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionType.java:99 -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:519 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:529 msgid "name not specified" msgstr "nom no especificat" @@ -7516,19 +7544,15 @@ msgstr "Rendiment de cost de treball" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:96 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:117 msgid "Queue-based Resources Planning" -msgstr "Planificació de recurs basats en cues" +msgstr "Planificació de recursos basats en cues" -#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:56 -msgid "Previous" -msgstr "Previ" - -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:140 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:137 msgid "Create project from Template" msgstr "Crear projecte des de la plantilla" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:129 -msgid "Unit Type name cannot be empty" -msgstr "Tipus d'unitat no pot estar buida" +#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:56 +msgid "Previous" +msgstr "Previ" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:436 msgid "" @@ -7545,7 +7569,7 @@ msgstr "Valor ja enviat al client. Els valor no poden ser canviats " msgid "an authorization type must be set" msgstr "s'ha d'establir un tipus d'autorització" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:872 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:869 msgid "" "This project is a subcontracted project. If you delete it, you won't be able" " to report progress anymore. Are you sure?" @@ -7607,7 +7631,7 @@ msgstr "Desmarcar" #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:284 msgid "Queue-based Resources" -msgstr "Recurs basats en cues" +msgstr "Recursos basats en cues" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:1103 msgid "Hours Group at {0}" @@ -7628,6 +7652,7 @@ msgstr "Data de termini" msgid "Invalid Start Date. New Start Date must be earlier than End Date" msgstr "Data d'inici invàlida. Nova data d'inici ha de començar abans que la data de finalització" +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportQueryController.java:373 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:115 msgid "Tasks" msgstr "Tasques" @@ -7693,7 +7718,7 @@ msgstr "esforç basat en rellotge no està calculat correctament" msgid "Status" msgstr "Estats" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:323 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:322 msgid "from {0}" msgstr "des de {0}" @@ -7701,7 +7726,7 @@ msgstr "des de {0}" msgid "Resource load view" msgstr "Vista de la càrrega de recursos" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:810 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:811 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeComponent.java:81 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:70 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/EffortDurationPicker.java:62 @@ -7732,15 +7757,11 @@ msgstr "Tipus dels formularis de qualitat" msgid "{0} \"{1}\" deleted" msgstr "{0} \"{1}\" eliminat" -#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/TypeOfWorkHours.java:146 -msgid "type of work hours for monthly timesheets cannot be disabled" -msgstr "tipus de hores treballades per full d'hores mensuals no es pot inhabilitar" - #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:364 msgid " hours" msgstr "hores" -#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:259 +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:262 msgid "" "% Deviation interval (difference % between consumed and estimated hours)" msgstr "% Interval de desviació (% de diferències entre hores consumides i estimades)" @@ -7754,28 +7775,24 @@ msgid "Worker ID cannot be empty" msgstr "El ID de treballador no pot estar buit" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/Type.java:31 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:303 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:306 msgid "All project tasks" msgstr "Totes les tasques del projecte" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:390 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:399 msgid "LDAP Roles (separated by ;)" -msgstr "\"Roles\" LDAP (separades per ;)" +msgstr "\"Roles\" LDAP (separats per ;)" #: libreplan-webapp/src/main/webapp/planner/taskpanels/_allocationConfiguration.zul:27 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:78 msgid "Allocation configuration" msgstr "Configuració d'assignació" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:350 -msgid "Database" -msgstr "Base de dades" - #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:61 msgid "Subcontract price" msgstr "Preu del subcontracte" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:427 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:434 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:71 msgid "Send To Customers" msgstr "Enviar a clients" @@ -7784,22 +7801,27 @@ msgstr "Enviar a clients" msgid "The page that you are requesting does not exist." msgstr "La pàgina que s'ha demanat no existeix." +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:495 +msgid "" +"In personal timesheets, all timesheet lines should be in the same period" +msgstr "En el full de treball personal, totes les línies han d’estar en el mateix període" + #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:835 msgid "Resources per day are zero" msgstr "Els recursos per dia són 0" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1079 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1083 msgid "Value is not valid in current list of Hours Group" msgstr "Valor no és vàlid en la llista actual d'hores de grup" -#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:100 -msgid "Total extra per day" -msgstr "Extra total per dia" - #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:38 msgid "Timesheets List" msgstr "Llista de full d'hores" +#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:100 +msgid "Total extra per day" +msgstr "Extra total per dia" + #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:32 #: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:31 msgid "Assigned criteria" @@ -7809,13 +7831,13 @@ msgstr "Criteris assignats" msgid "Help on authentication (opens a new window)" msgstr "Ajuda en l'autenticació (s'obre una nova finestre)" -#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:42 +#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:42 msgid "Timesheet data" msgstr "Detalls del full d'hores" #: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:34 msgid "Base calendar type" -msgstr "Tipys de calendari base" +msgstr "Tipus de calendari base" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:78 msgid "Imputed expenses" @@ -7833,9 +7855,9 @@ msgstr "No s'ha pogut desar l'escenari" #: libreplan-webapp/src/main/webapp/orders/_orderFilter.zul:33 #: libreplan-webapp/src/main/webapp/orders/_orderFilter.zul:35 msgid "Apply filtering to tasks satisfying required criteria" -msgstr "Applicar filtrat a les tasques que compleixen els criteris necessaris" +msgstr "Aplicar filtrat a les tasques que compleixen els criteris necessaris" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:485 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:487 #: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:39 msgid "Task Scheduling Status In Project" msgstr "Estat de tasques planificades en el projecte" @@ -7853,7 +7875,7 @@ msgstr "el nom de l'empresa ha de ser únic. Aquest nom ja està en ús" #: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:162 #: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/ExpensesAreaController.java:92 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:378 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:873 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:870 #: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:313 msgid "Confirm" msgstr "Confirmar" @@ -7861,12 +7883,12 @@ msgstr "Confirmar" #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:48 #: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:33 #: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:40 -#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:57 +#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:56 #: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:56 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:49 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:58 -#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:36 -#: libreplan-webapp/src/main/webapp/profiles/_listProfiles.zul:49 +#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:38 +#: libreplan-webapp/src/main/webapp/profiles/_listProfiles.zul:50 #: libreplan-webapp/src/main/webapp/unittypes/_listUnitTypes.zul:32 #: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:55 #: libreplan-webapp/src/main/webapp/calendars/_list.zul:35 @@ -7903,11 +7925,11 @@ msgstr "Preu total" msgid "criterion codes must be unique inside a criterion type" msgstr "codi de criteri ha de ser únic dins del tipus de criteri" -#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:37 +#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:37 msgid "Warning: Not editing from home page of bound users" msgstr "Atenció: no editar des de la pàgina d'inici dels usuaris limitats" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetController.java:192 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:195 #: libreplan-webapp/src/main/java/org/libreplan/web/common/EffortDurationBox.java:49 msgid "Invalid Effort Duration" msgstr "Duració d'esforç invàlid" @@ -7925,22 +7947,22 @@ msgstr "Data d'inici no especificada" #: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:292 #: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:212 #: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:412 -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1208 -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1220 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1209 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1221 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:341 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1189 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1195 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1193 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1199 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:287 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:456 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:143 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:162 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractController.java:223 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractController.java:210 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionController.java:408 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:648 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:270 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:895 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1215 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1462 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:894 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1214 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1461 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:452 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:959 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:324 @@ -7949,11 +7971,11 @@ msgstr "Data d'inici no especificada" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:201 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:331 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:404 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1252 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1655 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1245 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1642 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:99 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:42 -#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:49 +#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:48 #: libreplan-webapp/src/main/webapp/materials/materials.zul:107 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:87 #: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:43 @@ -7973,10 +7995,10 @@ msgstr "Data d'inici no especificada" #: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:115 #: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:156 #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:108 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:170 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:168 #: libreplan-webapp/src/main/webapp/templates/_listTemplates.zul:51 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:57 -#: libreplan-webapp/src/main/webapp/profiles/_listProfiles.zul:40 +#: libreplan-webapp/src/main/webapp/profiles/_listProfiles.zul:41 #: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:52 #: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:46 #: libreplan-webapp/src/main/webapp/resources/_criterions.zul:88 @@ -8168,7 +8190,7 @@ msgstr "inici no abans que" #: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:45 msgid "start in fixed date" -msgstr "començar en data fixe" +msgstr "començar en data fixa" #: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:57 msgid "as late as possible" @@ -8218,10 +8240,6 @@ msgstr "Editar tots els projectes" msgid "Create projects" msgstr "Crear projectes" -#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:73 -msgid "Timesheet Lines List Report" -msgstr "Llista d'informes de línies del full d'hores" - #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:74 msgid "Hours Worked Per Resource Report" msgstr "Informe de hores treballades per recurs" @@ -8254,6 +8272,14 @@ msgstr "Informe de projecte de l'estat de tasques planificades" msgid "Materials Needs At Date Report" msgstr "Materials necessaris a la data de l'informe" +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:344 +msgid "Database" +msgstr "Base de dades" + +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:345 +msgid "LDAP" +msgstr "LDAP" + #: libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderLineTemplate.java:156 msgid "Line" msgstr "Línia" @@ -8308,11 +8334,11 @@ msgstr "TREBALLADOR" #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/ResourceEnum.java:33 msgid "MACHINE" -msgstr "MÀQUIMA" +msgstr "MÀQUINA" #: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:33 msgid "OFFERED" -msgstr "OFERIT" +msgstr "OFERT" #: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:33 msgid "ACCEPTED" @@ -8362,17 +8388,17 @@ msgstr "P" msgid "U" msgstr "U" -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:761 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:774 #: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLineGroup.java:995 msgid "Cannot spread two progress in the same task" msgstr "No es poden propagar dos processos en la mateixa tasca" -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:785 -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:811 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:798 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:824 msgid "Duplicate Progress Assignment For Task" msgstr "Assignació de progrés duplicat per la tasca" -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:1133 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:1146 msgid "Quality form already exists" msgstr "Formulari de qualitat ja existeix" @@ -8384,6 +8410,18 @@ msgstr "El percentatge total ha de ser menys de 100%" msgid "The criterion already exists into another task" msgstr "El criteri ja existeix en un altra tasca" +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/PersonalTimesheetsPeriodicityEnum.java:35 +msgid "Monthly" +msgstr "Mensual" + +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/PersonalTimesheetsPeriodicityEnum.java:66 +msgid "Twice-monthly" +msgstr "Dos cops al mes" + +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/PersonalTimesheetsPeriodicityEnum.java:123 +msgid "Weekly" +msgstr "Setmanal" + #: libreplan-business/src/main/java/org/libreplan/business/common/entities/ProgressType.java:37 msgid "Progress with all tasks by hours" msgstr "Progrés amb totes les tasques per hores"