diff --git a/libreplan-webapp/src/main/resources/i18n/nl.po b/libreplan-webapp/src/main/resources/i18n/nl.po
index 7d38bcbdd..1e2f63706 100644
--- a/libreplan-webapp/src/main/resources/i18n/nl.po
+++ b/libreplan-webapp/src/main/resources/i18n/nl.po
@@ -1,17 +1,17 @@
 # LibrePlan - Webapp module.
 # Copyright (C) 2009-2010 Fundación para o Fomento da Calidade Industrial e
 #                         Desenvolvemento Tecnolóxico de Galicia
-# Copyright (C) 2010-2012 Igalia, S.L.
+# Copyright (C) 2010-2013 Igalia, S.L.
 # This file is distributed under the same license as the LibrePlan package.
 #
 # Translators:
-# Jeroen Baten <jeroen@jeroenbaten.nl>, 2012.
+# Jeroen Baten <jeroen@jeroenbaten.nl>, 2012-2013.
 msgid ""
 msgstr ""
-"Project-Id-Version: libreplan-1.3.3\n"
+"Project-Id-Version: libreplan-1.4.0\n"
 "Report-Msgid-Bugs-To: http://bugs.libreplan.org/\n"
-"POT-Creation-Date: 2012-12-07 13:59+0100\n"
-"PO-Revision-Date: 2012-12-07 15:16+0000\n"
+"POT-Creation-Date: 2013-04-22 12:09+0200\n"
+"PO-Revision-Date: 2013-04-22 11:54+0000\n"
 "Last-Translator: Jeroen Baten <jeroen@jeroenbaten.nl>\n"
 "Language-Team: Nederlands\n"
 "MIME-Version: 1.0\n"
@@ -24,7 +24,7 @@ msgstr ""
 msgid "currency code not specified"
 msgstr "Valutacode niet gespecificeerd"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:495
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:509
 msgid "You do not have permissions to create new users"
 msgstr "U heeft geen rechten voor het toevoegen van gebruikers"
 
@@ -32,20 +32,20 @@ msgstr "U heeft geen rechten voor het toevoegen van gebruikers"
 msgid "Availability ratio"
 msgstr "Beschikbaarheidsratio"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:378
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:379
 msgid "Group path"
-msgstr "Groep pad"
+msgstr "Groeppad"
 
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1150
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1152
 msgid ""
 "resource cost category assignments codes must be unique inside a resource"
 msgstr "resource kostencategorietoekenningscodes moeten uniek zijn binnen een resource"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/users/OrderAuthorizationController.java:92
 msgid "No authorizations were added because you did not select any."
-msgstr "Er zijn geen autorisaties toegevoegd omdat u er geen koos."
+msgstr "Er zijn geen autorisaties toegevoegd omdat u er geen hebt gekozen."
 
-#: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:88
+#: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:118
 #: libreplan-webapp/src/main/webapp/common/layout/_customMenu.zul:71
 #: libreplan-webapp/src/main/webapp/common/layout/login.zul:59
 msgid "en"
@@ -71,81 +71,82 @@ msgstr "Kies rapport gegevens"
 msgid "Create Virtual Worker"
 msgstr "Maak Virtuele werker"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:862
 #: 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/java/org/libreplan/web/workreports/WorkReportCRUDController.java:862
+#: libreplan-webapp/src/main/webapp/myaccount/_expensesArea.zul:40
+#: libreplan-webapp/src/main/webapp/myaccount/_myTasksArea.zul:42
+#: libreplan-webapp/src/main/webapp/myaccount/_personalTimesheetsArea.zul:37
 #: 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
-#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:174
-#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:137
-#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:159
-#: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:28
-#: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:36
-#: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:52
-#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:68
-#: libreplan-webapp/src/main/webapp/scenarios/_list.zul:28
-#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:83
-#: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:38
-#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:87
+#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:39
+#: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:39
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:37
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:56
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:109
+#: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:31
+#: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:40
+#: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:37
+#: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:44
+#: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:29
+#: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:26
+#: libreplan-webapp/src/main/webapp/resources/_criterions.zul:44
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:110
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:127
+#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:36
+#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:58
+#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:174
 #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:99
 #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:140
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:99
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:140
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:99
 #: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:88
 #: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:128
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:95
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:137
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:178
 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:89
 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:128
 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:170
 #: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:120
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:99
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:140
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:95
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:137
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:178
 #: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:107
 #: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:148
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:99
-#: libreplan-webapp/src/main/webapp/templates/_listTemplates.zul:33
-#: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:41
-#: 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/_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:57
+#: libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul:59
 #: 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
 #: libreplan-webapp/src/main/webapp/calendars/_list.zul:31
-#: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:37
-#: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:31
-#: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:40
-#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:39
-#: libreplan-webapp/src/main/webapp/resources/_criterions.zul:44
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:37
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:56
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:109
-#: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:39
-#: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:29
-#: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:26
-#: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:44
-#: libreplan-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:29
-#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:48
-#: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:50
-#: libreplan-webapp/src/main/webapp/orders/_edition.zul:279
-#: libreplan-webapp/src/main/webapp/orders/_list.zul:36
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:63
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:88
+#: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:28
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:81
+#: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:50
+#: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:41
+#: libreplan-webapp/src/main/webapp/templates/_listTemplates.zul:33
+#: libreplan-webapp/src/main/webapp/templates/_advances.zul:39
+#: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:36
+#: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:52
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:137
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:159
+#: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:28
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:267
+#: libreplan-webapp/src/main/webapp/common/_listJobScheduling.zul:31
+#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:68
+#: libreplan-webapp/src/main/webapp/scenarios/_list.zul:28
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:83
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:50
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:70
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:50
+#: libreplan-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:29
 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:57
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:281
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:48
+#: libreplan-webapp/src/main/webapp/orders/_list.zul:36
+#: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:30
+#: libreplan-webapp/src/main/webapp/unittypes/_listUnitTypes.zul:29
+#: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:38
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:87
 #: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:143
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:266
 msgid "Operations"
 msgstr "Operations"
 
@@ -153,12 +154,12 @@ msgstr "Operations"
 msgid "Basic data"
 msgstr "Basisgegevens"
 
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:84
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:112
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:84
 msgid "Select"
 msgstr "Selecteer"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:498
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:510
 msgid "Project Status"
 msgstr "Project Status"
 
@@ -167,15 +168,15 @@ msgstr "Project Status"
 msgid "Start date cannot be empty"
 msgstr "Startdatum kan niet leeg zijn"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:340
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:345
 #: 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
 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:22
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:55
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:178
 #: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:54
-#: libreplan-webapp/src/main/webapp/orders/_edition.zul:53
-#: libreplan-webapp/src/main/webapp/orders/_edition.zul:176
-#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:57
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:58
 msgid "Materials"
 msgstr "Materialen"
 
@@ -183,14 +184,14 @@ msgstr "Materialen"
 msgid "dates must be sorted and cannot overlap"
 msgstr "data moeten volgorderlijk zijn en mogen niet overlappen"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java:361
-msgid "Reassign"
-msgstr "Opnieuw toekennen"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:180
 msgid "Not bound"
 msgstr "Niet gebonden"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java:361
+msgid "Reassign"
+msgstr "Opnieuw toekennen"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/GlobalProgressChart.java:62
 msgid "By critical path hours"
 msgstr "Op kritieke pad uren"
@@ -200,13 +201,13 @@ msgstr "Op kritieke pad uren"
 msgid "MonteCarlo Method"
 msgstr "MonteCarlo Methode"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:183
+#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:184
 #: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskDeadlineViolationStatusEnum.java:34
 msgid "No deadline"
 msgstr "Geen deadline"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:238
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:256
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:255
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:273
 msgid "Project Scheduling"
 msgstr "Project Planning"
 
@@ -228,28 +229,34 @@ msgstr "Machine kan niet verwijderd worden. Machine is toegekend aan een project
 msgid "Please, select a calendar"
 msgstr "Kies een kalender"
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:256
-msgid "Summary"
-msgstr "Samenvatting"
-
 #: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:29
 #: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:172
 msgid "Predefined"
 msgstr "Voorgedefinieerd"
 
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:256
+msgid "Summary"
+msgstr "Samenvatting"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:357
 #: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:344
-#: 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
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:60
 msgid "Quality Forms"
 msgstr "Kwaliteit formulieren"
 
+#: libreplan-webapp/src/main/java/org/libreplan/importers/ExportTimesheetsToTim.java:92
+#: libreplan-webapp/src/main/java/org/libreplan/importers/ExportTimesheetsToTim.java:135
+#: libreplan-webapp/src/main/java/org/libreplan/importers/ImportRosterFromTim.java:124
+msgid "Tim connector not found"
+msgstr "Tim-connector niet gevonden"
+
 #: libreplan-business/src/main/java/org/libreplan/business/planner/entities/StretchesFunction.java:316
 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:502
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:514
 msgid "Reports"
 msgstr "Rapporten"
 
@@ -261,7 +268,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:122
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:139
 msgid "username not specified"
 msgstr "gebruikersnaam niet gespecificeerd"
 
@@ -298,6 +305,10 @@ msgstr "Eigen uitzondering"
 msgid "Your session has expired because of inactivity. Please log in again."
 msgstr "Uw sessie is verlopen i.v.m. inactiviteit. Meld uzelf a.u.b. opnieuw aan."
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:1117
+msgid "Only {0} allowed"
+msgstr "Alleen {0} toegestaan"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:526
 msgid "Cannot delete that material because it is assigned to a project."
 msgstr "Kan dat materiaal niet verwijderen want het is toegekend aan een project."
@@ -306,7 +317,7 @@ msgstr "Kan dat materiaal niet verwijderen want het is toegekend aan een project
 msgid "Alpha must be greater than 0"
 msgstr "Alpha moet groter zijn dan 0"
 
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:1171
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:1172
 msgid "code is already used in another project"
 msgstr "code wordt reeds in ander project gebruikt"
 
@@ -331,8 +342,8 @@ msgid "Manual assignment"
 msgstr "Handmatige toekenning"
 
 #: 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
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:431
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:70
 msgid "Companies"
 msgstr "Bedrijven"
 
@@ -340,9 +351,9 @@ msgstr "Bedrijven"
 msgid "Quality form items list"
 msgstr "Kwaliteitsformulierenlijst"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:1061
 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:514
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:1047
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:128
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:130
 msgid "Create {0}: {1}"
 msgstr "Maak {0}: {1}"
 
@@ -354,17 +365,21 @@ msgstr "naam van entiteit niet gespecificeerd"
 msgid "You do not have permissions to go to worker edition window"
 msgstr "U heeft geen rechten om naar het werker wijzigingsscherm te gaan"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/NewAllocationSelector.java:51
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/NewAllocationSelector.java:55
 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:895
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:404
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1035
 msgid "The project has no scheduled elements"
 msgstr "Het project heeft geen ingeplande elementen"
 
-#: libreplan-webapp/src/main/webapp/planner/main.zul:53
+#: libreplan-webapp/src/main/java/org/libreplan/importers/ExportTimesheetsToTim.java:162
+msgid "Export product code {0}, project {1}"
+msgstr "Export productcode {0}, project {1}"
+
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:36
+#: libreplan-webapp/src/main/webapp/planner/main.zul:53
 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:120
 msgid "Start"
 msgstr "Start"
@@ -373,7 +388,7 @@ msgstr "Start"
 msgid "cost assignment's category not specified"
 msgstr "kosten toekenningscategorie niet gespecificeerd"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:121
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:122
 msgid "Check for updates"
 msgstr "Controleer op updates"
 
@@ -405,19 +420,19 @@ msgstr "Verplaatst Projecten tussen scenario's"
 msgid "changing perspective"
 msgstr "wijzigen perspectief"
 
-#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:47
-msgid "Estimated hours average"
-msgstr "Geschat uren gemiddelde"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/users/OrderAuthorizationController.java:120
 msgid ""
 "Could not add those authorizations to profile {0} because they were already "
 "present."
 msgstr "Kon deze autorisaties niet toevoegen aan profiel {0} omdat ze er al in zaten."
 
-#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:163
-#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/ResourceCalendar.java:78
+#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:47
+msgid "Estimated hours average"
+msgstr "Geschat uren gemiddelde"
+
 #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionSatisfaction.java:216
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/ResourceCalendar.java:78
+#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:163
 msgid "resource not specified"
 msgstr "resource niet gespecificeerd"
 
@@ -425,7 +440,7 @@ msgstr "resource niet gespecificeerd"
 msgid "measure not specified"
 msgstr "measure niet gespecificeerd"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:64
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:65
 msgid "Default calendar"
 msgstr "Standaard Kalender"
 
@@ -439,15 +454,15 @@ 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:169
-#: 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
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:161
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:188
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:180
 #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:158
+#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:169
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:210
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:161
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:181
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:220
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:188
 msgid "Click on this"
 msgstr "Klik hier"
 
@@ -455,15 +470,15 @@ msgstr "Klik hier"
 msgid "project calendar not specified"
 msgstr "projectkalender niet gespecificeerd"
 
-#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:104
-#: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:36
 #: libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul:53
+#: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:36
+#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:104
 msgid "Project Name"
 msgstr "Projectnaam"
 
-#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/TypeOfWorkHours.java:146
+#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/TypeOfWorkHours.java:149
 msgid "type of work hours for personal timesheets cannot be disabled"
-msgstr "type werkuren kan bij individuele urenstaten niet gedisabled worden"
+msgstr "type werkuren kan bij individuele urenstaten niet uitgezet worden"
 
 #: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/ExternalCompany.java:166
 msgid "Company ID already used. It must be unique"
@@ -487,7 +502,7 @@ msgstr "Inspringen"
 msgid "Reassignation"
 msgstr "Opnieuw toekennen"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:351
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:352
 msgid "Save passwords in database"
 msgstr "Sla wachtwoord op in database"
 
@@ -495,14 +510,14 @@ msgstr "Sla wachtwoord op in database"
 msgid "Consolidated progress measurement cannot be removed"
 msgstr "Geconsolideerde voortgangsmeting kan niet worden verwijderd"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:984
+msgid "Delete bound user"
+msgstr "Verwijder gekoppelde gebruiker"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTree.java:42
 msgid "New template"
 msgstr "Nieuwe sjabloon"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:970
-msgid "Delete bound user"
-msgstr "Verwijder gekoppelde gebruiker"
-
 #: libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialInfo.java:61
 msgid "unit price not specified"
 msgstr "Stuksprijs niet gespecificeerd"
@@ -511,6 +526,10 @@ msgstr "Stuksprijs niet gespecificeerd"
 msgid "Total estimated hours"
 msgstr "Totaal geschatte uren"
 
+#: libreplan-webapp/src/main/webapp/common/_editJobScheduling.zul:133
+msgid "For more details on cron expression click"
+msgstr "Voor meer informatie over cron expressies klik"
+
 #: libreplan-webapp/src/main/webapp/common/error.zul:21
 #: libreplan-webapp/src/main/webapp/common/event_error.zul:22
 msgid "LibrePlan: Runtime Error"
@@ -541,14 +560,18 @@ msgstr "Nieuw kwaliteitsformulier item"
 msgid "LibrePlan: Labels"
 msgstr "LibrePlan: Labels"
 
-#: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:363
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:380
 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
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:283
 msgid "LDAP connection was successful"
 msgstr "LDAP verbinding was successvol"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/JobSchedulerController.java:414
+msgid "Job is scheduled/unscheduled"
+msgstr "Taak is gepland/niet-gepland"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:350
 msgid ""
 "This resource allocation type is incompatible. The task has an associated "
@@ -564,7 +587,7 @@ msgstr "positie niet gespecificeerd"
 msgid "Current"
 msgstr "Huidig"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:84
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:85
 msgid "{0} List"
 msgstr "{0} Lijst"
 
@@ -572,19 +595,19 @@ msgstr "{0} Lijst"
 msgid "Dependencies"
 msgstr "Afhankelijkheden"
 
-#: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:78
+#: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:108
 msgid "Current selection"
 msgstr "Actuele selectie"
 
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1130
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1132
 msgid ""
 "there exist criterion satisfactions referring to criterion types not "
 "applicable to this resource"
 msgstr "er bestaan criterium overeenkomsten die verwijzen naar criterium types die niet relevant zijn voor deze resource "
 
 #: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:47
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:52
 #: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:52
-#: libreplan-webapp/src/main/webapp/orders/_edition.zul:50
 msgid "Criterion Requirement"
 msgstr "Criterium Requirement"
 
@@ -593,6 +616,8 @@ msgid "Show labels"
 msgstr "Toon labels"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/EffortDurationPicker.java:63
+#: libreplan-webapp/src/main/webapp/common/_editJobScheduling.zul:107
+#: libreplan-webapp/src/main/webapp/common/_editJobScheduling.zul:145
 msgid "Minutes"
 msgstr "Minuten"
 
@@ -629,13 +654,13 @@ 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:28
 #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:53
+#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:28
 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:669
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:673
 msgid ""
 "there are no resources for required criteria: {0}. So the generic allocation"
 " can't be added"
@@ -645,7 +670,7 @@ msgstr "Er zijn geen resources voor dit vereiste criterium: {0}. Dus de automati
 msgid "must be later than start date"
 msgstr "moet later dan startdatum zijn"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:371
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:372
 msgid "Role search strategy"
 msgstr "Rol zoek strategie"
 
@@ -669,15 +694,15 @@ msgstr "Toegewezen uren"
 msgid "progress should be greater than 0% and less than 100%"
 msgstr "voorgang dient meer dan 0% en minder dan 100% te zijn"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:668
-msgid "A description field with the same name already exists."
-msgstr "Een omschrijvingsveld met dezelfde naam bestaat reeds."
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:456
 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:143
 msgid "Confirm deleting this hour cost. Are you sure?"
 msgstr "Bevestiging verwijdering uurprijs. Weet u het zeker?"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:668
+msgid "A description field with the same name already exists."
+msgstr "Een omschrijvingsveld met dezelfde naam bestaat reeds."
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/milestone/DeleteMilestoneCommand.java:59
 msgid "Delete Milestone"
 msgstr "Verwijder mijlpaal"
@@ -694,7 +719,7 @@ msgstr "Niet-toegekende lokaties"
 msgid "Application URI"
 msgstr "Application URI"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:373
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:374
 msgid "Group strategy"
 msgstr "Groepsstrategie"
 
@@ -702,14 +727,18 @@ msgstr "Groepsstrategie"
 msgid "Budget: {0}, Consumed: {1} ({2}%)"
 msgstr "Budget: {0}, Verbruikt: {1} ({2}%)"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1562
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1570
 msgid "Configure"
 msgstr "Configureer"
 
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:55
-#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:59
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:142
+msgid "Criterion filter"
+msgstr "Criteriumfilter"
+
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:60
 #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:61
 #: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:36
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:55
 msgid "First name"
 msgstr "Voornaam"
 
@@ -721,24 +750,24 @@ msgstr "Complementaire tekstvelden"
 msgid "LibrePlan: Send To Subcontractors"
 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/calendars/BaseCalendarCRUDController.java:451
+#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:291
 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:215
 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1281
-#: 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:826
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:966
 msgid "Confirm deleting {0}. Are you sure?"
 msgstr "Bevestig verwijderen {0}. Weet u het zeker?"
 
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:222
+msgid "External code"
+msgstr "Externe code"
+
 #: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:51
 msgid "Edit selected task"
 msgstr "Wijzig geselecteerde taak"
 
-#: libreplan-webapp/src/main/webapp/orders/_edition.zul:220
-msgid "External code"
-msgstr "Externe code"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:197
 #: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:748
 msgid "Personal timesheet saved"
@@ -764,7 +793,7 @@ msgstr "Nieuwe leveringsdatum"
 msgid "Required materials"
 msgstr "Vereiste materialen"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:312
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:409
 msgid "Backwards"
 msgstr "Achteruit"
 
@@ -798,14 +827,14 @@ msgstr "EAC"
 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/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/webapp/scenarios/_edition.zul:39
+msgid "Predecessor"
+msgstr "Voorganger"
+
 #: 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"
@@ -820,16 +849,17 @@ msgid ""
 " value "
 msgstr "Waarde is ongeldig, de standaard maximum waarde moet groter zijn dan de nauwkeurigheidswaarde"
 
-#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:82
-#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:45
-#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:61
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:125
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:57
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:60
 #: libreplan-webapp/src/main/webapp/myaccount/_myTasksArea.zul:36
 #: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:38
+#: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:61
 #: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:55
-#: libreplan-webapp/src/main/webapp/orders/_edition.zul:277
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:125
+#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:45
+#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:61
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:60
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:57
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:82
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:279
 msgid "End date"
 msgstr "Einddatum"
 
@@ -837,7 +867,7 @@ msgstr "Einddatum"
 msgid "LibrePlan: Calendar Exception Days"
 msgstr "LibrePlan: Kalender uitzonderingsdagen"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:976
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:990
 msgid "Worker and bound user deleted"
 msgstr "Werker en gekoppelde gebruiker verwijderd"
 
@@ -857,28 +887,32 @@ msgstr "profielnaam wordt al gebruikt door een ander profiel"
 msgid "You cannot remove the current scenario"
 msgstr "U kunt het actuele scenario niet verwijderen"
 
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:84
-#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:71
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:72
 #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:122
 #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:158
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:84
 msgid "E-mail"
 msgstr "E-mail"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/TimeLineRequiredMaterialController.java:112
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:115
 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:106
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:115
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/TimeLineRequiredMaterialController.java:112
 msgid "This project has already been added."
 msgstr "Dit project is al toegevoegd"
 
+#: libreplan-webapp/src/main/webapp/orders/components/_timOrderTimesheetSync.zul:45
+msgid "Export to Tim"
+msgstr "Exporteren naar Tim"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/ProjectStatusReportController.java:173
-#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:558
-#: 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/java/org/libreplan/web/common/CustomMenuController.java:331
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:669
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:765
 #: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:39
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:32
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:144
 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:36
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:143
-#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:54
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:55
 msgid "Criteria"
 msgstr "Criteria"
 
@@ -890,8 +924,8 @@ msgstr "Gebruikersgegevens"
 msgid "Resource / Criteria"
 msgstr "Resource/Criteria"
 
-#: libreplan-business/src/main/java/org/libreplan/business/workreports/valueobjects/DescriptionField.java:71
 #: libreplan-business/src/main/java/org/libreplan/business/workreports/valueobjects/DescriptionValue.java:71
+#: libreplan-business/src/main/java/org/libreplan/business/workreports/valueobjects/DescriptionField.java:71
 msgid "field name not specified or empty"
 msgstr "veldnaam niet gespecificeerd of leeg"
 
@@ -912,14 +946,14 @@ 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:377
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:382
 #: libreplan-webapp/src/main/webapp/myaccount/_expensesArea.zul:22
-#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:62
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:63
 msgid "Expenses"
 msgstr "Onkosten"
 
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionType.java:182
 #: libreplan-business/src/main/java/org/libreplan/business/scenarios/entities/Scenario.java:145
-#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionType.java:165
 msgid "name is already used"
 msgstr "naam reeds in gebruik"
 
@@ -935,10 +969,6 @@ msgstr "Projectversie is het zelfde bij bron en bestemmings scenarios"
 msgid "Quality form item name must be unique"
 msgstr "Kwaliteitsformulieritemnaam moet uniek zijn"
 
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:50
-msgid "Subcontracting communication date"
-msgstr "Onderaannemen communicatie datum"
-
 #: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:162
 #: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:28
 msgid "Finished"
@@ -948,58 +978,66 @@ msgstr "Klaar"
 msgid "Personal data"
 msgstr "Persoonlijke gegevens"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:164
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:50
+msgid "Subcontracting communication date"
+msgstr "Onderaannemen communicatie datum"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:159
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:202
 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:337
 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:207
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:202
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:159
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:164
 msgid "please, select a Criterion"
 msgstr "Kies een criterium"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/entrypoints/EntryPointsHandler.java:143
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/entrypoints/EntryPointsHandler.java:144
 msgid "{0} annotation required on {1}"
 msgstr "{0} annotatie vereist bij {1}"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:239
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:263
 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:1290
-msgid "Modified"
-msgstr "Gewijzigd"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:999
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1006
 msgid "cannot be negative"
 msgstr "kan niet negatief zijn"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1297
+msgid "Modified"
+msgstr "Gewijzigd"
+
 #: 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:665
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:788
 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/resources/worker/CriterionsController.java:89
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:471
+msgid "MessagesContainer is needed"
+msgstr "BoodschapContainer is benodigd"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/importers/ProjectImportController.java:110
+msgid "The only current suported formats are mpp and planner."
+msgstr "De enige op dit moment ondersteunde bestandsformaten zijn mpp en planner."
+
 #: 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"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:89
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:457
-msgid "MessagesContainer is needed"
-msgstr "BoodschapContainer is benodigd"
-
 #: libreplan-webapp/src/main/webapp/dashboard/_dashboardfororder.zul:100
 msgid ""
 "Load percentage of resources participating in the project while they are "
 "assigned"
 msgstr "Belastingspercentage van resources betrokken bij het project terwijl ze zijn toegekend"
 
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:58
-#: libreplan-webapp/src/main/webapp/resources/worker/_localizations.zul:69
 #: libreplan-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:26
+#: libreplan-webapp/src/main/webapp/resources/worker/_localizations.zul:69
 #: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:29
 #: libreplan-webapp/src/main/webapp/resources/_criterions.zul:42
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:58
 msgid "Ending date"
 msgstr "Einddatum"
 
@@ -1027,7 +1065,7 @@ msgstr "Sjablonenlijst"
 msgid "Criteria: {0}"
 msgstr "Criteria: {0}"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:264
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:265
 msgid "Last value"
 msgstr "Laatste waarde"
 
@@ -1035,6 +1073,11 @@ msgstr "Laatste waarde"
 msgid "Average of worked hours in finished applications"
 msgstr "Gemiddeld aantal gewerkte uren in afgeronde applicaties"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/importers/ProjectImportController.java:79
+#: libreplan-webapp/src/main/java/org/libreplan/web/importers/ProjectImportController.java:98
+msgid "Instance not found."
+msgstr "instantie niet gevonden"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:723
 msgid "Calculated progress can not be modified"
 msgstr "Berekende voorgang niet niet worden gewijzigd"
@@ -1047,8 +1090,12 @@ msgstr "Werk verricht sinds startdatum"
 msgid "Statistics log"
 msgstr "Statistieken logboek"
 
-#: libreplan-webapp/src/main/webapp/resources/worker/_calendar.zul:47
+#: libreplan-webapp/src/main/java/org/libreplan/web/importers/ProjectImportController.java:77
+msgid ": Calendar import successfully!"
+msgstr ": Kalender import succesvol!"
+
 #: libreplan-webapp/src/main/webapp/resources/machine/_calendar.zul:40
+#: libreplan-webapp/src/main/webapp/resources/worker/_calendar.zul:47
 msgid "Edit Calendar"
 msgstr "Wijzig kalender"
 
@@ -1060,25 +1107,33 @@ msgstr "item"
 msgid "Profile"
 msgstr "Profiel"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:610
+msgid "{0} sequences"
+msgstr "{0} sequences"
+
+#: libreplan-webapp/src/main/webapp/common/_editJobScheduling.zul:120
+msgid "or names"
+msgstr "of namen"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:505
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:39
+msgid "Materials Needs At Date"
+msgstr "Benodigde materialen op datum"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:615
 #: 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:316
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:317
 msgid "UserDn"
 msgstr "UserDN"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:233
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:235
 msgid "{0} \"{1}\" saved"
 msgstr "{0} \"{1}\" opgeslagen"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:307
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:328
 msgid "filtering"
 msgstr "filteren"
 
@@ -1090,7 +1145,7 @@ msgstr "Totaal Budget"
 msgid "Hierarchy"
 msgstr "Hierarchie"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:955
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:969
 msgid ""
 "This worker cannot be deleted because it has assignments to projects or "
 "imputed hours"
@@ -1105,7 +1160,12 @@ msgstr "Werk gedaan totaan de einddatum"
 msgid "Print configuration"
 msgstr "Print configuratie"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeModel.java:422
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/JiraSynchronizationController.java:182
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/JiraSynchronizationController.java:235
+msgid "Failed: {0}"
+msgstr "Mislukt: {0}"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeModel.java:433
 msgid "There is another timesheet template with the same code"
 msgstr "Er is een andere urenstaatsjabloon met dezelfde code"
 
@@ -1131,40 +1191,44 @@ msgid ""
 "different resource type."
 msgstr "Weet u zeker dat u het resource type wilt wijzigen? U verlies de criteria bij een ander resource type."
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:170
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:165
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:208
 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:343
 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:213
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:208
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:165
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:170
 msgid "This Criterion has already been added."
 msgstr "Dit criterium is al toegevoegd"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:246
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:247
 msgid "add"
 msgstr "toevoegen"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/TimSynchronizationController.java:153
+msgid "Exporting timesheets to Tim failed. Check the Tim connector"
+msgstr "Het exporteren van urenstaten naar Tim is mislukt. Controleer de Tim connector"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:1142
 #: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:426
-#: 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?"
 msgstr "Niet opgeslagen wijzigiingen zullen verloren gaan. Wilt u toch doorgaan?"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:290
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:297
 msgid "please select a user to bound"
 msgstr "kies aub een gebruiker om aan te koppelen"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:301
-#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:49
-msgid "Workers"
-msgstr "Werkers"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:862
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1002
 msgid ""
 "You can not remove the project \"{0}\" because it has time tracked at some "
 "of its tasks"
 msgstr " U kunt het project \"{0}\" niet verwijderen omdat er uren zijn geschreven op een of meer van de taken"
 
-#: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:53
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:306
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:50
+msgid "Workers"
+msgstr "Werkers"
+
+#: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:80
 msgid "Resources matching selected criteria"
 msgstr "Resources die overeenkomen met het geselecteerde criterium"
 
@@ -1177,18 +1241,19 @@ msgid "Label Type"
 msgstr "Label Type"
 
 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:50
+#: libreplan-webapp/src/main/webapp/common/_editJobScheduling.zul:150
 msgid "Year"
 msgstr "Jaar"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:327
-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:429
-#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:70
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:441
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:72
 msgid "Received From Subcontractors"
 msgstr "Ontvangen Van Onderaannemers"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:329
+msgid "{0} \"{1}\" could not be deleted, it was already removed"
+msgstr "{0} \"{1}\" kon niet verwijderd worden, het was reeds verwijderd"
+
 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/Profile.java:68
 msgid "profile name not specified"
 msgstr "Profilenaam niet opgegeven"
@@ -1197,6 +1262,10 @@ msgstr "Profilenaam niet opgegeven"
 msgid "you do not have permissions to create new labels"
 msgstr "u heeft geen rechten voor het maken van nieuwe labels"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/JobSchedulerController.java:351
+msgid "Unable to parse cron expression"
+msgstr "Het interpreteren van de cron expressie is niet gelukt"
+
 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:63
 msgid "Date Start"
 msgstr "Startdatum"
@@ -1213,10 +1282,11 @@ msgstr "Alle taakuren"
 msgid "Hour costs"
 msgstr "Urenkosten"
 
