From 74545e2356b3778135bb67a89546d5ff790b9f45 Mon Sep 17 00:00:00 2001 From: Jeroen Baten Date: Wed, 10 Oct 2012 17:48:50 +0200 Subject: [PATCH] i18n: Update Dutch translation --- ganttzk/src/main/resources/i18n/nl.po | 6 +- .../projectStatus_nl.properties | 11 + .../src/main/resources/i18n/nl.po | 1376 +++++++++-------- 3 files changed, 721 insertions(+), 672 deletions(-) create mode 100644 libreplan-webapp/src/main/jasper/projectStatus_Bundle/projectStatus_nl.properties diff --git a/ganttzk/src/main/resources/i18n/nl.po b/ganttzk/src/main/resources/i18n/nl.po index 5ccc285c2..272dcafd0 100644 --- a/ganttzk/src/main/resources/i18n/nl.po +++ b/ganttzk/src/main/resources/i18n/nl.po @@ -8,9 +8,9 @@ # Jeroen Baten , 2012. msgid "" msgstr "" -"Project-Id-Version: libreplan-1.3.0\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" +"POT-Creation-Date: 2012-10-02 12:44+0200\n" "PO-Revision-Date: 2012-07-06 09:59+0000\n" "Last-Translator: Jeroen Baten \n" "Language-Team: Nederlands\n" @@ -18,7 +18,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: nl\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 diff --git a/libreplan-webapp/src/main/jasper/projectStatus_Bundle/projectStatus_nl.properties b/libreplan-webapp/src/main/jasper/projectStatus_Bundle/projectStatus_nl.properties new file mode 100644 index 000000000..d13c415c3 --- /dev/null +++ b/libreplan-webapp/src/main/jasper/projectStatus_Bundle/projectStatus_nl.properties @@ -0,0 +1,11 @@ +# Locale for projectStatusReport.jrxml +title = Project statusrapport +project = Project +project_estimated_hours = Geschatte uren\: +project_planned_hours = Geplande uren\: +project_imputed_hours = Ingevoerde uren\: +code = Code +name = Naam +estimated_hours = Geschat +planned_hours = Gepland +imputed_hours = Ingevoerd diff --git a/libreplan-webapp/src/main/resources/i18n/nl.po b/libreplan-webapp/src/main/resources/i18n/nl.po index 3c753df11..ee215458a 100644 --- a/libreplan-webapp/src/main/resources/i18n/nl.po +++ b/libreplan-webapp/src/main/resources/i18n/nl.po @@ -8,19 +8,19 @@ # Jeroen Baten , 2012. msgid "" msgstr "" -"Project-Id-Version: libreplan-1.3.0\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-07-09 15:50+0000\n" +"POT-Creation-Date: 2012-10-02 12:44+0200\n" +"PO-Revision-Date: 2012-10-10 09:40+0000\n" "Last-Translator: Jeroen Baten \n" "Language-Team: Nederlands\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: nl\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\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 "Valutacode niet gespecificeerd" @@ -32,7 +32,7 @@ msgstr "U heeft geen rechten voor het toevoegen van gebruikers" msgid "Availability ratio" msgstr "Beschikbaarheidsratio" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:358 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:367 msgid "Group path" msgstr "Groep pad" @@ -71,13 +71,13 @@ msgstr "Kies rapport gegevens" msgid "Create Virtual Worker" msgstr "Maak Virtuele werker" -#: 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 "Maak Virtuele werker" #: 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 "Maak Virtuele werker" #: 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 "Operations" @@ -156,12 +156,16 @@ msgstr "Basisgegevens" msgid "Select" msgstr "Selecteer" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:498 +msgid "Project Status" +msgstr "Project Status" + #: 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 "Startdatum kan niet leeg zijn" -#: 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,7 +189,7 @@ msgstr "Opnieuw toekennen" msgid "Not bound" msgstr "Niet gebonden" -#: 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 "Op kritieke pad uren" @@ -194,7 +198,7 @@ msgstr "Op kritieke pad uren" msgid "MonteCarlo Method" msgstr "MonteCarlo Methode" -#: 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 "Geen deadline" @@ -232,7 +236,7 @@ msgid "Predefined" msgstr "Voorgedefinieerd" #: 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 "Kwaliteit formulieren" msgid "A stretch has lower or equal values than the previous stretch" msgstr "Een periode heeft lgere of gelijke waarde dan een vorige periode" -#: 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 "Rapporten" @@ -255,7 +259,7 @@ msgstr "Toekenningen konden niet worden afgerond" msgid "Create task" msgstr "Maak taak" -#: 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 "gebruikersnaam niet gespecificeerd" @@ -267,8 +271,8 @@ msgstr "LibrePlan: Gevorderd toekennen" msgid "Criterion requirements" msgstr "Criteria requirements" -#: 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 "Kies aub een timesheet sjabloontype" @@ -278,7 +282,7 @@ msgstr "Dedication grafiek" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:118 msgid "Sum of expenses imputed in children tasks" -msgstr "Som van uitgaven imputed in afgeleide taken" +msgstr "Som van uitgaven toegewezen in afgeleide taken" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:710 msgid "Progress that are reported by quality forms can not be modified" @@ -312,16 +316,16 @@ msgstr "Gedaan werk" msgid "Unassign" msgstr "Weghalen" -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:36 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:37 msgid "Filter timesheet lines by" msgstr "Filter timesheet regels bij" -#: 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 "Handmatige toekenning" -#: 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 "Bedrijven" @@ -336,11 +340,11 @@ msgstr "Kwaliteitsformulierenlijst" msgid "Create {0}: {1}" msgstr "Maak {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 "naam van entiteit niet gespecificeerd" -#: 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 "U heeft geen rechten om naar het werker wijzigingsscherm te gaan" @@ -349,7 +353,7 @@ msgid "generic workers allocation" msgstr "Algemene werker toekenning" #: 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 "Het project heeft geen ingeplande elementen" @@ -363,7 +367,7 @@ msgstr "Start" msgid "cost assignment's category not specified" msgstr "kosten toekenningscategorie niet gespecificeerd" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:112 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:121 msgid "Check for updates" msgstr "Controleer op updates" @@ -424,8 +428,14 @@ msgstr "Standaard Kalender" msgid "criterion not specified" msgstr "criterium niet gespecificeerd" +#: 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 "slechts één urenstaatregel per dag en taak is toegestaan in individuele urenstaten" + #: 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 "projectkalender niet gespecificeerd" msgid "Project Name" msgstr "Projectnaam" +#: 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 "type werkuren kan bij individuele urenstaten niet gedisabled worden" + #: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/ExternalCompany.java:166 msgid "Company ID already used. It must be unique" msgstr "Bedrijfs-ID reeds gebruikt. Deze dient uniek te zijn" @@ -453,7 +467,13 @@ msgstr "Bedrijfs-ID reeds gebruikt. Deze dient uniek te zijn" msgid "Cannot be higher than Ending Date" msgstr "Kan niet later zijn dan einddatum" -#: 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 "Rollen van LDAP gebruikers kunnen niet beheert worden omdat LDAP aan staat en LDAP rollen worden gebruikt." + +#: 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 "Inspringen" @@ -462,7 +482,7 @@ msgstr "Inspringen" msgid "Reassignation" msgstr "Opnieuw toekennen" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:331 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:340 msgid "Save passwords in database" msgstr "Sla wachtwoord op in database" @@ -516,11 +536,15 @@ msgstr "Nieuw kwaliteitsformulier item" msgid "LibrePlan: Labels" msgstr "LibrePlan: Labels" -#: 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 "U heeft de maximum limiet van gebruikers bereikt" + +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:254 msgid "LDAP connection was successful" msgstr "LDAP verbinding was successvol" -#: 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 "Dit resource toekenningstype is niet compatibel. De taak heeft een geass msgid "position not specified" msgstr "positie niet gespecificeerd" -#: 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 "Huidig" @@ -600,23 +624,23 @@ msgstr "Gecontroleerd" msgid "a disabled resource has enabled subresources" msgstr "een niet actieve resource heeft actieve subresources" -#: 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 "Klant" #: 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 "Er zijn geen resources voor dit vereiste criterium: {0}. Dus de automatische toekenning kan niet worden toegevoegd" -#: 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 "moet later dan startdatum zijn" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:351 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:360 msgid "Role search strategy" msgstr "Rol zoek strategie" @@ -624,7 +648,7 @@ msgstr "Rol zoek strategie" msgid "fields should match with timesheet data if are shared by lines" msgstr "velden moeten overeen komen met onkostensheet gegevens indien zijn gedeeld met regels" -#: 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 "Er bestaat al een leveringsdatum met dezelfde datum." @@ -634,9 +658,9 @@ msgstr "Materiaal cateogienaam moet uniek zijn. Het is echter al gebruikt" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:169 msgid "Imputed hours" -msgstr "Imputed uren" +msgstr "Toegewezen uren" -#: 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 "voorgang dient meer dan 0% en minder dan 100% te zijn" @@ -653,7 +677,7 @@ msgstr "Bevestiging verwijdering uurprijs. Weet u het zeker?" msgid "Delete Milestone" msgstr "Verwijder mijlpaal" -#: 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 "extern bedrijf moet een onderaannemer zijn" @@ -665,15 +689,15 @@ msgstr "Niet-toegekende lokaties" msgid "Application URI" msgstr "Application URI" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:353 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:362 msgid "Group strategy" msgstr "Groepsstrategie" -#: 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 "Budget: {0}, Verbruikt: {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 "Configureer" @@ -695,10 +719,10 @@ msgstr "LibrePlan: Zend Naar Onderaannemers" #: 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 "Bevestig verwijderen {0}. Weet u het zeker?" @@ -710,15 +734,20 @@ msgstr "Wijzig geselecteerde taak" msgid "External code" msgstr "Externe code" +#: 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 "Persoonlijke urenstaat opgeslagen" + #: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:51 msgid "View" msgstr "Toon" -#: 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 "Onderaannemingsdatum niet gespecificeerd\t" -#: 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 "basis niet gespecificeerd" @@ -730,7 +759,7 @@ msgstr "Nieuwe leveringsdatum" msgid "Required materials" msgstr "Vereiste materialen" -#: 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 "Achteruit" @@ -760,30 +789,25 @@ msgstr "Op" msgid "EAC" msgstr "EAC" -#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:39 -msgid "Predecessor" -msgstr "Voorganger" - -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:602 -msgid "Not workable day" -msgstr "Geen werkdag" - #: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:539 msgid "it already exists another expense sheet with the same code." msgstr "er bestaat al een ander declaratieformulier met dezelfde code." -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/TreeElementOperationsController.java:55 -msgid "Please select a task" -msgstr "Kies een taak" +#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:39 +msgid "Predecessor" +msgstr "Voorganger" + +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:601 +msgid "Not workable day" +msgstr "Geen werkdag" #: 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 "Een stap heeft hogere of gelijke waarden dan de vorige stap" -#: 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 "slechts een urenstaatregel per dag per taak is toegestaan in maandelijkse urenstaten" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/TreeElementOperationsController.java:55 +msgid "Please select a task" +msgstr "Kies een taak" #: 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 "Dit project is al toegevoegd" #: 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 "Criteria" @@ -882,7 +906,7 @@ msgstr "Waarde moet een veelvoud zijn van de precisiewaarde van het voortgangsty msgid "Set Filter Options" msgstr "Stel filter opties in" -#: 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 "Kies een criterium" msgid "{0} annotation required on {1}" msgstr "{0} annotatie vereist bij {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 "Sommige te verwijderen sequenties bestaat niet" -#: 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 "Gewijzigd" +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:956 +msgid "cannot be negative" +msgstr "kan niet negatief zijn" + #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:215 msgid "Add Criterion" msgstr "Voeg criterium toe" -#: 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 prefix ongeldig. het kan niet leeg zijn of alleen spaties bevatten." -#: 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 "overerfde uitzondering kan niet worden verwijderd" @@ -988,7 +1016,7 @@ msgstr "Sjablonenlijst" msgid "Criteria: {0}" msgstr "Criteria: {0}" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:244 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:253 msgid "Last value" msgstr "Laatste waarde" @@ -1021,12 +1049,17 @@ msgstr "item" msgid "Profile" msgstr "Profiel" -#: 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 "Persoonlijke urenstaat" + +#: 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 "Benodigde materialen op datum" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:296 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:305 msgid "UserDn" msgstr "UserDN" @@ -1069,6 +1102,10 @@ msgstr "Er is een andere urenstaatsjabloon met dezelfde code" msgid "Overload due to other assignments" msgstr "Overbelast ivm andere opdrachten" +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/GlobalProgressChart.java:123 +msgid "Project progress percentage" +msgstr "Project voortgangspercentage" + #: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:104 msgid "Expense properties" msgstr "Onkosten eigenschappen" @@ -1091,17 +1128,11 @@ msgstr "Weet u zeker dat u het resource type wilt wijzigen? U verlies de criteri msgid "This Criterion has already been added." msgstr "Dit criterium is al toegevoegd" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:226 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:235 msgid "add" msgstr "toevoegen" -#: 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 "Budgetwaarde kan niet negatief zijn" - -#: 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 "kies aub een gebruiker om aan te koppelen" msgid "Workers" msgstr "Werkers" -#: 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 "Jaar" msgid "{0} \"{1}\" could not be deleted, it was already removed" msgstr "{0} \"{1}\" kon niet verwijderd worden, het was reeds verwijderd" -#: 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 "Ontvangen Van Onderaannemers" @@ -1163,9 +1194,9 @@ msgstr "Startdatum" msgid "LibrePlan: Hours Types" msgstr "LibrePlan: Urentypes" -#: 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 "By all tasks hours" +msgstr "Alle taakuren" #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:66 msgid "Hour costs" @@ -1195,8 +1226,8 @@ msgstr "er zijn geen geldige periodes voor deze kalender" msgid "Add role" msgstr "Rol toevoegen" -#: 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 "UItzonderingseinddatum moet op of na stardatum liggen" @@ -1218,7 +1249,8 @@ msgstr "Periodedatum mag niet voor startdatum van taak liggen:" msgid "Progress Types List" msgstr "Lijst voortgangstypes" -#: 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 "De code kan niet leeg en moet uniek zijn." #: 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 "Profielen" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/UserDashboardController.java:60 -msgid "Monthly timesheet \"{0}\" saved" -msgstr "Maandurenstaat \"{0}\" opgslagen" - #: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:46 #: libreplan-webapp/src/main/webapp/myaccount/_expensesArea.zul:35 msgid "First expense" msgstr "Eerste onkosten" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:275 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:284 msgid "Host" msgstr "Host" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:198 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:207 msgid "Perspectives" msgstr "Perspectieven" @@ -1292,6 +1320,10 @@ msgstr "Splits nieuwe toewijzing" msgid "maxixum value of percentage progress type must be 100" msgstr "maximum waarde van procentuele voortgang moet 100 zijn" +#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:84 +msgid "Total personal timesheet" +msgstr "Totaal persoonlijke urenstaat" + #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:275 msgid "Expiry date" msgstr "Verloopdatum" @@ -1346,11 +1378,11 @@ msgstr "Taak: {0}" msgid "Percentage" msgstr "Percentage" -#: libreplan-webapp/src/main/webapp/dashboard/_costStatus.zul:52 +#: libreplan-webapp/src/main/webapp/dashboard/_costStatus.zul:55 msgid "Remaining time" msgstr "Resterende tijd" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:88 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:97 msgid "Company logo URL" msgstr "Bedrijfslogo URL" @@ -1358,16 +1390,16 @@ msgstr "Bedrijfslogo URL" msgid "No worker selected" msgstr "Geen werker geselecteerd" -#: 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 "Aantal cijfers" -#: 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 "Taak niet gevonden" -#: 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 "bedrijfscode mag geen spaties bevatten" @@ -1380,7 +1412,7 @@ msgstr "Totale beschikbaarheid" msgid "Problems connecting with client web service" msgstr "Problemen bij het verbinden met de client web service" -#: 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" @@ -1404,21 +1436,21 @@ msgstr "Profielen Lijst" msgid "both {0} of category {1} and {2} of category {3} have the same code" msgstr "zowel {0} van categorie {1} en {2} van categorie {3} hebben dezelfde code" -#: 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 "Labels" -#: 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 "Wachtrij-gebaseerde resource toekenning" @@ -1431,11 +1463,7 @@ msgstr "Einddatum afgegeven door de onderaannemer" msgid "New timesheet" msgstr "Nieuwe tijdsheet" -#: 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 "Totaal aantal uren" msgid "Reassigning {0} projects" msgstr "opnieuw toewijzen {0} projecten" +#: 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 "Filter op taak status" -#: 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 "Selecteer datum" -#: 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 "status niet gespecificeerd" @@ -1522,13 +1550,13 @@ msgstr "Activeringsperioden" #: 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 "Kalender" -#: 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 "Resources" @@ -1560,7 +1588,7 @@ msgid "scenario" msgstr "scenario" #: 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,11 +1599,11 @@ msgstr "naar" msgid "worker's first name not specified" msgstr "voornaam werker niet gespecificeerd" -#: 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 "Einddatum kan alleen verwijderd worden in de laatste verlenging" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:354 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:363 msgid "Property strategy" msgstr "Eigendom strategie" @@ -1628,7 +1656,7 @@ msgid "Last name" msgstr "Achternaam" #: 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 "Verwijder" @@ -1652,7 +1680,7 @@ msgstr "Voortgangstype" msgid "name not specified or empty" msgstr "naam niet opgegeven of leeg" -#: 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 "Taak bevat geconsolideerde voortgang. Kan sigmoid functie niet toepassen." @@ -1664,7 +1692,7 @@ msgstr "Datum kan niet de hele volgende werkweek bevatten" msgid "LibrePlan: Virtual Worker Groups" msgstr "LibrePlan: Virtueel team" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:324 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:333 msgid "UserId" msgstr "GebruikersID" @@ -1683,11 +1711,11 @@ msgstr "Startdatum is ongeldig, de nieuwe startdatum moet voor de huidige startd msgid "Create New Project" msgstr "Maak nieuw project" -#: 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 "Stretches lijst" -#: 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 "naar {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,11 +1756,11 @@ 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 "Opslaan" -#: 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. " @@ -1743,13 +1771,13 @@ msgstr "Het is alleen mogelijk om een leverdatum toe te voegen als alle leverdat msgid "Standard Effort" msgstr "Standaard Effort" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:158 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:167 msgid "Material categories" msgstr "Materiaal categorien" -#: 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 "Aantal cijfers moet tussen {0} en {1} liggen" @@ -1776,7 +1804,7 @@ msgid "" "progress assignment from root task" msgstr "Spreidingsvoortgang kan niet gewijzigd worden als er een consolidatie in een van de voortgangstaken van de root taak is" -#: 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 "Plan van deadline naar start" @@ -1789,10 +1817,6 @@ msgstr "Gebruikersautorisatie" msgid "Problems connecting with subcontractor web service" msgstr "Problemen bij het verbinden met een onderaannemer web service" -#: libreplan-webapp/src/main/webapp/myaccount/_monthlyTimesheetsArea.zul:22 -msgid "Monthly timesheets" -msgstr "Maandelijkse urenstaat" - #: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:377 msgid "Delete template. Are you sure?" msgstr "Verwijder sjabloon. weet u het zeker?" @@ -1801,12 +1825,12 @@ msgstr "Verwijder sjabloon. weet u het zeker?" msgid "Expense date" msgstr "Onkosten datum" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:236 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:245 msgid "Entity type" msgstr "Entiteittype" -#: 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 "Niet opgeslagen wijzigingen zullen verloren gaan. Weet u het zeker?" @@ -1854,15 +1878,16 @@ msgstr "Alles Uitklappen/Inklappen" msgid "Overload due to current project" msgstr "Overbelast door huidig project" -#: 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 "Naam: {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 "Omlaag" #: 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 "Declaratieformulier" msgid "Report structure" msgstr "Rapportstructuur" -#: 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 "resource moet gekoppeld zijn aan een gebruiker bij een persoonlijke urenstaat" + +#: 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 "Ja" @@ -1891,7 +1920,7 @@ msgstr "Ja" msgid "Go to user edition window" msgstr "Ga naar gebruiker wijzigingsvenster" -#: 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 "Bereken aantal uren" msgid "Assign" msgstr "Toekenne" -#: 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 "Maak sjabloon" @@ -1942,7 +1971,7 @@ msgid "last expense sheet line sequence code not specified" msgstr "Laatste declaratieformulier volgcode niet gespecificeerd" #: 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 "Niet genoeg rechten om dit project te wijzigen" @@ -1959,12 +1988,17 @@ msgstr "Gevorderde zoekopdracht" msgid "Filter by labels" msgstr "Filter op label" -#: 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 "BELANGRIJK: Vergeet niet aan de onderaannemer te melden dat zijn contract is beeindigd" +#: 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 "Project statusrapport" + #: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:36 msgid "MonteCarlo chart" msgstr "MonteCarlo grafiek" @@ -1973,7 +2007,7 @@ msgstr "MonteCarlo grafiek" msgid "Schedule Variance" msgstr "Plan Variantie" -#: 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 "resources per dag kan niet leeg zijn of lager dan nul" @@ -1981,7 +2015,7 @@ msgstr "resources per dag kan niet leeg zijn of lager dan nul" msgid "Criterion cannot be empty" msgstr "Criteria kunnen niet leeg zijn" -#: 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 "bedrijfscode niet gespecificeerd" @@ -2002,9 +2036,9 @@ msgstr "indexvelden en labels moeten uniek en opvolgend zijn" #: 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 "Opdrachttype" msgid "Duration (days)" msgstr "Duur (dagen)" -#: 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 "Zend Naar Onderaannemers" @@ -2086,7 +2120,7 @@ msgstr "Labeltype al toegekend" msgid "Timesheets Template" msgstr "Urenstaatsjabloon" -#: 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 niet gespecificeerd" @@ -2094,7 +2128,7 @@ msgstr "Host niet gespecificeerd" msgid "percentages in quality form items must be unique" msgstr "Percentages in kwaliteitsformulieritems moeten uniek zijn" -#: 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 "Wijzig wachtij-gebaseerde resource" @@ -2113,7 +2147,7 @@ msgstr "Waarde is ongeldig.\nCode kan geen letters bevatten zoals '_'." msgid "Node without children" msgstr "Knooppunt zonder kinderen" -#: 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 "Achternaam" msgid "calendars with zero hours are not allowed" msgstr "kalenders met nul uren zijn niet toegestaan" -#: 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 "kalenders met nul uren zijn niet toegestaan" #: 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,8 +2219,8 @@ msgstr "Toevoegen vanaf sjabloon" msgid "Expense Sheets List" msgstr "Onkostendeclaratielijst" -#: 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 "Toegekende resources voor deze taak zullen verwijderd worden. Weet u het zeker?" @@ -2194,11 +2228,11 @@ msgstr "Toegekende resources voor deze taak zullen verwijderd worden. Weet u het msgid "Filter by month" msgstr "Filter op maand" -#: 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 "De code is ongeldig. Er is een ander unittype met dezelfde code" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:259 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:268 msgid "Enable LDAP authentication" msgstr "Inschakelen LDAP authenticatie" @@ -2224,7 +2258,7 @@ msgid "Cannot calculate charts for current data" msgstr "Kan geen grafiek berekenen met actuele gegevens" #: 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 "projectnaam reeds gebruikt" @@ -2247,6 +2281,7 @@ msgstr "percentage moet uniek zijn" #: 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 "Label" msgid "price cost not specified" msgstr "Prijs niet gespecificeerd" +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:218 +msgid "Task Completation Lead/Lag" +msgstr "Taak Voltooiing voorsprong/vertraging" + #: 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 "Dagen vanaf de aanvang tot de deadline" msgid "Estimate At Completion" msgstr "Schatting van voltooiing" -#: 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 "Indirect" @@ -2326,14 +2365,18 @@ msgstr "Startdatum van de opdracht niet gespecificeerd" msgid "No tasks available yet" msgstr "Taken nog niet beschikbaar" -#: 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 "Uitvoerformaat" + +#: 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 "Direkt" -#: 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 "Werkweek" msgid "Please select a source scenario" msgstr "Kies aub een bronscenario" -#: 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 "BedrijfsID" -#: 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 "Entiteitssequences" #: 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 "moet na einddatum zijn" @@ -2401,7 +2444,7 @@ msgstr "Vertraging vanaf het begin (dagen)" msgid "Total Hours" msgstr "Totaal aantal uren" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:389 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:398 msgid "LibrePlan Role" msgstr "LibrePlan Rol" @@ -2409,24 +2452,20 @@ msgstr "LibrePlan Rol" msgid "Must start after (days since project start)" msgstr "Moet starten na (aantal dagen sinds aanvang project)" -#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:37 -msgid "Create Progress Type" -msgstr "Maak voortgangstype" - #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionController.java:129 msgid "Confirm cancel" msgstr "Bevestig afbreken" -#: 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 "Werk en voortgang per taak" -#: 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 "projectcode reeds gebruikt" -#: 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 "De {0} sequenceprefix kan niet worden herhaald" @@ -2438,15 +2477,15 @@ msgstr "type niet gespecificeerd" msgid "WBS (tasks)" msgstr "WBS (taken)" -#: 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 "Verwijderen sequence" -#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:104 +#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:104 msgid "Total extra" msgstr "Totaal 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 "Ontvangen van klanten" @@ -2463,7 +2502,7 @@ msgstr "LibrePlan: Sjablonen" msgid "Edit Virtual Workers Group: {0}" msgstr "Wijzig virtuele werkergroup: {0}" -#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:88 +#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:88 msgid "Total other" msgstr "Totaal andere" @@ -2479,16 +2518,16 @@ msgstr "LibrePlan: Uitgaven" msgid "Maximum/minimum of worked hours in finished applications" msgstr "Maximum/minimum aantal gewerkte uren in voltooide applicaties" -#: 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 "Planning opgeslagen" -#: 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." -msgstr "U kunt het project \"{0}\" niet verwijderen want het heeft imputed declaratieformulieren." +msgstr "U kunt het project \"{0}\" niet verwijderen want het heeft toegewezen declaratieformulieren." #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:219 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:70 @@ -2546,7 +2585,7 @@ msgstr "LibrePlan: Bedrijven" msgid "Queue-based" msgstr "Wachtrij-gebaseerd" -#: 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 "Afgeleid van kalender {0}" @@ -2555,7 +2594,7 @@ msgstr "Afgeleid van kalender {0}" msgid "Deliver date" msgstr "Leverdatum" -#: 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 "Extern bedrijf" #: 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 "Uitzonderingen" msgid "User settings" msgstr "Gebruikersinstellingen" -#: 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 "Startuur" @@ -2628,7 +2667,7 @@ msgstr "Formaatfilters zijn niet geldig" msgid "LibrePlan: Project Costs" msgstr "LibrePlan: Projectkosten" -#: 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 "Stel code in op automatisch-gegenereerd om een nieuw project te maken vanaf een sjabloon" @@ -2645,11 +2684,11 @@ msgstr "Gekoppelde gebruiker" msgid "Unallocated name" msgstr "Niet toegewezen naam" -#: 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 "Omhoog" -#: 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 "Wachtwoord mag niet leeg zijn" @@ -2671,7 +2710,7 @@ msgstr "Maak {0}" msgid "Already exists another template with the same name" msgstr "Er bestaat al een sjabloon met dezelfde naam" -#: 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 "Onbeperkt" @@ -2691,15 +2730,15 @@ msgstr "Pagina omhoog" msgid "Create new project" msgstr "Maak nieuw project" -#: 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 "datum in de toekomst" -#: 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 "Moet starten na" msgid "Fully, Partially or Unscheduled. (Drag and drop to move tasks)" msgstr "Volledig, Gedeeltelijk of Ongepland. (Sleur en pleur om taken te verplaatsen)" -#: 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 "Bevestig wijziging" @@ -2733,19 +2772,19 @@ msgstr "Code bestaat al in urengroep codes" #: 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 "Planning" -#: 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 "De taak heeft voortgansconsoolidaties. Om het resource allocatietype te wijzigen moeten eerst alle consolidaties verwijderd worden" #: 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 "Zend" @@ -2762,7 +2801,7 @@ msgstr "LibrePlan: Materialen" msgid "New task" msgstr "Nieuwe taak" -#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:31 +#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:30 msgid "Associated user" msgstr "Geassocieerde gebruiker" @@ -2770,7 +2809,7 @@ msgstr "Geassocieerde gebruiker" msgid "Type name" msgstr "Type naam" -#: 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 @@ -2784,9 +2823,9 @@ msgstr "Alle" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/advances/AdvanceAssignmentPlanningCommand.java:69 msgid "Progress assignment" -msgstr "Voortgang toekenning" +msgstr "Voortgangsinvoer" -#: 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 "U kunt niet het standaard scenario \"{0}\" verwijdern" -#: 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 "Volgens planning" @@ -2816,14 +2855,14 @@ msgstr "Persoonlijke gegevens" msgid "Workers List" msgstr "Werkerslijst" -#: 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 "Ge-erft" -#: 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 "Gebruiker al gekoppeld aan een andere werker" msgid "criterion name not specified" msgstr "criteriumnaam niet gespecificeerd" -#: 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 "poort niet gespecificeerd" @@ -2861,18 +2900,25 @@ msgstr "kalender niet gespecificeerd" msgid "Start hour cannot be greater than finish hour" msgstr "Startuur kan niet na einduur liggen" -#: 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 "Instellingen" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:366 -msgid "Role property" -msgstr "Rol eigenschap" +#: 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 "Er zijn nog niet opgeslagen wijzigingen in de actuele persoonlijke urenstaat. aub opslaan voor verplaatsen" #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:25 msgid "Manual allocation" msgstr "Handmatig toekennen" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:375 +msgid "Role property" +msgstr "Rol eigenschap" + #: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceAssignment.java:75 msgid "progress type not specified" msgstr "voortgangstype niet gespecificeerd" @@ -2902,7 +2948,7 @@ msgstr "Voortgangsmeting kan niet verwijderd worden. Voortgangsmeting al al geco msgid "Recommended allocation" msgstr "Aanbevolen toekenning" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:258 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:267 msgid "Activation" msgstr "Activering" @@ -2914,7 +2960,7 @@ msgstr "Berekende voortgang kan niet verwijderd worden" msgid "Materials saved" msgstr "Materialen opgeslagen" -#: 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 "Totaal aantal gewerkte uren door resouce in een maand" @@ -2923,7 +2969,7 @@ msgstr "Totaal aantal gewerkte uren door resouce in een maand" msgid "LibrePlan: Access Forbidden" msgstr "LibrePlan: Toegang niet toegestaan" -#: 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 "Andere projecten" @@ -2943,11 +2989,11 @@ msgstr "Code mag niet leeg zijn" msgid "Template cannot be removed because it has applications" msgstr "Sjabloon kan niet verwijderd worden omdat hij wordt toegepast" -#: 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 "Minimaal één {0} sequence moet actief zijn" -#: 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 "criteriumvervulling met einddatum voor aanvang" msgid "Disable Delete" msgstr "Uitschakelen Verwijderen" -#: 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 "Geschatte/Geplande uren per taak" -#: 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 "Minimaal één {0} sequence is nodig" @@ -2979,11 +3025,11 @@ msgstr "LibrePlan: Kostencategorien" msgid "Assigned" msgstr "Toegekend" -#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:96 +#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:96 msgid "Total capacity" msgstr "Totale capaciteit" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:261 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:270 msgid "Use LDAP roles" msgstr "Gebruik LDAP rollen" @@ -3002,6 +3048,10 @@ msgstr "Fout: {0}" msgid "More options" msgstr "Meer opties" +#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:21 +msgid "LibrePlan: Personal timesheet" +msgstr "LibrePlan: Persoonlijke urenstaat" + #: libreplan-webapp/src/main/java/org/libreplan/web/orders/TreeElementOperationsController.java:244 msgid "Confirm create template" msgstr "Bevestig aanmaken sjabloon" @@ -3014,17 +3064,11 @@ msgstr "Hoeveelheid werk" msgid "Parent" msgstr "Bron" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:36 -msgid "" -"Password cannot be managed for LDAP users because LDAP authentication is " -"being used" -msgstr "Wachtwoord kan niet beheert worden voor LDAP gebruikers omdat LDAP authenticatie wordt gebruikt." - #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:91 msgid "Earliest date" msgstr "Eerstmogelijke datum" -#: 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 "Wijzig wachtwoord" @@ -3037,8 +3081,8 @@ msgstr "LibrePlan: Werk en voortgang per taak" msgid "Projects" msgstr "Projecten" -#: 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 "Bevestig afsluit dialoog" @@ -3060,14 +3104,14 @@ msgstr "Onderaannemingscode" msgid "Material assignments" msgstr "Materiaal toekenningen" -#: 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 "laatste waarde niet gespecificeerd" #: 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 "taak niet gespecificeerd" @@ -3075,6 +3119,12 @@ msgstr "taak niet gespecificeerd" msgid "Change password" msgstr "Wijzig wachtwoord" +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:38 +msgid "" +"Password cannot be managed for LDAP users because LDAP authentication is " +"enabled." +msgstr "Wachtwoorden kunnen niet beheerd worden voor LDAP gebruikers omdat LDAP authenticatie aan staat" + #: 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 "Tekstveld" msgid "Question" msgstr "Vraag" -#: 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" @@ -3141,7 +3191,7 @@ msgstr "resource type staat geen criteria toe" msgid "Please, select a destination scenario" msgstr "Kies aub een bestemmingsscenario" -#: 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 "Kies aub een bestemmingsscenario" #: 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 "Kies aub een bestemmingsscenario" #: 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 "Afbreken" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:39 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:36 msgid "General user data" msgstr "Algemene gebruikers gegevens" @@ -3187,7 +3237,7 @@ msgstr "Algemene gebruikers gegevens" msgid "Unschedule" msgstr "Unschedule" -#: 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 "Uitbestede taak succesvol verzonden" @@ -3195,17 +3245,13 @@ msgstr "Uitbestede taak succesvol verzonden" msgid "Accumulated hours chart" msgstr "Geaccumuleerde uren grafiek" -#: 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 "Machinelijst" #: 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 "U heeft geen leesrechten voor dit project" @@ -3256,7 +3302,7 @@ msgstr "omschrijvingswaarde: de urenstaat mist een omschrijvingsveld" msgid "Create new Workweek" msgstr "Maak nieuwe werkweek" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:103 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:112 msgid "Autocomplete login form" msgstr "Automatisch aanvullen aanmeldformulier" @@ -3292,11 +3338,11 @@ msgstr "{0} (max: {1})" msgid "Cost Category" msgstr "Kostencategorie" -#: 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 "einde" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:373 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:382 msgid "Role search query" msgstr "Rol zoekvraag" @@ -3329,7 +3375,7 @@ msgstr "Wijzig taak {0}" msgid "LibrePlan: Timesheets" msgstr "LibrePlan: Urenstaten" -#: 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 "gebruikersnaam is reeds in gebruik door een andere gebruiker" @@ -3337,8 +3383,8 @@ msgstr "gebruikersnaam is reeds in gebruik door een andere gebruiker" msgid "references" msgstr "referenties" -#: 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 "U moet een geldige datum kiezen." @@ -3374,7 +3420,7 @@ msgstr "Toevoegen criterium vereiste" msgid "Percentage of estimated budget hours / hours consumed" msgstr "Geschat percentage van urenbudget / uren verbruikt" -#: 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 "Automatisch" @@ -3382,14 +3428,13 @@ msgstr "Automatisch" msgid "Criterion Name" msgstr "Criteriumnaam" -#: 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: wijzig wachtwoord" msgid "please, select a label" msgstr "Kies aub een label" -#: 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 "Verwacht" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:155 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:153 msgid "Add profile" msgstr "Toevoegen profiel " @@ -3447,7 +3492,7 @@ msgstr "de waardes zijn ongeldig, de waardes mogen niet ongedefinieerd zijn" msgid "Apply changes and go back to scheduling" msgstr "Voer wijzigingen door en ga terug naar planning" -#: 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 "Spreiding voortgang" @@ -3464,9 +3509,11 @@ msgid "cost assignment's resource not specified" msgstr "kostentoekennings resource niet gespecificeerd" #: 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 "kostentoekennings resource niet gespecificeerd" msgid "Project" msgstr "Project" -#: 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 "Gevorderde toekenning kan niet verwijderd worden omdat het gevorderde metingen heeft die al aan de klant zijn gerapporteerd" -#: 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 "Niet toegekend" -#: 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 "Er bestaat al een einddatum met dezelfde datum" @@ -3522,17 +3569,13 @@ msgstr "Wijzig het wachtwoord" msgid "label code is already being used" msgstr "labelcode is al in gebruik" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:72 -msgid "Hours type for monthly timesheets" -msgstr "Urentype voor maandelijkse urenstaten" - #: 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 "uitgeschakeld" -#: 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 "Earned value" @@ -3546,7 +3589,7 @@ msgstr "Overwerk" msgid "Inherited from parent calendar" msgstr "Georven van parent kalender" -#: 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 "U heeft geen rechten voor het wijzigen van deze urenstaat" @@ -3567,15 +3610,15 @@ msgid "" msgstr "Sjablonen kunnen alleen gemaakt worden uit bestaande taken. U probeert een nieuwe sjabloon te maken uit een nieuwe taak.⏎\nSla aub uw project op voordat u verder gaat." #: 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 "Totaal werk" -#: 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 "een kwaliteitsformulier kan niet twee keer aan dezelfde taak worden toegekend" -#: 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 "aantal cijfers buiten bereik" @@ -3589,7 +3632,7 @@ msgstr "De urenstaatregelcodes moeten uniek zijn" msgid "Calendar Exception Days" msgstr "Kalender uitzonderingsdagen" -#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:115 +#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:114 msgid "Time tracking" msgstr "Tijd bijhouden" @@ -3599,19 +3642,11 @@ msgid "" " review it or click in the following link in order to go to initial page: " msgstr "Als u de URL rechtstreeks in de adresbalk van de browser heeft ingevoerd, controleer deze dan of klik op de volgende link om naar de startpagina te gaan." -#: 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} nog niet ondersteund" -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:151 -msgid "Total tasks" -msgstr "Totaal taken" - -#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:84 -msgid "Total monthly timesheet" -msgstr "Totaal maandelijkse urenstaat" - #: libreplan-webapp/src/main/webapp/common/layout/login.zul:144 msgid "is not supported for its use with LibrePlan." msgstr "wordt niet ondersteund voor gebruik binnen LibrePlan." @@ -3628,11 +3663,11 @@ msgstr "Nieuwe entry" msgid "Resources Load" msgstr "Resource belasting" -#: 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 "GebruikersID niet gespecificeerd" -#: 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 "Wijzigingen zijn afgebroken" @@ -3640,11 +3675,11 @@ msgstr "Wijzigingen zijn afgebroken" msgid "LibrePlan: Planning" msgstr "LibrePlan: Planning" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:188 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:197 msgid "Expense sheets" msgstr "Onkostendeclaraties" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:316 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:325 msgid "Authentication" msgstr "Authenticatie" @@ -3682,9 +3717,9 @@ msgstr "Filter op criteria" msgid "Max value" msgstr "Max waarde" -#: 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 "Nee" @@ -3718,11 +3753,11 @@ msgstr "Periode" msgid "Spread" msgstr "Spread" -#: 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 "Uitgeschakeld omdat het meer dan één urengroep bevat" -#: 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 "Bevestig verwijdering van gebruiker" @@ -3730,7 +3765,7 @@ msgstr "Bevestig verwijdering van gebruiker" msgid "Select start date" msgstr "Kies startdatum" -#: 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 "Verwijderd {0}" @@ -3774,7 +3809,7 @@ msgstr "Dezelfde resource is twee keer ingezet binnen dezelfde periode" msgid "Value is not valid, the precision value must not be empty" msgstr "Waarde is ongeldig, de precisie waarde mag niet leeg zijn" -#: 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 "init" msgid "Add new progress measurement" msgstr "Toevoegen nieuwe voortgangsmeeting" -#: 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 "Selecteren voor automatische queuing" @@ -3831,7 +3866,7 @@ msgstr "Aanmaken & Toewijzen" msgid "Calculated progress measurements cannot be removed" msgstr "Gecalculeerde voortgangsmeting kan niet worden verwijderd" -#: 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 "Niet instelbaar" @@ -3843,17 +3878,17 @@ msgstr "urenstaat niet gespecificeerd" msgid "The length must be greater than 0 and not empty" msgstr "De lengte moet groter dan 0 en niet leeg zijn" -#: 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 "Taakstatus" -#: 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 "Gekoppelde resource" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:178 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:187 msgid "Calendar exception days" msgstr "Kalender uitzonderingsdagen" @@ -3861,7 +3896,7 @@ msgstr "Kalender uitzonderingsdagen" msgid "Advanced allocation" msgstr "Gevorderde toewijzing" -#: 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 "Geschatte afwijking bij voltooide taken" @@ -3871,7 +3906,7 @@ msgstr "Geschatte afwijking bij voltooide taken" msgid "Consolidated" msgstr "Geconsolideerd" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:200 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:209 msgid "MonteCarlo method" msgstr "MonteCarlo methode" @@ -3897,9 +3932,8 @@ msgstr "LibrePlan: Gebruikerstoegang" msgid "Customer" msgstr "Klant" -#: 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 "Urentype" @@ -3918,11 +3952,11 @@ msgid "" "the Main Settings window before." msgstr "Standaard kalender kan niet worden verwijderd. Wissel aub eerst de standaard kalender in het instellingenscherm." -#: 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 "Kan niet verbinden met LDAP server" -#: 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 "moet voor de einddatum liggen" @@ -3930,9 +3964,11 @@ msgstr "moet voor de einddatum liggen" msgid "Add Exception" msgstr "Toevoegen uitzondering" -#: 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 "Toevoegen uitzondering" #: 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 "Toevoegen uitzondering" #: 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 "Toevoegen uitzondering" #: 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 "Inspanning moet groter dan nul zijn" #: 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" @@ -4078,8 +4115,8 @@ msgstr "Opslaan project" msgid "Day is not valid" msgstr "Dag is ongeldig" -#: 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 "U dient een startdatum te kiezen voor de uitzondering" @@ -4107,7 +4144,7 @@ msgstr "LibrePlan: Materiaal Eenheden" msgid "Virtual resources cannot be bound to any user" msgstr "Virtuele teams kunnen niet gekoppeld worden aan een gebruiker" -#: 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 "Codesequentie is al in gebruik en kan niet worden gewijzigd" @@ -4124,7 +4161,7 @@ msgid "effort not specified" msgstr "inspanning niet gespecificeerd" #: 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 "inspanning niet gespecificeerd" #: 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 "Seconden" msgid "please, select an item" msgstr "Kies aub en item" -#: 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 "een label kan niet twee keer in dezelfde tak worden toegekend" @@ -4233,11 +4270,11 @@ msgstr "Dag van de week" msgid "Companies List" msgstr "Bedrijvenlijst" -#: 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 "Normale resource toekenning" -#: 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 "standaard kalender niet gespecificeerd" @@ -4245,11 +4282,11 @@ msgstr "standaard kalender niet gespecificeerd" msgid "indirect progress assignments should have different types" msgstr "indirecte voortgangstoekening moet andere types hebben" -#: 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 "Stretches met interpolatie" -#: 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 "Gewerkte uren per resource" @@ -4258,21 +4295,16 @@ msgstr "Gewerkte uren per resource" msgid "material not specified" msgstr "materiaal niet gespecificeerd" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:149 -msgid "" -"Profiles of LDAP users cannot be managed because LDAP roles are being used." -msgstr "Profielen van LDAP gebruikers kunnen niet beheert worden omdat LDAP rollen worden gebruikt." - #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:26 #: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:36 msgid "Category name" msgstr "Categorienaam" -#: 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 "Datum moet binnen visualisatiegebhied liggen" -#: 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 "Toon een melding als er een nieuwe LibrePlan versie is verschenen" @@ -4288,7 +4320,7 @@ msgstr "MonteCarlo" msgid "Duration" msgstr "Duur" -#: 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 "Uitzondering: {0}" @@ -4328,11 +4360,6 @@ msgstr "Verbinden" msgid "Concept" msgstr "Concept" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:128 -msgid "" -"Roles of LDAP users cannot be managed because LDAP roles are being used." -msgstr "Rollen van LDAP gebruikers kunnen niet beheert worden omdat LDAP rollen worden gebruikt." - #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:223 msgid "Allocation: [{0},{1}]" msgstr "Allocatie: [{0},{1}]" @@ -4341,11 +4368,11 @@ msgstr "Allocatie: [{0},{1}]" msgid "Virtual Workers Group" msgstr "Virtuele werkersgroep" -#: 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 "Wijzigingen opgeslagen" -#: 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 "Zie planning" @@ -4370,7 +4397,7 @@ msgid "Relationship" msgstr "Relatie" #: 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 "Onderaannemen" @@ -4381,26 +4408,22 @@ msgstr "Onderaannemen" msgid "End" msgstr "Einde" -#: 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 "Projectkosten" #: 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 "Kostencategorieën" -#: 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 "Andere" -#: 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 "criteriumtype niet gespecificeerd" @@ -4413,10 +4436,6 @@ msgstr "standaardprijs niet gespecificeerd" msgid "timesheet template not specified" msgstr "urenstaatsjabloon niet gespecificeerd" -#: 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 "Urenstaat succesvol verwijderd" @@ -4425,10 +4444,6 @@ msgstr "Urenstaat succesvol verwijderd" msgid "Users List" msgstr "Gebruikerslijst" -#: 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 "Voortgang types" #: 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 "Kostencategorie" @@ -4473,7 +4488,7 @@ msgstr "Kostencategorie" msgid "Quality form cannot be removed as it is spreading progress" msgstr "Kwaliteistformulier kan niet worden verwijderd omdat het de voortgang rapporteerd" -#: 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 "Het kan niet verwijderd worden. Minimaal één sequence is nodig." @@ -4519,7 +4534,7 @@ msgstr "Klant referentiecode" msgid "Constraint" msgstr "Beperking" -#: 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 "Referentieklant" #: 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 "Informatie" -#: 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 "Helaas heeft u geen toegangdrechten voor dit project" @@ -4574,7 +4589,7 @@ msgstr "Communicatie Naar Onderaannemers" msgid "New hours group " msgstr "Nieuwe urengroup" -#: 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 "Ken element handmatig aan wachtrij" @@ -4675,7 +4690,7 @@ msgstr "iitems kunnen niet afgevinkt worden totdat de vorige items zijn afgevink msgid "Code " msgstr "Code" -#: 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 "Uitzondering: {0} (Inh)" @@ -4694,7 +4709,7 @@ msgid "Regular" msgstr "Normaal" #: 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 "Toon voortgang" @@ -4712,16 +4727,17 @@ msgstr "Fout bij opslaan van het project⏎\n{0}" msgid "LibrePlan: Machines" msgstr "LibrePlan: Machines" -#: 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} u" #: 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 "Fout" @@ -4783,7 +4799,7 @@ msgstr "Er is een andere urenstaatsjabloon met de zelfde naam" msgid "SPREAD" msgstr "SPREAD" -#: 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 "Wijzigingen toegepast" @@ -4795,13 +4811,13 @@ msgstr "Gebudgetteerde Kosten Werk Ingepland" msgid "criterion type does not allow hierarchy" msgstr "criteriumtype staat hierarchie niet toe" -#: libreplan-webapp/src/main/webapp/dashboard/_costStatus.zul:62 +#: libreplan-webapp/src/main/webapp/dashboard/_costStatus.zul:66 msgid "Project closing previsions" msgstr "Project afsluitvoorwaarden" -#: 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 "Materiaal eenheden" @@ -4824,7 +4840,7 @@ msgstr "LDAP configuratie" msgid "progress type should must be defined if quality form reports progress" msgstr "voortgangstype moet zijn gedefinieerd als het kwaliteitsformulier de voortgang rapporteerd" -#: 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 "Superuser" @@ -4854,18 +4870,18 @@ msgid "Cost Variance" msgstr "Kosten Variantie" #: 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 "Totaal" -#: 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 "Gebruikersaccounts" @@ -4875,7 +4891,7 @@ msgstr "Gebruikersaccounts" msgid "Invalidate" msgstr "Maak ongeldig" -#: 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 "Gebruiker is gekoppeld aan resource \"{0}\" en zal worden losgekoppeld. msgid "Budget hours" msgstr "Budgeturen" -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:132 -msgid "Go to monthly timesheet" -msgstr "Ga naar maandelijkse urenstaat" - #: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/TaskQualityFormItem.java:78 msgid "percentage not specified" msgstr "percentage niet gespecificeerd" @@ -4897,7 +4909,7 @@ msgstr "percentage niet gespecificeerd" msgid "Edit task: {0}" msgstr "Wijzig taak: {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 "kan niet leeg zijn of lager dan nul" msgid "Check consolidated progresses" msgstr "Controleer geconsolideerde voortgang" -#: 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 "Update taakeinde" @@ -4951,7 +4963,7 @@ msgid "Apply tab changes" msgstr "Verwerk wijzigingen" #: 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 "wachtwoorden komen niet overeen" @@ -4959,7 +4971,7 @@ msgstr "wachtwoorden komen niet overeen" msgid "Day properties" msgstr "Dag eigenschappen" -#: 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 taken)" @@ -4970,16 +4982,20 @@ msgstr "(%d taken)" #: 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 "moet minder zijn dan einddatum" +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetDTO.java:120 +msgid "Week {0}" +msgstr "Week {0}" + #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:82 msgid "Hours groups" msgstr "Urengroepen" -#: 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,9 +5023,9 @@ msgid "" "progress assignment" msgstr "Spreid voortgang kan niet gewijzigd worden als er een consolidatie is in een voortgangs toekenning" -#: 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 kritieke pad duurO" +msgstr "Per kritieke pad duur" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/milestone/AddMilestoneCommand.java:54 msgid "new milestone" @@ -5031,7 +5047,7 @@ msgstr "Urenstaat" msgid "Show dependencies" msgstr "Toon afhankelijkheden" -#: 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 "Plan vanaf start tot deadline" @@ -5079,7 +5095,7 @@ msgid "" "subcontractor company." msgstr "Onderaannemerswaardes zijn alleen-lezen want ze worden afgegeven door het onderaannemende bedrijf" -#: 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 "Er is een marge van %d dagen op de overall deadline van het project (%.2f %%)." @@ -5088,7 +5104,7 @@ msgstr "Er is een marge van %d dagen op de overall deadline van het project (%.2 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 "Mijn dashboard" @@ -5179,11 +5195,11 @@ msgstr "Wijzigingen opslaan" msgid "Application settings" msgstr "Applicatie instellingen" -#: 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 "Total dedication" @@ -5195,7 +5211,7 @@ msgstr "Kies bron" msgid "Worker deleted" msgstr "Werker verwijderd" -#: 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 "Kies aub entity" @@ -5203,7 +5219,7 @@ msgstr "Kies aub entity" msgid "LibrePlan: Profiles" msgstr "LibrePlan: Profielen" -#: 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 "Uur klaar" @@ -5216,12 +5232,16 @@ msgstr "totaal niet gespecificeerd" msgid "Last expense" msgstr "Laatste uitgave" +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:132 +msgid "Go to personal timesheet" +msgstr "Ga naar persoonlijke urenstaat" + #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:108 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:197 msgid "Day" msgstr "Dag" -#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:76 +#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:76 msgid "Timesheet summary" msgstr "Urenstaat samenvatting" @@ -5229,41 +5249,40 @@ msgstr "Urenstaat samenvatting" msgid "Current password" msgstr "Huidig wachtwoord" -#: 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 "Slechts een sequentie per entiteit kan op ieder moment actief zijn" -#: 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 "Kies aub een item" -#: 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 "Kan niet hoger zijn dan einde-uur" -#: 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} 1ste twee-weken" + #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeComponent.java:64 msgid "New Template element" msgstr "Nieuw sjabloon element" -#: 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 "Maandelijkse urenstaat" - #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:211 msgid "Project: {0}" msgstr "Project: {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 "Urenstaten" @@ -5293,7 +5312,7 @@ msgstr "Opnieuw toewijzen soort" msgid "There are repeated description values in the timesheet " msgstr "Er zijn meerdere identieke omschrijvingen in de urenstaat" -#: 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}\" kan niet verwijderd worden omdat deze in gebruik is" @@ -5322,7 +5341,7 @@ msgstr "Incorrecte authenticatie" msgid "Edit task" msgstr "Wijzig taak" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:95 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:104 msgid "Currency" msgstr "Valuta" @@ -5330,8 +5349,9 @@ msgstr "Valuta" msgid "End date is not valid, the new end date must be after the start date" msgstr "Einddatum is ongeldig, de nieuwe einddatum moet na de startdatum liggen" -#: 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 "Urenstaat regelslijst" @@ -5381,13 +5401,13 @@ msgstr "Profiel gegevens" msgid "The name of the label is empty." msgstr "De naam van het label is leeg" -#: 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 "Startdatum kan niet leeg zijn bij vooruit plannen" -#: 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 "Configuratie" @@ -5395,7 +5415,7 @@ msgstr "Configuratie" msgid "cost category not specified" msgstr "kostencategorie niet gespecificeerd" -#: 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 "Overtreden deadline" @@ -5403,7 +5423,7 @@ msgstr "Overtreden deadline" msgid "Delivery dates requested by customer. " msgstr "Leveringsdata aangevraagd door klant" -#: 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 "Help de ontwikkelaars van LibrePlan bij het verzamelen van informatie ov msgid "LibrePlan: Workers" msgstr "LibrePlan: Werkers" +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/UserDashboardController.java:64 +msgid "Personal timesheet \"{0}\" saved" +msgstr "Persoonlijke urenstaat \"{0}\" opgeslagen" + #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:719 msgid "Create Virtual Workers Group" msgstr "Maak virtuele werkersgroep" -#: 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 "In-/Uitschakelen waarschuwing over een beschikbare nieuwe LibrePlan versie" @@ -5427,13 +5451,13 @@ msgid "" "applications" msgstr "interactievelden zijn leeg en het bedrijf is gemarkeerd als interacterend met applicaties" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:174 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:183 msgid "Timesheet templates" msgstr "Urenstaatsjabloon" -#: 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 "Uren geinvesteerd" @@ -5443,7 +5467,7 @@ msgstr "Uren geinvesteerd" msgid "Templates" msgstr "Sjablonen" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:343 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:352 msgid "Authorization" msgstr "Autorisatie" @@ -5456,7 +5480,7 @@ msgid "" "The name is not valid, there is another progress type with the same name. " msgstr "De naam is niet geldig, er is een ander voortgangstype met dezelfde naam" -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:50 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:49 msgid "task" msgstr "taak" @@ -5468,6 +5492,12 @@ msgstr "Alle wijzigingen zullen verloren gaan. Weet u het zeker?" msgid "Sorry for the inconvenience." msgstr "Excuus voor het ongemak" +#: 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 "Profielen van LDAP gebruikers kunnen niet beheerd worden omdat LDAP aan staat en LDAP rollen worden gebruikt." + #: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityFormItem.java:81 msgid "quality form item position not specified" msgstr "kwaliteitsformulier onderdeelpositie niet gespecificeerd" @@ -5477,7 +5507,7 @@ msgstr "kwaliteitsformulier onderdeelpositie niet gespecificeerd" msgid "Machines" msgstr "Machines" -#: 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 "Mijn account" @@ -5490,7 +5520,7 @@ msgstr "Bestemmingsscenario" msgid "Company view" msgstr "Bedrijf" -#: 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 "valutasymbool " @@ -5539,7 +5569,7 @@ msgstr "Categorie gegevens" msgid "Search" msgstr "Zoeken" -#: 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 "voorvoegsel mag geen spaties bevatten " @@ -5593,7 +5623,7 @@ msgstr "Som van totale uitgaven" msgid "Communications From Customers" msgstr "Communicaties Vanaf Klanten" -#: 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 "Communicaties Vanaf Klanten" #: 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 "Resource" -#: 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 "Onkostendeclaratie \"{0}\" opgeslagen" @@ -5638,7 +5667,7 @@ msgstr "Datum laatste voortgangsrapport" msgid "Could not load any resource" msgstr "Kon geen resource laden" -#: 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 "Werk en voortgang per project" @@ -5661,7 +5690,7 @@ msgstr "Sluiten" msgid "LibrePlan: Timesheet Lines List" msgstr "LibrePlan: Urenstaatregelslijst" -#: 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 "Specifieke toekenning" @@ -5689,15 +5718,12 @@ msgstr "Maak kopie" msgid "Company data" msgstr "Bedrijfsgegevens" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:151 -msgid "Unit type code cannot be empty" -msgstr "Eenheidstype kan niet leeg zijn" - -#: 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 "Gebruikers" -#: 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 "De {0} is ongeldig. Andere waarde bestaat vanaf het zelfde criteriumtype" @@ -5718,8 +5744,8 @@ msgstr "laatste urengroepsequentiecode niet gespecificeerd" msgid "label type name is already in use" msgstr "labetypenaam is reeds in gebruik" -#: 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 "Kies aub een einddatum voor de uitzondering" @@ -5743,7 +5769,7 @@ msgid "" "completed." msgstr "Een andere gebruiker heeft dezelfde gegevens gewijzigd, dus deze handeling kan niet veilig voltooid worden." -#: 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 "Stel aub een datum in" @@ -5752,7 +5778,7 @@ msgstr "Stel aub een datum in" msgid "Template saved" msgstr "Sjabloon opgeslagen" -#: 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 "voorvoegsel niet gespecificeerd" @@ -5805,21 +5831,17 @@ msgstr "Pas filter toe op" msgid "Enabled" msgstr "Ingeschakeld" -#: 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 "Voer aub een geldige inspanning in" -#: 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 "resource moet gekoppeld worden aan een gebruiker voor maandelijkse urenstaten" - #: 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 "Kwaliteitsformulier moet een onderdeel bevatten met een waarde van 100% om de voortgang te kunnen rapporteren" -#: 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 "externe bedrijf niet gespecificeerd" @@ -5828,7 +5850,7 @@ msgid "Quality form name is already being used" msgstr "Kwaliteitsformuliernaam reeds in gebruik" #: 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 "Urenstaat sjablonen" @@ -5849,7 +5871,7 @@ msgstr "Belasting door huidig project" msgid "length not specified" msgstr "lengte niet gespecificeerd" -#: 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 "Track tijd" @@ -5857,7 +5879,7 @@ msgstr "Track tijd" msgid "There must be at least 2 stretches for doing interpolation" msgstr "Er moeten minimaal 2 stappen zijn om te kunnen interpoleren" -#: 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 "Verwijder wachtrij-gebaseerd resource element" @@ -5878,9 +5900,9 @@ msgstr " Datumformat is verkeerd. Gebruik aub het volgende 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 "Filter" msgid "Scheduling mode" msgstr "Planningsmode" -#: 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 "Persoonlijke urenstaten periodiciteit" + +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskMilestone.java:121 msgid "a milestone cannot have a task associated" msgstr "een mijlpaal kan geen geassocieerde taak hebben" @@ -5920,7 +5946,7 @@ msgid "" "Invalid value. Precission value must be lower than the Default Max value." msgstr "Ongeldige waarde. Exacte waarde moet lager zijn dan de standaard max waarde" -#: 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 "Toekeningsfunctie zal worden gewijzigd. Weet u het zeker?" @@ -5947,11 +5973,15 @@ msgstr "Onderaannemingsdatum" msgid "Report progress" msgstr "Rapporteer voortgang" +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/GlobalProgressChart.java:124 +msgid "Progress percentage per progress type" +msgstr "Voortgangspercentage per voortgangstype" + #: 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 "Authenticatietype" @@ -5983,7 +6013,7 @@ msgstr "Terug" msgid "Our company username" msgstr "Ons bedrijf gebruikersnaam" -#: 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 "Onderaannemer" @@ -6021,7 +6051,7 @@ msgstr "het project moet een deadline hebben" msgid "last label sequence code not specified" msgstr "laatste labelsequentiecode niet gespecificeerd" -#: libreplan-webapp/src/main/webapp/myaccount/_monthlyTimesheetsArea.zul:31 +#: libreplan-webapp/src/main/webapp/myaccount/_personalTimesheetsArea.zul:31 msgid "Available hours" msgstr "Beschikbare uren" @@ -6048,7 +6078,7 @@ msgstr "Lengte" msgid "Task code" msgstr "Taakcode" -#: 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 "Maak afgeleide" msgid "Label Types" msgstr "Labeltypes" -#: 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 "het moet groter dan nul zijn" @@ -6098,14 +6128,18 @@ msgstr "onkostendeclaratie niet gespecificeerd" msgid "LibrePlan: Timesheets Templates" msgstr "LibrePlan: Urenstaat Sjablonen" -#: 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 "Maak project" -#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:64 +#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:63 msgid "Next" msgstr "Volgende" +#: libreplan-webapp/src/main/webapp/myaccount/_personalTimesheetsArea.zul:22 +msgid "Personal timesheets" +msgstr "Persoonlijke urenstaten" + #: 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" @@ -6130,7 +6164,7 @@ msgid "" "present." msgstr "Kon deze autorisaties niet toevoegen aan gebruiker {0} omdat deze ze al had." -#: 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 "Hoofdkalender" @@ -6143,7 +6177,7 @@ msgstr "ja" msgid "Select gap" msgstr "Selecteer gap" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:282 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:291 msgid "Port" msgstr "Poort" @@ -6152,7 +6186,6 @@ msgid "Date Finish" msgstr "Einddatum" #: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:455 -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:147 msgid "From" msgstr "Van" @@ -6199,7 +6232,7 @@ msgstr "Kostencategory toekenning" msgid "progress type name is already in use" msgstr "voortgangstypenaam is reeds in gebruik" -#: 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 "aantal cijfers niet gespecificeerd" @@ -6207,10 +6240,14 @@ msgstr "aantal cijfers niet gespecificeerd" msgid "task cannot be empty if it is shared by lines" msgstr "taak kan niet leeg zijn als deze door meerdere regels wordt gedeeld" -#: 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 "Alle werkers" +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1189 +msgid "You have exceeded the maximum limit of resources" +msgstr "U heeft de maximale limiet van resources bereikt" + #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:766 msgid "The field name must be unique and not empty" msgstr "De veldnaam moet uniek zijn en niet leeg" @@ -6225,17 +6262,11 @@ msgstr "Selecteer criteria of resources" msgid "Select required criteria set and press filter button" msgstr "Selecteer gewenste criteriaset en klik op de filterknop" -#: 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 u" - #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:217 msgid "Timesheet lines" msgstr "Urenstaatregels" -#: 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 "Het kan niet leeg zijn" @@ -6258,7 +6289,7 @@ msgstr "Eenheidstype" msgid "Load due to other assignments" msgstr "Belasting door andere opdrachten" -#: 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 "Persoonlijk deel" @@ -6302,7 +6333,7 @@ msgstr "Criterium vereisten" msgid "working hours not specified" msgstr "werkuren niet gespecificeerd" -#: 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 sequentiecode ongeldig. Deze mag geen '_' bevatten" @@ -6353,13 +6384,13 @@ msgstr "SV" msgid "Label has already been added." msgstr "Label is reeds toegevoegd" -#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:123 +#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:122 msgid "Add task" msgstr "Taak toevoegen" -#: 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 "Prijs per uur" msgid "Last stretch should have 100% for length and amount of work" msgstr "Laatste periode moet 100% voor lengte en hoeveelheid werk hebben" -#: 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 "Geen projectdeadline gedefinieerd" @@ -6403,7 +6434,6 @@ msgid "" msgstr "Een andere taak in de zelfde tak rapporteert reeds de voortgang voor dit kwaliteitsformulier" #: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:457 -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:148 msgid "To" msgstr "Om" @@ -6411,7 +6441,7 @@ msgstr "Om" msgid "options" msgstr "opties" -#: 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 "Wachtrij-gebaseerde toekenning" @@ -6423,7 +6453,7 @@ msgstr "Toon alleen de huidige vervulde criteria" msgid "Latest date" msgstr "Laatste datum" -#: 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 "Deadline kan niet leeg zijn in achterwaarts mode" @@ -6435,13 +6465,13 @@ msgstr "Groepeer op week" msgid "Full name" msgstr "Volledige naam" -#: 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 "De standaard gebruiker \"admin\" kan niet worden verwijderd omdat hij verplicht aanwezig is." #: 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 "Urentype" @@ -6467,17 +6497,13 @@ msgstr "Geplande aanvang" msgid "Filter by projects" msgstr "Filter op projecten" -#: 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 "Taakkwaliteitsformulier itemnaam niet gespecificeerd" #: 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 "Aktief" @@ -6490,12 +6516,12 @@ msgstr "Geërfde labels" msgid "Queue-based resource" msgstr "Wachtrij-gebaseerde resource" -#: 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 "Leverdatum" -#: 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 "Uitspringen" @@ -6536,7 +6562,7 @@ msgstr "Geschatte startdatum voor de taak (druk Enter in de tekstbox om een kale msgid "Show all reported hours" msgstr "Toon alle gerapporteerde uren" -#: 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 "Inspanningen" @@ -6602,15 +6628,15 @@ msgstr "Herlaad" msgid "Profiles authorization" msgstr "Profiel autorisatie" -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:71 -msgid "Assignation" -msgstr "Toekenning" - #: libreplan-webapp/src/main/webapp/myaccount/settings.zul:98 msgid "Planning charts expanded" msgstr "Planningsgrafieken uitgebreid" -#: 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 "Toekenning" + +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:702 msgid "Inh" msgstr "Inh" @@ -6631,7 +6657,7 @@ msgstr "naam kan niet leeg zijn" msgid "Doing {0} reassignations" msgstr "Bezig met {0} reassignations" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:212 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:221 msgid "Select entity" msgstr "Kies entity" @@ -6656,7 +6682,7 @@ msgstr "Ongeldige waarde. Standaard maximum waarde kan niet leeg zijn" msgid "Invalid Spread values. At least one value should be true" msgstr "Ongeldige spread waardes. Minimaal één waarde moet waar zijn" -#: 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 "code niet gespecificeerd" @@ -6671,6 +6697,7 @@ msgstr "laatste sequentiecode niet gespecificeerd" #: 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 "laatste sequentiecode niet gespecificeerd" msgid "if the report is not opened automatically" msgstr "als het rapport niet automatisch geopend wordt" -#: 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 "Ongeldige opmaakvoorvoegsel. Opmaakvoorvoegsels kunnen niet leeg zijn, ' msgid "Create template from selected task" msgstr "Maak sjabloon van geselecteerde taak" -#: 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 "Alle projecten" @@ -6703,7 +6730,7 @@ msgstr "Voltooit: {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 "Wachtwoord" @@ -6712,11 +6739,11 @@ msgstr "Wachtwoord" msgid "Observations" msgstr "Observaties" -#: 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 "Wijzig project" -#: 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 "Urenkosten: {0}, Onkosten: {1}" @@ -6734,7 +6761,7 @@ msgstr "Geldig vanaf" msgid "Month" msgstr "Maand" -#: 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} kon niet gealloceerd worden. Kan niet meer dan één resource alloceren" @@ -6755,10 +6782,6 @@ msgstr "Kan materiaal niet in general view invoegen. Kies aub een categorie" msgid "Expense lines" msgstr "Onkostenregels" -#: 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 "In maandelijkse urenstaten moeten alle afzonderlijke regels in dezelfde maand vallen." - #: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:311 msgid "Delete {0} \"{1}\". Are you sure?" msgstr "Verwijder {0} \"{1}\". Weet u het zeker?" @@ -6780,14 +6803,14 @@ msgid "Accept" msgstr "Accepteren" #: 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 "Voorbeeld: {0}" @@ -6796,19 +6819,19 @@ msgid "" "Cannot delete timesheet template. There are some timesheets bound to it." msgstr "Kan urenstaatsjabloon niet verwijderen. Er zijn urenstaten mee verbonden" -#: 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 "Kies aub een type uitzondering" +#: 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 "kan niet negatief of leeg zijn" + #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:48 msgid "Calculated" msgstr "Berekent" -#: 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 " De " - #: libreplan-webapp/src/main/webapp/common/layout/login.zul:56 msgid "Access to the system" msgstr "Toegang tot het systeem" @@ -6821,7 +6844,7 @@ msgstr "Waarschijnlijkheid" msgid "Report data" msgstr "Rapport gegevens" -#: 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 "Materiaal Unit" @@ -6830,13 +6853,6 @@ msgstr "Materiaal Unit" msgid "External load" msgstr "Externe belasting" -#: 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 "Er zijn nog niet opgeslagen wijzigingen in de huidige maandelijkse urenstaat. Sla deze aub eerst op" - #: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ReportAdvancesController.java:207 msgid "Progress sent successfully" msgstr "Voortgang succesvol verzonden" @@ -6855,7 +6871,7 @@ msgstr "Prioriteit" msgid "Apply changes and continue edition" msgstr "Voer wijzigingen door en ga verder met wijzigen" -#: 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 "Oneindig overmatig toekenbaar" @@ -6864,7 +6880,7 @@ msgstr "Oneindig overmatig toekenbaar" msgid "Money spent" msgstr "Uitgegeven geld" -#: 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 "Uitgegeven geld" msgid "Code" msgstr "Code" -#: 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 "Maandelijkse urenstaat opgeslagen" - #: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:40 msgid "Add stretch" msgstr "Toevoegen stap" @@ -6970,7 +6981,7 @@ msgstr "Handeling kan niet ongedaan gemaakt worden" #: 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 "Schrijf" msgid "Number of applications" msgstr "Aantal applicaties" -#: 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 "Wijs element automatisch aan queue toe" -#: 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 "Bevestig wijzigen werker" @@ -7021,13 +7032,13 @@ msgstr "Bevestig wijzigen werker" msgid "type" msgstr "type" -#: 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 "Normaal" -#: 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 "Project view" msgid "Probability %" msgstr "Waarschijnlijkheid %" -#: 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 "Belasting" msgid "New criterion" msgstr "Nieuw criterium" -#: 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 "Nieuw criterium" #: 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 "Communicatietype" msgid "Selected node" msgstr "Selecteer node" -#: 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 "er bestaat al een toekenning voor criterium {0}" @@ -7112,7 +7122,7 @@ msgstr "Code mag niet leeg zijn." msgid "Project type" msgstr "Projecttype" -#: 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 "Vooruit" @@ -7128,15 +7138,15 @@ msgstr "Aantal afgeronde applicaties" msgid "Invalid queue element" msgstr "Ongeldig queue element" -#: 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 "Niet toegwezen" -#: 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 "Aantal taken" @@ -7144,7 +7154,7 @@ msgstr "Aantal taken" msgid "At least one HoursGroup is needed" msgstr "Minimaal één UrenGroep is nodig" -#: 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 "Virtuele werker" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionController.java:343 msgid "Length percentage should be between 0 and 100" -msgstr "Lengteoercentage moet tussen 0 en 100 liggen" +msgstr "Lengtepercentage moet tussen 0 en 100 liggen" #: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:50 msgid "Multiple values per resource" @@ -7177,7 +7187,7 @@ msgstr "Meerdere waarden per resource" msgid "Split" msgstr "Splits" -#: 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 "Communicatie" @@ -7195,7 +7205,7 @@ msgstr "Kan de voorgedefinieerde kalender uitzonderingsdag \"{0}\" niet verwijde msgid "Supported Chrome, Firefox, Safari and Epiphany browsers" msgstr "Ondersteund Chrome, Firefox, Safari en Epiphany browsers" -#: 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 "Taak deadline overschrijdingen" @@ -7212,25 +7222,28 @@ msgstr "Taak deadline overschrijdingen" msgid "Starting date" msgstr "Startdatum" +#: 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 "Periodiciteit kan niet gewijzigd worden omdat er al persoonlijke urenstaten zijn opgeslagen" + #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:62 msgid "Add materials" msgstr "Toevoegen materialen" -#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:21 -msgid "LibrePlan: Monthly timesheet" -msgstr "LibrePlan: Maandelijkse urenstaat" - #: libreplan-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:34 msgid "Load 100%" msgstr "Belasting 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 "Functie" #: 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 "labelnamen moeten uniek zijn binnen een labeltype" #: 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 "Klik op de volgende link om op de homepage te komen:" msgid "New password" msgstr "Nieuw wachtwoord" +#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:20 +msgid "LibrePlan: Project Status Report" +msgstr "LibrePlan: Project statusrapport" + #: 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 "De planning van deze taak is niet in het actuele scenario. U moet overschakelen naar een van de volgende scenario's: {0}" +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetDTO.java:124 +msgid "{0} 2nd fortnight" +msgstr "{0} 2de twee-weken" + #: libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul:20 msgid "LibrePlan: Received From Customers" msgstr "LibrePlan: Ontvangen Van Klanten" @@ -7320,7 +7341,7 @@ msgid "Unit price" msgstr "Eenheidsprijs" #: 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 "Niet genoeg rechten voor het maken van sjablonen" @@ -7349,7 +7370,7 @@ msgstr "Projectcode" msgid "Reassigning" msgstr "opnieuw toewijzen" -#: 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} reeds toegekend aan resource toekenninslijst" @@ -7361,6 +7382,10 @@ msgstr "Niet gereviewed" msgid "Label Types List" msgstr "Label types lijst" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:72 +msgid "Hours type for personal timesheets" +msgstr "Urentype voor persoonlijke urenstaten" + #: 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 "Label types lijst" #: 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 "Verversen" msgid "Two Hour Cost of the same type overlap in time" msgstr "Twee uurtarieven van het zelfde type overlappen elkaar qua tijd" -#: 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 "Home" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:105 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:114 msgid "Enable/Disable" msgstr "Aan-/uitschakelen" @@ -7443,6 +7467,10 @@ msgstr "percentage moet tussen 1 en 100 liggen" msgid "Communication Date" msgstr "Communicatiedatum" +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractedTaskData.java:281 +msgid "delivery date not specified" +msgstr "leverdatum niet gespecificeerd" + #: 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 "Criterium" msgid "Edit Timesheet" msgstr "Wijzig Urenstaat" -#: 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 "Kies aub een werker" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:309 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:318 msgid "Test LDAP connection" msgstr "Test LDAP verbinding" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:125 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:134 msgid "Generate code for" msgstr "Genereer code voor" @@ -7496,7 +7524,7 @@ msgstr "Genereer code voor" #: 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 "naam niet gespecificeerd" @@ -7518,17 +7546,13 @@ msgstr "Daadwerkelijk Kosten Werk verricht" msgid "Queue-based Resources Planning" msgstr "Wachtrij-gebaseerde Resource Planning" -#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:56 -msgid "Previous" -msgstr "Vorige" - -#: 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 "Maak project vanuit sjabloon" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:129 -msgid "Unit Type name cannot be empty" -msgstr "Unitnaam mag niet leeg zijn" +#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:56 +msgid "Previous" +msgstr "Vorige" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:436 msgid "" @@ -7545,7 +7569,7 @@ msgstr "Waardes reeds naar de klant gezonden.Waardes kunnen niet worden gewijzig msgid "an authorization type must be set" msgstr "een autorisatietype moet worden ingesteld" -#: 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?" @@ -7628,6 +7652,7 @@ msgstr "Deadline" msgid "Invalid Start Date. New Start Date must be earlier than End Date" msgstr "Ongeldige startdatum. Nieuwe startdatum moet voor de einddatum liggen" +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportQueryController.java:373 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:115 msgid "Tasks" msgstr "Taken" @@ -7693,7 +7718,7 @@ msgstr "inspanning is niet correct berekent gebaseerd op de klok" msgid "Status" msgstr "Status" -#: 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 "van {0}" @@ -7701,7 +7726,7 @@ msgstr "van {0}" msgid "Resource load view" msgstr "Resource belasting view" -#: 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 "Kwaliteitsformuliertype" msgid "{0} \"{1}\" deleted" msgstr "{0} \"{1}\" verwijderd" -#: 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 "type werkuren voor maandelijkse urenstaten kunnen niet worden uit gezet" - #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:364 msgid " hours" msgstr " uren" -#: 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 "% Deviatie interval (procentueel verschil tussen verbruikte en geschatte uren)" @@ -7754,11 +7775,11 @@ msgid "Worker ID cannot be empty" msgstr "WerkerID mag niet leeg zijn" #: 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 "Alle project taken" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:390 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:399 msgid "LDAP Roles (separated by ;)" msgstr "LDAP Rollen (gescheiden door ;)" @@ -7767,15 +7788,11 @@ msgstr "LDAP Rollen (gescheiden door ;)" msgid "Allocation configuration" msgstr "Toekenningsconfiguratie" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:350 -msgid "Database" -msgstr "Database" - #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:61 msgid "Subcontract price" msgstr "Onderaanneem prijs" -#: 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 "Stuur naar klanten" @@ -7784,22 +7801,27 @@ msgstr "Stuur naar klanten" msgid "The page that you are requesting does not exist." msgstr "De pagina die u heeft aangevraagd bestaat niet" +#: 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 "In persoonlijke urenstaten dienen alle urenstaatregels in dezelfde periode te vallen" + #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:835 msgid "Resources per day are zero" msgstr "Resources per dag zijn nul" -#: 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 "Waarde is niet geldig in de huidige lijst urengroep" -#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:100 -msgid "Total extra per day" -msgstr "Totaal extra per dag" - #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:38 msgid "Timesheets List" msgstr "Urenstaatlijst" +#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:100 +msgid "Total extra per day" +msgstr "Totaal extra per dag" + #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:32 #: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:31 msgid "Assigned criteria" @@ -7809,7 +7831,7 @@ msgstr "Toegewezen criteria" msgid "Help on authentication (opens a new window)" msgstr "Help bij authenticatie (opent een nieuw venster)" -#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:42 +#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:42 msgid "Timesheet data" msgstr "Urenstaatgegevens" @@ -7819,7 +7841,7 @@ msgstr "Basis kalendertype" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:78 msgid "Imputed expenses" -msgstr "Imputed uitgaven" +msgstr "Toegewezen uitgaven" #: libreplan-webapp/src/main/webapp/planner/taskpanels/_allocationConfiguration.zul:35 msgid "Planned end" @@ -7835,7 +7857,7 @@ msgstr "Kon het scenario niet opslaan" msgid "Apply filtering to tasks satisfying required criteria" msgstr "Pas filtering toe op taken die voldoen aan de vereiste criteria" -#: 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 "Taak planning status in project" @@ -7853,7 +7875,7 @@ msgstr "bedrijfsnaam moet uniek zijn. Bedrijfsnaam reeds gebruikt" #: 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 "Bevestig" @@ -7861,12 +7883,12 @@ msgstr "Bevestig" #: 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 "Toaalprijs" msgid "criterion codes must be unique inside a criterion type" msgstr "criteriumcodes moeten uniek zijn binnen een criteriumtype" -#: 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 "Waarschuwing: Niet aan het wijzigen vanaf de homepage van gekoppelde gebruikers" -#: 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 "Ongeldige inspanningsduur" @@ -7925,22 +7947,22 @@ msgstr "startdatum niet gespecificeerd" #: 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 "startdatum niet gespecificeerd" #: 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 "startdatum niet gespecificeerd" #: 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 @@ -8218,10 +8240,6 @@ msgstr "Bewerk alle projecten" msgid "Create projects" msgstr "Definieer projecten" -#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:73 -msgid "Timesheet Lines List Report" -msgstr "Urenstaatregelslijst rapport" - #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:74 msgid "Hours Worked Per Resource Report" msgstr "Uren gewerkt per resource rapport" @@ -8254,6 +8272,14 @@ msgstr "Taakplanningsstatus in Project Rapport" msgid "Materials Needs At Date Report" msgstr "Benodigde materialen op rapportdatum" +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:344 +msgid "Database" +msgstr "Database" + +#: 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 "Regel" @@ -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 "Kan geen twee voortgangen in dezelfde taak spreiden" -#: 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 "Duplicaat voortgangs toewijziging voor taak" -#: 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 "kwaliteitsformulier bestaat reeds" @@ -8384,6 +8410,18 @@ msgstr "Totaal percentage zou minder dan 100% moeten zijn" msgid "The criterion already exists into another task" msgstr "Het criterium bestaat reeds in een andere taak" +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/PersonalTimesheetsPeriodicityEnum.java:35 +msgid "Monthly" +msgstr "Maandelijks" + +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/PersonalTimesheetsPeriodicityEnum.java:66 +msgid "Twice-monthly" +msgstr "Tweemaandelijks" + +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/PersonalTimesheetsPeriodicityEnum.java:123 +msgid "Weekly" +msgstr "Wekelijks" + #: libreplan-business/src/main/java/org/libreplan/business/common/entities/ProgressType.java:37 msgid "Progress with all tasks by hours" msgstr "Voortgang met alle taken per uur"