+#: libreplan-webapp/src/main/webapp/planner/order.zul:105
 #: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:137
 #: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:168
-#: libreplan-webapp/src/main/webapp/planner/order.zul:105
 #: libreplan-webapp/src/main/webapp/subcontract/subcontractorCommunications.zul:58
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:438
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:67
 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:35
 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:56
@@ -1242,13 +1312,13 @@ msgstr "Rol toevoegen"
 msgid "Exception end date should be greater or equals than start date"
 msgstr "UItzonderingseinddatum moet op of na stardatum liggen"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:529
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:539
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:521
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:531
 msgid "Repeated Project code {0} in Project {1}"
 msgstr "Herhalade Projectcode {0} in Project {1}"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:239
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineConfigurationController.java:222
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:239
 msgid "End date is not valid, the new end date must be after start date"
 msgstr "Einddatum is ongeldig. De nieuwe einddatum moet na de startdatum liggen"
 
@@ -1260,8 +1330,12 @@ 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/worker/AssignedCriterionsModel.java:335
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:297
+msgid "Please select a connector to test it"
+msgstr "Selecteer aub een connector om deze te testen"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/AssignedMachineCriterionsModel.java:398
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/AssignedCriterionsModel.java:335
 msgid ""
 "The {0} can not be assigned to this resource. Its interval overlaps with "
 "other criterion"
@@ -1279,22 +1353,22 @@ msgstr "Eerdere startdatum"
 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/common/CustomMenuController.java:413
 #: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:124
-#: 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
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:68
 msgid "Profiles"
 msgstr "Profielen"
 
-#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:46
 #: libreplan-webapp/src/main/webapp/myaccount/_expensesArea.zul:35
+#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:46
 msgid "First expense"
 msgstr "Eerste onkosten"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:295
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:296
 msgid "Host"
 msgstr "Host"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:207
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:208
 msgid "Perspectives"
 msgstr "Perspectieven"
 
@@ -1302,6 +1376,14 @@ msgstr "Perspectieven"
 msgid "Workable time"
 msgstr "Werktijd"
 
+#: libreplan-webapp/src/main/webapp/orders/imports/projectImport.zul:54
+msgid "Upload Project"
+msgstr "Upload Project"
+
+#: libreplan-webapp/src/main/java/org/libreplan/importers/ImportRosterFromTim.java:210
+msgid "No roster-exceptions found in the response"
+msgstr "Geen rooster-uitzonderingen in het antwoord"
+
 #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:40
 msgid "Company name"
 msgstr "Bedrijfsnaam"
@@ -1344,6 +1426,14 @@ msgstr "Verloopdatum"
 msgid "Pagination"
 msgstr "Pagineren"
 
+#: libreplan-business/src/main/java/org/libreplan/business/common/entities/ConnectorProperty.java:51
+msgid "property key not specified"
+msgstr "property key not specified"
+
+#: libreplan-webapp/src/main/java/org/libreplan/importers/ImportRosterFromTim.java:153
+msgid "No departments configured"
+msgstr "Geen afdelingen geconfigureerd"
+
 #: libreplan-webapp/src/main/webapp/common/layout/template.zul:86
 msgid "Change scenario"
 msgstr "Wijzig scenario"
@@ -1353,18 +1443,18 @@ msgstr "Wijzig scenario"
 msgid "Critical path"
 msgstr "Kritieke pad"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1338
+msgid "Value is not valid. It must be smaller than max value"
+msgstr "Waarde is ongeldig. Het moet kleiner zijn dan de maximumwaarde"
+
 #: libreplan-webapp/src/main/webapp/materials/materials.zul:43
 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:41
 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:77
 msgid "Categories"
 msgstr "Categorien"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1338
-msgid "Value is not valid. It must be smaller than max value"
-msgstr "Waarde is ongeldig. Het moet kleiner zijn dan de maximumwaarde"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/OrdersTabCreator.java:47
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:181
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:183
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/OrdersTabCreator.java:50
 msgid "Project Details"
 msgstr "Project details"
 
@@ -1376,24 +1466,28 @@ msgstr "Voeg nieuwe urengroep toe"
 msgid "Cancel changes and back to scheduling"
 msgstr "Breek wijzigingen af en terug naar planning"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:384
+#: libreplan-webapp/src/main/webapp/planner/order.zul:106
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:45
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:68
+#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:66
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:86
+msgid "Percentage"
+msgstr "Percentage"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:212
 msgid "Task: {0}"
 msgstr "Taak: {0}"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:384
-#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:65
-#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:86
-#: libreplan-webapp/src/main/webapp/planner/order.zul:106
-#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:45
-#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:68
-msgid "Percentage"
-msgstr "Percentage"
+#: libreplan-webapp/src/main/webapp/common/_editJobScheduling.zul:98
+msgid "Field"
+msgstr "Veld"
 
 #: libreplan-webapp/src/main/webapp/dashboard/_costStatus.zul:55
 msgid "Remaining time"
 msgstr "Resterende tijd"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:97
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:98
 msgid "Company logo URL"
 msgstr "Bedrijfslogo URL"
 
@@ -1401,21 +1495,21 @@ msgstr "Bedrijfslogo URL"
 msgid "No worker selected"
 msgstr "Geen werker geselecteerd"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:244
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:262
-msgid "Number of digits"
-msgstr "Aantal cijfers"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportQueryController.java:290
 msgid "Task not found"
 msgstr "Taak niet gevonden"
 
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:245
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:263
+msgid "Number of digits"
+msgstr "Aantal cijfers"
+
 #: libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java:152
 msgid "company code cannot contain whitespaces"
 msgstr "bedrijfscode mag geen spaties bevatten"
 
-#: libreplan-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:39
 #: libreplan-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:39
+#: libreplan-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:39
 msgid "Total capability"
 msgstr "Totale beschikbaarheid"
 
@@ -1423,7 +1517,11 @@ 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:721
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:132
+msgid "Projects since"
+msgstr "Projecten sinds"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:865
 msgid ""
 "You cannot remove the task \"{0}\" because it has work reported on it or any"
 " of its children"
@@ -1439,44 +1537,49 @@ msgstr "Exception Type"
 msgid "The current value must be less than the max value."
 msgstr "De huiidge waarde moet lager zijn dan de maximum waarde."
 
-#: libreplan-webapp/src/main/webapp/profiles/_listProfiles.zul:22
-msgid "Profiles List"
-msgstr "Profielen Lijst"
+#: libreplan-webapp/src/main/java/org/libreplan/importers/ImportRosterFromTim.java:182
+msgid "No valid response for department \"{0}\""
+msgstr "Geen geldige respons voor afdeling \"{0}\""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:915
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/ProjectStatusReportController.java:160
+#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:226
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:341
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:752
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:726
+#: 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/common/configuration.zul:148
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:50
+#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:50
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:57
+msgid "Labels"
+msgstr "Labels"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsModel.java:278
 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:915
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/ProjectStatusReportController.java:160
-#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:226
-#: 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:147
-#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:56
-msgid "Labels"
-msgstr "Labels"
+#: libreplan-webapp/src/main/webapp/profiles/_listProfiles.zul:22
+msgid "Profiles List"
+msgstr "Profielen Lijst"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:442
 msgid "Queue-based resource assignation"
 msgstr "Wachtrij-gebaseerde resource toekenning"
 
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:116
+msgid "End date communicated by the subcontractor."
+msgstr "Einddatum afgegeven door de onderaannemer"
+
 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:106
 #: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:47
 msgid "New timesheet"
 msgstr "Nieuwe tijdsheet"
 
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:116
-msgid "End date communicated by the subcontractor."
-msgstr "Einddatum afgegeven door de onderaannemer"
-
 #: 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/_edition.zul:197
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:68
 msgid "Total hours"
 msgstr "Totaal aantal uren"
@@ -1485,7 +1588,7 @@ msgstr "Totaal aantal uren"
 msgid "Reassigning {0} projects"
 msgstr "opnieuw toewijzen {0} projecten"
 
-#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:39
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:40
 msgid "Data"
 msgstr "Data"
 
@@ -1493,11 +1596,15 @@ msgstr "Data"
 msgid "Filter by task status"
 msgstr "Filter op taak status"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:496
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:424
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:453
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:520
 msgid "Select date"
 msgstr "Selecteer datum"
 
+#: libreplan-webapp/src/main/java/org/libreplan/importers/JiraOrderElementSynchronizer.java:541
+msgid "No JIRA issues found for key {0}"
+msgstr "geen JIRA issues gevonden voor sleutel {0}"
+
 #: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractedTaskData.java:265
 msgid "state not specified"
 msgstr "status niet gespecificeerd"
@@ -1515,7 +1622,7 @@ msgstr "Probeer aub opnieuw."
 msgid "cannot be checked until the previous item is checked before"
 msgstr "kan niet worden afgevinkt als het vorige item niet is afgevinkt"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:57
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:58
 msgid "Company code"
 msgstr "Bedrijfscode"
 
@@ -1527,11 +1634,15 @@ msgstr "Onbekende attribuut '{0}' in classe {1}"
 msgid "Sum of imputed hours in children tasks"
 msgstr "Totaal van doorbelaste uren in afgeleide taken"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:297
+msgid "Import project"
+msgstr "Importeer project"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordController.java:96
 msgid "passwords can not be empty"
 msgstr "wachtwoorden kunnen niet leeg zijn"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:1074
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:1066
 msgid "Task {0}"
 msgstr "Taak {0}"
 
@@ -1545,9 +1656,9 @@ msgstr "Neem contact op met een LibrePlan beheerder om uw toegangsrechten te wij
 msgid "machine name not specified"
 msgstr "machinenaam niet gespecificeerd"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:176
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:93
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:139
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:176
 msgid "already assigned"
 msgstr "reeds toegewezen"
 
@@ -1556,22 +1667,26 @@ msgid "Activation periods"
 msgstr "Activeringsperioden"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:505
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:32
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:35
 #: libreplan-webapp/src/main/webapp/planner/order.zul:151
 #: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:90
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:35
-#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:32
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:178
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:140
 #: 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:177
 msgid "Calendar"
 msgstr "Kalender"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:357
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:362
 #: libreplan-webapp/src/main/webapp/dashboard/_dashboardfororder.zul:76
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:157
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:158
 msgid "Resources"
 msgstr "Resources"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioCRUDController.java:238
+msgid "Scenario"
+msgstr "Scenario"
+
 #: libreplan-webapp/src/main/webapp/myaccount/changePassword.zul:56
 msgid ""
 "LDAP users cannot change their password if LDAP authentication is enabled. "
@@ -1599,20 +1714,29 @@ msgstr "De browser die u gebruikt"
 msgid "scenario"
 msgstr "scenario"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:220
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderSyncInfo.java:96
+msgid "connector name not specified"
+msgstr "connectornaam niet gespecificeerd"
+
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:134
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:151
+msgid "months to"
+msgstr "maanden tot"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:221
 msgid ""
 "Defines the time since last saving operation at project planning "
 "perspectives after which a warning is raised on leaving. Set to 0 in order "
 "to disable the warning."
 msgstr "Definieert de tijd sinds de laatste save operatie in het project-plannings perspectief waarna een waarschuwing wordt getoond bij het verlaten. Stel in op 0 on deze waarschuwing uit te zetten."
 
+#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:42
 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:52
 #: 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
+#: libreplan-webapp/src/main/webapp/orders/_orderFilter.zul:30
 msgid "to"
-msgstr "naar"
+msgstr "tot"
 
 #: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:567
 msgid ""
@@ -1628,12 +1752,12 @@ msgstr "voornaam werker niet gespecificeerd"
 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:374
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:375
 msgid "Property strategy"
 msgstr "Eigendom strategie"
 
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:107
-#: libreplan-webapp/src/main/webapp/orders/_edition.zul:276
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:278
 msgid "Save date"
 msgstr "Opslagdatum"
 
@@ -1644,9 +1768,9 @@ msgstr "De kwaliteitsonderdeelposities moeten overeenkomen met het bijbehorende
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:521
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:281
-#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceMeasurement.java:82
 #: libreplan-business/src/main/java/org/libreplan/business/expensesheet/entities/ExpenseSheetLine.java:146
 #: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:140
+#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceMeasurement.java:82
 #: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/TaskQualityFormItem.java:139
 msgid "date not specified"
 msgstr "datum niet gespecificeerd"
@@ -1657,8 +1781,12 @@ msgid ""
 "and their calendars."
 msgstr "Beschikbare periodes zijn afhankelijk van de vervulling van de criteria van resources en hun kalenders"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:197
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:215
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:362
+msgid "JIRA connection was successful"
+msgstr "JIRA verbinding was successvol"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:199
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:232
 msgid "Projects Planning"
 msgstr "Projecten planning"
 
@@ -1674,14 +1802,14 @@ msgstr "U kunt geen scenario verwijderen met afgeleide scenarios"
 msgid "The max value must be greater than 0"
 msgstr "De maximum waarde moet groter zijn dan 0"
 
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:61
-#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:65
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:66
 #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:73
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:61
 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:568
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/Util.java:675
 msgid "Remove"
 msgstr "Verwijder"
 
@@ -1705,7 +1833,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:1311
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1319
 msgid "Task contains consolidated progress. Cannot apply sigmoid function."
 msgstr "Taak bevat geconsolideerde voortgang. Kan sigmoid functie niet toepassen."
 
@@ -1717,26 +1845,26 @@ 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:344
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:345
 msgid "UserId"
 msgstr "GebruikersID"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:509
-msgid "This date can not include the whole previous work week"
-msgstr "Deze datum kan niet de hele voorafgaande werkweek bevatten"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:245
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:220
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:245
 msgid ""
 "Start date is not valid, the new start date must be previous the current "
 "start date"
 msgstr "Startdatum is ongeldig, de nieuwe startdatum moet voor de huidige startdatum liggen"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:509
+msgid "This date can not include the whole previous work week"
+msgstr "Deze datum kan niet de hele voorafgaande werkweek bevatten"
+
 #: libreplan-webapp/src/main/webapp/common/layout/template.zul:123
 msgid "Create New Project"
 msgstr "Maak nieuw project"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1446
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1454
 msgid "Stretches list"
 msgstr "Stretches lijst"
 
@@ -1752,36 +1880,37 @@ msgstr "LibrePlan: Totaal Gewerkte Uren door Resources in een maand"
 msgid "Zoom"
 msgstr "Zoom"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:886
-#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:112
-#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:38
-#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:91
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:878
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:162
+#: libreplan-webapp/src/main/webapp/myaccount/changePassword.zul:89
+#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:133
 #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:102
-#: libreplan-webapp/src/main/webapp/materials/materials.zul:118
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:97
+#: libreplan-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:45
+#: libreplan-webapp/src/main/webapp/resources/worker/worker.zul:42
+#: libreplan-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:41
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:90
+#: libreplan-webapp/src/main/webapp/resources/criterions/criterions.zul:45
+#: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:48
+#: libreplan-webapp/src/main/webapp/typeofworkhours/_editTypeOfWorkHours.zul:77
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:91
 #: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:180
+#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:46
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:118
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:112
+#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:125
 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:232
 #: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:37
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:450
+#: libreplan-webapp/src/main/webapp/common/_editJobScheduling.zul:84
 #: 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:184
-#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:125
-#: 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/costcategories/_editCostCategory.zul:94
 #: libreplan-webapp/src/main/webapp/profiles/_editProfile.zul:70
+#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:38
 #: libreplan-webapp/src/main/webapp/unittypes/unitTypes.zul:41
-#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:46
-#: libreplan-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:41
-#: libreplan-webapp/src/main/webapp/resources/worker/worker.zul:42
-#: libreplan-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:45
-#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:97
-#: libreplan-webapp/src/main/webapp/resources/criterions/criterions.zul:45
-#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:90
-#: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:48
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:131
 #: 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:419
 msgid "Save"
 msgstr "Opslaan"
 
@@ -1796,13 +1925,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:167
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:168
 msgid "Material categories"
 msgstr "Materiaal categorien"
 
-#: 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
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:399
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:711
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:809
 msgid "number of digits must be between {0} and {1}"
 msgstr "Aantal cijfers moet tussen {0} en {1} liggen"
 
@@ -1829,7 +1958,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:313
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:410
 msgid "Schedule from deadline to start"
 msgstr "Plan van deadline naar start"
 
@@ -1850,21 +1979,21 @@ msgstr "Verwijder sjabloon. weet u het zeker?"
 msgid "Expense date"
 msgstr "Onkosten datum"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:256
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:257
 msgid "Entity type"
 msgstr "Entiteittype"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1096
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:234
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1120
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:330
 msgid "Unsaved changes will be lost. Are you sure?"
 msgstr "Niet opgeslagen wijzigingen zullen verloren gaan. Weet u het zeker?"
 
-#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:22
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:22
 #: libreplan-webapp/src/main/webapp/planner/resources_use.zul:22
 #: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:22
 #: libreplan-webapp/src/main/webapp/planner/main.zul:22
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:22
 #: libreplan-webapp/src/main/webapp/planner/order.zul:22
+#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:22
 #: libreplan-webapp/src/main/webapp/resourceload/resourceload.zul:22
 msgid "LibrePlan: Scheduling"
 msgstr "LibrePlan: Planning"
@@ -1895,7 +2024,7 @@ msgid ""
 "popup or type in date directly)"
 msgstr "Geschatte einddatum voor de taak (druk enter in tekstbox om een kalender venster te openen of type datum rechtstreeks in)"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:310
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:364
 msgid "Expand/Collapse all"
 msgstr "Alles Uitklappen/Inklappen"
 
@@ -1903,13 +2032,9 @@ 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:887
-msgid "Name: {0}"
-msgstr "Naam: {0}"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:118
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:139
 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:113
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:139
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:118
 msgid "Please, select a project"
 msgstr "Kies aub een project"
 
@@ -1932,7 +2057,7 @@ msgstr "resource moet gekoppeld zijn aan een gebruiker bij een persoonlijke uren
 #: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:102
 #: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:103
 #: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:393
-#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionType.java:139
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionType.java:156
 msgid "Yes"
 msgstr "Ja"
 
@@ -1940,17 +2065,17 @@ msgstr "Ja"
 msgid "Go to user edition window"
 msgstr "Ga naar gebruiker wijzigingsvenster"
 
-#: 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
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:397
 #: libreplan-webapp/src/main/webapp/dashboard/_dashboardfororder.zul:67
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:46
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:159
+#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:46
 msgid "Cost"
 msgstr "Kosten"
 
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:146
 #: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:40
-#: libreplan-webapp/src/main/webapp/orders/_edition.zul:42
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:146
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:44
 msgid "General data"
 msgstr "Algemene gegevens"
 
@@ -1962,7 +2087,7 @@ msgstr "BAC"
 msgid "Deadline (days since project start)"
 msgstr "Deadline (dagen sinds aanvang project)"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:381
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:402
 msgid "Calculate Number of Hours"
 msgstr "Bereken aantal uren"
 
@@ -1973,7 +2098,7 @@ msgstr "Bereken aantal uren"
 msgid "Assign"
 msgstr "Toekenne"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1276
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1424
 msgid "Create Template"
 msgstr "Maak sjabloon"
 
@@ -1991,20 +2116,20 @@ 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:837
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:977
 msgid "Not enough permissions to edit this project"
 msgstr "Niet genoeg rechten om dit project te wijzigen"
 
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:60
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:68
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:60
 msgid "Advanced search"
 msgstr "Gevorderde zoekopdracht"
 
 #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:76
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:76
 #: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:65
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:114
 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:97
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:76
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:114
 #: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:84
 msgid "Filter by labels"
 msgstr "Filter op label"
@@ -2016,7 +2141,7 @@ msgid ""
 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
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:84
 msgid "Project Status Report"
 msgstr "Project statusrapport"
 
@@ -2028,7 +2153,7 @@ msgstr "MonteCarlo grafiek"
 msgid "Schedule Variance"
 msgstr "Plan Variantie"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:684
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:688
 msgid "resources per day cannot be empty or less than zero"
 msgstr "resources per dag kan niet leeg zijn of lager dan nul"
 
@@ -2049,35 +2174,35 @@ msgstr "criteriumnamen moeten uniek zijn binnen een criteriumtype"
 msgid "Status code"
 msgstr "Status code"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:575
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:613
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:644
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/AdvancedAllocationTaskController.java:73
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:472
+#: libreplan-webapp/src/main/java/org/libreplan/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:150
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:970
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:155
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:103
+#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:391
+msgid "Warning"
+msgstr "Waarschuwing"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:900
 msgid "Index fields and labels must be unique and consecutive"
 msgstr "indexvelden en labels moeten uniek en opvolgend zijn"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:970
-#: 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:575
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:613
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:644
-#: 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
-msgid "Warning"
-msgstr "Waarschuwing"
-
-#: libreplan-webapp/src/main/webapp/resources/worker/_calendar.zul:35
-#: libreplan-webapp/src/main/webapp/resources/machine/_calendar.zul:30
-msgid "Select parent calendar"
-msgstr "Selecteer bovenliggende kalender"
-
 #: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:66
-#: libreplan-webapp/src/main/webapp/orders/_edition.zul:67
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:69
 msgid "Identification"
 msgstr "Identificatie"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:218
+#: libreplan-webapp/src/main/webapp/resources/machine/_calendar.zul:30
+#: libreplan-webapp/src/main/webapp/resources/worker/_calendar.zul:35
+msgid "Select parent calendar"
+msgstr "Selecteer bovenliggende kalender"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:242
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:218
 msgid "Invaldid End Date. New End Date must be after current End Date "
 msgstr "Ongeldige einddatum. Nieuwe einddatum moet na huidige einddatum zijn"
 
@@ -2098,35 +2223,35 @@ msgstr "Niet-gekoppelde resource"
 msgid "quality form not specified"
 msgstr "kwaliteitsformulier niet gespecificeerd"
 
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:187
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:188
-#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:178
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:228
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:217
 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:96
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:168
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:195
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:187
 #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:165
-#: libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul:37
+#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:178
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:217
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:168
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:188
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:228
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:195
 #: libreplan-webapp/src/main/webapp/subcontract/subcontractorCommunications.zul:37
+#: libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul:37
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:49
 msgid "Show"
 msgstr "Toon"
 
-#: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:71
-msgid "Assignment Type"
-msgstr "Opdrachttype"
-
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:58
 msgid "Duration (days)"
 msgstr "Duur (dagen)"
 
-#: 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
+#: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:101
+msgid "Assignment Type"
+msgstr "Opdrachttype"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:436
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:71
 msgid "Send To Subcontractors"
 msgstr "Zend Naar Onderaannemers"
 
-#: libreplan-webapp/src/main/webapp/orders/_edition.zul:204
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:206
 msgid "Customer information"
 msgstr "Klant informatie"
 
@@ -2134,6 +2259,10 @@ msgstr "Klant informatie"
 msgid "Back to log in"
 msgstr "Terug naar aanmelden"
 
+#: libreplan-webapp/src/main/java/org/libreplan/importers/ExportTimesheetsToTim.java:217
+msgid "No response or exception in response"
+msgstr "Geen respons of fout in respons"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:651
 msgid "Label type already assigned"
 msgstr "Labeltype al toegekend"
@@ -2142,10 +2271,19 @@ msgstr "Labeltype al toegekend"
 msgid "Timesheets Template"
 msgstr "Urenstaatsjabloon"
 
+#: libreplan-webapp/src/main/webapp/common/_editJobScheduling.zul:66
+msgid "Connector"
+msgstr "Connector"
+
 #: libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java:160
 msgid "host not specified"
 msgstr "Host niet gespecificeerd"
 
+#: libreplan-webapp/src/main/java/org/libreplan/importers/JiraTimesheetSynchronizer.java:148
+#: libreplan-webapp/src/main/java/org/libreplan/importers/JiraOrderElementSynchronizer.java:290
+msgid "No worklog items found for \"{0}\" issue"
+msgstr "Geen urenstaat-items  gevonden voor issue \"{0}\""
+
 #: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityForm.java:266
 msgid "percentages in quality form items must be unique"
 msgstr "Percentages in kwaliteitsformulieritems moeten uniek zijn"
@@ -2163,7 +2301,7 @@ msgid "Expenses cost"
 msgstr "Onkosten"
 
 #: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportType.java:158
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeModel.java:416
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeModel.java:427
 msgid ""
 "Value is not valid.\n"
 " Code cannot contain chars like '_'."
@@ -2191,12 +2329,20 @@ msgstr "Taak eigenschappen"
 msgid "Sum of direct imputed hours"
 msgstr "Som van direkt toegerekende uren"
 
+#: libreplan-business/src/main/java/org/libreplan/business/common/entities/JobSchedulerConfiguration.java:123
+msgid "job group and name are already being used"
+msgstr "Taakgroep en naam worden reeds gebruikt"
+
 #: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:233
 #: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/HourCost.java:113
 msgid "type of work hours not specified"
 msgstr "type werkuren niet gespecificeerd"
 
-#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/TypeOfWorkHours.java:125
+#: libreplan-webapp/src/main/webapp/orders/_synchronizationInfo.zul:20
+msgid "LibrePlan: Synchronization info"
+msgstr "LibrePlan: Synchronisatie info"
+
+#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/TypeOfWorkHours.java:128
 msgid "the type of work hours name has to be unique. It is already used"
 msgstr "de naam voor het werkurentype moet uniek zijn. Is reeds in gebruik"
 
@@ -2211,20 +2357,20 @@ msgstr "kalenders met nul uren zijn niet toegestaan"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:777
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:392
+#: libreplan-webapp/src/main/webapp/myaccount/_personalTimesheetsArea.zul:28
+#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:50
+#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:154
+#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:48
+#: libreplan-webapp/src/main/webapp/planner/order.zul:107
 #: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:170
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:43
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:43
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:43
+#: libreplan-webapp/src/main/webapp/subcontract/subcontractorCommunications.zul:69
 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:118
 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:181
 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:69
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:98
-#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:48
-#: libreplan-webapp/src/main/webapp/planner/order.zul:107
-#: 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/_personalTimesheetsArea.zul:28
-#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:50
-#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:154
-#: 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
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:87
@@ -2233,11 +2379,20 @@ msgstr "kalenders met nul uren zijn niet toegestaan"
 msgid "Date"
 msgstr "Datum"
 
-#: libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul:58
+#: libreplan-business/src/main/java/org/libreplan/business/common/entities/JobSchedulerConfiguration.java:66
+msgid "job group not specified"
+msgstr "taakgroep niet gespecificeerd"
+
 #: libreplan-webapp/src/main/webapp/subcontract/subcontractorCommunications.zul:59
+#: libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul:58
 msgid "Reviewed"
 msgstr "Reviewed"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/JobSchedulerController.java:390
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/JobSchedulerController.java:395
+msgid "Job scheduling"
+msgstr "taakplanning"
+
 #: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:42
 msgid "Add From Template"
 msgstr "Toevoegen vanaf sjabloon"
@@ -2251,15 +2406,28 @@ msgstr "Onkostendeclaratielijst"
 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?"
 
+#: libreplan-webapp/src/main/webapp/common/_editJobScheduling.zul:41
+#: libreplan-webapp/src/main/webapp/common/_listJobScheduling.zul:29
+msgid "Cron expression"
+msgstr "Cron-expressie"
+
+#: libreplan-webapp/src/main/java/org/libreplan/importers/JiraOrderElementSynchronizer.java:194
+msgid "Estimated time for \"{0}\" issue is 0"
+msgstr "Geschatte tijd voor issue \"{0}\" is 0"
+
 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:43
 msgid "Filter by month"
 msgstr "Filter op maand"
 
+#: libreplan-webapp/src/main/java/org/libreplan/importers/ExportTimesheetsToTim.java:224
+msgid "Registration response with empty refs"
+msgstr "Registratieresponse met lege referenties"
+
 #: 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:279
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:280
 msgid "Enable LDAP authentication"
 msgstr "Inschakelen LDAP authenticatie"
 
@@ -2267,11 +2435,15 @@ msgstr "Inschakelen LDAP authenticatie"
 msgid "( max: {0} )"
 msgstr "( max: {0} )"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:182
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:182
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:182
 msgid "Criterion already assigned"
 msgstr "Criterium reeds toegekend"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:235
+msgid "Scheduling or unscheduling of jobs for this connector is not completed"
+msgstr "Inplannen of uitplannen van taken voor deze connector is niet voltooid"
+
 #: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/TaskQualityFormItem.java:100
 msgid "passed not specified"
 msgstr "passed not specified"
@@ -2284,8 +2456,12 @@ msgstr "Kies wachtrij"
 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:1505
+#: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:82
+msgid "Availability"
+msgstr "Beschikbaarheid"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:178
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1691
 msgid "project name already being used"
 msgstr "projectnaam reeds gebruikt"
 
@@ -2306,40 +2482,47 @@ msgstr "het project moet een startdatum hebben"
 msgid "percentage must be unique"
 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:171
-#: 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
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:163
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:190
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:160
-msgid "direct link"
-msgstr "directe koppeling"
-
 #: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:111
 msgid "Down"
 msgstr "Omlaag"
 
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:90
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:182
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:160
+#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:171
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:212
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:163
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:183
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:222
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:190
+msgid "direct link"
+msgstr "directe koppeling"
+
 #: libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderTemplate.java:71
 msgid "template calendar not specified"
 msgstr "kalendersjabloon niet gespecificeerd"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:838
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementFilterEnum.java:36
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:30
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:30
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskElementFilterEnum.java:34
-#: libreplan-webapp/src/main/webapp/orders/_edition.zul:48
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:30
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:30
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementFilterEnum.java:36
 msgid "Label"
 msgstr "Label"
 
+#: libreplan-webapp/src/main/webapp/common/_editJobScheduling.zul:95
+msgid "Cron expression format"
+msgstr "Cron-expressie format"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/importers/ProjectImportController.java:96
+msgid ": Import successfully!"
+msgstr ": Import successvol!"
+
 #: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/HourCost.java:87
 msgid "price cost not specified"
 msgstr "Prijs niet gespecificeerd"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:218
+#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:219
 msgid "Task Completation Lead/Lag"
 msgstr "Taak Voltooiing voorsprong/vertraging"
 
@@ -2348,8 +2531,8 @@ msgstr "Taak Voltooiing voorsprong/vertraging"
 msgid "Association with roles"
 msgstr "Connectie met rollen"
 
-#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:36
 #: libreplan-webapp/src/main/webapp/myaccount/_expensesArea.zul:44
+#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:36
 msgid "New expense sheet"
 msgstr "Nieuw declaratieformulier"
 
@@ -2361,10 +2544,10 @@ msgstr "Maak urenstaat"
 msgid "Quality forms"
 msgstr "Kwaliteitsformulieren"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:552
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:562
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:544
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:554
 msgid "Repeated Hours Group code {0} in Project {1}"
-msgstr "Herhaalde Urengroepcode {0} in Project {1}"
+msgstr "Duplicaat code \"{0}\" in taak \"{1}\""
 
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:144
 msgid "Hours group"
@@ -2388,6 +2571,10 @@ msgstr "Indirect"
 msgid "cost assignment's start date not specified"
 msgstr "Startdatum van de opdracht niet gespecificeerd"
 
+#: libreplan-webapp/src/main/webapp/orders/components/_jiraOrderElementSync.zul:34
+msgid "JIRA label"
+msgstr "JIRA label"
+
 #: libreplan-webapp/src/main/webapp/dashboard/_dashboardfororder.zul:123
 msgid "No tasks available yet"
 msgstr "Taken nog niet beschikbaar"
@@ -2396,17 +2583,17 @@ msgstr "Taken nog niet beschikbaar"
 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/workreports/WorkReportQueryController.java:259
 #: 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:860
 #: 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/java/org/libreplan/web/workreports/WorkReportCRUDController.java:860
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:86
+#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:51
 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:205
 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:257
 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:278
@@ -2430,12 +2617,12 @@ msgstr "Werkweek"
 msgid "Please select a source scenario"
 msgstr "Kies aub een bronscenario"
 
-#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:27
 #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:47
+#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:27
 msgid "Company ID"
 msgstr "BedrijfsID"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1582
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1768
 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."
@@ -2445,14 +2632,14 @@ msgstr "Het is alleen mogelijk om een nieuwe einddatum toe te voegen als alle be
 msgid "Entity sequences"
 msgstr "Entiteitssequences"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportQueryController.java:138
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:325
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:257
-#: 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:679
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1314
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:782
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:296
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:367
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportQueryController.java:138
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:823
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:242
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1462
 msgid "must be after start date"
 msgstr "moet na einddatum zijn"
 
@@ -2467,11 +2654,11 @@ msgstr "clockstart: de clockstart moet niet null zijn als het berekende aantal u
 msgid "Delay from beginning (days)"
 msgstr "Vertraging vanaf het begin (dagen)"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:455
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:476
 msgid "Total Hours"
 msgstr "Totaal aantal uren"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:409
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:410
 msgid "LibrePlan Role"
 msgstr "LibrePlan Rol"
 
@@ -2479,6 +2666,10 @@ msgstr "LibrePlan Rol"
 msgid "Task finished"
 msgstr "Taak voltooid"
 
+#: libreplan-webapp/src/main/webapp/common/_listJobScheduling.zul:20
+msgid "Job Scheduling List"
+msgstr "Taakplanningslijst"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeComponent.java:100
 msgid "Must start after (days since project start)"
 msgstr "Moet starten na (aantal dagen sinds aanvang project)"
@@ -2487,16 +2678,16 @@ msgstr "Moet starten na (aantal dagen sinds aanvang project)"
 msgid "Confirm cancel"
 msgstr "Bevestig afbreken"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:470
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:482
 #: 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:1529
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1715
 msgid "project code already being used"
 msgstr "projectcode reeds gebruikt"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:191
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:215
 msgid "The {0} sequence prefixes cannot be repeated"
 msgstr "De {0} sequenceprefix kan niet worden herhaald"
 
@@ -2504,11 +2695,11 @@ msgstr "De {0} sequenceprefix kan niet worden herhaald"
 msgid "type not specified"
 msgstr "type niet gespecificeerd"
 
-#: libreplan-webapp/src/main/webapp/orders/_edition.zul:40
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:42
 msgid "WBS (tasks)"
 msgstr "WBS (taken)"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:713
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:836
 msgid "Deleting sequence"
 msgstr "Verwijderen sequence"
 
@@ -2516,8 +2707,8 @@ msgstr "Verwijderen sequence"
 msgid "Total extra"
 msgstr "Totaal extra"
 
-#: 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
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:451
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:74
 msgid "Received From Customers"
 msgstr "Ontvangen van klanten"
 
@@ -2529,18 +2720,18 @@ msgstr "Kies scenario"
 msgid "LibrePlan: Templates"
 msgstr "LibrePlan: Sjablonen"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:417
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:428
 msgid "Edit Virtual Workers Group: {0}"
 msgstr "Wijzig virtuele werkergroup: {0}"
 
-#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:88
-msgid "Total other"
-msgstr "Totaal andere"
-
 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:51
 msgid "Criterion requirement"
 msgstr "Criterium vereiste"
 
+#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:88
+msgid "Total other"
+msgstr "Totaal andere"
+
 #: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:21
 msgid "LibrePlan: Expenses"
 msgstr "LibrePlan: Uitgaven"
@@ -2553,16 +2744,16 @@ msgstr "Maximum/minimum aantal gewerkte uren in voltooide applicaties"
 msgid "Scheduling saved"
 msgstr "Planning opgeslagen"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:711
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:851
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:855
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:991
 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 toegewezen declaratieformulieren."
 
+#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:28
 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:219
 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:70
-#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:28
 msgid "Add new row"
 msgstr "Voeg nieuwe rij toe"
 
@@ -2582,8 +2773,8 @@ msgstr "deadline moet na startdatum liggen"
 msgid "Password saved"
 msgstr "Wachtwoord opgeslagen"
 
-#: libreplan-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:34
 #: libreplan-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:29
+#: libreplan-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:34
 msgid "Overload"
 msgstr "Overbelast"
 
@@ -2596,8 +2787,8 @@ msgstr "onderaangenomen taak niet gespecificeerd"
 msgid "Assignment log"
 msgstr "Opdrachten logboek"
 
-#: libreplan-webapp/src/main/webapp/materials/materials.zul:75
 #: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:160
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:75
 msgid "New"
 msgstr "Nieuw"
 
@@ -2609,10 +2800,20 @@ msgstr "Datum laatste voortgangsmeeting"
 msgid "LibrePlan: Companies"
 msgstr "LibrePlan: Bedrijven"
 
+#: libreplan-webapp/src/main/webapp/common/_editJobScheduling.zul:29
+#: libreplan-webapp/src/main/webapp/common/_listJobScheduling.zul:27
+msgid "Job group"
+msgstr "Taakgroep"
+
+#: libreplan-webapp/src/main/java/org/libreplan/importers/JiraTimesheetSynchronizer.java:108
+#: libreplan-webapp/src/main/java/org/libreplan/importers/JiraOrderElementSynchronizer.java:517
+msgid "Synchronization"
+msgstr "Synchronisatie"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/ResourceAllocationBehaviour.java:63
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:86
-#: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:39
 #: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:38
+#: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:39
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:86
 msgid "Queue-based"
 msgstr "Wachtrij-gebaseerd"
 
@@ -2625,7 +2826,7 @@ msgstr "Afgeleid van kalender {0}"
 msgid "Deliver date"
 msgstr "Leverdatum"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:235
+#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:236
 msgid ""
 "Days Interval (Calculated as task completion end date minus estimated end "
 "date)"
@@ -2649,31 +2850,35 @@ msgstr "U heeft geen rechten om deze pagina te bekijken"
 msgid "The quality form item positions must be unique and consecutive."
 msgstr "De kwaliteitsformuieritemposities moeten uniek en opvolgend zijn"
 
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:27
-msgid "External company"
-msgstr "Extern bedrijf"
-
+#: libreplan-webapp/src/main/webapp/typeofworkhours/_listTypesOfWorkHours.zul:30
 #: 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:34
 #: libreplan-webapp/src/main/webapp/users/_editUser.zul:141
 #: libreplan-webapp/src/main/webapp/users/_editUser.zul:161
+#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:34
+#: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:28
 #: libreplan-webapp/src/main/webapp/profiles/_editProfile.zul:61
 #: 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
 msgid "Actions"
 msgstr "Acties"
 
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:27
+msgid "External company"
+msgstr "Extern bedrijf"
+
 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:130
 msgid "Exceptions"
 msgstr "Uitzonderingen"
 
-#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:33
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:34
 msgid "User settings"
 msgstr "Gebruikersinstellingen"
 
+#: libreplan-webapp/src/main/java/org/libreplan/importers/ExportTimesheetsToTim.java:106
+msgid "No items found in 'OrderSyncInfo' to export to Tim"
+msgstr "Geen items gevonden in  'OrderSyncInfo' om naar Tim te exporteren"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:833
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:110
 msgid "Start hour"
@@ -2683,6 +2888,10 @@ msgstr "Startuur"
 msgid "Assign materials"
 msgstr "Materialen toekennen"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/bandboxsearch/BandboxMultipleSearch.java:241
+msgid "format filters are not valid"
+msgstr "Formaatfilters zijn niet geldig"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ExternalCompanyBandboxFinder.java:51
 #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:79
 #: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:37
@@ -2690,9 +2899,9 @@ msgstr "Materialen toekennen"
 msgid "ID"
 msgstr "ID"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/bandboxsearch/BandboxMultipleSearch.java:238
-msgid "format filters are not valid"
-msgstr "Formaatfilters zijn niet geldig"
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:1131
+msgid "Only digits allowed"
+msgstr "Alleen cijfers toegestaan"
 
 #: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:21
 msgid "LibrePlan: Project Costs"
@@ -2702,22 +2911,35 @@ msgstr "LibrePlan: Projectkosten"
 msgid "please, select a criterion"
 msgstr "kies aub een criterium"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:294
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:300
 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"
 
+#: libreplan-webapp/src/main/webapp/common/_editJobScheduling.zul:124
+msgid "0 or 7 is Sunday, or use names"
+msgstr "0 of 7 is Zondag, of gebruik (Engelse) namen"
+
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:161
 msgid "Hours Group"
 msgstr "Urengroep"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:819
+msgid "Unallocated name"
+msgstr "Niet toegewezen naam"
+
 #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:101
 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:45
 msgid "Bound user"
 msgstr "Gekoppelde gebruiker"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:819
-msgid "Unallocated name"
-msgstr "Niet toegewezen naam"
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1730
+msgid "Subcontracted by client"
+msgstr "Aanbesteed door klant"
+
+#: libreplan-webapp/src/main/webapp/common/_editJobScheduling.zul:115
+#: libreplan-webapp/src/main/webapp/common/_editJobScheduling.zul:147
+msgid "Day of month"
+msgstr "Dag van de maand"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:282
 msgid "Password cannot be empty"
@@ -2727,16 +2949,20 @@ msgstr "Wachtwoord mag niet leeg zijn"
 msgid "BCWP"
 msgstr "BCWP"
 
-#: libreplan-webapp/src/main/webapp/orders/_edition.zul:149
-msgid "Dependencies have priority"
-msgstr "Afhankelijkheden hebben prioriteit"
-
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:1059
 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:512
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:1045
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:126
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:128
 msgid "Create {0}"
 msgstr "Maak {0}"
 
+#: libreplan-webapp/src/main/webapp/orders/components/_jiraOrderElementSync.zul:39
+msgid "Sync with JIRA"
+msgstr "Synchroniseer met JIRA"
+
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:151
+msgid "Dependencies have priority"
+msgstr "Afhankelijkheden hebben prioriteit"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesModel.java:317
 msgid "Already exists another template with the same name"
 msgstr "Er bestaat al een sjabloon met dezelfde naam"
@@ -2745,6 +2971,10 @@ msgstr "Er bestaat al een sjabloon met dezelfde naam"
 msgid "Unlimited"
 msgstr "Onbeperkt"
 
+#: libreplan-business/src/main/java/org/libreplan/business/common/entities/JobSchedulerConfiguration.java:84
+msgid "cron expression not specified"
+msgstr "cron-expressie niet gespecificeerd"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:252
 msgid "Budget At Completion"
 msgstr "Budget bij voltooiing"
@@ -2753,25 +2983,25 @@ msgstr "Budget bij voltooiing"
 msgid "Assign Label"
 msgstr "Label toekennen"
 
-#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:79
-msgid "Page up"
-msgstr "Pagina omhoog"
-
 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:24
 msgid "Create new project"
 msgstr "Maak nieuw project"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:772
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:368
+#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:79
+msgid "Page up"
+msgstr "Pagina omhoog"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:397
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:796
 msgid "date in the future"
 msgstr "datum in de toekomst"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:896
-#: 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/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:31
 #: 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/_edition.zul:106
 #: libreplan-webapp/src/main/webapp/orders/_list.zul:35
 msgid "State"
 msgstr "Status"
@@ -2780,14 +3010,14 @@ msgstr "Status"
 msgid "Must start after"
 msgstr "Moet starten na"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1330
+msgid "Confirm change"
+msgstr "Bevestig wijziging"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:118
 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:1322
-msgid "Confirm change"
-msgstr "Bevestig wijziging"
-
 #: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:322
 msgid "the cost category name has to be unique and it is already in use"
 msgstr "de kostencategorienaam moet uniek zijn en is reeds in gebruik"
@@ -2796,37 +3026,41 @@ msgstr "de kostencategorienaam moet uniek zijn en is reeds in gebruik"
 msgid "units not specified"
 msgstr "eenheden niet gespecificeerd"
 
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLine.java:328
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLine.java:331
 msgid "Code already included in Hours Group codes"
 msgstr "Code bestaat al in urengroep codes"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:133
 #: 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:531
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:301
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:543
 #: 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:370
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:371
 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/webapp/orders/imports/projectImport.zul:48
+msgid "Both calendars and gantt charts"
+msgstr "Zowel kalender- als gantt-grafieken"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksController.java:207
+#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ReportAdvancesController.java:199
 msgid "Send"
 msgstr "Zend"
 
-#: libreplan-webapp/src/main/webapp/common/layout/template.zul:108
-msgid "user"
-msgstr "gebruiker"
-
 #: libreplan-webapp/src/main/webapp/materials/materials.zul:21
 msgid "LibrePlan: Materials"
 msgstr "LibrePlan: Materialen"
 
+#: libreplan-webapp/src/main/webapp/common/layout/template.zul:108
+msgid "user"
+msgstr "gebruiker"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeModel.java:53
 #: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:33
 msgid "New task"
@@ -2836,36 +3070,51 @@ msgstr "Nieuwe taak"
 msgid "Associated user"
 msgstr "Geassocieerde gebruiker"
 
-#: libreplan-webapp/src/main/webapp/typeofworkhours/_listTypesOfWorkHours.zul:27
-msgid "Type name"
-msgstr "Type naam"
+#: libreplan-webapp/src/main/webapp/orders/_jiraSyncInfo.zul:34
+msgid ""
+"Synchronization of timesheets is not completed for the following reasons:"
+msgstr "Synchronisatie van urenstaten is niet voltooit om de volgende reden:"
 
-#: 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/planner/advances/AdvanceAssignmentPlanningCommand.java:69
+msgid "Progress assignment"
+msgstr "Voortgangsinvoer"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:863
 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:181
-#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:728
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/TimeLineRequiredMaterialController.java:207
 #: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/FilterCommunicationEnum.java:28
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:849
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportQueryController.java:250
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:839
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:75
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:76
 #: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:27
 msgid "All"
 msgstr "Alle"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/advances/AdvanceAssignmentPlanningCommand.java:69
-msgid "Progress assignment"
-msgstr "Voortgangsinvoer"
+#: libreplan-webapp/src/main/webapp/typeofworkhours/_listTypesOfWorkHours.zul:27
+msgid "Type name"
+msgstr "Type naam"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/JobSchedulerController.java:292
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/JobSchedulerController.java:293
 #: 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"
 
+#: libreplan-webapp/src/main/java/org/libreplan/importers/JiraOrderElementSynchronizer.java:402
+msgid "Duplicate value AdvanceAssignment for order element of \"{0}\""
+msgstr "Dubbele waarde AdvanceAssignment voor order-element van \"{0}\""
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioModel.java:118
 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:179
+#: libreplan-webapp/src/main/webapp/orders/_jiraSyncInfo.zul:32
+msgid "Synchronization of timesheets was successful"
+msgstr "Synchronisatie van urenstaten was succesvol"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:180
 #: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskDeadlineViolationStatusEnum.java:36
 msgid "On schedule"
 msgstr "Volgens planning"
@@ -2878,6 +3127,12 @@ msgstr "Kalenderlijst"
 msgid "Create activation period"
 msgstr "Maak activeringsperiode"
 
+#: 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/webapp/resources/search/_resourceFilter.zul:31
 msgid "Personal details"
 msgstr "Persoonlijke gegevens"
@@ -2886,11 +3141,11 @@ msgstr "Persoonlijke gegevens"
 msgid "Workers List"
 msgstr "Werkerslijst"
 
-#: 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/resources/worker/WorkerCRUDController.java:1048
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:293
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:122
+msgid "Worker"
+msgstr "Werker"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:519
 #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:597
@@ -2899,26 +3154,20 @@ msgid ""
 "resource allocation criteria at any interval of time"
 msgstr "Kan geselecteerd element niet alloceren. Er is geen wachtrij die overeenkomt met de resource allocatie criteria voor elke interval of tijd"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:293
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:1034
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:122
-msgid "Worker"
-msgstr "Werker"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1383
 msgid ""
 "Date is not valid, it must be later than the last progress reported to the "
 "customer"
 msgstr "Datum is ongeldig. Het moet liggen na de laatste voortgangsrapportage die naar de klant is gerapporteerd."
 
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java:224
-msgid "User already bound to other worker"
-msgstr "Gebruiker al gekoppeld aan een andere werker"
-
 #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:300
 msgid "criterion name not specified"
 msgstr "criteriumnaam niet gespecificeerd"
 
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java:224
+msgid "User already bound to other worker"
+msgstr "Gebruiker al gekoppeld aan een andere werker"
+
 #: libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java:170
 msgid "port not specified"
 msgstr "poort niet gespecificeerd"
@@ -2931,6 +3180,10 @@ 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:523
+msgid "Preferences"
+msgstr "Instellingen"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:784
 #: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:793
 msgid ""
@@ -2938,18 +3191,14 @@ msgid ""
 "before moving"
 msgstr "Er zijn nog niet opgeslagen wijzigingen in de actuele persoonlijke urenstaat. aub opslaan voor verplaatsen"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:511
-msgid "Preferences"
-msgstr "Instellingen"
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:387
+msgid "Role property"
+msgstr "Rol eigenschap"
 
 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:25
 msgid "Manual allocation"
 msgstr "Handmatig toekennen"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:386
-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"
@@ -2979,19 +3228,23 @@ msgstr "Voortgangsmeting kan niet verwijderd worden. Voortgangsmeting al al geco
 msgid "Recommended allocation"
 msgstr "Aanbevolen toekenning"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:278
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:279
 msgid "Activation"
 msgstr "Activering"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:759
-msgid "Calculated progress cannot be removed"
-msgstr "Berekende voortgang kan niet verwijderd worden"
+#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioCRUDController.java:243
+msgid "Scenarios"
+msgstr "Scenarios"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:375
 msgid "Materials saved"
 msgstr "Materialen opgeslagen"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:458
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:759
+msgid "Calculated progress cannot be removed"
+msgstr "Berekende voortgang kan niet verwijderd worden"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:470
 #: 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"
@@ -3004,6 +3257,10 @@ msgstr "LibrePlan: Toegang niet toegestaan"
 msgid "Other projects"
 msgstr "Andere projecten"
 
+#: libreplan-webapp/src/main/webapp/orders/_jiraSyncInfo.zul:20
+msgid "LibrePlan: Jira synchronization info"
+msgstr "LibrePlan: Jira synchronisatie info"
+
 #: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:264
 msgid "clock finish cannot be empty if number of hours is calcultate by clock"
 msgstr "Klokeinde kan niet leeg zijn als aantal uren berekend wordt per klok"
@@ -3012,7 +3269,7 @@ msgstr "Klokeinde kan niet leeg zijn als aantal uren berekend wordt per klok"
 msgid "Tasks input buffer"
 msgstr "Taken invoer buffer"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeModel.java:412
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeModel.java:423
 msgid "Code cannot be empty"
 msgstr "Code mag niet leeg zijn"
 
@@ -3020,10 +3277,20 @@ 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:187
+#: libreplan-webapp/src/main/java/org/libreplan/importers/JiraOrderElementSynchronizer.java:171
+#: libreplan-webapp/src/main/java/org/libreplan/importers/JiraOrderElementSynchronizer.java:533
+msgid "Synchronization order {0}"
+msgstr "Synchronisatie order {0}"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:211
 msgid "At least one {0} sequence must be active"
 msgstr "Minimaal één {0} sequence moet actief zijn"
 
+#: libreplan-webapp/src/main/webapp/common/_editJobScheduling.zul:35
+#: libreplan-webapp/src/main/webapp/common/_listJobScheduling.zul:28
+msgid "Job name"
+msgstr "Taaknaam"
+
 #: libreplan-webapp/src/main/webapp/users/_editUser.zul:160
 #: libreplan-webapp/src/main/webapp/profiles/_listProfiles.zul:26
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:42
@@ -3039,15 +3306,15 @@ msgstr "criteriumvervulling met einddatum voor aanvang"
 msgid "Disable Delete"
 msgstr "Uitschakelen Verwijderen"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:476
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:206
+msgid "At least one {0} sequence is needed"
+msgstr "Minimaal één {0} sequence is nodig"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:488
 #: 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:182
-msgid "At least one {0} sequence is needed"
-msgstr "Minimaal één {0} sequence is nodig"
-
 #: libreplan-webapp/src/main/webapp/costcategories/costCategory.zul:23
 msgid "LibrePlan: Cost Categories"
 msgstr "LibrePlan: Kostencategorien"
@@ -3060,7 +3327,11 @@ msgstr "Toegekend"
 msgid "Total capacity"
 msgstr "Totale capaciteit"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:281
+#: libreplan-webapp/src/main/java/org/libreplan/importers/ExportTimesheetsToTim.java:130
+msgid "Order should not be empty"
+msgstr "Order mag niet leeg zijn"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:282
 msgid "Use LDAP roles"
 msgstr "Gebruik LDAP rollen"
 
@@ -3068,14 +3339,14 @@ msgstr "Gebruik LDAP rollen"
 msgid "Details"
 msgstr "Details"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ReportAdvancesModel.java:226
 #: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksModel.java:250
 #: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksModel.java:296
+#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ReportAdvancesModel.java:226
 msgid "Error: {0}"
 msgstr "Fout: {0}"
 
-#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:65
 #: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:36
+#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:65
 msgid "More options"
 msgstr "Meer opties"
 
@@ -3087,6 +3358,10 @@ msgstr "LibrePlan: Persoonlijke urenstaat"
 msgid "Confirm create template"
 msgstr "Bevestig aanmaken sjabloon"
 
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:140
+msgid "Resources load filtering"
+msgstr "Resourcebelastingfiltering"
+
 #: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:50
 msgid "Work amount"
 msgstr "Hoeveelheid werk"
@@ -3099,7 +3374,7 @@ msgstr "Bron"
 msgid "Earliest date"
 msgstr "Eerstmogelijke datum"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:513
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:525
 msgid "Change Password"
 msgstr "Wijzig wachtwoord"
 
@@ -3112,8 +3387,8 @@ msgstr "LibrePlan: Werk en voortgang per taak"
 msgid "Projects"
 msgstr "Projecten"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1097
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:235
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1121
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:331
 msgid "Confirm exit dialog"
 msgstr "Bevestig afsluit dialoog"
 
@@ -3139,10 +3414,10 @@ msgstr "Materiaal toekenningen"
 msgid "last value not specified"
 msgstr "laatste waarde niet gespecificeerd"
 
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractedTaskData.java:121
 #: 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:179
 #: 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:121
 msgid "task not specified"
 msgstr "taak niet gespecificeerd"
 
@@ -3150,6 +3425,10 @@ msgstr "taak niet gespecificeerd"
 msgid "Change password"
 msgstr "Wijzig wachtwoord"
 
+#: libreplan-webapp/src/main/webapp/orders/imports/projectImport.zul:34
+msgid "Import Project"
+msgstr "Importeer Project"
+
 #: libreplan-webapp/src/main/webapp/users/_editUser.zul:38
 msgid ""
 "Password cannot be managed for LDAP users because LDAP authentication is "
@@ -3191,14 +3470,14 @@ msgstr "project niet gespecificeerd"
 msgid "Work record"
 msgstr "Werkrekord"
 
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:76
 #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:168
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:147
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:200
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:149
 #: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:169
 #: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:206
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:200
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:76
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:149
 #: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:176
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:147
 msgid "Output format"
 msgstr "Uitvoer formaat"
 
@@ -3218,56 +3497,59 @@ msgstr "Pagina omlaag"
 msgid "resource type does not allow enabled criteria"
 msgstr "resource type staat geen criteria toe"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1112
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/assigntemplates/TemplateFinderPopup.java:126
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/JiraSynchronizationController.java:313
+#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:139
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:106
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:103
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:94
+#: libreplan-webapp/src/main/webapp/resources/criterions/criterions.zul:46
+#: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:49
+#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:42
+#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:50
+#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:91
+#: libreplan-webapp/src/main/webapp/planner/order.zul:131
+#: libreplan-webapp/src/main/webapp/planner/order.zul:166
+#: libreplan-webapp/src/main/webapp/planner/editTask.zul:83
+#: libreplan-webapp/src/main/webapp/planner/reassign.zul:50
+#: libreplan-webapp/src/main/webapp/typeofworkhours/_editTypeOfWorkHours.zul:81
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:97
+#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:184
+#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:58
+#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:49
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:116
+#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:129
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:238
+#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:39
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:453
+#: libreplan-webapp/src/main/webapp/common/_editJobScheduling.zul:90
+#: libreplan-webapp/src/main/webapp/common/_editJobScheduling.zul:165
+#: libreplan-webapp/src/main/webapp/common/layout/template.zul:104
+#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:70
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:188
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:98
+#: libreplan-webapp/src/main/webapp/profiles/_editProfile.zul:74
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:132
+#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:90
+#: libreplan-webapp/src/main/webapp/unittypes/unitTypes.zul:43
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:137
+#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:135
+msgid "Cancel"
+msgstr "Afbreken"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/TransferOrdersModel.java:148
 msgid "Please, select a destination scenario"
 msgstr "Kies aub een bestemmingsscenario"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1088
-#: 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
-#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:106
-#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:184
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:238
-#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:39
-#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:70
-#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:98
-#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:137
-#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:50
-#: libreplan-webapp/src/main/webapp/planner/editTask.zul:83
-#: libreplan-webapp/src/main/webapp/planner/reassign.zul:50
-#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:91
-#: 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:188
-#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:129
-#: 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
-#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:49
-#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:103
-#: libreplan-webapp/src/main/webapp/resources/criterions/criterions.zul:46
-#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:94
-#: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:49
-#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:90
-#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:132
-#: 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:422
-msgid "Cancel"
-msgstr "Afbreken"
+#: libreplan-webapp/src/main/webapp/common/components/schedulingStateToggler.zul:32
+msgid "Unschedule"
+msgstr "Unschedule"
 
 #: libreplan-webapp/src/main/webapp/users/_editUser.zul:36
 msgid "General user data"
 msgstr "Algemene gebruikers gegevens"
 
-#: libreplan-webapp/src/main/webapp/common/components/schedulingStateToggler.zul:32
-msgid "Unschedule"
-msgstr "Unschedule"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksController.java:216
 msgid "Subcontracted task sent successfully"
 msgstr "Uitbestede taak succesvol verzonden"
@@ -3280,16 +3562,16 @@ msgstr "Geaccumuleerde uren grafiek"
 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: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"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:255
 msgid "CPI"
 msgstr "CPI"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:414
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:832
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1044
+msgid "You don't have read access to this project"
+msgstr "U heeft geen leesrechten voor dit project"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:96
 msgid ""
 "Disable hierarchy will cause criteria tree to be flattened. Are you sure?"
@@ -3303,18 +3585,22 @@ msgstr "standaard maximum waarde van procentuele voortgangstype moet 100 zijn"
 msgid "Cannot create another progress of the same type"
 msgstr "Kan geen andere voortgang maken van hetzelfde type"
 
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:50
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:43
 #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:45
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:43
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:50
 msgid "Dates"
 msgstr "Data"
 
 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:29
-#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:29
 #: libreplan-webapp/src/main/webapp/orders/_splitMaterialAssignmentDlg.zul:38
+#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:29
 msgid "Units"
 msgstr "Eenheden"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/search/NewAllocationSelectorController.java:732
+msgid "Start filtering date cannot be empty"
+msgstr "Start filterdatum mag niet leeg zijn"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:168
 #: libreplan-business/src/main/java/org/libreplan/business/planner/entities/StretchesFunction.java:309
 msgid "At least one stretch is needed"
@@ -3333,7 +3619,7 @@ msgstr "omschrijvingswaarde: de urenstaat mist een omschrijvingsveld"
 msgid "Create new Workweek"
 msgstr "Maak nieuwe werkweek"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:112
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:113
 msgid "Autocomplete login form"
 msgstr "Automatisch aanvullen aanmeldformulier"
 
@@ -3357,6 +3643,10 @@ msgstr "LibrePlan: Taakplanningsstatus in project"
 msgid "name"
 msgstr "naam"
 
+#: libreplan-webapp/src/main/webapp/orders/imports/projectImport.zul:43
+msgid "Select the elements to import into LibrePlan"
+msgstr "Kies de elementen om in LibrePlan te importeren"
+
 #: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:76
 msgid "Delete selected task"
 msgstr "Verwijder geselecteerde taak"
@@ -3369,11 +3659,11 @@ msgstr "{0} (max: {1})"
 msgid "Cost Category"
 msgstr "Kostencategorie"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:492
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:582
 msgid "end"
 msgstr "einde"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:393
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:394
 msgid "Role search query"
 msgstr "Rol zoekvraag"
 
@@ -3385,11 +3675,15 @@ msgstr "De urenkostencode moet uniek zijn"
 msgid "Log"
 msgstr "Logboek"
 
+#: libreplan-webapp/src/main/webapp/orders/imports/projectImport.zul:38
+msgid "The formats supported for import are MPP and PLANNER files."
+msgstr "De enige op dit moment ondersteunde bestandsformaten zijn mpp en planner."
+
 #: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:68
 msgid "Inherited exception"
 msgstr "Georven uitzondering"
 
-#: libreplan-webapp/src/main/webapp/orders/_edition.zul:57
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:59
 msgid "Authorizations"
 msgstr "Autorisaties"
 
@@ -3406,7 +3700,11 @@ msgstr "Wijzig taak {0}"
 msgid "LibrePlan: Timesheets"
 msgstr "LibrePlan: Urenstaten"
 
-#: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:231
+#: libreplan-webapp/src/main/java/org/libreplan/web/importers/ProjectImportController.java:89
+msgid ": Task import successfully!"
+msgstr ": Taak import succesvol!"
+
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:248
 msgid "username is already being used by another user"
 msgstr "gebruikersnaam is reeds in gebruik door een andere gebruiker"
 
@@ -3415,7 +3713,7 @@ msgid "references"
 msgstr "referenties"
 
 #: 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
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1761
 msgid "You must select a valid date. "
 msgstr "U moet een geldige datum kiezen."
 
@@ -3439,37 +3737,37 @@ msgstr "percentage moet groer zijn dan 0% en minder dan 100%"
 msgid "The field name must be unique."
 msgstr "De veldnaam moet uniek zijn"
 
-#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:49
-msgid "Default max value"
-msgstr "Standaard maximum waarde"
-
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:36
 msgid "Add criterion requirement"
 msgstr "Toevoegen criterium vereiste"
 
+#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:50
+msgid "Default max value"
+msgstr "Standaard maximum waarde"
+
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:146
 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:500
-msgid "Automatic"
-msgstr "Automatisch"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/CriterionBandboxFinder.java:44
 msgid "Criterion Name"
 msgstr "Criteriumnaam"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:500
+msgid "Automatic"
+msgstr "Automatisch"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:801
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:667
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementBandboxFinder.java:52
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:667
+#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:150
+#: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:48
 #: 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/myaccount/personalTimesheet.zul:150
 #: 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
 msgid "Task"
 msgstr "Taak"
 
@@ -3477,12 +3775,12 @@ msgstr "Taak"
 msgid "LibrePlan: Change password"
 msgstr "LibrePlan: wijzig wachtwoord"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:130
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:308
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/ProjectStatusReportController.java:188
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:174
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:168
 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:125
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:168
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/ProjectStatusReportController.java:188
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:308
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:174
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:130
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:90
 msgid "please, select a label"
 msgstr "Kies aub een label"
@@ -3503,7 +3801,7 @@ msgstr "Libreplan: Scenario Management"
 msgid "cost assignment with end date before start date"
 msgstr "kostentoekenning met einddatum voor startdatum"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/bandboxsearch/BandboxMultipleSearch.java:227
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/bandboxsearch/BandboxMultipleSearch.java:229
 msgid "filter already exists"
 msgstr "Filter bestaat al"
 
@@ -3530,9 +3828,9 @@ msgstr "Voer wijzigingen door en ga terug naar planning"
 msgid "Spreading progress"
 msgstr "Spreiding voortgang"
 
-#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:108
-#: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:38
 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:53
+#: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:38
+#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:108
 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:32
 msgid "Task name"
 msgstr "Taaknaam"
@@ -3541,20 +3839,24 @@ msgstr "Taaknaam"
 msgid "cost assignment's resource not specified"
 msgstr "kostentoekennings resource niet gespecificeerd"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:1072
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:663
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:1064
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementBandboxFinder.java:51
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:663
+#: libreplan-webapp/src/main/webapp/myaccount/_myTasksArea.zul:31
 #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:66
 #: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:42
 #: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:53
 #: 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
 #: libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderTemplate.java:64
 msgid "Project"
 msgstr "Project"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:371
+#: libreplan-webapp/src/main/java/org/libreplan/importers/ExportTimesheetsToTim.java:99
+msgid "Export"
+msgstr "Export"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:468
 msgid ""
 "Starting date cannot be empty because there is a task with constraint \"as "
 "soon as possible\""
@@ -3564,21 +3866,24 @@ msgstr "Startdatum kan niet leeg zijn omdat er een taak is met de randvoorwaarde
 msgid "last material sequence code not specified"
 msgstr "laatste materiaalsequentiecode niet gespecificeerd"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/TwoWaySelector.java:79
+#: 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 "Unassigned"
+msgstr "Niet toegekend"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:480
+msgid "Extra"
+msgstr "Extra"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:772
 msgid ""
 "Advance assignment cannot be removed as it has advance measures that have "
 "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/PersonalTimesheetController.java:480
-msgid "Extra"
-msgstr "Extra"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/TwoWaySelector.java:79
-msgid "Unassigned"
-msgstr "Niet toegekend"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1587
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1773
 msgid "It already exists a end date with the same date. "
 msgstr "Er bestaat al een einddatum met dezelfde datum"
 
@@ -3603,20 +3908,24 @@ msgid "label code is already being used"
 msgstr "labelcode is al in gebruik"
 
 #: libreplan-webapp/src/main/webapp/materials/materials.zul:87
-#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:29
 #: libreplan-webapp/src/main/webapp/users/_editUser.zul:78
+#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:29
 msgid "Disabled"
 msgstr "uitgeschakeld"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:713
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:324
+#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:166
+msgid "There is a margin of {0} days with the project global deadline ({1}%)."
+msgstr "Er is een marge van {0} dagen op de overall deadline van het project ({1}%)."
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:353
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:737
 msgid "Earned value"
 msgstr "Earned value"
 
 #: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:35
 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:163
 msgid "Overtime Effort"
-msgstr "Overwerk"
+msgstr "Overwerk Inspanning"
 
 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:231
 msgid "Inherited from parent calendar"
@@ -3642,12 +3951,12 @@ msgid ""
 "Please save your project before proceeding."
 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/_personalTimesheetsArea.zul:33
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:66
 msgid "Total work"
 msgstr "Totaal werk"
 
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:1497
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:1498
 msgid "a quality form cannot be assigned twice to the same task"
 msgstr "een kwaliteitsformulier kan niet twee keer aan dezelfde taak worden toegekend"
 
@@ -3659,9 +3968,9 @@ msgstr "aantal cijfers buiten bereik"
 msgid "The timesheet line codes must be unique."
 msgstr "De urenstaatregelcodes moeten uniek zijn"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java:252
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:322
-#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:53
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:327
+#: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java:263
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:54
 msgid "Calendar Exception Days"
 msgstr "Kalender uitzonderingsdagen"
 
@@ -3700,7 +4009,7 @@ msgstr "Resource belasting"
 msgid "userId not specified"
 msgstr "GebruikersID niet gespecificeerd"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:226
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:254
 msgid "Changes have been canceled"
 msgstr "Wijzigingen zijn afgebroken"
 
@@ -3708,15 +4017,23 @@ msgstr "Wijzigingen zijn afgebroken"
 msgid "LibrePlan: Planning"
 msgstr "LibrePlan: Planning"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:197
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/JobSchedulerController.java:434
+msgid "Job is deleted from scheduler"
+msgstr "Taak is verwijderd van de scheduler"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:198
 msgid "Expense sheets"
 msgstr "Onkostendeclaraties"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:336
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:337
 msgid "Authentication"
 msgstr "Authenticatie"
 
-#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:88
+#: libreplan-webapp/src/main/java/org/libreplan/importers/JiraOrderElementSynchronizer.java:524
+msgid "No items found in 'OrderSyncInfo' to synchronize with JIRA issues"
+msgstr "Geen items gevonden in  'OrderSyncInfo' om te synchroniseren met Jira issues"
+
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:89
 msgid "Select language"
 msgstr "Kies taal"
 
@@ -3724,8 +4041,8 @@ msgstr "Kies taal"
 msgid "Appropriative allocation"
 msgstr "Appropriative allocatie"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:187
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:186
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:187
 msgid "This criterion type cannot have multiple values in the same period"
 msgstr "Dit criteriumtype kan niet meerdere waarden in dezelfde periode hebben"
 
@@ -3733,19 +4050,23 @@ msgstr "Dit criteriumtype kan niet meerdere waarden in dezelfde periode hebben"
 msgid "Assigned criterion requirements"
 msgstr "Toegekende criteria vereisten"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java:247
+#: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java:258
 msgid "Calendar Exception Day"
 msgstr "Kalender uitzonderingsdag"
 
 #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:117
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:117
 #: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:105
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:155
 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:147
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:117
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:155
 #: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:125
 msgid "Filter by criteria"
 msgstr "Filter op criteria"
 
+#: libreplan-business/src/main/java/org/libreplan/business/common/entities/JobSchedulerConfiguration.java:75
+msgid "job name not specified"
+msgstr "taak niet gespecificeerd"
+
 #: libreplan-webapp/src/main/webapp/templates/_advances.zul:37
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:43
 msgid "Max value"
@@ -3754,7 +4075,7 @@ msgstr "Max waarde"
 #: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:102
 #: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:103
 #: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:395
-#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionType.java:139
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionType.java:156
 msgid "No"
 msgstr "Nee"
 
@@ -3774,7 +4095,7 @@ msgstr "Uren toe te wijzen"
 msgid "A category must be selected"
 msgstr "Een categorie moet worden gekozen"
 
-#: libreplan-webapp/src/main/webapp/orders/_edition.zul:264
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:266
 msgid "Delivery dates asked by the subcontractor. "
 msgstr "Leverdata gevraagd door de onderaannemer"
 
@@ -3787,7 +4108,7 @@ msgstr "Periode"
 msgid "Spread"
 msgstr "Spread"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1021
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1028
 msgid "Disabled because of it contains more than one hours group"
 msgstr "Uitgeschakeld omdat het meer dan één urengroep bevat"
 
@@ -3799,7 +4120,7 @@ msgstr "Bevestig verwijdering van gebruiker"
 msgid "Select start date"
 msgstr "Kies startdatum"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:882
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1022
 msgid "Removed {0}"
 msgstr "Verwijderd {0}"
 
@@ -3809,7 +4130,7 @@ msgid ""
 "resources"
 msgstr "Dit criteriumtype kan niet worden verwijderd omdat het aan een project of resource is toegekend"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:959
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:973
 msgid "Confirm deleting this worker. Are you sure?"
 msgstr "Bevestig verwijderen van werker. Weet u het zeker?"
 
@@ -3827,7 +4148,7 @@ msgstr "omschrijving: de urenstaat heeft geen omschrijvingsveld"
 msgid "Role name"
 msgstr "Rolnaam"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:984
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:998
 msgid "This worker was already removed by other user"
 msgstr "Deze werker werd reeds verwijderd door een andere gebruiker"
 
@@ -3839,15 +4160,19 @@ msgstr "Werkurentype gegevens"
 msgid "The same resource is assigned twice inside an interval"
 msgstr "Dezelfde resource is twee keer ingezet binnen dezelfde periode"
 
+#: libreplan-webapp/src/main/java/org/libreplan/importers/JiraTimesheetSynchronizer.java:143
+msgid "No worklogs found for \"{0}\" key"
+msgstr "Geen urenstaat-items  gevonden voor sleutel \"{0}\""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:543
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:904
+msgid "h"
+msgstr "h"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:75
 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:880
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:514
-msgid "h"
-msgstr "h"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:363
 msgid "Workable capacity for this period "
 msgstr "Werkbare capaciteit voor deze periode"
@@ -3876,7 +4201,7 @@ msgstr "Toevoegen mijlpaal"
 msgid "Assign selected items"
 msgstr "Toewijzen geselecteerde onderdelen"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:468
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:558
 msgid "init"
 msgstr "init"
 
@@ -3888,6 +4213,10 @@ msgstr "Toevoegen nieuwe voortgangsmeeting"
 msgid "Select for automatic queuing"
 msgstr "Selecteren voor automatische queuing"
 
+#: libreplan-webapp/src/main/java/org/libreplan/importers/ExportTimesheetsToTim.java:127
+msgid "Product code should not be empty"
+msgstr "Productcode mag niet leeg zijn"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/TransferOrdersController.java:192
 msgid "Project {0} transfered"
 msgstr "Project {0} verplaatst"
@@ -3900,7 +4229,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:1565
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1573
 msgid "Not configurable"
 msgstr "Niet instelbaar"
 
@@ -3912,17 +4241,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:280
+#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:281
 msgid "Task Status"
 msgstr "Taakstatus"
 
-#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:33
 #: libreplan-webapp/src/main/webapp/users/_editUser.zul:98
 #: libreplan-webapp/src/main/webapp/users/_editUser.zul:110
+#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:33
 msgid "Bound resource"
 msgstr "Gekoppelde resource"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:187
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:188
 msgid "Calendar exception days"
 msgstr "Kalender uitzonderingsdagen"
 
@@ -3930,26 +4259,34 @@ msgstr "Kalender uitzonderingsdagen"
 msgid "Advanced allocation"
 msgstr "Gevorderde toewijzing"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:246
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderSyncInfo.java:113
+msgid "project sync info is already being used"
+msgstr "project sync info is reeds in gebruik"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:247
 msgid "Estimation deviation on completed tasks"
 msgstr "Geschatte afwijking bij voltooide taken"
 
+#: libreplan-webapp/src/main/java/org/libreplan/importers/JiraTimesheetSynchronizer.java:130
+msgid "Key for Order \"{0}\" is empty"
+msgstr "Sleutel voor Order \"{0}\" is leeg"
+
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:93
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:96
 #: libreplan-webapp/src/main/webapp/planner/order.zul:108
 msgid "Consolidated"
 msgstr "Geconsolideerd"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:209
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:210
 msgid "MonteCarlo method"
 msgstr "MonteCarlo methode"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:386
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:425
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:393
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:436
 msgid "Edit Worker: {0}"
 msgstr "Wijzig werker: {0}"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:1143
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:1157
 msgid "You do not have permissions to go to user edition window"
 msgstr "U heeft geen rechten om naar het gebruikerswijzigenscherm te gaan"
 
@@ -3957,11 +4294,11 @@ msgstr "U heeft geen rechten om naar het gebruikerswijzigenscherm te gaan"
 msgid "LibrePlan: User access"
 msgstr "LibrePlan: Gebruikerstoegang"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:30
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:30
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:30
 #: libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul:56
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:227
 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:69
-#: libreplan-webapp/src/main/webapp/orders/_edition.zul:225
 #: libreplan-webapp/src/main/webapp/orders/_list.zul:32
 msgid "Customer"
 msgstr "Klant"
@@ -3969,6 +4306,7 @@ msgstr "Klant"
 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:847
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:116
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:34
+#: libreplan-business/src/main/java/org/libreplan/business/common/entities/PredefinedConnectorProperties.java:47
 msgid "Hours type"
 msgstr "Urentype"
 
@@ -3986,10 +4324,14 @@ 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:258
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:287
 msgid "Cannot connect to LDAP server"
 msgstr "Kan niet verbinden met LDAP server"
 
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:419
+msgid "Application properties"
+msgstr "Applicatie-instellingen"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1582
 msgid "must be before end date"
 msgstr "moet voor de einddatum liggen"
@@ -3998,16 +4340,41 @@ msgstr "moet voor de einddatum liggen"
 msgid "Add Exception"
 msgstr "Toevoegen uitzondering"
 
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:123
+msgid "Projects view filtering"
+msgstr "Projectview filteren"
+
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:159
+msgid "Dedication"
+msgstr "Dedication"
+
 #: 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/tree/TreeController.java:234
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1002
+#: libreplan-webapp/src/main/java/org/libreplan/web/montecarlo/MonteCarloController.java:159
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:212
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:343
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:351
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:311
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:317
+#: 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
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:135
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignController.java:143
 #: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:193
 #: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:197
 #: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:360
 #: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:478
+#: 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/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/templates/TemplatesTreeController.java:110
 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:320
 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:327
 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:334
@@ -4018,83 +4385,77 @@ msgstr "Toevoegen uitzondering"
 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:411
 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:420
 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:445
-#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:234
-#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:995
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:873
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:1125
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:483
 #: 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
 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:305
-#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:202
-#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:223
-#: 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/users/UserCRUDController.java:483
-#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:110
-#: 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
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:212
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:343
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:351
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:304
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:310
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:135
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:448
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/TimSynchronizationController.java:142
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:173
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:320
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:126
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:967
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:981
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1440
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1467
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:167
-#: 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: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:750
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1684
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1708
+#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:202
+#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:223
+#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:247
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:43
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:50
+#: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:96
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:48
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:58
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:64
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:129
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:53
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:46
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:74
+#: libreplan-webapp/src/main/webapp/typeofworkhours/_editTypeOfWorkHours.zul:44
+#: libreplan-webapp/src/main/webapp/typeofworkhours/_editTypeOfWorkHours.zul:55
+#: libreplan-webapp/src/main/webapp/typeofworkhours/_editTypeOfWorkHours.zul:61
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:43
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:54
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:43
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:58
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:94
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:96
 #: 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
 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:94
-#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:43
-#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:54
-#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:43
-#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:50
-#: libreplan-webapp/src/main/webapp/materials/materials.zul:94
-#: libreplan-webapp/src/main/webapp/materials/materials.zul:96
+#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:39
 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:161
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:61
+#: libreplan-webapp/src/main/webapp/common/_editJobScheduling.zul:31
+#: libreplan-webapp/src/main/webapp/common/_editJobScheduling.zul:37
+#: libreplan-webapp/src/main/webapp/common/_editJobScheduling.zul:45
+#: libreplan-webapp/src/main/webapp/common/_editJobScheduling.zul:56
 #: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:34
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:50
 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:44
 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:54
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:50
-#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:39
 #: libreplan-webapp/src/main/webapp/profiles/_editProfile.zul:43
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:43
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:58
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:53
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:129
-#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:48
-#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:58
-#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:64
-#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:46
-#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:74
-#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:38
-#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:52
+#: libreplan-webapp/src/main/webapp/orders/components/_jiraOrderElementSync.zul:49
 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:35
 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:41
-#: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:96
-#: libreplan-webapp/src/main/webapp/typeofworkhours/_editTypeOfWorkHours.zul:44
-#: libreplan-webapp/src/main/webapp/typeofworkhours/_editTypeOfWorkHours.zul:55
-#: libreplan-webapp/src/main/webapp/typeofworkhours/_editTypeOfWorkHours.zul:61
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:60
+#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:38
+#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:52
 msgid "cannot be empty"
 msgstr "kan niet leeg zijn"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:425
-msgid "Effort must be greater than zero"
-msgstr "Inspanning moet groter dan nul zijn"
+#: libreplan-webapp/src/main/webapp/orders/components/_timOrderTimesheetSync.zul:22
+msgid "Tim sync information"
+msgstr "Tim sync informatie"
+
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:173
+msgid "Heading Fields"
+msgstr "Omschrijving Velden"
 
 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:50
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:54
@@ -4103,9 +4464,13 @@ msgstr "Inspanning moet groter dan nul zijn"
 msgid "from"
 msgstr "van"
 
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:173
-msgid "Heading Fields"
-msgstr "Omschrijving Velden"
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:425
+msgid "Effort must be greater than zero"
+msgstr "Inspanning moet groter dan nul zijn"
+
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:149
+msgid "Resources load since"
+msgstr "Resourcebelasting sinds"
 
 #: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:72
 #: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:82
@@ -4116,13 +4481,21 @@ msgstr "Voortgangstype"
 msgid "Assigned Label Type cannot be repeated in a Timesheet Template."
 msgstr "Toegekend Labeltype kan niet worden herhaald in een urenstaatsjabloon"
 
+#: libreplan-webapp/src/main/webapp/orders/components/_jiraOrderElementSync.zul:22
+msgid "Jira sync information"
+msgstr "Jira sync informatie"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/search/NewAllocationSelectorController.java:735
+msgid "End filtering date cannot be empty"
+msgstr "Eind filterdatum mag niet leeg zijn"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:444
 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:143
 msgid ""
 "Hours types are empty. Please, create some hours types before proceeding"
 msgstr "Urentypes zijn leeg. Maak aub enkele urentypes aan voor u verder gaat"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:851
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:865
 #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/ResourceType.java:30
 msgid "Normal resource"
 msgstr "Normale resource"
@@ -4137,14 +4510,14 @@ msgstr "Tijdsperiode bevat ongeldige gegevens. Einddatum moet na startdatum ligg
 msgid "Expand taskgroups"
 msgstr "Uitklappen taakgroepen"
 
-#: libreplan-webapp/src/main/webapp/common/layout/template.zul:141
-msgid "The admin's account password remains the default one. This is insecure"
-msgstr "Het wachtwoord van het beheersaccount is nog steeds het origineel. Dit is niet veilig"
-
 #: libreplan-webapp/src/main/webapp/orders/_ordersTab.zul:33
 msgid "Save Project"
 msgstr "Opslaan project"
 
+#: libreplan-webapp/src/main/webapp/common/layout/template.zul:141
+msgid "The admin's account password remains the default one. This is insecure"
+msgstr "Het wachtwoord van het beheersaccount is nog steeds het origineel. Dit is niet veilig"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/ManualAllocationController.java:318
 #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/ManualAllocationController.java:324
 msgid "Day is not valid"
@@ -4167,23 +4540,23 @@ msgstr "Help"
 msgid "Variance At Completion"
 msgstr "Variantie bij voltooiing"
 
-#: libreplan-webapp/src/main/webapp/common/layout/template.zul:171
-msgid "default password was not changed"
-msgstr "standaard wachtwoord werd niet gewijzigd"
-
 #: libreplan-webapp/src/main/webapp/unittypes/unitTypes.zul:21
 msgid "LibrePlan: Material Units"
 msgstr "LibrePlan: Materiaal Eenheden"
 
+#: libreplan-webapp/src/main/webapp/common/layout/template.zul:171
+msgid "default password was not changed"
+msgstr "standaard wachtwoord werd niet gewijzigd"
+
 #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java:256
 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:498
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:621
 msgid "Code sequence is already in use and cannot be updated"
 msgstr "Codesequentie is al in gebruik en kan niet worden gewijzigd"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/SettingsController.java:96
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/SettingsController.java:135
 msgid "Settings saved"
 msgstr "Instellingen opgeslagen"
 
@@ -4196,84 +4569,85 @@ 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: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/planner/allocation/ResourceAllocationController.java:464
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:935
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ScenarioBandboxFinder.java:46
 #: 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/BaseCalendarBandboxFinder.java:46
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TypeOfWorkHoursBandboxFinder.java:43
-#: 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/ExternalCompanyBandboxFinder.java:51
-#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:42
-#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:77
-#: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:26
-#: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:27
+#: 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/TypeOfWorkHoursBandboxFinder.java:43
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/BaseCalendarBandboxFinder.java:46
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:374
+#: libreplan-webapp/src/main/webapp/myaccount/_myTasksArea.zul:27
+#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:26
+#: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:35
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:56
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:32
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:53
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:108
+#: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:34
+#: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:41
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:39
+#: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:25
+#: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:27
+#: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:45
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:81
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:32
+#: libreplan-webapp/src/main/webapp/planner/main.zul:49
+#: libreplan-webapp/src/main/webapp/typeofworkhours/_editTypeOfWorkHours.zul:52
 #: 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:26
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:98
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:139
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:96
+#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:87
+#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:127
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:87
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:127
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:169
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:117
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:98
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:139
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:92
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:136
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:177
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:106
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:147
+#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:46
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:40
+#: libreplan-webapp/src/main/webapp/calendars/_list.zul:28
 #: libreplan-webapp/src/main/webapp/materials/materials.zul:60
+#: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:26
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:42
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:77
+#: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:48
+#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:62
+#: libreplan-webapp/src/main/webapp/templates/_listTemplates.zul:26
+#: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:34
+#: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:50
 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:43
 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:134
 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:156
 #: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:27
-#: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:34
-#: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:50
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:437
 #: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:66
 #: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:76
 #: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:32
 #: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:52
 #: libreplan-webapp/src/main/webapp/scenarios/_list.zul:27
 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:51
+#: libreplan-webapp/src/main/webapp/profiles/_editProfile.zul:40
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:110
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:80
+#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:36
+#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:27
+#: libreplan-webapp/src/main/webapp/orders/_list.zul:28
+#: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:27
+#: libreplan-webapp/src/main/webapp/unittypes/_editUnitType.zul:51
 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:36
 #: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:42
 #: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:83
-#: libreplan-webapp/src/main/webapp/planner/main.zul:49
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:32
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:81
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:98
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:139
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:98
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:139
-#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:87
-#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:127
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:92
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:136
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:177
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:87
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:127
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:169
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:117
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:106
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:147
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:96
-#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:62
-#: libreplan-webapp/src/main/webapp/templates/_listTemplates.zul:26
-#: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:48
-#: libreplan-webapp/src/main/webapp/myaccount/_myTasksArea.zul:27
-#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:46
-#: libreplan-webapp/src/main/webapp/profiles/_editProfile.zul:40
-#: libreplan-webapp/src/main/webapp/unittypes/_editUnitType.zul:51
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:40
-#: libreplan-webapp/src/main/webapp/calendars/_list.zul:28
-#: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:34
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:32
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:53
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:108
-#: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:35
-#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:56
-#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:39
-#: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:25
-#: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:27
-#: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:45
-#: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:41
-#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:36
-#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:27
-#: libreplan-webapp/src/main/webapp/orders/_edition.zul:78
-#: libreplan-webapp/src/main/webapp/orders/_list.zul:28
-#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:110
 #: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:96
-#: libreplan-webapp/src/main/webapp/typeofworkhours/_editTypeOfWorkHours.zul:52
 msgid "Name"
 msgstr "naam"
 
@@ -4288,6 +4662,8 @@ msgid "Delete task"
 msgstr "Verwijder taak"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/EffortDurationPicker.java:69
+#: libreplan-webapp/src/main/webapp/common/_editJobScheduling.zul:103
+#: libreplan-webapp/src/main/webapp/common/_editJobScheduling.zul:144
 msgid "Seconds"
 msgstr "Seconden"
 
@@ -4295,11 +4671,13 @@ msgstr "Seconden"
 msgid "please, select an item"
 msgstr "Kies aub en item"
 
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:1181
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:1182
 msgid "a label can not be assigned twice in the same branch"
 msgstr "een label kan niet twee keer in dezelfde tak worden toegekend"
 
 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:224
+#: libreplan-webapp/src/main/webapp/common/_editJobScheduling.zul:123
+#: libreplan-webapp/src/main/webapp/common/_editJobScheduling.zul:149
 msgid "Day of week"
 msgstr "Dag van de week"
 
@@ -4311,19 +4689,23 @@ msgstr "Bedrijvenlijst"
 msgid "Normal resource assignment"
 msgstr "Normale resource toekenning"
 
+#: libreplan-webapp/src/main/webapp/orders/_timImpExpInfo.zul:20
+msgid "LibrePlan: Tim import export info"
+msgstr "LibrePlan: Tim import export info"
+
 #: libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java:135
 msgid "default calendar not specified"
 msgstr "standaard kalender niet gespecificeerd"
 
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLineGroup.java:1146
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLineGroup.java:1151
 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:1469
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1477
 msgid "Stretches with Interpolation"
 msgstr "Stretches met interpolatie"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:451
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:463
 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:39
 msgid "Hours Worked Per Resource"
 msgstr "Gewerkte uren per resource"
@@ -4332,16 +4714,16 @@ msgstr "Gewerkte uren per resource"
 msgid "material not specified"
 msgstr "materiaal niet gespecificeerd"
 
-#: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:26
 #: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:36
+#: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:26
 msgid "Category name"
 msgstr "Categorienaam"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:760
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:784
 msgid "Date must be inside visualization area"
 msgstr "Datum moet binnen visualisatiegebhied liggen"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:124
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:125
 msgid "Show a notification when new LibrePlan versions are released"
 msgstr "Toon een melding als er een nieuwe LibrePlan versie is verschenen"
 
@@ -4353,14 +4735,14 @@ msgstr "Hoofdmenu"
 msgid "MonteCarlo"
 msgstr "MonteCarlo"
 
-#: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:49
-msgid "Duration"
-msgstr "Duur"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:593
 msgid "Exception: {0}"
 msgstr "Uitzondering: {0}"
 
+#: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:49
+msgid "Duration"
+msgstr "Duur"
+
 #: libreplan-webapp/src/main/webapp/myaccount/changePassword.zul:54
 msgid "Password settings"
 msgstr "Wachtwoord instellingen"
@@ -4369,7 +4751,8 @@ msgstr "Wachtwoord instellingen"
 msgid "Delete expense sheet \"{0}\". Are you sure?"
 msgstr "Verwijder declaratieformulier \"{0}\". Weet u het zeker?"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:150
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:152
+#: libreplan-webapp/src/main/webapp/common/_editJobScheduling.zul:77
 #: libreplan-webapp/src/main/webapp/common/components/schedulingStateToggler.zul:29
 msgid "Schedule"
 msgstr "Plan"
@@ -4382,11 +4765,17 @@ msgstr "Niet verwacht: {0}"
 msgid "a personal expense sheet must have the same resource in all the lines"
 msgstr "een persoonlijk declaratieformulier moet dezelfde resource hebben op alle regels"
 
-#: libreplan-webapp/src/main/webapp/planner/main.zul:61
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:50
+#: libreplan-webapp/src/main/webapp/planner/main.zul:61
 msgid "Notes"
 msgstr "Notities"
 
+#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:145
+#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:169
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:85
+msgid "Concept"
+msgstr "Concept"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioCRUDController.java:178
 msgid "Connect"
 msgstr "Verbinden"
@@ -4395,25 +4784,19 @@ msgstr "Verbinden"
 msgid "This progress type cannot cannot be removed"
 msgstr "Dit voortgangstype kan niet worden verwijderd"
 
-#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:145
-#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:169
-#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:85
-msgid "Concept"
-msgstr "Concept"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:223
 msgid "Allocation: [{0},{1}]"
 msgstr "Allocatie: [{0},{1}]"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:1036
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:1050
 msgid "Virtual Workers Group"
 msgstr "Virtuele werkersgroep"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:210
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:229
 msgid "Changes saved"
 msgstr "Wijzigingen opgeslagen"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1261
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1409
 msgid "See scheduling"
 msgstr "Zie planning"
 
@@ -4428,7 +4811,13 @@ msgstr "Voortgang metingen"
 msgid "Add measure"
 msgstr "Toevoegen meting"
 
-#: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:52
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:443
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractCommand.java:53
+#: libreplan-webapp/src/main/webapp/planner/editTask.zul:69
+msgid "Subcontract"
+msgstr "Onderaannemen"
+
+#: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:79
 msgid "Found resources"
 msgstr "Resources gevonden"
 
@@ -4437,26 +4826,20 @@ msgstr "Resources gevonden"
 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:443
-#: libreplan-webapp/src/main/webapp/planner/editTask.zul:69
-msgid "Subcontract"
-msgstr "Onderaannemen"
-
-#: libreplan-webapp/src/main/webapp/planner/main.zul:57
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:41
+#: libreplan-webapp/src/main/webapp/planner/main.zul:57
 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:121
 msgid "End"
 msgstr "Einde"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:482
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:494
 #: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:39
 msgid "Project Costs"
 msgstr "Projectkosten"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:387
 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:531
-#: 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
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:64
 msgid "Cost Categories"
 msgstr "Kostencategorieën"
 
@@ -4465,11 +4848,15 @@ msgstr "Kostencategorieën"
 msgid "Other"
 msgstr "Andere"
 
+#: libreplan-webapp/src/main/java/org/libreplan/importers/ImportRosterFromTim.java:372
+msgid "Calendar exception day not found"
+msgstr "Kalenderuitzonderingsdag is niet gevonden"
+
 #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:313
 msgid "criterion type not specified"
 msgstr "criteriumtype niet gespecificeerd"
 
-#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/TypeOfWorkHours.java:103
+#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/TypeOfWorkHours.java:106
 msgid "default price not specified"
 msgstr "standaardprijs niet gespecificeerd"
 
@@ -4486,23 +4873,28 @@ msgid "Users List"
 msgstr "Gebruikerslijst"
 
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:27
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:57
 #: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:56
-#: libreplan-webapp/src/main/webapp/orders/_edition.zul:55
 msgid "Task quality forms"
 msgstr "Taak kwaliteitsformulier"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/UserBandboxFinder.java:47
-#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:27
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:47
-#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:52
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:144
-msgid "Username"
-msgstr "Gebruikersnaam"
-
 #: libreplan-webapp/src/main/webapp/users/_editUser.zul:106
 msgid "Has bound resource"
 msgstr "Heeft een gekoppelde resource"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/UserBandboxFinder.java:47
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:53
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:144
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:47
+#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:27
+#: libreplan-business/src/main/java/org/libreplan/business/common/entities/PredefinedConnectorProperties.java:36
+msgid "Username"
+msgstr "Gebruikersnaam"
+
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:125
+msgid "Label filter"
+msgstr "Label filter"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1235
 msgid ""
 "Progress measurements that are reported by quality forms cannot be removed"
@@ -4514,25 +4906,29 @@ msgid ""
 "date"
 msgstr "Aantal uren is niet goed berekend op basis van start- en einddatum"
 
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderSyncInfo.java:78
+msgid "last synchronized date not specified"
+msgstr "laatste synchronisatiedatum niet gespecificeerd"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:337
 #: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:237
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:332
-#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:55
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:56
 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:193
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:194
 msgid "Cost category"
 msgstr "Kostencategorie"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:835
+msgid "It can not be deleted. At least one sequence is necessary."
+msgstr "Het kan niet verwijderd worden. Minimaal één sequence is nodig."
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:342
 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:712
-msgid "It can not be deleted. At least one sequence is necessary."
-msgstr "Het kan niet verwijderd worden. Minimaal één sequence is nodig."
-
 #: libreplan-business/src/main/java/org/libreplan/business/materials/entities/Material.java:105
 msgid "description is not specified"
 msgstr "omschrijving is niet gespecificeerd"
@@ -4541,7 +4937,7 @@ msgstr "omschrijving is niet gespecificeerd"
 msgid "Resource allocation"
 msgstr "Resource toekennen"
 
-#: libreplan-webapp/src/main/webapp/orders/_edition.zul:266
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:268
 msgid "New end date for the customer"
 msgstr "Nieuwe einddatum voor de klant"
 
@@ -4553,9 +4949,9 @@ msgstr "ID reeds in gebruik. Het dient uniek te zijn"
 msgid "please, select a quality form"
 msgstr "selecteer aub een kwaliteitsformulier"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:1065
 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:518
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:1051
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:132
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:134
 msgid "Edit {0}: {1}"
 msgstr "Wijzig {0}: {1}"
 
@@ -4575,42 +4971,42 @@ msgstr "Klant referentiecode"
 msgid "Constraint"
 msgstr "Beperking"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:390
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:150
+msgid "Add New Label Type Field"
+msgstr "Voeg nieuw labeltypeveld toe"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:487
 msgid ""
 "Deadline cannot be empty because there is a task with constraint \"as late "
 "as possible\""
 msgstr "Deadline kan niet leeg zijn omdat er een taak is met de randvoorwaarde \"zo laat mogelijk\""
 
-#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:150
-msgid "Add New Label Type Field"
-msgstr "Voeg nieuw labeltypeveld toe"
-
 #: libreplan-business/src/main/java/org/libreplan/business/advance/entities/DirectAdvanceAssignment.java:195
 msgid ""
 "Progress measurements must have a value lower than their following progress "
 "measurements."
 msgstr "Voortgangsmeting moeten een waarde hebben die lager is dan hun latere voortgangsmeting"
 
-#: libreplan-webapp/src/main/webapp/orders/_edition.zul:233
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:235
 msgid "Customer reference"
 msgstr "Referentieklant"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:373
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:717
 #: 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:372
-#: 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: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/resourceload/ResourceLoadController.java:405
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:415
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:833
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:978
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1036
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1045
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1078
 #: 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:931
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1077
 msgid "Sorry, you do not have permissions to access this project"
 msgstr "Helaas heeft u geen toegangdrechten voor dit project"
 
@@ -4618,7 +5014,7 @@ msgstr "Helaas heeft u geen toegangdrechten voor dit project"
 msgid "END"
 msgstr "EINDE"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:272
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:279
 msgid "Worker saved"
 msgstr "Werker opgeslagen"
 
@@ -4654,27 +5050,36 @@ msgstr "Voortgangspercentage"
 msgid "Heading"
 msgstr "Koptekst"
 
-#: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:22
-msgid "Criterion Types List"
-msgstr "Criteriumtypelijst"
+#: libreplan-webapp/src/main/java/org/libreplan/importers/ImportRosterFromTim.java:356
+msgid "Exception name should not be empty"
+msgstr "Uitzonderingsnaam mag niet leeg zijn"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:459
-msgid "Do you want to split the material assignment {0}?"
-msgstr "Wilt u de materiaalverdeling {0} splitsen?"
+#: libreplan-webapp/src/main/java/org/libreplan/importers/JiraOrderElementSynchronizer.java:132
+#: libreplan-webapp/src/main/java/org/libreplan/importers/JiraOrderElementSynchronizer.java:511
+msgid "Connection values of JIRA connector are invalid"
+msgstr "Verbindingsinstellingen van de JIRA-connector zijn ongeldig"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:528
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:274
 msgid "must be after the previous date"
 msgstr "moet na de vorige datum zijn"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:112
-msgid "Hours Type"
-msgstr "Urentype"
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:459
+msgid "Do you want to split the material assignment {0}?"
+msgstr "Wilt u de materiaalverdeling {0} splitsen?"
+
+#: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:22
+msgid "Criterion Types List"
+msgstr "Criteriumtypelijst"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/montecarlo/MonteCarloController.java:192
 msgid "Percentages should sum 100"
 msgstr "Percentages dienen opgeteld 100 te zijn"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:112
+msgid "Hours Type"
+msgstr "Urentype"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:81
 msgid "Total task budget"
 msgstr "Totaal taak budget"
@@ -4683,7 +5088,7 @@ msgstr "Totaal taak budget"
 msgid "Worker must be not-null"
 msgstr "Werker moet gedefinieerd zijn"
 
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1063
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1065
 msgid "Some criterion satisfactions overlap in time"
 msgstr "Sommige criteria satisfactions overlappen in tijd"
 
@@ -4703,18 +5108,18 @@ msgstr "Werker toewijzingen"
 msgid "last task sequence code not specified"
 msgstr "laatste takensequentiecode niet gespecificeerd"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:603
+#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsModel.java:173
 #: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:266
 #: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:154
 #: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:182
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsModel.java:173
 #: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioModel.java:221
 #: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:206
 #: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:227
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:603
 msgid "{0} already exists"
 msgstr "{0} bestaat reeds"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:437
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:448
 msgid "Create Worker"
 msgstr "Maken werker"
 
@@ -4735,9 +5140,9 @@ msgstr "Code"
 msgid "Exception: {0} (Inh)"
 msgstr "Uitzondering: {0} (Inh)"
 
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:72
 #: libreplan-webapp/src/main/webapp/myaccount/changePassword.zul:77
 #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:153
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:72
 msgid "Password confirmation"
 msgstr "Wachtwoord bevestiging"
 
@@ -4750,11 +5155,11 @@ msgid "Regular"
 msgstr "Normaal"
 
 #: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:39
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:88
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:89
 msgid "Show progress"
 msgstr "Toon voortgang"
 
-#: libreplan-webapp/src/main/webapp/orders/_edition.zul:170
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:172
 msgid "Work"
 msgstr "Werk"
 
@@ -4764,8 +5169,8 @@ msgid ""
 "{0}"
 msgstr "Fout bij opslaan van het project⏎\n{0}"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:375
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:220
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:375
 msgid ""
 "You are about to leave the planning edition, unsaved changes will be lost."
 msgstr "U gaat het planningsscherm verlaten, niet-opgeslagen wijzigingen zullen verloren gaan."
@@ -4774,15 +5179,15 @@ msgstr "U gaat het planningsscherm verlaten, niet-opgeslagen wijzigingen zullen
 msgid "LibrePlan: Machines"
 msgstr "LibrePlan: Machines"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MyTasksAreaController.java:75
 #: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/CostStatusController.java:118
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MyTasksAreaController.java:75
 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:351
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1320
 #: 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:1312
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:343
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:403
 #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:628
 msgid "Error"
@@ -4800,14 +5205,18 @@ msgstr "ETC"
 msgid "Log out"
 msgstr "Afmelden"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/ProjectStatusReportController.java:107
-msgid "You should filter the report by project, labels or criteria"
-msgstr "U dient het rapport te filteren op project, labels of criteria"
+#: libreplan-webapp/src/main/webapp/common/job_scheduling.zul:20
+msgid "LibrePlan: Job Scheduling"
+msgstr "LibrePlan:Taakplanner"
 
 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:42
 msgid "Filter timesheet by"
 msgstr "Filter urenstaat op"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/ProjectStatusReportController.java:107
+msgid "You should filter the report by project, labels or criteria"
+msgstr "U dient het rapport te filteren op project, labels of criteria"
+
 #: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:25
 msgid "Add new configuration unit"
 msgstr "Toevoegen nieuwe configuratie unit"
@@ -4821,15 +5230,15 @@ msgstr "Belangrijkste voorkeuren"
 msgid "Progress consolidation"
 msgstr "Voorgangsconsolidatie"
 
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:47
-msgid "Add new worker assignment"
-msgstr "Toevoegen nieuwe werkopdracht"
-
 #: libreplan-webapp/src/main/webapp/myaccount/_myTasksArea.zul:22
 msgid "My tasks"
 msgstr "Mijn taken"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:729
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:47
+msgid "Add new worker assignment"
+msgstr "Toevoegen nieuwe werkopdracht"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:840
 msgid "Show all elements"
 msgstr "Toon alle elementen"
 
@@ -4841,18 +5250,14 @@ msgstr "Taak informatie"
 msgid "Progress cannot be consolidated."
 msgstr "Voortgang kan niet geconsolideerd worden"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeModel.java:403
-msgid "There is another timesheet template with the same name"
-msgstr "Er is een andere urenstaatsjabloon met de zelfde naam"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:165
 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:190
 msgid "SPREAD"
 msgstr "SPREAD"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:709
-msgid "Changes applied"
-msgstr "Wijzigingen toegepast"
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeModel.java:414
+msgid "There is another timesheet template with the same name"
+msgstr "Er is een andere urenstaatsjabloon met de zelfde naam"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/adaptplanning/AdaptPlanningCommand.java:70
 msgid "Adapting planning according to timesheets"
@@ -4862,6 +5267,10 @@ msgstr "Aanpassen van de planning op basis van urenstaten"
 msgid "Budgeted Cost Work Scheduled"
 msgstr "Gebudgetteerde Kosten Werk Ingepland"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:717
+msgid "Changes applied"
+msgstr "Wijzigingen toegepast"
+
 #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:471
 msgid "criterion type does not allow hierarchy"
 msgstr "criteriumtype staat hierarchie niet toe"
@@ -4871,9 +5280,9 @@ msgid "Project closing previsions"
 msgstr "Project afsluitvoorwaarden"
 
 #: 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
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:351
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:174
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:59
 msgid "Material Units"
 msgstr "Materiaal eenheden"
 
@@ -4883,6 +5292,10 @@ msgid ""
 "of work percentage"
 msgstr "Laatste periode moet 100% lengte en 100% werkpercentage hebben"
 
+#: libreplan-webapp/src/main/webapp/common/_editJobScheduling.zul:54
+msgid "Job class name"
+msgstr "Taakgroepsnaam"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionsModel.java:216
 msgid "Resource type cannot be empty"
 msgstr "Resourcetype kan niet leeg zijn"
@@ -4916,6 +5329,14 @@ msgstr "Startdatum"
 msgid "progress assignment not specified"
 msgstr "voortgangs toekenning niet gespecificeerd"
 
+#: libreplan-webapp/src/main/java/org/libreplan/importers/JiraOrderElementSynchronizer.java:182
+msgid "Order-element for \"{0}\" issue not found"
+msgstr "Order-element voor issue \"{0}\" niet gevonden"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/search/NewAllocationSelectorController.java:756
+msgid "Start filtering date must be before than end filtering date"
+msgstr "Startdatum filter moet voor de einddatum liggen"
+
 #: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:22
 msgid "Virtual Workers Groups List"
 msgstr "Virtuele werkersgroep lijst"
@@ -4924,23 +5345,27 @@ msgstr "Virtuele werkersgroep lijst"
 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/planner/allocation/ResourceAllocationController.java:646
 #: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:360
 #: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:698
-#: 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/_expensesArea.zul:33
 #: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:92
-#: libreplan-webapp/src/main/webapp/orders/_edition.zul:182
+#: 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/expensesheet/expenseSheet.zul:50
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:184
 msgid "Total"
 msgstr "Totaal"
 
-#: 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
+#: 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 "User Accounts"
 msgstr "Gebruikersaccounts"
 
+#: libreplan-webapp/src/main/webapp/common/_editJobScheduling.zul:99
+msgid "Allowed values"
+msgstr "Toegestane waardes"
+
 #: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:158
 msgid "Effort"
 msgstr "Inspanning"
@@ -4968,7 +5393,7 @@ msgstr "percentage niet gespecificeerd"
 msgid "Edit task: {0}"
 msgstr "Wijzig taak: {0}"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:129
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:130
 msgid ""
 "Check this option if you would like to send feedback to LibrePlan developers"
 " about program usage"
@@ -4978,14 +5403,14 @@ msgstr "Vink deze optie aan als u feedback wilt sturen naar de LibrePlan ontwikk
 msgid "Machine was already removed"
 msgstr "Machine was reeds verwijderd"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:232
-msgid "expense line of the "
-msgstr "uitgavenregel van de"
-
 #: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:52
 msgid "Select destination"
 msgstr "Kies bestemming"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:232
+msgid "expense line of the "
+msgstr "uitgavenregel van de"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:203
 msgid "cannot be empty or less than zero"
 msgstr "kan niet leeg zijn of lager dan nul"
@@ -5004,25 +5429,25 @@ msgstr "Update taakeinde"
 msgid "Show all"
 msgstr "Toon alles"
 
-#: libreplan-webapp/src/main/webapp/typeofworkhours/_listTypesOfWorkHours.zul:28
-#: libreplan-webapp/src/main/webapp/typeofworkhours/_editTypeOfWorkHours.zul:59
-msgid "Default price"
-msgstr "Standaardprijs"
+#: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:39
+msgid "Estimated hours"
+msgstr "Geschatte uren"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:827
 msgid "Periods available depend on resources' calendar."
 msgstr "Perioden beschikbaar zijn afhankelijk van de kalender van de resource"
 
-#: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:39
-msgid "Estimated hours"
-msgstr "Geschatte uren"
+#: libreplan-webapp/src/main/webapp/typeofworkhours/_editTypeOfWorkHours.zul:59
+#: libreplan-webapp/src/main/webapp/typeofworkhours/_listTypesOfWorkHours.zul:28
+msgid "Default price"
+msgstr "Standaardprijs"
 
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:121
 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:261
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordController.java:99
 msgid "passwords don't match"
 msgstr "wachtwoorden komen niet overeen"
 
@@ -5030,19 +5455,23 @@ msgstr "wachtwoorden komen niet overeen"
 msgid "Day properties"
 msgstr "Dag eigenschappen"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:271
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:331
+msgid "Tim connection was successful"
+msgstr "Tim verbinding was successvol"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:272
 msgid " (%d tasks)"
 msgstr "(%d taken)"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportQueryController.java:156
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:344
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:275
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:145
-#: 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:697
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1331
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:799
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:314
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:386
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:145
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportQueryController.java:156
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:841
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:259
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1480
 msgid "must be lower than end date"
 msgstr "moet minder zijn dan einddatum"
 
@@ -5054,7 +5483,7 @@ msgstr "Week {0}"
 msgid "Hours groups"
 msgstr "Urengroepen"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:116
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:117
 msgid ""
 "Enable/Disable autocomplete property in login form, if the admin password is"
 " still the default one"
@@ -5068,9 +5497,9 @@ msgstr "Maak nieuwe gebruiker"
 msgid "Transfer"
 msgstr "Overdragen"
 
-#: libreplan-webapp/src/main/webapp/typeofworkhours/_listTypesOfWorkHours.zul:22
-msgid "Work Hours Types List"
-msgstr "Werkuren types lijst"
+#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/GlobalProgressChart.java:63
+msgid "By critical path duration"
+msgstr "Per kritieke pad duur"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:764
 msgid "Consolidated progress cannot be removed"
@@ -5082,9 +5511,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:63
-msgid "By critical path duration"
-msgstr "Per kritieke pad duur"
+#: libreplan-webapp/src/main/webapp/typeofworkhours/_listTypesOfWorkHours.zul:22
+msgid "Work Hours Types List"
+msgstr "Werkuren types lijst"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/milestone/AddMilestoneCommand.java:54
 msgid "new milestone"
@@ -5106,7 +5535,7 @@ msgstr "Urenstaat"
 msgid "Show dependencies"
 msgstr "Toon afhankelijkheden"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:310
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:407
 msgid "Schedule from start to deadline"
 msgstr "Plan vanaf start tot deadline"
 
@@ -5117,8 +5546,8 @@ msgid "Estimated days"
 msgstr "Geschatte dagen"
 
 #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:53
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:53
 #: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:63
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:53
 msgid "Reference date"
 msgstr "Referentie datum"
 
@@ -5130,7 +5559,7 @@ msgstr "LibrePlan: Geschatte/Geplande uren per taak"
 msgid "quality form item percentage not specified"
 msgstr "kwaliteitsformulieritem percentage niet gespecificeerd"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:316
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:323
 msgid "passwords do not match"
 msgstr "wachtwoorden komen niet overeen"
 
@@ -5154,11 +5583,6 @@ 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: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 %%)."
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:250
 msgid "CV"
 msgstr "CV"
@@ -5187,21 +5611,21 @@ msgstr "Stretches functie configuratie"
 msgid "Not indentable"
 msgstr "Niet indentable"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:341
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:344
 msgid ""
 "The original workable days value {0} cannot be modified as it has "
 "consolidations"
 msgstr "Het originele aantal van {0} werkdagen kan niet gewijzigd worden omdat het consolidaties bevat"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:259
-msgid "Timesheet saved"
-msgstr "Urenstaat opgeslagen"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:497
 #: libreplan-webapp/src/main/webapp/materials/materials.zul:73
 msgid "List of materials for all categories (select one to filter)"
 msgstr "Lijst met materialen voor alle categorieën (kies er een om te filteren)"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:259
+msgid "Timesheet saved"
+msgstr "Urenstaat opgeslagen"
+
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:74
 msgid "Resource allocation type"
 msgstr "Resource toekenningstype"
@@ -5215,6 +5639,10 @@ msgstr "Gebruiker uitgeschakeld"
 msgid "Exception type"
 msgstr "Uitzonderingstype"
 
+#: libreplan-webapp/src/main/webapp/common/_editJobScheduling.zul:127
+msgid "Year (optional)"
+msgstr "Jaar (optioneel)"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:824
 msgid "In the available periods {0} only {1} hours are available."
 msgstr "In de beschikbare perioden {0} zijn alleen {1} uren beschikbaar"
@@ -5233,15 +5661,15 @@ msgid ""
 "Date is not valid, it must be later than the last progress consolidation"
 msgstr "Datum is ongeldig. Het moet na de laatste voortgangs consolidatie liggen"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:214
-msgid "Seconds planning warning"
-msgstr "Seconden planningswaarschuwing"
-
 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:28
 msgid "Reception date"
 msgstr "Ontvangstdatum"
 
-#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:21
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:215
+msgid "Seconds planning warning"
+msgstr "Seconden planningswaarschuwing"
+
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:22
 msgid "LibrePlan: Settings"
 msgstr "LibrePlan: Instellingen"
 
@@ -5249,16 +5677,20 @@ msgstr "LibrePlan: Instellingen"
 msgid "worker's surname not specified"
 msgstr "Achternaam werker niet opgegeven"
 
-#: libreplan-webapp/src/main/webapp/resources/worker/_calendar.zul:48
 #: libreplan-webapp/src/main/webapp/resources/machine/_calendar.zul:41
+#: libreplan-webapp/src/main/webapp/resources/worker/_calendar.zul:48
 msgid "Save changes"
 msgstr "Wijzigingen opslaan"
 
-#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:80
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:81
 msgid "Application settings"
 msgstr "Applicatie instellingen"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:309
+#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:44
+msgid "Select source"
+msgstr "Kies bron"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:310
 msgid "Base"
 msgstr "Base"
 
@@ -5266,19 +5698,15 @@ msgstr "Base"
 msgid "Total dedication"
 msgstr "Total dedication"
 
-#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:44
-msgid "Select source"
-msgstr "Kies bron"
-
 #: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:542
 msgid "the same task is marked as finished by more than one timesheet line"
 msgstr "dezelfde taak is gemarkeerd als voltooid door meerdere andere urenstaatregels"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:977
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:991
 msgid "Worker deleted"
 msgstr "Werker verwijderd"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:745
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:868
 msgid "Select entity, please"
 msgstr "Kies aub entity"
 
@@ -5294,15 +5722,15 @@ msgstr "Uur klaar"
 msgid "total not specified"
 msgstr "totaal niet gespecificeerd"
 
-#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:48
-#: libreplan-webapp/src/main/webapp/myaccount/_expensesArea.zul:38
-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/myaccount/_expensesArea.zul:38
+#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:48
+msgid "Last expense"
+msgstr "Laatste uitgave"
+
 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:108
 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:197
 msgid "Day"
@@ -5330,8 +5758,8 @@ msgstr "Kies aub een item"
 msgid "Cannot be higher than finish hour"
 msgstr "Kan niet hoger zijn dan einde-uur"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:241
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:260
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:242
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:261
 msgid "Prefix"
 msgstr "Prefix"
 
@@ -5347,18 +5775,26 @@ msgstr "Nieuw sjabloon element"
 msgid "Project: {0}"
 msgstr "Project: {0}"
 
-#: 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:153
-#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:60
-msgid "Timesheets"
-msgstr "Urenstaten"
+#: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:47
+msgid "Load ratios calculated between"
+msgstr "Belastingratios berekend tussen"
 
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:94
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:97
 msgid "Non Consolidated"
 msgstr "Niet geconsolideerd"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:368
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:114
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:154
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:61
+msgid "Timesheets"
+msgstr "Urenstaten"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:45
+msgid "Connectors"
+msgstr "Connectors"
+
 #: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:43
 msgid "From date"
 msgstr "Vanaf datum"
@@ -5367,14 +5803,14 @@ msgstr "Vanaf datum"
 msgid "Task of project"
 msgstr "Taak van project"
 
-#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:229
-msgid "Hours cost"
-msgstr "Urenkosten"
-
 #: libreplan-webapp/src/main/webapp/planner/reassign.zul:34
 msgid "Reassigning type"
 msgstr "Opnieuw toewijzen soort"
 
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:229
+msgid "Hours cost"
+msgstr "Urenkosten"
+
 #: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:308
 msgid "There are repeated description values in the timesheet "
 msgstr "Er zijn meerdere identieke omschrijvingen in de urenstaat"
@@ -5398,29 +5834,29 @@ msgstr "Positie"
 msgid "maximum value not specified"
 msgstr "maxmimum waarde niet gespecificeerd"
 
-#: libreplan-webapp/src/main/webapp/common/layout/login.zul:109
-msgid "Incorrect authentication"
-msgstr "Incorrecte authenticatie"
-
 #: libreplan-webapp/src/main/webapp/planner/editTask.zul:53
 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:42
 #: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:35
 msgid "Edit task"
 msgstr "Wijzig taak"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:104
-msgid "Currency"
-msgstr "Valuta"
+#: libreplan-webapp/src/main/webapp/common/layout/login.zul:109
+msgid "Incorrect authentication"
+msgstr "Incorrecte authenticatie"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:378
+#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:31
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:75
+msgid "Timesheet Lines List"
+msgstr "Urenstaat regelslijst"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:214
 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: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"
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:105
+msgid "Currency"
+msgstr "Valuta"
 
 #: libreplan-business/src/main/java/org/libreplan/business/orders/entities/Order.java:678
 msgid "task code is repeated inside the project"
@@ -5440,6 +5876,7 @@ msgstr "Capaciteit moet een positief geheel getal zijn"
 
 #: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:94
 #: libreplan-webapp/src/main/webapp/calendars/calendars.zul:48
+#: libreplan-webapp/src/main/webapp/common/_editJobScheduling.zul:87
 msgid "Save and Continue"
 msgstr "Opslaan en doorgaan"
 
@@ -5464,21 +5901,21 @@ msgstr "Go!"
 msgid "Inherits up to date"
 msgstr "Overervingen zijn actueel"
 
-#: libreplan-webapp/src/main/webapp/profiles/_editProfile.zul:27
-msgid "Profile data"
-msgstr "Profiel gegevens"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:280
 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:366
+#: libreplan-webapp/src/main/webapp/profiles/_editProfile.zul:27
+msgid "Profile data"
+msgstr "Profiel gegevens"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:463
 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:413
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:425
 #: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:33
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:287
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:288
 msgid "Configuration"
 msgstr "Configuratie"
 
@@ -5486,15 +5923,22 @@ msgstr "Configuratie"
 msgid "cost category not specified"
 msgstr "kostencategorie niet gespecificeerd"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:181
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:366
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:372
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/JiraSynchronizationController.java:186
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/JiraSynchronizationController.java:239
+msgid "Cannot connect to JIRA server"
+msgstr "Kan niet verbinden met JIRA server"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:182
 msgid "Violated deadline"
 msgstr "Overtreden deadline"
 
-#: libreplan-webapp/src/main/webapp/orders/_edition.zul:243
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:245
 msgid "Delivery dates requested by customer. "
 msgstr "Leveringsdata aangevraagd door klant"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:128
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:129
 msgid ""
 "Help the project developers to collect information about which LibrePlan "
 "version you are using"
@@ -5508,11 +5952,11 @@ msgstr "LibrePlan: Werkers"
 msgid "Personal timesheet \"{0}\" saved"
 msgstr "Persoonlijke urenstaat \"{0}\" opgeslagen"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:719
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:733
 msgid "Create Virtual Workers Group"
 msgstr "Maak virtuele werkersgroep"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:125
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:126
 msgid "Enable/Disable warning about new LibrePlan versions available"
 msgstr "In-/Uitschakelen waarschuwing over een beschikbare nieuwe LibrePlan versie"
 
@@ -5522,35 +5966,43 @@ msgid ""
 "applications"
 msgstr "interactievelden zijn leeg en het bedrijf is gemarkeerd als interacterend met applicaties"
 
-#: 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:891
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:698
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:715
 #: libreplan-webapp/src/main/webapp/dashboard/_costStatus.zul:42
 msgid "Hours invested"
 msgstr "Uren geinvesteerd"
 
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:184
+msgid "Timesheet templates"
+msgstr "Urenstaatsjabloon"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:305
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:292
 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:48
 msgid "Templates"
 msgstr "Sjablonen"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:363
+#: libreplan-webapp/src/main/java/org/libreplan/web/importers/ProjectImportController.java:105
+msgid "Select one of the options."
+msgstr "Kies een van de opties."
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:364
 msgid "Authorization"
 msgstr "Autorisatie"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:363
-msgid "Project saved"
-msgstr "Project opgeslagen"
+#: libreplan-webapp/src/main/webapp/common/_editJobScheduling.zul:164
+msgid "OK"
+msgstr "OK"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:119
 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/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:363
+msgid "Project saved"
+msgstr "Project opgeslagen"
+
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:49
 msgid "task"
 msgstr "taak"
@@ -5573,8 +6025,9 @@ msgstr "Profielen van LDAP gebruikers kunnen niet beheerd worden omdat LDAP aan
 msgid "quality form item position not specified"
 msgstr "kwaliteitsformulier onderdeelpositie niet gespecificeerd"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:306
-#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:50
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:606
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:311
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:51
 msgid "Machines"
 msgstr "Machines"
 
@@ -5587,7 +6040,7 @@ msgid "Destination scenario"
 msgstr "Bestemmingsscenario"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:264
-#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:108
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:109
 msgid "Company view"
 msgstr "Overzicht"
 
@@ -5608,26 +6061,34 @@ msgstr "rapport voortgang niet gespecificeerd"
 msgid "Filter by"
 msgstr "Filter op"
 
-#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:48
-msgid "Up to date"
-msgstr "Up to date"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/calendar/CalendarAllocationCommand.java:58
 #: libreplan-webapp/src/main/webapp/planner/order.zul:143
 msgid "Calendar allocation"
 msgstr "Kalender toekennen"
 
+#: libreplan-webapp/src/main/java/org/libreplan/importers/ExportTimesheetsToTim.java:203
+msgid "Unable to crate time registration for request"
+msgstr "Niet in staat om een tijdregistratie te maken voor request"
+
+#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:48
+msgid "Up to date"
+msgstr "Up to date"
+
 #: libreplan-webapp/src/main/webapp/materials/materials.zul:86
 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:33
 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:113
 msgid "Category"
 msgstr "Categorie"
 
+#: libreplan-webapp/src/main/java/org/libreplan/importers/JiraTimesheetSynchronizer.java:115
+msgid "No workers found"
+msgstr "Geen werkers gevonden"
+
 #: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:22
 msgid "LibrePlan: Progress Types"
 msgstr "LibrePlan: Voortgangstypes"
 
-#: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:79
+#: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:109
 #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:203
 msgid "[generic all workers]"
 msgstr "[alle werkers]"
@@ -5636,6 +6097,10 @@ msgstr "[alle werkers]"
 msgid "Category data"
 msgstr "Categorie gegevens"
 
+#: libreplan-webapp/src/main/webapp/common/_listJobScheduling.zul:30
+msgid "Next fire time"
+msgstr "Volgende starttijd"
+
 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:97
 msgid "Search"
 msgstr "Zoeken"
@@ -5672,34 +6137,39 @@ msgstr "LibrePlan: Criteria"
 msgid "LibrePlan: Transfer Projects Between Scenarios"
 msgstr "LibrePlan: Kopieer projecten tussen scenarios"
 
-#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/Task.java:171
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/Task.java:189
 msgid "element associated to a task must be not empty"
 msgstr "element geassocoeerd met een taak mag niet leeg zijn"
 
+#: libreplan-webapp/src/main/webapp/resources/machine/_calendar.zul:43
+#: libreplan-webapp/src/main/webapp/resources/worker/_calendar.zul:50
+msgid "Remove calendar"
+msgstr "Verwijder kalender"
+
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:178
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:259
 msgid "%"
 msgstr "%"
 
-#: libreplan-webapp/src/main/webapp/resources/worker/_calendar.zul:50
-#: libreplan-webapp/src/main/webapp/resources/machine/_calendar.zul:43
-msgid "Remove calendar"
-msgstr "Verwijder kalender"
-
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:109
 msgid "Sum of direct expenses"
 msgstr "Som van totale uitgaven"
 
-#: libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul:33
-msgid "Communications From Customers"
-msgstr "Communicaties Vanaf Klanten"
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:71
+msgid "Total task hours"
+msgstr "Totaal taakuren"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/UserDashboardController.java:71
+msgid "Expense sheet \"{0}\" saved"
+msgstr "Onkostendeclaratie \"{0}\" opgeslagen"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:793
-#: 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/TaskElementFilterEnum.java:34
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceAllocationFilterEnum.java:30
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceBandboxFinder.java:46
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskElementFilterEnum.java:34
+#: 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/TaskGroupFilterEnum.java:32
+#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:69
 #: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:95
 #: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:151
 #: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:171
@@ -5707,22 +6177,17 @@ msgstr "Communicaties Vanaf Klanten"
 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:81
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:44
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:100
-#: 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:71
-msgid "Expense sheet \"{0}\" saved"
-msgstr "Onkostendeclaratie \"{0}\" opgeslagen"
+#: libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul:33
+msgid "Communications From Customers"
+msgstr "Communicaties Vanaf Klanten"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:71
-msgid "Total task hours"
-msgstr "Totaal taakuren"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:312
-#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:51
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:317
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:52
 msgid "Virtual Workers"
 msgstr "Virtueel Team"
 
@@ -5730,15 +6195,15 @@ msgstr "Virtueel Team"
 msgid "Configuration unit name"
 msgstr "Configuratieunit naam"
 
-#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:47
-msgid "Date last progress reported"
-msgstr "Datum laatste voortgangsrapport"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/entrypoints/RedirectorSynthetiser.java:125
 msgid "Could not load any resource"
 msgstr "Kon geen resource laden"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:464
+#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:47
+msgid "Date last progress reported"
+msgstr "Datum laatste voortgangsrapport"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:476
 #: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:39
 msgid "Work And Progress Per Project"
 msgstr "Werk en voortgang per project"
@@ -5751,16 +6216,19 @@ msgstr "Seconden planningswaarschuwing niet gespecicifeerd"
 msgid "total must be greater or equal than 0"
 msgstr "totaal moet groter dan of gelijk aan nul zijn"
 
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:113
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:85
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:187
+#: libreplan-webapp/src/main/webapp/orders/_synchronizationInfo.zul:24
+#: libreplan-webapp/src/main/webapp/orders/_timImpExpInfo.zul:29
+#: libreplan-webapp/src/main/webapp/orders/_jiraSyncInfo.zul:39
+msgid "Close"
+msgstr "Sluiten"
+
 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:158
 msgid "Default Label"
 msgstr "Standaard label"
 
-#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:187
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:85
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:113
-msgid "Close"
-msgstr "Sluiten"
-
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:23
 msgid "LibrePlan: Timesheet Lines List"
 msgstr "LibrePlan: Urenstaatregelslijst"
@@ -5769,36 +6237,40 @@ msgstr "LibrePlan: Urenstaatregelslijst"
 msgid "Specific Allocations"
 msgstr "Specifieke toekenning"
 
-#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:447
-msgid "label type: the timesheet has not assigned this label type"
-msgstr "labe;type: de urenstaat heeft dit labeltype niet toegekend gekregen"
-
 #: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:221
 msgid "progress type marked as quality form but is updatable"
 msgstr "voortgangstype is gemarkeerd als kwaliteitsformulier maar is te wijzigen"
 
-#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:64
-msgid "Move selected task up"
-msgstr "Verplaats geselecteerde taak omhoog"
+#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:447
+msgid "label type: the timesheet has not assigned this label type"
+msgstr "labe;type: de urenstaat heeft dit labeltype niet toegekend gekregen"
 
 #: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:27
 msgid "Select criteria set or specific resources for allocation"
 msgstr "Kies criteriaset of specifieke resources om te alloceren"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:350
-msgid "Create copy"
-msgstr "Maak kopie"
+#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:64
+msgid "Move selected task up"
+msgstr "Verplaats geselecteerde taak omhoog"
 
 #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:28
 msgid "Company data"
 msgstr "Bedrijfsgegevens"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:350
+msgid "Create copy"
+msgstr "Maak kopie"
+
+#: libreplan-webapp/src/main/java/org/libreplan/importers/JiraTimesheetSynchronizer.java:332
+msgid "Hours type should not be empty to synchronine timesheets"
+msgstr "Urentype mag niet leeg zijn voor het synchroniseren van urenstaten"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:274
 msgid "Users"
 msgstr "Gebruikers"
 
-#: 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
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/AssignedCriterionsModel.java:340
 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"
 
@@ -5811,7 +6283,7 @@ msgid "Hours Management"
 msgstr "Urenmanagement"
 
 #: libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderLineTemplate.java:170
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLine.java:323
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLine.java:326
 msgid "last hours group sequence code not specified"
 msgstr "laatste urengroepsequentiecode niet gespecificeerd"
 
@@ -5819,16 +6291,16 @@ 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/exceptionDays/CalendarExceptionTypeModel.java:102
+msgid "Cannot remove {0}, since it is being used by some exception day"
+msgstr "Kan {0} niet verwijderen omdat het in gebruik is bij een andere uitzonderingsdag"
+
 #: 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"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeModel.java:102
-msgid "Cannot remove {0}, since it is being used by some exception day"
-msgstr "Kan {0} niet verwijderen omdat het in gebruik is bij een andere uitzonderingsdag"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/NewAllocationSelector.java:94
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/NewAllocationSelector.java:98
 msgid "specific allocation"
 msgstr "Specifieke allocering"
 
@@ -5844,14 +6316,18 @@ 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:1684
+msgid "Please set a date"
+msgstr "Stel aub een datum in"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:224
 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:242
 msgid "Template saved"
 msgstr "Sjabloon opgeslagen"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1684
-msgid "Please set a date"
-msgstr "Stel aub een datum in"
+#: libreplan-webapp/src/main/java/org/libreplan/importers/ExportTimesheetsToTim.java:185
+msgid "No work reportlines are found for order: \"{0}\""
+msgstr "Geen urenstaatregels zijn gevonden voor order/project: \"{0}\""
 
 #: libreplan-business/src/main/java/org/libreplan/business/common/entities/EntitySequence.java:93
 msgid "prefix not specified"
@@ -5865,13 +6341,17 @@ msgstr "laatste criteriumsequentiecode niet gespecificeerd"
 msgid "Task quality form name"
 msgstr "Taak kwaliteitsformulier naam"
 
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1093
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1095
 #: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:158
 #: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:163
 #: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:183
 msgid "Some cost category assignments overlap in time"
 msgstr "Sommige kosten categorie toewijzingen overlappen elkaar in de tijd"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1731
+msgid "Regular project"
+msgstr "Normaal project"
+
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:26
 msgid "Imputed hours calculation"
 msgstr "Doorbelaste uren berekening"
@@ -5879,7 +6359,7 @@ msgstr "Doorbelaste uren berekening"
 #: libreplan-webapp/src/main/webapp/resources/worker/_localizations.zul:31
 #: libreplan-webapp/src/main/webapp/resources/worker/_localizations.zul:53
 #: libreplan-webapp/src/main/webapp/resources/worker/_localizations.zul:67
-#: libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderLineGroupTemplate.java:268
+#: libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderLineGroupTemplate.java:273
 msgid "Group"
 msgstr "Groep"
 
@@ -5888,21 +6368,13 @@ msgstr "Groep"
 msgid "Exit session"
 msgstr "Einde sessie"
 
-#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:30
-msgid "Statistics list "
-msgstr "Statistieken lijst"
-
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:113
-msgid "Apply filter to"
-msgstr "Pas filter toe op"
-
-#: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:28
-#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:58
-#: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:27
 #: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:61
 #: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:28
-#: libreplan-webapp/src/main/webapp/typeofworkhours/_listTypesOfWorkHours.zul:29
 #: libreplan-webapp/src/main/webapp/typeofworkhours/_editTypeOfWorkHours.zul:66
+#: libreplan-webapp/src/main/webapp/typeofworkhours/_listTypesOfWorkHours.zul:29
+#: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:27
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:58
+#: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:28
 msgid "Enabled"
 msgstr "Ingeschakeld"
 
@@ -5910,6 +6382,14 @@ msgstr "Ingeschakeld"
 msgid "Please, enter a valid effort"
 msgstr "Voer aub een geldige inspanning in"
 
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:113
+msgid "Apply filter to"
+msgstr "Pas filter toe op"
+
+#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:30
+msgid "Statistics list "
+msgstr "Statistieken lijst"
+
 #: 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 "
@@ -5925,19 +6405,19 @@ 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:368
-#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:61
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:373
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:62
 msgid "Timesheets Templates"
 msgstr "Urenstaat sjablonen"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:1143
+msgid "Confirm user edition"
+msgstr "Bevestig wijzigen gebruiker"
+
 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:117
 msgid "Any"
 msgstr "Iedere"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:1129
-msgid "Confirm user edition"
-msgstr "Bevestig wijzigen gebruiker"
-
 #: libreplan-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:47
 msgid "Load due to current project"
 msgstr "Belasting door huidig project"
@@ -5954,6 +6434,10 @@ 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/webapp/orders/components/_timOrderTimesheetSync.zul:33
+msgid "Tim last sync"
+msgstr "Tim laatste sync"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:477
 msgid "Remove queue-based resource element"
 msgstr "Verwijder wachtrij-gebaseerd resource element"
@@ -5966,24 +6450,24 @@ msgstr "standaard maximum waarde moet groter zijn dan de exacte waarde"
 msgid "Date format is wrong. Please, use the following format: {0}"
 msgstr " Datumformat is verkeerd. Gebruik aub het volgende format: {0}"
 
-#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:114
-#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:39
+#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:136
 #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:104
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:100
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:186
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:92
+#: libreplan-webapp/src/main/webapp/typeofworkhours/_editTypeOfWorkHours.zul:79
 #: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:182
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:114
+#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:127
 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:234
 #: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:38
 #: 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:186
-#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:127
-#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:136
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:96
 #: libreplan-webapp/src/main/webapp/profiles/_editProfile.zul:72
+#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:39
 #: libreplan-webapp/src/main/webapp/unittypes/unitTypes.zul:42
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:186
-#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:100
-#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:92
-#: libreplan-webapp/src/main/webapp/typeofworkhours/_editTypeOfWorkHours.zul:79
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:134
 msgid "Save & Continue"
 msgstr "Opslaan en Doorgaan"
 
@@ -5991,27 +6475,27 @@ msgstr "Opslaan en Doorgaan"
 msgid "Subcategory names must be unique."
 msgstr "Naam van subcategorie moet uniek zijn"
 
+#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:51
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:54
+#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:83
+#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:34
+#: libreplan-webapp/src/main/webapp/orders/_orderFilter.zul:23
+#: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:29
+msgid "Filter"
+msgstr "Filter"
+
 #: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:21
 msgid "LibrePlan: Work And Progress Per Project"
 msgstr "LibrePlan: Werk en voortgang per project"
 
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:54
-#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:83
-#: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:29
-#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:51
-#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:34
-#: libreplan-webapp/src/main/webapp/orders/_orderFilter.zul:23
-msgid "Filter"
-msgstr "Filter"
-
-#: libreplan-webapp/src/main/webapp/orders/_edition.zul:145
-msgid "Scheduling mode"
-msgstr "Planningsmode"
-
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:78
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:79
 msgid "Personal timesheets peridocity"
 msgstr "Persoonlijke urenstaten periodiciteit"
 
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:147
+msgid "Scheduling mode"
+msgstr "Planningsmode"
+
 #: 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"
@@ -6021,7 +6505,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:1321
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1329
 msgid "Assignment function will be changed. Are you sure?"
 msgstr "Toekeningsfunctie zal worden gewijzigd. Weet u het zeker?"
 
@@ -6033,7 +6517,11 @@ msgstr "Totaal uitgaven"
 msgid "Assigned locations"
 msgstr "Toegekende locaties"
 
-#: libreplan-webapp/src/main/webapp/orders/_orderFilter.zul:31
+#: libreplan-webapp/src/main/webapp/orders/imports/projectImport.zul:21
+msgid "LibrePlan: Import Project"
+msgstr "LibrePlan: Importeer project"
+
+#: libreplan-webapp/src/main/webapp/orders/_orderFilter.zul:33
 msgid "subelements"
 msgstr "subelementen"
 
@@ -6043,37 +6531,37 @@ msgstr "subelementen"
 msgid "Subcontracting date"
 msgstr "Onderaannemingsdatum"
 
-#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:66
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:49
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:66
 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/webapp/myaccount/personalTimesheet.zul:168
 msgid "Ok"
 msgstr "Ok"
 
+#: 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:31
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:89
-msgid "Authentication type"
-msgstr "Authenticatietype"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:457
 msgid "cannot be empty."
 msgstr "kan niet leeg zijn"
 
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:89
+#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:31
+msgid "Authentication type"
+msgstr "Authenticatietype"
+
 #: libreplan-webapp/src/main/webapp/common/layout/_customMenu.zul:55
 msgid "START"
 msgstr "START"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/NewAllocationSelector.java:71
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/NewAllocationSelector.java:75
 msgid "generic machines allocation"
 msgstr "Algemene machine toekenning"
 
@@ -6081,8 +6569,8 @@ msgstr "Algemene machine toekenning"
 msgid "Subcontrated task"
 msgstr "Onderaangenomen taak"
 
-#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:68
 #: libreplan-webapp/src/main/webapp/planner/order.zul:70
+#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:68
 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:75
 #: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:86
 msgid "Back"
@@ -6092,8 +6580,8 @@ msgstr "Terug"
 msgid "Our company username"
 msgstr "Ons bedrijf gebruikersnaam"
 
-#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:29
 #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:58
+#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:29
 msgid "Subcontractor"
 msgstr "Onderaannemer"
 
@@ -6110,7 +6598,7 @@ msgstr "Afbreken en terug"
 msgid "Assign quality form"
 msgstr "Kwaliteitsformulier toekennen"
 
-#: libreplan-webapp/src/main/webapp/orders/_edition.zul:116
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:118
 msgid "Planning Configuration"
 msgstr "Planningsconfiguratie"
 
@@ -6118,7 +6606,7 @@ msgstr "Planningsconfiguratie"
 msgid "Delete item {0}. Are you sure?"
 msgstr "Verwijder item {0}. Weet u het zeker?"
 
-#: libreplan-webapp/src/main/webapp/orders/_edition.zul:188
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:190
 msgid "Calculated budget"
 msgstr "Berekend budget"
 
@@ -6138,33 +6626,37 @@ msgstr "Beschikbare uren"
 msgid "Personal"
 msgstr "Persoonlijk"
 
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:52
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:59
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:52
 msgid "Allocations"
 msgstr "Toekenningen"
 
+#: libreplan-webapp/src/main/java/org/libreplan/importers/CalendarImporterMPXJ.java:365
+msgid "Calendar name already in use"
+msgstr "Kalendernaam reeds gebruikt"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/assigntemplates/TemplateFinderPopup.java:137
 msgid "Choosing Template"
 msgstr "Sjabloon kiezen"
 
-#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:135
 #: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:49
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:135
 msgid "Length"
 msgstr "Lengte"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:449
+#: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:35
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:66
+msgid "Capacity"
+msgstr "Capaciteit"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementBandboxFinder.java:52
 #: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:37
 msgid "Task code"
 msgstr "Taakcode"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:449
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:66
-#: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:35
-msgid "Capacity"
-msgstr "Capaciteit"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioCRUDController.java:133
 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:333
+#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioCRUDController.java:133
 msgid "Create derived"
 msgstr "Maak afgeleide"
 
@@ -6172,7 +6664,7 @@ msgstr "Maak afgeleide"
 msgid "Label Types"
 msgstr "Labeltypes"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:645
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:649
 msgid "it must be greater than zero"
 msgstr "het moet groter dan nul zijn"
 
@@ -6184,17 +6676,17 @@ msgstr "het moet een positief getal zijn"
 msgid "No Allocations have been done"
 msgstr "Er zijn geen toekenningen gedaan"
 
-#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:111
-#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:122
-msgid "Total hours task"
-msgstr "Totaal uren taak"
-
 #: libreplan-webapp/src/main/webapp/common/page_not_found.zul:49
 msgid ""
 "If you reached this page from another page of LibrePlan please notify us in "
 "order to fix it as soon as possible."
 msgstr "Als u deze pagina bereikt vanuit een andere pagina van LibrePlan laat het ons dan weten zodat we het zo snel mogelijk kunnen repareren."
 
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:111
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:122
+msgid "Total hours task"
+msgstr "Totaal uren taak"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:442
 msgid "Removed calendar \"{0}\""
 msgstr "Verwijderd kalender \"{0}\""
@@ -6203,27 +6695,27 @@ msgstr "Verwijderd kalender \"{0}\""
 msgid "expense sheet not specified"
 msgstr "onkostendeclaratie niet gespecificeerd"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1215
+msgid "Create project"
+msgstr "Maak project"
+
 #: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:23
 msgid "LibrePlan: Timesheets Templates"
 msgstr "LibrePlan: Urenstaat Sjablonen"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1066
-msgid "Create project"
-msgstr "Maak project"
-
 #: 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"
 msgstr "Sta meerdere waardes van dit type criterium toe in de zelfde tijdsperiode"
 
+#: libreplan-webapp/src/main/webapp/myaccount/_personalTimesheetsArea.zul:22
+msgid "Personal timesheets"
+msgstr "Persoonlijke urenstaten"
+
 #: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportType.java:421
 msgid ""
 "In the heading part, index labels and fields must be unique and consecutive"
@@ -6243,36 +6735,40 @@ msgid ""
 "present."
 msgstr "Kon deze autorisaties niet toevoegen aan gebruiker {0} omdat deze ze al had."
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:578
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:1023
+msgid "yes"
+msgstr "ja"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:306
 msgid "Root calendar"
 msgstr "Hoofdkalender"
 
-#: 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 "yes"
-msgstr "ja"
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:443
+msgid "Test connection"
+msgstr "Test verbinding"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:303
+msgid "Port"
+msgstr "Poort"
 
 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:113
 msgid "Select gap"
 msgstr "Selecteer gap"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:302
-msgid "Port"
-msgstr "Poort"
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:552
+msgid "From"
+msgstr "Van"
 
 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:64
 msgid "Date Finish"
 msgstr "Einddatum"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:455
-msgid "From"
-msgstr "Van"
-
 #: libreplan-business/src/main/java/org/libreplan/business/orders/entities/Order.java:369
 msgid "At least one hours group is needed for each task"
 msgstr "Minimaal één urengroep is nodig per taak"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:556
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:667
 msgid "Resources or criteria"
 msgstr "Resources of criteria"
 
@@ -6280,6 +6776,14 @@ msgstr "Resources of criteria"
 msgid "Name of criterion is empty."
 msgstr "Naam van criterium is leeg"
 
+#: libreplan-webapp/src/main/webapp/orders/_jiraSyncInfo.zul:24
+msgid "Synchronization order elements with JIRA issues was successful"
+msgstr "Synchronisatie van orderelementen met JIRA issues was succesvol"
+
+#: libreplan-webapp/src/main/java/org/libreplan/importers/JiraTimesheetSynchronizer.java:124
+msgid "Order \"{0}\" not found. Order probalbly not synchronized"
+msgstr "Order \"{0}\" niet gevonden. Order waarschijnlijk niet gesynchroniseerd"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/CriterionRequirementWrapper.java:224
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:95
 msgid "Validate"
@@ -6293,17 +6797,23 @@ msgstr "Deze resource is reeds toegevoegd"
 msgid "Could not retrieve Code. Please, try again later"
 msgstr "Kon de code niet ophalen. Probeer het later aub opnieuw"
 
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:445
-msgid "Criterion Type name is already being used"
-msgstr "Criteriumtypenaam is reeds in gebruik"
-
 #: libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialCategory.java:239
 msgid "There are repeated material category codes"
 msgstr "Er worden materiaalcategoriecodes herhaald"
 
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:36
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:445
+msgid "Criterion Type name is already being used"
+msgstr "Criteriumtypenaam is reeds in gebruik"
+
+#: libreplan-webapp/src/main/java/org/libreplan/importers/ExportTimesheetsToTim.java:96
+#: libreplan-webapp/src/main/java/org/libreplan/importers/ExportTimesheetsToTim.java:140
+#: libreplan-webapp/src/main/java/org/libreplan/importers/ImportRosterFromTim.java:129
+msgid "Connection values of Tim connector are invalid"
+msgstr "Verbindingsinstellingen van de Tim-connector zijn ongeldig"
+
 #: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:25
 #: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:34
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:36
 msgid "Cost category assignment"
 msgstr "Kostencategory toekenning"
 
@@ -6323,44 +6833,48 @@ msgstr "taak kan niet leeg zijn als deze door meerdere regels wordt gedeeld"
 msgid "All workers"
 msgstr "Alle werkers"
 
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1189
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1191
 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"
-
 #: libreplan-webapp/src/main/webapp/resources/search/allocation_selector_combo.zul:25
 msgid "Select criteria or resources"
 msgstr "Selecteer criteria of resources"
 
+#: 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"
+
 #: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:26
 #: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:24
 #: libreplan-webapp/src/main/webapp/orders/_orderFilter.zul:24
 msgid "Select required criteria set and press filter button"
 msgstr "Selecteer gewenste criteriaset en klik op de filterknop"
 
-#: 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:1521
 msgid "It cannot be empty"
 msgstr "Het kan niet leeg zijn"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:394
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:217
+msgid "Timesheet lines"
+msgstr "Urenstaatregels"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:415
 msgid "Calculate Resources per Day"
 msgstr "Bereken resources per dag"
 
+#: libreplan-webapp/src/main/webapp/common/_editJobScheduling.zul:134
+msgid "here"
+msgstr "hier"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:255
 msgid "Estimate To Complete"
 msgstr "Schat voltooiingstijd"
 
 #: libreplan-webapp/src/main/webapp/materials/materials.zul:85
 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:30
-#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:30
 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:111
+#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:30
 msgid "Unit type"
 msgstr "Eenheidstype"
 
@@ -6368,7 +6882,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:515
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:527
 msgid "Personal area"
 msgstr "Persoonlijk deel"
 
@@ -6376,14 +6890,14 @@ msgstr "Persoonlijk deel"
 msgid "Calendar data"
 msgstr "Kalender datum"
 
-#: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:22
-msgid "Cost Categories List"
-msgstr "Kostencategorielijst"
-
 #: libreplan-webapp/src/main/webapp/dashboard/_costStatus.zul:28
 msgid "Current state indicators"
 msgstr "Huidige statusindicatoren"
 
+#: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:22
+msgid "Cost Categories List"
+msgstr "Kostencategorielijst"
+
 #: libreplan-business/src/main/java/org/libreplan/business/common/IntegrationEntity.java:109
 msgid "code is already used"
 msgstr "code is reeds gebruikt"
@@ -6400,6 +6914,10 @@ msgstr "Labels lijst"
 msgid "last timesheet line sequence code not specified"
 msgstr "laatste urenstaat regelsequentiecode niet gespecificeerd"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/JobSchedulerController.java:231
+msgid "Completed"
+msgstr "Voltooid"
+
 #: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityFormItem.java:72
 msgid "quality form item name not specified or empty"
 msgstr "kwaliteitsformulier itemnaan niet gespecificeerd of leeg"
@@ -6408,6 +6926,10 @@ msgstr "kwaliteitsformulier itemnaan niet gespecificeerd of leeg"
 msgid "Criterion Requirements"
 msgstr "Criterium vereisten"
 
+#: libreplan-business/src/main/java/org/libreplan/business/common/entities/JobSchedulerConfiguration.java:93
+msgid "job class name not specified"
+msgstr "taakgroepsnaam niet gespecificeerd"
+
 #: libreplan-business/src/main/java/org/libreplan/business/orders/entities/HoursGroup.java:187
 msgid "working hours not specified"
 msgstr "werkuren niet gespecificeerd"
@@ -6434,8 +6956,8 @@ msgstr "Verplaats geselecteerde taak naar beneden"
 msgid "quality form type not specified"
 msgstr "kwaliteitsformuliertype niet gespecificeerd"
 
-#: 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/OrderFilterEnum.java:32
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:32
 msgid "Customer Reference"
 msgstr "Klant referentie"
 
@@ -6443,23 +6965,23 @@ msgstr "Klant referentie"
 msgid "Overtime ratio"
 msgstr "Overwerk ratio"
 
-#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:89
-msgid "Create and assign label"
-msgstr "Maak en ken label toe"
-
 #: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:42
 msgid "Optimistic"
 msgstr "Optimistisch"
 
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:89
+msgid "Create and assign label"
+msgstr "Maak en ken label toe"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:250
 msgid "SV"
 msgstr "SV"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:136
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:131
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:174
 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:313
 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:179
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:174
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:131
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:136
 msgid "Label has already been added."
 msgstr "Label is reeds toegevoegd"
 
@@ -6468,14 +6990,14 @@ msgid "Add task"
 msgstr "Taak toevoegen"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:888
-#: 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/java/org/libreplan/web/orders/OrderElementTreeController.java:772
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:714
+#: libreplan-webapp/src/main/webapp/myaccount/_myTasksArea.zul:38
+#: libreplan-webapp/src/main/webapp/dashboard/_dashboardfororder.zul:58
 #: 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
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:48
 #: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:48
-#: libreplan-webapp/src/main/webapp/orders/_edition.zul:46
-#: libreplan-webapp/src/main/webapp/dashboard/_dashboardfororder.zul:58
 msgid "Progress"
 msgstr "Voortgang"
 
@@ -6483,26 +7005,31 @@ msgstr "Voortgang"
 msgid "All progress types have already been assigned."
 msgstr "Alle voortgangstypes zijn reeds toegewezen"
 
-#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:80
-msgid "Price per hour"
-msgstr "Prijs per uur"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:177
 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:169
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:80
+msgid "Price per hour"
+msgstr "Prijs per uur"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:170
 msgid "No project deadline defined"
 msgstr "Geen projectdeadline gedefinieerd"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:317
-#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:52
+#: libreplan-webapp/src/main/webapp/orders/_timImpExpInfo.zul:24
+msgid "was successful"
+msgstr "was succesvol"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:322
+#: libreplan-webapp/src/main/webapp/orders/imports/projectImport.zul:46
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:53
 msgid "Calendars"
 msgstr "Kalenders"
 
-#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceMeasurement.java:102
 #: libreplan-business/src/main/java/org/libreplan/business/expensesheet/entities/ExpenseSheetLine.java:93
 #: libreplan-business/src/main/java/org/libreplan/business/workreports/valueobjects/DescriptionValue.java:80
+#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceMeasurement.java:102
 msgid "value not specified"
 msgstr "waarde niet gespecificeerd"
 
@@ -6512,27 +7039,31 @@ msgid ""
 "quality form"
 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/java/org/libreplan/web/resourceload/ResourceLoadController.java:554
 msgid "To"
 msgstr "Om"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:333
+msgid "Cannot connet to Tim server"
+msgstr "Kan niet verbinden met Tim server"
+
 #: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:30
 msgid "options"
 msgstr "opties"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1202
-msgid "Queue-based assignment"
-msgstr "Wachtrij-gebaseerde toekenning"
-
 #: libreplan-webapp/src/main/webapp/resources/_criterions.zul:32
 msgid "Show only current satisfied criteria"
 msgstr "Toon alleen de huidige vervulde criteria"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1210
+msgid "Queue-based assignment"
+msgstr "Wachtrij-gebaseerde toekenning"
+
 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:92
 msgid "Latest date"
 msgstr "Laatste datum"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:385
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:482
 msgid "Deadline cannot be empty in backwards mode"
 msgstr "Deadline kan niet leeg zijn in achterwaarts mode"
 
@@ -6548,10 +7079,10 @@ msgstr "Volledige naam"
 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/common/CustomMenuController.java:392
 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:117
-#: 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
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:164
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:65
 msgid "Hours Types"
 msgstr "Urentype"
 
@@ -6568,11 +7099,11 @@ msgid "Planned start"
 msgstr "Geplande aanvang"
 
 #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:62
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:77
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:98
 #: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:62
 #: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:73
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:98
 #: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:43
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:77
 msgid "Filter by projects"
 msgstr "Filter op projecten"
 
@@ -6580,9 +7111,9 @@ msgstr "Filter op projecten"
 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:258
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:259
+#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:45
 msgid "Active"
 msgstr "Aktief"
 
@@ -6590,13 +7121,13 @@ msgstr "Aktief"
 msgid "Inherited labels"
 msgstr "Geërfde labels"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:850
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:864
 #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/ResourceType.java:31
 msgid "Queue-based resource"
 msgstr "Wachtrij-gebaseerde resource"
 
 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:55
-#: libreplan-webapp/src/main/webapp/orders/_edition.zul:249
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:251
 msgid "Delivery date"
 msgstr "Leverdatum"
 
@@ -6626,49 +7157,55 @@ msgstr "Aanmelden"
 msgid "Project name"
 msgstr "Projectnaam"
 
-#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:55
-msgid "Precision"
-msgstr "Precisie"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:92
 msgid ""
 "Estimated start date for the task (press enter in textbox to open calendar "
 "popup or type in date directly)"
 msgstr "Geschatte startdatum voor de taak (druk Enter in de tekstbox om een kalender popup te openen, of type de datum rechtstreeks in)"
 
+#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:56
+msgid "Precision"
+msgstr "Precisie"
+
 #: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:41
 msgid "Show all reported hours"
 msgstr "Toon alle gerapporteerde uren"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:934
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:942
 msgid "Efforts"
 msgstr "Inspanningen"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/OrdersTabCreator.java:101
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/OrdersTabCreator.java:125
+#: libreplan-webapp/src/main/java/org/libreplan/importers/JiraTimesheetSynchronizer.java:383
+#: libreplan-webapp/src/main/java/org/libreplan/importers/ExportTimesheetsToTim.java:291
+#: libreplan-webapp/src/main/java/org/libreplan/importers/ImportRosterFromTim.java:239
+msgid "Worker \"{0}\" not found"
+msgstr "Werker \"{0}\" niet gevonden"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/OrdersTabCreator.java:106
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/OrdersTabCreator.java:139
 msgid "Projects List"
 msgstr "Projectenlijst"
 
 #: libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderLineTemplate.java:235
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLine.java:390
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLine.java:393
 msgid "budget not specified"
 msgstr "budget niet gespecificeerd"
 
-#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:56
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:50
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:55
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:76
+#: libreplan-webapp/src/main/webapp/typeofworkhours/_editTypeOfWorkHours.zul:46
 #: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:44
-#: libreplan-webapp/src/main/webapp/materials/materials.zul:62
 #: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:81
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:60
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:62
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:56
 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:163
 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:60
 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:45
-#: libreplan-webapp/src/main/webapp/unittypes/_editUnitType.zul:45
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:60
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:55
-#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:50
-#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:76
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:90
 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:53
-#: libreplan-webapp/src/main/webapp/orders/_edition.zul:88
-#: libreplan-webapp/src/main/webapp/typeofworkhours/_editTypeOfWorkHours.zul:46
+#: libreplan-webapp/src/main/webapp/unittypes/_editUnitType.zul:45
 msgid "Generate code"
 msgstr "Genereer code"
 
@@ -6676,14 +7213,35 @@ msgstr "Genereer code"
 msgid "Scheduling state"
 msgstr "Planing status"
 
-#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:44
+#: libreplan-webapp/src/main/java/org/libreplan/importers/OrderImporterMPXJ.java:660
+msgid "Linked calendar not found"
+msgstr "Gekoppelde kalender niet gevonden"
+
+#: libreplan-business/src/main/java/org/libreplan/business/common/entities/Connector.java:100
+msgid "connector name is already being used"
+msgstr "connectornaam is reeds in gebruik"
+
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:45
 msgid "Personal Data"
 msgstr "Personeelsgegevens"
 
+#: libreplan-webapp/src/main/java/org/libreplan/importers/JiraOrderElementSynchronizer.java:283
+msgid "No worklogs found for \"{0}\" issue"
+msgstr "Geen urenstaat-items  gevonden voor issue \"{0}\""
+
 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:21
 msgid "LibrePlan: Hours Worked Per Resource"
 msgstr "LibrePlan: Gewerkte uren per resource"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:601
+msgid "Machine"
+msgstr "Machine"
+
+#: libreplan-webapp/src/main/webapp/common/access_forbidden.zul:45
+#: libreplan-webapp/src/main/webapp/common/page_not_found.zul:45
+msgid "Go to init"
+msgstr "Ga naar init"
+
 #: libreplan-webapp/src/main/webapp/users/users.zul:23
 msgid "LibrePlan: User Accounts"
 msgstr "LibrePlan: Gebruikersaccounts"
@@ -6692,10 +7250,9 @@ msgstr "LibrePlan: Gebruikersaccounts"
 msgid "Budget in money"
 msgstr "Geldelijk budget"
 
-#: libreplan-webapp/src/main/webapp/common/access_forbidden.zul:45
-#: libreplan-webapp/src/main/webapp/common/page_not_found.zul:45
-msgid "Go to init"
-msgstr "Ga naar init"
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:200
+msgid "Criterion Type"
+msgstr "Criteriumtype"
 
 #: libreplan-webapp/src/main/webapp/common/error.zul:54
 #: libreplan-webapp/src/main/webapp/common/event_error.zul:50
@@ -6710,7 +7267,7 @@ msgstr "Profiel autorisatie"
 msgid "Assignation"
 msgstr "Toekenning"
 
-#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:98
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:99
 msgid "Planning charts expanded"
 msgstr "Planningsgrafieken uitgebreid"
 
@@ -6718,28 +7275,28 @@ msgstr "Planningsgrafieken uitgebreid"
 msgid "Inh"
 msgstr "Inh"
 
-#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskGroup.java:110
-msgid "element associated to a task group have to be defined"
-msgstr "elementen die geassocieerd zijn met een takengroep moeten worden gedefinieerd"
-
 #: libreplan-business/src/main/java/org/libreplan/business/expensesheet/entities/ExpenseSheetLine.java:92
 msgid "value must be greater or equal than 0"
 msgstr "waarde moet groter of gelijk aan nul zijn"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeModel.java:397
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskGroup.java:110
+msgid "element associated to a task group have to be defined"
+msgstr "elementen die geassocieerd zijn met een takengroep moeten worden gedefinieerd"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesModel.java:311
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeModel.java:408
 msgid "name cannot be empty"
 msgstr "naam kan niet leeg zijn"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:466
-msgid "task is already marked as finished in another timesheet"
-msgstr "taak is reeds gemarkeerd als zijnde voltooid in een andere urenstaat"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java:190
 msgid "Doing {0} reassignations"
 msgstr "Bezig met {0} reassignations"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:232
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:466
+msgid "task is already marked as finished in another timesheet"
+msgstr "taak is reeds gemarkeerd als zijnde voltooid in een andere urenstaat"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:233
 msgid "Select entity"
 msgstr "Kies entity"
 
@@ -6751,10 +7308,6 @@ msgstr "De einddatum kan niet voor de startdatum liggen"
 msgid "Go to worker edition window"
 msgstr "Ga naar werker wijzigen scherm"
 
-#: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:40
-msgid "Worked hours"
-msgstr "Gewerkte uren"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:95
 msgid "Invalid value. Default Max Value cannot be empty"
 msgstr "Ongeldige waarde. Standaard maximum waarde kan niet leeg zijn"
@@ -6764,8 +7317,12 @@ 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:604
+#: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:40
+msgid "Worked hours"
+msgstr "Gewerkte uren"
+
 #: libreplan-business/src/main/java/org/libreplan/business/common/IntegrationEntity.java:48
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:605
 msgid "code not specified"
 msgstr "code niet gespecificeerd"
 
@@ -6777,24 +7334,28 @@ msgstr "Projectenlijst"
 msgid "last sequence code not specified"
 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:173
-#: 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
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:164
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:191
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:161
-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:663
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:786
 msgid ""
 "Invalid format prefix. Format prefix cannot be empty, contain '_' or contain"
 " whitespaces."
 msgstr "Ongeldige opmaakvoorvoegsel. Opmaakvoorvoegsels kunnen niet leeg zijn, ' _' of spaties bevatten"
 
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:91
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:183
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:161
+#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:173
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:213
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:164
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:184
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:223
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:191
+msgid "if the report is not opened automatically"
+msgstr "als het rapport niet automatisch geopend wordt"
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderSyncInfo.java:87
+msgid "key not specified"
+msgstr "sleutel niet gespecificeerd"
+
 #: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:55
 msgid "Create template from selected task"
 msgstr "Maak sjabloon van geselecteerde taak"
@@ -6808,20 +7369,21 @@ msgstr "Alle projecten"
 msgid "Completed: {0}%"
 msgstr "Voltooit: {0}%"
 
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:67
 #: 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/configuration.zul:324
 #: libreplan-webapp/src/main/webapp/common/layout/login.zul:84
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:323
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:67
+#: libreplan-business/src/main/java/org/libreplan/business/common/entities/PredefinedConnectorProperties.java:37
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:36
 #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:92
+#: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:36
 msgid "Observations"
 msgstr "Observaties"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:939
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1071
 msgid "Edit project"
 msgstr "Wijzig project"
 
@@ -6829,6 +7391,10 @@ msgstr "Wijzig project"
 msgid "Hours cost: {0}, Expenses cost: {1}"
 msgstr "Urenkosten: {0}, Onkosten: {1}"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:205
+msgid "Criterion Types"
+msgstr "Criteriumtypes"
+
 #: libreplan-webapp/src/main/webapp/templates/_advances.zul:27
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:25
 msgid "Progress assignments"
@@ -6840,10 +7406,12 @@ msgid "Valid from"
 msgstr "Geldig vanaf"
 
 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:55
+#: libreplan-webapp/src/main/webapp/common/_editJobScheduling.zul:119
+#: libreplan-webapp/src/main/webapp/common/_editJobScheduling.zul:148
 msgid "Month"
 msgstr "Maand"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:919
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:923
 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"
 
@@ -6864,7 +7432,7 @@ msgstr "Kan materiaal niet in general view invoegen. Kies aub een categorie"
 msgid "Expense lines"
 msgstr "Onkostenregels"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:311
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:313
 msgid "Delete {0} \"{1}\". Are you sure?"
 msgstr "Verwijder {0} \"{1}\". Weet u het zeker?"
 
@@ -6872,27 +7440,27 @@ msgstr "Verwijder {0} \"{1}\". Weet u het zeker?"
 msgid "Only {0} resources per day were achieved for current allocation"
 msgstr "Alleen {0} resources per dag zijn gelukt voor de huidige toekenning"
 
-#: libreplan-webapp/src/main/webapp/planner/editTask.zul:81
-#: libreplan-webapp/src/main/webapp/planner/reassign.zul:48
 #: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:89
 #: libreplan-webapp/src/main/webapp/planner/main.zul:66
 #: libreplan-webapp/src/main/webapp/planner/order.zul:128
 #: libreplan-webapp/src/main/webapp/planner/order.zul:163
+#: libreplan-webapp/src/main/webapp/planner/editTask.zul:81
+#: libreplan-webapp/src/main/webapp/planner/reassign.zul:48
+#: libreplan-webapp/src/main/webapp/common/layout/template.zul:102
 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:88
 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:133
-#: libreplan-webapp/src/main/webapp/common/layout/template.zul:102
 msgid "Accept"
 msgstr "Accepteren"
 
 #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:81
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:298
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:305
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:312
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:319
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:347
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:382
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:389
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:396
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:299
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:306
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:313
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:320
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:348
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:383
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:390
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:397
 msgid "Example: {0}"
 msgstr "Voorbeeld: {0}"
 
@@ -6906,8 +7474,8 @@ 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/common/configuration.zul:219
 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:69
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:218
 msgid "cannot be negative or empty"
 msgstr "kan niet negatief of leeg zijn"
 
@@ -6923,15 +7491,23 @@ msgstr "Toegang tot het systeem"
 msgid "Probability"
 msgstr "Waarschijnlijkheid"
 
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:139
-msgid "Report data"
-msgstr "Rapport gegevens"
+#: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:83
+msgid "Overtime"
+msgstr "Overwerk"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:422
+msgid "Select connector"
+msgstr "Kies connector"
 
 #: 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"
 
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:139
+msgid "Report data"
+msgstr "Rapport gegevens"
+
 #: libreplan-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:44
 msgid "External load"
 msgstr "Externe belasting"
@@ -6940,6 +7516,10 @@ msgstr "Externe belasting"
 msgid "Progress sent successfully"
 msgstr "Voortgang succesvol verzonden"
 
+#: libreplan-webapp/src/main/java/org/libreplan/importers/ImportRosterFromTim.java:165
+msgid "Import roster for department {0}"
+msgstr "Importeer rooster van afdeling {0}"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerModel.java:416
 msgid ""
 "Please, allow Multiple Active Criteria in this type in order to use selected"
@@ -6963,19 +7543,38 @@ msgstr "Oneindig overmatig toekenbaar"
 msgid "Money spent"
 msgstr "Uitgegeven geld"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:856
 #: 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/workreports/WorkReportCRUDController.java:856
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:31
-#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:49
-#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:79
-#: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:27
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:31
+#: libreplan-webapp/src/main/webapp/myaccount/_expensesArea.zul:31
+#: libreplan-webapp/src/main/webapp/myaccount/_myTasksArea.zul:29
+#: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:37
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:45
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:50
+#: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:38
+#: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:42
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:71
+#: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:26
+#: libreplan-webapp/src/main/webapp/typeofworkhours/_editTypeOfWorkHours.zul:40
+#: libreplan-webapp/src/main/webapp/typeofworkhours/_listTypesOfWorkHours.zul:26
 #: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:38
-#: libreplan-webapp/src/main/webapp/materials/materials.zul:61
-#: libreplan-webapp/src/main/webapp/materials/materials.zul:82
 #: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:52
 #: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:76
 #: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:173
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:97
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:88
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:118
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:93
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:54
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:201
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:276
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:61
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:82
+#: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:27
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:49
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:79
+#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:28
 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:67
 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:158
 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:54
@@ -6984,31 +7583,12 @@ msgstr "Uitgegeven geld"
 #: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:51
 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:40
 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:78
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:93
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:88
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:118
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:97
-#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:28
-#: libreplan-webapp/src/main/webapp/myaccount/_expensesArea.zul:31
-#: libreplan-webapp/src/main/webapp/myaccount/_myTasksArea.zul:29
-#: libreplan-webapp/src/main/webapp/unittypes/_editUnitType.zul:37
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:54
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:201
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:276
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:50
-#: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:38
-#: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:37
-#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:45
-#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:71
-#: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:26
-#: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:42
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:109
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:85
 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:48
 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:26
-#: libreplan-webapp/src/main/webapp/orders/_edition.zul:83
 #: libreplan-webapp/src/main/webapp/orders/_list.zul:29
-#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:109
-#: libreplan-webapp/src/main/webapp/typeofworkhours/_listTypesOfWorkHours.zul:26
-#: libreplan-webapp/src/main/webapp/typeofworkhours/_editTypeOfWorkHours.zul:40
+#: libreplan-webapp/src/main/webapp/unittypes/_editUnitType.zul:37
 msgid "Code"
 msgstr "Code"
 
@@ -7023,15 +7603,15 @@ msgid ""
 "contains Progress Consolidations values"
 msgstr "Voortgangstoekenning kan niet worden verwijderd of gewijzigd. De voortgangstoekenning bevat voortgangsconsolidaties"
 
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:70
-msgid "Assignation type"
-msgstr "Assignation type"
-
 #: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:33
 msgid "Show resource assignments"
 msgstr "Toon resource toewijzingen"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:369
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:70
+msgid "Assignation type"
+msgstr "Assignation type"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:390
 msgid "Calculate Workable Days"
 msgstr "Bereken werkbare dagen"
 
@@ -7039,16 +7619,17 @@ msgstr "Bereken werkbare dagen"
 msgid "unit name not specified"
 msgstr "unitnaam niet gespecificeerd"
 
-#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:81
-#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:42
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:94
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:53
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:119
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:55
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:98
 #: libreplan-webapp/src/main/webapp/myaccount/_myTasksArea.zul:33
 #: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:37
+#: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:56
 #: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:54
+#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:42
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:55
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:98
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:53
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:119
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:94
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:81
 msgid "Start date"
 msgstr "Startdatum"
 
@@ -7063,17 +7644,13 @@ msgstr "Handeling kan niet ongedaan gemaakt worden"
 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeComponent.java:90
 #: 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:54
+#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:82
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:170
 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:65
-#: libreplan-webapp/src/main/webapp/orders/_edition.zul:168
 msgid "Budget"
 msgstr "Budget"
 
-#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:38
-msgid "Unit name"
-msgstr "Naam eenheid"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:750
 msgid "Progress that are reported by quality forms cannot be modified"
 msgstr "De voortgang die is gerapporteerd door kwaliteitsformuliere kan niet worden aangepast"
@@ -7082,15 +7659,19 @@ msgstr "De voortgang die is gerapporteerd door kwaliteitsformuliere kan niet wor
 msgid "LibrePlan: Main Settings"
 msgstr "LibrePlan: Basis Instellingen"
 
+#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:38
+msgid "Unit name"
+msgstr "Naam eenheid"
+
 #: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLabelTypeAssigment.java:64
 msgid "default label not specified"
 msgstr "standaard label niet gespecificeerd"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementBandboxFinder.java:51
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderBandboxFinder.java:44
-#: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:35
 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:50
 #: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:44
+#: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:35
 msgid "Project code"
 msgstr "Projectcode"
 
@@ -7099,18 +7680,33 @@ msgstr "Projectcode"
 msgid "Write"
 msgstr "Schrijf"
 
-#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:39
-msgid "Number of applications"
-msgstr "Aantal applicaties"
-
 #: 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/importers/JiraTimesheetSynchronizer.java:323
+#: libreplan-webapp/src/main/java/org/libreplan/importers/JiraOrderElementSynchronizer.java:105
+#: libreplan-webapp/src/main/java/org/libreplan/importers/JiraOrderElementSynchronizer.java:127
+#: libreplan-webapp/src/main/java/org/libreplan/importers/JiraOrderElementSynchronizer.java:507
+msgid "JIRA connector not found"
+msgstr "JIRA-connector niet gevonden"
+
+#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:39
+msgid "Number of applications"
+msgstr "Aantal applicaties"
+
+#: libreplan-webapp/src/main/webapp/orders/components/_timOrderTimesheetSync.zul:41
+msgid "Tim product code"
+msgstr "Tim productcode"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:427
 msgid "Confirm worker edition"
 msgstr "Bevestig wijzigen werker"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/JiraSynchronizationController.java:302
+msgid "Start sync"
+msgstr "Start sync"
+
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:74
 msgid "type"
 msgstr "type"
@@ -7121,53 +7717,53 @@ msgstr "type"
 msgid "Normal"
 msgstr "Normaal"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:398
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:403
 #: libreplan-webapp/src/main/webapp/common/configuration.zul:36
-#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:65
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:66
 msgid "Main Settings"
 msgstr "Basis Instellingen"
 
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:112
+msgid "Project view"
+msgstr "Project view"
+
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:106
 msgid "Task Code"
 msgstr "Taakcode"
 
-#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:111
-msgid "Project view"
-msgstr "Project view"
-
 #: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:51
 #: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:53
 #: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:55
 msgid "Probability %"
 msgstr "Waarschijnlijkheid %"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:712
-#: 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/resources/criterions/_criterionsTree.zul:28
+#: libreplan-webapp/src/main/webapp/resources/_criterions.zul:27
+msgid "New criterion"
+msgstr "Nieuw criterium"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:352
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:736
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:965
 #: libreplan-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:49
 msgid "Load"
 msgstr "Belasting"
 
-#: libreplan-webapp/src/main/webapp/resources/_criterions.zul:27
-#: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:28
-msgid "New criterion"
-msgstr "Nieuw criterium"
-
-#: 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
-#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:43
-#: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:37
-#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:49
-#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:77
-#: libreplan-webapp/src/main/webapp/templates/_listTemplates.zul:31
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:719
 #: libreplan-webapp/src/main/webapp/myaccount/_expensesArea.zul:29
 #: 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
+#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:54
+#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:87
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:83
+#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:77
+#: libreplan-webapp/src/main/webapp/templates/_listTemplates.zul:31
+#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:43
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:100
 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:59
-#: libreplan-webapp/src/main/webapp/orders/_edition.zul:98
+#: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:37
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:49
 msgid "Description"
 msgstr "Omschrijving"
 
@@ -7180,12 +7776,12 @@ msgstr "Resource: {0}"
 msgid "Apply"
 msgstr "Toepassen"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:969
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:983
 msgid "Do you want to remove bound user \"{0}\" too?"
 msgstr "Wilt u de daaraan gekoppelde gebruiker \"{0}\" ook verwijderen?"
 
-#: libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul:52
 #: libreplan-webapp/src/main/webapp/subcontract/subcontractorCommunications.zul:52
+#: libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul:52
 msgid "Communication Type"
 msgstr "Communicatietype"
 
@@ -7193,7 +7789,7 @@ msgstr "Communicatietype"
 msgid "Selected node"
 msgstr "Selecteer node"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:678
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:682
 msgid "already exists an allocation for criteria {0}"
 msgstr "er bestaat al een toekenning voor criterium {0}"
 
@@ -7201,11 +7797,11 @@ msgstr "er bestaat al een toekenning voor criterium {0}"
 msgid "Code cannot be empty."
 msgstr "Code mag niet leeg zijn."
 
-#: libreplan-webapp/src/main/webapp/orders/_edition.zul:216
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:218
 msgid "Project type"
 msgstr "Projecttype"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:310
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:407
 msgid "Forward"
 msgstr "Vooruit"
 
@@ -7213,25 +7809,13 @@ msgstr "Vooruit"
 msgid "Invalid date. Date must be unique for this Progress Assignment"
 msgstr "Ongeldige datum. Datum moet uniek zijn voor deze voortgangstoekenning"
 
-#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:43
-msgid "Number of finished applications"
-msgstr "Aantal afgeronde applicaties"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:469
 msgid "Invalid queue element"
 msgstr "Ongeldig queue element"
 
-#: 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: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"
+#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:43
+msgid "Number of finished applications"
+msgstr "Aantal afgeronde applicaties"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:403
 msgid "At least one HoursGroup is needed"
@@ -7245,6 +7829,12 @@ msgstr "Minimaal één UrenGroep is nodig"
 msgid "User"
 msgstr "Gebruiker"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:237
+#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:264
+#: libreplan-webapp/src/main/webapp/myaccount/_personalTimesheetsArea.zul:35
+msgid "Number of tasks"
+msgstr "Aantal taken"
+
 #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:71
 msgid "Interacts with applications"
 msgstr "Interacteert met applicaties"
@@ -7270,42 +7860,42 @@ msgstr "Meerdere waarden per resource"
 msgid "Split"
 msgstr "Splits"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:443
+#: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java:211
+msgid "Cannot remove the predefined calendar exception day \"{0}\""
+msgstr "Kan de voorgedefinieerde kalender uitzonderingsdag \"{0}\" niet verwijderen"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:455
 msgid "Communications"
 msgstr "Communicatie"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/TimeLineRequiredMaterialController.java:106
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:110
 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:100
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:110
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/TimeLineRequiredMaterialController.java:106
 msgid "please, select a project"
 msgstr "Kies aub een project"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java:200
-msgid "Cannot remove the predefined calendar exception day \"{0}\""
-msgstr "Kan de voorgedefinieerde kalender uitzonderingsdag \"{0}\" niet verwijderen"
-
 #: libreplan-webapp/src/main/webapp/common/layout/login.zul:123
 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:178
+#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:179
 msgid "Task deadline violations"
 msgstr "Taak deadline overschrijdingen"
 
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:53
+#: libreplan-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:25
 #: libreplan-webapp/src/main/webapp/resources/worker/_localizations.zul:33
 #: libreplan-webapp/src/main/webapp/resources/worker/_localizations.zul:68
-#: libreplan-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:25
 #: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:28
 #: libreplan-webapp/src/main/webapp/resources/_criterions.zul:41
-#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:58
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:53
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:129
 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:45
-#: libreplan-webapp/src/main/webapp/orders/_edition.zul:127
+#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:58
 #: libreplan-webapp/src/main/webapp/orders/_list.zul:30
 msgid "Starting date"
 msgstr "Startdatum"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:913
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:1036
 msgid ""
 "Periocity cannot be changed because there is already any personal timesheet "
 "stored"
@@ -7315,86 +7905,103 @@ msgstr "Periodiciteit kan niet gewijzigd worden omdat er al persoonlijke urensta
 msgid "Add materials"
 msgstr "Toevoegen materialen"
 
+#: libreplan-webapp/src/main/webapp/orders/_timImpExpInfo.zul:25
+msgid "is not completed for the following reasons:"
+msgstr "is niet voltooit om de volgende reden:"
+
+#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/TypeOfWorkHours.java:171
+msgid "type of work hours for JIRA connector cannot be disabled"
+msgstr "type werkuren voor JIRA connector kunnen niet worden uitgezet"
+
 #: 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:940
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:948
 #: 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:148
-#: 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
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:139
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:166
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:137
-msgid "Format"
-msgstr "Formaat"
+#: libreplan-webapp/src/main/java/org/libreplan/importers/JiraTimesheetSynchronizer.java:159
+msgid "Order element \"{0}\" not found"
+msgstr "Order-element \"{0}\" niet gevonden"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:908
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:900
 msgid "New project version"
 msgstr "Nieuwe projectversie"
 
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:66
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:158
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:137
+#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:148
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:190
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:139
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:159
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:196
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:166
+msgid "Format"
+msgstr "Formaat"
+
 #: libreplan-business/src/main/java/org/libreplan/business/labels/entities/LabelType.java:110
 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: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:506
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1229
+#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:79
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/Util.java:656
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:596
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1377
 #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:478
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/Util.java:549
-#: 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: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: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
+#: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:47
 #: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:28
 #: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:40
 #: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:33
 #: libreplan-webapp/src/main/webapp/typeofworkhours/_listTypesOfWorkHours.zul:45
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:26
+#: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:37
+#: libreplan-webapp/src/main/webapp/templates/_listTemplates.zul:46
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:81
+#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:134
+#: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:37
+#: libreplan-webapp/src/main/webapp/common/_editJobScheduling.zul:49
+#: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:37
+#: libreplan-webapp/src/main/webapp/profiles/_listProfiles.zul:36
+#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:26
+#: libreplan-webapp/src/main/webapp/unittypes/_editUnitType.zul:25
+#: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:47
 msgid "Edit"
 msgstr "Wijzig"
 
-#: libreplan-webapp/src/main/webapp/orders/_edition.zul:93
-msgid "Responsible"
-msgstr "Verantwoordelijk"
-
 #: libreplan-webapp/src/main/webapp/common/access_forbidden.zul:43
 msgid "Click the following link to return to home page: "
 msgstr "Klik op de volgende link om op de homepage te komen:"
 
-#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:20
-msgid "LibrePlan: Project Status Report"
-msgstr "LibrePlan: Project statusrapport"
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:95
+msgid "Responsible"
+msgstr "Verantwoordelijk"
 
 #: libreplan-webapp/src/main/webapp/myaccount/changePassword.zul:71
 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/webapp/orders/imports/projectImport.zul:47
+msgid "Gantt charts"
+msgstr "Gantt-grafieken"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetDTO.java:124
 msgid "{0} 2nd fortnight"
 msgstr "{0} 2de twee-weken"
@@ -7412,25 +8019,13 @@ msgstr "Nieuwe gebruiker"
 msgid "New Description"
 msgstr "Nieuwe omschrijving"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:851
-msgid "Done"
-msgstr "Voltooid"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:114
 msgid "Tree {0} sucessfully flattened"
 msgstr "Boomstructuur {0} succesvol afgeplat"
 
-#: libreplan-webapp/src/main/webapp/materials/materials.zul:84
-#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:31
-#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:31
-#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:112
-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:1286
-msgid "Not enough permissions to create templates"
-msgstr "Niet genoeg rechten voor het maken van sjablonen"
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:851
+msgid "Done"
+msgstr "Voltooid"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1347
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1369
@@ -7438,18 +8033,30 @@ msgid ""
 "Invalid value. Value must be greater than the value of previous progress."
 msgstr "Ongeldige waarde.Waarde moet hoger zijn dan de waarde van de vorige voortgang."
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:342
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1434
+msgid "Not enough permissions to create templates"
+msgstr "Niet genoeg rechten voor het maken van sjablonen"
+
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:84
+#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:31
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:112
+#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:31
+msgid "Unit price"
+msgstr "Eenheidsprijs"
+
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:109
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:126
 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:48
-#: libreplan-webapp/src/main/webapp/orders/_edition.zul:250
-#: libreplan-webapp/src/main/webapp/orders/_edition.zul:278
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:252
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:280
 msgid "Communication date"
 msgstr "Communicatiedatum"
 
-#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:102
 #: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:66
-#: libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul:55
 #: libreplan-webapp/src/main/webapp/subcontract/subcontractorCommunications.zul:55
+#: libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul:55
+#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:102
 msgid "Project Code"
 msgstr "Projectcode"
 
@@ -7457,7 +8064,14 @@ msgstr "Projectcode"
 msgid "Reassigning"
 msgstr "opnieuw toewijzen"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:651
+#: libreplan-webapp/src/main/webapp/orders/imports/projectImport.zul:39
+msgid ""
+"The imported data are Gantt projects with their tasks, constraints, "
+"dependencies and milestones and there is also the option to upload "
+"calendars."
+msgstr "De geimporteerde data zijn Gantt-projecten met hun taken, begrenzingen, afhankelijkheden en milestones en er is tevens de optie om kalenders te uploaden."
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:655
 msgid "{0} already assigned to resource allocation list"
 msgstr "{0} reeds toegekend aan resource toekenninslijst"
 
@@ -7469,55 +8083,55 @@ msgstr "Niet gereviewed"
 msgid "Label Types List"
 msgstr "Label types lijst"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:72
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:73
 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/CriterionBandboxFinder.java:44
 #: 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
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/CriterionBandboxFinder.java:44
-#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:61
+#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:46
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:68
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:83
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:44
+#: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:27
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:33
 #: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:56
 #: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:91
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:97
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:138
+#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:86
+#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:126
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:85
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:126
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:168
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:97
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:138
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:135
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:176
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:105
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:146
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:47
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:113
+#: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:49
+#: libreplan-webapp/src/main/webapp/templates/_listTemplates.zul:25
+#: libreplan-webapp/src/main/webapp/templates/_advances.zul:36
 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:154
 #: 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
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:33
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:97
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:138
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:97
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:138
-#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:86
-#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:126
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:135
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:176
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:85
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:126
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:168
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:105
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:146
-#: libreplan-webapp/src/main/webapp/templates/_listTemplates.zul:25
-#: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:49
-#: libreplan-webapp/src/main/webapp/templates/_advances.zul:36
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:47
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:113
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:83
-#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:68
-#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:44
-#: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:27
-#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:46
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:42
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:48
 #: libreplan-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:28
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:47
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:153
-#: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:48
-#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:42
+#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:62
 msgid "Type"
 msgstr "Type"
 
-#: libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul:43
 #: libreplan-webapp/src/main/webapp/subcontract/subcontractorCommunications.zul:43
+#: libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul:43
 msgid "Refresh"
 msgstr "Verversen"
 
@@ -7527,11 +8141,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:508
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:520
 msgid "Home"
 msgstr "Home"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:114
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:115
 msgid "Enable/Disable"
 msgstr "Aan-/uitschakelen"
 
@@ -7543,7 +8157,7 @@ msgstr "Bedrijfswachtwoord"
 msgid "BCWS"
 msgstr "BCWS"
 
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1144
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1146
 msgid "criterion satisfaction codes must be unique inside a resource"
 msgstr "criterium satisfaction codes moeten uniek zijn binnen een resource"
 
@@ -7556,8 +8170,8 @@ msgstr "Dit voortgangstype kan niet gewijzigd worden"
 msgid "percentage should be between 1 and 100"
 msgstr "percentage moet tussen 1 en 100 liggen"
 
-#: libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul:57
 #: libreplan-webapp/src/main/webapp/subcontract/subcontractorCommunications.zul:57
+#: libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul:57
 msgid "Communication Date"
 msgstr "Communicatiedatum"
 
@@ -7565,8 +8179,8 @@ msgstr "Communicatiedatum"
 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
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:1023
 msgid "no"
 msgstr "nee"
 
@@ -7580,20 +8194,20 @@ msgstr "Alle machine werkopdrachten moeten een startdatum hebben voor de einddat
 msgid "Task name (Task code)"
 msgstr "Taaknaam (Taakcode)"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementFilterEnum.java:36
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:30
-#: 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/ResourceFilterEnum.java:29
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceAllocationFilterEnum.java:30
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:30
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskElementFilterEnum.java:34
-msgid "Criterion"
-msgstr "Criterium"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:656
 msgid "Edit Timesheet"
 msgstr "Wijzig Urenstaat"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskElementFilterEnum.java:34
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceFilterEnum.java:29
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:30
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceAllocationFilterEnum.java:30
+#: 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/TaskGroupFilterEnum.java:30
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementFilterEnum.java:36
+msgid "Criterion"
+msgstr "Criterium"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:104
 msgid "unl"
 msgstr "unl"
@@ -7602,23 +8216,24 @@ msgstr "unl"
 msgid "Please select a worker"
 msgstr "Kies aub een werker"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:329
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:330
 msgid "Test LDAP connection"
 msgstr "Test LDAP verbinding"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:134
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:135
 msgid "Generate code for"
 msgstr "Genereer code voor"
 
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionType.java:116
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/BaseCalendar.java:160
 #: libreplan-business/src/main/java/org/libreplan/business/labels/entities/Label.java:44
 #: libreplan-business/src/main/java/org/libreplan/business/labels/entities/LabelType.java:50
-#: libreplan-business/src/main/java/org/libreplan/business/scenarios/entities/Scenario.java:114
-#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:193
-#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/TypeOfWorkHours.java:94
 #: libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderElementTemplate.java:373
-#: 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:533
+#: libreplan-business/src/main/java/org/libreplan/business/common/entities/Connector.java:70
+#: libreplan-business/src/main/java/org/libreplan/business/scenarios/entities/Scenario.java:114
+#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/TypeOfWorkHours.java:97
+#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:193
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:534
 msgid "name not specified"
 msgstr "naam niet gespecificeerd"
 
@@ -7626,8 +8241,8 @@ msgstr "naam niet gespecificeerd"
 msgid "Queue-based resource allocation"
 msgstr "Wachtrij-gebaseerde resource allocatie"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioCRUDController.java:225
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateController.java:121
+#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioCRUDController.java:225
 msgid "error doing reassignment: {0}"
 msgstr "fout bij uitvoeren hertoekenning: {0}"
 
@@ -7640,30 +8255,30 @@ msgstr "Daadwerkelijk Kosten Werk verricht"
 msgid "Queue-based Resources Planning"
 msgstr "Wachtrij-gebaseerde Resource Planning"
 
-#: 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/webapp/myaccount/personalTimesheet.zul:56
 msgid "Previous"
 msgstr "Vorige"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:436
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:147
+msgid "Create project from Template"
+msgstr "Maak project vanuit sjabloon"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1253
+msgid "Values already sent to the customer. Values cannot be changed "
+msgstr "Waardes reeds naar de klant gezonden.Waardes kunnen niet worden gewijzigd"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:498
 msgid ""
 "Value is not valid.\n"
 " Code cannot contain chars like '_' \n"
 " and should not be empty"
 msgstr "Waarde is niet geldig.\nCode kan geen letters bevatten zoals '_'\nen mag niet leeg zijn"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1253
-msgid "Values already sent to the customer. Values cannot be changed "
-msgstr "Waardes reeds naar de klant gezonden.Waardes kunnen niet worden gewijzigd"
-
 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/OrderAuthorization.java:43
 msgid "an authorization type must be set"
 msgstr "een autorisatietype moet worden ingesteld"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:869
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1009
 msgid ""
 "This project is a subcontracted project. If you delete it, you won't be able"
 " to report progress anymore. Are you sure?"
@@ -7673,42 +8288,48 @@ msgstr "Dit project is een onderaangenomen project. Als u het verwijderd kunt u
 msgid "Percentage of estimated budget in money / money spent"
 msgstr "Percentage van geschat budget in uitgegeven geld/geld "
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:907
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:899
 msgid ""
 "Confirm creating a new project version for this scenario and derived. Are "
 "you sure?"
 msgstr "Bevestig het maken van een nieuwe projectversie voor dit scenario en afgeleiden. Weet u het zeker?"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:156
-#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:72
-#: libreplan-webapp/src/main/webapp/materials/materials.zul:47
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:97
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:59
+#: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:30
+#: libreplan-webapp/src/main/webapp/resources/_criterions.zul:29
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:66
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:59
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:97
 #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:86
 #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:127
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:86
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:127
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:86
 #: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:75
 #: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:115
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:82
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:124
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:165
 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:75
 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:107
 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:157
 #: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:107
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:86
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:127
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:82
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:124
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:165
 #: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:94
 #: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:135
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:86
-#: libreplan-webapp/src/main/webapp/resources/_criterions.zul:29
-#: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:30
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:47
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:72
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:270
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:35
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:166
-#: libreplan-webapp/src/main/webapp/orders/_edition.zul:268
 msgid "Add"
 msgstr "Toevoegen"
 
+#: libreplan-webapp/src/main/webapp/orders/_jiraSyncInfo.zul:26
+msgid ""
+"Synchronization order elements with JIRA issues was not completed for the "
+"following reasons:"
+msgstr "Synchronisatie van orderelementen met JIRA issues is niet voltooid om de volgende redenen:"
+
 #: libreplan-webapp/src/main/webapp/common/error.zul:48
 #: libreplan-webapp/src/main/webapp/common/event_error.zul:43
 msgid "Stacktrace"
@@ -7718,33 +8339,33 @@ msgstr "Stacktrace"
 msgid "timesheet template name is already being used"
 msgstr "urenstaatsjabloonnaam is reeds in gebruik"
 
-#: libreplan-webapp/src/main/webapp/materials/materials.zul:50
 #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:122
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:50
 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:43
 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:79
 msgid "Unselect"
 msgstr "Deselecteer"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:284
-msgid "Queue-based Resources"
-msgstr "Wachtrij-gebaseerde resources"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:1084
-msgid "Hours Group at {0}"
-msgstr "Urengroep op {0}"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:103
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:46
 #: libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul:54
-#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:64
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:134
 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:52
-#: libreplan-webapp/src/main/webapp/orders/_edition.zul:132
+#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:64
 #: libreplan-webapp/src/main/webapp/orders/_list.zul:31
 msgid "Deadline"
 msgstr "Deadline"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:241
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:284
+msgid "Queue-based Resources"
+msgstr "Wachtrij-gebaseerde resources"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:1076
+msgid "Hours Group at {0}"
+msgstr "Urengroep op {0}"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:216
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:241
 msgid "Invalid Start Date. New Start Date must be earlier than End Date"
 msgstr "Ongeldige startdatum. Nieuwe startdatum moet voor de einddatum liggen"
 
@@ -7769,17 +8390,17 @@ msgstr "Machine gegevens"
 msgid "VAC"
 msgstr "VAC"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/AdvancedAllocationTabCreator.java:156
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/AdvancedAllocationTabCreator.java:236
+msgid "Advanced Allocation"
+msgstr "Gevorderd toekennen"
+
 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:29
 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:34
 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:55
 msgid "Label type"
 msgstr "Labeltype"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/AdvancedAllocationTabCreator.java:156
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/AdvancedAllocationTabCreator.java:236
-msgid "Advanced Allocation"
-msgstr "Gevorderd toekennen"
-
 #: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:93
 msgid "Number of iterations"
 msgstr "Aantal iteraties"
@@ -7792,7 +8413,7 @@ msgstr "labeltype: de urenstaat heeft niet dit labeltype toegekend"
 msgid "Template Tree"
 msgstr "Sjabloon boomstructuur"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:449
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:470
 #: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:35
 msgid "Alpha"
 msgstr "Alpha"
@@ -7809,55 +8430,66 @@ msgstr "Laatste communicatie"
 msgid "effort is not properly calculated based on clock"
 msgstr "inspanning is niet correct berekent gebaseerd op de klok"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:322
+msgid "from {0}"
+msgstr "van {0}"
+
 #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:65
 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:33
 msgid "Status"
 msgstr "Status"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:322
-msgid "from {0}"
-msgstr "van {0}"
-
-#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:114
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:115
 msgid "Resource load view"
 msgstr "Resource belasting view"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:843
-#: 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
-#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:114
-#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:72
-#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:81
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:34
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:72
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:54
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:82
-#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:154
-#: libreplan-webapp/src/main/webapp/orders/_list.zul:34
-#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:36
-#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:35
-#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:37
-msgid "Hours"
-msgstr "Uren"
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/JiraSynchronizationController.java:205
+msgid "No JIRA issues to import"
+msgstr "Geen JIRA issues om te importeren"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:606
 msgid "Could not save the new calendar"
 msgstr "Kon de nieuwe kalender niet opslaan"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeComponent.java:81
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:843
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/EffortDurationPicker.java:62
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:70
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:82
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:72
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:34
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:54
+#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:72
+#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:81
+#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:114
+#: libreplan-webapp/src/main/webapp/common/_editJobScheduling.zul:111
+#: libreplan-webapp/src/main/webapp/common/_editJobScheduling.zul:146
+#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:36
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:35
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:154
+#: libreplan-webapp/src/main/webapp/orders/_list.zul:34
+#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:37
+msgid "Hours"
+msgstr "Uren"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:320
+msgid "{0} \"{1}\" deleted"
+msgstr "{0} \"{1}\" verwijderd"
+
 #: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:56
 msgid "Quality form type"
 msgstr "Kwaliteitsformuliertype"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:318
-msgid "{0} \"{1}\" deleted"
-msgstr "{0} \"{1}\" verwijderd"
-
 #: 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:262
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:419
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:69
+msgid "Job Scheduling"
+msgstr "Taakplanning"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:263
 msgid ""
 "% Deviation interval (difference % between consumed and estimated hours)"
 msgstr "% Deviatie interval (procentueel verschil tussen verbruikte en geschatte uren)"
@@ -7875,7 +8507,7 @@ msgstr "WerkerID mag niet leeg zijn"
 msgid "All project tasks"
 msgstr "Alle project taken"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:410
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:411
 msgid "LDAP Roles (separated by ;)"
 msgstr "LDAP Rollen (gescheiden door ;)"
 
@@ -7884,7 +8516,7 @@ msgstr "LDAP Rollen (gescheiden door ;)"
 msgid "Allocation configuration"
 msgstr "Toekenningsconfiguratie"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:732
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:876
 msgid ""
 "You cannot remove the task \"{0}\" because it is the only child of its "
 "parent and its parent has tracked time or imputed expenses"
@@ -7894,8 +8526,8 @@ msgstr "U kunt taak \"{0}\" niet verwijderen omdat het de enige afgeleide is en
 msgid "Subcontract price"
 msgstr "Onderaanneem prijs"
 
-#: 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
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:446
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:73
 msgid "Send To Customers"
 msgstr "Stuur naar klanten"
 
@@ -7908,24 +8540,24 @@ 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:1134
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1141
 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/workreports/workReport.zul:38
-msgid "Timesheets List"
-msgstr "Urenstaatlijst"
+#: 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/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/workreports/workReport.zul:38
+msgid "Timesheets List"
+msgstr "Urenstaatlijst"
+
 #: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:31
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:32
 msgid "Assigned criteria"
 msgstr "Toegewezen criteria"
 
@@ -7954,50 +8586,51 @@ msgid "Could not save the scenario"
 msgstr "Kon het scenario niet opslaan"
 
 #: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:36
-#: libreplan-webapp/src/main/webapp/orders/_orderFilter.zul:33
 #: libreplan-webapp/src/main/webapp/orders/_orderFilter.zul:35
+#: libreplan-webapp/src/main/webapp/orders/_orderFilter.zul:37
 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:487
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:39
-msgid "Task Scheduling Status In Project"
-msgstr "Taak planning status in project"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:768
 msgid ""
 "Subcontractor values are read only because they were reported by the "
 "subcontractor company"
 msgstr "Onderaannemer waardes zijn alleen-lezen omdat ze zijn gerapporteerd door het onderaannemersbedrijf"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:499
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:39
+msgid "Task Scheduling Status In Project"
+msgstr "Taak planning status in project"
+
 #: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/ExternalCompany.java:149
 msgid "company name must be unique. Company name already used"
 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:870
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:313
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:315
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/ExpensesAreaController.java:92
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1010
+#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:162
 msgid "Confirm"
 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: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: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
-#: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:45
 #: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:43
+#: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:45
 #: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:52
 #: libreplan-webapp/src/main/webapp/typeofworkhours/_listTypesOfWorkHours.zul:58
+#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:40
+#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:55
+#: libreplan-webapp/src/main/webapp/calendars/_list.zul:35
+#: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:48
+#: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:56
+#: libreplan-webapp/src/main/webapp/common/_listJobScheduling.zul:34
+#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:38
+#: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:49
+#: libreplan-webapp/src/main/webapp/profiles/_listProfiles.zul:50
+#: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:33
+#: libreplan-webapp/src/main/webapp/unittypes/_listUnitTypes.zul:32
+#: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:58
 msgid "Create"
 msgstr "Maak"
 
@@ -8035,9 +8668,9 @@ msgstr "criteriumcodes moeten uniek zijn binnen een criteriumtype"
 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/common/EffortDurationBox.java:49
 #: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:212
 #: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:288
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/EffortDurationBox.java:49
 msgid "Invalid Effort Duration"
 msgstr "Ongeldige inspanningsduur"
 
@@ -8045,83 +8678,83 @@ msgstr "Ongeldige inspanningsduur"
 msgid "Virtual worker group name must be unique"
 msgstr "Virtueel teamnaam moet uniek zijn"
 
-#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/HourCost.java:96
 #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionSatisfaction.java:193
+#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/HourCost.java:96
 msgid "start date not specified"
 msgstr "startdatum niet gespecificeerd"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:271
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:292
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1165
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1171
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:973
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:324
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:669
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionController.java:408
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractController.java:210
 #: 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/reports/HoursWorkedPerWorkerController.java:270
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:452
+#: 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/materials/MaterialsController.java:271
+#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:292
 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1269
 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1281
 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:341
-#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1158
-#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1164
 #: 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: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: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
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1288
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:389
 #: 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: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/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:389
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1288
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1393
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1828
 #: 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
-#: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:42
-#: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:52
-#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:116
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:107
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:148
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:107
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:148
-#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:96
-#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:136
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:104
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:145
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:186
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:136
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:178
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:129
-#: 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:169
-#: 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: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
 #: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:70
 #: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:118
 #: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:133
+#: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:46
+#: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:52
 #: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:45
+#: libreplan-webapp/src/main/webapp/resources/_criterions.zul:88
+#: libreplan-webapp/src/main/webapp/typeofworkhours/_listTypesOfWorkHours.zul:50
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:107
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:148
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:108
+#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:96
+#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:136
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:136
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:178
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:129
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:107
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:148
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:104
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:145
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:186
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:115
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:156
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:107
+#: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:42
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:99
+#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:57
+#: libreplan-webapp/src/main/webapp/templates/_listTemplates.zul:51
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:87
+#: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:43
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:169
+#: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:42
+#: libreplan-webapp/src/main/webapp/profiles/_listProfiles.zul:41
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:79
 #: libreplan-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:102
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:67
+#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:56
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:91
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:212
-#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:56
-#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:79
-#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:67
-#: libreplan-webapp/src/main/webapp/typeofworkhours/_listTypesOfWorkHours.zul:50
+#: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:52
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:116
 msgid "Delete"
 msgstr "Verwijderen"
 
@@ -8145,77 +8778,45 @@ msgstr "Leverdatum bijwerken"
 msgid "End date update"
 msgstr "Einddatum bijwerken"
 
-#: libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialStatusEnum.java:32
-msgid "RECEIVED"
-msgstr "ONTVANGEN"
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/ResourceEnum.java:32
+msgid "WORKER"
+msgstr "WERKER"
 
-#: libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialStatusEnum.java:33
-msgid "PENDING"
-msgstr "WACHTEND"
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/ResourceEnum.java:33
+msgid "MACHINE"
+msgstr "MACHINE"
 
-#: libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialStatusEnum.java:34
-msgid "ORDERED"
-msgstr "BESTELT"
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:207
+msgid "[generic all machines]"
+msgstr "[generiek alle machines]"
 
-#: libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialStatusEnum.java:35
-msgid "PROCESSING"
-msgstr "PROCESSING"
+#: libreplan-business/src/main/java/org/libreplan/business/planner/limiting/entities/QueuePosition.java:53
+msgid "Hour should be between 0 and 23"
+msgstr "Uren moeten tussen 0 en 23 liggen"
 
-#: libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialStatusEnum.java:36
-msgid "CANCELED"
-msgstr "AFGEBROKEN"
+#: libreplan-business/src/main/java/org/libreplan/business/planner/limiting/entities/LimitingResourceQueueDependency.java:170
+msgid "A queue dependency has to have an origin different from destiny"
+msgstr "Een wachtrij afhankelijkheid heeft een bron nodig die afwijkt van de bestemming"
 
-#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/PositionInWorkReportEnum.java:34
-msgid "heading"
-msgstr "kop"
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:29
+msgid "In progress"
+msgstr "Wordt aan gewerkt"
 
-#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/PositionInWorkReportEnum.java:34
-msgid "line"
-msgstr "regel"
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:30
+msgid "Pending"
+msgstr "Wachtend"
 
-#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/HoursManagementEnum.java:31
-msgid "Number of assigned hours"
-msgstr "Aantal toegewezen uren"
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:31
+msgid "Blocked"
+msgstr "Geblokkeerd"
 
-#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/HoursManagementEnum.java:32
-msgid "Number of hours calculated by clock"
-msgstr "Aantal uren berekent door de klok"
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:32
+msgid "Ready to start"
+msgstr "Klaar om te beginnen"
 
-#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/HoursManagementEnum.java:33
-msgid "Number of assigned hours and time"
-msgstr "Aantal toegekende uren en tijd"
-
-#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityFormType.java:29
-msgid "by percentage"
-msgstr "op percentage"
-
-#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityFormType.java:29
-msgid "by items"
-msgstr "op items"
-
-#: libreplan-business/src/main/java/org/libreplan/business/settings/entities/Language.java:36
-msgid "Use browser language configuration"
-msgstr "Gebruik browser taalconfiguratie"
-
-#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/StretchesFunction.java:410
-msgid "Stretches must sum 100%"
-msgstr "Stretches moeten opgeteld 100% zijn"
-
-#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:76
-msgid "Flat"
-msgstr "Plat"
-
-#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:78
-msgid "Stretches"
-msgstr "Stretches"
-
-#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:79
-msgid "Interpolation"
-msgstr "Interpolatie"
-
-#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:80
-msgid "Sigmoid"
-msgstr "Sigmoid"
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskDeadlineViolationStatusEnum.java:35
+msgid "Deadline violated"
+msgstr "Deadline overtreden"
 
 #: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractState.java:32
 msgid "Pending initial send"
@@ -8237,6 +8838,42 @@ msgstr "Update mislukt"
 msgid "Success sent"
 msgstr "Zenden gelukt"
 
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:31
+msgid "as soon as possible"
+msgstr "zo snel mogelijk"
+
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:38
+msgid "start not earlier than"
+msgstr "start niet eerder dan"
+
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:45
+msgid "start in fixed date"
+msgstr "start op vaste datum"
+
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:57
+msgid "as late as possible"
+msgstr "zo laat mogelijk"
+
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:64
+msgid "finish not later than"
+msgstr "eindig niet later dan"
+
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:76
+msgid "Flat"
+msgstr "Plat"
+
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:78
+msgid "Stretches"
+msgstr "Stretches"
+
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:79
+msgid "Interpolation"
+msgstr "Interpolatie"
+
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:80
+msgid "Sigmoid"
+msgstr "Sigmoid"
+
 #: libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:95
 msgid "There are no days available due to not satisfying the criteria."
 msgstr "Er zijn geen dagen beschikbaar omdat niet aan de criteria wordt voldaan"
@@ -8265,129 +8902,9 @@ msgstr "Resource is niet beschikbaar bij taakstart"
 msgid "Resource is not available according to task's calendar"
 msgstr "Resource is niet beschikbaar volgens de taakkalender"
 
-#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:29
-msgid "In progress"
-msgstr "Wordt aan gewerkt"
-
-#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:30
-msgid "Pending"
-msgstr "Wachtend"
-
-#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:31
-msgid "Blocked"
-msgstr "Geblokkeerd"
-
-#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:32
-msgid "Ready to start"
-msgstr "Klaar om te beginnen"
-
-#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskDeadlineViolationStatusEnum.java:35
-msgid "Deadline violated"
-msgstr "Deadline overtreden"
-
-#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:31
-msgid "as soon as possible"
-msgstr "zo snel mogelijk"
-
-#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:38
-msgid "start not earlier than"
-msgstr "start niet eerder dan"
-
-#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:45
-msgid "start in fixed date"
-msgstr "start op vaste datum"
-
-#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:57
-msgid "as late as possible"
-msgstr "zo laat mogelijk"
-
-#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:64
-msgid "finish not later than"
-msgstr "eindig niet later dan"
-
-#: libreplan-business/src/main/java/org/libreplan/business/planner/limiting/entities/QueuePosition.java:53
-msgid "Hour should be between 0 and 23"
-msgstr "Uren moeten tussen 0 en 23 liggen"
-
-#: libreplan-business/src/main/java/org/libreplan/business/planner/limiting/entities/LimitingResourceQueueDependency.java:170
-msgid "A queue dependency has to have an origin different from destiny"
-msgstr "Een wachtrij afhankelijkheid heeft een bron nodig die afwijkt van de bestemming"
-
-#: libreplan-business/src/main/java/org/libreplan/business/users/entities/OrderAuthorizationType.java:33
-msgid "Read authorization"
-msgstr "Lees authorisatie"
-
-#: libreplan-business/src/main/java/org/libreplan/business/users/entities/OrderAuthorizationType.java:34
-msgid "Write authorization"
-msgstr "Schrijf authorisatie"
-
-#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:37
-msgid "Web service reader"
-msgstr "Web service reader"
-
-#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:38
-msgid "Web service writer"
-msgstr "Web service writer"
-
-#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:39
-msgid "Web service subcontractor operations"
-msgstr "web service onderaannemer operaties"
-
-#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:41
-msgid "Read all projects"
-msgstr "Lees alle projecten"
-
-#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:42
-msgid "Edit all projects"
-msgstr "Bewerk alle projecten"
-
-#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:43
-msgid "Create projects"
-msgstr "Definieer projecten"
-
-#: 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"
-
-#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:75
-msgid "Total Worked Hours By Resource In A Month Report"
-msgstr "Totaal aantal uren gewerkt per resource in een maand rapport"
-
-#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:76
-msgid "Work And Progress Per Project Report"
-msgstr "Werk en voortgang per project rapport"
-
-#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:77
-msgid "Work And Progress Per Task Report"
-msgstr "Werk en Voortgang Per Taak Rapport"
-
-#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:78
-msgid "Estimated/Planned Hours Per Task Report"
-msgstr "Geschatte/Geplande Uren per Taak Rapport"
-
-#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:79
-msgid "Project Costs Report"
-msgstr "Projectkostenrapport"
-
-#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:80
-msgid "Task Scheduling Status In Project Report"
-msgstr "Taakplanningsstatus in Project Rapport"
-
-#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:81
-msgid "Materials Needs At Date Report"
-msgstr "Benodigde materialen op rapportdatum"
-
-#: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:345
-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"
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/StretchesFunction.java:410
+msgid "Stretches must sum 100%"
+msgstr "Stretches moeten opgeteld 100% zijn"
 
 #: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:31
 msgid "red (default)"
@@ -8429,53 +8946,181 @@ msgstr "paars"
 msgid "unlimited"
 msgstr "onbeperkt"
 
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:207
-msgid "[generic all machines]"
-msgstr "[generiek alle machines]"
+#: libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialStatusEnum.java:32
+msgid "RECEIVED"
+msgstr "ONTVANGEN"
 
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/ResourceEnum.java:32
-msgid "WORKER"
-msgstr "WERKER"
+#: libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialStatusEnum.java:33
+msgid "PENDING"
+msgstr "WACHTEND"
 
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/ResourceEnum.java:33
-msgid "MACHINE"
-msgstr "MACHINE"
+#: libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialStatusEnum.java:34
+msgid "ORDERED"
+msgstr "BESTELT"
 
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:33
-msgid "PRE-SALES"
-msgstr "PRE-SALES"
+#: libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialStatusEnum.java:35
+msgid "PROCESSING"
+msgstr "PROCESSING"
 
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:34
-msgid "OFFERED"
-msgstr "GEOFFREERD"
-
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:35
-msgid "OUTSOURCED"
-msgstr "UITBESTEED"
-
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:36
-msgid "ACCEPTED"
-msgstr "GEACCEPTEERD"
-
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:37
-msgid "STARTED"
-msgstr "GESTART"
-
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:38
-msgid "ON HOLD"
-msgstr "ON HOLD"
-
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:39
-msgid "FINISHED"
-msgstr "KLAAR"
-
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:40
-msgid "CANCELLED"
+#: libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialStatusEnum.java:36
+msgid "CANCELED"
 msgstr "AFGEBROKEN"
 
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:41
-msgid "STORED"
-msgstr "OPGESLAGEN"
+#: libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderLineTemplate.java:156
+msgid "Line"
+msgstr "Regel"
+
+#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/HoursManagementEnum.java:31
+msgid "Number of assigned hours"
+msgstr "Aantal toegewezen uren"
+
+#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/HoursManagementEnum.java:32
+msgid "Number of hours calculated by clock"
+msgstr "Aantal uren berekent door de klok"
+
+#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/HoursManagementEnum.java:33
+msgid "Number of assigned hours and time"
+msgstr "Aantal toegekende uren en tijd"
+
+#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/PositionInWorkReportEnum.java:34
+msgid "heading"
+msgstr "kop"
+
+#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/PositionInWorkReportEnum.java:34
+msgid "line"
+msgstr "regel"
+
+#: libreplan-business/src/main/java/org/libreplan/business/common/daos/EntitySequenceDAO.java:82
+msgid "Entity Sequence cannot be deleted. Entity Sequence already in use"
+msgstr "Entiteitssequentie kan niet worden verwijderd. Entitietssequentie reeds in gebruik"
+
+#: 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/PredefinedConnectorProperties.java:34
+msgid "Activated"
+msgstr "Geactiveert"
+
+#: libreplan-business/src/main/java/org/libreplan/business/common/entities/PredefinedConnectorProperties.java:35
+msgid "Server URL"
+msgstr "Server URL"
+
+#: libreplan-business/src/main/java/org/libreplan/business/common/entities/PredefinedConnectorProperties.java:40
+msgid "Number of days timesheet to Tim"
+msgstr "Aantal urenstaatdagen naar Tim"
+
+#: libreplan-business/src/main/java/org/libreplan/business/common/entities/PredefinedConnectorProperties.java:41
+msgid "Number of days roster from Tim"
+msgstr "Aantal roosterdagen van Tim"
+
+#: libreplan-business/src/main/java/org/libreplan/business/common/entities/PredefinedConnectorProperties.java:42
+msgid "Productivity factor"
+msgstr "Productiviteitsfactor"
+
+#: libreplan-business/src/main/java/org/libreplan/business/common/entities/PredefinedConnectorProperties.java:43
+msgid "Department IDs to import toster"
+msgstr "Afdelingscode voor importeren van rooster"
+
+#: libreplan-business/src/main/java/org/libreplan/business/common/entities/PredefinedConnectorProperties.java:46
+msgid "JIRA labels: comma-separated list of labels or URL"
+msgstr "JIRA labels: kommagescheiden lijst met labels of URL"
+
+#: 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"
+
+#: libreplan-business/src/main/java/org/libreplan/business/common/entities/ProgressType.java:38
+msgid "Progress with critical path tasks by hours"
+msgstr "Voortgang met kritieke pad taken per uur"
+
+#: libreplan-business/src/main/java/org/libreplan/business/common/entities/ProgressType.java:39
+msgid "Progress with critical path tasks by duration"
+msgstr "Voortgang met kritieke pad taken per tijdsduur"
+
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/OrderAuthorizationType.java:33
+msgid "Read authorization"
+msgstr "Lees authorisatie"
+
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/OrderAuthorizationType.java:34
+msgid "Write authorization"
+msgstr "Schrijf authorisatie"
+
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:362
+msgid "Database"
+msgstr "Database"
+
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:362
+msgid "LDAP"
+msgstr "LDAP"
+
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:37
+msgid "Web service reader"
+msgstr "Web service reader"
+
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:38
+msgid "Web service writer"
+msgstr "Web service writer"
+
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:39
+msgid "Web service subcontractor operations"
+msgstr "web service onderaannemer operaties"
+
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:41
+msgid "Read all projects"
+msgstr "Lees alle projecten"
+
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:42
+msgid "Edit all projects"
+msgstr "Bewerk alle projecten"
+
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:43
+msgid "Create projects"
+msgstr "Definieer projecten"
+
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:49
+msgid "Import projects"
+msgstr "Importeer projecten"
+
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:76
+msgid "Hours Worked Per Resource Report"
+msgstr "Uren gewerkt per resource rapport"
+
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:77
+msgid "Total Worked Hours By Resource In A Month Report"
+msgstr "Totaal aantal uren gewerkt per resource in een maand rapport"
+
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:78
+msgid "Work And Progress Per Project Report"
+msgstr "Werk en voortgang per project rapport"
+
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:79
+msgid "Work And Progress Per Task Report"
+msgstr "Werk en Voortgang Per Taak Rapport"
+
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:80
+msgid "Estimated/Planned Hours Per Task Report"
+msgstr "Geschatte/Geplande Uren per Taak Rapport"
+
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:81
+msgid "Project Costs Report"
+msgstr "Projectkostenrapport"
+
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:82
+msgid "Task Scheduling Status In Project Report"
+msgstr "Taakplanningsstatus in Project Rapport"
+
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:83
+msgid "Materials Needs At Date Report"
+msgstr "Benodigde materialen op rapportdatum"
 
 #: libreplan-business/src/main/java/org/libreplan/business/orders/entities/SchedulingState.java:366
 msgid "Fully scheduled"
@@ -8501,52 +9146,72 @@ msgstr "P"
 msgid "U"
 msgstr "U"
 
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:778
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLineGroup.java:1001
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLineGroup.java:1006
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:779
 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:802
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:828
-msgid "Duplicate Progress Assignment For Task"
-msgstr "Duplicaat voortgangs toewijziging voor taak"
-
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:1158
-msgid "Quality form already exists"
-msgstr "kwaliteitsformulier bestaat reeds"
-
 #: libreplan-business/src/main/java/org/libreplan/business/orders/entities/HoursGroup.java:208
 msgid "Total percentage should be less than 100%"
 msgstr "Totaal percentage zou minder dan 100% moeten zijn"
 
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:35
+msgid "PRE-SALES"
+msgstr "PRE-SALES"
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:36
+msgid "OFFERED"
+msgstr "GEOFFREERD"
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:37
+msgid "OUTSOURCED"
+msgstr "UITBESTEED"
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:38
+msgid "ACCEPTED"
+msgstr "GEACCEPTEERD"
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:39
+msgid "STARTED"
+msgstr "GESTART"
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:40
+msgid "ON HOLD"
+msgstr "ON HOLD"
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:41
+msgid "FINISHED"
+msgstr "KLAAR"
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:42
+msgid "CANCELLED"
+msgstr "AFGEBROKEN"
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:43
+msgid "STORED"
+msgstr "OPGESLAGEN"
+
 #: libreplan-business/src/main/java/org/libreplan/business/orders/entities/CriterionRequirementHandler.java:539
 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/orders/entities/OrderElement.java:803
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:829
+msgid "Duplicate Progress Assignment For Task"
+msgstr "Duplicaat voortgangs toewijziging voor taak"
 
-#: 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/orders/entities/OrderElement.java:1159
+msgid "Quality form already exists"
+msgstr "kwaliteitsformulier bestaat reeds"
 
-#: 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/qualityforms/entities/QualityFormType.java:29
+msgid "by percentage"
+msgstr "op percentage"
 
-#: 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"
+#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityFormType.java:29
+msgid "by items"
+msgstr "op items"
 
-#: libreplan-business/src/main/java/org/libreplan/business/common/entities/ProgressType.java:38
-msgid "Progress with critical path tasks by hours"
-msgstr "Voortgang met kritieke pad taken per uur"
-
-#: libreplan-business/src/main/java/org/libreplan/business/common/entities/ProgressType.java:39
-msgid "Progress with critical path tasks by duration"
-msgstr "Voortgang met kritieke pad taken per tijdsduur"
-
-#: libreplan-business/src/main/java/org/libreplan/business/common/daos/EntitySequenceDAO.java:82
-msgid "Entity Sequence cannot be deleted. Entity Sequence already in use"
-msgstr "Entiteitssequentie kan niet worden verwijderd. Entitietssequentie reeds in gebruik"
+#: libreplan-business/src/main/java/org/libreplan/business/settings/entities/Language.java:36
+msgid "Use browser language configuration"
+msgstr "Gebruik browser taalconfiguratie"