diff --git a/AUTHORS.rst b/AUTHORS.rst
index e9d86a08b..f091e560b 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -51,6 +51,7 @@ Translators
   Helena Grosso <lenagrosso@gmail.com>,
   Joaquim Rocha <jrocha@igalia.com>
 * [ru] Pavel Rudensky <prudensky@gmail.com>
+* [zh] Swanson Chan <lacidophilin@yahoo.com>
 
 
 Contributors
diff --git a/doc/src/user/en/20-acerca-de.rst b/doc/src/user/en/20-acerca-de.rst
index cea2bc0a1..c29685c6a 100644
--- a/doc/src/user/en/20-acerca-de.rst
+++ b/doc/src/user/en/20-acerca-de.rst
@@ -86,6 +86,7 @@ Translators
   Helena Grosso <lenagrosso@gmail.com>,
   Joaquim Rocha <jrocha@igalia.com>
 * [ru] Pavel Rudensky <prudensky@gmail.com>
+* [zh] Swanson Chan <lacidophilin@yahoo.com>
 
 Contributors
 ------------
diff --git a/doc/src/user/es/20-acerca-de.rst b/doc/src/user/es/20-acerca-de.rst
index c7cc052a3..cfc313b92 100644
--- a/doc/src/user/es/20-acerca-de.rst
+++ b/doc/src/user/es/20-acerca-de.rst
@@ -86,6 +86,7 @@ Traductores
   Helena Grosso <lenagrosso@gmail.com>,
   Joaquim Rocha <jrocha@igalia.com>
 * [ru] Pavel Rudensky <prudensky@gmail.com>
+* [zh] Swanson Chan <lacidophilin@yahoo.com>
 
 Contribuidores
 --------------
diff --git a/doc/src/user/gl/20-acerca-de.rst b/doc/src/user/gl/20-acerca-de.rst
index 5232ea5bd..74628036b 100644
--- a/doc/src/user/gl/20-acerca-de.rst
+++ b/doc/src/user/gl/20-acerca-de.rst
@@ -86,6 +86,7 @@ Traductores
   Helena Grosso <lenagrosso@gmail.com>,
   Joaquim Rocha <jrocha@igalia.com>
 * [ru] Pavel Rudensky <prudensky@gmail.com>
+* [zh] Swanson Chan <lacidophilin@yahoo.com>
 
 Contribuidores
 --------------
diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java b/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java
index b2d58cb01..199249bd3 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java
@@ -144,8 +144,6 @@ public class Planner extends HtmlMacroComponent  {
 
     private GanttPanel ganttPanel;
 
-    private boolean fixedZoomByUser = false;
-
     private List<? extends CommandContextualized<?>> contextualizedGlobalCommands;
 
     private CommandContextualized<?> goingDownInLastArrowCommand;
@@ -174,7 +172,7 @@ public class Planner extends HtmlMacroComponent  {
 
     private boolean isFlattenTree = false;
 
-    private ZoomLevel initialZoomLevel = null;
+    private ZoomLevel zoomLevel = null;
 
     private Listbox listZoomLevels = null;
 
@@ -276,8 +274,7 @@ public class Planner extends HtmlMacroComponent  {
         if (ganttPanel == null) {
             return;
         }
-        this.fixedZoomByUser = true;
-        initialZoomLevel = zoomLevel;
+        this.zoomLevel = zoomLevel;
         ganttPanel.setZoomLevel(zoomLevel, scrollLeft);
     }
 
@@ -732,22 +729,14 @@ public class Planner extends HtmlMacroComponent  {
 
     public ZoomLevel getZoomLevel() {
         if (ganttPanel == null) {
-            return initialZoomLevel != null ? initialZoomLevel
+            return zoomLevel != null ? zoomLevel
                     : ZoomLevel.DETAIL_ONE;
         }
         return ganttPanel.getTimeTracker().getDetailLevel();
     }
 
-    public boolean isFixedZoomByUser() {
-        return this.fixedZoomByUser;
-    }
-
     public void setInitialZoomLevel(final ZoomLevel zoomLevel) {
-        if (this.initialZoomLevel != null) {
-            // already initialized
-            return;
-        }
-        this.initialZoomLevel = zoomLevel;
+        this.zoomLevel = zoomLevel;
     }
 
     public boolean areContainersExpandedByDefault() {
@@ -821,12 +810,11 @@ public class Planner extends HtmlMacroComponent  {
     }
 
     public void updateSelectedZoomLevel() {
-        if (!isFixedZoomByUser()) {
-            Listitem selectedItem = (Listitem) listZoomLevels.getItems().get(
-                    initialZoomLevel.ordinal());
-            listZoomLevels.setSelectedItem(selectedItem);
-            listZoomLevels.invalidate();
-        }
+        ganttPanel.getTimeTracker().setZoomLevel(zoomLevel);
+        Listitem selectedItem = (Listitem) listZoomLevels.getItems().get(
+                zoomLevel.ordinal());
+        listZoomLevels.setSelectedItem(selectedItem);
+        listZoomLevels.invalidate();
     }
 
     public IContext<?> getContext() {
diff --git a/ganttzk/src/main/resources/i18n/zh.po b/ganttzk/src/main/resources/i18n/zh.po
new file mode 100644
index 000000000..b94b3a81b
--- /dev/null
+++ b/ganttzk/src/main/resources/i18n/zh.po
@@ -0,0 +1,249 @@
+# LibrePlan - GanttZK 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.
+# This file is distributed under the same license as the LibrePlan package.
+#
+# Translators:
+# Swanson Chan <lacidophilin@yahoo.com>, 2013.
+msgid ""
+msgstr ""
+"Project-Id-Version: libreplan-1.3.3\n"
+"Report-Msgid-Bugs-To: http://bugs.libreplan.org/\n"
+"POT-Creation-Date: 2012-12-07 13:59+0100\n"
+"PO-Revision-Date: 2013-03-09 07:49+0000\n"
+"Last-Translator: Swanson Chan <lacidophilin@yahoo.com>\n"
+"Language-Team: 中文\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:216
+#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:235
+msgid "Erase"
+msgstr "抹去"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java:299
+msgid "Add Dependency"
+msgstr "添加依赖关系"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:58
+msgid "Worker"
+msgstr "工人"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:689
+msgid "Show money cost bar"
+msgstr "显示资金成本栏"
+
+#: ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul:29
+msgid "Start"
+msgstr "开始"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:668
+msgid "Show reported hours"
+msgstr "节目报道小时"
+
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:85
+msgid "Show/Hide reported hours"
+msgstr "报告显示/隐藏小时"
+
+#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:35
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:49
+msgid "Zoom"
+msgstr "放大"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:67
+msgid "The specified dependency is not allowed"
+msgstr "不允许指定的依赖"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:255
+msgid "Set End-End"
+msgstr "设置端到端"
+
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:78
+msgid "Show/Hide progress"
+msgstr "显示/隐藏进度"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:58
+msgid "Task"
+msgstr "任务"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:199
+msgid "available effort: {0}, assigned effort: {1}"
+msgstr "可用的努力：{0}，分配的努力：{1}"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:64
+msgid "Criterion"
+msgstr "标准"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:695
+msgid "Hide money cost bar"
+msgstr "隐藏资金成本吧"
+
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:44
+msgid "Print"
+msgstr "打印"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:71
+msgid "Week"
+msgstr "周"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:501
+msgid "filtering by name"
+msgstr "过滤名称"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadLeftPane.java:111
+msgid "See scheduling"
+msgstr "见调度"
+
+#: ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul:30
+msgid "End"
+msgstr "结束"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:89
+msgid "Resources"
+msgstr "资源"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/TimeTracker.java:243
+msgid "changing zoom"
+msgstr "改变变焦"
+
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:91
+msgid "Show/Hide money cost bar"
+msgstr "显示/隐藏资金成本吧"
+
+#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:47
+msgid "Group by"
+msgstr "集团通过"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:90
+msgid "Generic allocation criteria"
+msgstr "通用的分配标准"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:45
+msgid "Quarter"
+msgstr "季"
+
+#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:43
+msgid "Page"
+msgstr "页"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:58
+msgid "None"
+msgstr "无"
+
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:71
+msgid "Flatten/Unflatten tree"
+msgstr "拼合/ Unflatten树的"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:58
+msgid "Project"
+msgstr "项目"
+
+#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:67
+#: ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul:28
+msgid "Name"
+msgstr "名称"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:645
+msgid "Show progress"
+msgstr "显示进度"
+
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:67
+msgid "Expand/Collapse all"
+msgstr "展开/收起所有"
+
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:58
+msgid "Show/Hide critical path"
+msgstr "显示/隐藏关键路径"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:32
+msgid "Year"
+msgstr "年"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:150
+msgid "showing criteria"
+msgstr "显示标准"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:58
+msgid "Month"
+msgstr "月"
+
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:64
+msgid "Show/Hide resources"
+msgstr "显示/隐藏资源"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:247
+msgid "Set End-Start"
+msgstr "设置结束开始"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:309
+msgid "decreasing zoom"
+msgstr "减少变焦"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:625
+msgid "Hide critical path"
+msgstr "隐藏关键路径"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:84
+msgid "Day"
+msgstr "日"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:675
+msgid "Hide reported hours"
+msgstr "隐藏报道小时"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:193
+msgid "Load: {0}%"
+msgstr "负载：{0}％"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:147
+msgid "showing resources"
+msgstr "显示资源"
+
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:61
+msgid "Show/Hide labels"
+msgstr "显示/隐藏标签"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:97
+msgid "Hour"
+msgstr "小时"
+
+#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:90
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:120
+msgid "Graphics"
+msgstr "图像"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:251
+msgid "Set Start-Start"
+msgstr "设置开始启动"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:152
+msgid "See resource allocation"
+msgstr "资源分配"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:292
+msgid "increasing zoom"
+msgstr "增加变焦"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:467
+msgid "Show all elements"
+msgstr "显示所有元素"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:466
+msgid "All"
+msgstr "所有"
+
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:38
+msgid "Refresh"
+msgstr "刷新"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:620
+msgid "Show critical path"
+msgstr "显示关键路径"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:653
+msgid "Hide progress"
+msgstr "隐藏进度"
diff --git a/libreplan-business/src/main/java/org/libreplan/business/labels/entities/Label.java b/libreplan-business/src/main/java/org/libreplan/business/labels/entities/Label.java
index d68a2aa7e..9cb5886e1 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/labels/entities/Label.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/labels/entities/Label.java
@@ -132,4 +132,8 @@ public class Label extends IntegrationEntity implements Comparable<Label> {
         return getTypeAndName().compareToIgnoreCase(o.getTypeAndName());
     }
 
+    public String getFinderPattern() {
+        return String.format("%s ( %s )", name, type.getName());
+    }
+
 }
diff --git a/libreplan-business/src/main/java/org/libreplan/business/orders/daos/IOrderDAO.java b/libreplan-business/src/main/java/org/libreplan/business/orders/daos/IOrderDAO.java
index 1a96f86a8..007ada378 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/orders/daos/IOrderDAO.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/orders/daos/IOrderDAO.java
@@ -26,8 +26,11 @@ import java.util.List;
 
 import org.libreplan.business.common.daos.IIntegrationEntityDAO;
 import org.libreplan.business.common.exceptions.InstanceNotFoundException;
+import org.libreplan.business.externalcompanies.entities.ExternalCompany;
+import org.libreplan.business.labels.entities.Label;
 import org.libreplan.business.orders.entities.Order;
 import org.libreplan.business.orders.entities.OrderElement;
+import org.libreplan.business.orders.entities.OrderStatusEnum;
 import org.libreplan.business.planner.entities.Task;
 import org.libreplan.business.reports.dtos.CostExpenseSheetDTO;
 import org.libreplan.business.reports.dtos.OrderCostsPerResourceDTO;
@@ -79,6 +82,11 @@ public interface IOrderDAO extends IIntegrationEntityDAO<Order> {
     List<Order> getOrdersByReadAuthorizationByScenario(String username,
             Scenario scenario);
 
+    List<Order> getOrdersByReadAuthorizationBetweenDatesByLabelsCriteriaCustomerAndState(
+            String username, Scenario scenario, Date startDate, Date endDate,
+            List<Label> labels, List<Criterion> criteria,
+            ExternalCompany customer, OrderStatusEnum state);
+
     /**
      * Returns the order filtered by the name. If name is blank (whitespace,
      * empty ("") or null, it throws <code>InstanceNotFoundException</code>.
diff --git a/libreplan-business/src/main/java/org/libreplan/business/orders/daos/OrderDAO.java b/libreplan-business/src/main/java/org/libreplan/business/orders/daos/OrderDAO.java
index d90827559..9de3542a0 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/orders/daos/OrderDAO.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/orders/daos/OrderDAO.java
@@ -38,9 +38,12 @@ import org.libreplan.business.common.exceptions.InstanceNotFoundException;
 import org.libreplan.business.costcategories.daos.CostCategoryDAO;
 import org.libreplan.business.costcategories.daos.ITypeOfWorkHoursDAO;
 import org.libreplan.business.costcategories.entities.TypeOfWorkHours;
+import org.libreplan.business.externalcompanies.entities.ExternalCompany;
+import org.libreplan.business.labels.entities.Label;
 import org.libreplan.business.orders.entities.Order;
 import org.libreplan.business.orders.entities.OrderElement;
 import org.libreplan.business.orders.entities.OrderStatusEnum;
+import org.libreplan.business.orders.entities.SchedulingState;
 import org.libreplan.business.planner.daos.ITaskSourceDAO;
 import org.libreplan.business.planner.entities.Task;
 import org.libreplan.business.reports.dtos.CostExpenseSheetDTO;
@@ -214,6 +217,242 @@ public class OrderDAO extends IntegrationEntityDAO<Order> implements
         }
     }
 
+    private List<Order> getOrdersByReadAuthorizationBetweenDatesByLabelsCriteriaCustomerAndState(
+            User user, Date startDate, Date endDate, List<Label> labels,
+            List<Criterion> criteria, ExternalCompany customer,
+            OrderStatusEnum state) {
+        List<Long> ordersIdsFiltered = getOrdersIdsFiltered(user, labels,
+                criteria, customer, state);
+        if (ordersIdsFiltered != null && ordersIdsFiltered.isEmpty()) {
+            return Collections.emptyList();
+        }
+
+        List<Long> ordersIdsByDates = getOrdersIdsByDates(startDate, endDate);
+        if (ordersIdsByDates != null && ordersIdsByDates.isEmpty()) {
+            return Collections.emptyList();
+        }
+
+        List<Long> ordersIdsUnscheduled = getOrdersIdsUnscheduled(startDate,
+                endDate);
+
+        Criteria c = getSession().createCriteria(Order.class);
+        if (ordersIdsFiltered != null && ordersIdsByDates != null) {
+            org.hibernate.criterion.Criterion and = Restrictions.and(
+                    Restrictions.in("id", ordersIdsFiltered),
+                    Restrictions.in("id", ordersIdsByDates));
+            c.add(and);
+        } else {
+            if (ordersIdsFiltered != null) {
+                c.add(Restrictions.in("id", ordersIdsFiltered));
+            }
+            if (ordersIdsByDates != null) {
+                if (ordersIdsUnscheduled.isEmpty()) {
+                    c.add(Restrictions.in("id", ordersIdsByDates));
+                } else {
+                    c.add(Restrictions.or(
+                            Restrictions.in("id", ordersIdsByDates),
+                            Restrictions.in("id", ordersIdsUnscheduled)));
+                }
+            }
+        }
+
+        c.addOrder(org.hibernate.criterion.Order.desc("initDate"));
+        c.addOrder(org.hibernate.criterion.Order.asc("infoComponent.name"));
+        return c.list();
+    }
+
+    private List<Long> getOrdersIdsUnscheduled(Date startDate, Date endDate) {
+        String strQuery = "SELECT s.orderElement.id "
+                + "FROM SchedulingDataForVersion s "
+                + "WHERE s.schedulingStateType = :type";
+        Query query = getSession().createQuery(strQuery);
+        query.setParameter("type", SchedulingState.Type.NO_SCHEDULED);
+
+        List<Long> ordersIdsUnscheduled = query.list();
+        if (ordersIdsUnscheduled.isEmpty()) {
+            return Collections.emptyList();
+        }
+
+        String strQueryDates = "SELECT o.id "
+                + "FROM Order o "
+                + "WHERE o.id IN (:ids) ";
+
+        if (startDate != null) {
+            strQueryDates += "AND o.initDate >= :startDate ";
+        }
+        if (endDate != null) {
+            strQueryDates += "AND o.initDate <= :endDate ";
+        }
+
+        Query queryDates = getSession().createQuery(strQueryDates);
+        if (startDate != null) {
+            queryDates.setParameter("startDate", startDate);
+        }
+        if (endDate != null) {
+            queryDates.setParameter("endDate", endDate);
+        }
+        queryDates.setParameterList("ids", ordersIdsUnscheduled);
+
+        return queryDates.list();
+    }
+
+    /**
+     * If both params are <code>null</code> it returns <code>null</code>.
+     * Otherwise it filters the list of tasks to return the ones wihtout parent
+     * between the dates.
+     */
+    private List<Long> getOrdersIdsByDates(Date startDate, Date endDate) {
+        if (startDate == null && endDate == null) {
+            return null;
+        }
+
+        String strQuery = "SELECT t.taskSource.schedulingData.orderElement.id "
+                + "FROM TaskElement t "
+                + "WHERE t.parent IS NULL ";
+        if (endDate != null) {
+            strQuery += "AND t.startDate.date <= :endDate ";
+        }
+        if (startDate != null) {
+            strQuery += "AND t.endDate.date >= :startDate ";
+        }
+
+        Query query = getSession().createQuery(strQuery);
+        if (startDate != null) {
+            query.setParameter("startDate", LocalDate.fromDateFields(startDate));
+        }
+        if (endDate != null) {
+            query.setParameter("endDate", LocalDate.fromDateFields(endDate));
+        }
+
+        return query.list();
+    }
+
+    /**
+     * If user has permissions over all orders and not filters are passed it
+     * returns <code>null</code>. Otherwise, it returns the list of orders
+     * identifiers for which the user has read permissions and the filters pass.
+     */
+    private List<Long> getOrdersIdsFiltered(User user, List<Label> labels,
+            List<Criterion> criteria, ExternalCompany customer,
+            OrderStatusEnum state) {
+        List<Long> ordersIdsByReadAuthorization = getOrdersIdsByReadAuthorization(user);
+
+        String strQuery = "SELECT o.id ";
+        strQuery += "FROM Order o ";
+
+        String where = "";
+        String whereFinal = "";
+        if (labels != null && !labels.isEmpty()) {
+            for (int i = 0; i < labels.size(); i++) {
+                if (where.isEmpty()) {
+                    where += "WHERE ";
+                } else {
+                    where += "AND ";
+                }
+                where += ":label" + i + " IN elements(o.labels) ";
+            }
+        }
+
+        if (criteria != null && !criteria.isEmpty()) {
+            strQuery += "JOIN o.criterionRequirements cr ";
+            if (where.isEmpty()) {
+                where += "WHERE ";
+            } else {
+                where += "AND ";
+            }
+            where += "cr.criterion IN (:criteria) ";
+            where += "AND cr.class = DirectCriterionRequirement ";
+            whereFinal += "GROUP BY o.id ";
+            whereFinal += "HAVING count(o.id) = :criteriaSize ";
+        }
+
+        if (customer != null) {
+            if (where.isEmpty()) {
+                where += "WHERE ";
+            } else {
+                where += "AND ";
+            }
+            where += "o.customer = :customer ";
+        }
+
+        if (state != null) {
+            if (where.isEmpty()) {
+                where += "WHERE ";
+            } else {
+                where += "AND ";
+            }
+            where += "o.state = :state ";
+        }
+
+        // If not restrictions by labels, criteria, customer or state
+        if (where.isEmpty()) {
+            return ordersIdsByReadAuthorization;
+        }
+
+        if (ordersIdsByReadAuthorization != null
+                && !ordersIdsByReadAuthorization.isEmpty()) {
+            if (where.isEmpty()) {
+                where += "WHERE ";
+            } else {
+                where += "AND ";
+            }
+            where += "o.id IN (:ids) ";
+        }
+
+        strQuery += where + whereFinal;
+        Query query = getSession().createQuery(strQuery);
+        if (labels != null && !labels.isEmpty()) {
+            int i = 0;
+            for (Label label : labels) {
+                query.setParameter("label" + i, label);
+                i++;
+            }
+        }
+        if (criteria != null && !criteria.isEmpty()) {
+            query.setParameterList("criteria", criteria);
+            query.setParameter("criteriaSize", (long) criteria.size());
+        }
+
+        if (customer != null) {
+            query.setParameter("customer", customer);
+        }
+
+        if (state != null) {
+            query.setParameter("state", state);
+        }
+
+        if (ordersIdsByReadAuthorization != null
+                && !ordersIdsByReadAuthorization.isEmpty()) {
+            query.setParameterList("ids", ordersIdsByReadAuthorization);
+        }
+
+        return query.list();
+    }
+
+    /**
+     * If user has permissions over all orders it returns <code>null</code>.
+     * Otherwise, it returns the list of orders identifiers for which the user
+     * has read permissions.
+     */
+    private List<Long> getOrdersIdsByReadAuthorization(User user) {
+        if (user.isInRole(UserRole.ROLE_SUPERUSER)
+                || user.isInRole(UserRole.ROLE_READ_ALL_PROJECTS)
+                || user.isInRole(UserRole.ROLE_EDIT_ALL_PROJECTS)) {
+            return null;
+        } else {
+            String strQuery = "SELECT oa.order.id "
+                    + "FROM OrderAuthorization oa "
+                    + "WHERE oa.user = :user "
+                    + "OR oa.profile IN (:profiles) ";
+
+            Query query = getSession().createQuery(strQuery);
+            query.setParameter("user", user);
+            query.setParameterList("profiles", user.getProfiles());
+
+            return query.list();
+        }
+    }
+
     @Override
     public List<Order> getOrdersByWriteAuthorization(User user) {
         if (user.isInRole(UserRole.ROLE_SUPERUSER)
@@ -278,6 +517,23 @@ public class OrderDAO extends IntegrationEntityDAO<Order> implements
         return existsInScenario(getOrdersByReadAuthorization(user), scenario);
     }
 
+    @Override
+    public List<Order> getOrdersByReadAuthorizationBetweenDatesByLabelsCriteriaCustomerAndState(
+            String username, Scenario scenario, Date startDate, Date endDate,
+            List<Label> labels, List<Criterion> criteria,
+            ExternalCompany customer, OrderStatusEnum state) {
+        User user;
+        try {
+            user = userDAO.findByLoginName(username);
+        } catch (InstanceNotFoundException e) {
+            throw new RuntimeException(e);
+        }
+        return existsInScenario(
+                getOrdersByReadAuthorizationBetweenDatesByLabelsCriteriaCustomerAndState(
+                        user, startDate, endDate, labels, criteria, customer,
+                        state), scenario);
+    }
+
     private List<Order> existsInScenario(List<Order> orders, Scenario scenario) {
         List<Order> result = new ArrayList<Order>();
         for (Order each : orders) {
diff --git a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java
index 2a3b73ca8..367ec5bce 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java
@@ -1689,4 +1689,8 @@ public abstract class OrderElement extends IntegrationEntity implements
         return code.startsWith(PredefinedConnectorProperties.JIRA_CODE_PREFIX);
     }
 
+    public boolean isConvertedToContainer() {
+        return false;
+    }
+
 }
diff --git a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLine.java b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLine.java
index fac42a838..854f3a347 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLine.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLine.java
@@ -88,6 +88,8 @@ public class OrderLine extends OrderElement {
 
     private Integer lastHoursGroupSequenceCode = 0;
 
+    private boolean convertedToContainer = false;
+
     @Override
     public Integer getWorkHours() {
         return hoursGroupOrderLineHandler.calculateTotalHours(hoursGroups);
@@ -156,6 +158,7 @@ public class OrderLine extends OrderElement {
         result.setName(getName());
         setCode("");
         setName("");
+        convertedToContainer = true;
         return result;
     }
 
@@ -392,4 +395,9 @@ public class OrderLine extends OrderElement {
         return budget;
     }
 
+    @Override
+    public boolean isConvertedToContainer() {
+        return convertedToContainer;
+    }
+
 }
diff --git a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java
index 814e817bd..9f9386ef1 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java
@@ -23,6 +23,8 @@ package org.libreplan.business.orders.entities;
 
 import static org.libreplan.business.i18n.I18nHelper._;
 
+import java.util.EnumSet;
+
 
 /**
  * @author Susana Montes Pedreiera <smotnes@wirelessgalicia.com>
@@ -53,4 +55,12 @@ public enum OrderStatusEnum {
     public static OrderStatusEnum getDefault() {
         return PRE_SALES;
     }
+
+    public static EnumSet<OrderStatusEnum> getVisibleStatus() {
+        return EnumSet.of(OrderStatusEnum.PRE_SALES, OrderStatusEnum.OFFERED,
+                OrderStatusEnum.OUTSOURCED, OrderStatusEnum.ACCEPTED,
+                OrderStatusEnum.STARTED, OrderStatusEnum.ON_HOLD,
+                OrderStatusEnum.FINISHED);
+    }
+
 }
diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/daos/DayAssignmentDAO.java b/libreplan-business/src/main/java/org/libreplan/business/planner/daos/DayAssignmentDAO.java
index 043c7dea3..a515cbad1 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/planner/daos/DayAssignmentDAO.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/planner/daos/DayAssignmentDAO.java
@@ -46,6 +46,7 @@ import org.springframework.stereotype.Repository;
  *
  * @author Diego Pino García <dpino@igalia.com>
  * @author Manuel Rego Casasnovas <mrego@igalia.com>
+ * @author Javier Moran Rua <jmoran@igalia.com>
  */
 @Repository
 @Scope(BeanDefinition.SCOPE_SINGLETON)
@@ -63,30 +64,46 @@ public class DayAssignmentDAO extends GenericDAOHibernate<DayAssignment, Long>
     @Override
     public List<DayAssignment> getAllFor(Scenario scenario) {
         List<DayAssignment> result = new ArrayList<DayAssignment>();
-        result.addAll(getSpecific(scenario, null, null));
-        result.addAll(getGeneric(scenario, null, null));
-        result.addAll(getDerived(scenario, null, null));
+        result.addAll(getSpecific(scenario, null, null, null));
+        result.addAll(getGeneric(scenario, null, null, null));
+        result.addAll(getDerived(scenario, null, null, null));
         return result;
     }
 
+    @Override
     public List<DayAssignment> getAllFor(Scenario scenario, LocalDate init,
             LocalDate end) {
         List<DayAssignment> result = new ArrayList<DayAssignment>();
-        result.addAll(getSpecific(scenario, init, end));
-        result.addAll(getGeneric(scenario, init, end));
-        result.addAll(getDerived(scenario, init, end));
+        result.addAll(getSpecific(scenario, init, end, null));
+        result.addAll(getGeneric(scenario, init, end, null));
+        result.addAll(getDerived(scenario, init, end, null));
+        return result;
+    }
+
+    @Override
+    public List<DayAssignment> getAllFor(Scenario scenario,
+            LocalDate startDateInclusive, LocalDate endDateInclusive,
+            Resource resource) {
+        List<DayAssignment> result = new ArrayList<DayAssignment>();
+        result.addAll(getSpecific(scenario, startDateInclusive,
+                endDateInclusive, resource));
+        result.addAll(getGeneric(scenario, startDateInclusive,
+                endDateInclusive, resource));
+        result.addAll(getDerived(scenario, startDateInclusive,
+                endDateInclusive, resource));
         return result;
     }
 
     private List<DerivedDayAssignment> getDerived(Scenario scenario,
-            LocalDate initInclusive, LocalDate endInclusive) {
+            LocalDate initInclusive, LocalDate endInclusive, Resource resource) {
         String queryString = "select d from DerivedDayAssignmentsContainer c "
                 + "JOIN c.dayAssignments d where c.scenario = :scenario"
                 + addQueryConditionForInitAndEndDate(initInclusive,
-                        endInclusive);
+                        endInclusive) + addQueryConditionsForResource(resource);
         Query query = getSession().createQuery(queryString);
         query = query.setParameter("scenario", scenario);
         addInitAndEndParameters(query, initInclusive, endInclusive);
+        addResourceParameter(query, resource);
         return query.list();
     }
 
@@ -98,6 +115,10 @@ public class DayAssignmentDAO extends GenericDAOHibernate<DayAssignment, Long>
         return initCondition + endCondition;
     }
 
+    private String addQueryConditionsForResource(Resource resource) {
+        return resource != null ? " and d.resource = :resource " : "";
+    }
+
     private Query addInitAndEndParameters(Query query, LocalDate initInclusive,
             LocalDate endInclusive) {
         if (initInclusive != null) {
@@ -109,30 +130,38 @@ public class DayAssignmentDAO extends GenericDAOHibernate<DayAssignment, Long>
         return query;
     }
 
+    private Query addResourceParameter(Query query, Resource resource) {
+        return resource != null ? query.setParameter("resource", resource)
+                : query;
+    }
+
     private List<GenericDayAssignment> getGeneric(Scenario scenario,
-            LocalDate initInclusive, LocalDate endInclusive) {
+            LocalDate initInclusive, LocalDate endInclusive, Resource resource) {
         String queryString = "select d from GenericDayAssignmentsContainer c "
                 + "JOIN c.dayAssignments d where c.scenario = :scenario"
                 + addQueryConditionForInitAndEndDate(initInclusive,
-                        endInclusive);
+                        endInclusive) + addQueryConditionsForResource(resource);
         Query query = getSession().createQuery(queryString).setParameter(
                 "scenario", scenario);
-        query = addInitAndEndParameters(query, initInclusive, endInclusive);
+        addInitAndEndParameters(query, initInclusive, endInclusive);
+        addResourceParameter(query, resource);
         return query.list();
     }
 
     private List<SpecificDayAssignment> getSpecific(Scenario scenario,
-            LocalDate initInclusive, LocalDate endInclusive) {
+            LocalDate initInclusive, LocalDate endInclusive, Resource resource) {
         String queryString = "select d from SpecificDayAssignmentsContainer c "
                 + "JOIN c.dayAssignments d where c.scenario = :scenario"
                 + addQueryConditionForInitAndEndDate(initInclusive,
-                        endInclusive);
+                        endInclusive) + addQueryConditionsForResource(resource);
         Query query = getSession().createQuery(queryString).setParameter(
                 "scenario", scenario);
-        query = addInitAndEndParameters(query, initInclusive, endInclusive);
+        addInitAndEndParameters(query, initInclusive, endInclusive);
+        addResourceParameter(query, resource);
         return query.list();
     }
 
+    @Override
     @SuppressWarnings("unchecked")
     public List<DayAssignment> listFilteredByDate(LocalDate init, LocalDate end) {
         Criteria criteria  = getSession().createCriteria(DayAssignment.class);
@@ -164,7 +193,7 @@ public class DayAssignmentDAO extends GenericDAOHibernate<DayAssignment, Long>
         }
         Criteria criteria = getSession().createCriteria(DayAssignment.class)
                 .add(Restrictions.in("resource", resources));
-        return (List<DayAssignment>) criteria.list();
+        return criteria.list();
     }
 
 }
diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/daos/IDayAssignmentDAO.java b/libreplan-business/src/main/java/org/libreplan/business/planner/daos/IDayAssignmentDAO.java
index d8af46e7d..3af595dc6 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/planner/daos/IDayAssignmentDAO.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/planner/daos/IDayAssignmentDAO.java
@@ -34,8 +34,9 @@ import org.libreplan.business.scenarios.entities.Scenario;
 /**
  * DAO interface for {@link DayAssignment}
  *
- * @author @author Diego Pino García <dpino@igalia.com>
+ * @author Diego Pino García <dpino@igalia.com>
  * @author Manuel Rego Casasnovas <mrego@igalia.com>
+ * @author Javier Moran Rua <jmoran@igalia.com>
  */
 public interface IDayAssignmentDAO extends IGenericDAO<DayAssignment, Long> {
 
@@ -47,6 +48,10 @@ public interface IDayAssignmentDAO extends IGenericDAO<DayAssignment, Long> {
     public List<DayAssignment> getAllFor(Scenario scenario,
             LocalDate initInclusive, LocalDate endInclusive);
 
+    public List<DayAssignment> getAllFor(Scenario scenario,
+            LocalDate startDateInclusive, LocalDate endDateInclusive,
+            Resource resource);
+
     List<DayAssignment> listFilteredByDate(LocalDate init, LocalDate end);
 
     public List<DayAssignment> findByResources(Scenario scenario, List<Resource> resources);
diff --git a/libreplan-business/src/main/java/org/libreplan/business/resources/daos/IResourceLoadRatiosCalculator.java b/libreplan-business/src/main/java/org/libreplan/business/resources/daos/IResourceLoadRatiosCalculator.java
new file mode 100644
index 000000000..d8e349625
--- /dev/null
+++ b/libreplan-business/src/main/java/org/libreplan/business/resources/daos/IResourceLoadRatiosCalculator.java
@@ -0,0 +1,80 @@
+/*
+ * This file is part of LibrePlan
+ *
+ * Copyright (C) 2012 Igalia, S.L.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.libreplan.business.resources.daos;
+
+import java.math.BigDecimal;
+
+import org.joda.time.LocalDate;
+import org.libreplan.business.resources.entities.Resource;
+import org.libreplan.business.scenarios.entities.Scenario;
+import org.libreplan.business.workingday.EffortDuration;
+
+/**
+ * Specifies the method to calculate the load ratios of a resource and the data
+ * type which represents the output
+ *
+ * @author Javier Moran Rua <jmoran@igalia.com>
+ *
+ */
+public interface IResourceLoadRatiosCalculator {
+
+    public interface ILoadRatiosDataType {
+
+        EffortDuration getLoad();
+
+        EffortDuration getOverload();
+
+        EffortDuration getCapacity();
+
+        /**
+         * Calculates the overtime ratio. The overtime ratio is defined as
+         * overload / (load+overload).
+         *
+         * @return the overtime ratio represented with a {@link BigDecimal} with
+         *         scale of 2. If both load and overload are zero it is returned
+         *         zero.
+         */
+        BigDecimal getOvertimeRatio();
+
+        /**
+         * Calculates the availability ratio. The availability ratio is defined
+         * as 1 - (load/capacity)*100. It is a percentage.
+         *
+         * @return the availability ratio represented with a {@link BigDecimal}
+         *         with a scale of 2. In the case that the capacity is zero, a
+         *         0% of availability is returned.
+         */
+        BigDecimal getAvailiabilityRatio();
+    }
+
+    /**
+     * Calculates the load ratios of a resource between two dates in the
+     * escenario specified.
+     *
+     * @param resource
+     * @param startDate
+     * @param endDate
+     * @return the load ratios calculated.
+     */
+    ILoadRatiosDataType calculateLoadRatios(Resource resource,
+            LocalDate startDate,
+            LocalDate endDate, Scenario scenario);
+
+}
diff --git a/libreplan-business/src/main/java/org/libreplan/business/resources/daos/ResourceLoadRatiosCalculator.java b/libreplan-business/src/main/java/org/libreplan/business/resources/daos/ResourceLoadRatiosCalculator.java
new file mode 100644
index 000000000..cc34e34c4
--- /dev/null
+++ b/libreplan-business/src/main/java/org/libreplan/business/resources/daos/ResourceLoadRatiosCalculator.java
@@ -0,0 +1,218 @@
+/*
+ * This file is part of LibrePlan
+ *
+ * Copyright (C) 2012 Igalia, S.L.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.libreplan.business.resources.daos;
+
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.joda.time.LocalDate;
+import org.libreplan.business.common.IAdHocTransactionService;
+import org.libreplan.business.common.IOnTransaction;
+import org.libreplan.business.planner.daos.IDayAssignmentDAO;
+import org.libreplan.business.planner.entities.DayAssignment;
+import org.libreplan.business.resources.entities.Resource;
+import org.libreplan.business.scenarios.entities.Scenario;
+import org.libreplan.business.workingday.EffortDuration;
+import org.libreplan.business.workingday.IntraDayDate.PartialDay;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Service;
+
+/**
+ * Class designed to be used as a singleton spring bean implementing the
+ * {@link IResourceLoadRatiosCalculator} interface.
+ *
+ * Spawns a new Hibernate transaction using {@link IAdHocTransactionService} to
+ * access the database.
+ *
+ * @author Javier Moran Rua <jmoran@igalia.com>
+ *
+ */
+
+@Service
+@Scope(BeanDefinition.SCOPE_SINGLETON)
+public class ResourceLoadRatiosCalculator implements
+        IResourceLoadRatiosCalculator {
+
+    @Autowired
+    private IDayAssignmentDAO dayAssigmentDAO;
+
+    @Autowired
+    private IResourceDAO resourceDAO;
+
+    @Autowired
+    private IAdHocTransactionService adHocTransactionService;
+
+    private static class LoadRatiosDataType implements
+            IResourceLoadRatiosCalculator.ILoadRatiosDataType {
+        private EffortDuration load;
+        private EffortDuration overload;
+        private EffortDuration capacity;
+
+        public LoadRatiosDataType(EffortDuration load, EffortDuration overload,
+                EffortDuration capacity) {
+            this.load = load;
+            this.overload = overload;
+            this.capacity = capacity;
+        }
+
+        @Override
+        public EffortDuration getLoad() {
+            return this.load;
+        }
+
+        @Override
+        public EffortDuration getOverload() {
+            return this.overload;
+        }
+
+        @Override
+        public EffortDuration getCapacity() {
+            return this.capacity;
+        }
+
+        @Override
+        public BigDecimal getOvertimeRatio() {
+            BigDecimal result;
+            if (this.load.isZero() && this.overload.isZero()) {
+                result = BigDecimal.ZERO;
+            } else {
+                result = this.overload.dividedByAndResultAsBigDecimal(this.load
+                        .plus(this.capacity));
+            }
+
+            return result.setScale(2, BigDecimal.ROUND_HALF_UP);
+        }
+
+        @Override
+        public BigDecimal getAvailiabilityRatio() {
+            BigDecimal result;
+            if (this.capacity.isZero()) {
+                result = BigDecimal.ZERO;
+            } else {
+
+                result = BigDecimal.ONE.subtract(this.load
+                        .dividedByAndResultAsBigDecimal(this.capacity));
+                if (result.compareTo(BigDecimal.ZERO) < 0) {
+                    result = BigDecimal.ZERO;
+                }
+            }
+            return result.setScale(2, BigDecimal.ROUND_HALF_UP);
+        }
+    }
+
+    @Override
+    public ILoadRatiosDataType calculateLoadRatios(final Resource resource,
+            final LocalDate startDate, final LocalDate endDate,
+            final Scenario scenario) {
+
+        return adHocTransactionService
+                .runOnReadOnlyTransaction(new IOnTransaction<LoadRatiosDataType>() {
+
+                    @Override
+                    @SuppressWarnings("unchecked")
+                    public LoadRatiosDataType execute() {
+
+                        resourceDAO.reattach(resource);
+
+                        EffortDuration totalLoad = EffortDuration.zero(),
+                                totalOverload = EffortDuration.zero(),
+                                totalCapacity = EffortDuration.zero();
+
+                        for (Map.Entry<LocalDate, EffortDuration> each :
+                            getAllEffortPerDateFor(scenario,
+ startDate, endDate, resource)
+                                .entrySet()) {
+                            totalLoad = addLoad(totalLoad, each.getValue());
+                            totalOverload = addOverload(totalOverload,
+                                    resource, each.getValue(), each.getKey());
+
+                        }
+
+                        totalCapacity = calculateTotalCapacity(resource,
+                                startDate, endDate);
+                        return new LoadRatiosDataType(totalLoad,
+                                totalOverload, totalCapacity);
+                    }
+
+                    private Map<LocalDate,EffortDuration>
+                        getAllEffortPerDateFor(Scenario scenario,LocalDate startDate,
+                                LocalDate endDate, Resource resource) {
+
+                        HashMap<LocalDate, EffortDuration> result =
+                                new HashMap<LocalDate, EffortDuration>();
+
+                        List<DayAssignment> l = dayAssigmentDAO.getAllFor(
+                                scenario, startDate, endDate,
+                                resource);
+
+                        EffortDuration newValue = EffortDuration.zero();
+                        for (DayAssignment each: l) {
+                            if (result.containsKey(each.getDay())) {
+                                newValue = result.get(each.getDay()).
+                                        plus(each.getDuration());
+                            } else {
+                                newValue = each.getDuration();
+                            }
+                            result.put(each.getDay(), newValue);
+                        }
+                        return result;
+                    }
+
+                    private EffortDuration addLoad(EffortDuration currentLoad,
+                            EffortDuration load) {
+                        return currentLoad.plus(load);
+                    }
+
+                    private EffortDuration calculateTotalCapacity(
+                            Resource resource, LocalDate startDate,
+                            LocalDate endDate) {
+
+                        return resource.getCalendar().getWorkableDuration(
+                                startDate, endDate);
+                    }
+
+                    private EffortDuration addOverload(
+                            EffortDuration currentOverload, Resource resource,
+                            EffortDuration loadAtDate, LocalDate date) {
+                        EffortDuration result;
+                        EffortDuration capacityAtDay = getCapacityAtDate(
+                                resource, date);
+                        if (capacityAtDay.compareTo(loadAtDate) < 0) {
+                            result = currentOverload.plus(loadAtDate
+                                    .minus(capacityAtDay));
+                        } else {
+                            result = currentOverload;
+                        }
+
+                        return result;
+                    }
+
+                    private EffortDuration getCapacityAtDate(Resource resource,
+                            LocalDate date) {
+                        return resource.getCalendar().getCapacityOn(
+                                PartialDay.wholeDay(date));
+                    }
+                });
+    }
+}
diff --git a/libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java b/libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java
index 2c2239aa1..9adf58538 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java
@@ -466,6 +466,10 @@ public class Criterion extends IntegrationEntity implements ICriterion,
         return String.format("%s :: %s", type, name);
     }
 
+    public String getFinderPattern() {
+        return String.format("%s ( %s )", name, type.getName());
+    }
+
     @Override
     public int compareTo(Criterion o) {
         return toString().compareToIgnoreCase(o.toString());
diff --git a/libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java b/libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java
index f0038176e..9d4736b13 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java
@@ -49,8 +49,10 @@ import org.libreplan.business.calendars.entities.ResourceCalendar;
 import org.libreplan.business.calendars.entities.SameWorkHoursEveryDay;
 import org.libreplan.business.common.BaseEntity;
 import org.libreplan.business.common.IHumanIdentifiable;
+import org.libreplan.business.common.IOnTransaction;
 import org.libreplan.business.common.IntegrationEntity;
 import org.libreplan.business.common.Registry;
+import org.libreplan.business.common.entities.Configuration;
 import org.libreplan.business.common.exceptions.InstanceNotFoundException;
 import org.libreplan.business.common.exceptions.MultipleInstancesException;
 import org.libreplan.business.common.exceptions.ValidationException;
@@ -1188,15 +1190,31 @@ public abstract class Resource extends IntegrationEntity implements
 
     @AssertTrue(message = "You have exceeded the maximum limit of resources")
     public boolean checkMaxResources() {
-        Integer maxResources = Registry.getConfigurationDAO()
-                .getConfiguration().getMaxResources();
-        if (maxResources != null && maxResources > 0) {
-            List<Resource> resources = Registry.getResourceDAO().findAll();
-            if (resources.size() > maxResources) {
-                return false;
-            }
-        }
-        return true;
+        return Registry.getTransactionService()
+                .runOnAnotherReadOnlyTransaction(new IOnTransaction<Boolean>() {
+                    @Override
+                    public Boolean execute() {
+                        Configuration configuration = Registry
+                                .getConfigurationDAO().getConfiguration();
+                        if (configuration == null) {
+                            return true;
+                        }
+
+                        Integer maxResources = configuration.getMaxResources();
+                        if (maxResources != null && maxResources > 0) {
+                            List<Resource> resources = Registry
+                                    .getResourceDAO().findAll();
+                            int resourcesNumber = resources.size();
+                            if (isNewObject()) {
+                                resourcesNumber++;
+                            }
+                            if (resourcesNumber > maxResources) {
+                                return false;
+                            }
+                        }
+                        return true;
+                    }
+                });
     }
 
     public boolean isActiveBetween(LocalDate startDate, LocalDate endDate) {
diff --git a/libreplan-business/src/main/java/org/libreplan/business/settings/entities/Language.java b/libreplan-business/src/main/java/org/libreplan/business/settings/entities/Language.java
index f3385ee4d..c494bd839 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/settings/entities/Language.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/settings/entities/Language.java
@@ -45,7 +45,8 @@ public enum Language {
     POLISH_LANGUAGE("Polski", new Locale("pl")),
     CZECH_LANGUAGE("Čeština", new Locale("cs")),
     GERMAN_LANGUAGE("Deutsch", new Locale("de")),
-    CATALAN_LANGUAGE("Català", new Locale("ca"));
+    CATALAN_LANGUAGE("Català", new Locale("ca")),
+    CHINESE_LANGUAGE("中文", new Locale("zh"));
 
     private final String displayName;
 
diff --git a/libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java b/libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java
index bd285c96e..bf0f4a476 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java
@@ -3,7 +3,7 @@
  *
  * 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 program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -31,8 +31,12 @@ import org.hibernate.validator.AssertTrue;
 import org.hibernate.validator.NotEmpty;
 import org.libreplan.business.common.BaseEntity;
 import org.libreplan.business.common.IHumanIdentifiable;
+import org.libreplan.business.common.IOnTransaction;
 import org.libreplan.business.common.Registry;
+import org.libreplan.business.common.entities.Configuration;
 import org.libreplan.business.common.exceptions.InstanceNotFoundException;
+import org.libreplan.business.labels.entities.Label;
+import org.libreplan.business.resources.entities.Criterion;
 import org.libreplan.business.resources.entities.Worker;
 import org.libreplan.business.scenarios.entities.Scenario;
 import org.libreplan.business.settings.entities.Language;
@@ -47,6 +51,7 @@ import org.libreplan.business.users.daos.IUserDAO;
  * @author Ignacio Diaz Teijido <ignacio.diaz@comtecsf.es>
  * @author Manuel Rego Casasnovas <rego@igalia.com>
  * @author Javier Moran Rua <jmoran@igalia.com>
+ * @author Lorenzo Tilve Álvaro <ltilve@igalia.com>
  */
 public class User extends BaseEntity implements IHumanIdentifiable{
 
@@ -81,6 +86,18 @@ public class User extends BaseEntity implements IHumanIdentifiable{
 
     private Worker worker;
 
+    private Label projectsFilterLabel = null;
+
+    private Integer projectsFilterPeriodSince;
+
+    private Integer projectsFilterPeriodTo;
+
+    private Criterion resourcesLoadFilterCriterion = null;
+
+    private Integer resourcesLoadFilterPeriodSince;
+
+    private Integer resourcesLoadFilterPeriodTo;
+
     /**
      * Necessary for Hibernate. Please, do not call it.
      */
@@ -362,15 +379,77 @@ public class User extends BaseEntity implements IHumanIdentifiable{
 
     @AssertTrue(message = "You have exceeded the maximum limit of users")
     public boolean checkMaxUsers() {
-        Integer maxUsers = Registry.getConfigurationDAO().getConfiguration()
-                .getMaxUsers();
-        if (maxUsers != null && maxUsers > 0) {
-            List<User> users = Registry.getUserDAO().findAll();
-            if (users.size() > maxUsers) {
-                return false;
-            }
-        }
-        return true;
+        return Registry.getTransactionService()
+                .runOnAnotherReadOnlyTransaction(new IOnTransaction<Boolean>() {
+                    @Override
+                    public Boolean execute() {
+                        Configuration configuration = Registry
+                                .getConfigurationDAO().getConfiguration();
+                        if (configuration == null) {
+                            return true;
+                        }
+
+                        Integer maxUsers = configuration.getMaxUsers();
+                        if (maxUsers != null && maxUsers > 0) {
+                            List<User> users = Registry.getUserDAO().findAll();
+                            int usersNumber = users.size();
+                            if (isNewObject()) {
+                                usersNumber++;
+                            }
+                            if (usersNumber > maxUsers) {
+                                return false;
+                            }
+                        }
+                        return true;
+                    }
+                });
+    }
+
+    public Label getProjectsFilterLabel() {
+        return projectsFilterLabel;
+    }
+
+    public void setProjectsFilterLabel(Label label) {
+        projectsFilterLabel = label;
+    }
+
+    public Criterion getResourcesLoadFilterCriterion() {
+        return resourcesLoadFilterCriterion;
+    }
+
+    public void setResourcesLoadFilterCriterion(Criterion criterion) {
+        resourcesLoadFilterCriterion = criterion;
+    }
+
+    public Integer getProjectsFilterPeriodSince() {
+        return projectsFilterPeriodSince;
+    }
+    public void setProjectsFilterPeriodSince(Integer period) {
+        projectsFilterPeriodSince = period;
+    }
+
+    public Integer getProjectsFilterPeriodTo() {
+        return projectsFilterPeriodTo;
+    }
+
+    public void setProjectsFilterPeriodTo(Integer period) {
+        projectsFilterPeriodTo = period;
+    }
+
+    public Integer getResourcesLoadFilterPeriodSince() {
+        return resourcesLoadFilterPeriodSince;
+    }
+
+    public void setResourcesLoadFilterPeriodSince(Integer period) {
+        resourcesLoadFilterPeriodSince = period;
+    }
+
+    public Integer getResourcesLoadFilterPeriodTo() {
+        return resourcesLoadFilterPeriodTo;
+    }
+
+    public void setResourcesLoadFilterPeriodTo(Integer period) {
+        resourcesLoadFilterPeriodTo = period;
     }
 
 }
diff --git a/libreplan-business/src/main/resources/db.changelog-1.3.xml b/libreplan-business/src/main/resources/db.changelog-1.3.xml
index 55f7ede49..9fdb1ac79 100644
--- a/libreplan-business/src/main/resources/db.changelog-1.3.xml
+++ b/libreplan-business/src/main/resources/db.changelog-1.3.xml
@@ -303,4 +303,69 @@
             <column name="schedule" type="BOOLEAN" />
        </createTable>
     </changeSet>
+
+    <changeSet id="add-projects_filter_period_since-column-to-user_table"
+        author="ltilve">
+        <comment>Add column to store project filtering interval 'range since' parameter</comment>
+        <addColumn tableName="user_table">
+            <column name="projects_filter_period_since" type="INTEGER" />
+        </addColumn>
+    </changeSet>
+
+    <changeSet id="add-projects_filter_period_to-column-to-user_table"
+        author="ltilve">
+        <comment>Add column to store project filtering interval 'range to' parameter</comment>
+        <addColumn tableName="user_table">
+            <column name="projects_filter_period_to" type="INTEGER" />
+        </addColumn>
+    </changeSet>
+
+    <changeSet id="add-resources_load_filter_period_since-column-to-user_table"
+        author="ltilve">
+        <comment>Add column to store resources load filtering interval 'range since' parameter</comment>
+        <addColumn tableName="user_table">
+            <column name="resources_load_filter_period_since" type="INTEGER" />
+        </addColumn>
+    </changeSet>
+
+    <changeSet id="add-resources_load_filter_period_to-column-to-user_table"
+        author="ltilve">
+        <comment>Add column to store resources load filtering interval 'range to' parameter</comment>
+        <addColumn tableName="user_table">
+            <column name="resources_load_filter_period_to" type="INTEGER" />
+        </addColumn>
+    </changeSet>
+
+    <changeSet id="add-projects_filter_label_id-column-to-user_table"
+        author="ltilve">
+        <comment>Add column to store label reference for default project filtering</comment>
+        <addColumn tableName="user_table">
+            <column name="projects_filter_label_id" type="BIGINT" />
+        </addColumn>
+    </changeSet>
+
+    <changeSet id="add-resources_load_filter_criterion_id-column-to-user_table"
+        author="ltilve">
+        <comment>Add column to store criterion reference for default resources load filtering</comment>
+        <addColumn tableName="user_table">
+            <column name="resources_load_filter_criterion_id" type="BIGINT" />
+        </addColumn>
+    </changeSet>
+
+    <changeSet id="add-projects_filter_label_id-fk-to-user_table" author="ltilve">
+        <comment>Add Foreign Key constraint on label reference</comment>
+        <addForeignKeyConstraint constraintName="user_label_fkey"
+            baseTableName="user_table" baseColumnNames="projects_filter_label_id"
+            referencedTableName="label" referencedColumnNames="id"
+            onDelete="SET NULL" />
+    </changeSet>
+
+    <changeSet id="add-resources_load_filter_fk_id-column-to-user_table" author="ltilve">
+        <comment>Add Foreign Key constraint on criterion reference</comment>
+        <addForeignKeyConstraint constraintName="user_criterion_fkey"
+            baseTableName="user_table" baseColumnNames="resources_load_filter_criterion_id"
+            referencedTableName="criterion" referencedColumnNames="id"
+            onDelete="SET NULL"/>
+    </changeSet>
+
 </databaseChangeLog>
diff --git a/libreplan-business/src/main/resources/org/libreplan/business/users/entities/Users.hbm.xml b/libreplan-business/src/main/resources/org/libreplan/business/users/entities/Users.hbm.xml
index ee8216415..0fd927182 100644
--- a/libreplan-business/src/main/resources/org/libreplan/business/users/entities/Users.hbm.xml
+++ b/libreplan-business/src/main/resources/org/libreplan/business/users/entities/Users.hbm.xml
@@ -63,6 +63,20 @@
         <one-to-one name="worker" property-ref="user"
             class="org.libreplan.business.resources.entities.Worker" />
 
+        <property name="projectsFilterPeriodSince" column="projects_filter_period_since"/>
+
+        <property name="projectsFilterPeriodTo" column="projects_filter_period_to"/>
+
+        <property name="resourcesLoadFilterPeriodSince" column="resources_load_filter_period_since"/>
+
+        <property name="resourcesLoadFilterPeriodTo" column="resources_load_filter_period_to"/>
+
+        <many-to-one name="projectsFilterLabel" cascade="none" lazy="false"
+            column="projects_filter_label_id" />
+
+        <many-to-one name="resourcesLoadFilterCriterion" cascade="none"
+            lazy="false" column="resources_load_filter_criterion_id" />
+
     </class>
 
     <class name="Profile" table="profile_table">
diff --git a/libreplan-webapp/pom.xml b/libreplan-webapp/pom.xml
index c8cb43e00..47955fd1f 100644
--- a/libreplan-webapp/pom.xml
+++ b/libreplan-webapp/pom.xml
@@ -143,6 +143,9 @@
                             <copy todir="src/main/webapp/help/ca" failonerror="false">
                                 <fileset dir="../doc/src/user/es/html"/>
                             </copy>
+                            <copy todir="src/main/webapp/help/zh" failonerror="false">
+                                <fileset dir="../doc/src/user/en/html"/>
+                            </copy>
                           </tasks>
                          </configuration>
                         </execution>
diff --git a/libreplan-webapp/src/main/jasper/completedEstimatedHours_Bundle/completedEstimatedHours_zh.properties b/libreplan-webapp/src/main/jasper/completedEstimatedHours_Bundle/completedEstimatedHours_zh.properties
new file mode 100644
index 000000000..06b4eb773
--- /dev/null
+++ b/libreplan-webapp/src/main/jasper/completedEstimatedHours_Bundle/completedEstimatedHours_zh.properties
@@ -0,0 +1,14 @@
+# Locale for completedEstimatedHours.jrxml
+title = \  \u5c0f\u65f6\u5185\u62a5
+subtitle = \u4f30\u8ba1\u4efb\u52a1/\u8ba1\u5212\u5c0f\u65f6\u6570
+order = \u9879\u76ee\u540d\u79f0\uff1a
+reference = \u53c2\u8003\u65e5\u671f\uff1a
+criteria = \u6807\u51c6\uff1a
+labels = \u6807\u7b7e\uff1a
+name = \u540d\u79f0
+total.hours = \u603b\u65f6\u6570
+estimated = \u4f30\u8ba1
+planned = \u8ba1\u5212
+hours.up.to.date = \u5c0f\u65f6\u6700\u65b0
+page = \u9875
+of = \u7684
diff --git a/libreplan-webapp/src/main/jasper/hoursWorkedPerWorkerInAMonth_Bundle/hoursWorkedPerWorkerInAMonth_zh.properties b/libreplan-webapp/src/main/jasper/hoursWorkedPerWorkerInAMonth_Bundle/hoursWorkedPerWorkerInAMonth_zh.properties
new file mode 100644
index 000000000..b1f1553b0
--- /dev/null
+++ b/libreplan-webapp/src/main/jasper/hoursWorkedPerWorkerInAMonth_Bundle/hoursWorkedPerWorkerInAMonth_zh.properties
@@ -0,0 +1,11 @@
+# Locale for hoursWorkedPerWorkerReportInAMonth.jrxml
+title = \u5de5\u4f5c\u62a5\u544a
+subtitle = \u5728\u4e00\u4e2a\u6708\u5185\u901a\u8fc7\u8d44\u6e90\u7684\u603b\u5de5\u4f5c\u5c0f\u65f6
+parameters.year = \u5e74\u4efd\uff1a
+parameters.month = \u6708\uff1a
+name = \u540d\u79f0
+hours = \u5c0f\u65f6
+total.hours = \u603b\u65f6\u6570\uff1a
+note1 = \u5728\u641c\u7d22\u8303\u56f4\u4e2d\u5bf9\u9009\u5b9a\u7684\u8d44\u6e90\u4e0d\u5b58\u5728\u7684\u5de5\u4f5c\u62a5\u544a\u3002
+page = \u9875
+of = \u7684
diff --git a/libreplan-webapp/src/main/jasper/hoursWorkedPerWorker_Bundle/hoursWorkedPerWorker_zh.properties b/libreplan-webapp/src/main/jasper/hoursWorkedPerWorker_Bundle/hoursWorkedPerWorker_zh.properties
new file mode 100644
index 000000000..5c438f60d
--- /dev/null
+++ b/libreplan-webapp/src/main/jasper/hoursWorkedPerWorker_Bundle/hoursWorkedPerWorker_zh.properties
@@ -0,0 +1,18 @@
+# Locale for hoursWorkedPerWorkerReport.jrxml
+title = \u5de5\u4f5c\u62a5\u544a
+subtitle = \u5de5\u4f5c\u65f6\u6570\u8d44\u6e90
+date.start = \u5f00\u59cb\u65e5\u671f\uff1a
+date.end = \u7ed3\u675f\u65e5\u671f\uff1a
+criteria = \u6807\u51c6\uff1a
+labels = \u6807\u7b7e
+labels.colon = \u6807\u7b7e\uff1a
+start = \u5f00\u59cb
+end = \u7ed3\u675f
+hours = \u5c0f\u65f6
+task.code.name = \u4efb\u52a1\u4ee3\u7801/\u540d\u79f0
+text.fields = \u6587\u672c\u5b57\u6bb5
+total.day = \u6bcf\u5929\u7684\u603b\u65f6\u6570\uff1a
+total.worker = \u6bcf\u540d\u5de5\u4eba\u7684\u603b\u65f6\u6570\uff1a
+note1 = \u5728\u641c\u7d22\u8303\u56f4\u4e2d\u5bf9\u9009\u5b9a\u7684\u8d44\u6e90\u4e0d\u5b58\u5728\u7684\u5de5\u4f5c\u62a5\u544a\u3002
+page = \u9875
+of = \u7684
diff --git a/libreplan-webapp/src/main/jasper/orderCostsPerResource_Bundle/orderCostsPerResource_zh.properties b/libreplan-webapp/src/main/jasper/orderCostsPerResource_Bundle/orderCostsPerResource_zh.properties
new file mode 100644
index 000000000..08b153aa6
--- /dev/null
+++ b/libreplan-webapp/src/main/jasper/orderCostsPerResource_Bundle/orderCostsPerResource_zh.properties
@@ -0,0 +1,28 @@
+# Locale for ordersCostPerResourcesReport.jrxml
+title = \u9879\u76ee\u62a5\u544a
+subtitle = \u9879\u76ee\u6210\u672c
+date.start = \u5f00\u59cb\u65e5\u671f\uff1a
+date.end = \u7ed3\u675f\u65e5\u671f\uff1a
+criteria = \u6807\u51c6\uff1a
+labels = \u6807\u7b7e\uff1a
+headers.column1 = \u7c7b\u578b\u5c0f\u65f6
+headers.column2 = \u65e5\u671f
+headers.column3 = \u85aa\u6c34
+headers.column4 = \u5c0f\u65f6
+headers.column5 = \u6210\u672c
+total.task = \u6bcf\u5929\u7684\u603b\u8ba1\uff1a
+total.worker = \u6bcf\u4e2a\u5de5\u4eba\u7684\u603b\u8ba1\uff1a
+total = \u9879\u76ee\u603b\uff1a
+page = \u9875
+of = \u7684
+expense.subtitle = \u8d39\u7528\u8868
+headers.expense.column1 = \u65e5\u671f
+headers.expense.column2 = \u6982\u5ff5
+headers.expense.column3 = \u8d44\u6e90
+headers.expense.column4 = \u503c
+time.spend.subtitle = \u6267\u884c\u65f6\u95f4\uff1a
+money.spend.subtitle = \u82b1\u7684\u94b1\uff1a
+total.numhours = \u603b\u65f6\u6570\uff1a
+total.time.money = \u5c0f\u65f6\u8d39\u7528\uff1a
+total.expense.money = \u8d39\u7528\u6210\u672c\uff1a
+total.money = \u5408\u8ba1\uff1a
diff --git a/libreplan-webapp/src/main/jasper/projectStatus_Bundle/projectStatus_zh.properties b/libreplan-webapp/src/main/jasper/projectStatus_Bundle/projectStatus_zh.properties
new file mode 100644
index 000000000..64d25e640
--- /dev/null
+++ b/libreplan-webapp/src/main/jasper/projectStatus_Bundle/projectStatus_zh.properties
@@ -0,0 +1,20 @@
+# Locale for projectStatusReport.jrxml
+title = 项目状态报告
+project = 项目名称：
+filter = 过滤器：
+project_estimated_hours = 估计时间：
+project_planned_hours = 计划时间：
+project_imputed_hours = 的推算时间：
+code = 码
+name = 名称
+estimated_hours = 估计
+planned_hours = 计划
+imputed_hours = 的推算
+project_budget = 预算：
+project_hours_cost = 小时费用：
+project_expenses_cost = 费用成本：
+project_total_cost = 总成本：
+budget = 预算
+hours_cost = 小时费用
+expenses_cost = 费用成本
+total_cost = 总成本
diff --git a/libreplan-webapp/src/main/jasper/schedulingProgressPerOrder_Bundle/schedulingProgressPerOrder_zh.properties b/libreplan-webapp/src/main/jasper/schedulingProgressPerOrder_Bundle/schedulingProgressPerOrder_zh.properties
new file mode 100644
index 000000000..6c080159b
--- /dev/null
+++ b/libreplan-webapp/src/main/jasper/schedulingProgressPerOrder_Bundle/schedulingProgressPerOrder_zh.properties
@@ -0,0 +1,24 @@
+# Locale for schedulingProgressPerOrderReport.jrxml
+title = \u8fdb\u5c55\u62a5\u544a
+subtitle = \u6bcf\u4e2a\u9879\u76ee\u7684\u5de5\u4f5c\u53ca\u8fdb\u5c55\u60c5\u51b5
+tipo = \u8fdb\u5c55\u7c7b\u578b\uff1a
+order = \u9879\u76ee\uff1a
+date.start = \u8d77\u59cb\u65e5\u671f\u3002
+date.end = \u7ed3\u675f\u65e5\u671f\uff1a
+date.reference = \u53c2\u8003\u65e5\u671f\uff1a
+total.hours = \u603b\u65f6\u6570
+estimated = \u4f30\u8ba1
+planned = \u8ba1\u5212
+progress = \u8fdb\u6b65
+measured = \u6d4b\u91cf
+imputed = \u7684\u63a8\u7b97
+hours.up.to.date = \u5c0f\u65f6\u6700\u65b0
+real = \u5b9e
+difference = \u5dee\u5f02
+cost = \u6210\u672c
+cost.ratio = \u6210\u672c\u7387
+planned.ratio = \u89c4\u5212\u6bd4\u7387
+note1 = \u9009\u62e9\u7684\u8fdb\u5ea6\u7c7b\u578b\u662f\u4e0d\u9002\u7528\u4e8e\u8fd9\u4e00\u9879\u76ee\u3002
+note2 = \u4f7f\u7528\u8513\u5ef6\u8fdb\u5c55\u7c7b\u578b\u3002
+page = \u9875
+of = \u7684
diff --git a/libreplan-webapp/src/main/jasper/timeLineRequiredMaterial_Bundle/timeLineRequiredMaterial_zh.properties b/libreplan-webapp/src/main/jasper/timeLineRequiredMaterial_Bundle/timeLineRequiredMaterial_zh.properties
new file mode 100644
index 000000000..9f78a5b37
--- /dev/null
+++ b/libreplan-webapp/src/main/jasper/timeLineRequiredMaterial_Bundle/timeLineRequiredMaterial_zh.properties
@@ -0,0 +1,17 @@
+# Locale for timeLineRequiredMaterial.jrxml
+title = \u7269\u6599
+subtitle = \u7269\u6599\u9700\u6c42\u65e5\u671f
+date.start = \u5f00\u59cb\u65e5\u671f\uff1a
+date.end = \u7ed3\u675f\u65e5\u671f\uff1a
+status = \u72b6\u6001\uff1a
+headers.title = \u65e5
+headers.column1 = \u6750\u6599
+headers.column2 = \u9879\u76ee - \u4efb\u52a1
+headers.column3 = \u53ef\u7528\u6027
+headers.column4 = \u5355\u4f4d
+headers.column5 = \u5355\u4ef7
+headers.column6 = \u4ef7\u683c
+headers.column7 = \u72b6\u6001
+headers.total = \u6bcf\u5929\u7684\u603b\u4ef7\u683c\uff1a
+page = \u9875
+of = \u7684
diff --git a/libreplan-webapp/src/main/jasper/workingArrangementsPerOrder_Bundle/workingArrangementsPerOrder_zh.properties b/libreplan-webapp/src/main/jasper/workingArrangementsPerOrder_Bundle/workingArrangementsPerOrder_zh.properties
new file mode 100644
index 000000000..c0cf77103
--- /dev/null
+++ b/libreplan-webapp/src/main/jasper/workingArrangementsPerOrder_Bundle/workingArrangementsPerOrder_zh.properties
@@ -0,0 +1,28 @@
+# Locale for workingArrangementPerOrderReport.jrxml
+title = \u9879\u76ee\u62a5\u544a
+subtitle = \u5728\u9879\u76ee\u7684\u4efb\u52a1\u8c03\u5ea6\u72b6\u6001
+order = \u9879\u76ee\u540d\u79f0\uff1a
+status = \u72b6\u6001\uff1a
+name = \u59d3\u540d\u3002
+code = \u4ee3\u7801\uff1a
+criteria = \u6807\u51c6\uff1a
+labels = \u6807\u7b7e\uff1a
+headers1.column1 = \u5f00\u59cb\u65e5\u671f
+headers1.column1.column1 = \u4f30\u8ba1
+headers1.column1.column2 = \u7b2c\u4e00\u6b21\u62a5\u544a
+headers1.column2 = \u7ed3\u675f\u65e5\u671f
+headers1.column2.column1 = \u4f30\u8ba1
+headers1.column2.column2 = \u6700\u540e\u62a5\u544a
+headers1.column2.column3 = \u671f\u9650
+headers1.column3 = \u8fdb\u6b65
+headers1.column4 = \u72b6\u6001
+headers1.column5 = \u671f\u9650
+headers2.title = \u4f9d\u5b58\u5173\u7cfb
+headers2.column1 = \u540d\u79f0
+headers2.column2 = \u7801
+headers2.column3 = \u7c7b\u578b
+headers2.column4 = \u8fdb\u6b65
+overrun = \u6cdb\u6ee5
+intime = \u53ca\u65f6
+page = \u9875
+of = \u7684
diff --git a/libreplan-webapp/src/main/jasper/workingProgressPerTask_Bundle/workingProgressPerTask_zh.properties b/libreplan-webapp/src/main/jasper/workingProgressPerTask_Bundle/workingProgressPerTask_zh.properties
new file mode 100644
index 000000000..0ce553cef
--- /dev/null
+++ b/libreplan-webapp/src/main/jasper/workingProgressPerTask_Bundle/workingProgressPerTask_zh.properties
@@ -0,0 +1,24 @@
+# Locale for workingProgressPerTaskReport.jrxml
+title = \u8fdb\u5c55\u62a5\u544a
+subtitle = \u6bcf\u4e2a\u4efb\u52a1\u7684\u5de5\u4f5c\u53ca\u8fdb\u5c55\u60c5\u51b5
+order = \u9879\u76ee\u540d\u79f0\uff1a
+reference = \u53c2\u8003\u65e5\u671f\uff1a
+criteria = \u6807\u51c6\uff1a
+labels = \u6807\u7b7e\uff1a
+headers.column1 = \u603b\u65f6\u6570
+headers.column1.column1 = \u4f30\u8ba1
+headers.column1.column2 = \u8ba1\u5212
+headers.column2 = \u8fdb\u6b65
+headers.column2.column1 = \u6d4b\u91cf
+headers.column2.column2 = \u7684\u63a8\u7b97
+headers.column2.column3 = \u8ba1\u5212
+headers.column3 = \u5c0f\u65f6\u6700\u65b0
+headers.column3.column1 = \u8ba1\u5212
+headers.column3.column2 = \u5b9e
+headers.column4 = \u5dee\u5f02
+headers.column4.column1 = \u6210\u672c
+headers.column4.column2 = \u8ba1\u5212
+headers.column4.column3 = \u6210\u672c\u7387
+headers.column4.column4 = \u89c4\u5212\u6bd4\u7387
+page = \u9875
+of = \u7684
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/FilterUtils.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/FilterUtils.java
new file mode 100644
index 000000000..215958d68
--- /dev/null
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/FilterUtils.java
@@ -0,0 +1,270 @@
+/*
+ * This file is part of LibrePlan
+ *
+ * Copyright (C) 2013 Igalia, S.L.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.libreplan.web.common;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
+
+import org.joda.time.LocalDate;
+import org.libreplan.business.orders.entities.Order;
+import org.libreplan.web.common.components.finders.FilterPair;
+import org.zkoss.ganttz.timetracker.zoom.ZoomLevel;
+import org.zkoss.zk.ui.Sessions;
+
+/**
+ * Manages operations to read and write filter parameters from the session <br />
+ *
+ * @author Lorenzo Tilve Álvaro <ltilve@igalia.com>
+ */
+public class FilterUtils {
+
+    // Company view and Project list session variables
+
+    public static Date readProjectsStartDate() {
+        return (Date) Sessions.getCurrent().getAttribute(
+                "companyFilterStartDate");
+    }
+
+    public static Date readProjectsEndDate() {
+        return (Date) Sessions.getCurrent()
+                .getAttribute("companyFilterEndDate");
+    }
+
+    public static List<FilterPair> readProjectsParameters() {
+        return (List<FilterPair>) Sessions.getCurrent().getAttribute(
+                "companyFilterLabel");
+    }
+
+    public static void writeProjectsStartDate(Date date) {
+        Sessions.getCurrent().setAttribute("companyFilterStartDate", date);
+        Sessions.getCurrent().setAttribute("companyFilterStartDateChanged",
+                true);
+    }
+
+    public static boolean hasProjectsStartDateChanged() {
+        return Sessions.getCurrent().hasAttribute(
+                "companyFilterStartDateChanged");
+    }
+
+    public static void writeProjectsEndDate(Date date) {
+        Sessions.getCurrent().setAttribute("companyFilterEndDate", date);
+        Sessions.getCurrent().setAttribute("companyFilterEndDateChanged", true);
+    }
+
+    public static boolean hasProjectsEndDateChanged() {
+        return Sessions.getCurrent()
+                .hasAttribute("companyFilterEndDateChanged");
+    }
+
+
+    public static void writeProjectsParameters(List<FilterPair> parameters) {
+        Sessions.getCurrent().setAttribute("companyFilterLabel", parameters);
+    }
+
+    public static void writeProjectsFilter(Date startDate, Date endDate,
+            List<FilterPair> parameters) {
+        writeProjectsStartDate(startDate);
+        writeProjectsEndDate(endDate);
+        writeProjectsParameters(parameters);
+    }
+
+    public static void writeProjectFilterChanged(boolean changed) {
+        Sessions.getCurrent().setAttribute("companyFilterChanged", changed);
+    }
+
+    public static boolean hasProjectFilterChanged() {
+        return (Sessions.getCurrent().getAttribute("companyFilterChanged") != null)
+                && ((Boolean) Sessions.getCurrent().getAttribute(
+                        "companyFilterChanged"));
+    }
+
+    public static void writeProjectPlanningFilterChanged(boolean changed) {
+        Sessions.getCurrent().setAttribute("companyFilterPlanningChanged",
+                changed);
+    }
+
+    public static boolean hasProjectPlanningFilterChanged() {
+        return (Sessions.getCurrent().getAttribute(
+                "companyFilterPlanningChanged") != null)
+                && ((Boolean) Sessions.getCurrent().getAttribute(
+                        "companyFilterPlanningChanged"));
+    }
+
+    // Resources load filter
+
+    public static LocalDate readResourceLoadsStartDate() {
+        return (LocalDate) Sessions.getCurrent().getAttribute(
+                "resourceLoadStartDate");
+    }
+
+    public static LocalDate readResourceLoadsEndDate() {
+        return (LocalDate) Sessions.getCurrent().getAttribute(
+                "resourceLoadEndDate");
+    }
+
+    public static List<FilterPair> readResourceLoadsBandbox() {
+        return (List<FilterPair>) Sessions.getCurrent().getAttribute(
+                "resourceLoadFilterWorkerOrCriterion");
+    }
+
+    public static void writeResourceLoadsStartDate(LocalDate date) {
+        Sessions.getCurrent().setAttribute("resourceLoadStartDate", date);
+        Sessions.getCurrent()
+                .setAttribute("resourceLoadStartDateChanged", true);
+    }
+
+    public static boolean hasResourceLoadsStartDateChanged() {
+        return Sessions.getCurrent().hasAttribute(
+                "resourceLoadStartDateChanged");
+    }
+
+    public static void writeResourceLoadsEndDate(LocalDate date) {
+        Sessions.getCurrent().setAttribute("resourceLoadEndDate", date);
+        Sessions.getCurrent().setAttribute("resourceLoadEndDateChanged", true);
+    }
+
+    public static boolean hasResourceLoadsEndDateChanged() {
+        return Sessions.getCurrent().hasAttribute("resourceLoadEndDateChanged");
+    }
+
+    public static void writeResourceLoadsParameters(List<Object> parameters) {
+        Sessions.getCurrent().setAttribute(
+                "resourceLoadFilterWorkerOrCriterion", parameters);
+    }
+
+    // Project gantt and WBS filter parameters
+
+    public static Date readOrderStartDate(Order order) {
+        return (Date) Sessions.getCurrent().getAttribute(
+                order.getCode() + "-startDateFilter");
+    }
+
+    public static Date readOrderEndDate(Order order) {
+        return (Date) Sessions.getCurrent().getAttribute(
+                order.getCode() + "-endDateFilter");
+    }
+
+    public static String readOrderTaskName(Order order) {
+        return (String) Sessions.getCurrent().getAttribute(
+                order.getCode() + "-tasknameFilter");
+    }
+
+    public static List<FilterPair> readOrderParameters(Order order) {
+        return (List<FilterPair>) Sessions.getCurrent().getAttribute(
+                order.getCode() + "-labelsandcriteriaFilter");
+    }
+
+    public static Boolean readOrderInheritance(Order order) {
+        return (Boolean) Sessions.getCurrent().getAttribute(
+                order.getCode() + "-inheritanceFilter");
+    }
+
+
+    public static void writeOrderStartDate(Order order, Date date) {
+        Sessions.getCurrent().setAttribute(
+                order.getCode() + "-startDateFilter", date);
+    }
+
+    public static void writeOrderEndDate(Order order, Date date) {
+        Sessions.getCurrent().setAttribute(order.getCode() + "-endDateFilter",
+                date);
+    }
+
+    public static void writeOrderTaskName(Order order, String name) {
+        Sessions.getCurrent().setAttribute(order.getCode() + "-tasknameFilter",
+                name);
+    }
+
+    public static void writeOrderParameters(Order order,
+            List<FilterPair> parameters) {
+        Sessions.getCurrent().setAttribute(
+                order.getCode() + "-labelsandcriteriaFilter", parameters);
+    }
+
+    public static void writeOrderInheritance(Order order, boolean value) {
+        Sessions.getCurrent().setAttribute(
+                order.getCode() + "-inheritanceFilter", value);
+    }
+
+    public static void clearBandboxes() {
+        writeProjectsParameters(null);
+        writeResourceLoadsParameters(null);
+    }
+
+    public static void clearSessionDates() {
+        writeProjectsStartDate(null);
+        Sessions.getCurrent().setAttribute("companyFilterStartDateChanged",
+                null);
+        writeProjectsEndDate(null);
+        Sessions.getCurrent().setAttribute("companyFilterEndDateChanged", null);
+        writeResourceLoadsStartDate(null);
+        Sessions.getCurrent()
+                .setAttribute("resourceLoadStartDateChanged", null);
+        writeResourceLoadsEndDate(null);
+        Sessions.getCurrent().setAttribute("resourceLoadEndDateChanged", null);
+    }
+
+    public static ZoomLevel readZoomLevelCompanyView() {
+        return (ZoomLevel) Sessions.getCurrent().getAttribute(
+                "zoomLevelCompanyView");
+    }
+
+    public static void writeZoomLevelCompanyView(ZoomLevel zoomLevel) {
+        Sessions.getCurrent().setAttribute("zoomLevelCompanyView", zoomLevel);
+    }
+
+    public static ZoomLevel readZoomLevelResourcesLoad() {
+        return (ZoomLevel) Sessions.getCurrent().getAttribute(
+                "zoomLevelResourcesLoad");
+    }
+
+    public static void writeZoomLevelResourcesLoad(ZoomLevel zoomLevel) {
+        Sessions.getCurrent().setAttribute("zoomLevelResourcesLoad", zoomLevel);
+    }
+
+    public static ZoomLevel readZoomLevel(Order order) {
+        return (ZoomLevel) Sessions.getCurrent().getAttribute(
+                order.getCode() + "-zoomLevel");
+    }
+
+    public static void writeZoomLevel(Order order, ZoomLevel zoomLevel) {
+        Sessions.getCurrent().setAttribute(order.getCode() + "-zoomLevel",
+                zoomLevel);
+    }
+
+    public static boolean sessionExists() {
+        return Sessions.getCurrent() != null;
+    }
+
+    public static boolean hasOrderWBSFiltersChanged(Order order) {
+        return sessionExists()
+                && (Sessions.getCurrent().getAttribute(
+                        order.getCode() + "-orderWBSFilterChanged") != null)
+                && ((Boolean) Sessions.getCurrent().getAttribute(
+                        order.getCode() + "-orderWBSFilterChanged"));
+    }
+
+    public static void writeOrderWBSFiltersChanged(Order order, boolean changed) {
+        Sessions.getCurrent().setAttribute(
+                order.getCode() + "-orderWBSFilterChanged", changed);
+    }
+
+}
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/ViewSwitcher.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/ViewSwitcher.java
index 7a68fca35..99aa36986 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/common/ViewSwitcher.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/ViewSwitcher.java
@@ -25,11 +25,12 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.libreplan.business.orders.entities.Order;
 import org.libreplan.web.planner.allocation.AdvancedAllocationController;
-import org.libreplan.web.planner.allocation.AllocationResult;
 import org.libreplan.web.planner.allocation.AdvancedAllocationController.AllocationInput;
 import org.libreplan.web.planner.allocation.AdvancedAllocationController.IAdvanceAllocationResultReceiver;
 import org.libreplan.web.planner.allocation.AdvancedAllocationController.IBack;
+import org.libreplan.web.planner.allocation.AllocationResult;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
@@ -54,20 +55,23 @@ public class ViewSwitcher implements Composer {
         isInPlanningOrder = true;
     }
 
-    public void goToAdvancedAllocation(AllocationResult allocationResult,
+    public void goToAdvancedAllocation(Order order,
+            AllocationResult allocationResult,
             IAdvanceAllocationResultReceiver resultReceiver) {
-        planningOrder = ComponentsReplacer.replaceAllChildren(parent,
-                "advance_allocation.zul", createArgsForAdvancedAllocation(
-                        allocationResult, resultReceiver));
+        planningOrder = ComponentsReplacer.replaceAllChildren(
+                parent,
+                "advance_allocation.zul",
+                createArgsForAdvancedAllocation(order, allocationResult,
+                        resultReceiver));
         isInPlanningOrder = false;
     }
 
-    private Map<String, Object> createArgsForAdvancedAllocation(
+    private Map<String, Object> createArgsForAdvancedAllocation(Order order,
             AllocationResult allocationResult,
             IAdvanceAllocationResultReceiver resultReceiver) {
         Map<String, Object> result = new HashMap<String, Object>();
         result.put("advancedAllocationController",
-                new AdvancedAllocationController(createBack(),
+                new AdvancedAllocationController(order, createBack(),
                         asAllocationInput(allocationResult, resultReceiver)));
         return result;
     }
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/NewAllocationSelector.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/NewAllocationSelector.java
index 482612ba0..f6c529c36 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/NewAllocationSelector.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/NewAllocationSelector.java
@@ -21,6 +21,7 @@
 
 package org.libreplan.web.common.components;
 
+import java.util.Date;
 import java.util.List;
 
 import org.libreplan.business.resources.daos.IResourcesSearcher;
@@ -36,6 +37,7 @@ import org.zkoss.zul.Radiogroup;
 
 /**
  * @author Diego Pino García <dpino@igalia.com>
+ * @author Javier Moran Rua <jmoran@igalia.com>
  *
  *         ZK macro component for searching {@link Worker} entities
  *
@@ -43,6 +45,8 @@ import org.zkoss.zul.Radiogroup;
 @SuppressWarnings("serial")
 public class NewAllocationSelector extends AllocationSelector {
 
+    public static final int DAYS_LEAD_LAG_TO_TASK_LIMITS_DATES_FILTERING_INITIALIZATION = 30;
+
     private NewAllocationSelectorController selectorController;
 
     private ResourceAllocationBehaviour behaviour;
@@ -148,6 +152,7 @@ public class NewAllocationSelector extends AllocationSelector {
 
     }   // AllocationType
 
+    @Override
     public NewAllocationSelectorController getController() {
         if (selectorController == null) {
             selectorController = new NewAllocationSelectorController(behaviour);
@@ -164,4 +169,12 @@ public class NewAllocationSelector extends AllocationSelector {
         this.behaviour = ResourceAllocationBehaviour.valueOf(behaviour);
     }
 
+    public void setEndFilteringDate(Date d) {
+        getController().setEndFilteringDate(d);
+    }
+
+    public void setStartFilteringDate(Date d) {
+        getController().setStartFilteringDate(d);
+    }
+
 }
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/bandboxsearch/BandboxMultipleSearch.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/bandboxsearch/BandboxMultipleSearch.java
index 435bd97dd..4d3424e5b 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/bandboxsearch/BandboxMultipleSearch.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/bandboxsearch/BandboxMultipleSearch.java
@@ -131,6 +131,8 @@ public class BandboxMultipleSearch extends HtmlMacroComponent {
                 final String inputText = ((InputEvent) event).getValue();
                 if ((inputText == null) || (inputText.isEmpty())) {
                     clear();
+                    listbox.setSelectedIndex(0);
+                    Events.postEvent(Events.ON_CHANGE, listbox, null);
                 } else {
                     searchMultipleFilters(inputText);
                 }
@@ -231,6 +233,7 @@ public class BandboxMultipleSearch extends HtmlMacroComponent {
     }
 
     public List getSelectedElements() {
+        updateBandboxValue();
         if (this.multipleFiltersFinder != null) {
             if (!multipleFiltersFinder.isValidFormatText(selectedFilters,
                     bandbox.getValue())) {
@@ -387,4 +390,13 @@ public class BandboxMultipleSearch extends HtmlMacroComponent {
         return heightBbox;
     }
 
+    public void addSelectedElements(List<FilterPair> sessionFilterPairs) {
+        selectedFilters.clear();
+        for (FilterPair filterPair : sessionFilterPairs) {
+            addFilter(filterPair);
+        }
+        updateselectedFiltersText();
+        updateBandboxValue();
+    }
+
 }
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementsMultipleFiltersFinder.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementsMultipleFiltersFinder.java
index 99d49a024..d0eae3b9e 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementsMultipleFiltersFinder.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementsMultipleFiltersFinder.java
@@ -193,9 +193,9 @@ public class OrderElementsMultipleFiltersFinder extends MultipleFiltersFinder {
     }
 
     private void addLabel(LabelType type, Label label) {
-        String pattern = label.getName() + " ( " + type.getName() + " )";
         getListMatching().add(
-                new FilterPair(OrderElementFilterEnum.Label, pattern, label));
+                new FilterPair(OrderElementFilterEnum.Label, label
+                        .getFinderPattern(), label));
     }
 
 }
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrdersMultipleFiltersFinder.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrdersMultipleFiltersFinder.java
index 0c554a37d..7a7957d59 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrdersMultipleFiltersFinder.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrdersMultipleFiltersFinder.java
@@ -302,9 +302,9 @@ public class OrdersMultipleFiltersFinder extends MultipleFiltersFinder {
     }
 
     private void addLabel(LabelType type, Label label) {
-        String pattern = label.getName() + " ( " + type.getName() + " )";
         getListMatching().add(
-                new FilterPair(OrderFilterEnum.Label, pattern, label));
+                new FilterPair(OrderFilterEnum.Label, label.getFinderPattern(),
+                        label));
     }
 
     private void addExternalCompany(ExternalCompany externalCompany) {
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskElementsMultipleFiltersFinder.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskElementsMultipleFiltersFinder.java
index 3fdeddac8..8aa7efc75 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskElementsMultipleFiltersFinder.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskElementsMultipleFiltersFinder.java
@@ -196,9 +196,9 @@ public class TaskElementsMultipleFiltersFinder extends MultipleFiltersFinder {
     }
 
     private void addLabel(LabelType type, Label label) {
-        String pattern = label.getName() + " ( " + type.getName() + " )";
         getListMatching().add(
-                new FilterPair(TaskElementFilterEnum.Label, pattern, label));
+                new FilterPair(TaskElementFilterEnum.Label, label
+                        .getFinderPattern(), label));
     }
 
     private List<FilterPair> fillWithFirstTenFiltersResources() {
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupsMultipleFiltersFinder.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupsMultipleFiltersFinder.java
index 9d47b7fa8..71cbeaba7 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupsMultipleFiltersFinder.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupsMultipleFiltersFinder.java
@@ -307,9 +307,9 @@ public class TaskGroupsMultipleFiltersFinder extends MultipleFiltersFinder {
     }
 
     private void addLabel(LabelType type, Label label) {
-        String pattern = label.getName() + " ( " + type.getName() + " )";
         getListMatching().add(
-                new FilterPair(TaskGroupFilterEnum.Label, pattern, label));
+                new FilterPair(TaskGroupFilterEnum.Label, label
+                        .getFinderPattern(), label));
     }
 
     private void addExternalCompany(ExternalCompany externalCompany) {
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/IOrderModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/IOrderModel.java
index d8c3d7fbb..0892692f9 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/IOrderModel.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/IOrderModel.java
@@ -33,12 +33,14 @@ import org.libreplan.business.labels.entities.Label;
 import org.libreplan.business.orders.entities.Order;
 import org.libreplan.business.orders.entities.OrderElement;
 import org.libreplan.business.orders.entities.OrderLineGroup;
+import org.libreplan.business.orders.entities.OrderStatusEnum;
 import org.libreplan.business.planner.entities.PositionConstraintType;
 import org.libreplan.business.qualityforms.entities.QualityForm;
 import org.libreplan.business.resources.entities.Criterion;
 import org.libreplan.business.resources.entities.CriterionType;
 import org.libreplan.business.templates.entities.OrderElementTemplate;
 import org.libreplan.business.templates.entities.OrderTemplate;
+import org.libreplan.business.users.entities.User;
 import org.libreplan.web.common.IIntegrationEntityModel;
 import org.libreplan.web.planner.order.PlanningStateCreator.PlanningState;
 import org.zkoss.ganttz.IPredicate;
@@ -87,6 +89,10 @@ public interface IOrderModel extends IIntegrationEntityModel {
 
     List<Order> getOrders();
 
+    List<Order> getOrders(Date startDate, Date endDate, List<Label> labels,
+            List<Criterion> criteria, ExternalCompany customer,
+            OrderStatusEnum state);
+
     void initEdit(Order order, Desktop desktop);
 
     void prepareForCreate(Desktop desktop);
@@ -148,4 +154,6 @@ public interface IOrderModel extends IIntegrationEntityModel {
     boolean isOnlyChildAndParentAlreadyInUseByHoursOrExpenses(
             OrderElement orderElement);
 
+    User getUser();
+
 }
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java
index 82ade693b..17d2c08bb 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java
@@ -23,6 +23,8 @@ package org.libreplan.web.orders;
 
 import static org.libreplan.web.I18nHelper._;
 
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.ConcurrentModificationException;
 import java.util.Date;
 import java.util.HashMap;
@@ -36,6 +38,7 @@ import javax.annotation.Resource;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.LogFactory;
+import org.joda.time.LocalDate;
 import org.libreplan.business.calendars.entities.BaseCalendar;
 import org.libreplan.business.common.exceptions.InstanceNotFoundException;
 import org.libreplan.business.externalcompanies.entities.DeadlineCommunication;
@@ -48,9 +51,12 @@ import org.libreplan.business.orders.entities.Order.SchedulingMode;
 import org.libreplan.business.orders.entities.OrderElement;
 import org.libreplan.business.orders.entities.OrderStatusEnum;
 import org.libreplan.business.planner.entities.PositionConstraintType;
+import org.libreplan.business.resources.entities.Criterion;
 import org.libreplan.business.templates.entities.OrderTemplate;
+import org.libreplan.business.users.entities.User;
 import org.libreplan.business.users.entities.UserRole;
 import org.libreplan.web.common.ConfirmCloseUtil;
+import org.libreplan.web.common.FilterUtils;
 import org.libreplan.web.common.IMessagesForUser;
 import org.libreplan.web.common.Level;
 import org.libreplan.web.common.MessagesForUser;
@@ -60,6 +66,8 @@ import org.libreplan.web.common.Util.ReloadStrategy;
 import org.libreplan.web.common.components.bandboxsearch.BandboxMultipleSearch;
 import org.libreplan.web.common.components.bandboxsearch.BandboxSearch;
 import org.libreplan.web.common.components.finders.FilterPair;
+import org.libreplan.web.common.components.finders.OrderFilterEnum;
+import org.libreplan.web.common.components.finders.TaskGroupFilterEnum;
 import org.libreplan.web.orders.criterionrequirements.AssignedCriterionRequirementToOrderElementController;
 import org.libreplan.web.orders.labels.AssignedLabelsToOrderElementController;
 import org.libreplan.web.orders.labels.LabelsAssignmentToOrderElementComponent;
@@ -214,9 +222,91 @@ public class OrderCRUDController extends GenericForwardComposer {
                 .getFellow("bdFilters");
         checkIncludeOrderElements = (Checkbox) filterComponent
                 .getFellow("checkIncludeOrderElements");
-
         checkCreationPermissions();
         setupGlobalButtons();
+        initializeFilter();
+    }
+
+    private void initializeFilter() {
+        Date startDate = (Date) FilterUtils.readProjectsStartDate();
+        Date endDate = FilterUtils.readProjectsEndDate();
+
+        boolean calculateStartDate = (startDate == null);
+        boolean calculateEndDate = (endDate == null);
+
+        // Filter predicate needs to be calculated based on the projects dates
+        if ((calculateStartDate) || (calculateEndDate)) {
+
+            User user = orderModel.getUser();
+            // Calculate filter based on user preferences
+            if (user != null) {
+                if ((startDate == null)
+                        && !FilterUtils.hasProjectsStartDateChanged()
+                        && (user.getProjectsFilterPeriodSince() != null)) {
+                    startDate = new LocalDate()
+                            .minusMonths(user.getProjectsFilterPeriodSince())
+                            .toDateTimeAtStartOfDay().toDate();
+                }
+                if ((endDate == null)
+                        && !FilterUtils.hasProjectsEndDateChanged()
+                        && (user.getProjectsFilterPeriodTo() != null)) {
+                    endDate = new LocalDate()
+                            .plusMonths(user.getProjectsFilterPeriodTo())
+                            .toDateMidnight().toDate();
+                }
+            }
+        }
+        filterStartDate.setValue(startDate);
+        filterFinishDate.setValue(endDate);
+
+        loadLabels();
+        FilterUtils.writeProjectPlanningFilterChanged(false);
+    }
+
+    private void loadLabels() {
+        List<FilterPair> sessionFilters = FilterUtils
+                .readProjectsParameters();
+        // Allow labels when list is empty
+        if (sessionFilters != null) {
+            bdFilters.addSelectedElements(toOrderFilterEnum(sessionFilters));
+            return;
+        }
+
+        User user = orderModel.getUser();
+        // Calculate filter based on user preferences
+        if ((user != null) && (user.getProjectsFilterLabel() != null)) {
+            bdFilters.addSelectedElement(new FilterPair(OrderFilterEnum.Label,
+                    user.getProjectsFilterLabel().getFinderPattern(), user
+                            .getProjectsFilterLabel()));
+        }
+    }
+
+    private List<FilterPair> toOrderFilterEnum(List<FilterPair> filterPairs) {
+        List<FilterPair> result = new ArrayList<FilterPair>();
+        for (FilterPair filterPair : filterPairs) {
+            TaskGroupFilterEnum type = (TaskGroupFilterEnum) filterPair
+                    .getType();
+            switch (type) {
+            case Label:
+                result.add(new FilterPair(OrderFilterEnum.Label, filterPair
+                        .getPattern(), filterPair.getValue()));
+                break;
+            case Criterion:
+                result.add(new FilterPair(OrderFilterEnum.Criterion, filterPair
+                        .getPattern(), filterPair.getValue()));
+                break;
+            case ExternalCompany:
+                result.add(new FilterPair(OrderFilterEnum.ExternalCompany,
+                        filterPair.getPattern(), filterPair.getValue()));
+                break;
+            case State:
+                result.add(new FilterPair(OrderFilterEnum.State, filterPair
+                        .getPattern(), filterPair.getValue()));
+                break;
+            default:
+            }
+        }
+        return result;
     }
 
     private void setupGlobalButtons() {
@@ -456,7 +546,7 @@ public class OrderCRUDController extends GenericForwardComposer {
 
     private void reloadTree(TreeComponent orderElementsTree) {
         final Tree tree = (Tree) orderElementsTree.getFellowIfAny("tree");
-        tree.setModel(orderElementTreeController.getTreeModel());
+        tree.setModel(orderElementTreeController.getFilteredTreeModel());
         tree.addEventListener(Events.ON_SELECT, new EventListener() {
             @Override
             public void onEvent(Event event) {
@@ -653,7 +743,51 @@ public class OrderCRUDController extends GenericForwardComposer {
     }
 
     public List<Order> getOrders() {
-        return orderModel.getOrders();
+        if (checkIncludeOrderElements.isChecked()) {
+            return orderModel.getOrders();
+        }
+
+        return getOrdersFiltered();
+    }
+
+    private List<Order> getOrdersFiltered() {
+        List<org.libreplan.business.labels.entities.Label> labels = new ArrayList<org.libreplan.business.labels.entities.Label>();
+        List<Criterion> criteria = new ArrayList<Criterion>();
+        ExternalCompany customer = null;
+        OrderStatusEnum state = null;
+
+        for (FilterPair filterPair : (List<FilterPair>) bdFilters
+                .getSelectedElements()) {
+            OrderFilterEnum type = (OrderFilterEnum) filterPair.getType();
+            switch (type) {
+            case Label:
+                labels.add((org.libreplan.business.labels.entities.Label) filterPair
+                        .getValue());
+                break;
+            case Criterion:
+                criteria.add((Criterion) filterPair.getValue());
+                break;
+            case ExternalCompany:
+                if (customer != null) {
+                    // It's impossible to have an Order associated to more than
+                    // 1 customer
+                    return Collections.emptyList();
+                }
+                customer = (ExternalCompany) filterPair.getValue();
+                break;
+            case State:
+                if (state != null) {
+                    // It's impossible to have an Order associated with more
+                    // than 1 state
+                    return Collections.emptyList();
+                }
+                state = (OrderStatusEnum) filterPair.getValue();
+                break;
+            }
+        }
+
+        return orderModel.getOrders(filterStartDate.getValue(),
+                filterFinishDate.getValue(), labels, criteria, customer, state);
     }
 
     private OnlyOneVisible getVisibility() {
@@ -801,7 +935,6 @@ public class OrderCRUDController extends GenericForwardComposer {
         listing = (Grid) listWindow.getFellow("listing");
         showOrderFilter();
         showCreateButtons(true);
-        clearFilterDates();
     }
 
     private void showWindow(Window window) {
@@ -1319,9 +1452,9 @@ public class OrderCRUDController extends GenericForwardComposer {
                     throws WrongValueException {
                 Date finishDate = (Date) value;
                 if ((finishDate != null)
-                        && (filterStartDate.getValue() != null)
-                        && (finishDate.compareTo(filterStartDate.getValue()) < 0)) {
-                    filterFinishDate.setValue(null);
+                        && (filterStartDate.getRawValue() != null)
+                        && (finishDate.compareTo((Date) filterStartDate
+                                .getRawValue()) < 0)) {
                     throw new WrongValueException(comp,
                             _("must be after start date"));
                 }
@@ -1336,9 +1469,10 @@ public class OrderCRUDController extends GenericForwardComposer {
                     throws WrongValueException {
                 Date startDate = (Date) value;
                 if ((startDate != null)
-                        && (filterFinishDate.getValue() != null)
-                        && (startDate.compareTo(filterFinishDate.getValue()) > 0)) {
-                    filterStartDate.setValue(null);
+                        && (filterFinishDate.getRawValue() != null)
+                        && (startDate.compareTo((Date) filterFinishDate
+                                .getRawValue()) > 0)) {
+                    // filterStartDate.setValue(null);
                     throw new WrongValueException(comp,
                             _("must be lower than end date"));
                 }
@@ -1348,13 +1482,55 @@ public class OrderCRUDController extends GenericForwardComposer {
 
     public void onApplyFilter() {
         OrderPredicate predicate = createPredicate();
-        if (predicate != null) {
+        storeSessionVariables();
+        FilterUtils.writeProjectFilterChanged(true);
+        if (predicate != null && checkIncludeOrderElements.isChecked()) {
+            // Force reload conversation state in oderModel
+            getOrders();
             filterByPredicate(predicate);
         } else {
             showAllOrders();
         }
     }
 
+    private void storeSessionVariables() {
+        FilterUtils.writeProjectsFilter(filterStartDate.getValue(),
+                filterFinishDate.getValue(),
+                getSelectedBandboxAsTaskGroupFilters());
+    }
+
+    private List<FilterPair> getSelectedBandboxAsTaskGroupFilters() {
+        List<FilterPair> result = new ArrayList<FilterPair>();
+        for (FilterPair filterPair : (List<FilterPair>) bdFilters
+                .getSelectedElements()) {
+            OrderFilterEnum type = (OrderFilterEnum) filterPair
+                    .getType();
+            switch (type) {
+            case Label:
+                result.add(new FilterPair(TaskGroupFilterEnum.Label, filterPair
+                        .getPattern(), filterPair.getValue()));
+                break;
+            case Criterion:
+                result.add(new FilterPair(TaskGroupFilterEnum.Criterion,
+                        filterPair.getPattern(), filterPair.getValue()));
+                break;
+            case ExternalCompany:
+                result.add(new FilterPair(TaskGroupFilterEnum.ExternalCompany,
+                        filterPair.getPattern(), filterPair.getValue()));
+                break;
+            case State:
+                result.add(new FilterPair(TaskGroupFilterEnum.State, filterPair
+                        .getPattern(), filterPair.getValue()));
+                break;
+            default:
+                result.add(new FilterPair(OrderFilterEnum.Label, filterPair
+                        .getPattern(), filterPair.getValue()));
+                break;
+            }
+        }
+        return result;
+    }
+
     private OrderPredicate createPredicate() {
         List<FilterPair> listFilters = (List<FilterPair>) bdFilters
                 .getSelectedElements();
@@ -1375,13 +1551,8 @@ public class OrderCRUDController extends GenericForwardComposer {
         listing.invalidate();
     }
 
-    private void clearFilterDates() {
-        filterStartDate.setValue(null);
-        filterFinishDate.setValue(null);
-    }
-
-    public void showAllOrders() {
-        listing.setModel(new SimpleListModel(orderModel.getOrders().toArray()));
+    private void showAllOrders() {
+        listing.setModel(new SimpleListModel(getOrders().toArray()));
         listing.invalidate();
     }
 
@@ -1685,6 +1856,12 @@ public class OrderCRUDController extends GenericForwardComposer {
         return Util.getCurrencySymbol();
     }
 
+    public void readSessionFilterDates() {
+        filterStartDate.setValue(FilterUtils.readProjectsStartDate());
+        filterFinishDate.setValue(FilterUtils.readProjectsEndDate());
+        loadLabels();
+    }
+
     /**
      * Setup the connector, JiraSynchronization controller
      */
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementPredicate.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementPredicate.java
index 0552d61bb..a7c2ef3f2 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementPredicate.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementPredicate.java
@@ -67,10 +67,18 @@ public class OrderElementPredicate implements IPredicate {
         return accepts(orderElement) || accepts(orderElement.getAllChildren());
     }
 
+    public boolean isEmpty() {
+        return (filters.isEmpty() && startDate == null && finishDate == null && name
+                .isEmpty());
+    }
+
     private boolean accepts(OrderElement orderElement) {
         if (orderElement == null) {
             return false;
         }
+        if (orderElement.isNewObject() || orderElement.isConvertedToContainer()) {
+            return true;
+        }
         if (acceptFilters(orderElement) && acceptFiltersDates(orderElement)
                 && acceptFilterName(orderElement)) {
             return true;
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java
index 2a2484bbc..1f2d4f025 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java
@@ -32,6 +32,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.logging.Filter;
 
 import javax.annotation.Resource;
 
@@ -49,12 +50,15 @@ import org.libreplan.business.orders.entities.SchedulingState;
 import org.libreplan.business.requirements.entities.CriterionRequirement;
 import org.libreplan.business.templates.entities.OrderElementTemplate;
 import org.libreplan.business.users.entities.UserRole;
+import org.libreplan.web.common.FilterUtils;
 import org.libreplan.web.common.IMessagesForUser;
 import org.libreplan.web.common.Level;
 import org.libreplan.web.common.Util;
 import org.libreplan.web.common.components.bandboxsearch.BandboxMultipleSearch;
 import org.libreplan.web.common.components.bandboxsearch.BandboxSearch;
 import org.libreplan.web.common.components.finders.FilterPair;
+import org.libreplan.web.common.components.finders.OrderElementFilterEnum;
+import org.libreplan.web.common.components.finders.TaskElementFilterEnum;
 import org.libreplan.web.orders.assigntemplates.TemplateFinderPopup;
 import org.libreplan.web.orders.assigntemplates.TemplateFinderPopup.IOnResult;
 import org.libreplan.web.security.SecurityUtils;
@@ -76,6 +80,7 @@ import org.zkoss.zul.Datebox;
 import org.zkoss.zul.Popup;
 import org.zkoss.zul.Tab;
 import org.zkoss.zul.Textbox;
+import org.zkoss.zul.TreeModel;
 import org.zkoss.zul.Treechildren;
 import org.zkoss.zul.Treeitem;
 import org.zkoss.zul.Vbox;
@@ -285,9 +290,47 @@ public class OrderElementTreeController extends TreeController<OrderElement> {
         operationsForOrderElement.tree(tree)
                 .orderTemplates(this.orderTemplates);
 
+        importOrderFiltersFromSession();
         disableCreateTemplateButtonIfNeeded(comp);
     }
 
+    private void importOrderFiltersFromSession() {
+        Order order = orderModel.getOrder();
+        filterNameOrderElement.setValue(FilterUtils
+.readOrderTaskName(order));
+        filterStartDateOrderElement.setValue(FilterUtils
+                .readOrderStartDate(order));
+        filterFinishDateOrderElement.setValue(FilterUtils
+                .readOrderEndDate(order));
+        if (FilterUtils.readOrderParameters(order) != null) {
+            for (FilterPair each : (List<FilterPair>) FilterUtils
+                    .readOrderParameters(order)) {
+                if (toOrderFilterEnum(each) != null) {
+                    bdFiltersOrderElement
+                            .addSelectedElement(toOrderFilterEnum(each));
+                }
+            }
+        }
+        if (FilterUtils.readOrderInheritance(order) != null) {
+            labelsWithoutInheritance.setChecked(FilterUtils
+                    .readOrderInheritance(order));
+        }
+    }
+
+    private FilterPair toOrderFilterEnum(FilterPair each) {
+        switch ((TaskElementFilterEnum) each.getType()) {
+        case Label:
+            return new FilterPair(OrderElementFilterEnum.Label,
+                    each.getPattern(), each.getValue());
+        case Criterion:
+            return new FilterPair(OrderElementFilterEnum.Criterion,
+                    each.getPattern(), each.getValue());
+        case Resource:
+            // Resources are discarded on WBS filter
+        }
+        return null;
+    }
+
     private void disableCreateTemplateButtonIfNeeded(Component comp) {
         Button createTemplateButton = (Button) comp
                 .getFellowIfAny("createTemplateButton");
@@ -569,13 +612,15 @@ public class OrderElementTreeController extends TreeController<OrderElement> {
 
     @Override
     protected boolean isPredicateApplied() {
-        return predicate != null;
+        return (predicate != null)
+                && !((OrderElementPredicate) predicate).isEmpty();
     }
 
     /**
      * Apply filter to order elements in current order
      */
     public void onApplyFilter() {
+        writeFilterParameters();
         OrderElementPredicate predicate = createPredicate();
         this.predicate = predicate;
 
@@ -586,6 +631,38 @@ public class OrderElementTreeController extends TreeController<OrderElement> {
         }
     }
 
+    private void writeFilterParameters() {
+        Order order = orderModel.getOrder();
+        FilterUtils.writeOrderStartDate(order,
+                filterStartDateOrderElement.getValue());
+        FilterUtils.writeOrderEndDate(order,
+                filterFinishDateOrderElement.getValue());
+        FilterUtils
+                .writeOrderTaskName(order,
+                filterNameOrderElement.getValue());
+        FilterUtils.writeOrderInheritance(order,
+                labelsWithoutInheritance.isChecked());
+        List<FilterPair> result = new ArrayList<FilterPair>();
+        for (FilterPair filterPair : (List<FilterPair>) bdFiltersOrderElement
+                .getSelectedElements()) {
+            result.add(toTasKElementFilterEnum(filterPair));
+        }
+        FilterUtils.writeOrderParameters(order, result);
+        FilterUtils.writeOrderWBSFiltersChanged(order, true);
+    }
+
+    private FilterPair toTasKElementFilterEnum(FilterPair each) {
+        switch ((OrderElementFilterEnum) each.getType()) {
+        case Label:
+            return new FilterPair(TaskElementFilterEnum.Label,
+                    each.getPattern(), each.getValue());
+        case Criterion:
+            return new FilterPair(TaskElementFilterEnum.Criterion,
+                    each.getPattern(), each.getValue());
+        }
+        return null;
+    }
+
     private OrderElementPredicate createPredicate() {
         List<FilterPair> listFilters = (List<FilterPair>) bdFiltersOrderElement
                 .getSelectedElements();
@@ -603,6 +680,29 @@ public class OrderElementTreeController extends TreeController<OrderElement> {
                 name, ignoreLabelsInheritance);
     }
 
+    public TreeModel getFilteredTreeModel() {
+        OrderElementTreeModel filteredModel = getFilteredModel();
+        if (filteredModel == null) {
+            return null;
+        }
+        return filteredModel.asTree();
+    }
+
+    public OrderElementTreeModel getFilteredModel() {
+        if (orderModel == null) {
+            return null;
+        }
+
+        OrderElementPredicate predicate = createPredicate();
+        this.predicate = predicate;
+
+        if (predicate != null) {
+            return orderModel.getOrderElementsFilteredByPredicate(predicate);
+        } else {
+            return orderModel.getOrderElementTreeModel();
+        }
+    }
+
     private void filterByPredicate(OrderElementPredicate predicate) {
         OrderElementTreeModel orderElementTreeModel = orderModel
                 .getOrderElementsFilteredByPredicate(predicate);
@@ -618,10 +718,7 @@ public class OrderElementTreeController extends TreeController<OrderElement> {
 
     @Override
     protected boolean isNewButtonDisabled() {
-        if(readOnly) {
-            return true;
-        }
-        return isPredicateApplied();
+        return readOnly;
     }
 
     /**
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java
index ea29d4eec..e57e0d932 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java
@@ -58,6 +58,7 @@ import org.libreplan.business.orders.entities.HoursGroup;
 import org.libreplan.business.orders.entities.Order;
 import org.libreplan.business.orders.entities.OrderElement;
 import org.libreplan.business.orders.entities.OrderLineGroup;
+import org.libreplan.business.orders.entities.OrderStatusEnum;
 import org.libreplan.business.planner.entities.IMoneyCostCalculator;
 import org.libreplan.business.planner.entities.PositionConstraintType;
 import org.libreplan.business.qualityforms.daos.IQualityFormDAO;
@@ -222,6 +223,22 @@ public class OrderModel extends IntegrationEntityModel implements IOrderModel {
         return orders;
     }
 
+    @Override
+    @Transactional(readOnly = true)
+    public List<Order> getOrders(Date startDate, Date endDate,
+            List<Label> labels, List<Criterion> criteria,
+            ExternalCompany customer, OrderStatusEnum state) {
+        getLabelsOnConversation().reattachLabels();
+        List<Order> orders = orderDAO
+                .getOrdersByReadAuthorizationBetweenDatesByLabelsCriteriaCustomerAndState(
+                        SecurityUtils.getSessionUserLoginName(),
+                        scenarioManager.getCurrent(), startDate, endDate,
+                        labels, criteria, customer, state);
+
+        initializeOrders(orders);
+        return orders;
+    }
+
     private void initializeOrders(List<Order> list) {
         for (Order order : list) {
             orderDAO.reattachUnmodifiedEntity(order);
@@ -928,4 +945,21 @@ public class OrderModel extends IntegrationEntityModel implements IOrderModel {
         }
     }
 
+    @Override
+    @Transactional(readOnly = true)
+    public User getUser() {
+        User user;
+        try {
+            user = this.userDAO.findByLoginName(SecurityUtils
+                    .getSessionUserLoginName());
+        } catch (InstanceNotFoundException e) {
+            throw new RuntimeException(e);
+        }
+        // Attach filter bandbox elements
+        if (user.getProjectsFilterLabel() != null) {
+            user.getProjectsFilterLabel().getFinderPattern();
+        }
+        return user;
+    }
+
 }
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskGroupPredicate.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskGroupPredicate.java
index bede2dcaf..9ae289f32 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskGroupPredicate.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskGroupPredicate.java
@@ -18,6 +18,7 @@
  */
 package org.libreplan.web.planner;
 
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.Set;
@@ -282,4 +283,27 @@ public class TaskGroupPredicate implements IPredicate {
         return false;
     }
 
+    public boolean isIncludeChildren() {
+        return includeChildren;
+    }
+
+    public List<FilterPair> getFilters() {
+        if (filters == null) {
+            return Collections.emptyList();
+        }
+        return Collections.unmodifiableList(filters);
+    }
+
+    public Date getStartDate() {
+        return startDate;
+    }
+
+    public Date getFinishDate() {
+        return finishDate;
+    }
+
+    public void setFilters(List<FilterPair> listFilters) {
+        filters = listFilters;
+    }
+
 }
\ No newline at end of file
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java
index 61409fda5..b0533e756 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java
@@ -41,6 +41,7 @@ import org.apache.commons.lang.Validate;
 import org.joda.time.DateTime;
 import org.joda.time.LocalDate;
 import org.joda.time.Period;
+import org.libreplan.business.orders.entities.Order;
 import org.libreplan.business.planner.entities.AggregateOfResourceAllocations;
 import org.libreplan.business.planner.entities.AssignmentFunction;
 import org.libreplan.business.planner.entities.AssignmentFunction.AssignmentFunctionName;
@@ -56,6 +57,7 @@ import org.libreplan.business.planner.entities.TaskElement;
 import org.libreplan.business.resources.entities.Criterion;
 import org.libreplan.business.workingday.EffortDuration;
 import org.libreplan.web.common.EffortDurationBox;
+import org.libreplan.web.common.FilterUtils;
 import org.libreplan.web.common.IMessagesForUser;
 import org.libreplan.web.common.MessagesForUser;
 import org.libreplan.web.common.OnlyOneVisible;
@@ -377,24 +379,29 @@ public class AdvancedAllocationController extends GenericForwardComposer {
     private Listbox advancedAllocationHorizontalPagination;
     private Listbox advancedAllocationVerticalPagination;
 
-    private boolean fixedZoomByUser = false;
     private ZoomLevel zoomLevel;
 
-    public AdvancedAllocationController(IBack back,
+    private Order order;
+
+    public AdvancedAllocationController(Order order, IBack back,
             List<AllocationInput> allocationInputs) {
-        setInputData(back, allocationInputs);
+        setInputData(order, back, allocationInputs);
     }
 
-    private void setInputData(IBack back, List<AllocationInput> allocationInputs) {
+    private void setInputData(Order order, IBack back,
+            List<AllocationInput> allocationInputs) {
+        Validate.notNull(order);
         Validate.notNull(back);
         Validate.noNullElements(allocationInputs);
+        this.order = order;
         this.back = back;
         this.allocationInputs = allocationInputs;
     }
 
-    public void reset(IBack back, List<AllocationInput> allocationInputs) {
+    public void reset(Order order, IBack back,
+            List<AllocationInput> allocationInputs) {
         rowsCached = null;
-        setInputData(back, allocationInputs);
+        setInputData(order, back, allocationInputs);
         loadAndInitializeComponents();
     }
 
@@ -576,7 +583,8 @@ public class AdvancedAllocationController extends GenericForwardComposer {
     private void createComponents() {
         timeTracker = new TimeTracker(addMarginTointerval(), self);
         paginatorFilter = new PaginatorFilter();
-        if (fixedZoomByUser && (zoomLevel != null)) {
+        zoomLevel = FilterUtils.readZoomLevel(order);
+        if (zoomLevel != null) {
             timeTracker.setZoomLevel(zoomLevel);
         }
         paginatorFilter.setZoomLevel(timeTracker.getDetailLevel());
@@ -588,7 +596,7 @@ public class AdvancedAllocationController extends GenericForwardComposer {
         timeTracker.addZoomListener(new IZoomLevelChangedListener() {
             @Override
             public void zoomLevelChanged(ZoomLevel detailLevel) {
-                fixedZoomByUser = true;
+                FilterUtils.writeZoomLevel(order, detailLevel);
                 zoomLevel = detailLevel;
 
                 paginatorFilter.setZoomLevel(detailLevel);
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/IResourceAllocationModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/IResourceAllocationModel.java
index 5eaf7b981..ba55287c9 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/IResourceAllocationModel.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/IResourceAllocationModel.java
@@ -38,6 +38,7 @@ import org.zkoss.ganttz.extensions.IContextWithPlannerTask;
  *
  * @author Manuel Rego Casasnovas <mrego@igalia.com>
  * @author Diego Pino García <dpino@igalia.com>
+ * @author Javier Moran Rua <jmoran@igalia.com>
  */
 public interface IResourceAllocationModel extends INewAllocationsAdder {
 
@@ -84,4 +85,6 @@ public interface IResourceAllocationModel extends INewAllocationsAdder {
 
     Date getTaskEnd();
 
-}
\ No newline at end of file
+    Date getTaskStart();
+
+}
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java
index 0b2509bc2..6a07051b9 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java
@@ -31,6 +31,7 @@ import java.util.List;
 import org.apache.commons.lang.Validate;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.joda.time.LocalDate;
 import org.libreplan.business.orders.entities.AggregatedHoursGroup;
 import org.libreplan.business.planner.entities.CalculatedValue;
 import org.libreplan.business.planner.entities.DerivedAllocation;
@@ -82,8 +83,10 @@ import org.zkoss.zul.Window;
 
 /**
  * Controller for {@link ResourceAllocation} view.
+ *
  * @author Manuel Rego Casasnovas <mrego@igalia.com>
  * @author Diego Pino Garcia <dpino@igalia.com>
+ * @author Javier Moran Rua <jmoran@igalia.com>
  */
 @org.springframework.stereotype.Component("resourceAllocationController")
 @Scope(BeanDefinition.SCOPE_PROTOTYPE)
@@ -162,6 +165,7 @@ public class ResourceAllocationController extends GenericForwardComposer {
         assignedEffortComponent.setWidth("80px");
     }
 
+    @Override
     public ResourceAllocationController getController() {
         return this;
     }
@@ -228,12 +232,14 @@ public class ResourceAllocationController extends GenericForwardComposer {
         return allocationConfiguration.getTaskWorkableDays();
     }
 
-    private Label getTaskStart() {
-        return allocationConfiguration.getTaskStart();
+    public Label getTaskStart() {
+        return (allocationConfiguration != null) ? allocationConfiguration
+                .getTaskStart() : null;
     }
 
-    private Label getTaskEnd() {
-        return allocationConfiguration.getTaskEnd();
+    public Label getTaskEnd() {
+        return (allocationConfiguration != null) ? allocationConfiguration
+                .getTaskEnd() : null;
     }
 
     private Radiogroup getCalculationTypeSelector() {
@@ -317,8 +323,23 @@ public class ResourceAllocationController extends GenericForwardComposer {
     }
 
     public void goToAdvancedSearch() {
+        newAllocationSelector
+                .setStartFilteringDate(LocalDate
+                        .fromDateFields(resourceAllocationModel.getTaskStart())
+                        .minusDays(
+                                NewAllocationSelector.DAYS_LEAD_LAG_TO_TASK_LIMITS_DATES_FILTERING_INITIALIZATION)
+                        .toDateTimeAtStartOfDay().toDate());
+        newAllocationSelector
+                .setEndFilteringDate(LocalDate
+                        .fromDateFields(resourceAllocationModel.getTaskEnd())
+                        .plusDays(
+                                NewAllocationSelector.DAYS_LEAD_LAG_TO_TASK_LIMITS_DATES_FILTERING_INITIALIZATION)
+                        .toDateTimeAtStartOfDay().toDate());
         applyButton.setVisible(false);
         workerSearchTab.setSelected(true);
+        // The initial search and ratio load calculations is raised
+        // on going to advanced search
+        newAllocationSelector.clearAll();
     }
 
     /**
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationModel.java
index bfd8d0e46..9ef30078b 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationModel.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationModel.java
@@ -54,13 +54,14 @@ import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.zkoss.ganttz.data.GanttDate;
 import org.zkoss.ganttz.extensions.IContextWithPlannerTask;
 
 /**
  * Model for UI operations related to {@link Task}
+ *
  * @author Manuel Rego Casasnovas <mrego@igalia.com>
  * @author Diego Pino García <dpino@igalia.com>
+ * @author Javier Moran Rua <jmoran@igalia.com>
  */
 @Service
 @Scope(BeanDefinition.SCOPE_PROTOTYPE)
@@ -325,4 +326,17 @@ public class ResourceAllocationModel implements IResourceAllocationModel {
         return task.getEndDate();
     }
 
+    @Override
+    public Date getTaskStart() {
+        Date result;
+
+        if (task == null) {
+            result = null;
+        } else {
+            result = task.getStartDate();
+        }
+
+        return result;
+    }
+
 }
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java
index 4ffcc1402..f8c18114d 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2009-2010 Fundación para o Fomento da Calidade Industrial e
  *                         Desenvolvemento Tecnolóxico de Galicia
- * Copyright (C) 2010-2011 Igalia, S.L.
+ * Copyright (C) 2010-2013 Igalia, S.L.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -30,18 +30,21 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.lang.Validate;
+import org.joda.time.LocalDate;
 import org.libreplan.business.common.entities.ProgressType;
 import org.libreplan.business.planner.entities.TaskElement;
+import org.libreplan.business.users.entities.User;
 import org.libreplan.business.users.entities.UserRole;
+import org.libreplan.web.common.FilterUtils;
 import org.libreplan.web.common.components.bandboxsearch.BandboxMultipleSearch;
 import org.libreplan.web.common.components.finders.FilterPair;
+import org.libreplan.web.common.components.finders.TaskGroupFilterEnum;
 import org.libreplan.web.planner.TaskGroupPredicate;
 import org.libreplan.web.planner.tabs.MultipleTabsPlannerController;
 import org.libreplan.web.security.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.context.annotation.Scope;
-import org.zkoss.ganttz.IPredicate;
 import org.zkoss.ganttz.Planner;
 import org.zkoss.ganttz.extensions.ICommandOnTask;
 import org.zkoss.ganttz.timetracker.zoom.ZoomLevel;
@@ -67,6 +70,7 @@ import org.zkoss.zul.Vbox;
  * planner.
  *
  * @author Manuel Rego Casasnovas <mrego@igalia.com>
+ * @author Lorenzo Tilve Álvaro <ltilve@igalia.com>
  */
 @org.springframework.stereotype.Component
 @Scope(BeanDefinition.SCOPE_PROTOTYPE)
@@ -135,14 +139,49 @@ public class CompanyPlanningController implements Composer {
         bdFilters = (BandboxMultipleSearch) filterComponent
                 .getFellow("bdFilters");
         bdFilters.setFinder("taskGroupsMultipleFiltersFinder");
+        loadPredefinedBandboxFilter();
+
         checkIncludeOrderElements = (Checkbox) filterComponent
                 .getFellow("checkIncludeOrderElements");
         filterComponent.setVisible(true);
-
         checkCreationPermissions();
 
     }
 
+    private void loadPredefinedBandboxFilter() {
+        User user = model.getUser();
+        List<FilterPair> sessionFilterPairs = FilterUtils
+                .readProjectsParameters();
+        if (sessionFilterPairs != null) {
+            bdFilters.addSelectedElements(sessionFilterPairs);
+        } else if ((user != null) && (user.getProjectsFilterLabel() != null)) {
+            bdFilters.clear();
+            bdFilters.addSelectedElement(new FilterPair(
+                    TaskGroupFilterEnum.Label, user.getProjectsFilterLabel()
+                            .getFinderPattern(), user
+                            .getProjectsFilterLabel()));
+        }
+
+        // Calculate filter based on user preferences
+        if (user != null) {
+            if ((filterStartDate.getValue() == null)
+                    && !FilterUtils.hasProjectsStartDateChanged()
+                    && (user.getProjectsFilterPeriodSince() != null)) {
+                filterStartDate.setValue(new LocalDate()
+                        .minusMonths(user.getProjectsFilterPeriodSince())
+                        .toDateTimeAtStartOfDay().toDate());
+            }
+            if (filterFinishDate.getValue() == null
+                    && !FilterUtils.hasProjectsEndDateChanged()
+                    && (user.getProjectsFilterPeriodTo() != null)) {
+                filterFinishDate.setValue(new LocalDate()
+                        .plusMonths(user.getProjectsFilterPeriodTo())
+                        .toDateMidnight().toDate());
+            }
+        }
+
+    }
+
     /**
      * Checks the creation permissions of the current user and enables/disables
      * the create buttons accordingly.
@@ -278,35 +317,50 @@ public class CompanyPlanningController implements Composer {
         };
     }
 
+    public void readSessionVariablesIntoComponents() {
+        filterStartDate.setValue(FilterUtils.readProjectsStartDate());
+        filterFinishDate.setValue(FilterUtils.readProjectsEndDate());
+        loadPredefinedBandboxFilter();
+    }
+
     public void onApplyFilter() {
+        FilterUtils.writeProjectsFilter(filterStartDate.getValue(),
+                filterFinishDate.getValue(), bdFilters.getSelectedElements());
+        FilterUtils.writeProjectPlanningFilterChanged(true);
         filterByPredicate(createPredicate());
     }
 
-    private IPredicate createPredicate() {
+    public void loadSessionFiltersIntoBandbox() {
+        bdFilters.addSelectedElements(FilterUtils.readProjectsParameters());
+    }
+
+    private TaskGroupPredicate createPredicate() {
         List<FilterPair> listFilters = (List<FilterPair>) bdFilters
                 .getSelectedElements();
         Date startDate = filterStartDate.getValue();
         Date finishDate = filterFinishDate.getValue();
         Boolean includeOrderElements = checkIncludeOrderElements.isChecked();
 
-        if (listFilters.isEmpty() && startDate == null && finishDate == null) {
-            IPredicate predicate = model.getDefaultPredicate(includeOrderElements);
+        if (startDate == null && finishDate == null) {
+            TaskGroupPredicate predicate = model
+                    .getDefaultPredicate(includeOrderElements);
             //show filter dates calculated by default on screen
-            if(model.getFilterStartDate() != null) {
-                filterStartDate.setValue(model.getFilterStartDate().
-                        toDateMidnight().toDate());
+            if (model.getFilterStartDate() != null
+                    && !FilterUtils.hasProjectsStartDateChanged()) {
+                filterStartDate.setValue(model.getFilterStartDate());
             }
-            if(model.getFilterFinishDate() != null) {
-                filterFinishDate.setValue(model.getFilterFinishDate().
-                        toDateMidnight().toDate());
+            if (model.getFilterFinishDate() != null
+                    && !FilterUtils.hasProjectsEndDateChanged()) {
+                filterFinishDate.setValue(model.getFilterFinishDate());
             }
+            predicate.setFilters(listFilters);
             return predicate;
         }
         return new TaskGroupPredicate(listFilters, startDate, finishDate,
                 includeOrderElements);
     }
 
-    private void filterByPredicate(IPredicate predicate) {
+    private void filterByPredicate(TaskGroupPredicate predicate) {
         // Recalculate predicate
         model.setConfigurationToPlanner(planner, additional,
                 doubleClickCommand, predicate);
@@ -314,6 +368,11 @@ public class CompanyPlanningController implements Composer {
         planner.invalidate();
     }
 
+    public void setPredicate() {
+        model.setConfigurationToPlanner(planner, additional,
+                doubleClickCommand, createPredicate());
+    }
+
     public void setTabsController(MultipleTabsPlannerController tabsController) {
         this.tabsController = tabsController;
     }
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java
index fbe3552c6..6af87e68b 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java
@@ -47,6 +47,7 @@ import org.libreplan.business.common.IOnTransaction;
 import org.libreplan.business.common.daos.IConfigurationDAO;
 import org.libreplan.business.common.entities.ProgressType;
 import org.libreplan.business.common.exceptions.InstanceNotFoundException;
+import org.libreplan.business.externalcompanies.entities.ExternalCompany;
 import org.libreplan.business.hibernate.notification.PredefinedDatabaseSnapshots;
 import org.libreplan.business.orders.daos.IOrderDAO;
 import org.libreplan.business.orders.entities.Order;
@@ -57,10 +58,14 @@ import org.libreplan.business.planner.entities.ICompanyEarnedValueCalculator;
 import org.libreplan.business.planner.entities.TaskElement;
 import org.libreplan.business.planner.entities.TaskGroup;
 import org.libreplan.business.planner.entities.TaskMilestone;
+import org.libreplan.business.resources.entities.Criterion;
 import org.libreplan.business.scenarios.IScenarioManager;
 import org.libreplan.business.scenarios.entities.Scenario;
 import org.libreplan.business.users.daos.IUserDAO;
 import org.libreplan.business.users.entities.User;
+import org.libreplan.web.common.FilterUtils;
+import org.libreplan.web.common.components.finders.FilterPair;
+import org.libreplan.web.common.components.finders.TaskGroupFilterEnum;
 import org.libreplan.web.planner.TaskElementAdapter;
 import org.libreplan.web.planner.TaskGroupPredicate;
 import org.libreplan.web.planner.chart.Chart;
@@ -81,7 +86,6 @@ import org.springframework.transaction.annotation.Transactional;
 import org.zkforge.timeplot.Plotinfo;
 import org.zkforge.timeplot.Timeplot;
 import org.zkoss.ganttz.IChartVisibilityChangedListener;
-import org.zkoss.ganttz.IPredicate;
 import org.zkoss.ganttz.Planner;
 import org.zkoss.ganttz.adapters.IStructureNavigator;
 import org.zkoss.ganttz.adapters.PlannerConfiguration;
@@ -159,11 +163,8 @@ public class CompanyPlanningModel implements ICompanyPlanningModel {
     private LocalDate filterFinishDate;
 
     // All the status but CANCELLED and STORED
-    private static final EnumSet<OrderStatusEnum> STATUS_VISUALIZED = EnumSet
-            .of(OrderStatusEnum.PRE_SALES, OrderStatusEnum.OFFERED,
-                    OrderStatusEnum.OUTSOURCED, OrderStatusEnum.ACCEPTED,
-                    OrderStatusEnum.STARTED, OrderStatusEnum.ON_HOLD,
-                    OrderStatusEnum.FINISHED);
+    private static final EnumSet<OrderStatusEnum> STATUS_VISUALIZED = OrderStatusEnum
+            .getVisibleStatus();
 
     public void setPlanningControllerEntryPoints(
             MultipleTabsPlannerController entryPoints) {
@@ -202,7 +203,7 @@ public class CompanyPlanningModel implements ICompanyPlanningModel {
     public void setConfigurationToPlanner(final Planner planner,
             Collection<ICommandOnTask<TaskElement>> additional,
             ICommandOnTask<TaskElement> doubleClickCommand,
-            IPredicate predicate) {
+            TaskGroupPredicate predicate) {
         currentScenario = scenarioManager.getCurrent();
         final PlannerConfiguration<TaskElement> configuration = createConfiguration(predicate);
 
@@ -232,14 +233,13 @@ public class CompanyPlanningModel implements ICompanyPlanningModel {
         addPrintSupport(configuration);
         disableSomeFeatures(configuration);
 
-        ZoomLevel defaultZoomLevel = OrderPlanningModel
-                .calculateDefaultLevel(configuration);
-        OrderPlanningModel.configureInitialZoomLevelFor(planner,
-                defaultZoomLevel);
+        planner.setInitialZoomLevel(getZoomLevel(configuration));
 
         configuration.setSecondLevelModificators(BankHolidaysMarker.create(getDefaultCalendar()));
         planner.setConfiguration(configuration);
 
+        setupZoomLevelListener(planner);
+
         if(expandPlanningViewChart) {
             //if the chart is expanded, we load the data now
             setupChartAndItsContent(planner, chartComponent);
@@ -266,6 +266,32 @@ public class CompanyPlanningModel implements ICompanyPlanningModel {
         }
     }
 
+    private ZoomLevel getZoomLevel(
+            PlannerConfiguration<TaskElement> configuration) {
+        ZoomLevel sessionZoom = FilterUtils.readZoomLevelCompanyView();
+        if (sessionZoom != null) {
+            return sessionZoom;
+        }
+        return OrderPlanningModel.calculateDefaultLevel(configuration);
+    }
+
+    private void setupZoomLevelListener(Planner planner) {
+        planner.getTimeTracker().addZoomListener(getSessionZoomLevelListener());
+    }
+
+    private IZoomLevelChangedListener getSessionZoomLevelListener() {
+        IZoomLevelChangedListener zoomListener = new IZoomLevelChangedListener() {
+
+            @Override
+            public void zoomLevelChanged(ZoomLevel detailLevel) {
+                FilterUtils.writeZoomLevelCompanyView(detailLevel);
+            }
+        };
+
+        keepAliveZoomListeners.add(zoomListener);
+        return zoomListener;
+    }
+
     private BaseCalendar getDefaultCalendar() {
         return configurationDAO.getConfiguration().getDefaultCalendar();
     }
@@ -682,24 +708,36 @@ public class CompanyPlanningModel implements ICompanyPlanningModel {
     }
 
     private PlannerConfiguration<TaskElement> createConfiguration(
-            IPredicate predicate) {
+            TaskGroupPredicate predicate) {
         return new PlannerConfiguration<TaskElement>(
                 taskElementAdapterCreator.createForCompany(currentScenario),
                 new TaskElementNavigator(), retainOnlyTopLevel(predicate));
     }
 
-    private List<TaskElement> retainOnlyTopLevel(IPredicate predicate) {
+    private List<TaskElement> retainOnlyTopLevel(TaskGroupPredicate predicate) {
         List<TaskElement> result = new ArrayList<TaskElement>();
 
-        List<Order> list = orderDAO.getOrdersByReadAuthorizationByScenario(
-                SecurityUtils.getSessionUserLoginName(), currentScenario);
+        List<Order> list = getOrders(predicate);
         for (Order order : list) {
             order.useSchedulingDataFor(currentScenario, false);
             TaskGroup associatedTaskElement = order.getAssociatedTaskElement();
 
-            if (associatedTaskElement != null
-                    && (predicate == null || predicate
-                            .accepts(associatedTaskElement))) {
+            if (associatedTaskElement != null) {
+                if (predicate != null) {
+                    // If predicate includeChildren then we check if it accepts
+                    // the element
+                    if (predicate.isIncludeChildren()
+                            && !predicate.accepts(associatedTaskElement)) {
+                        // If it doesn't accept the element we move on to the
+                        // next order
+                        continue;
+                    }
+                }
+                // If predicate doesn't includeChildren then the orders where
+                // already filtered in the DB query.
+                // Otherwise they've been filtered with the predicate above, and
+                // if they didn't pass the filter the execution doesn't reach
+                // this point.
                 associatedTaskElement.setSimplifiedAssignedStatusCalculationEnabled(true);
                 result.add(associatedTaskElement);
             }
@@ -713,26 +751,90 @@ public class CompanyPlanningModel implements ICompanyPlanningModel {
         return result;
     }
 
-    @Override
-    @Transactional(readOnly = true)
-    public IPredicate getDefaultPredicate(Boolean includeOrderElements) {
-        if (currentScenario == null) {
-            currentScenario = scenarioManager.getCurrent();
+    private List<Order> getOrders(TaskGroupPredicate predicate) {
+        String username = SecurityUtils.getSessionUserLoginName();
+        if (predicate.isIncludeChildren()) {
+            return orderDAO.getOrdersByReadAuthorizationByScenario(username,
+                    currentScenario);
         }
 
-        List<Order> list = orderDAO.getOrdersByReadAuthorizationByScenario(
-                SecurityUtils.getSessionUserLoginName(), currentScenario);
-        Date startDate = null;
-        Date endDate = null;
-        for (Order each : list) {
-            each.useSchedulingDataFor(currentScenario, false);
-            TaskGroup associatedTaskElement = each.getAssociatedTaskElement();
-            if (associatedTaskElement != null
-                    && STATUS_VISUALIZED.contains(each.getState())) {
-                startDate = Collections.min(notNull(startDate, each.getInitDate(),
-                        associatedTaskElement.getStartDate()));
-                endDate = Collections.max(notNull(endDate, each.getDeadline(),
-                        associatedTaskElement.getEndDate()));
+        Date startDate = predicate.getStartDate();
+        Date endDate = predicate.getFinishDate();
+        List<org.libreplan.business.labels.entities.Label> labels = new ArrayList<org.libreplan.business.labels.entities.Label>();
+        List<Criterion> criteria = new ArrayList<Criterion>();
+        ExternalCompany customer = null;
+        OrderStatusEnum state = null;
+
+        for (FilterPair filterPair : (List<FilterPair>) predicate.getFilters()) {
+            TaskGroupFilterEnum type = (TaskGroupFilterEnum) filterPair
+                    .getType();
+            switch (type) {
+            case Label:
+                labels.add((org.libreplan.business.labels.entities.Label) filterPair
+                        .getValue());
+                break;
+            case Criterion:
+                criteria.add((Criterion) filterPair.getValue());
+                break;
+            case ExternalCompany:
+                if (customer != null) {
+                    // It's impossible to have an Order associated to more than
+                    // 1 customer
+                    return Collections.emptyList();
+                }
+                customer = (ExternalCompany) filterPair.getValue();
+                break;
+            case State:
+                if (state != null) {
+                    // It's impossible to have an Order associated with more
+                    // than 1 state
+                    return Collections.emptyList();
+                }
+                state = (OrderStatusEnum) filterPair.getValue();
+                break;
+            }
+        }
+
+        return orderDAO
+                .getOrdersByReadAuthorizationBetweenDatesByLabelsCriteriaCustomerAndState(
+                        username, currentScenario, startDate, endDate, labels,
+                        criteria, customer, state);
+    }
+
+    @Override
+    @Transactional(readOnly = true)
+    public TaskGroupPredicate getDefaultPredicate(Boolean includeOrderElements) {
+
+        Date startDate = FilterUtils.readProjectsStartDate();
+        Date endDate = FilterUtils.readProjectsEndDate();
+
+        boolean calculateStartDate = (startDate == null);
+        boolean calculateEndDate = (endDate == null);
+
+        // Filter predicate needs to be calculated based on the projects dates
+        if ((calculateStartDate) || (calculateEndDate)) {
+            if (currentScenario == null) {
+                currentScenario = scenarioManager.getCurrent();
+            }
+            List<Order> list = orderDAO.getOrdersByReadAuthorizationByScenario(
+                    SecurityUtils.getSessionUserLoginName(), currentScenario);
+            for (Order each : list) {
+                each.useSchedulingDataFor(currentScenario, false);
+                TaskGroup associatedTaskElement = each
+                        .getAssociatedTaskElement();
+                if (associatedTaskElement != null
+                        && STATUS_VISUALIZED.contains(each.getState())) {
+                    if (calculateStartDate) {
+                        startDate = Collections.min(notNull(startDate,
+                                each.getInitDate(),
+                                associatedTaskElement.getStartDate()));
+                    }
+                    if (calculateEndDate) {
+                        endDate = Collections.max(notNull(endDate,
+                                each.getDeadline(),
+                                associatedTaskElement.getEndDate()));
+                    }
+                }
             }
         }
         filterStartDate = startDate != null ? LocalDate
@@ -754,18 +856,19 @@ public class CompanyPlanningModel implements ICompanyPlanningModel {
     }
 
     @Override
-    public LocalDate getFilterStartDate() {
-        return filterStartDate;
+    public Date getFilterStartDate() {
+        return ((filterStartDate == null) ? null : filterStartDate
+                .toDateTimeAtStartOfDay().toDate());
     }
-
     @Override
-    public LocalDate getFilterFinishDate() {
-        return filterFinishDate;
+    public Date getFilterFinishDate() {
+        return ((filterStartDate == null) ? null : filterFinishDate
+                .toDateMidnight().toDate());
     }
 
     private AvailabilityTimeLine.Interval getFilterInterval() {
-        return AvailabilityTimeLine.Interval.create(getFilterStartDate(),
-                getFilterFinishDate());
+        return AvailabilityTimeLine.Interval.create(filterStartDate,
+                filterFinishDate);
     }
 
     private class CompanyLoadChartFiller extends StandardLoadChartFiller {
@@ -834,4 +937,21 @@ public class CompanyPlanningModel implements ICompanyPlanningModel {
         return configurationDAO.getConfiguration().getProgressType();
     }
 
+    @Override
+    @Transactional(readOnly = true)
+    public User getUser() {
+        User user;
+        try {
+            user = this.userDAO.findByLoginName(SecurityUtils
+                    .getSessionUserLoginName());
+        } catch (InstanceNotFoundException e) {
+            throw new RuntimeException(e);
+        }
+        // Attach filter bandbox elements
+        if (user.getProjectsFilterLabel() != null) {
+            user.getProjectsFilterLabel().getFinderPattern();
+        }
+        return user;
+    }
+
 }
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/ICompanyPlanningModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/ICompanyPlanningModel.java
index 01c5d12fc..b9818704e 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/ICompanyPlanningModel.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/ICompanyPlanningModel.java
@@ -22,13 +22,14 @@
 package org.libreplan.web.planner.company;
 
 import java.util.Collection;
+import java.util.Date;
 
 import org.joda.time.LocalDate;
 import org.libreplan.business.common.entities.ProgressType;
 import org.libreplan.business.planner.entities.TaskElement;
-import org.libreplan.business.templates.entities.OrderTemplate;
+import org.libreplan.business.users.entities.User;
+import org.libreplan.web.planner.TaskGroupPredicate;
 import org.libreplan.web.planner.tabs.MultipleTabsPlannerController;
-import org.zkoss.ganttz.IPredicate;
 import org.zkoss.ganttz.Planner;
 import org.zkoss.ganttz.extensions.ICommandOnTask;
 
@@ -41,16 +42,18 @@ public interface ICompanyPlanningModel {
 
     public void setConfigurationToPlanner(Planner planner,
             Collection<ICommandOnTask<TaskElement>> additional,
-            ICommandOnTask<TaskElement> doubleClickCommand, IPredicate predicate);
+            ICommandOnTask<TaskElement> doubleClickCommand,
+            TaskGroupPredicate predicate);
 
     public void setTabsController(MultipleTabsPlannerController tabsController);
 
-    LocalDate getFilterStartDate();
+    Date getFilterStartDate();
 
-    LocalDate getFilterFinishDate();
+    Date getFilterFinishDate();
 
     ProgressType getProgressTypeFromConfiguration();
 
-    public IPredicate getDefaultPredicate(Boolean includeOrderElements);
+    public TaskGroupPredicate getDefaultPredicate(Boolean includeOrderElements);
 
-}
+    User getUser();
+}
\ No newline at end of file
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java
index c6fe23907..914118d6c 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2009-2010 Fundación para o Fomento da Calidade Industrial e
  *                         Desenvolvemento Tecnolóxico de Galicia
- * Copyright (C) 2010-2011 Igalia, S.L.
+ * Copyright (C) 2010-2013 Igalia, S.L.
  * Copyright (C) 2010-2011 WirelessGalicia S.L.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -36,6 +36,7 @@ import org.apache.commons.lang.Validate;
 import org.apache.commons.logging.Log;
 import org.libreplan.business.orders.entities.Order;
 import org.libreplan.business.planner.entities.TaskElement;
+import org.libreplan.web.common.FilterUtils;
 import org.libreplan.web.common.ViewSwitcher;
 import org.libreplan.web.common.components.bandboxsearch.BandboxMultipleSearch;
 import org.libreplan.web.common.components.finders.FilterPair;
@@ -75,6 +76,7 @@ import org.zkoss.zul.Vbox;
 /**
  * @author Óscar González Fernández <ogonzalez@igalia.com>
  * @author Susana Montes Pedreira <smontes@wirelessgalicia.com>
+ * @author Lorenzo Tilve Álvaro <ltilve@igalia.com>
  */
 @Component
 @Scope(BeanDefinition.SCOPE_PROTOTYPE)
@@ -144,6 +146,7 @@ public class OrderPlanningController implements Composer {
         if (planner != null) {
             ensureIsInPlanningOrderView();
             updateConfiguration();
+            planner.setTaskListPredicate(getFilterAndParentExpanedPredicates(createPredicate()));
         }
     }
 
@@ -211,6 +214,8 @@ public class OrderPlanningController implements Composer {
 
     private void updateConfiguration() {
         if (order != null) {
+            importOrderFiltersFromSession();
+
             long time = System.currentTimeMillis();
             model.setConfigurationToPlanner(planner, order, viewSwitcher,
                     editTaskController, advancedAllocationTaskController,
@@ -225,6 +230,28 @@ public class OrderPlanningController implements Composer {
         }
     }
 
+    public void importOrderFiltersFromSession() {
+        importOrderFiltersFromSession(false);
+    }
+
+    public void importOrderFiltersFromSession(boolean forceReload) {
+        filterNameOrderElement.setValue(FilterUtils.readOrderTaskName(order));
+        filterStartDateOrderElement.setValue(FilterUtils
+                .readOrderStartDate(order));
+        filterFinishDateOrderElement.setValue(FilterUtils
+                .readOrderEndDate(order));
+        List<FilterPair> sessionFilterPairs = FilterUtils
+                .readOrderParameters(order);
+        if ((sessionFilterPairs != null)
+                && (bdFiltersOrderElement.getSelectedElements().isEmpty() || forceReload)) {
+            bdFiltersOrderElement.addSelectedElements(sessionFilterPairs);
+        }
+        if (FilterUtils.readOrderInheritance(order) != null) {
+            labelsWithoutInheritance.setChecked(FilterUtils
+                    .readOrderInheritance(order));
+        }
+    }
+
     public EditTaskController getEditTaskController() {
         return editTaskController;
     }
@@ -247,9 +274,18 @@ public class OrderPlanningController implements Composer {
 
     public void onApplyFilter() {
         filterByPredicate(createPredicate());
+        List<FilterPair> listFilters = (List<FilterPair>) bdFiltersOrderElement
+                .getSelectedElements();
+        FilterUtils.writeOrderParameters(order, listFilters);
     }
 
     private TaskElementPredicate createPredicate() {
+
+        if (FilterUtils.hasOrderWBSFiltersChanged(order)) {
+            importOrderFiltersFromSession(true);
+            FilterUtils.writeOrderWBSFiltersChanged(order, false);
+        }
+
         List<FilterPair> listFilters = (List<FilterPair>) bdFiltersOrderElement
                 .getSelectedElements();
         Date startDate = filterStartDateOrderElement.getValue();
@@ -261,7 +297,10 @@ public class OrderPlanningController implements Composer {
                 && name == null) {
             return null;
         }
-
+        FilterUtils.writeOrderTaskName(order, name);
+        FilterUtils.writeOrderStartDate(order, startDate);
+        FilterUtils.writeOrderEndDate(order, finishDate);
+        FilterUtils.writeOrderInheritance(order, ignoreLabelsInheritance);
         return new TaskElementPredicate(listFilters, startDate, finishDate,
                 name, ignoreLabelsInheritance);
     }
@@ -281,25 +320,7 @@ public class OrderPlanningController implements Composer {
             public void doAction() {
                 // FIXME remove or change
                 model.forceLoadLabelsAndCriterionRequirements();
-
-                final IContext<?> context = planner.getContext();
-                FilterAndParentExpandedPredicates newPredicate = new FilterAndParentExpandedPredicates(
-                        context) {
-                    @Override
-                    public boolean accpetsFilterPredicate(Task task) {
-                        if (predicate == null) {
-                            return true;
-                        }
-                        TaskElement taskElement = (TaskElement) context
-                                .getMapper()
-                                .findAssociatedDomainObject(task);
-                        return predicate.accepts(taskElement);
-                    }
-
-                };
-                newPredicate.setFilterContainers(planner.getPredicate()
-                        .isFilterContainers());
-                planner.setTaskListPredicate(newPredicate);
+                planner.setTaskListPredicate(getFilterAndParentExpanedPredicates(predicate));
             }
 
             @Override
@@ -310,6 +331,27 @@ public class OrderPlanningController implements Composer {
         });
     }
 
+    private FilterAndParentExpandedPredicates getFilterAndParentExpanedPredicates(
+            final TaskElementPredicate predicate) {
+        final IContext<?> context = planner.getContext();
+        FilterAndParentExpandedPredicates newPredicate = new FilterAndParentExpandedPredicates(
+                context) {
+            @Override
+            public boolean accpetsFilterPredicate(Task task) {
+                if (predicate == null) {
+                    return true;
+                }
+                TaskElement taskElement = (TaskElement) context.getMapper()
+                        .findAssociatedDomainObject(task);
+                return predicate.accepts(taskElement);
+            }
+
+        };
+        newPredicate.setFilterContainers(planner.getPredicate()
+                .isFilterContainers());
+        return newPredicate;
+    }
+
     public Constraint checkConstraintFinishDate() {
         return new Constraint() {
             @Override
@@ -320,7 +362,7 @@ public class OrderPlanningController implements Composer {
                         && (filterStartDateOrderElement.getValue() != null)
                         && (finishDate.compareTo(filterStartDateOrderElement
                                 .getValue()) < 0)) {
-                    filterFinishDateOrderElement.setValue(null);
+                    filterFinishDateOrderElement.setRawValue(null);
                     throw new WrongValueException(comp,
                             _("must be after start date"));
                 }
@@ -339,7 +381,7 @@ public class OrderPlanningController implements Composer {
                         && (filterFinishDateOrderElement.getValue() != null)
                         && (startDate.compareTo(filterFinishDateOrderElement
                                 .getValue()) > 0)) {
-                    filterStartDateOrderElement.setValue(null);
+                    filterStartDateOrderElement.setRawValue(null);
                     throw new WrongValueException(comp,
                             _("must be lower than end date"));
                 }
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java
index 910b561a8..fd8362a75 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java
@@ -71,6 +71,7 @@ import org.libreplan.business.users.entities.UserRole;
 import org.libreplan.business.workingday.EffortDuration;
 import org.libreplan.web.calendars.BaseCalendarModel;
 import org.libreplan.web.common.ConfirmCloseUtil;
+import org.libreplan.web.common.FilterUtils;
 import org.libreplan.web.common.ViewSwitcher;
 import org.libreplan.web.planner.adaptplanning.IAdaptPlanningCommand;
 import org.libreplan.web.planner.advances.AdvanceAssignmentPlanningController;
@@ -181,13 +182,6 @@ public class OrderPlanningModel implements IOrderPlanningModel {
         }
     }
 
-    public static void configureInitialZoomLevelFor(Planner planner,
-            ZoomLevel defaultZoomLevel) {
-        if (!planner.isFixedZoomByUser()) {
-            planner.setInitialZoomLevel(defaultZoomLevel);
-        }
-    }
-
     public static ZoomLevel calculateDefaultLevel(
             PlannerConfiguration<TaskElement> configuration) {
         if (configuration.getData().isEmpty()) {
@@ -326,9 +320,7 @@ public class OrderPlanningModel implements IOrderPlanningModel {
                 .isExpandOrderPlanningViewCharts());
         addAdditional(additional, configuration);
 
-        ZoomLevel defaultZoomLevel = OrderPlanningModel
-                .calculateDefaultLevel(configuration);
-        configureInitialZoomLevelFor(planner, defaultZoomLevel);
+        planner.setInitialZoomLevel(getZoomLevel(configuration, order));
 
         final boolean writingAllowed = isWritingAllowedOnOrder();
         ISaveCommand saveCommand = setupSaveCommand(configuration,
@@ -377,6 +369,9 @@ public class OrderPlanningModel implements IOrderPlanningModel {
         PROFILING_LOG.debug("setConfiguration on planner took: "
                 + (System.currentTimeMillis() - setConfigurationTime) + " ms");
         long preparingChartsAndMisc = System.currentTimeMillis();
+
+        setupZoomLevelListener(planner, order);
+
         // Prepare tabpanels
         Tabpanels chartTabpanels = new Tabpanels();
 
@@ -409,6 +404,34 @@ public class OrderPlanningModel implements IOrderPlanningModel {
                 + (System.currentTimeMillis() - overalProgressContentTime));
     }
 
+    private ZoomLevel getZoomLevel(
+            PlannerConfiguration<TaskElement> configuration, Order order) {
+        ZoomLevel sessionZoom = FilterUtils.readZoomLevel(order);
+        if (sessionZoom != null) {
+            return sessionZoom;
+        }
+        return OrderPlanningModel.calculateDefaultLevel(configuration);
+    }
+
+    private void setupZoomLevelListener(Planner planner, Order order) {
+        planner.getTimeTracker().addZoomListener(
+                getSessionZoomLevelListener(order));
+    }
+
+    private IZoomLevelChangedListener getSessionZoomLevelListener(
+            final Order order) {
+        IZoomLevelChangedListener zoomListener = new IZoomLevelChangedListener() {
+
+            @Override
+            public void zoomLevelChanged(ZoomLevel detailLevel) {
+                FilterUtils.writeZoomLevel(order, detailLevel);
+            }
+        };
+
+        keepAliveZoomListeners.add(zoomListener);
+        return zoomListener;
+    }
+
     private OrderEarnedValueChartFiller earnedValueChartFiller;
 
     private void setupAdvanceAssignmentPlanningController(final Planner planner,
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/PlanningStateCreator.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/PlanningStateCreator.java
index b6a596e17..3f4cf28b0 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/PlanningStateCreator.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/PlanningStateCreator.java
@@ -909,7 +909,9 @@ public class PlanningStateCreator {
 
         private void reattachCriterions(Set<Criterion> criterions) {
             for (Criterion each : criterions) {
-                criterionDAO.reattachUnmodifiedEntity(each);
+                if (!Hibernate.isInitialized(each)) {
+                    criterionDAO.reattachUnmodifiedEntity(each);
+                }
             }
         }
 
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java
index b6a5ded10..447f194c0 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java
@@ -337,7 +337,7 @@ public class SaveCommandBuilder {
                         message += validationException.getMessage();
                     }
 
-                    LOG.warn(validationException.getMessage());
+                    LOG.warn("Error saving the project", validationException);
                     Messagebox.show(
                             _("Error saving the project\n{0}", message),
                             _("Error"), Messagebox.OK, Messagebox.ERROR);
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/AdvancedAllocationTabCreator.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/AdvancedAllocationTabCreator.java
index 00c971542..2c6653dbe 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/AdvancedAllocationTabCreator.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/AdvancedAllocationTabCreator.java
@@ -264,7 +264,8 @@ public class AdvancedAllocationTabCreator {
 
     private Map<String, Object> argsWithController(PlanningState planningState) {
         Map<String, Object> result = new HashMap<String, Object>();
-        advancedAllocationController = new AdvancedAllocationController(onBack,
+        advancedAllocationController = new AdvancedAllocationController(
+                planningState.getOrder(), onBack,
                 createAllocationInputsFor(planningState));
         result.put("advancedAllocationController", advancedAllocationController);
         return result;
@@ -297,7 +298,7 @@ public class AdvancedAllocationTabCreator {
     }
 
     private void resetController(PlanningState planningState) {
-        advancedAllocationController.reset(onBack,
+        advancedAllocationController.reset(planningState.getOrder(), onBack,
                 createAllocationInputsFor(planningState));
     }
 
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/OrdersTabCreator.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/OrdersTabCreator.java
index f0a08883a..0d4125839 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/OrdersTabCreator.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/OrdersTabCreator.java
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2009-2010 Fundación para o Fomento da Calidade Industrial e
  *                         Desenvolvemento Tecnolóxico de Galicia
- * Copyright (C) 2010-2011 Igalia, S.L.
+ * Copyright (C) 2010-2013 Igalia, S.L.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -27,6 +27,7 @@ import static org.libreplan.web.planner.tabs.MultipleTabsPlannerController.getSc
 import java.util.HashMap;
 import java.util.Map;
 
+import org.libreplan.web.common.FilterUtils;
 import org.libreplan.web.common.Util;
 import org.libreplan.web.common.Util.ReloadStrategy;
 import org.libreplan.web.orders.OrderCRUDController;
@@ -41,6 +42,7 @@ import org.zkoss.zul.Label;
 
 /**
  * @author Óscar González Fernández <ogonzalez@igalia.com>
+ * @author Lorenzo Tilve Álvaro <ltilve@igalia.com>
  *
  */
 public class OrdersTabCreator {
@@ -111,9 +113,23 @@ public class OrdersTabCreator {
                 }
             }
 
+            private boolean checkFiltersChanged() {
+                return (FilterUtils.sessionExists() && FilterUtils
+                        .hasProjectPlanningFilterChanged());
+            }
+
+            private void setFiltersUnchanged() {
+                FilterUtils.writeProjectFilterChanged(false);
+            }
+
             @Override
             protected void afterShowAction() {
+                if (checkFiltersChanged()) {
+                    orderCRUDController.readSessionFilterDates();
+                    setFiltersUnchanged();
+                }
                 orderCRUDController.goToList();
+
                 if (breadcrumbs.getChildren() != null) {
                     breadcrumbs.getChildren().clear();
                 }
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java
index d6fcde153..09aa3903e 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2009-2010 Fundación para o Fomento da Calidade Industrial e
  *                         Desenvolvemento Tecnolóxico de Galicia
- * Copyright (C) 2010-2011 Igalia, S.L.
+ * Copyright (C) 2010-2013 Igalia, S.L.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -34,6 +34,7 @@ import org.libreplan.business.orders.daos.IOrderDAO;
 import org.libreplan.business.orders.entities.Order;
 import org.libreplan.business.orders.entities.OrderElement;
 import org.libreplan.business.planner.entities.TaskElement;
+import org.libreplan.web.common.FilterUtils;
 import org.libreplan.web.common.Util;
 import org.libreplan.web.planner.company.CompanyPlanningController;
 import org.libreplan.web.planner.order.OrderPlanningController;
@@ -49,6 +50,7 @@ import org.zkoss.zul.Label;
 
 /**
  * @author Óscar González Fernández <ogonzalez@igalia.com>
+ * @author Lorenzo Tilve Álvaro <ltilve@igalia.com>
  *
  */
 public class PlanningTabCreator {
@@ -205,8 +207,23 @@ public class PlanningTabCreator {
                 }
             }
 
+            private boolean checkFiltersChanged() {
+                return (FilterUtils.sessionExists() && FilterUtils
+                        .hasProjectFilterChanged());
+            }
+
+            private void setFiltersUnchanged() {
+                FilterUtils.writeProjectPlanningFilterChanged(false);
+            }
+
             @Override
             protected void afterShowAction() {
+                if (checkFiltersChanged()) {
+                    companyPlanningController
+                            .readSessionVariablesIntoComponents();
+                    setFiltersUnchanged();
+                }
+
                 companyPlanningController.setConfigurationForPlanner();
                 breadcrumbs.getChildren().clear();
                 breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR));
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/AdvancedAllocationTaskController.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/AdvancedAllocationTaskController.java
index e5ead90be..4b3b57e96 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/AdvancedAllocationTaskController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/AdvancedAllocationTaskController.java
@@ -78,8 +78,8 @@ public class AdvancedAllocationTaskController extends GenericForwardComposer {
             return;
         }
 
-        getSwitcher().goToAdvancedAllocation(allocationResult,
-                createResultReceiver(allocationResult));
+        getSwitcher().goToAdvancedAllocation(planningState.getOrder(),
+                allocationResult, createResultReceiver(allocationResult));
     }
 
 
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/resourceload/IResourceLoadModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/resourceload/IResourceLoadModel.java
index dd3abb5f1..6ea40c601 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/resourceload/IResourceLoadModel.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/resourceload/IResourceLoadModel.java
@@ -23,6 +23,7 @@ package org.libreplan.web.resourceload;
 
 import org.libreplan.business.orders.entities.Order;
 import org.libreplan.business.planner.entities.TaskElement;
+import org.libreplan.business.users.entities.User;
 
 public interface IResourceLoadModel {
 
@@ -35,4 +36,6 @@ public interface IResourceLoadModel {
 
     boolean isExpandResourceLoadViewCharts();
 
+    User getUser();
+
 }
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java b/libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java
index 5734ab57b..e09711e46 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java
@@ -3,7 +3,7 @@
  *
  * 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 program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -46,8 +46,11 @@ import org.libreplan.business.planner.entities.TaskElement;
 import org.libreplan.business.resources.daos.IResourcesSearcher;
 import org.libreplan.business.resources.entities.Criterion;
 import org.libreplan.business.resources.entities.Resource;
+import org.libreplan.business.users.entities.User;
+import org.libreplan.web.common.FilterUtils;
 import org.libreplan.web.common.components.bandboxsearch.BandboxMultipleSearch;
 import org.libreplan.web.common.components.finders.FilterPair;
+import org.libreplan.web.common.components.finders.ResourceAllocationFilterEnum;
 import org.libreplan.web.planner.chart.Chart;
 import org.libreplan.web.planner.chart.StandardLoadChartFiller;
 import org.libreplan.web.planner.company.CompanyPlanningModel;
@@ -98,6 +101,7 @@ import org.zkoss.zul.api.Combobox;
  *
  * @author Óscar González Fernández <ogonzalez@igalia.com>
  * @author Manuel Rego Casasnovas <rego@igalia.com>
+ * @author Lorenzo Tilve Álvaro <ltilve@igalia.com>
  */
 @Component
 @Scope(BeanDefinition.SCOPE_PROTOTYPE)
@@ -141,6 +145,7 @@ public class ResourceLoadController implements Composer {
         this.parent = comp;
     }
 
+
     public void reload() {
         reloader.resetToInitialState();
         reloadWithoutReset();
@@ -164,6 +169,8 @@ public class ResourceLoadController implements Composer {
 
         private TimeTracker timeTracker;
 
+        private IZoomLevelChangedListener zoomLevelListener;
+
         public Reloader() {
         }
 
@@ -247,14 +254,53 @@ public class ResourceLoadController implements Composer {
         }
 
         private TimeTracker buildTimeTracker(ResourceLoadDisplayData dataToShow) {
-            ZoomLevel zoomLevel = dataToShow.getInitialZoomLevel();
+            ZoomLevel zoomLevel = getZoomLevel(dataToShow);
             TimeTracker result = new TimeTracker(dataToShow.getViewInterval(),
                     zoomLevel, SeveralModificators.create(),
                     SeveralModificators.create(createBankHolidaysMarker()),
                     parent);
+            setupZoomLevelListener(result);
             return result;
         }
 
+        private ZoomLevel getZoomLevel(ResourceLoadDisplayData dataToShow) {
+            if (filterBy != null) {
+                Order order = filterBy.getOrder();
+                ZoomLevel sessionZoom = FilterUtils.readZoomLevel(order);
+                if (sessionZoom != null) {
+                    return sessionZoom;
+                }
+            }
+
+            ZoomLevel sessionZoom = FilterUtils.readZoomLevelResourcesLoad();
+            if (sessionZoom != null) {
+                return sessionZoom;
+            }
+            return dataToShow.getInitialZoomLevel();
+        }
+
+        private void setupZoomLevelListener(TimeTracker timeTracker) {
+            zoomLevelListener = getSessionZoomLevelListener();
+            timeTracker.addZoomListener(zoomLevelListener);
+        }
+
+        private IZoomLevelChangedListener getSessionZoomLevelListener() {
+            IZoomLevelChangedListener zoomListener = new IZoomLevelChangedListener() {
+
+                @Override
+                public void zoomLevelChanged(ZoomLevel detailLevel) {
+                    if (filterBy != null) {
+                        Order order = filterBy.getOrder();
+                        FilterUtils.writeZoomLevel(order, detailLevel);
+                    } else {
+                        FilterUtils.writeZoomLevelResourcesLoad(detailLevel);
+                    }
+                }
+            };
+
+            return zoomListener;
+        }
+
         private ResourcesLoadPanel buildPanel(ResourceLoadDisplayData dataToShow) {
             return new ResourcesLoadPanel(dataToShow.getLoadTimeLines(),
                     timeTracker, parent,
@@ -268,12 +314,55 @@ public class ResourceLoadController implements Composer {
         FilterTypeChanger filterTypeChanger = new FilterTypeChanger(onChange,
                 filterBy);
         result.add(filterTypeChanger);
-        result.add(new ByDatesFilter(onChange, filterBy));
+
+        // Only by dates and bandbox filter on global resources load
+        if (filterBy == null) {
+        LocalDate startDate = FilterUtils.readResourceLoadsStartDate();
+        LocalDate endDate = FilterUtils.readResourceLoadsEndDate();
+
+        User user = resourceLoadModel.getUser();
+
+        // Calculate filter based on user preferences
+        if (user != null) {
+                if (startDate == null
+                        && !FilterUtils.hasResourceLoadsStartDateChanged()) {
+                if (user.getResourcesLoadFilterPeriodSince() != null) {
+                    startDate = new LocalDate().minusMonths(user
+                            .getResourcesLoadFilterPeriodSince());
+                } else {
+                    // Default filter start
+                    startDate = new LocalDate().minusDays(1);
+                }
+            }
+                if ((endDate == null)
+                        && !FilterUtils.hasResourceLoadsEndDateChanged()
+                    && (user.getResourcesLoadFilterPeriodTo() != null)) {
+                endDate = new LocalDate().plusMonths(user
+                        .getResourcesLoadFilterPeriodTo());
+            }
+        }
+
+        result.add(new ByDatesFilter(onChange, filterBy, startDate, endDate));
+
+        List<FilterPair> filterPairs = (List<FilterPair>) FilterUtils
+                .readResourceLoadsBandbox();
+        if ((filterPairs == null || filterPairs.isEmpty())
+                && user.getResourcesLoadFilterCriterion() != null) {
+            filterPairs = new ArrayList<FilterPair>();
+            filterPairs.add(new FilterPair(
+                    ResourceAllocationFilterEnum.Criterion, user
+                            .getResourcesLoadFilterCriterion()
+                            .getFinderPattern(), user
+                            .getResourcesLoadFilterCriterion()));
+        }
+
         WorkersOrCriteriaBandbox bandbox = new WorkersOrCriteriaBandbox(
-                onChange, filterBy, filterTypeChanger, resourcesSearcher);
+                onChange, filterBy, filterTypeChanger, resourcesSearcher, filterPairs);
+
         result.add(bandbox);
         result.add(new ByNamePaginator(onChange, filterBy, filterTypeChanger,
                 bandbox));
+        }
         result.add(new LoadChart(onChange, filterBy));
         return result;
     }
@@ -412,10 +501,14 @@ public class ResourceLoadController implements Composer {
 
         private final Datebox endBox = new Datebox();
 
-        private ByDatesFilter(Runnable onChange, PlanningState filterBy) {
+        private ByDatesFilter(Runnable onChange, PlanningState filterBy,
+                LocalDate startDate, LocalDate endDate) {
             super(onChange, filterBy);
-            startDateValue = isAppliedToOrder() ? null : new LocalDate()
-                    .minusDays(1);
+            startDateValue = (isAppliedToOrder() || (startDate == null)) ? null
+                    : startDate
+                    .toDateTimeAtStartOfDay().toLocalDate();
+            endDateValue = (endDate == null) ? null : endDate
+                    .toDateMidnight().toLocalDate();
         }
 
         @Override
@@ -435,10 +528,12 @@ public class ResourceLoadController implements Composer {
                     LocalDate newStart = toLocal(startBox.getValue());
                     if (!ObjectUtils.equals(startDateValue, newStart)) {
                         startDateValue = newStart;
+                        FilterUtils.writeResourceLoadsStartDate(startDateValue);
                         notifyChange();
                     }
                 }
             });
+
             endBox.setValue(asDate(endDateValue));
             endBox.setWidth("100px");
             endBox.addEventListener(Events.ON_CHANGE, new EventListener() {
@@ -447,10 +542,12 @@ public class ResourceLoadController implements Composer {
                     LocalDate newEnd = toLocal(endBox.getValue());
                     if (!ObjectUtils.equals(endBox, newEnd)) {
                         endDateValue = newEnd;
+                        FilterUtils.writeResourceLoadsEndDate(endDateValue);
                         notifyChange();
                     }
                 }
             });
+
             Hbox hbox = new Hbox();
             hbox.appendChild(new Label(_("From") + ":"));
             hbox.appendChild(startBox);
@@ -510,9 +607,19 @@ public class ResourceLoadController implements Composer {
 
         private WorkersOrCriteriaBandbox(Runnable onChange,
                 PlanningState filterBy, FilterTypeChanger filterType,
-                IResourcesSearcher resourcesSearcher) {
+                IResourcesSearcher resourcesSearcher,
+                List<FilterPair> selectedFilters) {
             super(onChange, filterBy, filterType);
             this.resourcesSearcher = resourcesSearcher;
+
+            initBandbox();
+
+            if ((selectedFilters != null) && !selectedFilters.isEmpty()) {
+                for (FilterPair filterPair : selectedFilters) {
+                    bandBox.addSelectedElement(filterPair);
+                }
+                entitiesSelected = getSelected();
+            }
         }
 
         @Override
@@ -523,7 +630,7 @@ public class ResourceLoadController implements Composer {
             panel.setSecondOptionalFilter(buildBandboxFilterer());
         }
 
-        private Hbox buildBandboxFilterer() {
+        private void initBandbox() {
             bandBox.setId("workerBandboxMultipleSearch");
             bandBox.setWidthBandbox("185px");
             bandBox.setWidthListbox("450px");
@@ -534,10 +641,14 @@ public class ResourceLoadController implements Composer {
                 @Override
                 public void onEvent(Event event) throws Exception {
                     entitiesSelected = getSelected();
+                    FilterUtils.writeResourceLoadsParameters(bandBox
+                            .getSelectedElements());
                     notifyChange();
                 }
             });
+        }
 
+        private Hbox buildBandboxFilterer() {
             Hbox hbox = new Hbox();
             hbox.appendChild(getLabel());
             hbox.appendChild(bandBox);
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadModel.java
index 0836720a7..e3e6782ed 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadModel.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadModel.java
@@ -1065,6 +1065,23 @@ public class ResourceLoadModel implements IResourceLoadModel {
         return user.isExpandResourceLoadViewCharts();
     }
 
+    @Override
+    @Transactional(readOnly = true)
+    public User getUser() {
+        User user;
+        try {
+            user = this.userDAO.findByLoginName(SecurityUtils
+                    .getSessionUserLoginName());
+        } catch (InstanceNotFoundException e) {
+            throw new RuntimeException(e);
+        }
+        // Attach filter bandbox elements
+        if (user.getResourcesLoadFilterCriterion() != null) {
+            user.getResourcesLoadFilterCriterion().getFinderPattern();
+        }
+        return user;
+    }
+
 }
 
 class PeriodBuilderFactory {
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/resources/search/AllocationSelectorController.java b/libreplan-webapp/src/main/java/org/libreplan/web/resources/search/AllocationSelectorController.java
index b960c1570..15e9e8ab5 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/resources/search/AllocationSelectorController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/resources/search/AllocationSelectorController.java
@@ -23,9 +23,11 @@ package org.libreplan.web.resources.search;
 
 import java.util.List;
 
+import org.libreplan.business.resources.daos.IResourceLoadRatiosCalculator;
 import org.libreplan.business.resources.daos.IResourcesSearcher;
 import org.libreplan.business.resources.entities.Criterion;
 import org.libreplan.business.resources.entities.Resource;
+import org.libreplan.business.scenarios.IScenarioManager;
 import org.libreplan.web.common.components.ResourceAllocationBehaviour;
 import org.libreplan.web.planner.allocation.INewAllocationsAdder;
 import org.zkoss.zk.ui.util.GenericForwardComposer;
@@ -40,9 +42,15 @@ public abstract class AllocationSelectorController extends
     // injected by name
     protected IResourcesSearcher resourcesSearcher;
 
+    // injected by name
+    protected IResourceLoadRatiosCalculator resourceLoadRatiosCalculator;
+
     // injected by name
     protected ResourceAllocationBehaviour behaviour;
 
+    // injected by name
+    protected IScenarioManager scenarioManager;
+
     public AllocationSelectorController() {
 
     }
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/resources/search/NewAllocationSelectorController.java b/libreplan-webapp/src/main/java/org/libreplan/web/resources/search/NewAllocationSelectorController.java
index badde44c5..fc662fea6 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/resources/search/NewAllocationSelectorController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/resources/search/NewAllocationSelectorController.java
@@ -21,10 +21,14 @@
 
 package org.libreplan.web.resources.search;
 
+import static org.libreplan.web.I18nHelper._;
+
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Date;
 import java.util.EnumSet;
 import java.util.HashSet;
 import java.util.List;
@@ -32,6 +36,9 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
+import org.apache.commons.lang.Validate;
+import org.joda.time.LocalDate;
+import org.libreplan.business.resources.daos.IResourceLoadRatiosCalculator.ILoadRatiosDataType;
 import org.libreplan.business.resources.daos.IResourcesSearcher.IResourcesQuery;
 import org.libreplan.business.resources.entities.Criterion;
 import org.libreplan.business.resources.entities.CriterionType;
@@ -43,10 +50,15 @@ import org.libreplan.web.common.components.ResourceAllocationBehaviour;
 import org.libreplan.web.planner.allocation.INewAllocationsAdder;
 import org.zkoss.lang.Objects;
 import org.zkoss.zk.ui.Component;
+import org.zkoss.zk.ui.WrongValueException;
 import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zk.ui.event.EventListener;
 import org.zkoss.zk.ui.event.Events;
 import org.zkoss.zk.ui.event.InputEvent;
+import org.zkoss.zul.Constraint;
+import org.zkoss.zul.Datebox;
+import org.zkoss.zul.Div;
+import org.zkoss.zul.Image;
 import org.zkoss.zul.Label;
 import org.zkoss.zul.Listbox;
 import org.zkoss.zul.Listcell;
@@ -63,15 +75,23 @@ import org.zkoss.zul.Treecell;
 import org.zkoss.zul.Treeitem;
 import org.zkoss.zul.TreeitemRenderer;
 import org.zkoss.zul.Treerow;
+import org.zkoss.zul.api.Listheader;
 
 /**
- * @author Diego Pino Garcia <dpino@igalia.com>
+ * Controller for searching for {@link Resource}.
+ *
+ * @author Diego Pino Garcia <dpino@igalia.com>
+ * @author Javier Moran Rua <jmoran@igalia.com>
  *
- *         Controller for searching for {@link Resource}
  */
 public class NewAllocationSelectorController extends
         AllocationSelectorController {
 
+    private static final BigDecimal AVALIABILITY_GOOD_VALUE = new BigDecimal(
+            0.50);
+    private static final BigDecimal AVALIABILITY_INTERMEDIUM_VALUE = new BigDecimal(
+            0.25);
+
     private ResourceListRenderer resourceListRenderer = new ResourceListRenderer();
 
     private Radiogroup allocationTypeSelector;
@@ -82,6 +102,8 @@ public class NewAllocationSelectorController extends
 
     private Label allocationSelectedItems;
 
+    private Datebox startDateLoadRatiosDatebox, endDateLoadRatiosDatebox;
+
     private CriterionRenderer criterionRenderer = new CriterionRenderer();
 
     private AllocationType currentAllocationType;
@@ -103,6 +125,23 @@ public class NewAllocationSelectorController extends
         initializeCriteriaTree();
         initializeListboxResources();
         initializeAllocationTypeSelector();
+        initializeFilteringDates();
+    }
+
+    private void initializeFilteringDates() {
+        // Start and end filtering dates are initialized here because
+        // they cannot be empty and must have always a value. The
+        // task start date and task end date are not available at the first
+        // rendering. Thus, the current date and current date + 1 day are used
+        // as the value to initialize the components although will
+        // never be visible by the user.
+        Date initDate = new Date();
+        setStartFilteringDate(initDate);
+        setEndFilteringDate(LocalDate.fromDateFields(initDate).plusDays(1)
+                .toDateTimeAtStartOfDay().toDate());
+        startDateLoadRatiosDatebox
+                .setConstraint(checkConstraintFilteringDate());
+        endDateLoadRatiosDatebox.setConstraint(checkConstraintFilteringDate());
     }
 
     private void initializeCriteriaTree() {
@@ -127,14 +166,14 @@ public class NewAllocationSelectorController extends
         listBoxResources.addEventListener(Events.ON_SELECT,
                 new EventListener() {
 
-            @Override
-            public void onEvent(Event event) {
-                if (isGenericType()) {
-                    returnToSpecificDueToResourceSelection();
-                }
-                showSelectedAllocations();
-            }
-        });
+                    @Override
+                    public void onEvent(Event event) {
+                        if (isGenericType()) {
+                            returnToSpecificDueToResourceSelection();
+                        }
+                        showSelectedAllocations();
+                    }
+                });
         listBoxResources.setMultiple(behaviour.allowMultipleSelection());
         listBoxResources.setItemRenderer(getListitemRenderer());
     }
@@ -158,7 +197,7 @@ public class NewAllocationSelectorController extends
                     }
                 });
         // Feed with values
-        for (AllocationType each: behaviour.allocationTypes()) {
+        for (AllocationType each : behaviour.allocationTypes()) {
             allocationTypeSelector.appendChild(radio(each));
         }
         doInitialSelection();
@@ -197,8 +236,41 @@ public class NewAllocationSelectorController extends
         }
     }
 
-    private List<? extends Resource> getAllResources() {
-        return query().byResourceType(getType()).execute();
+    private List<ResourceWithItsLoadRatios> getAllResources() {
+
+        List<ResourceWithItsLoadRatios> result = new ArrayList<ResourceWithItsLoadRatios>();
+
+        // The search is only done in case that the endFilteringDate and
+        // startFilteringDate are initialized. This happens when the
+        // user does the advanced search visible by clicking on the
+        // AdvancedSearch button
+        if ((startDateLoadRatiosDatebox.getValue() != null)
+                && (endDateLoadRatiosDatebox.getValue() != null)) {
+
+            List<? extends Resource> listResources = query().byResourceType(
+                    getType()).execute();
+
+            result = addLoadRatiosCalculations(listResources);
+        }
+        return result;
+    }
+
+    private List<ResourceWithItsLoadRatios> addLoadRatiosCalculations(
+            List<? extends Resource> listResources) {
+
+        List<ResourceWithItsLoadRatios> result = new ArrayList<ResourceWithItsLoadRatios>();
+
+        for (Resource each : listResources) {
+            ILoadRatiosDataType t = resourceLoadRatiosCalculator
+                    .calculateLoadRatios(each, LocalDate
+                            .fromDateFields(startDateLoadRatiosDatebox
+                                    .getValue()),
+                            LocalDate.fromDateFields(endDateLoadRatiosDatebox
+                                    .getValue()), scenarioManager.getCurrent());
+            result.add(new ResourceWithItsLoadRatios(each, t));
+        }
+
+        return result;
     }
 
     private ResourceType getType() {
@@ -213,16 +285,28 @@ public class NewAllocationSelectorController extends
         refreshListBoxResources(getAllResources());
     }
 
-    private void refreshListBoxResources(List<? extends Resource> resources) {
+    private void refreshListBoxResources(
+            List<ResourceWithItsLoadRatios> resources) {
         listBoxResources.setModel(new SimpleListModel(resources));
+        triggerSortListBoxResources();
+    }
+
+    private void triggerSortListBoxResources() {
+        for (Object child : listBoxResources.getListhead().getChildren()) {
+            final Listheader hd = (Listheader) child;
+            if (!"natural".equals(hd.getSortDirection())) {
+                hd.sort("ascending".equals(hd.getSortDirection()), true);
+            }
+        }
     }
 
     private void returnToSpecificDueToResourceSelection() {
         currentAllocationType = AllocationType.SPECIFIC;
         List<Criterion> criteria = getSelectedCriterions();
         List<Resource> selectedWorkers = getSelectedWorkers();
-        refreshListBoxResources(query().byCriteria(criteria)
-                .byResourceType(getType()).execute());
+        refreshListBoxResources(addLoadRatiosCalculations(query()
+                .byCriteria(criteria).byResourceType(getType()).execute()));
+
         listBoxResources.renderAll(); // force render so list items has the
                                       // value property so the resources can be
                                       // selected
@@ -244,7 +328,8 @@ public class NewAllocationSelectorController extends
         @SuppressWarnings("unchecked")
         Collection<Listitem> items = listBoxResources.getItems();
         for (Listitem item : items) {
-            Resource itemResource = (Resource) item.getValue();
+            Resource itemResource = ((ResourceWithItsLoadRatios) item
+                    .getValue()).getResource();
             if (itemResource != null
                     && itemResource.getId().equals(resource.getId())) {
                 return item;
@@ -262,8 +347,8 @@ public class NewAllocationSelectorController extends
 
     @SuppressWarnings("unchecked")
     private void clearSelection(Listbox listBox) {
-        Set<Listitem> selectedItems = new HashSet<Listitem>(listBox
-                .getSelectedItems());
+        Set<Listitem> selectedItems = new HashSet<Listitem>(
+                listBox.getSelectedItems());
         for (Listitem each : selectedItems) {
             listBox.removeItemFromSelection(each);
         }
@@ -271,7 +356,8 @@ public class NewAllocationSelectorController extends
 
     @SuppressWarnings("unchecked")
     private void clearSelection(Tree tree) {
-        Set<Treeitem> selectedItems = new HashSet<Treeitem>(tree.getSelectedItems());
+        Set<Treeitem> selectedItems = new HashSet<Treeitem>(
+                tree.getSelectedItems());
         for (Treeitem each : selectedItems) {
             tree.removeItemFromSelection(each);
         }
@@ -294,10 +380,8 @@ public class NewAllocationSelectorController extends
      */
     private void searchResources(String name, List<Criterion> criterions) {
         final List<? extends Resource> resources = query().byName(name)
-                .byCriteria(criterions)
-                .byResourceType(getType())
-                .execute();
-        refreshListBoxResources(resources);
+                .byCriteria(criterions).byResourceType(getType()).execute();
+        refreshListBoxResources(addLoadRatiosCalculations(resources));
     }
 
     /**
@@ -306,6 +390,7 @@ public class NewAllocationSelectorController extends
      *
      * @return
      */
+    @Override
     public List<Criterion> getSelectedCriterions() {
         List<Criterion> result = new ArrayList<Criterion>();
 
@@ -324,10 +409,12 @@ public class NewAllocationSelectorController extends
         return resourceListRenderer;
     }
 
+    @Override
     public void onClose() {
         clearAll();
     }
 
+    @Override
     public void clearAll() {
         refreshListBoxResources();
         criterionsTree.setModel(getCriterions());
@@ -349,7 +436,8 @@ public class NewAllocationSelectorController extends
         List<Resource> result = new ArrayList<Resource>();
         List<Listitem> selectedItems = listBoxResources.getItems();
         for (Listitem item : selectedItems) {
-            result.add((Resource) item.getValue());
+            result.add(((ResourceWithItsLoadRatios) item.getValue())
+                    .getResource());
         }
         return result;
     }
@@ -359,7 +447,9 @@ public class NewAllocationSelectorController extends
         List<Resource> result = new ArrayList<Resource>();
         Set<Listitem> selectedItems = listBoxResources.getSelectedItems();
         for (Listitem item : selectedItems) {
-            result.add((Resource) item.getValue());
+
+            result.add(((ResourceWithItsLoadRatios) item.getValue())
+                    .getResource());
         }
         return result;
     }
@@ -466,6 +556,34 @@ public class NewAllocationSelectorController extends
                 toNodeList(criterion.getChildren()));
     }
 
+    private static class ResourceWithItsLoadRatios implements
+            Comparable<ResourceWithItsLoadRatios> {
+
+        private Resource resource;
+        private ILoadRatiosDataType ratios;
+
+        public ResourceWithItsLoadRatios(Resource resource,
+                ILoadRatiosDataType ratios) {
+            Validate.notNull(resource);
+            Validate.notNull(ratios);
+            this.resource = resource;
+            this.ratios = ratios;
+        }
+
+        public Resource getResource() {
+            return this.resource;
+        }
+
+        public ILoadRatiosDataType getRatios() {
+            return this.ratios;
+        }
+
+        @Override
+        public int compareTo(ResourceWithItsLoadRatios o) {
+            return this.resource.compareTo(o.getResource());
+        }
+    }
+
     /**
      * @author Diego Pino García <dpino@igalia.com>
      *
@@ -475,17 +593,62 @@ public class NewAllocationSelectorController extends
 
         @Override
         public void render(Listitem item, Object data) {
-            item.setValue((Resource) data);
+            item.setValue(data);
 
             appendLabelResource(item);
         }
 
         private void appendLabelResource(Listitem item) {
-            Resource resource = (Resource) item.getValue();
+            ResourceWithItsLoadRatios dataToRender = (ResourceWithItsLoadRatios) item
+                    .getValue();
 
-            Listcell cell = new Listcell();
-            cell.appendChild(new Label(resource.getShortDescription()));
-            item.appendChild(cell);
+            Listcell cellName = new Listcell();
+            Resource resource = dataToRender.getResource();
+            cellName.appendChild(new Label(resource.getShortDescription()));
+            item.appendChild(cellName);
+
+            Listcell cellAvailability = new Listcell();
+            BigDecimal availability = dataToRender.getRatios()
+                    .getAvailiabilityRatio();
+            Div totalDiv = new Div();
+            totalDiv.setStyle("width:50px;height:12px;border: solid 1px black");
+            Div containedDiv = new Div();
+            String styleValue = "width:" + availability.movePointRight(2)
+                    + "%;height:12px;background-color:"
+                    + calculateRgba(availability) + ";float:left;left:0";
+            containedDiv.setStyle(styleValue);
+            Label l = new Label(availability.movePointRight(2).toString() + "%");
+            l.setStyle("width:50px;margin-left: 12px");
+            containedDiv.appendChild(l);
+            totalDiv.appendChild(containedDiv);
+            cellAvailability.appendChild(totalDiv);
+            item.appendChild(cellAvailability);
+
+            Listcell cellOvertime = new Listcell();
+            BigDecimal overtime = dataToRender.getRatios().getOvertimeRatio();
+            Label overtimeLabel = new Label(overtime.toString());
+            cellOvertime.appendChild(overtimeLabel);
+            if (!overtime.equals(BigDecimal.ZERO.setScale(2))) {
+                overtimeLabel.setStyle("position: relative; top: -12px");
+                Image img = new Image(
+                        "/dashboard/img/value-meaning-negative.png");
+                img.setStyle("width: 25px; position: relative; top: -5px");
+                cellOvertime.appendChild(img);
+            }
+            item.appendChild(cellOvertime);
+        }
+
+        private String calculateRgba(BigDecimal avaliability) {
+            String result;
+            if (avaliability.compareTo(AVALIABILITY_INTERMEDIUM_VALUE) < 0) {
+                result = "rgba(150,0,0,0.3)";
+            } else if (avaliability.compareTo(AVALIABILITY_GOOD_VALUE) < 0) {
+                result = "rgba(255,255,0,0.5)";
+            } else {
+                result = "rgba(102,204,0,0.3)";
+            }
+
+            return result;
         }
     }
 
@@ -534,6 +697,7 @@ public class NewAllocationSelectorController extends
 
     }
 
+    @Override
     public void addTo(INewAllocationsAdder allocationsAdder) {
         currentAllocationType.addTo(this, allocationsAdder);
     }
@@ -546,4 +710,54 @@ public class NewAllocationSelectorController extends
         return listBoxResources.isMultiple();
     }
 
+    public void setEndFilteringDate(Date d) {
+        endDateLoadRatiosDatebox.setValue(d);
+    }
+
+    public void setStartFilteringDate(Date d) {
+        startDateLoadRatiosDatebox.setValue(d);
+    }
+
+    public void updateLoadRatios() {
+        searchResources("", getSelectedCriterions());
+    }
+
+    public Constraint  checkConstraintFilteringDate() {
+        return new Constraint() {
+            @Override
+            public void validate(Component comp, Object value) throws WrongValueException {
+                if (value == null) {
+                    if (comp.getId().equals("startDateLoadRatiosDatebox")) {
+                        throw new WrongValueException(comp,
+                                _("Start filtering date cannot be empty"));
+                    } else if (comp.getId().equals("endDateLoadRatiosDatebox")) {
+                        throw new WrongValueException(comp,
+                                _("End filtering date cannot be empty"));
+                    }
+                }
+
+                Date startDate = null;
+                if (comp.getId().equals("startDateLoadRatiosDatebox")) {
+                    startDate = (Date) value;
+                } else {
+                    startDate = (Date) startDateLoadRatiosDatebox.getRawValue();
+                }
+
+                Date endDate = null;
+                if (comp.getId().equals("endDateLoadRatiosDatebox")) {
+                    endDate = (Date) value;
+                } else {
+                    endDate = (Date) endDateLoadRatiosDatebox.getRawValue();
+                }
+
+                if ((startDate != null) && (endDate != null)) {
+                    if ((startDate.after(endDate))
+                            || (startDate.equals(endDate))) {
+                        throw new WrongValueException(comp,_("Start filtering date must be before than end filtering date"));
+                    }
+                }
+            }
+        };
+    }
+
 }
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java b/libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java
index 9f237c85b..6100ba700 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java
@@ -250,6 +250,10 @@ public abstract class TreeController<T extends ITreeNode<T>> extends
                 getRenderer().refreshHoursValueForThisNodeAndParents(newNode);
                 getRenderer().refreshBudgetValueForThisNodeAndParents(newNode);
 
+                // Moved here in order to have items already renderer in order
+                // to select the proper element to focus
+                filterByPredicateIfAny();
+
                 if (node.isLeaf() && !node.isEmptyLeaf()) {
                     // Then a new container will be created
                     nameTextbox = getRenderer().getNameTextbox(node);
@@ -260,8 +264,11 @@ public abstract class TreeController<T extends ITreeNode<T>> extends
                 }
             } else {
                 getModel().addElement(name.getValue(), hours.getValue());
+
+                // This is needed in both parts of the if, but it's repeated in
+                // order to simplify the code
+                filterByPredicateIfAny();
             }
-            filterByPredicateIfAny();
         } catch (IllegalStateException e) {
             LOG.warn("exception ocurred adding element", e);
             messagesForUser.showMessage(Level.ERROR, e.getMessage());
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/users/settings/ISettingsModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/users/settings/ISettingsModel.java
index b95d164b3..344c27eef 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/users/settings/ISettingsModel.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/users/settings/ISettingsModel.java
@@ -2,6 +2,7 @@
  * This file is part of LibrePlan
  *
  * Copyright (C) 2011 ComtecSF, S.L.
+ * Copyright (C) 2013 Igalia, S.L.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -18,7 +19,11 @@
  */
 package org.libreplan.web.users.settings;
 
+import java.util.List;
+
 import org.libreplan.business.common.exceptions.ValidationException;
+import org.libreplan.business.labels.entities.Label;
+import org.libreplan.business.resources.entities.Criterion;
 import org.libreplan.business.settings.entities.Language;
 
 
@@ -27,6 +32,7 @@ import org.libreplan.business.settings.entities.Language;
  *
  * @author Cristina Alvarino Perez <cristina.alvarino@comtecsf.es>
  * @author Ignacio Diaz Teijido <ignacio.diaz@comtecsf.es>
+ * @author Lorenzo Tilve Álvaro <ltilve@igalia.com>
  */
 public interface ISettingsModel {
 
@@ -67,4 +73,32 @@ public interface ISettingsModel {
 
     boolean isBound();
 
+    Integer getProjectsFilterPeriodSince();
+
+    void setProjectsFilterPeriodSince(Integer period);
+
+    Integer getProjectsFilterPeriodTo();
+
+    void setProjectsFilterPeriodTo(Integer period);
+
+    Integer getResourcesLoadFilterPeriodSince();
+
+    void setResourcesLoadFilterPeriodSince(Integer period);
+
+    Integer getResourcesLoadFilterPeriodTo();
+
+    void setResourcesLoadFilterPeriodTo(Integer period);
+
+    Label getProjectsFilterLabel();
+
+    List<Label> getAllLabels();
+
+    void setProjectsFilterLabel(Label label);
+
+    List<Criterion> getAllCriteria();
+
+    Criterion getResourcesLoadFilterCriterion();
+
+    void setResourcesLoadFilterCriterion(Criterion criterion);
+
 }
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/users/settings/SettingsController.java b/libreplan-webapp/src/main/java/org/libreplan/web/users/settings/SettingsController.java
index db6a1515e..abf2f1625 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/users/settings/SettingsController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/users/settings/SettingsController.java
@@ -2,6 +2,7 @@
  * This file is part of LibrePlan
  *
  * Copyright (C) 2011 ComtecSF, S.L.
+ * Copyright (C) 2013 Igalia.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -25,14 +26,26 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
+import java.util.logging.Filter;
 
 import org.libreplan.business.common.exceptions.ValidationException;
+import org.libreplan.business.labels.entities.Label;
+import org.libreplan.business.resources.entities.Criterion;
 import org.libreplan.business.settings.entities.Language;
+import org.libreplan.web.common.FilterUtils;
 import org.libreplan.web.common.IMessagesForUser;
 import org.libreplan.web.common.Level;
 import org.libreplan.web.common.MessagesForUser;
+import org.libreplan.web.common.components.bandboxsearch.BandboxSearch;
 import org.zkoss.zk.ui.Component;
+import org.zkoss.zk.ui.Session;
+import org.zkoss.zk.ui.Sessions;
+import org.zkoss.zk.ui.event.Event;
+import org.zkoss.zk.ui.event.EventListener;
+import org.zkoss.zk.ui.event.Events;
+import org.zkoss.zk.ui.event.SelectEvent;
 import org.zkoss.zk.ui.util.GenericForwardComposer;
+import org.zkoss.zul.Listitem;
 import org.zkoss.zul.ListitemRenderer;
 import org.zkoss.zul.Textbox;
 
@@ -41,6 +54,7 @@ import org.zkoss.zul.Textbox;
  *
  * @author Cristina Alvarino Perez <cristina.alvarino@comtecsf.es>
  * @author Ignacio Diaz Teijido <ignacio.diaz@comtecsf.es>
+ * @author Lorenzo Tilve Álvaro <ltilve@igalia.com>
  */
 public class SettingsController extends GenericForwardComposer {
 
@@ -52,6 +66,10 @@ public class SettingsController extends GenericForwardComposer {
 
     private Textbox password;
 
+    private BandboxSearch projectsFilterLabelBandboxSearch;
+
+    private BandboxSearch resourcesLoadFilterCriterionBandboxSearch;
+
     public static ListitemRenderer languagesRenderer = new ListitemRenderer() {
         @Override
         public void render(org.zkoss.zul.Listitem item, Object data)
@@ -71,6 +89,25 @@ public class SettingsController extends GenericForwardComposer {
         comp.setVariable("settingsController", this, true);
         messages = new MessagesForUser(messagesContainer);
         settingsModel.initEditLoggedUser();
+        projectsFilterLabelBandboxSearch.setListboxEventListener(
+                Events.ON_SELECT, new EventListener() {
+                    @Override
+                    public void onEvent(Event event) {
+                        Listitem selectedItem = (Listitem) ((SelectEvent) event)
+                                .getSelectedItems().iterator().next();
+                        setProjectsFilterLabel((Label) selectedItem.getValue());
+                    }
+                });
+        resourcesLoadFilterCriterionBandboxSearch.setListboxEventListener(
+                Events.ON_SELECT, new EventListener() {
+                    @Override
+                    public void onEvent(Event event) {
+                        Listitem selectedItem = (Listitem) ((SelectEvent) event)
+                                .getSelectedItems().iterator().next();
+                        setResourcesLoadFilterCriterion((Criterion) selectedItem
+                                .getValue());
+                    }
+                });
     }
 
     public List<Language> getLanguages() {
@@ -92,6 +129,8 @@ public class SettingsController extends GenericForwardComposer {
 
     public boolean save() {
         try {
+            checkEmptyBandboxes();
+            clearSessionVariables();
             settingsModel.confirmSave();
             messages.showMessage(Level.INFO, _("Settings saved"));
             return true;
@@ -101,6 +140,20 @@ public class SettingsController extends GenericForwardComposer {
         return false;
     }
 
+    private void clearSessionVariables() {
+        FilterUtils.clearBandboxes();
+        FilterUtils.clearSessionDates();
+    }
+
+    private void checkEmptyBandboxes() {
+        if (projectsFilterLabelBandboxSearch.getSelectedElement() == null) {
+            settingsModel.setProjectsFilterLabel(null);
+        }
+        if (resourcesLoadFilterCriterionBandboxSearch.getSelectedElement() == null) {
+            settingsModel.setResourcesLoadFilterCriterion(null);
+        }
+    }
+
     public void setSelectedLanguage(Language language) {
         settingsModel.setApplicationLanguage(language);
     }
@@ -176,4 +229,60 @@ public class SettingsController extends GenericForwardComposer {
         return settingsModel.isBound();
     }
 
+    public Integer getProjectsFilterPeriodSince() {
+        return settingsModel.getProjectsFilterPeriodSince();
+    }
+
+    public void setProjectsFilterPeriodSince(Integer period) {
+        settingsModel.setProjectsFilterPeriodSince(period);
+    }
+
+    public Integer getProjectsFilterPeriodTo() {
+        return settingsModel.getProjectsFilterPeriodTo();
+    }
+
+    public void setProjectsFilterPeriodTo(Integer period) {
+        settingsModel.setProjectsFilterPeriodTo(period);
+    }
+
+    public Integer getResourcesLoadFilterPeriodSince() {
+        return settingsModel.getResourcesLoadFilterPeriodSince();
+    }
+
+    public void setResourcesLoadFilterPeriodSince(Integer period) {
+        settingsModel.setResourcesLoadFilterPeriodSince(period);
+    }
+
+    public Integer getResourcesLoadFilterPeriodTo() {
+        return settingsModel.getResourcesLoadFilterPeriodTo();
+    }
+
+    public void setResourcesLoadFilterPeriodTo(Integer period) {
+        settingsModel.setResourcesLoadFilterPeriodTo(period);
+    }
+
+    public List<Label> getAllLabels() {
+        return settingsModel.getAllLabels();
+    }
+
+    public Label getProjectsFilterLabel() {
+        return settingsModel.getProjectsFilterLabel();
+    }
+
+    public void setProjectsFilterLabel(Label label) {
+        settingsModel.setProjectsFilterLabel(label);
+    }
+
+    public List<Criterion> getAllCriteria() {
+        return settingsModel.getAllCriteria();
+    }
+
+    public Criterion getResourcesLoadFilterCriterion() {
+        return settingsModel.getResourcesLoadFilterCriterion();
+    }
+
+    public void setResourcesLoadFilterCriterion(Criterion criterion) {
+        settingsModel.setResourcesLoadFilterCriterion(criterion);
+    }
+
 }
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/users/settings/SettingsModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/users/settings/SettingsModel.java
index 4a7df6763..a9970c2cb 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/users/settings/SettingsModel.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/users/settings/SettingsModel.java
@@ -19,9 +19,16 @@
 
 package org.libreplan.web.users.settings;
 
+import java.util.Collections;
+import java.util.List;
+
 import org.apache.commons.lang.Validate;
 import org.libreplan.business.common.exceptions.InstanceNotFoundException;
 import org.libreplan.business.common.exceptions.ValidationException;
+import org.libreplan.business.labels.daos.ILabelDAO;
+import org.libreplan.business.labels.entities.Label;
+import org.libreplan.business.resources.daos.ICriterionDAO;
+import org.libreplan.business.resources.entities.Criterion;
 import org.libreplan.business.settings.entities.Language;
 import org.libreplan.business.users.daos.IUserDAO;
 import org.libreplan.business.users.entities.Profile;
@@ -49,8 +56,18 @@ public class SettingsModel implements ISettingsModel {
     @Autowired
     private IUserDAO userDAO;
 
+    @Autowired
+    private ILabelDAO labelsDAO;
+
+    @Autowired
+    private ICriterionDAO criterionDAO;
+
     private User user;
 
+    private List<Label> allLabels;
+
+    private List<Criterion> allCriteria;
+
     @Override
     public Language getApplicationLanguage() {
         return user.getApplicationLanguage();
@@ -74,6 +91,26 @@ public class SettingsModel implements ISettingsModel {
     public void initEditLoggedUser() {
         User user = findByLoginUser(SecurityUtils.getSessionUserLoginName());
         this.user = getFromDB(user);
+        loadAllLabels();
+        loadAllCriteria();
+    }
+
+    @Transactional(readOnly = true)
+    private void loadAllLabels() {
+        allLabels = labelsDAO.getAll();
+        // initialize the labels
+        for (Label label : allLabels) {
+            label.getType().getName();
+        }
+    }
+
+    @Transactional(readOnly = true)
+    private void loadAllCriteria() {
+        allCriteria = criterionDAO.getAll();
+        // initialize the criteria
+        for (Criterion criterion : allCriteria) {
+            criterion.getType().getName();
+        }
     }
 
     @Transactional(readOnly = true)
@@ -202,4 +239,76 @@ public class SettingsModel implements ISettingsModel {
         return false;
     }
 
+    @Override
+    public Integer getProjectsFilterPeriodSince() {
+        return user.getProjectsFilterPeriodSince();
+    }
+
+    @Override
+    public void setProjectsFilterPeriodSince(Integer period) {
+        user.setProjectsFilterPeriodSince(period);
+    }
+
+    @Override
+    public Integer getProjectsFilterPeriodTo() {
+        return user.getProjectsFilterPeriodTo();
+    }
+
+    @Override
+    public void setProjectsFilterPeriodTo(Integer period) {
+        user.setProjectsFilterPeriodTo(period);
+    }
+
+    @Override
+    public Integer getResourcesLoadFilterPeriodSince() {
+        return user.getResourcesLoadFilterPeriodSince();
+    }
+
+    @Override
+    public void setResourcesLoadFilterPeriodSince(Integer period) {
+        user.setResourcesLoadFilterPeriodSince(period);
+    }
+
+    @Override
+    public Integer getResourcesLoadFilterPeriodTo() {
+        return user.getResourcesLoadFilterPeriodTo();
+    }
+
+    @Override
+    public void setResourcesLoadFilterPeriodTo(Integer period) {
+        user.setResourcesLoadFilterPeriodTo(period);
+    }
+
+    @Override
+    @Transactional(readOnly = true)
+    public List<Label> getAllLabels() {
+        return allLabels;
+    }
+
+    @Override
+    public Label getProjectsFilterLabel() {
+        return user.getProjectsFilterLabel();
+    }
+
+    @Override
+    public void setProjectsFilterLabel(Label label) {
+        user.setProjectsFilterLabel(label);
+    }
+
+    @Override
+    @Transactional(readOnly = true)
+    public List<Criterion> getAllCriteria() {
+        return allCriteria;
+    }
+
+    @Override
+    public Criterion getResourcesLoadFilterCriterion() {
+        return user.getResourcesLoadFilterCriterion();
+    }
+
+    @Override
+    public void setResourcesLoadFilterCriterion(Criterion criterion) {
+        user.setResourcesLoadFilterCriterion(criterion);
+    }
+
 }
diff --git a/libreplan-webapp/src/main/resources/i18n/es.po b/libreplan-webapp/src/main/resources/i18n/es.po
index 9682fe90b..d205e97d3 100644
--- a/libreplan-webapp/src/main/resources/i18n/es.po
+++ b/libreplan-webapp/src/main/resources/i18n/es.po
@@ -11,37 +11,39 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libreplan-1.3.3\n"
-"Report-Msgid-Bugs-To: http://bugs.libreplan.org/\n"
-"POT-Creation-Date: 2012-12-07 13:59+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-08 11:42+0100\n"
 "PO-Revision-Date: 2012-12-07 13:42+0000\n"
 "Last-Translator: Manuel Rego Casasnovas <rego@igalia.com>\n"
 "Language-Team: Español\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java:452
 msgid "currency code not specified"
 msgstr "código de moneda no especificado"
 
-#: 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 "No tiene permisos para crear usuarios nuevos"
 
-#: libreplan-webapp/src/main/webapp/dashboard/_dashboardfororder.zul:92
-msgid "Availability ratio"
-msgstr "Ratio de disponibilidad"
-
 #: libreplan-webapp/src/main/webapp/common/configuration.zul:378
 msgid "Group path"
 msgstr "Ruta del grupo"
 
+#: libreplan-webapp/src/main/webapp/dashboard/_dashboardfororder.zul:92
+msgid "Availability ratio"
+msgstr "Ratio de disponibilidad"
+
 #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1150
 msgid ""
 "resource cost category assignments codes must be unique inside a resource"
-msgstr "los códigos de las asignaciones de categorías de coste deben ser únicos dentro de un recurso"
+msgstr ""
+"los códigos de las asignaciones de categorías de coste deben ser únicos "
+"dentro de un recurso"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/users/OrderAuthorizationController.java:92
 msgid "No authorizations were added because you did not select any."
@@ -75,61 +77,28 @@ msgstr "Crear trabajador virtual"
 
 #: 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/webapp/externalcompanies/_listExternalCompanies.zul:31
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:81
 #: 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/scenarios/_list.zul:28
+#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:68
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:57
+#: libreplan-webapp/src/main/webapp/orders/_list.zul:36
+#: libreplan-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:29
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:50
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:70
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:279
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:50
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:48
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:83
+#: 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/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/planner/taskpanels/_tabPanelSubcontract.zul:110
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:127
-#: 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/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/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/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/calendars/_edition.zul:258
 #: 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
@@ -138,16 +107,49 @@ msgstr "Crear trabajador virtual"
 #: 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/orders/_listOrderElementAdvances.zul:50
-#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:70
-#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:57
-#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:143
+#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:39
+#: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:31
+#: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:37
+#: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:40
+#: libreplan-webapp/src/main/webapp/myaccount/_myTasksArea.zul:42
+#: libreplan-webapp/src/main/webapp/myaccount/_expensesArea.zul:40
+#: libreplan-webapp/src/main/webapp/myaccount/_personalTimesheetsArea.zul:37
+#: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:30
 #: libreplan-webapp/src/main/webapp/common/configuration.zul:266
+#: libreplan-webapp/src/main/webapp/templates/_advances.zul:39
+#: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:41
+#: libreplan-webapp/src/main/webapp/templates/_listTemplates.zul:33
+#: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:50
+#: 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/externalcompanies/_listExternalCompanies.zul:31
+#: 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/reportAdvances.zul:52
+#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:36
+#: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:38
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:87
+#: libreplan-webapp/src/main/webapp/unittypes/_listUnitTypes.zul:29
+#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:143
+#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:58
+#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:174
+#: 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/reports/completedEstimatedHoursPerTask.zul:99
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:140
+#: 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/workingProgressPerTaskReport.zul:99
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.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/projectStatusReport.zul:88
+#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:128
 msgid "Operations"
 msgstr "Operaciones"
 
@@ -171,12 +173,12 @@ msgstr "La fecha de inicio no puede estar vacía"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:340
 #: libreplan-webapp/src/main/webapp/materials/materials.zul:35
-#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:48
-#: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:52
-#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:22
 #: 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-webapp/src/main/webapp/templates/_editTemplateWindow.zul:52
+#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:22
+#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:48
 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:57
 msgid "Materials"
 msgstr "Materiales"
@@ -185,14 +187,14 @@ msgstr "Materiales"
 msgid "dates must be sorted and cannot overlap"
 msgstr "las fechas deben estar ordenadas y no se pueden superponer"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java:361
-msgid "Reassign"
-msgstr "Reasignar"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:180
 msgid "Not bound"
 msgstr "No vinculado"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java:361
+msgid "Reassign"
+msgstr "Reasignar"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/GlobalProgressChart.java:62
 msgid "By critical path hours"
 msgstr "Por horas del camino crítico"
@@ -207,8 +209,8 @@ msgstr "Método de Montecarlo"
 msgid "No deadline"
 msgstr "Sin fecha límite"
 
-#: 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:274
 msgid "Project Scheduling"
 msgstr "Planificación de proyectos"
 
@@ -224,25 +226,27 @@ msgstr "Administrar campos y etiquetas"
 msgid ""
 "Machine cannot be deleted. Machine is allocated to a project or contains "
 "imputed hours"
-msgstr "La máquina no se puede borrar. La máquina está asignada a un proyecto o tiene horas imputadas"
+msgstr ""
+"La máquina no se puede borrar. La máquina está asignada a un proyecto o "
+"tiene horas imputadas"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:269
 msgid "Please, select a calendar"
 msgstr "Por favor, seleccione un calendario"
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:256
-msgid "Summary"
-msgstr "Resumen"
-
 #: 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 "Predefinido"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:344
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:256
+msgid "Summary"
+msgstr "Resumen"
+
 #: 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/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:344
 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:53
+#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:49
 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:59
 msgid "Quality Forms"
 msgstr "Formularios de calidad"
@@ -251,19 +255,19 @@ msgstr "Formularios de calidad"
 msgid "A stretch has lower or equal values than the previous stretch"
 msgstr "Algún tramo tiene valores menores o iguales que el tramo anterior"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:502
-msgid "Reports"
-msgstr "Informes"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java:149
 msgid "Assignments could not be completed"
 msgstr "No se pudieron completar las asignaciones"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:502
+msgid "Reports"
+msgstr "Informes"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/assigntemplates/TemplateFinderPopup.java:117
 msgid "Create task"
 msgstr "Crear tarea"
 
-#: 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:137
 msgid "username not specified"
 msgstr "nombre de usuario no especificado"
 
@@ -290,16 +294,20 @@ msgstr "Suma de gastos imputados en las tareas hijas"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:714
 msgid "Progress that are reported by quality forms can not be modified"
-msgstr "No se puede modificar el progreso que se reporta por los formularios de calidad"
+msgstr ""
+"No se puede modificar el progreso que se reporta por los formularios de "
+"calidad"
+
+#: libreplan-webapp/src/main/webapp/common/layout/timeout.zul:27
+msgid "Your session has expired because of inactivity. Please log in again."
+msgstr ""
+"Su sesión ha expirado tras un tiempo de inactividad. Por favor, inicie "
+"sesión de nuevo."
 
 #: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:66
 msgid "Own exception"
 msgstr "Excepción propia"
 
-#: libreplan-webapp/src/main/webapp/common/layout/timeout.zul:27
-msgid "Your session has expired because of inactivity. Please log in again."
-msgstr "Su sesión ha expirado tras un tiempo de inactividad. Por favor, inicie sesión de nuevo."
-
 #: 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 "No se puede borrar ese material porque está asignado a un projecto."
@@ -332,8 +340,8 @@ msgstr "Filtrar las líneas del parte de trabajo por"
 msgid "Manual assignment"
 msgstr "Asignación manual"
 
-#: 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-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:146
 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:68
 msgid "Companies"
 msgstr "Empresas"
@@ -343,8 +351,8 @@ msgid "Quality form items list"
 msgstr "Lista de elementos del formulario de calidad"
 
 #: 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/resources/worker/WorkerCRUDController.java:1061
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:130
 msgid "Create {0}: {1}"
 msgstr "Crear {0}: {1}"
 
@@ -360,13 +368,13 @@ msgstr "No tiene permisos para ir a la ventana de edición de trabajadores"
 msgid "generic workers allocation"
 msgstr "asignación genérica de trabajadores"
 
-#: 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/orders/OrderCRUDController.java:1030
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:396
 msgid "The project has no scheduled elements"
 msgstr "El proyecto no tiene elementos planificados"
 
-#: libreplan-webapp/src/main/webapp/planner/main.zul:53
 #: 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 "Comienzo"
@@ -385,7 +393,8 @@ msgstr "Borrar elemento de plantilla"
 
 #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:516
 msgid "Criteria of this criterion type have been assigned to some resource."
-msgstr "Los criterios de este tipo de criterio han sido asignados a algún recurso."
+msgstr ""
+"Los criterios de este tipo de criterio han sido asignados a algún recurso."
 
 #: libreplan-webapp/src/main/webapp/calendars/calendars.zul:22
 msgid "LibrePlan: Calendars"
@@ -415,7 +424,9 @@ msgstr "Media de horas estimadas"
 msgid ""
 "Could not add those authorizations to profile {0} because they were already "
 "present."
-msgstr "No se pudieron añadir esas autorizaciones al perfil {0} porque ya estaban presentes."
+msgstr ""
+"No se pudieron añadir esas autorizaciones al perfil {0} porque ya estaban "
+"presentes."
 
 #: 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
@@ -431,25 +442,27 @@ msgstr "medida no especificada"
 msgid "Default calendar"
 msgstr "Calendario predeterminado"
 
-#: libreplan-business/src/main/java/org/libreplan/business/requirements/entities/CriterionRequirement.java:68
 #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionSatisfaction.java:206
+#: libreplan-business/src/main/java/org/libreplan/business/requirements/entities/CriterionRequirement.java:68
 msgid "criterion not specified"
 msgstr "criterio no especificado"
 
 #: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:474
 msgid ""
 "only one timesheet line per day and task is allowed in personal timesheets"
-msgstr "sólo está permitida una línea de parte de trabajo por día y tarea en los partes de horas personales"
+msgstr ""
+"sólo está permitida una línea de parte de trabajo por día y tarea en los "
+"partes de horas personales"
 
-#: 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/hoursWorkedPerWorkerInAMonthReport.zul:88
 #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:158
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:181
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:210
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:161
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:180
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:220
+#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:169
 msgid "Click on this"
 msgstr "Haz click en este"
 
@@ -477,9 +490,11 @@ msgstr "No puede ser posterior a la fecha de fin"
 
 #: libreplan-webapp/src/main/webapp/users/_editUser.zul:129
 msgid ""
-"Roles of LDAP users cannot be managed because LDAP is enabled and LDAP roles"
-" are being used."
-msgstr "Los roles de los usuarios de LDAP no se pueden gestionar porque el LDAP está activado y se están usando los roles del LDAP."
+"Roles of LDAP users cannot be managed because LDAP is enabled and LDAP roles "
+"are being used."
+msgstr ""
+"Los roles de los usuarios de LDAP no se pueden gestionar porque el LDAP está "
+"activado y se están usando los roles del LDAP."
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:306
 msgid "Indent"
@@ -497,14 +512,14 @@ msgstr "Guardar contraseñas en la base de datos"
 msgid "Consolidated progress measurement cannot be removed"
 msgstr "La medida de progreso consolidada no se puede borrar"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:984
+msgid "Delete bound user"
+msgstr "Borrar usuario vinculado"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTree.java:42
 msgid "New template"
 msgstr "Plantilla nueva"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:970
-msgid "Delete bound user"
-msgstr "Borrar usuario vinculado"
-
 #: libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialInfo.java:61
 msgid "unit price not specified"
 msgstr "precio unitario no especificado"
@@ -543,7 +558,7 @@ msgstr "Nuevo elemento del formulario de calidad"
 msgid "LibrePlan: Labels"
 msgstr "LibrePlan: Etiquetas"
 
-#: 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:378
 msgid "You have exceeded the maximum limit of users"
 msgstr "Ha superado el límite máximo de usuarios"
 
@@ -555,21 +570,24 @@ msgstr "La conexión con el LDAP se ha realizado con éxito"
 msgid ""
 "This resource allocation type is incompatible. The task has an associated "
 "order element which has a progress that is of type subcontractor. "
-msgstr "Este tipo de asignación de recursos es incompatible. La tarea tiene un elemento de pedido asociado que tiene un progreso que es de tipo subcontratación."
+msgstr ""
+"Este tipo de asignación de recursos es incompatible. La tarea tiene un "
+"elemento de pedido asociado que tiene un progreso que es de tipo "
+"subcontratación."
 
 #: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/TaskQualityFormItem.java:87
 msgid "position not specified"
 msgstr "posición no especificada"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:85
+msgid "{0} List"
+msgstr "{0} Lista"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/GlobalProgressChart.java:57
 #: libreplan-webapp/src/main/webapp/resources/_criterions.zul:43
 msgid "Current"
 msgstr "Actual"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:84
-msgid "{0} List"
-msgstr "{0} Lista"
-
 #: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:65
 msgid "Dependencies"
 msgstr "Dependencias"
@@ -582,11 +600,13 @@ msgstr "Selección actual"
 msgid ""
 "there exist criterion satisfactions referring to criterion types not "
 "applicable to this resource"
-msgstr "existen criterios satisfechos que pertenecen a tipos de criterio no aplicables a este recurso"
+msgstr ""
+"existen criterios satisfechos que pertenecen a tipos de criterio no "
+"aplicables a este recurso"
 
-#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:47
 #: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:52
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:50
+#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:47
 msgid "Criterion Requirement"
 msgstr "Criterio requerido"
 
@@ -631,17 +651,19 @@ msgstr "Comprobado"
 msgid "a disabled resource has enabled subresources"
 msgstr "un recurso deshabilitado tiene subrecursos habilitados"
 
-#: 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 "Cliente"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:673
 #: 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
 msgid ""
-"there are no resources for required criteria: {0}. So the generic allocation"
-" can't be added"
-msgstr "no hay recursos con los criterios solicitados: {0}. Por tanto, no se puede añadir la asignación genérica"
+"there are no resources for required criteria: {0}. So the generic allocation "
+"can't be added"
+msgstr ""
+"no hay recursos con los criterios solicitados: {0}. Por tanto, no se puede "
+"añadir la asignación genérica"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1565
 msgid "must be later than start date"
@@ -653,7 +675,9 @@ msgstr "Estrategia para la búsqueda de roles"
 
 #: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:401
 msgid "fields should match with timesheet data if are shared by lines"
-msgstr "los campos deberían coincidir con los datos del parte de trabajo si son compartidos por las líneas"
+msgstr ""
+"los campos deberían coincidir con los datos del parte de trabajo si son "
+"compartidos por las líneas"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractController.java:154
 msgid "It already exists a deliver date with the same date. "
@@ -704,14 +728,18 @@ msgstr "Estrategia de grupo"
 msgid "Budget: {0}, Consumed: {1} ({2}%)"
 msgstr "Presupuesto: {0}, Consumido: {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 "Configurar"
 
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:55
-#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:59
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:61
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:141
+msgid "Criterion filter"
+msgstr "Por criterio"
+
 #: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:36
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:61
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:60
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:55
 msgid "First name"
 msgstr "Nombre"
 
@@ -724,23 +752,23 @@ msgid "LibrePlan: Send To Subcontractors"
 msgstr "LibrePlan: Enviar a subcontratistas"
 
 #: 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/orders/AssignedTaskQualityFormsToOrderElementController.java:200
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:961
 #: 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/expensesheet/ExpenseSheetCRUDController.java:211
 msgid "Confirm deleting {0}. Are you sure?"
 msgstr "Confirmar el borrado de {0}. ¿Está seguro?"
 
-#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:51
-msgid "Edit selected task"
-msgstr "Editar tarea seleccionada"
-
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:220
 msgid "External code"
 msgstr "Código externo"
 
+#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:51
+msgid "Edit selected task"
+msgstr "Editar tarea seleccionada"
+
 #: 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"
@@ -766,36 +794,41 @@ msgstr "Nueva fecha de entrega"
 msgid "Required materials"
 msgstr "Materiales requeridos"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:312
-msgid "Backwards"
-msgstr "Atrás"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:181
 #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:104
 msgid "Existing user"
 msgstr "Usuario existente"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:404
+msgid "Backwards"
+msgstr "Atrás"
+
 #: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:52
 msgid "Apply filtering to resources satisfying required criteria"
-msgstr "Aplicar filtrado a los recursos que satisfacen los criterios requeridos"
+msgstr ""
+"Aplicar filtrado a los recursos que satisfacen los criterios requeridos"
 
 #: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:67
 #: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:77
 msgid "Version"
 msgstr "Versión"
 
-#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:35
-msgid "Communications To Customers"
-msgstr "Comunicaciones a clientes"
-
 #: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:105
 msgid "Up"
 msgstr "Arriba"
 
+#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:35
+msgid "Communications To Customers"
+msgstr "Comunicaciones a clientes"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:252
 msgid "EAC"
 msgstr "EAC"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:601
+msgid "Not workable day"
+msgstr "Día no laborable"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:539
 msgid "it already exists another expense sheet with the same code."
 msgstr "Ya existe otra hoja de gastos con el mismo código"
@@ -804,34 +837,32 @@ msgstr "Ya existe otra hoja de gastos con el mismo código"
 msgid "Predecessor"
 msgstr "Predecesor"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:601
-msgid "Not workable day"
-msgstr "Día no laborable"
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/TreeElementOperationsController.java:55
+msgid "Please select a task"
+msgstr "Por favor, seleccione una tarea"
 
 #: 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 "Algún tramo tiene valores mayores o iguales que el tramo anterior"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/TreeElementOperationsController.java:55
-msgid "Please select a task"
-msgstr "Por favor, seleccione una tarea"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:101
 msgid ""
-"Value is not valid, the default max value must be greater than the precision"
-" value "
-msgstr "El valor no es válido, el valor máximo por defecto debe ser mayor que el valor de precisión"
+"Value is not valid, the default max value must be greater than the precision "
+"value "
+msgstr ""
+"El valor no es válido, el valor máximo por defecto debe ser mayor que el "
+"valor de precisión"
 
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:277
 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:82
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:55
+#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:38
+#: libreplan-webapp/src/main/webapp/myaccount/_myTasksArea.zul:36
+#: 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/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/machine/_machineConfigurationUnits.zul:55
-#: libreplan-webapp/src/main/webapp/orders/_edition.zul:277
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:57
 msgid "End date"
 msgstr "Fecha de fin"
 
@@ -839,7 +870,7 @@ msgstr "Fecha de fin"
 msgid "LibrePlan: Calendar Exception Days"
 msgstr "LibrePlan: Días excepcionales del calendario"
 
-#: 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 "Trabajador y usuario vinculado borrados"
 
@@ -859,56 +890,58 @@ msgstr "el nombre del perfil ya está siendo usado por otro perfil"
 msgid "You cannot remove the current scenario"
 msgstr "No puede borrar el escenario actual"
 
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:84
-#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:71
 #: 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/myaccount/settings.zul:72
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:84
 msgid "E-mail"
 msgstr "Correo electrónico"
 
-#: 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 "Este proyecto ya ha sido añadido."
 
-#: 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/orders/OrderElementTreeController.java:675
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:661
 #: 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/reports/ProjectStatusReportController.java:173
 #: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:39
-#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:36
 #: libreplan-webapp/src/main/webapp/common/configuration.zul:143
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:32
+#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:36
 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:54
 msgid "Criteria"
 msgstr "Criterios"
 
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:28
-msgid "User data"
-msgstr "Datos del usuario"
-
 #: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:140
 msgid "Resource / Criteria"
 msgstr "Recursos / Criterios"
 
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:28
+msgid "User data"
+msgstr "Datos del usuario"
+
 #: 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
 msgid "field name not specified or empty"
 msgstr "nombre del perfil no especificado o vacío"
 
-#: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:44
-msgid "Lines"
-msgstr "Líneas"
-
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:29
 msgid "Add new progress assignment"
 msgstr "Añadir nueva asignación de progreso"
 
+#: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:44
+msgid "Lines"
+msgstr "Líneas"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1342
 msgid ""
 "Value must be a multiple of the precision value of the progress type: {0}"
-msgstr "El valor debe ser un múltiplo del valor de precisión del tipo de progreso: {0}"
+msgstr ""
+"El valor debe ser un múltiplo del valor de precisión del tipo de progreso: "
+"{0}"
 
 #: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:32
 msgid "Set Filter Options"
@@ -931,34 +964,35 @@ msgstr "Lista de formularios de calidad"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/TransferOrdersModel.java:170
 msgid "Project version is the same in source and destination scenarios"
-msgstr "La versión del proyecto es la misma en los escenarios de origen y destino"
+msgstr ""
+"La versión del proyecto es la misma en los escenarios de origen y destino"
 
 #: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityForm.java:210
 msgid "Quality form item name must be unique"
 msgstr "El nombre del ítem del formulario de calidad debe ser único"
 
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:50
-msgid "Subcontracting communication date"
-msgstr "Fecha de comunicación de la subcontratación"
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:31
+msgid "Personal data"
+msgstr "Datos personales"
 
 #: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:162
 #: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:28
 msgid "Finished"
 msgstr "Finalizado"
 
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:31
-msgid "Personal data"
-msgstr "Datos personales"
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:50
+msgid "Subcontracting communication date"
+msgstr "Fecha de comunicación de la subcontratación"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:164
-#: 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/HoursWorkedPerWorkerController.java:337
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:202
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:207
 msgid "please, select a Criterion"
 msgstr "por favor, seleccione un criterio"
 
-#: 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} anotación obligatoria en {1}"
 
@@ -966,28 +1000,30 @@ msgstr "{0} anotación obligatoria en {1}"
 msgid "Some sequences to be removed do not exist"
 msgstr "Algunas secuencias para borrar no existen"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1290
-msgid "Modified"
-msgstr "Modificado"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:999
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1001
 msgid "cannot be negative"
 msgstr "no puede ser negativo"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1292
+msgid "Modified"
+msgstr "Modificado"
+
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:215
 msgid "Add Criterion"
 msgstr "Añadir criterio"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:665
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:666
 msgid "format prefix invalid. It cannot be empty or contain whitespaces."
-msgstr "formato de prefijo inválido. No puede estar vacío o contener espacios en blanco."
+msgstr ""
+"formato de prefijo inválido. No puede estar vacío o contener espacios en "
+"blanco."
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1227
 msgid "inherited exception can not be removed"
 msgstr "la excepción heredada no se puede borrar"
 
 #: 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
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:471
 msgid "MessagesContainer is needed"
 msgstr "Es necesario un MessagesContainer"
 
@@ -995,13 +1031,15 @@ msgstr "Es necesario un MessagesContainer"
 msgid ""
 "Load percentage of resources participating in the project while they are "
 "assigned"
-msgstr "Porcentaje de carga de los recursos participantes en el proyecto mientras están asignados"
+msgstr ""
+"Porcentaje de carga de los recursos participantes en el proyecto mientras "
+"están asignados"
 
-#: 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/_workRelationships.zul:29
 #: libreplan-webapp/src/main/webapp/resources/_criterions.zul:42
+#: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:29
+#: 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/reports/schedulingProgressPerOrderReport.zul:58
 msgid "Ending date"
 msgstr "Fecha de fin"
 
@@ -1017,14 +1055,14 @@ msgstr "LibrePlan: Página no encontrada"
 msgid "project name is already being used"
 msgstr "el nombre de proyecto ya está siendo usado"
 
-#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:29
-msgid "Export options"
-msgstr "Opciones de exportación"
-
 #: libreplan-webapp/src/main/webapp/templates/_listTemplates.zul:21
 msgid "Templates List"
 msgstr "Lista de plantillas"
 
+#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:29
+msgid "Export options"
+msgstr "Opciones de exportación"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:221
 msgid "Criteria: {0}"
 msgstr "Criterios: {0} "
@@ -1041,16 +1079,16 @@ msgstr "Media de horas trabajadas en las aplicaciones finalizadas"
 msgid "Calculated progress can not be modified"
 msgstr "El progreso calculado no se puede modificar"
 
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:60
-msgid "Work done from starting date"
-msgstr "Trabajo realizado desde la fecha de inicio"
-
 #: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:51
 msgid "Statistics log"
 msgstr "Histórico de estadísticas"
 
-#: libreplan-webapp/src/main/webapp/resources/worker/_calendar.zul:47
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:60
+msgid "Work done from starting date"
+msgstr "Trabajo realizado desde la fecha de inicio"
+
 #: libreplan-webapp/src/main/webapp/resources/machine/_calendar.zul:40
+#: libreplan-webapp/src/main/webapp/resources/worker/_calendar.zul:47
 msgid "Edit Calendar"
 msgstr "Editar calendario"
 
@@ -1062,41 +1100,48 @@ msgstr "ítem"
 msgid "Profile"
 msgstr "Perfil"
 
-#: 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 "Parte de horas personal"
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:488
+#, fuzzy
+msgid "{0} sequences"
+msgstr "Secuencias de entidad"
 
 #: 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 "Necesidades de materiales en fecha"
 
+#: 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 "Parte de horas personal"
+
 #: libreplan-webapp/src/main/webapp/common/configuration.zul:316
 msgid "UserDn"
 msgstr "UserDn"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:233
-msgid "{0} \"{1}\" saved"
-msgstr "{0} \"{1}\" guardado"
-
-#: 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:317
 msgid "filtering"
 msgstr "filtrado"
 
-#: libreplan-webapp/src/main/webapp/orders/_list.zul:33
-msgid "Total Budget"
-msgstr "Presupuesto total"
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:235
+msgid "{0} \"{1}\" saved"
+msgstr "{0} \"{1}\" guardado"
 
 #: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:55
 msgid "Hierarchy"
 msgstr "Jerarquía"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:955
+#: libreplan-webapp/src/main/webapp/orders/_list.zul:33
+msgid "Total Budget"
+msgstr "Presupuesto total"
+
+#: 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"
-msgstr "Este trabajador no se puede borrar porque tiene asignaciones a proyectos u horas imputadas"
+msgstr ""
+"Este trabajador no se puede borrar porque tiene asignaciones a proyectos u "
+"horas imputadas"
 
 #: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:64
 msgid "Work done until ending date"
@@ -1127,31 +1172,33 @@ msgstr "Propiedades de la hoja de gastos"
 msgid "Time period saved"
 msgstr "Período de tiempo guardado"
 
+#: 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/HoursWorkedPerWorkerController.java:343
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:208
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:213
+msgid "This Criterion has already been added."
+msgstr "Este criterio ya ha sido añadido."
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:252
 msgid ""
 "Are you sure of changing the resource type? You will lose the criteria with "
 "different resource type."
-msgstr "¿Está seguro de cambiar el tipo de recurso? Los criterios con diferente tipo de recurso se perderán."
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:170
-#: 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
-msgid "This Criterion has already been added."
-msgstr "Este criterio ya ha sido añadido."
+msgstr ""
+"¿Está seguro de cambiar el tipo de recurso? Los criterios con diferente tipo "
+"de recurso se perderán."
 
 #: libreplan-webapp/src/main/webapp/common/configuration.zul:246
 msgid "add"
 msgstr "añadir"
 
-#: 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
+#: 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
 msgid "Unsaved changes will be lost. Would you like to continue?"
 msgstr "Se perderán los cambios sin guardar. ¿Le gustaría continuar?"
 
-#: 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 "por favor seleccione un usuario a vincular"
 
@@ -1160,11 +1207,13 @@ msgstr "por favor seleccione un usuario a vincular"
 msgid "Workers"
 msgstr "Trabajadores"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:862
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:997
 msgid ""
 "You can not remove the project \"{0}\" because it has time tracked at some "
 "of its tasks"
-msgstr "No puede borrar el proyecto \"{0}\" porque tiene horas asignadas a alguna de sus tareas"
+msgstr ""
+"No puede borrar el proyecto \"{0}\" porque tiene horas asignadas a alguna de "
+"sus tareas"
 
 #: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:53
 msgid "Resources matching selected criteria"
@@ -1182,15 +1231,15 @@ msgstr "Tipo de etiqueta"
 msgid "Year"
 msgstr "Año"
 
-#: 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}\" no se ha podido borrar, ya había sido eliminado"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:429
 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:70
 msgid "Received From Subcontractors"
 msgstr "Recibido de subcontratistas"
 
+#: 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}\" no se ha podido borrar, ya había sido eliminado"
+
 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/Profile.java:68
 msgid "profile name not specified"
 msgstr "nombre del perfil no especificado"
@@ -1215,59 +1264,66 @@ msgstr "Por horas de todas las tareas"
 msgid "Hour costs"
 msgstr "Costes por hora"
 
-#: 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/orders/_listOrderElementAdvances.zul:67
 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:35
 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:56
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:67
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:87
+#: libreplan-webapp/src/main/webapp/planner/order.zul:105
+#: libreplan-webapp/src/main/webapp/subcontract/subcontractorCommunications.zul:58
+#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:137
+#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:168
 msgid "Value"
 msgstr "Valor"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeModel.java:91
-msgid "Progress type cannot be modified"
-msgstr "El tipo de progreso no puede ser modificado"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:809
 msgid "there are no valid periods for this calendar"
 msgstr "no hay períodos válidos para este calendario"
 
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:133
+#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeModel.java:91
+msgid "Progress type cannot be modified"
+msgstr "El tipo de progreso no puede ser modificado"
+
 #: libreplan-webapp/src/main/webapp/profiles/_editProfile.zul:54
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:133
 msgid "Add role"
 msgstr "Añadir rol"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:642
 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1278
 msgid "Exception end date should be greater or equals than start date"
-msgstr "La fecha de fin de una excepción debe ser mayor o igual que la fecha de inicio"
+msgstr ""
+"La fecha de fin de una excepción debe ser mayor o igual que la fecha de "
+"inicio"
 
 #: 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
 msgid "Repeated Project code {0} in Project {1}"
 msgstr "Código {0} de proyecto repetdio en proyecto {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 "Fecha de fin inválida, la nueva fecha de fin debe ser posterior a la fecha de inicio"
+msgstr ""
+"Fecha de fin inválida, la nueva fecha de fin debe ser posterior a la fecha "
+"de inicio"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:284
 msgid "Stretch date must not be before task start date: "
-msgstr "La fecha del tramo no debe ser anterior a la fecha de inicio de la tarea: "
+msgstr ""
+"La fecha del tramo no debe ser anterior a la fecha de inicio de la tarea: "
 
 #: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:22
 msgid "Progress Types List"
 msgstr "Lista de tipos de progreso"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/AssignedCriterionsModel.java:335
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/AssignedMachineCriterionsModel.java:398
+#: 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"
-msgstr "El {0} no se puede asignar a este recurso. Su intervalo se solapa con otro criterio"
+msgstr ""
+"El {0} no se puede asignar a este recurso. Su intervalo se solapa con otro "
+"criterio"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:257
 msgid "Schedule Performance Index"
@@ -1281,14 +1337,14 @@ msgstr "Fecha de inicio más temprana"
 msgid "The code cannot be empty and it must be unique."
 msgstr "El código no puede estar vacío y debe ser único."
 
-#: 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-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:124
 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:67
 msgid "Profiles"
 msgstr "Perfiles"
 
-#: 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 "Primer gasto"
 
@@ -1314,7 +1370,8 @@ msgstr "LibrePlan: Enviar a clientes"
 
 #: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:493
 msgid "there are repeated description values in the timesheet lines"
-msgstr "hay valores de descripción repetidos en las líneas del parte de trabajo"
+msgstr ""
+"hay valores de descripción repetidos en las líneas del parte de trabajo"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:489
 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:521
@@ -1337,15 +1394,15 @@ msgstr "el valor máximo del tipo de progreso porcentaje debe ser 100"
 msgid "Total personal timesheet"
 msgstr "Total parte de horas personal"
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:275
-msgid "Expiry date"
-msgstr "Fecha de vencimiento"
-
 #: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:57
 #: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:73
 msgid "Pagination"
 msgstr "Paginación"
 
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:275
+msgid "Expiry date"
+msgstr "Fecha de vencimiento"
+
 #: libreplan-webapp/src/main/webapp/common/layout/template.zul:86
 msgid "Change scenario"
 msgstr "Cambiar escenario"
@@ -1365,8 +1422,8 @@ msgstr "Categorías"
 msgid "Value is not valid. It must be smaller than max value"
 msgstr "El valor no es válido. Debe ser menor que el valor máximo"
 
-#: 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 "Detalles de proyecto"
 
@@ -1383,11 +1440,11 @@ msgid "Task: {0}"
 msgstr "Tarea: {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
+#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:66
+#: libreplan-webapp/src/main/webapp/planner/order.zul:106
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:86
 msgid "Percentage"
 msgstr "Porcentaje"
 
@@ -1416,8 +1473,8 @@ msgstr "Tarea no encontrada"
 msgid "company code cannot contain whitespaces"
 msgstr "el código de empresa no puede contener espacios en blanco"
 
-#: 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 "Capacidad total"
 
@@ -1425,11 +1482,17 @@ msgstr "Capacidad total"
 msgid "Problems connecting with client web service"
 msgstr "Problemas al conectar con el servicio web cliente"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:721
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:131
+msgid "Projects since"
+msgstr "proyectos desde hace"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:775
 msgid ""
-"You cannot remove the task \"{0}\" because it has work reported on it or any"
-" of its children"
-msgstr "No puede borrar la tarea \"{0}\" porque alguno de sus hijos se está usando en algún parte de trabajo"
+"You cannot remove the task \"{0}\" because it has work reported on it or any "
+"of its children"
+msgstr ""
+"No puede borrar la tarea \"{0}\" porque alguno de sus hijos se está usando "
+"en algún parte de trabajo"
 
 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:169
 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:198
@@ -1441,29 +1504,31 @@ msgstr "Tipo de excepción"
 msgid "The current value must be less than the max value."
 msgstr "El valor actual debe ser menor que el valor máximo"
 
-#: libreplan-webapp/src/main/webapp/profiles/_listProfiles.zul:22
-msgid "Profiles List"
-msgstr "Lista de Perfiles"
-
 #: 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 "{0} de la categoría {1} y {2} de la categoría {3} tienen el mismo código"
+msgstr ""
+"{0} de la categoría {1} y {2} de la categoría {3} tienen el mismo código"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:726
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:662
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:336
+#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:226
 #: 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/orders/_edition.zul:48
 #: libreplan-webapp/src/main/webapp/common/configuration.zul:147
+#: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:50
+#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:46
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:76
 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:56
 msgid "Labels"
 msgstr "Etiquetas"
 
+#: libreplan-webapp/src/main/webapp/profiles/_listProfiles.zul:22
+msgid "Profiles List"
+msgstr "Lista de Perfiles"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:442
 msgid "Queue-based resource assignation"
 msgstr "Asignación de recursos basados en colas"
@@ -1487,7 +1552,7 @@ msgstr "Total de horas"
 msgid "Reassigning {0} projects"
 msgstr "Reasignando {0} proyectos"
 
-#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:39
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:40
 msgid "Data"
 msgstr "Datos"
 
@@ -1495,8 +1560,8 @@ msgstr "Datos"
 msgid "Filter by task status"
 msgstr "Filtrar por estado de tarea"
 
-#: 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/order/OrderPlanningModel.java:520
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:453
 msgid "Select date"
 msgstr "Seleccione fecha"
 
@@ -1507,7 +1572,9 @@ msgstr "estado no especificado"
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1319
 msgid ""
 "Spread progress cannot be removed. Please select another progress as spread."
-msgstr "El progreso que propaga no se puede eliminar. Por favor seleccione otro progreso como propagado."
+msgstr ""
+"El progreso que propaga no se puede eliminar. Por favor seleccione otro "
+"progreso como propagado."
 
 #: libreplan-webapp/src/main/webapp/common/concurrent_modification.zul:34
 msgid "Please try it again."
@@ -1541,7 +1608,9 @@ msgstr "Tarea: {0}"
 msgid ""
 "Please try to contact with any administrator in order to review your "
 "permissions in LibrePlan."
-msgstr "Por favor intente ponerse en contacto con cualquier administrador para revisar sus permisos en LibrePlan."
+msgstr ""
+"Por favor intente ponerse en contacto con cualquier administrador para "
+"revisar sus permisos en LibrePlan."
 
 #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Machine.java:101
 msgid "machine name not specified"
@@ -1558,33 +1627,40 @@ msgid "Activation periods"
 msgstr "Períodos de activación"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:505
-#: 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/orders/_projectDetails.zul:76
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:138
+#: 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/common/configuration.zul:177
+#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:90
+#: libreplan-webapp/src/main/webapp/planner/order.zul:151
 msgid "Calendar"
 msgstr "Calendario"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioCRUDController.java:238
+#, fuzzy
+msgid "Scenario"
+msgstr "escenario"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:357
-#: libreplan-webapp/src/main/webapp/dashboard/_dashboardfororder.zul:76
 #: libreplan-webapp/src/main/webapp/common/configuration.zul:157
+#: libreplan-webapp/src/main/webapp/dashboard/_dashboardfororder.zul:76
 msgid "Resources"
 msgstr "Recursos"
 
-#: libreplan-webapp/src/main/webapp/myaccount/changePassword.zul:56
-msgid ""
-"LDAP users cannot change their password if LDAP authentication is enabled. "
-"Talk to one of the administrators"
-msgstr "Los usuarios de LDAP nn pueden cambiar sus contraseñas si la autenticación de LDAP está habilitada. Hable con alguno de los administradores"
-
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:31
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:56
 msgid "Read"
 msgstr "Leer"
 
+#: libreplan-webapp/src/main/webapp/myaccount/changePassword.zul:56
+msgid ""
+"LDAP users cannot change their password if LDAP authentication is enabled. "
+"Talk to one of the administrators"
+msgstr ""
+"Los usuarios de LDAP nn pueden cambiar sus contraseñas si la autenticación "
+"de LDAP está habilitada. Hable con alguno de los administradores"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/TransferOrdersModel.java:153
 msgid "Source and destination scenarios should be different"
 msgstr "Los escenarios de origen y destino deben ser diferentes"
@@ -1601,18 +1677,26 @@ msgstr "El navegador que está usando"
 msgid "scenario"
 msgstr "escenario"
 
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:133
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:149
+msgid "months to"
+msgstr "meses hasta dentro de"
+
 #: libreplan-webapp/src/main/webapp/common/configuration.zul:220
 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 "Define el tiempo desde la última operación de guardado de las perspectivas de planificación del proyecto a partir del que se mostrará una advertencia al salir. Establecer a 0 para deshabilitar la advertencia."
+msgstr ""
+"Define el tiempo desde la última operación de guardado de las perspectivas "
+"de planificación del proyecto a partir del que se mostrará una advertencia "
+"al salir. Establecer a 0 para deshabilitar la advertencia."
 
+#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:42
+#: libreplan-webapp/src/main/webapp/orders/_orderFilter.zul:30
 #: 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
 msgid "to"
 msgstr "a"
 
@@ -1620,7 +1704,9 @@ msgstr "a"
 msgid ""
 "there is a timesheet line in another work report marking as finished the "
 "same task"
-msgstr "hay una línea en otro parte de trabajo marcando como finalizada la misma tarea"
+msgstr ""
+"hay una línea en otro parte de trabajo marcando como finalizada la misma "
+"tarea"
 
 #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java:122
 msgid "worker's first name not specified"
@@ -1628,28 +1714,31 @@ msgstr "nombre del trabajador no especificado"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1411
 msgid "End date can only be deleted in the the last activation"
-msgstr "La fecha de fin sólo se puede borrar en el último periodo de activación"
+msgstr ""
+"La fecha de fin sólo se puede borrar en el último periodo de activación"
 
 #: libreplan-webapp/src/main/webapp/common/configuration.zul:374
 msgid "Property strategy"
 msgstr "Estrategia de propiedad"
 
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:107
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:276
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:107
 msgid "Save date"
 msgstr "Guardar fecha"
 
 #: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityForm.java:248
 msgid ""
 "The quality item positions must be correct in function to the percentage."
-msgstr "Las posiciones de los ítems de calidad deben ser correctas en función del porcentaje."
+msgstr ""
+"Las posiciones de los ítems de calidad deben ser correctas en función del "
+"porcentaje."
 
-#: 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-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:521
 #: 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
+#: libreplan-business/src/main/java/org/libreplan/business/expensesheet/entities/ExpenseSheetLine.java:146
 msgid "date not specified"
 msgstr "fecha no especificada"
 
@@ -1657,10 +1746,12 @@ msgstr "fecha no especificada"
 msgid ""
 "Periods available depend on the satisfaction of the criteria of resources "
 "and their calendars."
-msgstr "Los períodos disponibles dependen de la satisfacción de criterios por los recursos y sus calendarios."
+msgstr ""
+"Los períodos disponibles dependen de la satisfacción de criterios por los "
+"recursos y sus calendarios."
 
-#: 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/planner/tabs/PlanningTabCreator.java:199
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:233
 msgid "Projects Planning"
 msgstr "Planificación de proyectos"
 
@@ -1676,14 +1767,14 @@ msgstr "No se puede eliminar un escenario con escenarios derivados"
 msgid "The max value must be greater than 0"
 msgstr "El valor máximo debe ser mayor que 0"
 
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:61
-#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:65
 #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:73
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:66
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:61
 msgid "Last name"
 msgstr "Apellidos"
 
 #: 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 "Borrar"
 
@@ -1707,9 +1798,11 @@ msgstr "Tipo de progreso"
 msgid "name not specified or empty"
 msgstr "nombre no especificado o vacío"
 
-#: 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 "La tarea contiene progreso consolidado. No se puede aplicar la función sigmoide."
+msgstr ""
+"La tarea contiene progreso consolidado. No se puede aplicar la función "
+"sigmoide."
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:535
 msgid "Date cannot include the entire next work week"
@@ -1727,18 +1820,20 @@ msgstr "UserId"
 msgid "This date can not include the whole previous work week"
 msgstr "Esta fecha no puede incluir a la semana de trabajo anterior completa"
 
-#: 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 "La fecha de inicio no es válida, la fecha de inicio nueva debe ser anterior a la fecha de inicio actual"
+msgstr ""
+"La fecha de inicio no es válida, la fecha de inicio nueva debe ser anterior "
+"a la fecha de inicio actual"
 
 #: libreplan-webapp/src/main/webapp/common/layout/template.zul:123
 msgid "Create New Project"
 msgstr "Crear proyecto nuevo"
 
-#: 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 "Lista de tramos"
 
@@ -1746,44 +1841,44 @@ msgstr "Lista de tramos"
 msgid "to {0}"
 msgstr "hasta {0}"
 
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:21
-msgid "LibrePlan: Total Worked Hours By Resource In A Month"
-msgstr "LibrePlan: Total horas trabajadas por recurso en un mes"
-
 #: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:65
 msgid "Zoom"
 msgstr "Zoom"
 
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:21
+msgid "LibrePlan: Total Worked Hours By Resource In A Month"
+msgstr "LibrePlan: Total horas trabajadas por recurso en un mes"
+
 #: 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/webapp/externalcompanies/_editExternalCompany.zul:102
 #: libreplan-webapp/src/main/webapp/materials/materials.zul:118
-#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:180
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:232
-#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:37
 #: 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/profiles/_editProfile.zul:70
-#: libreplan-webapp/src/main/webapp/unittypes/unitTypes.zul:41
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:232
+#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:37
 #: 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/limitingresources/limitingResourcesLayout.zul:59
-#: libreplan-webapp/src/main/webapp/typeofworkhours/_editTypeOfWorkHours.zul:77
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:90
+#: libreplan-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:41
+#: 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/myaccount/settings.zul:160
+#: libreplan-webapp/src/main/webapp/myaccount/changePassword.zul:89
+#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:133
+#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:38
 #: libreplan-webapp/src/main/webapp/common/configuration.zul:419
+#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:125
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:102
+#: libreplan-webapp/src/main/webapp/profiles/_editProfile.zul:70
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:91
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:131
+#: libreplan-webapp/src/main/webapp/typeofworkhours/_editTypeOfWorkHours.zul:77
+#: libreplan-webapp/src/main/webapp/unittypes/unitTypes.zul:41
+#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:59
+#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:180
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:184
 msgid "Save"
 msgstr "Guardar"
 
@@ -1791,20 +1886,22 @@ msgstr "Guardar"
 msgid ""
 "It will only be possible to add a Deliver Date if all the deliver date "
 "exiting in the table have a CommunicationDate not empty. "
-msgstr "Sólo será posible añadir una fecha de entrega si todas las fechas de entrega existentes en la tabla tienen una fecha de comunicación no vacía."
-
-#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:34
-#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:72
-msgid "Standard Effort"
-msgstr "Esfuerzo estándar"
+msgstr ""
+"Sólo será posible añadir una fecha de entrega si todas las fechas de entrega "
+"existentes en la tabla tienen una fecha de comunicación no vacía."
 
 #: libreplan-webapp/src/main/webapp/common/configuration.zul:167
 msgid "Material categories"
 msgstr "Categorías de materiales"
 
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:72
+#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:34
+msgid "Standard Effort"
+msgstr "Esfuerzo estándar"
+
 #: 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:589
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:687
 msgid "number of digits must be between {0} and {1}"
 msgstr "el número de dígitos debe estar entre {0} y {1}"
 
@@ -1815,7 +1912,9 @@ msgstr "la medida tiene que ser única"
 #: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:161
 msgid ""
 "Deleting this item will disable the report progress option. Are you sure?"
-msgstr "Borrando este elemento se deshabilitará la opción de notificar progreso. ¿Está seguro?"
+msgstr ""
+"Borrando este elemento se deshabilitará la opción de notificar progreso. "
+"¿Está seguro?"
 
 #: libreplan-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:22
 msgid "Criteria Requirement"
@@ -1829,9 +1928,11 @@ msgstr "Criterio seleccionado previamente"
 msgid ""
 "Spread progress cannot be changed if there is a consolidation in any "
 "progress assignment from root task"
-msgstr "El progreso que propaga no se puede cambiar si hay alguna consolidación en alguna asignación de progreso desde la tarea raíz"
+msgstr ""
+"El progreso que propaga no se puede cambiar si hay alguna consolidación en "
+"alguna asignación de progreso desde la tarea raíz"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:313
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:405
 msgid "Schedule from deadline to start"
 msgstr "Planificar desde la fecha límite hacia el inicio"
 
@@ -1848,26 +1949,26 @@ msgstr "Problemas conectando con el servicio web subcontratista"
 msgid "Delete template. Are you sure?"
 msgstr "Borrar plantilla. ¿Está seguro?"
 
-#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:117
-msgid "Expense date"
-msgstr "Fecha de gasto"
-
 #: libreplan-webapp/src/main/webapp/common/configuration.zul:256
 msgid "Entity type"
 msgstr "Tipo de entidad"
 
-#: 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/webapp/expensesheet/expenseSheet.zul:117
+msgid "Expense date"
+msgstr "Fecha de gasto"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:325
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1120
 msgid "Unsaved changes will be lost. Are you sure?"
 msgstr "Se perderán los cambios sin guardar. ¿Está seguro?"
 
+#: libreplan-webapp/src/main/webapp/resourceload/resourceload.zul:22
+#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:22
+#: libreplan-webapp/src/main/webapp/planner/order.zul:22
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:22
 #: libreplan-webapp/src/main/webapp/planner/montecarlo_function.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/resourceload/resourceload.zul:22
 msgid "LibrePlan: Scheduling"
 msgstr "LibrePlan: Planificación"
 
@@ -1875,14 +1976,14 @@ msgstr "LibrePlan: Planificación"
 msgid "Assigned load"
 msgstr "Carga asignada"
 
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:66
-msgid "Filter by workers"
-msgstr "Filtrar por trabajadores"
-
 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:154
 msgid "End Date"
 msgstr "Fecha de fin"
 
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:66
+msgid "Filter by workers"
+msgstr "Filtrar por trabajadores"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/AdvancedAllocationTaskController.java:73
 msgid "Some allocations needed"
 msgstr "Se necesitan algunas asignaciones"
@@ -1895,9 +1996,11 @@ msgstr "Recursos por día"
 msgid ""
 "Estimated end date for the task (press enter in textbox to open calendar "
 "popup or type in date directly)"
-msgstr "Fecha de fin estimada para la tarea (presione enter en el cuadro de texto para abrir el calendario o escriba la fecha directamente)"
+msgstr ""
+"Fecha de fin estimada para la tarea (presione enter en el cuadro de texto "
+"para abrir el calendario o escriba la fecha directamente)"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:310
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:355
 msgid "Expand/Collapse all"
 msgstr "Expandir/Plegar todo"
 
@@ -1905,13 +2008,9 @@ msgstr "Expandir/Plegar todo"
 msgid "Overload due to current project"
 msgstr "Sobrecarga debido al proyecto actual"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:887
-msgid "Name: {0}"
-msgstr "Nombre: {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
 msgid "Please, select a project"
 msgstr "Por favor, seleccione un proyecto"
 
@@ -1929,7 +2028,9 @@ msgstr "Estructura del parte"
 
 #: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:524
 msgid "resource has to be bound to a user in personal timesheets"
-msgstr "el recurso tiene que estar vinculado a un usuario en los partes de horas personales"
+msgstr ""
+"el recurso tiene que estar vinculado a un usuario en los partes de horas "
+"personales"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:102
 #: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:103
@@ -1950,32 +2051,32 @@ msgstr "Ir a la ventana de edición de usuarios"
 msgid "Cost"
 msgstr "Coste"
 
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:42
 #: 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
 msgid "General data"
 msgstr "Datos generales"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:251
-msgid "BAC"
-msgstr "BAC"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeComponent.java:111
 msgid "Deadline (days since project start)"
 msgstr "Fecha límite (días desde el inicio del proyecto)"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:251
+msgid "BAC"
+msgstr "BAC"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:381
 msgid "Calculate Number of Hours"
 msgstr "Calcular número de horas"
 
-#: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:38
-#: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:35
-#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:81
 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:99
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:81
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:35
+#: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:38
 msgid "Assign"
 msgstr "Asignar"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1276
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1414
 msgid "Create Template"
 msgstr "Crear plantilla"
 
@@ -1990,10 +2091,11 @@ msgstr "Tiempo"
 
 #: libreplan-business/src/main/java/org/libreplan/business/expensesheet/entities/ExpenseSheet.java:127
 msgid "last expense sheet line sequence code not specified"
-msgstr "último código de secuencia de la línea de la hoja de gastos no especificado"
+msgstr ""
+"último código de secuencia de la línea de la hoja de gastos no especificado"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:972
 #: 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
 msgid "Not enough permissions to edit this project"
 msgstr "No tiene permisos suficientes para editar este proyecto"
 
@@ -2002,12 +2104,12 @@ msgstr "No tiene permisos suficientes para editar este proyecto"
 msgid "Advanced search"
 msgstr "Búsqueda avanzada"
 
-#: 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/workingArrangementsPerOrderReport.zul:84
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:76
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:97
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:76
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:114
+#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:65
 msgid "Filter by labels"
 msgstr "Filtrar por etiquetas"
 
@@ -2015,7 +2117,9 @@ msgstr "Filtrar por etiquetas"
 msgid ""
 "IMPORTANT: Don't forget to communicate to subcontractor that his contract "
 "has been cancelled"
-msgstr "IMPORTANTE: No olvidar comunicar al subcontratista que su contrato ha sido cancelado"
+msgstr ""
+"IMPORTANTE: No olvidar comunicar al subcontratista que su contrato ha sido "
+"cancelado"
 
 #: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:36
 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:82
@@ -2030,7 +2134,7 @@ msgstr "Diagrama de Montecarlo"
 msgid "Schedule Variance"
 msgstr "Desviación en planificación"
 
-#: 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 "los recursos por día no pueden estar vacíos o ser menores que cero"
 
@@ -2051,37 +2155,39 @@ msgstr "los nombres de criterio deben ser únicos dentro de un tipo de criterio"
 msgid "Status code"
 msgstr "Código de estado"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:103
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:970
+#: 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/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/qualityforms/QualityFormCRUDController.java:391
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:155
+msgid "Warning"
+msgstr "Advertencia"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:900
 msgid "Index fields and labels must be unique and consecutive"
 msgstr "Los índices de campos y etiquetas deben ser únicos y consecutivos"
 
-#: 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 "Advertencia"
-
-#: libreplan-webapp/src/main/webapp/resources/worker/_calendar.zul:35
 #: 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 "Seleccionar el calendario padre"
 
-#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:66
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:67
+#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:66
 msgid "Identification"
 msgstr "Identificación"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:218
 #: 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 "La fecha de fin no es válida. La nueva fecha de fin debe ser posterior a la actual"
+msgstr ""
+"La fecha de fin no es válida. La nueva fecha de fin debe ser posterior a la "
+"actual"
 
 #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java:248
 msgid "Queue-based resources cannot be bound to any user"
@@ -2100,29 +2206,29 @@ msgstr "Desvincular recurso"
 msgid "quality form not specified"
 msgstr "formulario de calidad no especificado"
 
-#: 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/timeLineMaterialReport.zul:165
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:49
 #: libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul:37
 #: libreplan-webapp/src/main/webapp/subcontract/subcontractorCommunications.zul:37
-#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:49
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:195
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:96
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:165
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:188
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:217
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:168
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:187
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:228
+#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:178
 msgid "Show"
 msgstr "Mostrar"
 
-#: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:71
-msgid "Assignment Type"
-msgstr "Tipo de asignación"
-
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:58
 msgid "Duration (days)"
 msgstr "Duración (días)"
 
+#: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:71
+msgid "Assignment Type"
+msgstr "Tipo de asignación"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:424
 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:69
 msgid "Send To Subcontractors"
@@ -2150,7 +2256,8 @@ msgstr "host no especificado"
 
 #: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityForm.java:266
 msgid "percentages in quality form items must be unique"
-msgstr "los porcentajes en los ítems del formulario de calidad deben ser únicos"
+msgstr ""
+"los porcentajes en los ítems del formulario de calidad deben ser únicos"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:443
 msgid "Edit queue-based resource element"
@@ -2169,7 +2276,9 @@ msgstr "Coste de gastos"
 msgid ""
 "Value is not valid.\n"
 " Code cannot contain chars like '_'."
-msgstr "El valor no es válido.\n El código no puede contener caracteres como '_'."
+msgstr ""
+"El valor no es válido.\n"
+" El código no puede contener caracteres como '_'."
 
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:73
 msgid "Node without children"
@@ -2193,8 +2302,8 @@ msgstr "Propiedades de la tarea"
 msgid "Sum of direct imputed hours"
 msgstr "Suma de horas imputadas directamente"
 
-#: 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
+#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:233
 msgid "type of work hours not specified"
 msgstr "tipo de horas de trabajo no especificado"
 
@@ -2202,8 +2311,8 @@ msgstr "tipo de horas de trabajo no especificado"
 msgid "the type of work hours name has to be unique. It is already used"
 msgstr "el nombre del tipo de horas de trabajo debe ser único. Ya está en uso"
 
-#: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:35
 #: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:28
+#: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:35
 msgid "Surname"
 msgstr "Apellidos"
 
@@ -2211,27 +2320,27 @@ msgstr "Apellidos"
 msgid "calendars with zero hours are not allowed"
 msgstr "no están permitidos calendarios con cero horas"
 
-#: 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/expensesheet/expenseSheet.zul:170
-#: 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/java/org/libreplan/web/workreports/WorkReportCRUDController.java:777
 #: 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
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:32
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:84
+#: 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/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/subcontract/subcontractorCommunications.zul:69
+#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:170
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:43
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:43
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:43
 msgid "Date"
 msgstr "Fecha"
 
@@ -2240,14 +2349,14 @@ msgstr "Fecha"
 msgid "Reviewed"
 msgstr "Revisado"
 
-#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:42
-msgid "Add From Template"
-msgstr "Añadir a partir de plantilla"
-
 #: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:32
 msgid "Expense Sheets List"
 msgstr "Lista de hojas de gastos"
 
+#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:42
+msgid "Add From Template"
+msgstr "Añadir a partir de plantilla"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:574
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:612
 msgid "Assigned resources for this task will be deleted. Are you sure?"
@@ -2269,8 +2378,8 @@ msgstr "Habilitar la autenticación LDAP"
 msgid "( max: {0} )"
 msgstr "( máx: {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 "Criterio ya asignado"
 
@@ -2286,8 +2395,8 @@ msgstr "Seleccionar cola"
 msgid "Cannot calculate charts for current data"
 msgstr "No se pueden calcular gráficos para los datos actuales"
 
-#: 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/java/org/libreplan/web/orders/ProjectDetailsController.java:178
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1681
 msgid "project name already being used"
 msgstr "el nombre de proyecto ya está siendo usado"
 
@@ -2295,8 +2404,8 @@ msgstr "el nombre de proyecto ya está siendo usado"
 msgid "Work description"
 msgstr "Descripción del trabajo"
 
-#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:61
 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:60
+#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:61
 msgid "Split assignment"
 msgstr "Dividir asignación"
 
@@ -2308,15 +2417,15 @@ msgstr "el proyecto debe tener una fecha de inicio"
 msgid "percentage must be unique"
 msgstr "el porcentaje debe ser único"
 
-#: 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/hoursWorkedPerWorkerInAMonthReport.zul:90
 #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:160
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:183
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:212
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:163
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:182
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:222
+#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:171
 msgid "direct link"
 msgstr "enlace directo"
 
@@ -2329,11 +2438,10 @@ msgid "template calendar not specified"
 msgstr "calendario de la plantilla no especificado"
 
 #: 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/TaskGroupFilterEnum.java:30
+#: 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/OrderFilterEnum.java:30
 msgid "Label"
 msgstr "Etiqueta"
 
@@ -2345,13 +2453,13 @@ msgstr "precio no especificado"
 msgid "Task Completation Lead/Lag"
 msgstr "Adelanto/retraso en finalización de tareas"
 
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:127
 #: libreplan-webapp/src/main/webapp/profiles/_editProfile.zul:51
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:127
 msgid "Association with roles"
 msgstr "Asociación con roles"
 
-#: 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 "Nueva hoja de gastos"
 
@@ -2372,8 +2480,8 @@ msgstr "Código {0} de grupo de horas repetido en proyecto {1}"
 msgid "Hours group"
 msgstr "Grupo de horas"
 
-#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:72
 #: libreplan-webapp/src/main/webapp/templates/_listTemplates.zul:29
+#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:72
 msgid "Days from Beginning to Deadline"
 msgstr "Días desde el comienzo hasta la fecha límite"
 
@@ -2398,21 +2506,21 @@ msgstr "Todavía no hay tareas disponibles"
 msgid "Output format:"
 msgstr "Formato de salida:"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/CriterionRequirementWrapper.java:45
 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportQueryController.java:259
 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1199
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/CriterionRequirementWrapper.java:45
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:77
 msgid "Direct"
 msgstr "Directo"
 
 #: 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/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:86
+#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:34
 #: 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
-#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:34
+#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:51
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:86
 msgid "Op."
 msgstr "Op."
 
@@ -2432,40 +2540,44 @@ msgstr "Semana de trabajo"
 msgid "Please select a source scenario"
 msgstr "Por favor seleccione un escenario de origen"
 
-#: 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 "NIF"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1582
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1758
 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."
-msgstr "Sólo será posible añadir una fecha de fin si todas las existentes en la tabla ya han sido enviadas al cliente."
+msgstr ""
+"Sólo será posible añadir una fecha de fin si todas las existentes en la "
+"tabla ya han sido enviadas al cliente."
 
 #: libreplan-webapp/src/main/webapp/common/configuration.zul:43
 msgid "Entity sequences"
 msgstr "Secuencias de entidad"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:242
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:733
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1452
 #: 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/order/OrderPlanningController.java:356
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:302
 msgid "must be after start date"
 msgstr "debe ser posterior a la fecha de inicio"
 
 #: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:251
 msgid ""
-"closckStart:the clockStart must be not null if number of hours is calcultate"
-" by clock"
-msgstr "la hora de inicio no puede estar vacía si el número de horas se calcula por reloj"
+"closckStart:the clockStart must be not null if number of hours is calcultate "
+"by clock"
+msgstr ""
+"la hora de inicio no puede estar vacía si el número de horas se calcula por "
+"reloj"
 
-#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:67
 #: libreplan-webapp/src/main/webapp/templates/_listTemplates.zul:27
+#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:67
 msgid "Delay from beginning (days)"
 msgstr "Retraso desde el comienzo (en días)"
 
@@ -2494,7 +2606,7 @@ msgstr "Confirmar cancelación"
 msgid "Work And Progress Per Task"
 msgstr "Trabajo y progreso por tarea"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1529
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1705
 msgid "project code already being used"
 msgstr "el código del proyecto ya está siendo usado"
 
@@ -2510,7 +2622,7 @@ msgstr "tipo no especificada"
 msgid "WBS (tasks)"
 msgstr "EDT (tareas)"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:713
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:714
 msgid "Deleting sequence"
 msgstr "Borrando secuencia"
 
@@ -2531,18 +2643,18 @@ msgstr "Seleccionar escenario"
 msgid "LibrePlan: Templates"
 msgstr "LibrePlan: Plantillas"
 
-#: 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 "Editar grupo de trabajadores virtuales: {0}"
 
-#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:88
-msgid "Total other"
-msgstr "Total otro"
-
 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:51
 msgid "Criterion requirement"
 msgstr "Criterios requeridos"
 
+#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:88
+msgid "Total other"
+msgstr "Total otro"
+
 #: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:21
 msgid "LibrePlan: Expenses"
 msgstr "LibrePlan: Gastos"
@@ -2555,15 +2667,17 @@ msgstr "Máximo/mínimo de las horas trabajadas en las aplicaciones finalizadas"
 msgid "Scheduling saved"
 msgstr "Planificación guardada"
 
-#: 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:765
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:986
 msgid ""
 "You can not remove the project \"{0}\" because this one has imputed expense "
 "sheets."
-msgstr "No puede borrar la tarea \"{0}\" porque está imputado en alguna hoja de gastos."
+msgstr ""
+"No puede borrar la tarea \"{0}\" porque está imputado en alguna hoja de "
+"gastos."
 
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:219
 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:70
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:219
 #: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:28
 msgid "Add new row"
 msgstr "Añadir nueva fila"
@@ -2584,8 +2698,8 @@ msgstr "la fecha límite debe ser posterior a la fecha de inicio"
 msgid "Password saved"
 msgstr "Contraseña guardada"
 
-#: 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 "Sobrecarga"
 
@@ -2593,8 +2707,8 @@ msgstr "Sobrecarga"
 msgid "subcontrated task data not specified"
 msgstr "datos de la tarea subcontratada no especificados"
 
-#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:50
 #: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:30
+#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:50
 msgid "Assignment log"
 msgstr "Histórico de asignación"
 
@@ -2612,9 +2726,9 @@ msgid "LibrePlan: Companies"
 msgstr "LibrePlan: Empresas"
 
 #: 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 "Basado en cola"
 
@@ -2631,13 +2745,17 @@ msgstr "Fecha de entrega"
 msgid ""
 "Days Interval (Calculated as task completion end date minus estimated end "
 "date)"
-msgstr "Intervalo de días (Calculado como la fecha de finalización de la tarea menos la fecha estimada de fin)"
+msgstr ""
+"Intervalo de días (Calculado como la fecha de finalización de la tarea menos "
+"la fecha estimada de fin)"
 
 #: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/TaskQualityForm.java:101
 msgid ""
 "Each date must be greater than the dates of the previous task quality form "
 "items."
-msgstr "Cada fecha debe ser posterior a las fechas de los ítems anteriores del formulario de calidad."
+msgstr ""
+"Cada fecha debe ser posterior a las fechas de los ítems anteriores del "
+"formulario de calidad."
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:290
 msgid "Stretch date must be earlier than End date: "
@@ -2649,33 +2767,35 @@ msgstr "No tiene permisos para acceder a esta página."
 
 #: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityForm.java:216
 msgid "The quality form item positions must be unique and consecutive."
-msgstr "Las posiciones de los ítems del formulario de calidad deben ser únicas y consecutivas."
+msgstr ""
+"Las posiciones de los ítems del formulario de calidad deben ser únicas y "
+"consecutivas."
 
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:27
 msgid "External company"
 msgstr "Empresa externa"
 
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:68
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:44
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:68
 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:28
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:68
+#: libreplan-webapp/src/main/webapp/profiles/_editProfile.zul:61
+#: libreplan-webapp/src/main/webapp/profiles/_listProfiles.zul:28
+#: libreplan-webapp/src/main/webapp/typeofworkhours/_listTypesOfWorkHours.zul:30
 #: 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/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 "Acciones"
 
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:34
+msgid "User settings"
+msgstr "Preferencias de usuario"
+
 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:130
 msgid "Exceptions"
 msgstr "Excepciones"
 
-#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:33
-msgid "User settings"
-msgstr "Preferencias de usuario"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:833
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:110
 msgid "Start hour"
@@ -2686,13 +2806,13 @@ msgid "Assign materials"
 msgstr "Asignar materiales"
 
 #: 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
 #: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:29
+#: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:37
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:79
 msgid "ID"
 msgstr "NIF"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/bandboxsearch/BandboxMultipleSearch.java:238
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/bandboxsearch/BandboxMultipleSearch.java:240
 msgid "format filters are not valid"
 msgstr "los filtros de formato no son válidos"
 
@@ -2704,9 +2824,11 @@ msgstr "LibrePlan: Costes del proyecto"
 msgid "please, select a criterion"
 msgstr "por farvor, seleccione un criterio"
 
-#: 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 "Marcar el código como autogenerado para crear un nuevo proyecto a partir de plantillas"
+msgstr ""
+"Marcar el código como autogenerado para crear un nuevo proyecto a partir de "
+"plantillas"
 
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:161
 msgid "Hours Group"
@@ -2721,6 +2843,11 @@ msgstr "Usuario vinculado"
 msgid "Unallocated name"
 msgstr "Nombre no asignado"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1720
+#, fuzzy
+msgid "Subcontracted by client"
+msgstr "Precio de subcontratación"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:282
 msgid "Password cannot be empty"
 msgstr "La contraseña no puede estar vacía"
@@ -2734,8 +2861,8 @@ msgid "Dependencies have priority"
 msgstr "Las dependencias tienen prioridad"
 
 #: 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/resources/worker/WorkerCRUDController.java:1059
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:128
 msgid "Create {0}"
 msgstr "Crear {0}"
 
@@ -2763,18 +2890,18 @@ msgstr "Página arriba"
 msgid "Create new project"
 msgstr "Crear nuevo proyecto"
 
-#: 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/java/org/libreplan/web/planner/order/OrderPlanningModel.java:796
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:397
 msgid "date in the future"
 msgstr "fecha en el futuro"
 
-#: 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/planner/TaskElementAdapter.java:896
+#: libreplan-webapp/src/main/webapp/orders/_list.zul:35
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:104
 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:56
 #: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:51
-#: libreplan-webapp/src/main/webapp/orders/_edition.zul:104
-#: libreplan-webapp/src/main/webapp/orders/_list.zul:35
 msgid "State"
 msgstr "Estado"
 
@@ -2784,9 +2911,11 @@ msgstr "Debe empezar después"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:118
 msgid "Fully, Partially or Unscheduled. (Drag and drop to move tasks)"
-msgstr "Completa, parcialmente o no planificada. (Pinche y arrastre para mover tareas)"
+msgstr ""
+"Completa, parcialmente o no planificada. (Pinche y arrastre para mover "
+"tareas)"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1322
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1330
 msgid "Confirm change"
 msgstr "Confirmar cambio"
 
@@ -2802,22 +2931,24 @@ msgstr "unidades no especificadas"
 msgid "Code already included in Hours Group codes"
 msgstr "El código ya está incluido en los códigos de los grupos de horas"
 
-#: 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/templates/OrderTemplatesController.java:303
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:133
 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:47
 msgid "Planning"
 msgstr "Planificación"
 
-#: 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 "La tarea tiene consolidaciones de progreso. Debe borrar todas las consolidaciones para cambiar el tipo de asignación de recursos"
+"The task has got progress consolidations. To change resource allocation type "
+"all consolidations must be removed before"
+msgstr ""
+"La tarea tiene consolidaciones de progreso. Debe borrar todas las "
+"consolidaciones para cambiar el tipo de asignación de recursos"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ReportAdvancesController.java:199
 #: 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 "Enviar"
 
@@ -2843,11 +2974,11 @@ msgid "Type name"
 msgstr "Nombre del tipo"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportQueryController.java:250
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/TimeLineRequiredMaterialController.java:207
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:181
-#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:728
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:831
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:863
 #: 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/reports/SchedulingProgressPerOrderController.java:181
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/TimeLineRequiredMaterialController.java:207
 #: 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
@@ -2880,6 +3011,12 @@ msgstr "Lista de calendarios"
 msgid "Create activation period"
 msgstr "Crear período de activación"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/CriterionRequirementWrapper.java:48
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1197
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:229
+msgid "Inherited"
+msgstr "Heredado"
+
 #: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:31
 msgid "Personal details"
 msgstr "Detalles personales"
@@ -2888,30 +3025,29 @@ msgstr "Detalles personales"
 msgid "Workers List"
 msgstr "Lista de trabajadores"
 
-#: 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 "Heredado"
+#: 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 "Trabajador"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:519
 #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:597
 msgid ""
 "Cannot allocate selected element. There is not any queue that matches "
 "resource allocation criteria at any interval of time"
-msgstr "No se puede asignar el elemento seleccionado. No hay ninguna cola que coincida con los criterios de asignación de recursos en ningún intervalo de tiempo"
-
-#: 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 "Trabajador"
+msgstr ""
+"No se puede asignar el elemento seleccionado. No hay ninguna cola que "
+"coincida con los criterios de asignación de recursos en ningún intervalo de "
+"tiempo"
 
 #: 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 "La fecha no es válida, debe ser posterior al último progreso notificado al cliente"
+msgstr ""
+"La fecha no es válida, debe ser posterior al último progreso notificado al "
+"cliente"
 
 #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java:224
 msgid "User already bound to other worker"
@@ -2933,32 +3069,35 @@ msgstr "calendario no especificado"
 msgid "Start hour cannot be greater than finish hour"
 msgstr "La hora de inicio no puede ser posterior a la hora de fin"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:511
+msgid "Preferences"
+msgstr "Preferencias"
+
 #: 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 ""
 "There are unsaved changes in the current personal timesheet, please save "
 "before moving"
-msgstr "Hay cambios sin guardar en el parte de horas personal actual, por favor guarde antes de moverse"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:511
-msgid "Preferences"
-msgstr "Preferencias"
-
-#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:25
-msgid "Manual allocation"
-msgstr "Asignación manual"
+msgstr ""
+"Hay cambios sin guardar en el parte de horas personal actual, por favor "
+"guarde antes de moverse"
 
 #: libreplan-webapp/src/main/webapp/common/configuration.zul:386
 msgid "Role property"
 msgstr "Propiedad del rol"
 
+#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:25
+msgid "Manual allocation"
+msgstr "Asignación manual"
+
 #: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceAssignment.java:75
 msgid "progress type not specified"
 msgstr "tipo de progreso no especificado"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/ExpensesAreaController.java:108
 msgid "Expense sheet \"{1}\" could not be deleted, it was already removed"
-msgstr "La hoja de gastos \"{1}\" no se ha podido borrar, ya había sido eliminada"
+msgstr ""
+"La hoja de gastos \"{1}\" no se ha podido borrar, ya había sido eliminada"
 
 #: libreplan-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:29
 msgid "External overload"
@@ -2975,7 +3114,9 @@ msgstr "Autorizar"
 msgid ""
 "Progress Measurement cannot be deleted. Progress Measurement already "
 "consolidated"
-msgstr "La medida de progreso no se puede borrar. La medida de progreso ya está consolidada"
+msgstr ""
+"La medida de progreso no se puede borrar. La medida de progreso ya está "
+"consolidada"
 
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:47
 msgid "Recommended allocation"
@@ -2985,14 +3126,19 @@ msgstr "Asignación recomendada"
 msgid "Activation"
 msgstr "Activación"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:759
-msgid "Calculated progress cannot be removed"
-msgstr "El progreso calculado no se puede borrar"
+#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioCRUDController.java:243
+#, fuzzy
+msgid "Scenarios"
+msgstr "escenario"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:375
 msgid "Materials saved"
 msgstr "Materiales guardados"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:759
+msgid "Calculated progress cannot be removed"
+msgstr "El progreso calculado no se puede borrar"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:458
 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:39
 msgid "Total Worked Hours By Resource In A Month"
@@ -3008,7 +3154,9 @@ msgstr "Otros proyectos"
 
 #: 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 "la hora de fin no puede estar vacía si el número de horas es calculado por reloj"
+msgstr ""
+"la hora de fin no puede estar vacía si el número de horas es calculado por "
+"reloj"
 
 #: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:117
 msgid "Tasks input buffer"
@@ -3026,10 +3174,10 @@ msgstr "La plantilla no se puede borrar porque tiene aplicaciones."
 msgid "At least one {0} sequence must be active"
 msgstr "Al menos una secuencia de {0} debe estar activa"
 
-#: 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
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:66
+#: libreplan-webapp/src/main/webapp/profiles/_listProfiles.zul:26
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:160
 msgid "Profile name"
 msgstr "Nombre del perfil"
 
@@ -3070,9 +3218,9 @@ msgstr "Usar roles del LDAP"
 msgid "Details"
 msgstr "Detalles"
 
-#: 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 "Error: {0}"
 
@@ -3089,14 +3237,18 @@ msgstr "LibrePlan: Parte de horas personal"
 msgid "Confirm create template"
 msgstr "Confirmar la creación de la plantilla"
 
-#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:50
-msgid "Work amount"
-msgstr "Cantidad de trabajo"
-
 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:250
 msgid "Parent"
 msgstr "Padre"
 
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:139
+msgid "Resources load filtering"
+msgstr "Filtro de carga de recursos"
+
+#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:50
+msgid "Work amount"
+msgstr "Cantidad de trabajo"
+
 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:91
 msgid "Earliest date"
 msgstr "Fecha más temprana"
@@ -3114,19 +3266,21 @@ msgstr "LibrePlan: trabajo y progreso por tarea"
 msgid "Projects"
 msgstr "Proyectos"
 
-#: 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
-msgid "Confirm exit dialog"
-msgstr "Diálogo para confirmar la salida"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/converters/ConverterFactory.java:64
 msgid "Not found converter for {0}"
 msgstr "No se encontró un conversor para {0}"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:326
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1121
+msgid "Confirm exit dialog"
+msgstr "Diálogo para confirmar la salida"
+
 #: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportType.java:427
 msgid ""
 "In the lines part, index labels and fields must be unique and consecutive"
-msgstr "En la parte de las líneas, los índices de las etiquetas y los campos deben ser únicos y consecutivos"
+msgstr ""
+"En la parte de las líneas, los índices de las etiquetas y los campos deben "
+"ser únicos y consecutivos"
 
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:66
 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:52
@@ -3141,10 +3295,10 @@ msgstr "Asignaciones de materiales"
 msgid "last value not specified"
 msgstr "último valor no especificado"
 
-#: 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
+#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/TaskQualityForm.java:72
+#: libreplan-business/src/main/java/org/libreplan/business/expensesheet/entities/ExpenseSheetLine.java:110
 msgid "task not specified"
 msgstr "tarea no especificada"
 
@@ -3156,12 +3310,15 @@ msgstr "Cambiar la contraseña"
 msgid ""
 "Password cannot be managed for LDAP users because LDAP authentication is "
 "enabled."
-msgstr "La contraseña no se puede gestionar para los usuarios de LDAP porque la autenticación con LDAP está habilitada."
+msgstr ""
+"La contraseña no se puede gestionar para los usuarios de LDAP porque la "
+"autenticación con LDAP está habilitada."
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1325
 msgid ""
 "Progress measurement cannot be canged to {0}, because it is consolidated"
-msgstr "La medida de progreso no se puede cambiar a {0}, porque está consolidada"
+msgstr ""
+"La medida de progreso no se puede cambiar a {0}, porque está consolidada"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:826
 msgid "Text field"
@@ -3175,7 +3332,9 @@ msgstr "Pregunta"
 msgid ""
 "The meausure name is not valid. There is another unit type with the same "
 "measure name"
-msgstr "El nombre de la medida no es válido. Hay otro tipo de unidad con el mismo nombre de medida"
+msgstr ""
+"El nombre de la medida no es válido. Hay otro tipo de unidad con el mismo "
+"nombre de medida"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:626
 msgid "{0} cannot be fulfilled"
@@ -3193,14 +3352,14 @@ msgstr "proyecto no especificado"
 msgid "Work record"
 msgstr "Registro de trabajo"
 
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:168
-#: 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/hoursWorkedPerWorkerInAMonthReport.zul:76
 #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:147
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:169
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:200
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:149
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:168
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:206
 msgid "Output format"
 msgstr "Formato de salida"
 
@@ -3220,56 +3379,56 @@ msgstr "Página abajo"
 msgid "resource type does not allow enabled criteria"
 msgstr "el tipo de recurso no permite criterios habilitados"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/TransferOrdersModel.java:148
-msgid "Please, select a destination scenario"
-msgstr "Por favor, seleccione un escenario de destino"
-
-#: 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/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1112
 #: 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/scenarios/_edition.zul:70
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:132
+#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:90
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:98
 #: 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/resources/criterions/_edition.zul:94
+#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:139
 #: libreplan-webapp/src/main/webapp/common/layout/template.zul:104
 #: libreplan-webapp/src/main/webapp/common/configuration.zul:422
+#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:129
+#: 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/advance_allocation.zul:42
+#: libreplan-webapp/src/main/webapp/planner/reassign.zul:50
+#: libreplan-webapp/src/main/webapp/planner/editTask.zul:83
+#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:50
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:106
+#: libreplan-webapp/src/main/webapp/profiles/_editProfile.zul:74
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:97
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:137
+#: libreplan-webapp/src/main/webapp/typeofworkhours/_editTypeOfWorkHours.zul:81
+#: libreplan-webapp/src/main/webapp/unittypes/unitTypes.zul:43
+#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:135
+#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:184
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:188
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:36
-msgid "General user data"
-msgstr "Datos generales de usuario"
+#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/TransferOrdersModel.java:148
+msgid "Please, select a destination scenario"
+msgstr "Por favor, seleccione un escenario de destino"
 
 #: libreplan-webapp/src/main/webapp/common/components/schedulingStateToggler.zul:32
 msgid "Unschedule"
 msgstr "Quitar planificación"
 
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:36
+msgid "General user data"
+msgstr "Datos generales de usuario"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksController.java:216
 msgid "Subcontracted task sent successfully"
 msgstr "Tarea subcontratada enviada con éxito"
@@ -3282,9 +3441,9 @@ msgstr "Gráfico de horas acumuladas"
 msgid "Machines List"
 msgstr "Lista de máquinas"
 
-#: 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
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:827
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1039
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:406
 msgid "You don't have read access to this project"
 msgstr "No tiene acceso de lectura a este proyecto"
 
@@ -3295,28 +3454,31 @@ msgstr "CPI"
 #: 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?"
-msgstr "Desactivar jerarquía provocará que se aplane el árbol de criterios. ¿Está seguro?"
+msgstr ""
+"Desactivar jerarquía provocará que se aplane el árbol de criterios. ¿Está "
+"seguro?"
 
 #: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:231
 msgid "default maximum value of percentage progress type must be 100"
-msgstr "el valor máximo por defecto del tipo de progreso porcentaje debe ser 100"
+msgstr ""
+"el valor máximo por defecto del tipo de progreso porcentaje debe ser 100"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:139
 msgid "Cannot create another progress of the same type"
 msgstr "No puede crear otro progreso del mismo tipo"
 
-#: 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
-msgid "Dates"
-msgstr "Fechas"
-
-#: 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/templates/_materialAssignmentsBox.zul:29
 msgid "Units"
 msgstr "Unidades"
 
+#: 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 "Fechas"
+
 #: 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"
@@ -3367,14 +3529,14 @@ msgstr "Borrar tarea seleccionada"
 msgid "{0} (max: {1})"
 msgstr "{0} (máx: {1})"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:537
+msgid "end"
+msgstr "fin"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:526
 msgid "Cost Category"
 msgstr "Categoría de coste"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:492
-msgid "end"
-msgstr "fin"
-
 #: libreplan-webapp/src/main/webapp/common/configuration.zul:393
 msgid "Role search query"
 msgstr "Consulta para la búsqueda de roles"
@@ -3387,14 +3549,14 @@ msgstr "Los códigos del coste de hora deben ser únicos."
 msgid "Log"
 msgstr "Diario"
 
-#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:68
-msgid "Inherited exception"
-msgstr "Excepción heredada"
-
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:57
 msgid "Authorizations"
 msgstr "Autorizaciones"
 
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:68
+msgid "Inherited exception"
+msgstr "Excepción heredada"
+
 #: libreplan-webapp/src/main/webapp/common/concurrent_modification.zul:36
 #: libreplan-webapp/src/main/webapp/common/event_error.zul:49
 msgid "Continue"
@@ -3408,7 +3570,7 @@ msgstr "Editar tarea {0}"
 msgid "LibrePlan: Timesheets"
 msgstr "LibrePlan: Partes de trabajo"
 
-#: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:231
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:246
 msgid "username is already being used by another user"
 msgstr "el nombre de usuario ya está siendo usado por otro usuario"
 
@@ -3416,8 +3578,8 @@ msgstr "el nombre de usuario ya está siendo usado por otro usuario"
 msgid "references"
 msgstr "referencias"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1751
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractController.java:140
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1575
 msgid "You must select a valid date. "
 msgstr "Debe seleccionar una fecha válida."
 
@@ -3425,15 +3587,15 @@ msgstr "Debe seleccionar una fecha válida."
 msgid "Generic"
 msgstr "Genérico"
 
+#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:42
 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:43
 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:65
-#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:42
 msgid "Template"
 msgstr "Plantilla"
 
+#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/TaskQualityFormItem.java:126
 #: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityFormItem.java:112
 #: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityForm.java:277
-#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/TaskQualityFormItem.java:126
 msgid "percentage should be greater than 0% and less than 100%"
 msgstr "el porcentaje debería ser mayor que 0% y menor que 100%"
 
@@ -3441,37 +3603,37 @@ msgstr "el porcentaje debería ser mayor que 0% y menor que 100%"
 msgid "The field name must be unique."
 msgstr "El nombre del campo debe ser único."
 
-#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:49
-msgid "Default max value"
-msgstr "Valor máximo por defecto"
-
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:36
 msgid "Add criterion requirement"
 msgstr "Añadir criterio requerido"
 
+#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:50
+msgid "Default max value"
+msgstr "Valor máximo por defecto"
+
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:146
 msgid "Percentage of estimated budget hours / hours consumed"
 msgstr "Porcentaje de horas de presupuesto estimadas / horas consumidas"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:500
-msgid "Automatic"
-msgstr "Automático"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/CriterionBandboxFinder.java:44
 msgid "Criterion Name"
 msgstr "Nombre del criterio"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:500
+msgid "Automatic"
+msgstr "Automático"
+
 #: 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/webapp/expensesheet/expenseSheet.zul:127
-#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:167
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:667
+#: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:48
+#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:23
 #: 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
+#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:127
+#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:167
 msgid "Task"
 msgstr "Tarea"
 
@@ -3479,13 +3641,13 @@ msgstr "Tarea"
 msgid "LibrePlan: Change password"
 msgstr "LibrePlan: Cambiar la contraseña"
 
-#: 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/orders/labels/AssignedLabelsController.java:90
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:130
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:125
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:308
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:168
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:174
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/ProjectStatusReportController.java:188
 msgid "please, select a label"
 msgstr "por favor, seleccione una etiqueta"
 
@@ -3505,13 +3667,13 @@ msgstr "LibrePlan: Gestión de Escenarios"
 msgid "cost assignment with end date before start date"
 msgstr "la asignación de coste tiene fecha de fin anterior a la de inicio"
 
-#: 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 "el filtro ya existe"
 
-#: libreplan-webapp/src/main/webapp/resources/_criterions.zul:40
 #: libreplan-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:27
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:46
+#: libreplan-webapp/src/main/webapp/resources/_criterions.zul:40
 msgid "Criterion name"
 msgstr "Nombre del criterio"
 
@@ -3532,10 +3694,10 @@ msgstr "Aplicar cambios y volver a la planificación"
 msgid "Spreading progress"
 msgstr "Progreso que propaga"
 
+#: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:32
 #: 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/orders/_orderElementDetails.zul:32
 msgid "Task name"
 msgstr "Nombre de la tarea"
 
@@ -3543,44 +3705,48 @@ msgstr "Nombre de la tarea"
 msgid "cost assignment's resource not specified"
 msgstr "recurso de la asignación de coste no especificado"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementBandboxFinder.java:51
 #: 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/common/components/finders/OrderElementBandboxFinder.java:51
+#: libreplan-webapp/src/main/webapp/myaccount/_myTasksArea.zul:31
+#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:138
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:47
 #: 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 "Proyecto"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:371
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:463
 msgid ""
 "Starting date cannot be empty because there is a task with constraint \"as "
 "soon as possible\""
-msgstr "La fecha de inicio no puede estar vacía porque hay una tarea con la restricción \"tan pronto como sea posible\""
+msgstr ""
+"La fecha de inicio no puede estar vacía porque hay una tarea con la "
+"restricción \"tan pronto como sea posible\""
 
 #: libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialCategory.java:290
 msgid "last material sequence code not specified"
 msgstr "última código de secuencia de material no especificado"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/TwoWaySelector.java:79
+msgid "Unassigned"
+msgstr "No asignado"
+
 #: 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 "La asignación de progreso no se puede borrar ya que tiene medidas que ya han sido notificadas al cliente"
+msgstr ""
+"La asignación de progreso no se puede borrar ya que tiene medidas que ya han "
+"sido notificadas al cliente"
 
 #: 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 "No asignado"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1587
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1763
 msgid "It already exists a end date with the same date. "
 msgstr "ya existe una fecha de fin con la misma fecha."
 
@@ -3610,13 +3776,13 @@ msgstr "el código de la etiqueta ya está siendo usado"
 msgid "Disabled"
 msgstr "Deshabilitado"
 
-#: 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/planner/order/OrderPlanningModel.java:737
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:353
 msgid "Earned value"
 msgstr "Valor ganado"
 
-#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:35
 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:163
+#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:35
 msgid "Overtime Effort"
 msgstr "Esfuerzo extra"
 
@@ -3634,16 +3800,20 @@ msgstr "No tiene permisos para editar este parte de trabajo"
 msgid "Normal Effort"
 msgstr "Esfuerzo normal"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/TreeElementOperationsController.java:254
+msgid ""
+"Templates can only be created out of existent tasks.You are trying to create "
+"a template out of a new task.\n"
+"Please save your project before proceeding."
+msgstr ""
+"Las plantillas sólo pueden ser creadas a partir de tareas existentes. Está "
+"intentando crear unha plantilla a  partir de una tarea nueva.\n"
+"Por favor guarde su proyecto antes de continuar."
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java:138
 msgid "{0} reassignations finished"
 msgstr "Finalizadas {0} reasignaciones"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/TreeElementOperationsController.java:254
-msgid ""
-"Templates can only be created out of existent tasks.You are trying to create a template out of a new task.\n"
-"Please save your project before proceeding."
-msgstr "Las plantillas sólo pueden ser creadas a partir de tareas existentes. Está intentando crear unha plantilla a  partir de una tarea nueva.\nPor favor guarde su proyecto antes de continuar."
-
 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:66
 #: libreplan-webapp/src/main/webapp/myaccount/_personalTimesheetsArea.zul:33
 msgid "Total work"
@@ -3651,7 +3821,8 @@ msgstr "Trabajo total"
 
 #: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:1497
 msgid "a quality form cannot be assigned twice to the same task"
-msgstr "un formulario de calidad no se puede asignar dos veces a la misma tarea"
+msgstr ""
+"un formulario de calidad no se puede asignar dos veces a la misma tarea"
 
 #: libreplan-business/src/main/java/org/libreplan/business/common/entities/EntitySequence.java:145
 msgid "number of digits out of range"
@@ -3673,9 +3844,11 @@ msgstr "Partes de trabajo"
 
 #: libreplan-webapp/src/main/webapp/common/page_not_found.zul:43
 msgid ""
-"If you entered the URL directly in the navigation bar of the browser, please"
-" review it or click in the following link in order to go to initial page: "
-msgstr "Si introdujo la URL directamente en la barra del navegador, por favor revísela o haga click en el siguiente enlace para ir a la página inicial:"
+"If you entered the URL directly in the navigation bar of the browser, please "
+"review it or click in the following link in order to go to initial page: "
+msgstr ""
+"Si introdujo la URL directamente en la barra del navegador, por favor "
+"revísela o haga click en el siguiente enlace para ir a la página inicial:"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1124
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1139
@@ -3690,11 +3863,11 @@ msgstr "no está soportado para su uso con LibrePlan."
 msgid "New entry"
 msgstr "Entrada nueva"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:278
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:102
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:111
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:138
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:160
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:278
 msgid "Resources Load"
 msgstr "Carga de recursos"
 
@@ -3718,7 +3891,7 @@ msgstr "Hojas de gastos"
 msgid "Authentication"
 msgstr "Autenticación"
 
-#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:88
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:89
 msgid "Select language"
 msgstr "Seleccionar idioma"
 
@@ -3726,10 +3899,11 @@ msgstr "Seleccionar idioma"
 msgid "Appropriative allocation"
 msgstr "Asignación apropiativa"
 
-#: 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 "Este tipo de criterio no puede tener múltiples valores en el mismo periodo"
+msgstr ""
+"Este tipo de criterio no puede tener múltiples valores en el mismo periodo"
 
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:31
 msgid "Assigned criterion requirements"
@@ -3739,17 +3913,17 @@ msgstr "Criterios requeridos asignados"
 msgid "Calendar Exception Day"
 msgstr "Día excepcional del calendario"
 
-#: 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/workingArrangementsPerOrderReport.zul:125
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:117
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:147
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:117
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:155
+#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:105
 msgid "Filter by criteria"
 msgstr "Filtrar por criterios"
 
-#: libreplan-webapp/src/main/webapp/templates/_advances.zul:37
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:43
+#: libreplan-webapp/src/main/webapp/templates/_advances.zul:37
 msgid "Max value"
 msgstr "Valor máximo"
 
@@ -3784,12 +3958,12 @@ msgstr "Fechas de entrega solicitadas por el subcontratista."
 msgid "Period"
 msgstr "Periodo"
 
-#: libreplan-webapp/src/main/webapp/templates/_advances.zul:38
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:47
+#: libreplan-webapp/src/main/webapp/templates/_advances.zul:38
 msgid "Spread"
 msgstr "Propagación"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1021
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1023
 msgid "Disabled because of it contains more than one hours group"
 msgstr "Deshabilitado por contener más de un grupo de horas"
 
@@ -3801,7 +3975,7 @@ msgstr "Confirmar el borrado del usuario"
 msgid "Select start date"
 msgstr "Seleccionar fecha de inicio"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:882
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1017
 msgid "Removed {0}"
 msgstr "{0} borrado"
 
@@ -3809,9 +3983,11 @@ msgstr "{0} borrado"
 msgid ""
 "This criterion type cannot be deleted because it is assigned to projects or "
 "resources"
-msgstr "Este tipo de criterio no se puede borrar porque está asignado a proyectos o recursos"
+msgstr ""
+"Este tipo de criterio no se puede borrar porque está asignado a proyectos o "
+"recursos"
 
-#: 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 "Confirmar el borrado de este trabajador. ¿Está seguro?"
 
@@ -3820,16 +3996,15 @@ msgid "Group name"
 msgstr "Nombre del grupo"
 
 #: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:470
-msgid ""
-"description value: the timesheet has not assigned the description field"
+msgid "description value: the timesheet has not assigned the description field"
 msgstr "el parte de trabajo no tiene asignado el campo de descripción"
 
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:140
 #: libreplan-webapp/src/main/webapp/profiles/_editProfile.zul:60
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:140
 msgid "Role name"
 msgstr "Nombre del rol"
 
-#: 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 "Este trabajador ya ha sido borrado por otro usuario"
 
@@ -3841,15 +4016,15 @@ msgstr "Datos del tipo de hora de trabajo"
 msgid "The same resource is assigned twice inside an interval"
 msgstr "El mismo recurso está asignado dos veces dentro del intervalo"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:904
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:543
+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 "El valor no es válido, el valor de precisión no debe ser vacío"
 
-#: 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 "Capacidad de trabajo para este período "
@@ -3878,7 +4053,7 @@ msgstr "Añadir hito"
 msgid "Assign selected items"
 msgstr "Asignar elementos seleccionados"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:468
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:513
 msgid "init"
 msgstr "inicio"
 
@@ -3902,7 +4077,7 @@ msgstr "Crear y asignar"
 msgid "Calculated progress measurements cannot be removed"
 msgstr "Las medidas de progreso calculadas no se pueden borrar"
 
-#: 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 "No configurable"
 
@@ -3936,9 +4111,9 @@ msgstr "Asignación avanzada"
 msgid "Estimation deviation on completed tasks"
 msgstr "Estimación del desvío en tareas completadas"
 
+#: libreplan-webapp/src/main/webapp/planner/order.zul:108
 #: 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 "Consolidado"
 
@@ -3946,12 +4121,12 @@ msgstr "Consolidado"
 msgid "MonteCarlo method"
 msgstr "Método de Montecarlo"
 
-#: 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 "Editar trabajador: {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 "No tiene permisos para ir a la ventana de edición de usuarios"
 
@@ -3961,23 +4136,23 @@ msgstr "LibrePlan: Acceso de usuarios"
 
 #: 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/webapp/subcontract/customerCommunications.zul:56
+#: libreplan-webapp/src/main/webapp/orders/_list.zul:32
 #: 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
+#: libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul:56
 msgid "Customer"
 msgstr "Cliente"
 
-#: 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
-msgid "Hours type"
-msgstr "Tipo de horas"
-
 #: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:43
 msgid "Show money cost bar"
 msgstr "Mostrar barra de coste monetario"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:847
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:34
+#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:116
+msgid "Hours type"
+msgstr "Tipo de horas"
+
 #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:211
 msgid "criterion type name not specified"
 msgstr "nombre del tipo de criterio no especificado"
@@ -3986,7 +4161,9 @@ msgstr "nombre del tipo de criterio no especificado"
 msgid ""
 "Default calendar cannot be removed. Please, change the default calendar in "
 "the Main Settings window before."
-msgstr "El calendario por defecto no se puede. Por favor, cambie antes el calendario por defecto en la ventana de ajustes principales."
+msgstr ""
+"El calendario por defecto no se puede. Por favor, cambie antes el calendario "
+"por defecto en la ventana de ajustes principales."
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:258
 msgid "Cannot connect to LDAP server"
@@ -4000,16 +4177,28 @@ msgstr "debe ser anterior a la fecha de fin"
 msgid "Add Exception"
 msgstr "Añadir excepción"
 
-#: 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/webapp/myaccount/settings.zul:123
+msgid "Projects view filtering"
+msgstr "Filtros de lista de proyectos"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/montecarlo/MonteCarloController.java:159
+#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:310
 #: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:128
 #: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:148
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:310
-#: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:193
-#: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:197
-#: 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/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/criterionrequirements/AssignedCriterionRequirementController.java:320
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:173
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:439
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1674
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1698
+#: 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/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
@@ -4020,88 +4209,89 @@ msgstr "Añadir excepción"
 #: 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/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/criterion/CriterionTreeController.java:135
 #: 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/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/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/common/ConfigurationController.java:751
+#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:110
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignController.java:143
+#: 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/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/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/users/UserCRUDController.java:483
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:234
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:997
+#: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.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/workreports/workReport.zul:161
 #: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:34
+#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:38
+#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:52
+#: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:35
+#: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:41
 #: 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/workreports/workReport.zul:161
 #: 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/_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/resources/worker/_edition.zul:53
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:60
+#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:39
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:43
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:50
+#: libreplan-webapp/src/main/webapp/profiles/_editProfile.zul:43
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:43
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:54
 #: 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/users/_editUser.zul:50
 msgid "cannot be empty"
 msgstr "no puede ser vacío"
 
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:159
+#, fuzzy
+msgid "Dedication"
+msgstr "Gráfico de dedicación"
+
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:147
+msgid "Resources load since"
+msgstr "asignaciones desde hace"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:425
 msgid "Effort must be greater than zero"
 msgstr "El esfuerzo debe ser mayor que cero"
 
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:50
-#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:54
 #: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:40
 #: libreplan-webapp/src/main/webapp/orders/_orderFilter.zul:27
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:50
+#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:54
 msgid "from"
 msgstr "desde"
 
@@ -4116,32 +4306,40 @@ msgstr "Tipo de progreso"
 
 #: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportType.java:198
 msgid "Assigned Label Type cannot be repeated in a Timesheet Template."
-msgstr "El tipo de etiqueta asignado no puede estar repetido en un modelo de parte de trabajo."
+msgstr ""
+"El tipo de etiqueta asignado no puede estar repetido en un modelo de parte "
+"de trabajo."
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:444
 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:143
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:444
 msgid ""
 "Hours types are empty. Please, create some hours types before proceeding"
-msgstr "Los tipos de horas están vacíos. Por favor, cree algún tipo de horas antes de continuar"
+msgstr ""
+"Los tipos de horas están vacíos. Por favor, cree algún tipo de horas antes "
+"de continuar"
 
-#: 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 "Recurso normal"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkRelationshipsController.java:155
-msgid ""
-"Time period contains non valid data. Ending data must be older than starting"
-" date"
-msgstr "El período de tiempo contiene datos inválidos. La fecha de fin debe ser mayor que la de inicio"
-
 #: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:35
 msgid "Expand taskgroups"
 msgstr "Expandir grupos de tareas"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkRelationshipsController.java:155
+msgid ""
+"Time period contains non valid data. Ending data must be older than starting "
+"date"
+msgstr ""
+"El período de tiempo contiene datos inválidos. La fecha de fin debe ser "
+"mayor que la de inicio"
+
 #: libreplan-webapp/src/main/webapp/common/layout/template.zul:141
 msgid "The admin's account password remains the default one. This is insecure"
-msgstr "La contraseña de la cuenta de admin sigue siendo la contraseña por defecto. Esto no es seguro"
+msgstr ""
+"La contraseña de la cuenta de admin sigue siendo la contraseña por defecto. "
+"Esto no es seguro"
 
 #: libreplan-webapp/src/main/webapp/orders/_ordersTab.zul:33
 msgid "Save Project"
@@ -4169,121 +4367,123 @@ msgstr "Ayuda"
 msgid "Variance At Completion"
 msgstr "Desviación al coste final"
 
-#: libreplan-webapp/src/main/webapp/common/layout/template.zul:171
-msgid "default password was not changed"
-msgstr "la contraseña por defecto no fue cambiada"
-
 #: libreplan-webapp/src/main/webapp/unittypes/unitTypes.zul:21
 msgid "LibrePlan: Material Units"
 msgstr "LibrePlan: Unidades de materiales"
 
+#: libreplan-webapp/src/main/webapp/common/layout/template.zul:171
+msgid "default password was not changed"
+msgstr "la contraseña por defecto no fue cambiada"
+
 #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java:256
 msgid "Virtual resources cannot be bound to any user"
 msgstr "Los recursos virtuales no se pueden vincular a un usuario"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:498
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:499
 msgid "Code sequence is already in use and cannot be updated"
 msgstr "El código de secuencia ya está en uso y no se puede actualizar"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/SettingsController.java:96
-msgid "Settings saved"
-msgstr "Preferencias guardadas"
-
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:71
 msgid "Exportation options"
 msgstr "Opciones de exportación"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/SettingsController.java:133
+msgid "Settings saved"
+msgstr "Preferencias guardadas"
+
 #: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:94
 msgid "effort not specified"
 msgstr "esfuerzo no especificado"
 
-#: 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/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/BaseCalendarBandboxFinder.java:46
+#: 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/LabelBandboxFinder.java:52
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ExternalCompanyBandboxFinder.java:51
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:935
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:443
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:94
+#: 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/labels/_listLabelTypes.zul:26
-#: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:27
-#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:31
-#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:50
-#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:26
 #: libreplan-webapp/src/main/webapp/materials/materials.zul:60
+#: libreplan-webapp/src/main/webapp/scenarios/_list.zul:27
+#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:32
+#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:52
+#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:66
+#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:76
+#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:27
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:110
+#: libreplan-webapp/src/main/webapp/orders/_list.zul:28
+#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:36
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:78
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:51
+#: 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/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/calendars/_list.zul:28
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:40
+#: 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/_editMachine.zul:56
+#: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:35
+#: 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/_edition.zul:39
+#: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:41
+#: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:34
+#: libreplan-webapp/src/main/webapp/myaccount/_myTasksArea.zul:27
+#: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:27
+#: libreplan-webapp/src/main/webapp/templates/_listTemplates.zul:26
+#: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:48
+#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:62
+#: 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/externalcompanies/_listExternalCompanies.zul:26
+#: libreplan-webapp/src/main/webapp/profiles/_editProfile.zul:40
+#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:46
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:50
+#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:31
 #: 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/typeofworkhours/_editTypeOfWorkHours.zul:52
+#: libreplan-webapp/src/main/webapp/unittypes/_editUnitType.zul:51
+#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:96
+#: 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/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
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:98
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.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/projectStatusReport.zul:87
+#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:127
 msgid "Name"
 msgstr "Nombre"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkRelationshipsController.java:160
 msgid ""
-"Could not save time period. Time period overlaps with another non-compatible"
-" time period"
-msgstr "No se pudo guardar el período de tiempo. El período se solapa con otro período de tiempo incompatible"
+"Could not save time period. Time period overlaps with another non-compatible "
+"time period"
+msgstr ""
+"No se pudo guardar el período de tiempo. El período se solapa con otro "
+"período de tiempo incompatible"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:168
 msgid "Delete task"
@@ -4301,14 +4501,14 @@ msgstr "por favor, seleccione un elemento"
 msgid "a label can not be assigned twice in the same branch"
 msgstr "una etiqueta no puede estar asignada dos veces en la misma rama"
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:224
-msgid "Day of week"
-msgstr "Día de la semana"
-
 #: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:22
 msgid "Companies List"
 msgstr "Lista de empresas"
 
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:224
+msgid "Day of week"
+msgstr "Día de la semana"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:441
 msgid "Normal resource assignment"
 msgstr "Asignación de recursos normal"
@@ -4319,12 +4519,18 @@ msgstr "calendario por defecto no especificado"
 
 #: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLineGroup.java:1146
 msgid "indirect progress assignments should have different types"
-msgstr "las asignaciones de progreso indirectas deberían tener tipos diferentes"
+msgstr ""
+"las asignaciones de progreso indirectas deberían tener tipos diferentes"
 
-#: 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 "Tramos con interpolación"
 
+#: libreplan-webapp/src/main/webapp/common/help2.zul:19
+#, fuzzy
+msgid "LibrePlan: Help"
+msgstr "LibrePlan: Etiquetas"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:451
 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:39
 msgid "Hours Worked Per Resource"
@@ -4339,13 +4545,14 @@ msgstr "material no especificado"
 msgid "Category name"
 msgstr "Nombre de la categoría"
 
-#: 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 "La fecha debe estar dentro del área de visualización"
 
 #: libreplan-webapp/src/main/webapp/common/configuration.zul:124
 msgid "Show a notification when new LibrePlan versions are released"
-msgstr "Mostrar una notificación cuando una nueva versión de LibrePlan sea publicada"
+msgstr ""
+"Mostrar una notificación cuando una nueva versión de LibrePlan sea publicada"
 
 #: libreplan-webapp/src/main/webapp/common/layout/template.zul:69
 msgid "Main menu"
@@ -4355,14 +4562,14 @@ msgstr "Menú principal"
 msgid "MonteCarlo"
 msgstr "Montecarlo"
 
-#: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:49
-msgid "Duration"
-msgstr "Duración"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:593
 msgid "Exception: {0}"
 msgstr "Excepción: {0}"
 
+#: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:49
+msgid "Duration"
+msgstr "Duración"
+
 #: libreplan-webapp/src/main/webapp/myaccount/changePassword.zul:54
 msgid "Password settings"
 msgstr "Configuración de la contraseña"
@@ -4371,7 +4578,7 @@ msgstr "Configuración de la contraseña"
 msgid "Delete expense sheet \"{0}\". Are you sure?"
 msgstr "Borrar la hoja de gastos \"{0}\". ¿Está seguro?"
 
-#: 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/components/schedulingStateToggler.zul:29
 msgid "Schedule"
 msgstr "Planificar"
@@ -4382,10 +4589,11 @@ msgstr "Inesperado: {0}"
 
 #: libreplan-business/src/main/java/org/libreplan/business/expensesheet/entities/ExpenseSheet.java:241
 msgid "a personal expense sheet must have the same resource in all the lines"
-msgstr "una hoja de gastos personal debe tener el mismo recurso en todas las líneas"
+msgstr ""
+"una hoja de gastos personal debe tener el mismo recurso en todas las líneas"
 
-#: 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 "Notas"
 
@@ -4397,9 +4605,9 @@ msgstr "Conectar"
 msgid "This progress type cannot cannot be removed"
 msgstr "Este tipo de progreso no se puede borrar"
 
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:85
 #: 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 "Concepto"
 
@@ -4407,7 +4615,7 @@ msgstr "Concepto"
 msgid "Allocation: [{0},{1}]"
 msgstr "Asignación: [{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 "Grupo de trabajadores virtuales"
 
@@ -4415,14 +4623,14 @@ msgstr "Grupo de trabajadores virtuales"
 msgid "Changes saved"
 msgstr "Cambios guardados"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1261
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1399
 msgid "See scheduling"
 msgstr "Ver planificación"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationController.java:107
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationController.java:110
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:338
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:341
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationController.java:107
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationController.java:110
 msgid "Progress measurements"
 msgstr "Medidas de progreso"
 
@@ -4430,14 +4638,11 @@ msgstr "Medidas de progreso"
 msgid "Add measure"
 msgstr "Añadir medida"
 
-#: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:52
-msgid "Found resources"
-msgstr "Recursos encontrados"
-
-#: libreplan-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:27
-#: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:30
-msgid "Relationship"
-msgstr "Relación"
+#: 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 "Fin"
 
 #: 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
@@ -4445,11 +4650,14 @@ msgstr "Relación"
 msgid "Subcontract"
 msgstr "Subcontratar"
 
-#: libreplan-webapp/src/main/webapp/planner/main.zul:57
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:41
-#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:121
-msgid "End"
-msgstr "Fin"
+#: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:52
+msgid "Found resources"
+msgstr "Recursos encontrados"
+
+#: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:30
+#: libreplan-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:27
+msgid "Relationship"
+msgstr "Relación"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:482
 #: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:39
@@ -4471,14 +4679,14 @@ msgstr "Otro"
 msgid "criterion type not specified"
 msgstr "tipo de criterio no especificado"
 
-#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/TypeOfWorkHours.java:103
-msgid "default price not specified"
-msgstr "precio por defecto no especificado"
-
 #: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:134
 msgid "timesheet template not specified"
 msgstr "modelo de parte de trabajo no especificado"
 
+#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/TypeOfWorkHours.java:103
+msgid "default price not specified"
+msgstr "precio por defecto no especificado"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:220
 msgid "Timesheet removed successfully"
 msgstr "Parte de trabajo borrado con éxito"
@@ -4487,34 +4695,41 @@ msgstr "Parte de trabajo borrado con éxito"
 msgid "Users List"
 msgstr "Lista de usuarios"
 
-#: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:27
-#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:56
-#: libreplan-webapp/src/main/webapp/orders/_edition.zul:55
-msgid "Task quality forms"
-msgstr "Formularios de calidad de tarea"
-
-#: 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 "Nombre de usuario"
-
 #: libreplan-webapp/src/main/webapp/users/_editUser.zul:106
 msgid "Has bound resource"
 msgstr "Tiene un recurso vinculado"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/UserBandboxFinder.java:47
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:144
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:53
+#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:27
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:47
+msgid "Username"
+msgstr "Nombre de usuario"
+
+#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:56
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:55
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:27
+msgid "Task quality forms"
+msgstr "Formularios de calidad de tarea"
+
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:125
+msgid "Label filter"
+msgstr "Por etiqueta"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1235
 msgid ""
 "Progress measurements that are reported by quality forms cannot be removed"
-msgstr "Las medidas de progreso notificadas por formularios de calidad no se pueden modificadar"
+msgstr ""
+"Las medidas de progreso notificadas por formularios de calidad no se pueden "
+"modificadar"
 
 #: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:426
 msgid ""
 "Number of hours is not properly calculated according to start date and end "
 "date"
-msgstr "El número de horas no está bien calculado según las fechas de inicio y fin"
+msgstr ""
+"El número de horas no está bien calculado según las fechas de inicio y fin"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:237
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:332
@@ -4529,9 +4744,10 @@ msgstr "Categoría de coste"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:342
 msgid "Quality form cannot be removed as it is spreading progress"
-msgstr "El formulario de calidad no se puede borrar ya que está propagando progreso"
+msgstr ""
+"El formulario de calidad no se puede borrar ya que está propagando progreso"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:712
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:713
 msgid "It can not be deleted. At least one sequence is necessary."
 msgstr "No se puede borrar. Al menos una secuencia es necesaria."
 
@@ -4556,8 +4772,8 @@ msgid "please, select a quality form"
 msgstr "por favor, seleccione un formulario de calidad"
 
 #: 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/resources/worker/WorkerCRUDController.java:1065
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:134
 msgid "Edit {0}: {1}"
 msgstr "Editar {0}: {1}"
 
@@ -4577,11 +4793,13 @@ msgstr "Código de referencia del cliente"
 msgid "Constraint"
 msgstr "Restricción"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:390
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:482
 msgid ""
 "Deadline cannot be empty because there is a task with constraint \"as late "
 "as possible\""
-msgstr "La fecha de fin no puede estar vacía porque ha una tarea con la restricción \"tan tarde como sea posible\""
+msgstr ""
+"La fecha de fin no puede estar vacía porque ha una tarea con la restricción "
+"\"tan tarde como sea posible\""
 
 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:150
 msgid "Add New Label Type Field"
@@ -4597,22 +4815,22 @@ msgstr "Las medidas de progreso deben tener un valor menor que las siguientes."
 msgid "Customer reference"
 msgstr "Referencia de cliente"
 
-#: 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/orders/OrderCRUDController.java:828
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:973
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1031
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1040
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1067
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:397
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:407
 #: 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/planner/order/SaveCommandBuilder.java:363
+#: 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/limitingresources/LimitingResourcesController.java:331
 msgid "Information"
 msgstr "Información"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:931
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1066
 msgid "Sorry, you do not have permissions to access this project"
 msgstr "Lo sentimos, no tiene permisos para acceder a este proyecto"
 
@@ -4620,7 +4838,7 @@ msgstr "Lo sentimos, no tiene permisos para acceder a este proyecto"
 msgid "END"
 msgstr "FIN"
 
-#: 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 "Trabajador guardado"
 
@@ -4632,14 +4850,14 @@ msgstr "Comunicaciones a subcontratistas"
 msgid "New hours group "
 msgstr "Nuevo grupo de horas "
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:462
-msgid "Assign element to queue manually"
-msgstr "Asignar elemento a cola manualmente"
-
 #: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:47
 msgid "Please remember that only saved changes will be printed"
 msgstr "Por favor recuerda que sólo los cambios guardados serán impresos"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:462
+msgid "Assign element to queue manually"
+msgstr "Asignar elemento a cola manualmente"
+
 #: libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialCategory.java:254
 msgid "There are repeated material codes"
 msgstr "Hay códigos de materiales repetidos"
@@ -4656,27 +4874,27 @@ msgstr "Progreso %"
 msgid "Heading"
 msgstr "Cabecera"
 
-#: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:22
-msgid "Criterion Types List"
-msgstr "Lista de tipos de criterio"
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:274
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:528
+msgid "must be after the previous date"
+msgstr "debe ser posterior a la fecha anterior"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:459
 msgid "Do you want to split the material assignment {0}?"
 msgstr "¿Quiere dividir la asignación de material {0}?"
 
-#: 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 "debe ser posterior a la fecha anterior"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:112
-msgid "Hours Type"
-msgstr "Tipo de horas"
+#: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:22
+msgid "Criterion Types List"
+msgstr "Lista de tipos de criterio"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/montecarlo/MonteCarloController.java:192
 msgid "Percentages should sum 100"
 msgstr "Los porcentajes debería sumar 100"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:112
+msgid "Hours Type"
+msgstr "Tipo de horas"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:81
 msgid "Total task budget"
 msgstr "Presupuesto total de la tarea"
@@ -4689,14 +4907,14 @@ msgstr "El trabajador no debe ser nulo"
 msgid "Some criterion satisfactions overlap in time"
 msgstr "Algunos criterios satisfechos se solapan en el tiempo"
 
-#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:50
-msgid "Value last progress measurement"
-msgstr "Valor última medida de progreso"
-
 #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:21
 msgid "LibrePlan: Materials Needs At Date"
 msgstr "LibrePlan: Necesidad de materiales en fecha"
 
+#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:50
+msgid "Value last progress measurement"
+msgstr "Valor última medida de progreso"
+
 #: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:44
 msgid "Worker assignments"
 msgstr "Asignaciones de trabajador"
@@ -4710,18 +4928,18 @@ msgstr "último código de secuenci de tarea no especificado"
 #: 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/calendars/BaseCalendarModel.java:603
 #: 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} ya existe"
 
-#: 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 "Crear trabajador"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementInExpenseSheetBandboxFinder.java:45
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderInExpenseSheetBandboxFinder.java:44
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementInExpenseSheetBandboxFinder.java:45
 msgid "Project name (Project code)"
 msgstr "Nombre del proyecto (Código del proyecto)"
 
@@ -4729,30 +4947,30 @@ msgstr "Nombre del proyecto (Código del proyecto)"
 msgid "items cannot be checked until the previous items are checked before."
 msgstr "los ítmes no se pueden marcar mientras no se marquen los anteriores."
 
-#: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:38
-msgid "Code "
-msgstr "Código"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:595
 msgid "Exception: {0} (Inh)"
 msgstr "Excepción: {0} (Her)"
 
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:72
-#: libreplan-webapp/src/main/webapp/myaccount/changePassword.zul:77
+#: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:38
+msgid "Code "
+msgstr "Código"
+
 #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:153
+#: libreplan-webapp/src/main/webapp/myaccount/changePassword.zul:77
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:72
 msgid "Password confirmation"
 msgstr "Confirmación de contraseña"
 
-#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:72
-msgid "Indent selected task"
-msgstr "Indentar tarea seleccionada"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:665
 msgid "Regular"
 msgstr "Normal"
 
-#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:39
+#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:72
+msgid "Indent selected task"
+msgstr "Indentar tarea seleccionada"
+
 #: libreplan-webapp/src/main/webapp/common/configuration.zul:88
+#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:39
 msgid "Show progress"
 msgstr "Mostrar progreso"
 
@@ -4764,28 +4982,32 @@ msgstr "Trabajo"
 msgid ""
 "Error saving the project\n"
 "{0}"
-msgstr "Error guardando un proyecto\n{0}"
+msgstr ""
+"Error guardando un proyecto\n"
+"{0}"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:375
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:220
 msgid ""
 "You are about to leave the planning edition, unsaved changes will be lost."
-msgstr "Estás a punto de salir de la edición de planificación, los cambios sin guardar se perderán."
+msgstr ""
+"Estás a punto de salir de la edición de planificación, los cambios sin "
+"guardar se perderán."
 
 #: libreplan-webapp/src/main/webapp/resources/machine/machines.zul:22
 msgid "LibrePlan: Machines"
 msgstr "LibrePlan: Máquinas"
 
-#: 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} h"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:403
 #: 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/orders/criterionrequirements/AssignedCriterionRequirementController.java:403
 #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:628
 msgid "Error"
 msgstr "Error"
@@ -4831,7 +5053,7 @@ msgstr "Añadir nueva asignación de trabajador"
 msgid "My tasks"
 msgstr "Mis tareas"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:729
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:832
 msgid "Show all elements"
 msgstr "Mostrar todos los elementos"
 
@@ -4852,7 +5074,11 @@ msgstr "Ya existe otro modelo de parte de trabajo con el mismo nombre."
 msgid "SPREAD"
 msgstr "PROPAGACIÓN"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:709
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:247
+msgid "Budgeted Cost Work Scheduled"
+msgstr "Coste de trabajo presupuestado planificado"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:717
 msgid "Changes applied"
 msgstr "Cambios aplicados"
 
@@ -4860,10 +5086,6 @@ msgstr "Cambios aplicados"
 msgid "Adapting planning according to timesheets"
 msgstr "Adaptando la planificación según los partes de trabajo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:247
-msgid "Budgeted Cost Work Scheduled"
-msgstr "Coste de trabajo presupuestado planificado"
-
 #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:471
 msgid "criterion type does not allow hierarchy"
 msgstr "el tipo de criterio no permite jerarquía"
@@ -4883,7 +5105,9 @@ msgstr "Unidades de materiales"
 msgid ""
 "Last stretch should have one hundred percent length and one hundred percent "
 "of work percentage"
-msgstr "El último tramo debe tener 100% de porcentajes de longitud y cantidad de trabajo"
+msgstr ""
+"El último tramo debe tener 100% de porcentajes de longitud y cantidad de "
+"trabajo"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionsModel.java:216
 msgid "Resource type cannot be empty"
@@ -4895,7 +5119,9 @@ msgstr "Configuración del LDAP"
 
 #: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityForm.java:406
 msgid "progress type should must be defined if quality form reports progress"
-msgstr "el tipo de progreso debería estar definido si el formulario de calidad notifica progreso"
+msgstr ""
+"el tipo de progreso debería estar definido si el formulario de calidad "
+"notifica progreso"
 
 #: libreplan-webapp/src/main/webapp/users/_listUsers.zul:30
 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:35
@@ -4926,23 +5152,23 @@ msgstr "Lista de grupos de trabajadores virtuales"
 msgid "Cost Variance"
 msgstr "Desviación en coste"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:625
-#: 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
-msgid "Total"
-msgstr "Total"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:403
 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:66
 msgid "User Accounts"
 msgstr "Cuentas de usuario"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:625
+#: 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/orders/_edition.zul:182
+#: libreplan-webapp/src/main/webapp/myaccount/_expensesArea.zul:33
+#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:92
+#: 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
+msgid "Total"
+msgstr "Total"
+
 #: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:158
 msgid "Effort"
 msgstr "Esfuerzo"
@@ -4956,7 +5182,9 @@ msgstr "Invalidar"
 msgid ""
 "User is bound to resource \"{0}\" and it will be unbound. Do you want to "
 "continue with user removal?"
-msgstr "El usuario está vinculado al recurso \"{0}\" y será desvinculado. ¿Quiere continuar con el borrado del usuario?"
+msgstr ""
+"El usuario está vinculado al recurso \"{0}\" y será desvinculado. ¿Quiere "
+"continuar con el borrado del usuario?"
 
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:163
 msgid "Budget hours"
@@ -4972,9 +5200,11 @@ msgstr "Editar tarea: {0}"
 
 #: libreplan-webapp/src/main/webapp/common/configuration.zul:129
 msgid ""
-"Check this option if you would like to send feedback to LibrePlan developers"
-" about program usage"
-msgstr "Marca esta opción para enviar información a los desarroladores de LibrePlan para generar estadísticas de uso"
+"Check this option if you would like to send feedback to LibrePlan developers "
+"about program usage"
+msgstr ""
+"Marca esta opción para enviar información a los desarroladores de LibrePlan "
+"para generar estadísticas de uso"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:554
 msgid "Machine was already removed"
@@ -4988,15 +5218,15 @@ msgstr "línea de gasto de "
 msgid "Select destination"
 msgstr "Seleccionar destino"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:203
-msgid "cannot be empty or less than zero"
-msgstr "no puede estar vacío o ser menor que cero"
-
 #: libreplan-webapp/src/main/webapp/planner/order.zul:89
 #: libreplan-webapp/src/main/webapp/planner/order.zul:95
 msgid "Check consolidated progresses"
 msgstr "Marcar progresos consolidados"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:203
+msgid "cannot be empty or less than zero"
+msgstr "no puede estar vacío o ser menor que cero"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractController.java:287
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractController.java:290
 msgid "Update task end"
@@ -5011,20 +5241,21 @@ msgstr "Mostrar todo"
 msgid "Default price"
 msgstr "Precio por defecto"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:827
-msgid "Periods available depend on resources' calendar."
-msgstr "Los períodos de disponibilidad dependen del calendario de los recursos."
-
 #: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:39
 msgid "Estimated hours"
 msgstr "Horas estimadas"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:827
+msgid "Periods available depend on resources' calendar."
+msgstr ""
+"Los períodos de disponibilidad dependen del calendario de los recursos."
+
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:121
 msgid "Apply tab changes"
 msgstr "Aplicar cambios de la pestaña"
 
-#: 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 "las contraseñas no conciden"
 
@@ -5036,15 +5267,19 @@ msgstr "Propiedades del día"
 msgid " (%d tasks)"
 msgstr " (%d tareas)"
 
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:82
+msgid "Hours groups"
+msgstr "Grupos de horas"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:259
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:751
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1470
 #: 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/order/OrderPlanningController.java:375
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:320
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:145
 msgid "must be lower than end date"
 msgstr "debe ser anterior a la fecha de fin"
 
@@ -5052,15 +5287,14 @@ msgstr "debe ser anterior a la fecha de fin"
 msgid "Week {0}"
 msgstr "Semana {0}"
 
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:82
-msgid "Hours groups"
-msgstr "Grupos de horas"
-
 #: libreplan-webapp/src/main/webapp/common/configuration.zul:116
 msgid ""
-"Enable/Disable autocomplete property in login form, if the admin password is"
-" still the default one"
-msgstr "Habilitar/Deshabilitar la propiedad de autocompletado en el formulario de inicio de sesión, si la contraseña de admin es todavía la contraseña por defecto"
+"Enable/Disable autocomplete property in login form, if the admin password is "
+"still the default one"
+msgstr ""
+"Habilitar/Deshabilitar la propiedad de autocompletado en el formulario de "
+"inicio de sesión, si la contraseña de admin es todavía la contraseña por "
+"defecto"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:182
 msgid "Create new user"
@@ -5074,15 +5308,17 @@ msgstr "Transferir"
 msgid "Work Hours Types List"
 msgstr "Lista de tipos de horas de trabajo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:764
-msgid "Consolidated progress cannot be removed"
-msgstr "El progreso consolidado no se puede borrar"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:945
 msgid ""
 "Spread progress cannot be changed if there is a consolidation in any "
 "progress assignment"
-msgstr "El progreso que propaga no se puede cambiar si hay alguna consolidación en alguna asignación de progreso"
+msgstr ""
+"El progreso que propaga no se puede cambiar si hay alguna consolidación en "
+"alguna asignación de progreso"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:764
+msgid "Consolidated progress cannot be removed"
+msgstr "El progreso consolidado no se puede borrar"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/GlobalProgressChart.java:63
 msgid "By critical path duration"
@@ -5108,7 +5344,7 @@ msgstr "Parte de trabajo"
 msgid "Show dependencies"
 msgstr "Mostrar dependencias"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:310
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:402
 msgid "Schedule from start to deadline"
 msgstr "Planificar desde el principio a la fecha límite"
 
@@ -5118,9 +5354,9 @@ msgstr "Planificar desde el principio a la fecha límite"
 msgid "Estimated days"
 msgstr "Días estimados"
 
-#: 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/workingProgressPerTaskReport.zul:53
 msgid "Reference date"
 msgstr "Fecha de referencia"
 
@@ -5132,7 +5368,7 @@ msgstr "LibrePlan: Horas por tarea estimadas/planificadas"
 msgid "quality form item percentage not specified"
 msgstr "porcentage del ítem del formulario de calidad no especificado"
 
-#: 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 "las contraseñas no coinciden"
 
@@ -5140,26 +5376,33 @@ msgstr "las contraseñas no coinciden"
 msgid "quality form name not specified"
 msgstr "formulario de calidad no especificado"
 
-#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:81
-msgid "Progress Evolution"
-msgstr "Evolución del progreso"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/Type.java:55
-msgid "From chosen date"
-msgstr "A partir de la fecha elegida"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:259
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:727
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1257
 msgid ""
 "Subcontractor values are read only because they were reported by the "
 "subcontractor company."
-msgstr "Los valores de subcontratación son de sólo lectura porque fueron notificados por la empresa subcontratista."
+msgstr ""
+"Los valores de subcontratación son de sólo lectura porque fueron notificados "
+"por la empresa subcontratista."
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/Type.java:55
+msgid "From chosen date"
+msgstr "A partir de la fecha elegida"
+
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:81
+msgid "Progress Evolution"
+msgstr "Evolución del progreso"
 
 #: 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 "Hay un margen de %d días con la fecha límite global del proyecto (%.2f %%)."
+msgstr ""
+"Hay un margen de %d días con la fecha límite global del proyecto (%.2f %%)."
+
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:91
+msgid "Original"
+msgstr "Original"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:250
 msgid "CV"
@@ -5170,15 +5413,13 @@ msgstr "CV"
 msgid "My dashboard"
 msgstr "Mi panel de control"
 
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:91
-msgid "Original"
-msgstr "Original"
-
 #: libreplan-webapp/src/main/webapp/common/layout/template.zul:179
 msgid ""
 "A new version of LibrePlan is available. Please check next link for more "
 "information:"
-msgstr "Una nueva versión de LibrePlan está disponible. Por favor compruebe el siguiente enlace para más información:"
+msgstr ""
+"Una nueva versión de LibrePlan está disponible. Por favor compruebe el "
+"siguiente enlace para más información:"
 
 #: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:31
 msgid "Stretches function configuration"
@@ -5189,11 +5430,9 @@ msgstr "Configuración de la función de tramos"
 msgid "Not indentable"
 msgstr "No indentable"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:341
-msgid ""
-"The original workable days value {0} cannot be modified as it has "
-"consolidations"
-msgstr "El valor original de días laborables {0} no se puede modificar porque tiene consolidaciones"
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:74
+msgid "Resource allocation type"
+msgstr "Tipo de asignación de recursos"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:259
 msgid "Timesheet saved"
@@ -5202,11 +5441,16 @@ msgstr "Parte de trabajo guardado"
 #: 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 "Lista de materiales para todas las categorías (seleccione una para filtrar)"
+msgstr ""
+"Lista de materiales para todas las categorías (seleccione una para filtrar)"
 
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:74
-msgid "Resource allocation type"
-msgstr "Tipo de asignación de recursos"
+#: 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 ""
+"El valor original de días laborables {0} no se puede modificar porque tiene "
+"consolidaciones"
 
 #: libreplan-webapp/src/main/webapp/common/layout/login.zul:104
 msgid "User disabled"
@@ -5233,7 +5477,9 @@ msgstr "Mensaje - {0}"
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1379
 msgid ""
 "Date is not valid, it must be later than the last progress consolidation"
-msgstr "La fecha no es válida, debe ser posterior a la última consolidación de progreso"
+msgstr ""
+"La fecha no es válida, debe ser posterior a la última consolidación de "
+"progreso"
 
 #: libreplan-webapp/src/main/webapp/common/configuration.zul:214
 msgid "Seconds planning warning"
@@ -5243,7 +5489,7 @@ msgstr "Segundos advertencia planicación"
 msgid "Reception date"
 msgstr "Fecha de recepción"
 
-#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:21
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:22
 msgid "LibrePlan: Settings"
 msgstr "LibrePlan: Preferencias"
 
@@ -5251,12 +5497,12 @@ msgstr "LibrePlan: Preferencias"
 msgid "worker's surname not specified"
 msgstr "apellidos del trabajador no especificados"
 
-#: 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 "Guardar cambios"
 
-#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:80
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:81
 msgid "Application settings"
 msgstr "Preferencias de la aplicación"
 
@@ -5274,13 +5520,15 @@ msgstr "Seleccionar origen"
 
 #: 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 "la misma tarea está marcada como acabada por más de una línea de parte de trabajo"
+msgstr ""
+"la misma tarea está marcada como acabada por más de una línea de parte de "
+"trabajo"
 
-#: 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 "Trabajador borrado"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:745
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:746
 msgid "Select entity, please"
 msgstr "Seleccionar entidad, por favor"
 
@@ -5296,8 +5544,8 @@ msgstr "Hora de fin"
 msgid "total not specified"
 msgstr "total no especificado"
 
-#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:48
 #: libreplan-webapp/src/main/webapp/myaccount/_expensesArea.zul:38
+#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:48
 msgid "Last expense"
 msgstr "Último gasto"
 
@@ -5322,9 +5570,9 @@ msgstr "Contraseña actual"
 msgid "Only one sequence per entity can be active at the same time."
 msgstr "Sólo puede estar activa una secuencia por entidad al mismo tiempo."
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:274
 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:953
 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1213
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:274
 msgid "Please, select an item"
 msgstr "Por favor, seleccione un elemento"
 
@@ -5349,18 +5597,18 @@ msgstr "Nuevo elemento de plantilla"
 msgid "Project: {0}"
 msgstr "Proyecto: {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 "Partes de trabajo"
-
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:94
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:97
 msgid "Non Consolidated"
 msgstr "No consolidado"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:363
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:153
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:114
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:60
+msgid "Timesheets"
+msgstr "Partes de trabajo"
+
 #: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:43
 msgid "From date"
 msgstr "A partir de la fecha"
@@ -5369,14 +5617,14 @@ msgstr "A partir de la fecha"
 msgid "Task of project"
 msgstr "Tarea del proyecto"
 
-#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:229
-msgid "Hours cost"
-msgstr "Coste de horas"
-
 #: libreplan-webapp/src/main/webapp/planner/reassign.zul:34
 msgid "Reassigning type"
 msgstr "Tipo de reasignación"
 
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:229
+msgid "Hours cost"
+msgstr "Coste de horas"
+
 #: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:308
 msgid "There are repeated description values in the timesheet "
 msgstr "Hay valores de descripción repetidos en el parte de trabajo"
@@ -5404,9 +5652,9 @@ msgstr "valor máximo no especificada"
 msgid "Incorrect authentication"
 msgstr "Identificación incorrecta"
 
-#: 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
+#: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:42
+#: libreplan-webapp/src/main/webapp/planner/editTask.zul:53
 msgid "Edit task"
 msgstr "Editar tarea"
 
@@ -5416,7 +5664,9 @@ msgstr "Moneda"
 
 #: 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 "Fecha de fin inválida, la nueva fecha de fin debe ser posterior a la fecha de inicio"
+msgstr ""
+"Fecha de fin inválida, la nueva fecha de fin debe ser posterior a la fecha "
+"de inicio"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:373
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:31
@@ -5440,8 +5690,8 @@ msgstr "Valor actual"
 msgid "Capacity must be a positive integer number"
 msgstr "La capacidad ser un número entero positivo"
 
-#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:94
 #: libreplan-webapp/src/main/webapp/calendars/calendars.zul:48
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:94
 msgid "Save and Continue"
 msgstr "Guardar y continuar"
 
@@ -5456,7 +5706,8 @@ msgstr "Formulario de calidad"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:419
 msgid "Calendar cannot be removed as it has other derived calendars from it"
-msgstr "El calendario no se puede borrar porque tiene otros calendarios derivos de él"
+msgstr ""
+"El calendario no se puede borrar porque tiene otros calendarios derivos de él"
 
 #: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:97
 msgid "Go!"
@@ -5474,9 +5725,11 @@ msgstr "Datos del perfil"
 msgid "The name of the label is empty."
 msgstr "El nombre de la etiqueta está vacío."
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:366
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:458
 msgid "Starting date cannot be empty in forward mode"
-msgstr "La fecha de inicio no puede estar vacía en el modo de planificación hacia adelante"
+msgstr ""
+"La fecha de inicio no puede estar vacía en el modo de planificación hacia "
+"adelante"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:413
 #: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:33
@@ -5500,7 +5753,9 @@ msgstr "Fechas de entrega solicitadas por el cliente."
 msgid ""
 "Help the project developers to collect information about which LibrePlan "
 "version you are using"
-msgstr "Ayude a los desarrolladores del proyecto a recoger información sobre que versión de LibrePlan está usando"
+msgstr ""
+"Ayude a los desarrolladores del proyecto a recoger información sobre que "
+"versión de LibrePlan está usando"
 
 #: libreplan-webapp/src/main/webapp/resources/worker/worker.zul:22
 msgid "LibrePlan: Workers"
@@ -5510,32 +5765,36 @@ msgstr "LibrePlan: Trabajadores"
 msgid "Personal timesheet \"{0}\" saved"
 msgstr "Parte de horas personal \"{0}\" guardado"
 
-#: 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 "Crear grupo de trabajadores virtuales"
 
 #: libreplan-webapp/src/main/webapp/common/configuration.zul:125
 msgid "Enable/Disable warning about new LibrePlan versions available"
-msgstr "Habilitar/Deshabilitar la advertencia sobre nuevas versiones de LibrePlan disponibles"
+msgstr ""
+"Habilitar/Deshabilitar la advertencia sobre nuevas versiones de LibrePlan "
+"disponibles"
 
 #: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/ExternalCompany.java:183
 msgid ""
 "interaction fields are empty and company is marked as interact with "
 "applications"
-msgstr "los campos de interacción están vacíos y la empresa está marcada para interactuar con aplicaciones"
+msgstr ""
+"los campos de interacción están vacíos y la empresa está marcada para "
+"interactuar con aplicaciones"
 
 #: libreplan-webapp/src/main/webapp/common/configuration.zul:183
 msgid "Timesheet templates"
 msgstr "Plantillas de partes de trabajo"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:715
 #: 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/webapp/dashboard/_costStatus.zul:42
 msgid "Hours invested"
 msgstr "Horas invertidas"
 
-#: 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-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:305
 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:48
 msgid "Templates"
 msgstr "Plantillas"
@@ -5544,14 +5803,15 @@ msgstr "Plantillas"
 msgid "Authorization"
 msgstr "Autorización"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:363
-msgid "Project saved"
-msgstr "Proyecto guardado"
-
 #: 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 "El nombre no es válido, ya hay otro tipo de progreso con el mismo nombre. "
+msgstr ""
+"El nombre no es válido, ya hay otro tipo de progreso con el mismo nombre. "
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:363
+msgid "Project saved"
+msgstr "Proyecto guardado"
 
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:49
 msgid "task"
@@ -5569,12 +5829,15 @@ msgstr "Perdón por las molestias."
 msgid ""
 "Profiles of LDAP users cannot be managed because LDAP is enabled and LDAP "
 "roles are being used."
-msgstr "Los perfiles de los usuarios de LDAP no se pueden gestionar porque el LDAP está activado y se están usando los roles del LDAP."
+msgstr ""
+"Los perfiles de los usuarios de LDAP no se pueden gestionar porque el LDAP "
+"está activado y se están usando los roles del LDAP."
 
 #: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityFormItem.java:81
 msgid "quality form item position not specified"
 msgstr "posición del ítem del formulario de calidad no especificada"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:606
 #: 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 "Machines"
@@ -5589,7 +5852,7 @@ msgid "Destination scenario"
 msgstr "Escenario de destino"
 
 #: 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 "Vista de la compañía"
 
@@ -5601,8 +5864,8 @@ msgstr "símbolo de moneda no especificado"
 msgid "Both"
 msgstr "Ambos"
 
-#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityForm.java:389
 #: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/TaskQualityForm.java:171
+#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityForm.java:389
 msgid "report progress not specified"
 msgstr "progreso que progapa no especificado"
 
@@ -5610,18 +5873,18 @@ msgstr "progreso que progapa no especificado"
 msgid "Filter by"
 msgstr "Filtrar por"
 
-#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:48
-msgid "Up to date"
-msgstr "Actualizado"
-
 #: 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 "Asignación de calendario"
 
+#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:48
+msgid "Up to date"
+msgstr "Actualizado"
+
 #: 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
+#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:33
 msgid "Category"
 msgstr "Categoría"
 
@@ -5629,15 +5892,15 @@ msgstr "Categoría"
 msgid "LibrePlan: Progress Types"
 msgstr "LibrePlan: Tipos de progreso"
 
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:27
+msgid "Category data"
+msgstr "Datos de categoría"
+
 #: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:79
 #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:203
 msgid "[generic all workers]"
 msgstr "[genérico todos los trabajadores]"
 
-#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:27
-msgid "Category data"
-msgstr "Datos de categoría"
-
 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:97
 msgid "Search"
 msgstr "Buscar"
@@ -5658,22 +5921,22 @@ msgstr "rol LDAP no especificado"
 msgid "Add New Complementary Field"
 msgstr "Añadir nuevo campo complementario"
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:244
-msgid "Work weeks list"
-msgstr "Lista de las semanas de trabajo"
-
 #: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:38
 msgid "Source scenario"
 msgstr "Escenario de origen"
 
-#: libreplan-webapp/src/main/webapp/resources/criterions/criterions.zul:24
-msgid "LibrePlan: Criteria"
-msgstr "LibrePlan: Criterios"
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:244
+msgid "Work weeks list"
+msgstr "Lista de las semanas de trabajo"
 
 #: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:23
 msgid "LibrePlan: Transfer Projects Between Scenarios"
 msgstr "LibrePlan: transferir proyectos entre escenarios"
 
+#: libreplan-webapp/src/main/webapp/resources/criterions/criterions.zul:24
+msgid "LibrePlan: Criteria"
+msgstr "LibrePlan: Criterios"
+
 #: libreplan-business/src/main/java/org/libreplan/business/planner/entities/Task.java:171
 msgid "element associated to a task must be not empty"
 msgstr "el elemento asociado a una tarea no debe estar vacío"
@@ -5683,8 +5946,8 @@ msgstr "el elemento asociado a una tarea no debe estar vacío"
 msgid "%"
 msgstr "%"
 
-#: libreplan-webapp/src/main/webapp/resources/worker/_calendar.zul:50
 #: libreplan-webapp/src/main/webapp/resources/machine/_calendar.zul:43
+#: libreplan-webapp/src/main/webapp/resources/worker/_calendar.zul:50
 msgid "Remove calendar"
 msgstr "Borrar calendario"
 
@@ -5697,32 +5960,32 @@ msgid "Communications From Customers"
 msgstr "Comunicaciones desde clientes"
 
 #: 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/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/webapp/expensesheet/expenseSheet.zul:95
-#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:151
-#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:171
+#: 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/java/org/libreplan/web/common/components/finders/ResourceAllocationFilterEnum.java:30
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:33
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:86
 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:185
 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:81
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul: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
+#: 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
 msgid "Resource"
 msgstr "Recurso"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/UserDashboardController.java:71
-msgid "Expense sheet \"{0}\" saved"
-msgstr "Hoja de gastos  \"{0}\" guardada"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:71
 msgid "Total task hours"
 msgstr "Total de horas de tarea"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/UserDashboardController.java:71
+msgid "Expense sheet \"{0}\" saved"
+msgstr "Hoja de gastos  \"{0}\" guardada"
+
 #: 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
 msgid "Virtual Workers"
@@ -5771,21 +6034,22 @@ msgstr "LibrePlan: Lista de líneas de partes de trabajo"
 msgid "Specific Allocations"
 msgstr "Asignaciones específicas"
 
-#: 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 "el parte de trabajo no tiene asignado este tipo de etiqueta"
-
 #: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:221
 msgid "progress type marked as quality form but is updatable"
 msgstr "el tipo de progreso del formulario de calidad no se puede modificar "
 
-#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:64
-msgid "Move selected task up"
-msgstr "Mover tarea seleccionada hacia arriba"
+#: 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 "el parte de trabajo no tiene asignado este tipo de etiqueta"
 
 #: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:27
 msgid "Select criteria set or specific resources for allocation"
-msgstr "Seleccione conjunto de criterios o recursos específicos para la asignación"
+msgstr ""
+"Seleccione conjunto de criterios o recursos específicos para la asignación"
+
+#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:64
+msgid "Move selected task up"
+msgstr "Mover tarea seleccionada hacia arriba"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:350
 msgid "Create copy"
@@ -5795,25 +6059,25 @@ msgstr "Crear copia"
 msgid "Company data"
 msgstr "Datos de la empresa"
 
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:145
+msgid "Label Type fields"
+msgstr "Campos de tipo de etiqueta"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:274
 msgid "Users"
 msgstr "Usuarios"
 
-#: 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 "El {0} no es válido. Existe otro valor del mismo tipo de criterio"
 
-#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:145
-msgid "Label Type fields"
-msgstr "Campos de tipo de etiqueta"
-
 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:105
 msgid "Hours Management"
 msgstr "Administración de horas"
 
-#: 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/templates/entities/OrderLineTemplate.java:170
 msgid "last hours group sequence code not specified"
 msgstr "el último código de secuencia del grupo de horas no está especificado"
 
@@ -5821,15 +6085,15 @@ msgstr "el último código de secuencia del grupo de horas no está especificado
 msgid "label type name is already in use"
 msgstr "el nombre de tipo de etiqueta ya está siendo usado"
 
+#: 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 "No se puede borrar {0}, porque se está usando en algún día excepcional"
+
 #: 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 "Por favor, seleccione una fecha de fin para la excepción"
 
-#: 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 "No se puede borrar {0}, porque se está usando en algún día excepcional"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/NewAllocationSelector.java:94
 msgid "specific allocation"
 msgstr "asignación específica"
@@ -5838,13 +6102,17 @@ msgstr "asignación específica"
 msgid ""
 "Please use some of the compatible browsers: Chrome, Firefox, Safari or "
 "Epiphany."
-msgstr "Por favor usa uno de los navegadores compatibles: Chrome, Firefox, Safari o Epiphany."
+msgstr ""
+"Por favor usa uno de los navegadores compatibles: Chrome, Firefox, Safari o "
+"Epiphany."
 
 #: libreplan-webapp/src/main/webapp/common/concurrent_modification.zul:33
 msgid ""
 "Another user has modified the same data, so the operation cannot be safely "
 "completed."
-msgstr "Otro usuario ha modificado los mismos datos, por tanto la operación no se puede completar de manera segura."
+msgstr ""
+"Otro usuario ha modificado los mismos datos, por tanto la operación no se "
+"puede completar de manera segura."
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:224
 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:242
@@ -5878,6 +6146,11 @@ msgstr "Algunas asignaciones a categorías de coste se solapan en el tiempo"
 msgid "Imputed hours calculation"
 msgstr "Cálculo de horas imputadas"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1721
+#, fuzzy
+msgid "Regular project"
+msgstr "Nuevo proyecto"
+
 #: 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
@@ -5890,19 +6163,11 @@ msgstr "Grupo"
 msgid "Exit session"
 msgstr "Salir de la sesión"
 
-#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:30
-msgid "Statistics list "
-msgstr "Lista de estadísticas "
-
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:113
-msgid "Apply filter to"
-msgstr "Aplicar filtro a"
-
-#: 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/resources/criterions/_edition.zul:61
+#: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:28
 #: libreplan-webapp/src/main/webapp/typeofworkhours/_listTypesOfWorkHours.zul:29
 #: libreplan-webapp/src/main/webapp/typeofworkhours/_editTypeOfWorkHours.zul:66
 msgid "Enabled"
@@ -5912,11 +6177,21 @@ msgstr "Activado"
 msgid "Please, enter a valid effort"
 msgstr "Por favor, introduzca un esfuerzo válido"
 
+#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:30
+msgid "Statistics list "
+msgstr "Lista de estadísticas "
+
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:113
+msgid "Apply filter to"
+msgstr "Aplicar filtro a"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:321
 msgid ""
 "Quality form should include an item with a value of 100% in order to report "
 "progress"
-msgstr "El formulario de calidad debería tener un ítem con valor de 100% para poder notificar progreso"
+msgstr ""
+"El formulario de calidad debería tener un ítem con valor de 100% para poder "
+"notificar progreso"
 
 #: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractedTaskData.java:126
 msgid "external company not specified"
@@ -5932,14 +6207,14 @@ msgstr "El nombre del formulario de calidad ya está siendo usado"
 msgid "Timesheets Templates"
 msgstr "Modelos de partes de trabajo"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:1143
+msgid "Confirm user edition"
+msgstr "Confirmar la edición del usuario"
+
 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:117
 msgid "Any"
 msgstr "Cualquiera"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:1129
-msgid "Confirm user edition"
-msgstr "Confirmar la edición del usuario"
-
 #: libreplan-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:47
 msgid "Load due to current project"
 msgstr "Carga debido al proyecto actual"
@@ -5966,26 +6241,28 @@ msgstr "el valor máximo por defecto debe ser mayor que el valor de precisión"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/DynamicDatebox.java:149
 msgid "Date format is wrong. Please, use the following format: {0}"
-msgstr "El formato de la fecha es erróneo. Por favor, utilice el siguiente formato: {0}"
+msgstr ""
+"El formato de la fecha es erróneo. Por favor, utilice el siguiente formato: "
+"{0}"
 
 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:114
-#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:39
-#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:104
-#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:182
-#: 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/profiles/_editProfile.zul:72
-#: libreplan-webapp/src/main/webapp/unittypes/unitTypes.zul:42
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:186
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:234
+#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:38
 #: 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/resources/worker/_edition.zul:186
+#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:136
+#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:39
+#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:127
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:104
+#: libreplan-webapp/src/main/webapp/profiles/_editProfile.zul:72
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:134
 #: libreplan-webapp/src/main/webapp/typeofworkhours/_editTypeOfWorkHours.zul:79
+#: libreplan-webapp/src/main/webapp/unittypes/unitTypes.zul:42
+#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:182
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:186
 msgid "Save & Continue"
 msgstr "Guardar y continuar"
 
@@ -5993,39 +6270,41 @@ msgstr "Guardar y continuar"
 msgid "Subcategory names must be unique."
 msgstr "Los nombres de las subcategorías deben ser únicos."
 
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:21
-msgid "LibrePlan: Work And Progress Per Project"
-msgstr "LibrePlan: Trabajo y Progreso por Proyecto"
-
-#: 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 "Filtrar"
-
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:145
 msgid "Scheduling mode"
 msgstr "Modo de planificación"
 
+#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:34
+#: libreplan-webapp/src/main/webapp/orders/_orderFilter.zul:23
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:54
+#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:83
+#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:51
+#: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:29
+msgid "Filter"
+msgstr "Filtrar"
+
 #: libreplan-webapp/src/main/webapp/common/configuration.zul:78
 msgid "Personal timesheets peridocity"
 msgstr "Periodicidad de los partes de horas personales"
 
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:21
+msgid "LibrePlan: Work And Progress Per Project"
+msgstr "LibrePlan: Trabajo y Progreso por Proyecto"
+
 #: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskMilestone.java:121
 msgid "a milestone cannot have a task associated"
 msgstr "un hito no puede tener una tarea asociada"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1329
+msgid "Assignment function will be changed. Are you sure?"
+msgstr "Se va a cambiar la función de asignación. ¿Está seguro?"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:81
 msgid ""
 "Invalid value. Precission value must be lower than the Default Max value."
-msgstr "El valor no es válido, el valor de precisión debe ser menor que el valor máximo por defecto."
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1321
-msgid "Assignment function will be changed. Are you sure?"
-msgstr "Se va a cambiar la función de asignación. ¿Está seguro?"
+msgstr ""
+"El valor no es válido, el valor de precisión debe ser menor que el valor "
+"máximo por defecto."
 
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:127
 msgid "Total expenses"
@@ -6035,7 +6314,7 @@ msgstr "Gastos totales"
 msgid "Assigned locations"
 msgstr "Ubicaciones asignadas"
 
-#: libreplan-webapp/src/main/webapp/orders/_orderFilter.zul:31
+#: libreplan-webapp/src/main/webapp/orders/_orderFilter.zul:33
 msgid "subelements"
 msgstr "sub-elementos"
 
@@ -6045,8 +6324,8 @@ msgstr "sub-elementos"
 msgid "Subcontracting date"
 msgstr "Fecha de subcontratación"
 
-#: 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 "Notificar progreso"
 
@@ -6062,15 +6341,15 @@ msgstr "Ok"
 msgid "ACWP"
 msgstr "ACWP"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:457
+msgid "cannot be empty."
+msgstr "no puede estar vacío."
+
 #: libreplan-webapp/src/main/webapp/users/_listUsers.zul:31
 #: libreplan-webapp/src/main/webapp/users/_editUser.zul:89
 msgid "Authentication type"
 msgstr "Tipo de autenticación"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:457
-msgid "cannot be empty."
-msgstr "no puede estar vacío."
-
 #: libreplan-webapp/src/main/webapp/common/layout/_customMenu.zul:55
 msgid "START"
 msgstr "INICIO"
@@ -6083,10 +6362,10 @@ msgstr "asignación genérica de máquinas"
 msgid "Subcontrated task"
 msgstr "Tarea subcontratada"
 
-#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:68
-#: libreplan-webapp/src/main/webapp/planner/order.zul:70
-#: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:75
 #: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:86
+#: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:75
+#: libreplan-webapp/src/main/webapp/planner/order.zul:70
+#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:68
 msgid "Back"
 msgstr "Atrás"
 
@@ -6094,8 +6373,8 @@ msgstr "Atrás"
 msgid "Our company username"
 msgstr "Nombre de usuario de nuestra empresa"
 
-#: 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 "Subcontratista"
 
@@ -6107,8 +6386,8 @@ msgstr "Administración"
 msgid "Cancel and return"
 msgstr "Cancelar y volver"
 
-#: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:34
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:31
+#: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:34
 msgid "Assign quality form"
 msgstr "Asignar formulario de calidad"
 
@@ -6116,14 +6395,14 @@ msgstr "Asignar formulario de calidad"
 msgid "Planning Configuration"
 msgstr "Configuración de planificación"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:388
-msgid "Delete item {0}. Are you sure?"
-msgstr "Borrar elemento {0}. ¿Está seguro?"
-
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:188
 msgid "Calculated budget"
 msgstr "Presupuesto calculado"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:388
+msgid "Delete item {0}. Are you sure?"
+msgstr "Borrar elemento {0}. ¿Está seguro?"
+
 #: libreplan-business/src/main/java/org/libreplan/business/orders/entities/Order.java:356
 msgid "the project must have a deadline"
 msgstr "el proyecto debe tener una fecha límite"
@@ -6154,17 +6433,17 @@ msgstr "Eligiendo plantilla"
 msgid "Length"
 msgstr "Longitud"
 
-#: 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 "Código de la tarea"
-
 #: 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 "Capacidad"
 
+#: 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 "Código de la tarea"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioCRUDController.java:133
 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:333
 msgid "Create derived"
@@ -6174,7 +6453,7 @@ msgstr "Crear derivado"
 msgid "Label Types"
 msgstr "Tipos de etiqueta"
 
-#: 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 "debe ser mayor que cero"
 
@@ -6182,10 +6461,6 @@ msgstr "debe ser mayor que cero"
 msgid "must be a real positive number"
 msgstr "debe ser un número real positivo"
 
-#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:33
-msgid "No Allocations have been done"
-msgstr "No se han hecho asignaciones"
-
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:111
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:122
 msgid "Total hours task"
@@ -6195,7 +6470,13 @@ msgstr "Total de horas de tarea"
 msgid ""
 "If you reached this page from another page of LibrePlan please notify us in "
 "order to fix it as soon as possible."
-msgstr "Si llegó a está página desde otra página de LibrePlan por favor notifíquenoslo para arreglarlo lo antes posible."
+msgstr ""
+"Si llegó a está página desde otra página de LibrePlan por favor "
+"notifíquenoslo para arreglarlo lo antes posible."
+
+#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:33
+msgid "No Allocations have been done"
+msgstr "No se han hecho asignaciones"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:442
 msgid "Removed calendar \"{0}\""
@@ -6209,7 +6490,7 @@ msgstr "hoja de gastos no especificada"
 msgid "LibrePlan: Timesheets Templates"
 msgstr "LibrePlan: Modelos de partes de trabajo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1066
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1205
 msgid "Create project"
 msgstr "Crear proyecto"
 
@@ -6217,56 +6498,64 @@ msgstr "Crear proyecto"
 msgid "Next"
 msgstr "Siguiente"
 
+#: 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 ""
+"Permitir valores múltiples para este tipo de criterio en el mismo período de "
+"tiempo"
+
 #: libreplan-webapp/src/main/webapp/myaccount/_personalTimesheetsArea.zul:22
 msgid "Personal timesheets"
 msgstr "Partes de horas personales"
 
-#: 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 "Permitir valores múltiples para este tipo de criterio en el mismo período de tiempo"
-
 #: 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"
-msgstr "En la parte de la cabecera, los índices de las etiquetas y los campos deben ser únicos y consecutivos"
+msgstr ""
+"En la parte de la cabecera, los índices de las etiquetas y los campos deben "
+"ser únicos y consecutivos"
+
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:36
+msgid "Human hours per machine working hour within configuration unit"
+msgstr ""
+"Horas humanas por hora de trabajo de máquina dentro de unidad de "
+"configuración"
 
 #: libreplan-webapp/src/main/webapp/planner/editTask.zul:67
 msgid "Normal resource allocation"
 msgstr "Asignación de recursos normal"
 
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:36
-msgid "Human hours per machine working hour within configuration unit"
-msgstr "Horas humanas por hora de trabajo de máquina dentro de unidad de configuración"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/users/OrderAuthorizationController.java:109
 msgid ""
 "Could not add those authorizations to user {0} because they were already "
 "present."
-msgstr "No se pudieron añadir esas autorizaciones al usuario {0} porque ya estaban presentes."
+msgstr ""
+"No se pudieron añadir esas autorizaciones al usuario {0} porque ya estaban "
+"presentes."
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:306
 msgid "Root calendar"
 msgstr "Calendario raíz"
 
-#: 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 "yes"
 msgstr "sí"
 
-#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:113
-msgid "Select gap"
-msgstr "Seleccionar intervalo"
-
 #: libreplan-webapp/src/main/webapp/common/configuration.zul:302
 msgid "Port"
 msgstr "Puerto"
 
+#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:113
+msgid "Select gap"
+msgstr "Seleccionar intervalo"
+
 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:64
 msgid "Date Finish"
 msgstr "Fecha de fin"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:455
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:544
 msgid "From"
 msgstr "Desde"
 
@@ -6274,7 +6563,7 @@ msgstr "Desde"
 msgid "At least one hours group is needed for each task"
 msgstr "Es necesario al menos un grupo de horas por cada tarea"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:556
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:659
 msgid "Resources or criteria"
 msgstr "Recursos o criterios"
 
@@ -6303,9 +6592,9 @@ msgstr "El nombre de tipo de criterio está siendo usado"
 msgid "There are repeated material category codes"
 msgstr "Hay códigos de categorías de materiales repetidos"
 
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:36
-#: 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/_costCategoryAssignment.zul:25
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:36
 msgid "Cost category assignment"
 msgstr "Asignación de categoría de coste"
 
@@ -6329,19 +6618,20 @@ msgstr "Todos los trabajadores"
 msgid "You have exceeded the maximum limit of resources"
 msgstr "Ha superado el límite máximo de recursos"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:766
-msgid "The field name must be unique and not empty"
-msgstr "El nombre del campo debe ser único y no vacío"
-
 #: libreplan-webapp/src/main/webapp/resources/search/allocation_selector_combo.zul:25
 msgid "Select criteria or resources"
 msgstr "Seleccione criterios o recursos"
 
-#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:26
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:766
+msgid "The field name must be unique and not empty"
+msgstr "El nombre del campo debe ser único y no vacío"
+
 #: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:24
 #: libreplan-webapp/src/main/webapp/orders/_orderFilter.zul:24
+#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:26
 msgid "Select required criteria set and press filter button"
-msgstr "Seleccione conjunto de criterios requeridos y pulse el botón de filtrar"
+msgstr ""
+"Seleccione conjunto de criterios requeridos y pulse el botón de filtrar"
 
 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:217
 msgid "Timesheet lines"
@@ -6360,9 +6650,9 @@ msgid "Estimate To Complete"
 msgstr "Estimación del coste pendiente"
 
 #: 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/templates/_materialAssignmentsBox.zul:30
 msgid "Unit type"
 msgstr "Tipo de unidad"
 
@@ -6400,7 +6690,8 @@ msgstr "Lista de etiquetas"
 
 #: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:461
 msgid "last timesheet line sequence code not specified"
-msgstr "último código de secuencia de la línea de parte de trabajo no especificado"
+msgstr ""
+"último código de secuencia de la línea de parte de trabajo no especificado"
 
 #: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityFormItem.java:72
 msgid "quality form item name not specified or empty"
@@ -6418,20 +6709,20 @@ msgstr "horas de trabajo no especificadas"
 msgid "format sequence code invalid. It must not contain '_'"
 msgstr "formato del código de secuencia inválido. No debe contener '_'"
 
-#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:76
 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:200
 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:227
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:76
 msgid "Extra Effort"
 msgstr "Esfuerzo extra"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:269
-msgid "Already exists other label with the same name"
-msgstr "Ya existe otra etiqueta con el mismo nombre"
-
 #: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:60
 msgid "Move selected task down"
 msgstr "Mover tarea seleccoinada hacia abajo"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:269
+msgid "Already exists other label with the same name"
+msgstr "Ya existe otra etiqueta con el mismo nombre"
+
 #: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityForm.java:101
 msgid "quality form type not specified"
 msgstr "tipo de formulario de calidad no especificado"
@@ -6453,30 +6744,30 @@ msgstr "Crear y asignar etiqueta"
 msgid "Optimistic"
 msgstr "Optimista"
 
+#: 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/HoursWorkedPerWorkerController.java:313
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:174
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:179
+msgid "Label has already been added."
+msgstr "La etiqueta ya ha sido añadida."
+
 #: 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/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
-msgid "Label has already been added."
-msgstr "La etiqueta ya ha sido añadida."
-
 #: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:122
 msgid "Add task"
 msgstr "Añadir tarea"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:714
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:682
 #: 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/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/_editOrderElement.zul:48
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:46
+#: libreplan-webapp/src/main/webapp/myaccount/_myTasksArea.zul:38
+#: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:49
+#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:45
 #: libreplan-webapp/src/main/webapp/dashboard/_dashboardfororder.zul:58
 msgid "Progress"
 msgstr "Progreso"
@@ -6502,9 +6793,9 @@ msgstr "Fecha límite del proyecto sin definir"
 msgid "Calendars"
 msgstr "Calendarios"
 
+#: 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
 #: 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
 msgid "value not specified"
 msgstr "valor no especificado"
 
@@ -6512,9 +6803,11 @@ msgstr "valor no especificado"
 msgid ""
 "Another task in the same branch is already reporting progress for this "
 "quality form"
-msgstr "Otra tarea en la misma rama ya está informando de un progreso para este formulario de calidad"
+msgstr ""
+"Otra tarea en la misma rama ya está informando de un progreso para este "
+"formulario de calidad"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:457
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:546
 msgid "To"
 msgstr "Hasta"
 
@@ -6522,21 +6815,22 @@ msgstr "Hasta"
 msgid "options"
 msgstr "opciones"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1202
-msgid "Queue-based assignment"
-msgstr "Asignación basada en colas"
-
 #: libreplan-webapp/src/main/webapp/resources/_criterions.zul:32
 msgid "Show only current satisfied criteria"
 msgstr "Mostrar solo los criterios satisfechos actualmente"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1210
+msgid "Queue-based assignment"
+msgstr "Asignación basada en colas"
+
 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:92
 msgid "Latest date"
 msgstr "Fecha más tardía"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:385
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:477
 msgid "Deadline cannot be empty in backwards mode"
-msgstr "La fecha de fin no puede estar vacía en el modo de planificación hacia atrás"
+msgstr ""
+"La fecha de fin no puede estar vacía en el modo de planificación hacia atrás"
 
 #: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:88
 msgid "Group by weeks"
@@ -6548,7 +6842,8 @@ msgstr "Nombre completo"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:125
 msgid "Default user \"admin\" cannot be removed as it is mandatory"
-msgstr "El usuario por defecto \"admin\" non se puede borrar porque es obligatorio"
+msgstr ""
+"El usuario por defecto \"admin\" non se puede borrar porque es obligatorio"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:117
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:387
@@ -6569,12 +6864,12 @@ msgstr "Hecho {0} de {1}"
 msgid "Planned start"
 msgstr "Inicio planificado"
 
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:62
-#: 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
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:62
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:98
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:62
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:73
 msgid "Filter by projects"
 msgstr "Filtrar por proyectos"
 
@@ -6582,8 +6877,8 @@ msgstr "Filtrar por proyectos"
 msgid "Task Quality Form item name not specified"
 msgstr "Ítem del formulario de calidad de la tarea no especificado"
 
-#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:44
 #: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:43
+#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:45
 #: libreplan-webapp/src/main/webapp/common/configuration.zul:258
 msgid "Active"
 msgstr "Activo"
@@ -6592,13 +6887,13 @@ msgstr "Activo"
 msgid "Inherited labels"
 msgstr "Etiquetas heredadas"
 
-#: 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 "Recurso basado en colas"
 
-#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:55
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:249
+#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:55
 msgid "Delivery date"
 msgstr "Fecha de entrega"
 
@@ -6628,49 +6923,51 @@ msgstr "Entrar"
 msgid "Project name"
 msgstr "Nombre del proyecto"
 
-#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:55
-msgid "Precision"
-msgstr "Precisión"
-
 #: 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 "Fecha de inicio estimada para la tarea (presione enter en el cuadro de texto para abrir el calendario o escriba la fecha directamente)"
+msgstr ""
+"Fecha de inicio estimada para la tarea (presione enter en el cuadro de texto "
+"para abrir el calendario o escriba la fecha directamente)"
+
+#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:56
+msgid "Precision"
+msgstr "Precisión"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:942
+msgid "Efforts"
+msgstr "Esfuerzos"
 
 #: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:41
 msgid "Show all reported hours"
 msgstr "Mostrar todas las horas notificadas"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:934
-msgid "Efforts"
-msgstr "Esfuerzos"
-
-#: 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/web/planner/tabs/OrdersTabCreator.java:106
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/OrdersTabCreator.java:143
 msgid "Projects List"
 msgstr "Lista de proyectos"
 
-#: 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/templates/entities/OrderLineTemplate.java:235
 msgid "budget not specified"
 msgstr "presupuesto no especificado"
 
 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:56
-#: 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/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/_projectDetails.zul:53
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:88
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:45
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:163
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:60
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:60
+#: 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/resources/worker/_edition.zul:55
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:44
 #: libreplan-webapp/src/main/webapp/typeofworkhours/_editTypeOfWorkHours.zul:46
+#: libreplan-webapp/src/main/webapp/unittypes/_editUnitType.zul:45
+#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:81
 msgid "Generate code"
 msgstr "Generar código"
 
@@ -6678,7 +6975,7 @@ msgstr "Generar código"
 msgid "Scheduling state"
 msgstr "Estado de planificación"
 
-#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:44
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:45
 msgid "Personal Data"
 msgstr "Datos personales"
 
@@ -6686,19 +6983,29 @@ msgstr "Datos personales"
 msgid "LibrePlan: Hours Worked Per Resource"
 msgstr "LibrePlan: Horas Trabajadas Por Recurso"
 
-#: libreplan-webapp/src/main/webapp/users/users.zul:23
-msgid "LibrePlan: User Accounts"
-msgstr "LibrePlan: Cuentas de usuario"
-
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:213
 msgid "Budget in money"
 msgstr "Presupuesto en dinero"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:601
+#, fuzzy
+msgid "Machine"
+msgstr "Máquinas"
+
 #: 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 "Ir al inicio"
 
+#: libreplan-webapp/src/main/webapp/users/users.zul:23
+msgid "LibrePlan: User Accounts"
+msgstr "LibrePlan: Cuentas de usuario"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:200
+#, fuzzy
+msgid "Criterion Type"
+msgstr "Lista de tipos de criterio"
+
 #: libreplan-webapp/src/main/webapp/common/error.zul:54
 #: libreplan-webapp/src/main/webapp/common/event_error.zul:50
 msgid "Reload"
@@ -6708,39 +7015,39 @@ msgstr "Recargar"
 msgid "Profiles authorization"
 msgstr "Autorización de perfiles"
 
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:99
+msgid "Planning charts expanded"
+msgstr "Gráficos de planificación expandidos"
+
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:71
 msgid "Assignation"
 msgstr "Asignación"
 
-#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:98
-msgid "Planning charts expanded"
-msgstr "Gráficos de planificación expandidos"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:702
 msgid "Inh"
 msgstr "Her"
 
-#: 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 "el elemento asociado a un grupo de tareas tiene que estar definido"
-
 #: libreplan-business/src/main/java/org/libreplan/business/expensesheet/entities/ExpenseSheetLine.java:92
 msgid "value must be greater or equal than 0"
 msgstr "el valor debe ser mayor o igual a 0"
 
+#: 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 "el elemento asociado a un grupo de tareas tiene que estar definido"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeModel.java:397
 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesModel.java:311
 msgid "name cannot be empty"
 msgstr "el nombre no puede estar vacío"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:466
-msgid "task is already marked as finished in another timesheet"
-msgstr "la tarea ya está marcada como finalizada en otro parte de trabajo"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java:190
 msgid "Doing {0} reassignations"
 msgstr "Realizando {0} reasignaciones"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:466
+msgid "task is already marked as finished in another timesheet"
+msgstr "la tarea ya está marcada como finalizada en otro parte de trabajo"
+
 #: libreplan-webapp/src/main/webapp/common/configuration.zul:232
 msgid "Select entity"
 msgstr "Seleccione entidad"
@@ -6753,18 +7060,20 @@ msgstr "La fecha de fin no puede ser anterior a la fecha de inicio"
 msgid "Go to worker edition window"
 msgstr "Ir a la ventana de edición de trabajadores"
 
-#: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:40
-msgid "Worked hours"
-msgstr "Horas trabajadas"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:95
-msgid "Invalid value. Default Max Value cannot be empty"
-msgstr "El valor no es válido. El valor máximo por defecto no puede estar vacío"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:129
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:142
 msgid "Invalid Spread values. At least one value should be true"
-msgstr "Los valores de propagación no son válidos. Al menos uno debe ser verdadero"
+msgstr ""
+"Los valores de propagación no son válidos. Al menos uno debe ser verdadero"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:95
+msgid "Invalid value. Default Max Value cannot be empty"
+msgstr ""
+"El valor no es válido. El valor máximo por defecto no puede estar vacío"
+
+#: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:40
+msgid "Worked hours"
+msgstr "Horas trabajadas"
 
 #: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:604
 #: libreplan-business/src/main/java/org/libreplan/business/common/IntegrationEntity.java:48
@@ -6779,24 +7088,26 @@ msgstr "Lista de proyectos"
 msgid "last sequence code not specified"
 msgstr "último código de secuencia no especificado"
 
-#: 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/java/org/libreplan/web/common/ConfigurationController.java:664
+msgid ""
+"Invalid format prefix. Format prefix cannot be empty, contain '_' or contain "
+"whitespaces."
+msgstr ""
+"Formato de prefijo inválido. No puede estar vacío o contener '_' o espacios "
+"en blanco."
+
 #: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:191
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:91
 #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:161
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:184
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:213
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:164
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:183
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:223
+#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:173
 msgid "if the report is not opened automatically"
 msgstr "si el informe no se abre de forma automática"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:663
-msgid ""
-"Invalid format prefix. Format prefix cannot be empty, contain '_' or contain"
-" whitespaces."
-msgstr "Formato de prefijo inválido. No puede estar vacío o contener '_' o espacios en blanco."
-
 #: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:55
 msgid "Create template from selected task"
 msgstr "Crear plantilla a partir de tarea seleccionada"
@@ -6810,11 +7121,11 @@ msgstr "Todos los proyectos"
 msgid "Completed: {0}%"
 msgstr "Completado: {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/myaccount/changePassword.zul:49
 #: 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
 msgid "Password"
 msgstr "Contraseña"
 
@@ -6823,19 +7134,24 @@ msgstr "Contraseña"
 msgid "Observations"
 msgstr "Observaciones"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:939
-msgid "Edit project"
-msgstr "Editar proyecto"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:909
 msgid "Hours cost: {0}, Expenses cost: {1}"
 msgstr "Coste de horas: {0}, Coste de gastos: {1}"
 
-#: libreplan-webapp/src/main/webapp/templates/_advances.zul:27
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1074
+msgid "Edit project"
+msgstr "Editar proyecto"
+
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:25
+#: libreplan-webapp/src/main/webapp/templates/_advances.zul:27
 msgid "Progress assignments"
 msgstr "Asignaciones de progreso"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:205
+#, fuzzy
+msgid "Criterion Types"
+msgstr "Lista de tipos de criterio"
+
 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:252
 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:274
 msgid "Valid from"
@@ -6845,12 +7161,12 @@ msgstr "Válido desde"
 msgid "Month"
 msgstr "Mes"
 
-#: 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 "No se pudo asignar {0}. No se puede asignar más que un recurso"
 
-#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:32
 #: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:58
+#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:32
 msgid "Color"
 msgstr "Color"
 
@@ -6860,33 +7176,41 @@ msgstr "La contraseña actual es incorrecta"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:366
 msgid "Cannot insert material in general view. Please, select a category"
-msgstr "No se puede insertar material en la vista general. Por favor, seleccione una categoría"
+msgstr ""
+"No se puede insertar material en la vista general. Por favor, seleccione una "
+"categoría"
 
 #: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:125
 msgid "Expense lines"
 msgstr "Líneas de gastos"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:311
-msgid "Delete {0} \"{1}\". Are you sure?"
-msgstr "Borrar {0} \"{1}\". ¿Está seguro?"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:441
 msgid "Only {0} resources per day were achieved for current allocation"
 msgstr "Sólo se han logrado {0} recursos por día para la asignación actual"
 
-#: libreplan-webapp/src/main/webapp/planner/editTask.zul:81
-#: libreplan-webapp/src/main/webapp/planner/reassign.zul:48
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:313
+msgid "Delete {0} \"{1}\". Are you sure?"
+msgstr "Borrar {0} \"{1}\". ¿Está seguro?"
+
+#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:88
+#: libreplan-webapp/src/main/webapp/common/layout/template.zul:102
 #: 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/orders/_projectDetails.zul:88
+#: libreplan-webapp/src/main/webapp/planner/reassign.zul:48
+#: libreplan-webapp/src/main/webapp/planner/main.zul:66
+#: libreplan-webapp/src/main/webapp/planner/editTask.zul:81
 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:133
-#: libreplan-webapp/src/main/webapp/common/layout/template.zul:102
 msgid "Accept"
 msgstr "Aceptar"
 
-#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:81
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:969
+msgid ""
+"Cannot delete timesheet template. There are some timesheets bound to it."
+msgstr ""
+"No se puede borrar el modelo de parte de trabajo. Hay algún parte de trabajo "
+"ligado a él."
+
 #: 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
@@ -6895,21 +7219,17 @@ msgstr "Aceptar"
 #: 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/externalcompanies/_editExternalCompany.zul:81
 msgid "Example: {0}"
 msgstr "Ejemplo: {0}"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:969
-msgid ""
-"Cannot delete timesheet template. There are some timesheets bound to it."
-msgstr "No se puede borrar el modelo de parte de trabajo. Hay algún parte de trabajo ligado a él."
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:617
 msgid "Please, select type of exception"
 msgstr "Por favor, seleccione el tipo de excepción"
 
-#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:86
 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:69
 #: libreplan-webapp/src/main/webapp/common/configuration.zul:218
+#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:86
 msgid "cannot be negative or empty"
 msgstr "no puede ser negativo o vacío"
 
@@ -6944,73 +7264,75 @@ msgstr "El progreso se envió con éxito"
 
 #: 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"
-" Assignment Strategy"
-msgstr "Por favor, permita múltiples criterios activos para este tipo para usar estrategia de asignación seleccionada"
+"Please, allow Multiple Active Criteria in this type in order to use selected "
+"Assignment Strategy"
+msgstr ""
+"Por favor, permita múltiples criterios activos para este tipo para usar "
+"estrategia de asignación seleccionada"
 
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:73
 msgid "Priority"
 msgstr "Prioridad"
 
-#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:47
-msgid "Apply changes and continue edition"
-msgstr "Aplicar cambios y continuar la edición"
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:246
+msgid "Money spent"
+msgstr "Dinero gastado"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:221
 #: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:80
 msgid "Infinitely Over Assignable"
 msgstr "Sobreasignable infinitamente"
 
-#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:246
-msgid "Money spent"
-msgstr "Dinero gastado"
+#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:47
+msgid "Apply changes and continue edition"
+msgstr "Aplicar cambios y continuar la edición"
 
 #: 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/common/components/finders/OrderFilterEnum.java:31
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:85
+#: 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/labels/_listLabelTypes.zul:27
-#: 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/scenarios/_edition.zul:51
+#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:65
+#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:75
+#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:26
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:109
+#: libreplan-webapp/src/main/webapp/orders/_list.zul:29
+#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:48
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:83
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:40
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:78
 #: 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
-#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:65
-#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:75
-#: 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/machine/_listMachines.zul:37
 #: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:26
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:71
 #: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:42
-#: 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/resources/worker/_list.zul:38
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:50
+#: libreplan-webapp/src/main/webapp/myaccount/_myTasksArea.zul:29
+#: libreplan-webapp/src/main/webapp/myaccount/_expensesArea.zul:31
+#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:28
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:38
 #: 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
+#: 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
 msgid "Code"
 msgstr "Código"
 
@@ -7023,7 +7345,9 @@ msgstr "Añadir tramo"
 msgid ""
 "Progress Assignment cannot be deleted or changed. Progress Assignment "
 "contains Progress Consolidations values"
-msgstr "La asignación de progreso no se puede borrar o cambiar. La asignación de progreso contiene valores de consolidación de progreso"
+msgstr ""
+"La asignación de progreso no se puede borrar o cambiar. La asignación de "
+"progreso contiene valores de consolidación de progreso"
 
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:70
 msgid "Assignation type"
@@ -7042,15 +7366,15 @@ msgid "unit name not specified"
 msgstr "nombre de la unidad no especificado"
 
 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:81
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:54
+#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:37
+#: libreplan-webapp/src/main/webapp/myaccount/_myTasksArea.zul:33
 #: 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/machine/_machineConfigurationUnits.zul:54
+#: 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
 msgid "Start date"
 msgstr "Fecha de inicio"
 
@@ -7062,24 +7386,25 @@ msgstr "Actualizar excepción"
 msgid "Operation cannot be done"
 msgstr "No se puede efectuar la operación"
 
-#: 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/orders/_orderElementDetails.zul:65
+#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeComponent.java:90
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:168
+#: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:65
+#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:82
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:62
+#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:54
 msgid "Budget"
 msgstr "Presupuesto"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:750
+msgid "Progress that are reported by quality forms cannot be modified"
+msgstr ""
+"El progreso notificado por formularios de calidad no pueden ser modificado"
+
 #: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:38
 msgid "Unit name"
 msgstr "Nombre de la unidad"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:750
-msgid "Progress that are reported by quality forms cannot be modified"
-msgstr "El progreso notificado por formularios de calidad no pueden ser modificado"
-
 #: libreplan-webapp/src/main/webapp/common/configuration.zul:23
 msgid "LibrePlan: Main Settings"
 msgstr "LibrePlan: Ajustes principales"
@@ -7088,6 +7413,11 @@ msgstr "LibrePlan: Ajustes principales"
 msgid "default label not specified"
 msgstr "etiqueta por defecto no especificada"
 
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:32
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:57
+msgid "Write"
+msgstr "Escribir"
+
 #: 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
@@ -7096,19 +7426,14 @@ msgstr "etiqueta por defecto no especificada"
 msgid "Project code"
 msgstr "Código del proyecto"
 
-#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:32
-#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:57
-msgid "Write"
-msgstr "Escribir"
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:501
+msgid "Assign element to queue automatically"
+msgstr "Asignar elemento a la cola automáticamente"
 
 #: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:39
 msgid "Number of applications"
 msgstr "Número de aplicaciones"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:501
-msgid "Assign element to queue automatically"
-msgstr "Asignar elemento a la cola automáticamente"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:427
 msgid "Confirm worker edition"
 msgstr "Confirmar edición del trabajador"
@@ -7133,7 +7458,7 @@ msgstr "Ajustes principales"
 msgid "Task Code"
 msgstr "Código de la tarea"
 
-#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:111
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:112
 msgid "Project view"
 msgstr "Vista de proyecto"
 
@@ -7143,33 +7468,33 @@ msgstr "Vista de proyecto"
 msgid "Probability %"
 msgstr "Probabilidad %"
 
-#: 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/planner/_legendLoadChartOrder.zul:49
-msgid "Load"
-msgstr "Carga"
-
 #: libreplan-webapp/src/main/webapp/resources/_criterions.zul:27
 #: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:28
 msgid "New criterion"
 msgstr "Criterio nuevo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:702
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:957
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:736
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:352
+#: libreplan-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:49
+msgid "Load"
+msgstr "Carga"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:719
 #: 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/orders/_edition.zul:98
+#: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:59
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:62
+#: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:36
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:67
+#: libreplan-webapp/src/main/webapp/myaccount/_expensesArea.zul:29
+#: libreplan-webapp/src/main/webapp/templates/_listTemplates.zul:31
+#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:77
 #: 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/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/orders/_orderElementDetails.zul:59
-#: libreplan-webapp/src/main/webapp/orders/_edition.zul:98
+#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:54
+#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:87
 msgid "Description"
 msgstr "Descripción"
 
@@ -7182,7 +7507,7 @@ msgstr "Recurso: {0}"
 msgid "Apply"
 msgstr "Aplicar"
 
-#: 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 "¿Quiere borrar también el usuario vinculado \"{0}\"?"
 
@@ -7195,19 +7520,19 @@ msgstr "Tipo de comunicación"
 msgid "Selected node"
 msgstr "Nodo seleccionado"
 
-#: 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 "ya existe una asignación para los criterios {0}"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:514
-msgid "Code cannot be empty."
-msgstr "El código no puede estar vacío."
-
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:216
 msgid "Project type"
 msgstr "Tipo de proyecto"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:310
+#: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:514
+msgid "Code cannot be empty."
+msgstr "El código no puede estar vacío."
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:402
 msgid "Forward"
 msgstr "Adelante"
 
@@ -7215,20 +7540,28 @@ msgstr "Adelante"
 msgid "Invalid date. Date must be unique for this Progress Assignment"
 msgstr "La fecha no es válida. Debe ser única para esta asignación de progreso"
 
-#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:43
-msgid "Number of finished applications"
-msgstr "Número de aplicaciones finalizadas"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:469
 msgid "Invalid queue element"
 msgstr "elemento de cola inválido"
 
+#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:43
+msgid "Number of finished applications"
+msgstr "Número de aplicaciones finalizadas"
+
 #: 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 "No asignado"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:269
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:116
+#: libreplan-webapp/src/main/webapp/common/layout/login.zul:75
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:63
+#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:167
+msgid "User"
+msgstr "Usuario"
+
 #: 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
@@ -7239,25 +7572,17 @@ msgstr "Número de tareas"
 msgid "At least one HoursGroup is needed"
 msgstr "Es necesario al menos un grupo de horas"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:269
-#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:63
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:116
-#: libreplan-webapp/src/main/webapp/common/layout/login.zul:75
-#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:167
-msgid "User"
-msgstr "Usuario"
-
-#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:71
-msgid "Interacts with applications"
-msgstr "Interactúa con aplicaciones"
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:295
+msgid "Virtual worker"
+msgstr "Trabajador virtual"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceInExpenseSheetBandboxFinder.java:44
 msgid "Resource name (Resource code)"
 msgstr "Nombre del recurso (Código del recurso)"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:295
-msgid "Virtual worker"
-msgstr "Trabajador virtual"
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:71
+msgid "Interacts with applications"
+msgstr "Interactúa con aplicaciones"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionController.java:343
 msgid "Length percentage should be between 0 and 100"
@@ -7267,24 +7592,25 @@ msgstr "El porcentaje de duración debería estar entre 0 y 100"
 msgid "Multiple values per resource"
 msgstr "Múltiples valores por recurso"
 
-#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:60
 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:59
+#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:60
 msgid "Split"
 msgstr "Dividir"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:443
-msgid "Communications"
-msgstr "Comunicaciones"
-
-#: 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 "por favor, seleccione un proyecto"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java:200
 msgid "Cannot remove the predefined calendar exception day \"{0}\""
-msgstr "No se puede el tipo de día excepcional de calendario predefinido \"{0}\""
+msgstr ""
+"No se puede el tipo de día excepcional de calendario predefinido \"{0}\""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:443
+msgid "Communications"
+msgstr "Comunicaciones"
 
 #: libreplan-webapp/src/main/webapp/common/layout/login.zul:123
 msgid "Supported Chrome, Firefox, Safari and Epiphany browsers"
@@ -7294,24 +7620,26 @@ msgstr "Compatible con navegadores Chrome, Firefox, Safari y Epiphany"
 msgid "Task deadline violations"
 msgstr "Violaciones de la fecha límite de la tarea"
 
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:53
+#: libreplan-webapp/src/main/webapp/orders/_list.zul:30
+#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:58
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:127
+#: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:45
+#: libreplan-webapp/src/main/webapp/resources/_criterions.zul:41
+#: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:28
+#: 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/orders/_orderElementDetails.zul:45
-#: libreplan-webapp/src/main/webapp/orders/_edition.zul:127
-#: libreplan-webapp/src/main/webapp/orders/_list.zul:30
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:53
 msgid "Starting date"
 msgstr "Fecha de inicio"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:913
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:914
 msgid ""
 "Periocity cannot be changed because there is already any personal timesheet "
 "stored"
-msgstr "La periodicidad no se puede modificar porque ya hay algún parte de horas personal almacenado"
+msgstr ""
+"La periodicidad no se puede modificar porque ya hay algún parte de horas "
+"personal almacenado"
 
 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:62
 msgid "Add materials"
@@ -7321,57 +7649,58 @@ msgstr "Añadir materiales"
 msgid "Load 100%"
 msgstr "Carga 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 "Función"
 
-#: 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 "Formato"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:908
 msgid "New project version"
 msgstr "Nueva versión de proyecto"
 
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:166
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:66
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:137
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:159
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:190
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:139
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:158
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:196
+#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:148
+msgid "Format"
+msgstr "Formato"
+
 #: libreplan-business/src/main/java/org/libreplan/business/labels/entities/LabelType.java:110
 msgid "label names must be unique inside a label type"
-msgstr "los nombres de las etiquetas deben ser únicos dentro de un tipo de etiqueta"
+msgstr ""
+"los nombres de las etiquetas deben ser únicos dentro de un tipo de etiqueta"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:551
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1367
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:366
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/Util.java:656
 #: 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/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/criterions/_edition.zul:28
+#: 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/resources/criterions/_list.zul:40
 #: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:33
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:28
+#: 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/advance/_editAdvanceTypes.zul:26
+#: libreplan-webapp/src/main/webapp/templates/_listTemplates.zul:46
+#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:43
+#: libreplan-webapp/src/main/webapp/profiles/_listProfiles.zul:36
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:26
+#: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:47
 #: libreplan-webapp/src/main/webapp/typeofworkhours/_listTypesOfWorkHours.zul:45
+#: libreplan-webapp/src/main/webapp/unittypes/_editUnitType.zul:25
 msgid "Edit"
 msgstr "Editar"
 
@@ -7383,19 +7712,21 @@ msgstr "Responsable"
 msgid "Click the following link to return to home page: "
 msgstr "Haga click en el siguiente enlace para volver a la página de inicio:"
 
-#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:20
-msgid "LibrePlan: Project Status Report"
-msgstr "LibrePlan: Informe del estado del proyecto"
-
 #: libreplan-webapp/src/main/webapp/myaccount/changePassword.zul:71
 msgid "New password"
 msgstr "Nueva contraseña"
 
+#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:20
+msgid "LibrePlan: Project Status Report"
+msgstr "LibrePlan: Informe del estado del proyecto"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:159
 msgid ""
 "The planning of this task is not in the current scenenario.\n"
 "You should change to any of the following scenarios: {0}"
-msgstr "La planificación de esta tarea no está en el escenario actual.\nDebe cambiar a uno de los siguientes escenarios: {0}"
+msgstr ""
+"La planificación de esta tarea no está en el escenario actual.\n"
+"Debe cambiar a uno de los siguientes escenarios: {0}"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetDTO.java:124
 msgid "{0} 2nd fortnight"
@@ -7423,14 +7754,14 @@ msgid "Tree {0} sucessfully flattened"
 msgstr "Árbol {0} aplanado satisfactoriamente"
 
 #: 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
+#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:31
 msgid "Unit price"
 msgstr "Precio de la unidad"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:288
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1286
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:333
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1424
 msgid "Not enough permissions to create templates"
 msgstr "No tiene permisos suficientes para crear plantillas"
 
@@ -7438,35 +7769,37 @@ msgstr "No tiene permisos suficientes para crear plantillas"
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1369
 msgid ""
 "Invalid value. Value must be greater than the value of previous progress."
-msgstr "El valor no es válido. El valor debe ser mayor que el valor del progreso anterior."
+msgstr ""
+"El valor no es válido. El valor debe ser mayor que el valor del progreso "
+"anterior."
 
+#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:102
+#: libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul:55
+#: libreplan-webapp/src/main/webapp/subcontract/subcontractorCommunications.zul:55
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:66
+msgid "Project Code"
+msgstr "Código del proyecto"
+
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:250
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:278
 #: 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
 msgid "Communication date"
 msgstr "Fecha de comunicación"
 
-#: 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
-msgid "Project Code"
-msgstr "Código del proyecto"
-
 #: libreplan-webapp/src/main/webapp/planner/reassign.zul:30
 msgid "Reassigning"
 msgstr "Reasignando"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:651
-msgid "{0} already assigned to resource allocation list"
-msgstr "{0} ya está en la lista de asignación de recursos"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/FilterCommunicationEnum.java:28
 msgid "Not Reviewed"
 msgstr "Sin revisar"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:655
+msgid "{0} already assigned to resource allocation list"
+msgstr "{0} ya está en la lista de asignación de recursos"
+
 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:22
 msgid "Label Types List"
 msgstr "Lista de Tipos de Etiqueta"
@@ -7476,45 +7809,45 @@ msgid "Hours type for personal timesheets"
 msgstr "Tipo de horas para los partes de horas personales"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/QualityFormBandboxFinder.java:51
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/LabelBandboxFinder.java:52
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceInExpenseSheetBandboxFinder.java:44
 #: 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/expensesheet/expenseSheet.zul:56
-#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:91
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/LabelBandboxFinder.java:52
+#: libreplan-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:28
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:42
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:48
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:47
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:153
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:79
 #: 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/calendars/_edition.zul:47
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:113
+#: 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/criterions/_list.zul:27
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:44
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:83
+#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:62
+#: libreplan-webapp/src/main/webapp/templates/_advances.zul:36
+#: libreplan-webapp/src/main/webapp/templates/_listTemplates.zul:25
+#: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:49
 #: 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/expensesheet/expenseSheet.zul:56
+#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:91
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:105
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:146
 #: 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/_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/reports/workingProgressPerTaskReport.zul:97
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.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/projectStatusReport.zul:86
+#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:126
 msgid "Type"
 msgstr "Tipo"
 
@@ -7567,8 +7900,8 @@ msgstr "Fecha de comunicación"
 msgid "delivery date not specified"
 msgstr "fecha de entrega no especificada"
 
-#: 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 "no"
 
@@ -7576,26 +7909,28 @@ msgstr "no"
 msgid ""
 "All machine worker assignments must have a start date earlier than the end "
 "date"
-msgstr "Todas las asignaciones trabajador máquina deben tener una fecha de inicio anterior a la fecha de fin"
+msgstr ""
+"Todas las asignaciones trabajador máquina deben tener una fecha de inicio "
+"anterior a la fecha de fin"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementInExpenseSheetBandboxFinder.java:45
 msgid "Task name (Task code)"
 msgstr "Nombre de la tarea (Código de la tarea)"
 
-#: 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 "Criterio"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:656
 msgid "Edit Timesheet"
 msgstr "Editar parte de trabajo"
 
+#: 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: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/ResourceFilterEnum.java:29
+#: 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/OrderFilterEnum.java:30
+msgid "Criterion"
+msgstr "Criterio"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:104
 msgid "unl"
 msgstr "ili"
@@ -7615,12 +7950,12 @@ msgstr "Generar código para"
 #: 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/orders/entities/OrderElement.java:533
 #: 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/costcategories/entities/CostCategory.java:193
 #: 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/templates/entities/OrderElementTemplate.java:373
 msgid "name not specified"
 msgstr "nombre no especificado"
 
@@ -7642,7 +7977,7 @@ msgstr "Coste de trabajo realizado"
 msgid "Queue-based Resources Planning"
 msgstr "Planificación de recursos basados en colas"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:137
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:147
 msgid "Create project from Template"
 msgstr "Crear proyecto a partir de plantilla"
 
@@ -7650,26 +7985,31 @@ msgstr "Crear proyecto a partir de plantilla"
 msgid "Previous"
 msgstr "Anterior"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:436
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1253
+msgid "Values already sent to the customer. Values cannot be changed "
+msgstr "Valores ya enviados al cliente. Los valores no se pueden cambiar"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:481
 msgid ""
 "Value is not valid.\n"
 " Code cannot contain chars like '_' \n"
 " and should not be empty"
-msgstr "El valor no es válido.\n El código no puede contener caracteres como '_' \n y no debe ser vacío"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1253
-msgid "Values already sent to the customer. Values cannot be changed "
-msgstr "Valores ya enviados al cliente. Los valores no se pueden cambiar"
+msgstr ""
+"El valor no es válido.\n"
+" El código no puede contener caracteres como '_' \n"
+" y no debe ser vacío"
 
 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/OrderAuthorization.java:43
 msgid "an authorization type must be set"
 msgstr "debe seleccionar un tipo de autorización"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:869
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1004
 msgid ""
-"This project is a subcontracted project. If you delete it, you won't be able"
-" to report progress anymore. Are you sure?"
-msgstr "Este es un proyecto subcontratado. Si lo borra, perderá la relación para notificar progresos. ¿Está seguro?"
+"This project is a subcontracted project. If you delete it, you won't be able "
+"to report progress anymore. Are you sure?"
+msgstr ""
+"Este es un proyecto subcontratado. Si lo borra, perderá la relación para "
+"notificar progresos. ¿Está seguro?"
 
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:194
 msgid "Percentage of estimated budget in money / money spent"
@@ -7679,35 +8019,37 @@ msgstr "Porcentaje de presupuesto estimado / dinero gastado"
 msgid ""
 "Confirm creating a new project version for this scenario and derived. Are "
 "you sure?"
-msgstr "Confirmar la creación de una nueva versión del proyecto para este escenario y sus derivados. ¿Está seguro?"
+msgstr ""
+"Confirmar la creación de una nueva versión del proyecto para este escenario "
+"y sus derivados. ¿Está seguro?"
 
 #: 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/orders/_edition.zul:268
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:35
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:166
+#: libreplan-webapp/src/main/webapp/resources/_criterions.zul:29
+#: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:30
 #: 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/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:66
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:86
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:127
+#: 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/reports/completedEstimatedHoursPerTask.zul:86
 #: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:127
-#: 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/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/orders/_listOrderElementCriterionRequirements.zul:35
-#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:166
-#: libreplan-webapp/src/main/webapp/orders/_edition.zul:268
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:86
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.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/projectStatusReport.zul:75
+#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:115
 msgid "Add"
 msgstr "Añadir"
 
@@ -7721,12 +8063,22 @@ msgid "timesheet template name is already being used"
 msgstr "el nombre del modelo de parte de trabajo ya está siendo usado"
 
 #: libreplan-webapp/src/main/webapp/materials/materials.zul:50
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:122
 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:43
 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:79
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:122
 msgid "Unselect"
 msgstr "Deseleccionar"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:103
+#: libreplan-webapp/src/main/webapp/orders/_list.zul:31
+#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:64
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:132
+#: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:52
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:46
+#: libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul:54
+msgid "Deadline"
+msgstr "Fecha límite"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:284
 msgid "Queue-based Resources"
 msgstr "Recursos basados en colas"
@@ -7735,20 +8087,12 @@ msgstr "Recursos basados en colas"
 msgid "Hours Group at {0}"
 msgstr "Grupo de horas en {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/_orderElementDetails.zul:52
-#: libreplan-webapp/src/main/webapp/orders/_edition.zul:132
-#: libreplan-webapp/src/main/webapp/orders/_list.zul:31
-msgid "Deadline"
-msgstr "Fecha límite"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:241
 #: 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 "La fecha de inicio no es válida. La nueva fecha de inicio debe ser anterior a la fecha de fin"
+msgstr ""
+"La fecha de inicio no es válida. La nueva fecha de inicio debe ser anterior "
+"a la fecha de fin"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportQueryController.java:373
 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:115
@@ -7811,8 +8155,8 @@ msgstr "Última comunicación"
 msgid "effort is not properly calculated based on clock"
 msgstr "el esfuerzo no está bien calculado basándose en el reloj"
 
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:65
 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:33
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:65
 msgid "Status"
 msgstr "Estado"
 
@@ -7820,41 +8164,41 @@ msgstr "Estado"
 msgid "from {0}"
 msgstr "desde {0}"
 
-#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:114
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:115
 msgid "Resource load view"
 msgstr "Vista de carga de recursos"
 
-#: 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 "Horas"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:606
 msgid "Could not save the new calendar"
 msgstr "No se pudo guardar el nuevo calendario"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:70
+#: 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/templates/TemplatesTreeComponent.java:81
+#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:36
+#: libreplan-webapp/src/main/webapp/orders/_list.zul:34
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:154
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:35
+#: 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/_tabPanelLimitingResourceAllocation.zul:72
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:34
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:82
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:54
+#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:37
+msgid "Hours"
+msgstr "Horas"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:320
+msgid "{0} \"{1}\" deleted"
+msgstr "{0} \"{1}\" borrado"
+
 #: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:56
 msgid "Quality form type"
 msgstr "Tipo de formulario de calidad"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:318
-msgid "{0} \"{1}\" deleted"
-msgstr "{0} \"{1}\" borrado"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:364
 msgid " hours"
 msgstr " horas"
@@ -7862,7 +8206,8 @@ msgstr " horas"
 #: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:262
 msgid ""
 "% Deviation interval (difference % between consumed and estimated hours)"
-msgstr "% Intervalo de desvío (diferencia de % entre horas consumidas y estimadas)"
+msgstr ""
+"% Intervalo de desvío (diferencia de % entre horas consumidas y estimadas)"
 
 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:69
 msgid "New label"
@@ -7881,21 +8226,19 @@ msgstr "Todas las tareas del proyecto"
 msgid "LDAP Roles (separated by ;)"
 msgstr "Roles del LDAP (separados por ;)"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:786
+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"
+msgstr ""
+"No puede borrar la tarea \"{0}\" porque es el único hijo de su padre y su "
+"padre tiene imputadas horas o gastos"
+
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_allocationConfiguration.zul:27
 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:78
 msgid "Allocation configuration"
 msgstr "Configuración de asignación"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:732
-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"
-msgstr "No puede borrar la tarea \"{0}\" porque es el único hijo de su padre y su padre tiene imputadas horas o gastos"
-
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:61
-msgid "Subcontract price"
-msgstr "Precio de subcontratación"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:434
 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:71
 msgid "Send To Customers"
@@ -7905,19 +8248,25 @@ msgstr "Enviar a clientes"
 msgid "The page that you are requesting does not exist."
 msgstr "La página que está solicitando no existe."
 
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:61
+msgid "Subcontract price"
+msgstr "Precio de subcontratación"
+
 #: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:496
 msgid ""
 "In personal timesheets, all timesheet lines should be in the same period"
-msgstr "En los partes de horas personales, todas las líneas del parte deberían estar en el mismo mes"
+msgstr ""
+"En los partes de horas personales, todas las líneas del parte deberían estar "
+"en el mismo mes"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1136
+msgid "Value is not valid in current list of Hours Group"
+msgstr "El valor no es válido en la lista actual de grupos de horas"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:835
 msgid "Resources per day are zero"
 msgstr "Hay cero recursos por día"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1134
-msgid "Value is not valid in current list of Hours Group"
-msgstr "El valor no es válido en la lista actual de grupos de horas"
-
 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:38
 msgid "Timesheets List"
 msgstr "Lista de partes de trabajo"
@@ -7926,8 +8275,8 @@ msgstr "Lista de partes de trabajo"
 msgid "Total extra per day"
 msgstr "Extra por día total"
 
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:32
 #: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:31
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:32
 msgid "Assigned criteria"
 msgstr "Criterios asignados"
 
@@ -7956,50 +8305,54 @@ msgid "Could not save the scenario"
 msgstr "No se pudo guardar el escenario"
 
 #: 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 "Aplicar filtrado a las tareas que satisfacen los criterios requeridos"
 
+#: 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 ""
+"Los valores de subcontratación son de sólo lectura porque fueron notificados "
+"por la empresa subcontratista"
+
 #: 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 "Estado de planificación de tareas en un proyecto"
 
-#: 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 "Los valores de subcontratación son de sólo lectura porque fueron notificados por la empresa subcontratista"
-
 #: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/ExternalCompany.java:149
 msgid "company name must be unique. Company name already used"
-msgstr "el nombre de empresa debe ser único. El nombre de empresa ya está siendo usado"
+msgstr ""
+"el nombre de empresa debe ser único. El nombre de empresa ya está siendo "
+"usado"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1005
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:315
+#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:378
 #: 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
 msgid "Confirm"
 msgstr "Confirmar"
 
 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:48
-#: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:33
-#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:40
-#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul: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/workreports/_listWorkReportTypes.zul:56
 #: 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/criterions/_list.zul:52
+#: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:45
+#: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:33
+#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:56
+#: libreplan-webapp/src/main/webapp/profiles/_listProfiles.zul:50
+#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:40
+#: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:58
 #: libreplan-webapp/src/main/webapp/typeofworkhours/_listTypesOfWorkHours.zul:58
+#: libreplan-webapp/src/main/webapp/unittypes/_listUnitTypes.zul:32
+#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:38
 msgid "Create"
 msgstr "Crear"
 
@@ -8016,30 +8369,32 @@ msgstr "Permisos"
 msgid "List of materials for category: {0}"
 msgstr "Lista de materiales para la categoría {0}"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/adaptplanning/AdaptPlanningCommand.java:60
-msgid "Adapt planning according to timesheets"
-msgstr "Adaptar la planificación según los partes de trabajo"
-
 #: libreplan-webapp/src/main/webapp/orders/_ordersTab.zul:36
 msgid "Cancel edition"
 msgstr "Cancelar la edición"
 
-#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:32
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/adaptplanning/AdaptPlanningCommand.java:60
+msgid "Adapt planning according to timesheets"
+msgstr "Adaptar la planificación según los partes de trabajo"
+
 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:32
+#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:32
 msgid "Total price"
 msgstr "Precio total"
 
 #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:420
 msgid "criterion codes must be unique inside a criterion  type"
-msgstr "los códigos de los criterios deben ser únicos dentro de un tipo de criterio"
+msgstr ""
+"los códigos de los criterios deben ser únicos dentro de un tipo de criterio"
 
 #: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:37
 msgid "Warning: Not editing from home page of bound users"
-msgstr "Aviso: No está editando desde la página de inicio de los usuarios vinculados"
+msgstr ""
+"Aviso: No está editando desde la página de inicio de los usuarios vinculados"
 
+#: 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 "Duración de esfuerzo no válida"
 
@@ -8052,101 +8407,85 @@ msgstr "El nombre del grupo de trabajadores virtuales debe ser único"
 msgid "start date not specified"
 msgstr "fecha de inicio no especificada"
 
+#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:46
+msgid "Labels without inheritance"
+msgstr "Etiquetas sin herencia"
+
 #: 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/expensesheet/ExpenseSheetCRUDController.java:212
-#: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:412
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java: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/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/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:1383
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1818
 #: 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/workreports/WorkReportTypeCRUDController.java:341
+#: 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/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/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:973
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractController.java:210
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:648
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionController.java:408
+#: 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/tree/TreeController.java:1160
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1166
 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:42
-#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:48
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:99
 #: libreplan-webapp/src/main/webapp/materials/materials.zul:107
+#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:56
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:67
+#: libreplan-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:102
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:79
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:91
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:212
+#: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:42
 #: 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/criterions/_list.zul:45
-#: libreplan-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:102
-#: 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/resources/worker/_workRelationships.zul:46
+#: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:52
+#: libreplan-webapp/src/main/webapp/templates/_listTemplates.zul:51
+#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:57
+#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:48
+#: libreplan-webapp/src/main/webapp/profiles/_listProfiles.zul:41
+#: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:52
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:116
 #: libreplan-webapp/src/main/webapp/typeofworkhours/_listTypesOfWorkHours.zul:50
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:169
+#: 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/reports/completedEstimatedHoursPerTask.zul:107
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:148
+#: 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/workingProgressPerTaskReport.zul:107
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.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/projectStatusReport.zul:96
+#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:136
 msgid "Delete"
 msgstr "Borrar"
 
-#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:46
-msgid "Labels without inheritance"
-msgstr "Etiquetas sin herencia"
-
-#: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/CommunicationType.java:31
-msgid "New project"
-msgstr "Nuevo proyecto"
-
-#: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/CommunicationType.java:31
-msgid "Progress Update"
-msgstr "Actualización de progreso"
-
-#: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/CommunicationType.java:32
-msgid "Update Delivering Date"
-msgstr "Actualizar la fecha de entrega"
-
-#: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/CommunicationType.java:32
-msgid "End date update"
-msgstr "Actualización de fecha de fin"
-
 #: libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialStatusEnum.java:32
 msgid "RECEIVED"
 msgstr "RECIBIDO"
@@ -8167,6 +8506,88 @@ msgstr "PROCESANDO"
 msgid "CANCELED"
 msgstr "CANCELADO"
 
+#: 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
+msgid "Cannot spread two progress in the same task"
+msgstr "No pueden propagar dos progresos en la misma tarea"
+
+#: 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 "Asignación de progreso duplicada para la tarea"
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:1158
+msgid "Quality form already exists"
+msgstr "El formulario de calidad ya existe"
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/HoursGroup.java:208
+msgid "Total percentage should be less than 100%"
+msgstr "El porcentaje total debería ser menor que el 100%"
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/CriterionRequirementHandler.java:539
+msgid "The criterion already exists into another task"
+msgstr "El criterio ya existe dentro de otra tarea"
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/SchedulingState.java:366
+msgid "Fully scheduled"
+msgstr "Completamente planificado"
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/SchedulingState.java:368
+msgid "Partially scheduled"
+msgstr "Parcialmente planificado"
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/SchedulingState.java:370
+msgid "Unscheduled"
+msgstr "Desplanificado"
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/SchedulingState.java:376
+msgid "F"
+msgstr "C"
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/SchedulingState.java:378
+msgid "P"
+msgstr "P"
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/SchedulingState.java:380
+msgid "U"
+msgstr "D"
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:35
+msgid "PRE-SALES"
+msgstr "PRE-VENTAS"
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:36
+msgid "OFFERED"
+msgstr "OFERTADO"
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:37
+msgid "OUTSOURCED"
+msgstr "SUBCONTRATADO"
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:38
+msgid "ACCEPTED"
+msgstr "ACEPTADO"
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:39
+msgid "STARTED"
+msgstr "EMPEZADO"
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:40
+msgid "ON HOLD"
+msgstr "SUSPENDIDO"
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:41
+msgid "FINISHED"
+msgstr "FINALIZADO"
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:42
+msgid "CANCELLED"
+msgstr "CANCELADO"
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:43
+msgid "STORED"
+msgstr "ARCHIVADO"
+
 #: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/PositionInWorkReportEnum.java:34
 msgid "heading"
 msgstr "cabecera"
@@ -8187,21 +8608,105 @@ msgstr "Número de horas calculado por reloj"
 msgid "Number of assigned hours and time"
 msgstr "Número de horas asignadas y la hora"
 
-#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityFormType.java:29
-msgid "by percentage"
-msgstr "por porcentaje"
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:31
+msgid "red (default)"
+msgstr "rojo (defecto)"
 
-#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityFormType.java:29
-msgid "by items"
-msgstr "por items"
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:32
+msgid "green"
+msgstr "verde"
 
-#: libreplan-business/src/main/java/org/libreplan/business/settings/entities/Language.java:36
-msgid "Use browser language configuration"
-msgstr "Utilizar la configuración de idioma del navegador"
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:33
+msgid "blue"
+msgstr "azul"
 
-#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/StretchesFunction.java:410
-msgid "Stretches must sum 100%"
-msgstr "Los tramos deben sumar 100%"
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:34
+msgid "cyan"
+msgstr "cian"
+
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:35
+msgid "magenta"
+msgstr "magenta"
+
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:36
+msgid "yellow"
+msgstr "amarillo"
+
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:37
+msgid "black"
+msgstr "negro"
+
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:38
+msgid "orange"
+msgstr "naranja"
+
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:39
+msgid "purple"
+msgstr "púrpura"
+
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/Capacity.java:172
+msgid "unlimited"
+msgstr "ilimitado"
+
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:207
+msgid "[generic all machines]"
+msgstr "[genérico todas las máquinas]"
+
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/ResourceEnum.java:32
+msgid "WORKER"
+msgstr "TRABAJADOR"
+
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/ResourceEnum.java:33
+msgid "MACHINE"
+msgstr "MÁQUINA"
+
+#: 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 "No puede borrar la secuencia de entidad porque ya se está usando"
+
+#: libreplan-business/src/main/java/org/libreplan/business/common/entities/ProgressType.java:37
+msgid "Progress with all tasks by hours"
+msgstr "Progreso con todas las tareas por horas"
+
+#: libreplan-business/src/main/java/org/libreplan/business/common/entities/ProgressType.java:38
+msgid "Progress with critical path tasks by hours"
+msgstr "Progreso con las tareas en el camino crítico por horas"
+
+#: libreplan-business/src/main/java/org/libreplan/business/common/entities/ProgressType.java:39
+msgid "Progress with critical path tasks by duration"
+msgstr "Progreso con las tareas del camino crítico por duración"
+
+#: libreplan-business/src/main/java/org/libreplan/business/common/entities/PersonalTimesheetsPeriodicityEnum.java:35
+msgid "Monthly"
+msgstr "Mensual"
+
+#: libreplan-business/src/main/java/org/libreplan/business/common/entities/PersonalTimesheetsPeriodicityEnum.java:66
+msgid "Twice-monthly"
+msgstr "2 veces al mes"
+
+#: libreplan-business/src/main/java/org/libreplan/business/common/entities/PersonalTimesheetsPeriodicityEnum.java:123
+msgid "Weekly"
+msgstr "Semanal"
+
+#: libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderLineTemplate.java:156
+msgid "Line"
+msgstr "Línea"
+
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:29
+msgid "In progress"
+msgstr "En progreso"
+
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:30
+msgid "Pending"
+msgstr "Pendiente"
+
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:31
+msgid "Blocked"
+msgstr "Bloqueado"
+
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:32
+msgid "Ready to start"
+msgstr "Preparado para empezar"
 
 #: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:76
 msgid "Flat"
@@ -8219,6 +8724,46 @@ msgstr "Interpolación"
 msgid "Sigmoid"
 msgstr "Sigmoide"
 
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskDeadlineViolationStatusEnum.java:35
+msgid "Deadline violated"
+msgstr "Fecha límite violada"
+
+#: 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 "No hay días disponibles debido a que no se satisfacen los criterios."
+
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:96
+msgid ""
+"Another possibility is that the resources do not have days available due to "
+"their calendars."
+msgstr ""
+"Otra posibilidad es que los recursos no tengan días disponibles debido a sus "
+"calendarios."
+
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:102
+msgid ""
+"There are no days available in the days marked available by the task "
+"calendar."
+msgstr ""
+"No hay días disponibles en los días marcados como disponibles por el "
+"calendario de la tarea."
+
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:103
+msgid "Maybe the criteria are not satisfied in those days."
+msgstr "Puede que los criterios no se satisfagan en esos días."
+
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:175
+msgid "Resource is not available from task's start"
+msgstr "El recurso no está disponible desde el inicio de la tarea"
+
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:180
+msgid "Resource is not available according to task's calendar"
+msgstr "El recurso no está disponible según el calendario de la tarea"
+
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/StretchesFunction.java:410
+msgid "Stretches must sum 100%"
+msgstr "Los tramos deben sumar 100%"
+
 #: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractState.java:32
 msgid "Pending initial send"
 msgstr "Pendiente del envío inicial"
@@ -8239,54 +8784,6 @@ msgstr "Actualización fallida"
 msgid "Success sent"
 msgstr "Envío exitoso"
 
-#: 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 "No hay días disponibles debido a que no se satisfacen los criterios."
-
-#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:96
-msgid ""
-"Another possibility is that the resources do not have days available due to "
-"their calendars."
-msgstr "Otra posibilidad es que los recursos no tengan días disponibles debido a sus calendarios."
-
-#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:102
-msgid ""
-"There are no days available in the days marked available by the task "
-"calendar."
-msgstr "No hay días disponibles en los días marcados como disponibles por el calendario de la tarea."
-
-#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:103
-msgid "Maybe the criteria are not satisfied in those days."
-msgstr "Puede que los criterios no se satisfagan en esos días."
-
-#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:175
-msgid "Resource is not available from task's start"
-msgstr "El recurso no está disponible desde el inicio de la tarea"
-
-#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:180
-msgid "Resource is not available according to task's calendar"
-msgstr "El recurso no está disponible según el calendario de la tarea"
-
-#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:29
-msgid "In progress"
-msgstr "En progreso"
-
-#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:30
-msgid "Pending"
-msgstr "Pendiente"
-
-#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:31
-msgid "Blocked"
-msgstr "Bloqueado"
-
-#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:32
-msgid "Ready to start"
-msgstr "Preparado para empezar"
-
-#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskDeadlineViolationStatusEnum.java:35
-msgid "Deadline violated"
-msgstr "Fecha límite violada"
-
 #: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:31
 msgid "as soon as possible"
 msgstr "tan pronto como sea posible"
@@ -8313,15 +8810,44 @@ msgstr "La hora debería estar entre 0 y 23"
 
 #: 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 "Una dependencia de la cola tiene que ter un origen diferente de su destino"
+msgstr ""
+"Una dependencia de la cola tiene que ter un origen diferente de su destino"
 
-#: libreplan-business/src/main/java/org/libreplan/business/users/entities/OrderAuthorizationType.java:33
-msgid "Read authorization"
-msgstr "Autorización de lectura"
+#: libreplan-business/src/main/java/org/libreplan/business/settings/entities/Language.java:36
+msgid "Use browser language configuration"
+msgstr "Utilizar la configuración de idioma del navegador"
 
-#: libreplan-business/src/main/java/org/libreplan/business/users/entities/OrderAuthorizationType.java:34
-msgid "Write authorization"
-msgstr "Autorización de escritura"
+#: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/CommunicationType.java:31
+msgid "New project"
+msgstr "Nuevo proyecto"
+
+#: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/CommunicationType.java:31
+msgid "Progress Update"
+msgstr "Actualización de progreso"
+
+#: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/CommunicationType.java:32
+msgid "Update Delivering Date"
+msgstr "Actualizar la fecha de entrega"
+
+#: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/CommunicationType.java:32
+msgid "End date update"
+msgstr "Actualización de fecha de fin"
+
+#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityFormType.java:29
+msgid "by percentage"
+msgstr "por porcentaje"
+
+#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityFormType.java:29
+msgid "by items"
+msgstr "por items"
+
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:360
+msgid "Database"
+msgstr "Base de datos"
+
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:360
+msgid "LDAP"
+msgstr "LDAP"
 
 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:37
 msgid "Web service reader"
@@ -8379,176 +8905,13 @@ msgstr "Informe de estado de planificación de tareas en un proyecto"
 msgid "Materials Needs At Date Report"
 msgstr "Informe de necesidades de materiales en fecha"
 
-#: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:345
-msgid "Database"
-msgstr "Base de datos"
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/OrderAuthorizationType.java:33
+msgid "Read authorization"
+msgstr "Autorización de lectura"
 
-#: 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/users/entities/OrderAuthorizationType.java:34
+msgid "Write authorization"
+msgstr "Autorización de escritura"
 
-#: libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderLineTemplate.java:156
-msgid "Line"
-msgstr "Línea"
-
-#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:31
-msgid "red (default)"
-msgstr "rojo (defecto)"
-
-#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:32
-msgid "green"
-msgstr "verde"
-
-#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:33
-msgid "blue"
-msgstr "azul"
-
-#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:34
-msgid "cyan"
-msgstr "cian"
-
-#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:35
-msgid "magenta"
-msgstr "magenta"
-
-#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:36
-msgid "yellow"
-msgstr "amarillo"
-
-#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:37
-msgid "black"
-msgstr "negro"
-
-#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:38
-msgid "orange"
-msgstr "naranja"
-
-#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:39
-msgid "purple"
-msgstr "púrpura"
-
-#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/Capacity.java:172
-msgid "unlimited"
-msgstr "ilimitado"
-
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:207
-msgid "[generic all machines]"
-msgstr "[genérico todas las máquinas]"
-
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/ResourceEnum.java:32
-msgid "WORKER"
-msgstr "TRABAJADOR"
-
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/ResourceEnum.java:33
-msgid "MACHINE"
-msgstr "MÁQUINA"
-
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:33
-msgid "PRE-SALES"
-msgstr "PRE-VENTAS"
-
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:34
-msgid "OFFERED"
-msgstr "OFERTADO"
-
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:35
-msgid "OUTSOURCED"
-msgstr "SUBCONTRATADO"
-
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:36
-msgid "ACCEPTED"
-msgstr "ACEPTADO"
-
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:37
-msgid "STARTED"
-msgstr "EMPEZADO"
-
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:38
-msgid "ON HOLD"
-msgstr "SUSPENDIDO"
-
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:39
-msgid "FINISHED"
-msgstr "FINALIZADO"
-
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:40
-msgid "CANCELLED"
-msgstr "CANCELADO"
-
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:41
-msgid "STORED"
-msgstr "ARCHIVADO"
-
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/SchedulingState.java:366
-msgid "Fully scheduled"
-msgstr "Completamente planificado"
-
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/SchedulingState.java:368
-msgid "Partially scheduled"
-msgstr "Parcialmente planificado"
-
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/SchedulingState.java:370
-msgid "Unscheduled"
-msgstr "Desplanificado"
-
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/SchedulingState.java:376
-msgid "F"
-msgstr "C"
-
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/SchedulingState.java:378
-msgid "P"
-msgstr "P"
-
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/SchedulingState.java:380
-msgid "U"
-msgstr "D"
-
-#: 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
-msgid "Cannot spread two progress in the same task"
-msgstr "No pueden propagar dos progresos en la misma tarea"
-
-#: 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 "Asignación de progreso duplicada para la tarea"
-
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:1158
-msgid "Quality form already exists"
-msgstr "El formulario de calidad ya existe"
-
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/HoursGroup.java:208
-msgid "Total percentage should be less than 100%"
-msgstr "El porcentaje total debería ser menor que el 100%"
-
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/CriterionRequirementHandler.java:539
-msgid "The criterion already exists into another task"
-msgstr "El criterio ya existe dentro de otra tarea"
-
-#: libreplan-business/src/main/java/org/libreplan/business/common/entities/PersonalTimesheetsPeriodicityEnum.java:35
-msgid "Monthly"
-msgstr "Mensual"
-
-#: libreplan-business/src/main/java/org/libreplan/business/common/entities/PersonalTimesheetsPeriodicityEnum.java:66
-msgid "Twice-monthly"
-msgstr "2 veces al mes"
-
-#: libreplan-business/src/main/java/org/libreplan/business/common/entities/PersonalTimesheetsPeriodicityEnum.java:123
-msgid "Weekly"
-msgstr "Semanal"
-
-#: libreplan-business/src/main/java/org/libreplan/business/common/entities/ProgressType.java:37
-msgid "Progress with all tasks by hours"
-msgstr "Progreso con todas las tareas por horas"
-
-#: libreplan-business/src/main/java/org/libreplan/business/common/entities/ProgressType.java:38
-msgid "Progress with critical path tasks by hours"
-msgstr "Progreso con las tareas en el camino crítico por horas"
-
-#: libreplan-business/src/main/java/org/libreplan/business/common/entities/ProgressType.java:39
-msgid "Progress with critical path tasks by duration"
-msgstr "Progreso con las tareas del camino crítico por duración"
-
-#: 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 "No puede borrar la secuencia de entidad porque ya se está usando"
+#~ msgid "Name: {0}"
+#~ msgstr "Nombre: {0}"
diff --git a/libreplan-webapp/src/main/resources/i18n/keys.pot b/libreplan-webapp/src/main/resources/i18n/keys.pot
index a3654f292..9ee0edb62 100644
--- a/libreplan-webapp/src/main/resources/i18n/keys.pot
+++ b/libreplan-webapp/src/main/resources/i18n/keys.pot
@@ -7,33 +7,33 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: libreplan-1.3.3\n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-07 13:59+0100\n"
+"POT-Creation-Date: 2013-02-08 11:42+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java:452
 msgid "currency code not specified"
 msgstr ""
 
-#: 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 ""
 
-#: libreplan-webapp/src/main/webapp/dashboard/_dashboardfororder.zul:92
-msgid "Availability ratio"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/common/configuration.zul:378
 msgid "Group path"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/dashboard/_dashboardfororder.zul:92
+msgid "Availability ratio"
+msgstr ""
+
 #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1150
 msgid ""
 "resource cost category assignments codes must be unique inside a resource"
@@ -71,61 +71,28 @@ msgstr ""
 
 #: 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/webapp/externalcompanies/_listExternalCompanies.zul:31
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:81
 #: 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/scenarios/_list.zul:28
+#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:68
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:57
+#: libreplan-webapp/src/main/webapp/orders/_list.zul:36
+#: libreplan-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:29
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:50
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:70
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:279
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:50
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:48
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:83
+#: 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/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/planner/taskpanels/_tabPanelSubcontract.zul:110
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:127
-#: 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/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/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/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/calendars/_edition.zul:258
 #: 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
@@ -134,16 +101,49 @@ msgstr ""
 #: 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/orders/_listOrderElementAdvances.zul:50
-#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:70
-#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:57
-#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:143
+#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:39
+#: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:31
+#: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:37
+#: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:40
+#: libreplan-webapp/src/main/webapp/myaccount/_myTasksArea.zul:42
+#: libreplan-webapp/src/main/webapp/myaccount/_expensesArea.zul:40
+#: libreplan-webapp/src/main/webapp/myaccount/_personalTimesheetsArea.zul:37
+#: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:30
 #: libreplan-webapp/src/main/webapp/common/configuration.zul:266
+#: libreplan-webapp/src/main/webapp/templates/_advances.zul:39
+#: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:41
+#: libreplan-webapp/src/main/webapp/templates/_listTemplates.zul:33
+#: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:50
+#: 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/externalcompanies/_listExternalCompanies.zul:31
+#: 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/reportAdvances.zul:52
+#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:36
+#: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:38
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:87
+#: libreplan-webapp/src/main/webapp/unittypes/_listUnitTypes.zul:29
+#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:143
+#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:58
+#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:174
+#: 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/reports/completedEstimatedHoursPerTask.zul:99
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:140
+#: 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/workingProgressPerTaskReport.zul:99
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.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/projectStatusReport.zul:88
+#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:128
 msgid "Operations"
 msgstr ""
 
@@ -167,12 +167,12 @@ msgstr ""
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:340
 #: libreplan-webapp/src/main/webapp/materials/materials.zul:35
-#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:48
-#: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:52
-#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:22
 #: 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-webapp/src/main/webapp/templates/_editTemplateWindow.zul:52
+#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:22
+#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:48
 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:57
 msgid "Materials"
 msgstr ""
@@ -181,14 +181,14 @@ msgstr ""
 msgid "dates must be sorted and cannot overlap"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java:361
-msgid "Reassign"
-msgstr ""
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:180
 msgid "Not bound"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java:361
+msgid "Reassign"
+msgstr ""
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/GlobalProgressChart.java:62
 msgid "By critical path hours"
 msgstr ""
@@ -203,8 +203,8 @@ msgstr ""
 msgid "No deadline"
 msgstr ""
 
-#: 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:274
 msgid "Project Scheduling"
 msgstr ""
 
@@ -226,19 +226,19 @@ msgstr ""
 msgid "Please, select a calendar"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:256
-msgid "Summary"
-msgstr ""
-
 #: 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 ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:344
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:256
+msgid "Summary"
+msgstr ""
+
 #: 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/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:344
 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:53
+#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:49
 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:59
 msgid "Quality Forms"
 msgstr ""
@@ -247,19 +247,19 @@ msgstr ""
 msgid "A stretch has lower or equal values than the previous stretch"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:502
-msgid "Reports"
-msgstr ""
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java:149
 msgid "Assignments could not be completed"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:502
+msgid "Reports"
+msgstr ""
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/assigntemplates/TemplateFinderPopup.java:117
 msgid "Create task"
 msgstr ""
 
-#: 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:137
 msgid "username not specified"
 msgstr ""
 
@@ -288,14 +288,14 @@ msgstr ""
 msgid "Progress that are reported by quality forms can not be modified"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:66
-msgid "Own exception"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/common/layout/timeout.zul:27
 msgid "Your session has expired because of inactivity. Please log in again."
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:66
+msgid "Own exception"
+msgstr ""
+
 #: 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 ""
@@ -328,8 +328,8 @@ msgstr ""
 msgid "Manual assignment"
 msgstr ""
 
-#: 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-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:146
 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:68
 msgid "Companies"
 msgstr ""
@@ -339,8 +339,8 @@ msgid "Quality form items list"
 msgstr ""
 
 #: 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/resources/worker/WorkerCRUDController.java:1061
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:130
 msgid "Create {0}: {1}"
 msgstr ""
 
@@ -356,13 +356,13 @@ msgstr ""
 msgid "generic workers allocation"
 msgstr ""
 
-#: 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/orders/OrderCRUDController.java:1030
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:396
 msgid "The project has no scheduled elements"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/planner/main.zul:53
 #: 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 ""
@@ -427,8 +427,8 @@ msgstr ""
 msgid "Default calendar"
 msgstr ""
 
-#: libreplan-business/src/main/java/org/libreplan/business/requirements/entities/CriterionRequirement.java:68
 #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionSatisfaction.java:206
+#: libreplan-business/src/main/java/org/libreplan/business/requirements/entities/CriterionRequirement.java:68
 msgid "criterion not specified"
 msgstr ""
 
@@ -437,15 +437,15 @@ msgid ""
 "only one timesheet line per day and task is allowed in personal timesheets"
 msgstr ""
 
-#: 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/hoursWorkedPerWorkerInAMonthReport.zul:88
 #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:158
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:181
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:210
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:161
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:180
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:220
+#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:169
 msgid "Click on this"
 msgstr ""
 
@@ -493,12 +493,12 @@ msgstr ""
 msgid "Consolidated progress measurement cannot be removed"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTree.java:42
-msgid "New template"
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:984
+msgid "Delete bound user"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:970
-msgid "Delete bound user"
+#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTree.java:42
+msgid "New template"
 msgstr ""
 
 #: libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialInfo.java:61
@@ -539,7 +539,7 @@ msgstr ""
 msgid "LibrePlan: Labels"
 msgstr ""
 
-#: 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:378
 msgid "You have exceeded the maximum limit of users"
 msgstr ""
 
@@ -557,15 +557,15 @@ msgstr ""
 msgid "position not specified"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:85
+msgid "{0} List"
+msgstr ""
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/GlobalProgressChart.java:57
 #: libreplan-webapp/src/main/webapp/resources/_criterions.zul:43
 msgid "Current"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:84
-msgid "{0} List"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:65
 msgid "Dependencies"
 msgstr ""
@@ -580,9 +580,9 @@ msgid ""
 "applicable to this resource"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:47
 #: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:52
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:50
+#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:47
 msgid "Criterion Requirement"
 msgstr ""
 
@@ -627,13 +627,13 @@ msgstr ""
 msgid "a disabled resource has enabled subresources"
 msgstr ""
 
-#: 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 ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:673
 #: 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
 msgid ""
 "there are no resources for required criteria: {0}. So the generic allocation "
 "can't be added"
@@ -700,14 +700,18 @@ msgstr ""
 msgid "Budget: {0}, Consumed: {1} ({2}%)"
 msgstr ""
 
-#: 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 ""
 
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:55
-#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:59
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:61
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:141
+msgid "Criterion filter"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:36
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:61
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:60
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:55
 msgid "First name"
 msgstr ""
 
@@ -720,23 +724,23 @@ msgid "LibrePlan: Send To Subcontractors"
 msgstr ""
 
 #: 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/orders/AssignedTaskQualityFormsToOrderElementController.java:200
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:961
 #: 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/expensesheet/ExpenseSheetCRUDController.java:211
 msgid "Confirm deleting {0}. Are you sure?"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:51
-msgid "Edit selected task"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:220
 msgid "External code"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:51
+msgid "Edit selected task"
+msgstr ""
+
 #: 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"
@@ -762,15 +766,15 @@ msgstr ""
 msgid "Required materials"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:312
-msgid "Backwards"
-msgstr ""
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:181
 #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:104
 msgid "Existing user"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:404
+msgid "Backwards"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:52
 msgid "Apply filtering to resources satisfying required criteria"
 msgstr ""
@@ -780,18 +784,22 @@ msgstr ""
 msgid "Version"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:35
-msgid "Communications To Customers"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:105
 msgid "Up"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:35
+msgid "Communications To Customers"
+msgstr ""
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:252
 msgid "EAC"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:601
+msgid "Not workable day"
+msgstr ""
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:539
 msgid "it already exists another expense sheet with the same code."
 msgstr ""
@@ -800,34 +808,30 @@ msgstr ""
 msgid "Predecessor"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:601
-msgid "Not workable day"
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/TreeElementOperationsController.java:55
+msgid "Please select a task"
 msgstr ""
 
 #: 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 ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/TreeElementOperationsController.java:55
-msgid "Please select a task"
-msgstr ""
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:101
 msgid ""
 "Value is not valid, the default max value must be greater than the precision "
 "value "
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:277
 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:82
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:55
+#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:38
+#: libreplan-webapp/src/main/webapp/myaccount/_myTasksArea.zul:36
+#: 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/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/machine/_machineConfigurationUnits.zul:55
-#: libreplan-webapp/src/main/webapp/orders/_edition.zul:277
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:57
 msgid "End date"
 msgstr ""
 
@@ -835,7 +839,7 @@ msgstr ""
 msgid "LibrePlan: Calendar Exception Days"
 msgstr ""
 
-#: 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 ""
 
@@ -855,52 +859,52 @@ msgstr ""
 msgid "You cannot remove the current scenario"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:84
-#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:71
 #: 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/myaccount/settings.zul:72
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:84
 msgid "E-mail"
 msgstr ""
 
-#: 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 ""
 
-#: 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/orders/OrderElementTreeController.java:675
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:661
 #: 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/reports/ProjectStatusReportController.java:173
 #: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:39
-#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:36
 #: libreplan-webapp/src/main/webapp/common/configuration.zul:143
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:32
+#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:36
 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:54
 msgid "Criteria"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:28
-msgid "User data"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:140
 msgid "Resource / Criteria"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:28
+msgid "User data"
+msgstr ""
+
 #: 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
 msgid "field name not specified or empty"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:44
-msgid "Lines"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:29
 msgid "Add new progress assignment"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:44
+msgid "Lines"
+msgstr ""
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1342
 msgid ""
 "Value must be a multiple of the precision value of the progress type: {0}"
@@ -933,8 +937,8 @@ msgstr ""
 msgid "Quality form item name must be unique"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:50
-msgid "Subcontracting communication date"
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:31
+msgid "Personal data"
 msgstr ""
 
 #: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:162
@@ -942,19 +946,19 @@ msgstr ""
 msgid "Finished"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:31
-msgid "Personal data"
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:50
+msgid "Subcontracting communication date"
 msgstr ""
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:164
-#: 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/HoursWorkedPerWorkerController.java:337
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:202
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:207
 msgid "please, select a Criterion"
 msgstr ""
 
-#: 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 ""
 
@@ -962,19 +966,19 @@ msgstr ""
 msgid "Some sequences to be removed do not exist"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1290
-msgid "Modified"
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1001
+msgid "cannot be negative"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:999
-msgid "cannot be negative"
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1292
+msgid "Modified"
 msgstr ""
 
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:215
 msgid "Add Criterion"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:665
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:666
 msgid "format prefix invalid. It cannot be empty or contain whitespaces."
 msgstr ""
 
@@ -983,7 +987,7 @@ msgid "inherited exception can not be removed"
 msgstr ""
 
 #: 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
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:471
 msgid "MessagesContainer is needed"
 msgstr ""
 
@@ -993,11 +997,11 @@ msgid ""
 "assigned"
 msgstr ""
 
-#: 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/_workRelationships.zul:29
 #: libreplan-webapp/src/main/webapp/resources/_criterions.zul:42
+#: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:29
+#: 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/reports/schedulingProgressPerOrderReport.zul:58
 msgid "Ending date"
 msgstr ""
 
@@ -1013,14 +1017,14 @@ msgstr ""
 msgid "project name is already being used"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:29
-msgid "Export options"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/templates/_listTemplates.zul:21
 msgid "Templates List"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:29
+msgid "Export options"
+msgstr ""
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:221
 msgid "Criteria: {0}"
 msgstr ""
@@ -1037,16 +1041,16 @@ msgstr ""
 msgid "Calculated progress can not be modified"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:60
-msgid "Work done from starting date"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:51
 msgid "Statistics log"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/resources/worker/_calendar.zul:47
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:60
+msgid "Work done from starting date"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/resources/machine/_calendar.zul:40
+#: libreplan-webapp/src/main/webapp/resources/worker/_calendar.zul:47
 msgid "Edit Calendar"
 msgstr ""
 
@@ -1058,9 +1062,8 @@ msgstr ""
 msgid "Profile"
 msgstr ""
 
-#: 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"
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:488
+msgid "{0} sequences"
 msgstr ""
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:493
@@ -1068,27 +1071,32 @@ msgstr ""
 msgid "Materials Needs At Date"
 msgstr ""
 
+#: 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 ""
+
 #: libreplan-webapp/src/main/webapp/common/configuration.zul:316
 msgid "UserDn"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:233
-msgid "{0} \"{1}\" saved"
-msgstr ""
-
-#: 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:317
 msgid "filtering"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/orders/_list.zul:33
-msgid "Total Budget"
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:235
+msgid "{0} \"{1}\" saved"
 msgstr ""
 
 #: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:55
 msgid "Hierarchy"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:955
+#: libreplan-webapp/src/main/webapp/orders/_list.zul:33
+msgid "Total Budget"
+msgstr ""
+
+#: 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"
@@ -1123,31 +1131,31 @@ msgstr ""
 msgid "Time period saved"
 msgstr ""
 
+#: 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/HoursWorkedPerWorkerController.java:343
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:208
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:213
+msgid "This Criterion has already been added."
+msgstr ""
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:252
 msgid ""
 "Are you sure of changing the resource type? You will lose the criteria with "
 "different resource type."
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:170
-#: 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
-msgid "This Criterion has already been added."
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/common/configuration.zul:246
 msgid "add"
 msgstr ""
 
-#: 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
+#: 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
 msgid "Unsaved changes will be lost. Would you like to continue?"
 msgstr ""
 
-#: 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 ""
 
@@ -1156,7 +1164,7 @@ msgstr ""
 msgid "Workers"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:862
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:997
 msgid ""
 "You can not remove the project \"{0}\" because it has time tracked at some "
 "of its tasks"
@@ -1178,15 +1186,15 @@ msgstr ""
 msgid "Year"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:327
-msgid "{0} \"{1}\" could not be deleted, it was already removed"
-msgstr ""
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:429
 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:70
 msgid "Received From Subcontractors"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:329
+msgid "{0} \"{1}\" could not be deleted, it was already removed"
+msgstr ""
+
 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/Profile.java:68
 msgid "profile name not specified"
 msgstr ""
@@ -1211,27 +1219,27 @@ msgstr ""
 msgid "Hour costs"
 msgstr ""
 
-#: 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/orders/_listOrderElementAdvances.zul:67
 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:35
 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:56
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:67
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:87
+#: libreplan-webapp/src/main/webapp/planner/order.zul:105
+#: libreplan-webapp/src/main/webapp/subcontract/subcontractorCommunications.zul:58
+#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:137
+#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:168
 msgid "Value"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeModel.java:91
-msgid "Progress type cannot be modified"
-msgstr ""
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:809
 msgid "there are no valid periods for this calendar"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:133
+#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeModel.java:91
+msgid "Progress type cannot be modified"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/profiles/_editProfile.zul:54
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:133
 msgid "Add role"
 msgstr ""
 
@@ -1245,8 +1253,8 @@ msgstr ""
 msgid "Repeated Project code {0} in Project {1}"
 msgstr ""
 
-#: 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 ""
 
@@ -1258,8 +1266,8 @@ msgstr ""
 msgid "Progress Types List"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/AssignedCriterionsModel.java:335
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/AssignedMachineCriterionsModel.java:398
+#: 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"
@@ -1277,14 +1285,14 @@ msgstr ""
 msgid "The code cannot be empty and it must be unique."
 msgstr ""
 
-#: 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-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:124
 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:67
 msgid "Profiles"
 msgstr ""
 
-#: 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 ""
 
@@ -1333,15 +1341,15 @@ msgstr ""
 msgid "Total personal timesheet"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:275
-msgid "Expiry date"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:57
 #: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:73
 msgid "Pagination"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:275
+msgid "Expiry date"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/common/layout/template.zul:86
 msgid "Change scenario"
 msgstr ""
@@ -1361,8 +1369,8 @@ msgstr ""
 msgid "Value is not valid. It must be smaller than max value"
 msgstr ""
 
-#: 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 ""
 
@@ -1379,11 +1387,11 @@ msgid "Task: {0}"
 msgstr ""
 
 #: 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
+#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:66
+#: libreplan-webapp/src/main/webapp/planner/order.zul:106
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:86
 msgid "Percentage"
 msgstr ""
 
@@ -1412,8 +1420,8 @@ msgstr ""
 msgid "company code cannot contain whitespaces"
 msgstr ""
 
-#: 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 ""
 
@@ -1421,7 +1429,11 @@ msgstr ""
 msgid "Problems connecting with client web service"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:721
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:131
+msgid "Projects since"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:775
 msgid ""
 "You cannot remove the task \"{0}\" because it has work reported on it or any "
 "of its children"
@@ -1437,29 +1449,30 @@ msgstr ""
 msgid "The current value must be less than the max value."
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/profiles/_listProfiles.zul:22
-msgid "Profiles List"
-msgstr ""
-
 #: 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 ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:726
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:662
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:336
+#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:226
 #: 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/orders/_edition.zul:48
 #: libreplan-webapp/src/main/webapp/common/configuration.zul:147
+#: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:50
+#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:46
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:76
 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:56
 msgid "Labels"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/profiles/_listProfiles.zul:22
+msgid "Profiles List"
+msgstr ""
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:442
 msgid "Queue-based resource assignation"
 msgstr ""
@@ -1483,7 +1496,7 @@ msgstr ""
 msgid "Reassigning {0} projects"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:39
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:40
 msgid "Data"
 msgstr ""
 
@@ -1491,8 +1504,8 @@ msgstr ""
 msgid "Filter by task status"
 msgstr ""
 
-#: 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/order/OrderPlanningModel.java:520
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:453
 msgid "Select date"
 msgstr ""
 
@@ -1554,33 +1567,37 @@ msgid "Activation periods"
 msgstr ""
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:505
-#: 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/orders/_projectDetails.zul:76
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:138
+#: 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/common/configuration.zul:177
+#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:90
+#: libreplan-webapp/src/main/webapp/planner/order.zul:151
 msgid "Calendar"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioCRUDController.java:238
+msgid "Scenario"
+msgstr ""
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:357
-#: libreplan-webapp/src/main/webapp/dashboard/_dashboardfororder.zul:76
 #: libreplan-webapp/src/main/webapp/common/configuration.zul:157
+#: libreplan-webapp/src/main/webapp/dashboard/_dashboardfororder.zul:76
 msgid "Resources"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:31
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:56
+msgid "Read"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/myaccount/changePassword.zul:56
 msgid ""
 "LDAP users cannot change their password if LDAP authentication is enabled. "
 "Talk to one of the administrators"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:31
-#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:56
-msgid "Read"
-msgstr ""
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/TransferOrdersModel.java:153
 msgid "Source and destination scenarios should be different"
 msgstr ""
@@ -1597,6 +1614,11 @@ msgstr ""
 msgid "scenario"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:133
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:149
+msgid "months to"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/common/configuration.zul:220
 msgid ""
 "Defines the time since last saving operation at project planning "
@@ -1604,11 +1626,11 @@ msgid ""
 "to disable the warning."
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:42
+#: libreplan-webapp/src/main/webapp/orders/_orderFilter.zul:30
 #: 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
 msgid "to"
 msgstr ""
 
@@ -1630,8 +1652,8 @@ msgstr ""
 msgid "Property strategy"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:107
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:276
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:107
 msgid "Save date"
 msgstr ""
 
@@ -1640,12 +1662,12 @@ msgid ""
 "The quality item positions must be correct in function to the percentage."
 msgstr ""
 
-#: 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-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:521
 #: 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
+#: libreplan-business/src/main/java/org/libreplan/business/expensesheet/entities/ExpenseSheetLine.java:146
 msgid "date not specified"
 msgstr ""
 
@@ -1655,8 +1677,8 @@ msgid ""
 "and their calendars."
 msgstr ""
 
-#: 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/planner/tabs/PlanningTabCreator.java:199
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:233
 msgid "Projects Planning"
 msgstr ""
 
@@ -1672,14 +1694,14 @@ msgstr ""
 msgid "The max value must be greater than 0"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:61
-#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:65
 #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:73
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:66
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:61
 msgid "Last name"
 msgstr ""
 
 #: 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 ""
 
@@ -1703,7 +1725,7 @@ msgstr ""
 msgid "name not specified or empty"
 msgstr ""
 
-#: 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 ""
 
@@ -1723,8 +1745,8 @@ msgstr ""
 msgid "This date can not include the whole previous work week"
 msgstr ""
 
-#: 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"
@@ -1734,7 +1756,7 @@ msgstr ""
 msgid "Create New Project"
 msgstr ""
 
-#: 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 ""
 
@@ -1742,44 +1764,44 @@ msgstr ""
 msgid "to {0}"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:21
-msgid "LibrePlan: Total Worked Hours By Resource In A Month"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:65
 msgid "Zoom"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:21
+msgid "LibrePlan: Total Worked Hours By Resource In A Month"
+msgstr ""
+
 #: 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/webapp/externalcompanies/_editExternalCompany.zul:102
 #: libreplan-webapp/src/main/webapp/materials/materials.zul:118
-#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:180
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:232
-#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:37
 #: 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/profiles/_editProfile.zul:70
-#: libreplan-webapp/src/main/webapp/unittypes/unitTypes.zul:41
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:232
+#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:37
 #: 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/limitingresources/limitingResourcesLayout.zul:59
-#: libreplan-webapp/src/main/webapp/typeofworkhours/_editTypeOfWorkHours.zul:77
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:90
+#: libreplan-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:41
+#: 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/myaccount/settings.zul:160
+#: libreplan-webapp/src/main/webapp/myaccount/changePassword.zul:89
+#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:133
+#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:38
 #: libreplan-webapp/src/main/webapp/common/configuration.zul:419
+#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:125
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:102
+#: libreplan-webapp/src/main/webapp/profiles/_editProfile.zul:70
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:91
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:131
+#: libreplan-webapp/src/main/webapp/typeofworkhours/_editTypeOfWorkHours.zul:77
+#: libreplan-webapp/src/main/webapp/unittypes/unitTypes.zul:41
+#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:59
+#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:180
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:184
 msgid "Save"
 msgstr ""
 
@@ -1789,18 +1811,18 @@ msgid ""
 "exiting in the table have a CommunicationDate not empty. "
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:34
-#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:72
-msgid "Standard Effort"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/common/configuration.zul:167
 msgid "Material categories"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:72
+#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:34
+msgid "Standard Effort"
+msgstr ""
+
 #: 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:589
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:687
 msgid "number of digits must be between {0} and {1}"
 msgstr ""
 
@@ -1827,7 +1849,7 @@ msgid ""
 "progress assignment from root task"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:313
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:405
 msgid "Schedule from deadline to start"
 msgstr ""
 
@@ -1844,26 +1866,26 @@ msgstr ""
 msgid "Delete template. Are you sure?"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:117
-msgid "Expense date"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/common/configuration.zul:256
 msgid "Entity type"
 msgstr ""
 
-#: 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/webapp/expensesheet/expenseSheet.zul:117
+msgid "Expense date"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:325
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1120
 msgid "Unsaved changes will be lost. Are you sure?"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/resourceload/resourceload.zul:22
+#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:22
+#: libreplan-webapp/src/main/webapp/planner/order.zul:22
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:22
 #: libreplan-webapp/src/main/webapp/planner/montecarlo_function.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/resourceload/resourceload.zul:22
 msgid "LibrePlan: Scheduling"
 msgstr ""
 
@@ -1871,14 +1893,14 @@ msgstr ""
 msgid "Assigned load"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:66
-msgid "Filter by workers"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:154
 msgid "End Date"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:66
+msgid "Filter by workers"
+msgstr ""
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/AdvancedAllocationTaskController.java:73
 msgid "Some allocations needed"
 msgstr ""
@@ -1893,7 +1915,7 @@ msgid ""
 "popup or type in date directly)"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:310
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:355
 msgid "Expand/Collapse all"
 msgstr ""
 
@@ -1901,13 +1923,9 @@ msgstr ""
 msgid "Overload due to current project"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:887
-msgid "Name: {0}"
-msgstr ""
-
 #: 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
 msgid "Please, select a project"
 msgstr ""
 
@@ -1946,32 +1964,32 @@ msgstr ""
 msgid "Cost"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:42
 #: 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
 msgid "General data"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:251
-msgid "BAC"
-msgstr ""
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeComponent.java:111
 msgid "Deadline (days since project start)"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:251
+msgid "BAC"
+msgstr ""
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:381
 msgid "Calculate Number of Hours"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:38
-#: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:35
-#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:81
 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:99
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:81
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:35
+#: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:38
 msgid "Assign"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1276
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1414
 msgid "Create Template"
 msgstr ""
 
@@ -1988,8 +2006,8 @@ msgstr ""
 msgid "last expense sheet line sequence code not specified"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:972
 #: 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
 msgid "Not enough permissions to edit this project"
 msgstr ""
 
@@ -1998,12 +2016,12 @@ msgstr ""
 msgid "Advanced search"
 msgstr ""
 
-#: 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/workingArrangementsPerOrderReport.zul:84
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:76
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:97
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:76
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:114
+#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:65
 msgid "Filter by labels"
 msgstr ""
 
@@ -2026,7 +2044,7 @@ msgstr ""
 msgid "Schedule Variance"
 msgstr ""
 
-#: 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 ""
 
@@ -2047,35 +2065,35 @@ msgstr ""
 msgid "Status code"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:103
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:970
+#: 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/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/qualityforms/QualityFormCRUDController.java:391
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:155
+msgid "Warning"
+msgstr ""
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:900
 msgid "Index fields and labels must be unique and consecutive"
 msgstr ""
 
-#: 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 ""
-
-#: libreplan-webapp/src/main/webapp/resources/worker/_calendar.zul:35
 #: 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 ""
 
-#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:66
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:67
+#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:66
 msgid "Identification"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:218
 #: 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 ""
 
@@ -2096,29 +2114,29 @@ msgstr ""
 msgid "quality form not specified"
 msgstr ""
 
-#: 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/timeLineMaterialReport.zul:165
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:49
 #: libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul:37
 #: libreplan-webapp/src/main/webapp/subcontract/subcontractorCommunications.zul:37
-#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:49
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:195
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:96
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:165
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:188
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:217
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:168
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:187
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:228
+#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:178
 msgid "Show"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:71
-msgid "Assignment Type"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:58
 msgid "Duration (days)"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:71
+msgid "Assignment Type"
+msgstr ""
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:424
 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:69
 msgid "Send To Subcontractors"
@@ -2189,8 +2207,8 @@ msgstr ""
 msgid "Sum of direct imputed hours"
 msgstr ""
 
-#: 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
+#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:233
 msgid "type of work hours not specified"
 msgstr ""
 
@@ -2198,8 +2216,8 @@ msgstr ""
 msgid "the type of work hours name has to be unique. It is already used"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:35
 #: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:28
+#: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:35
 msgid "Surname"
 msgstr ""
 
@@ -2207,27 +2225,27 @@ msgstr ""
 msgid "calendars with zero hours are not allowed"
 msgstr ""
 
-#: 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/expensesheet/expenseSheet.zul:170
-#: 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/java/org/libreplan/web/workreports/WorkReportCRUDController.java:777
 #: 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
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:32
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:84
+#: 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/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/subcontract/subcontractorCommunications.zul:69
+#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:170
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:43
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:43
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:43
 msgid "Date"
 msgstr ""
 
@@ -2236,14 +2254,14 @@ msgstr ""
 msgid "Reviewed"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:42
-msgid "Add From Template"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:32
 msgid "Expense Sheets List"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:42
+msgid "Add From Template"
+msgstr ""
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:574
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:612
 msgid "Assigned resources for this task will be deleted. Are you sure?"
@@ -2265,8 +2283,8 @@ msgstr ""
 msgid "( max: {0} )"
 msgstr ""
 
-#: 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 ""
 
@@ -2282,8 +2300,8 @@ msgstr ""
 msgid "Cannot calculate charts for current data"
 msgstr ""
 
-#: 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/java/org/libreplan/web/orders/ProjectDetailsController.java:178
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1681
 msgid "project name already being used"
 msgstr ""
 
@@ -2291,8 +2309,8 @@ msgstr ""
 msgid "Work description"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:61
 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:60
+#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:61
 msgid "Split assignment"
 msgstr ""
 
@@ -2304,15 +2322,15 @@ msgstr ""
 msgid "percentage must be unique"
 msgstr ""
 
-#: 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/hoursWorkedPerWorkerInAMonthReport.zul:90
 #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:160
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:183
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:212
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:163
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:182
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:222
+#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:171
 msgid "direct link"
 msgstr ""
 
@@ -2325,11 +2343,10 @@ msgid "template calendar not specified"
 msgstr ""
 
 #: 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/TaskGroupFilterEnum.java:30
+#: 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/OrderFilterEnum.java:30
 msgid "Label"
 msgstr ""
 
@@ -2341,13 +2358,13 @@ msgstr ""
 msgid "Task Completation Lead/Lag"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:127
 #: libreplan-webapp/src/main/webapp/profiles/_editProfile.zul:51
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:127
 msgid "Association with roles"
 msgstr ""
 
-#: 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 ""
 
@@ -2368,8 +2385,8 @@ msgstr ""
 msgid "Hours group"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:72
 #: libreplan-webapp/src/main/webapp/templates/_listTemplates.zul:29
+#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:72
 msgid "Days from Beginning to Deadline"
 msgstr ""
 
@@ -2394,21 +2411,21 @@ msgstr ""
 msgid "Output format:"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/CriterionRequirementWrapper.java:45
 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportQueryController.java:259
 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1199
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/CriterionRequirementWrapper.java:45
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:77
 msgid "Direct"
 msgstr ""
 
 #: 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/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:86
+#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:34
 #: 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
-#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:34
+#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:51
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:86
 msgid "Op."
 msgstr ""
 
@@ -2428,12 +2445,12 @@ msgstr ""
 msgid "Please select a source scenario"
 msgstr ""
 
-#: 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 ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1582
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1758
 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."
@@ -2443,14 +2460,14 @@ msgstr ""
 msgid "Entity sequences"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:242
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:733
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1452
 #: 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/order/OrderPlanningController.java:356
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:302
 msgid "must be after start date"
 msgstr ""
 
@@ -2460,8 +2477,8 @@ msgid ""
 "by clock"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:67
 #: libreplan-webapp/src/main/webapp/templates/_listTemplates.zul:27
+#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:67
 msgid "Delay from beginning (days)"
 msgstr ""
 
@@ -2490,7 +2507,7 @@ msgstr ""
 msgid "Work And Progress Per Task"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1529
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1705
 msgid "project code already being used"
 msgstr ""
 
@@ -2506,7 +2523,7 @@ msgstr ""
 msgid "WBS (tasks)"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:713
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:714
 msgid "Deleting sequence"
 msgstr ""
 
@@ -2527,18 +2544,18 @@ msgstr ""
 msgid "LibrePlan: Templates"
 msgstr ""
 
-#: 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 ""
 
-#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:88
-msgid "Total other"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:51
 msgid "Criterion requirement"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:88
+msgid "Total other"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:21
 msgid "LibrePlan: Expenses"
 msgstr ""
@@ -2551,15 +2568,15 @@ msgstr ""
 msgid "Scheduling saved"
 msgstr ""
 
-#: 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:765
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:986
 msgid ""
 "You can not remove the project \"{0}\" because this one has imputed expense "
 "sheets."
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:219
 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:70
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:219
 #: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:28
 msgid "Add new row"
 msgstr ""
@@ -2580,8 +2597,8 @@ msgstr ""
 msgid "Password saved"
 msgstr ""
 
-#: 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 ""
 
@@ -2589,8 +2606,8 @@ msgstr ""
 msgid "subcontrated task data not specified"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:50
 #: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:30
+#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:50
 msgid "Assignment log"
 msgstr ""
 
@@ -2608,9 +2625,9 @@ msgid "LibrePlan: Companies"
 msgstr ""
 
 #: 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 ""
 
@@ -2651,27 +2668,27 @@ msgstr ""
 msgid "External company"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:68
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:44
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:68
 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:28
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:68
+#: libreplan-webapp/src/main/webapp/profiles/_editProfile.zul:61
+#: libreplan-webapp/src/main/webapp/profiles/_listProfiles.zul:28
+#: libreplan-webapp/src/main/webapp/typeofworkhours/_listTypesOfWorkHours.zul:30
 #: 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/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 ""
 
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:34
+msgid "User settings"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:130
 msgid "Exceptions"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:33
-msgid "User settings"
-msgstr ""
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:833
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:110
 msgid "Start hour"
@@ -2682,13 +2699,13 @@ msgid "Assign materials"
 msgstr ""
 
 #: 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
 #: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:29
+#: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:37
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:79
 msgid "ID"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/bandboxsearch/BandboxMultipleSearch.java:238
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/bandboxsearch/BandboxMultipleSearch.java:240
 msgid "format filters are not valid"
 msgstr ""
 
@@ -2700,7 +2717,7 @@ msgstr ""
 msgid "please, select a criterion"
 msgstr ""
 
-#: 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 ""
 
@@ -2717,6 +2734,10 @@ msgstr ""
 msgid "Unallocated name"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1720
+msgid "Subcontracted by client"
+msgstr ""
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:282
 msgid "Password cannot be empty"
 msgstr ""
@@ -2730,8 +2751,8 @@ msgid "Dependencies have priority"
 msgstr ""
 
 #: 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/resources/worker/WorkerCRUDController.java:1059
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:128
 msgid "Create {0}"
 msgstr ""
 
@@ -2759,18 +2780,18 @@ msgstr ""
 msgid "Create new project"
 msgstr ""
 
-#: 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/java/org/libreplan/web/planner/order/OrderPlanningModel.java:796
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:397
 msgid "date in the future"
 msgstr ""
 
-#: 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/planner/TaskElementAdapter.java:896
+#: libreplan-webapp/src/main/webapp/orders/_list.zul:35
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:104
 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:56
 #: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:51
-#: libreplan-webapp/src/main/webapp/orders/_edition.zul:104
-#: libreplan-webapp/src/main/webapp/orders/_list.zul:35
 msgid "State"
 msgstr ""
 
@@ -2782,7 +2803,7 @@ msgstr ""
 msgid "Fully, Partially or Unscheduled. (Drag and drop to move tasks)"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1322
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1330
 msgid "Confirm change"
 msgstr ""
 
@@ -2798,22 +2819,22 @@ msgstr ""
 msgid "Code already included in Hours Group codes"
 msgstr ""
 
-#: 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/templates/OrderTemplatesController.java:303
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:133
 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:47
 msgid "Planning"
 msgstr ""
 
-#: 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 ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ReportAdvancesController.java:199
 #: 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 ""
 
@@ -2839,11 +2860,11 @@ msgid "Type name"
 msgstr ""
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportQueryController.java:250
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/TimeLineRequiredMaterialController.java:207
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:181
-#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:728
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:831
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:863
 #: 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/reports/SchedulingProgressPerOrderController.java:181
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/TimeLineRequiredMaterialController.java:207
 #: 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
@@ -2876,6 +2897,12 @@ msgstr ""
 msgid "Create activation period"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/CriterionRequirementWrapper.java:48
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1197
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:229
+msgid "Inherited"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:31
 msgid "Personal details"
 msgstr ""
@@ -2884,10 +2911,10 @@ msgstr ""
 msgid "Workers List"
 msgstr ""
 
-#: 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"
+#: 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 ""
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:519
@@ -2897,12 +2924,6 @@ msgid ""
 "resource allocation criteria at any interval of time"
 msgstr ""
 
-#: 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 ""
-
 #: 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 "
@@ -2929,6 +2950,10 @@ msgstr ""
 msgid "Start hour cannot be greater than finish hour"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:511
+msgid "Preferences"
+msgstr ""
+
 #: 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 ""
@@ -2936,18 +2961,14 @@ msgid ""
 "before moving"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:511
-msgid "Preferences"
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:386
+msgid "Role property"
 msgstr ""
 
 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:25
 msgid "Manual allocation"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:386
-msgid "Role property"
-msgstr ""
-
 #: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceAssignment.java:75
 msgid "progress type not specified"
 msgstr ""
@@ -2981,14 +3002,18 @@ msgstr ""
 msgid "Activation"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:759
-msgid "Calculated progress cannot be removed"
+#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioCRUDController.java:243
+msgid "Scenarios"
 msgstr ""
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:375
 msgid "Materials saved"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:759
+msgid "Calculated progress cannot be removed"
+msgstr ""
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:458
 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:39
 msgid "Total Worked Hours By Resource In A Month"
@@ -3022,10 +3047,10 @@ msgstr ""
 msgid "At least one {0} sequence must be active"
 msgstr ""
 
-#: 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
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:66
+#: libreplan-webapp/src/main/webapp/profiles/_listProfiles.zul:26
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:160
 msgid "Profile name"
 msgstr ""
 
@@ -3066,9 +3091,9 @@ msgstr ""
 msgid "Details"
 msgstr ""
 
-#: 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 ""
 
@@ -3085,14 +3110,18 @@ msgstr ""
 msgid "Confirm create template"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:50
-msgid "Work amount"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:250
 msgid "Parent"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:139
+msgid "Resources load filtering"
+msgstr ""
+
+#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:50
+msgid "Work amount"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:91
 msgid "Earliest date"
 msgstr ""
@@ -3110,15 +3139,15 @@ msgstr ""
 msgid "Projects"
 msgstr ""
 
-#: 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
-msgid "Confirm exit dialog"
-msgstr ""
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/converters/ConverterFactory.java:64
 msgid "Not found converter for {0}"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:326
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1121
+msgid "Confirm exit dialog"
+msgstr ""
+
 #: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportType.java:427
 msgid ""
 "In the lines part, index labels and fields must be unique and consecutive"
@@ -3137,10 +3166,10 @@ msgstr ""
 msgid "last value not specified"
 msgstr ""
 
-#: 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
+#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/TaskQualityForm.java:72
+#: libreplan-business/src/main/java/org/libreplan/business/expensesheet/entities/ExpenseSheetLine.java:110
 msgid "task not specified"
 msgstr ""
 
@@ -3189,14 +3218,14 @@ msgstr ""
 msgid "Work record"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:168
-#: 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/hoursWorkedPerWorkerInAMonthReport.zul:76
 #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:147
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:169
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:200
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:149
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:168
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:206
 msgid "Output format"
 msgstr ""
 
@@ -3216,56 +3245,56 @@ msgstr ""
 msgid "resource type does not allow enabled criteria"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/TransferOrdersModel.java:148
-msgid "Please, select a destination scenario"
-msgstr ""
-
-#: 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/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1112
 #: 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/scenarios/_edition.zul:70
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:132
+#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:90
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:98
 #: 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/resources/criterions/_edition.zul:94
+#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:139
 #: libreplan-webapp/src/main/webapp/common/layout/template.zul:104
 #: libreplan-webapp/src/main/webapp/common/configuration.zul:422
+#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:129
+#: 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/advance_allocation.zul:42
+#: libreplan-webapp/src/main/webapp/planner/reassign.zul:50
+#: libreplan-webapp/src/main/webapp/planner/editTask.zul:83
+#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:50
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:106
+#: libreplan-webapp/src/main/webapp/profiles/_editProfile.zul:74
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:97
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:137
+#: libreplan-webapp/src/main/webapp/typeofworkhours/_editTypeOfWorkHours.zul:81
+#: libreplan-webapp/src/main/webapp/unittypes/unitTypes.zul:43
+#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:135
+#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:184
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:188
 msgid "Cancel"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:36
-msgid "General user data"
+#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/TransferOrdersModel.java:148
+msgid "Please, select a destination scenario"
 msgstr ""
 
 #: libreplan-webapp/src/main/webapp/common/components/schedulingStateToggler.zul:32
 msgid "Unschedule"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:36
+msgid "General user data"
+msgstr ""
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksController.java:216
 msgid "Subcontracted task sent successfully"
 msgstr ""
@@ -3278,9 +3307,9 @@ msgstr ""
 msgid "Machines List"
 msgstr ""
 
-#: 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
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:827
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1039
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:406
 msgid "You don't have read access to this project"
 msgstr ""
 
@@ -3301,18 +3330,18 @@ msgstr ""
 msgid "Cannot create another progress of the same type"
 msgstr ""
 
-#: 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
-msgid "Dates"
-msgstr ""
-
-#: 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/templates/_materialAssignmentsBox.zul:29
 msgid "Units"
 msgstr ""
 
+#: 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 ""
+
 #: 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"
@@ -3363,12 +3392,12 @@ msgstr ""
 msgid "{0} (max: {1})"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:526
-msgid "Cost Category"
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:537
+msgid "end"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:492
-msgid "end"
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:526
+msgid "Cost Category"
 msgstr ""
 
 #: libreplan-webapp/src/main/webapp/common/configuration.zul:393
@@ -3383,14 +3412,14 @@ msgstr ""
 msgid "Log"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:68
-msgid "Inherited exception"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:57
 msgid "Authorizations"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:68
+msgid "Inherited exception"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/common/concurrent_modification.zul:36
 #: libreplan-webapp/src/main/webapp/common/event_error.zul:49
 msgid "Continue"
@@ -3404,7 +3433,7 @@ msgstr ""
 msgid "LibrePlan: Timesheets"
 msgstr ""
 
-#: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:231
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:246
 msgid "username is already being used by another user"
 msgstr ""
 
@@ -3412,8 +3441,8 @@ msgstr ""
 msgid "references"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1751
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractController.java:140
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1575
 msgid "You must select a valid date. "
 msgstr ""
 
@@ -3421,15 +3450,15 @@ msgstr ""
 msgid "Generic"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:42
 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:43
 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:65
-#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:42
 msgid "Template"
 msgstr ""
 
+#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/TaskQualityFormItem.java:126
 #: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityFormItem.java:112
 #: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityForm.java:277
-#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/TaskQualityFormItem.java:126
 msgid "percentage should be greater than 0% and less than 100%"
 msgstr ""
 
@@ -3437,37 +3466,37 @@ msgstr ""
 msgid "The field name must be unique."
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:49
-msgid "Default max value"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:36
 msgid "Add criterion requirement"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:50
+msgid "Default max value"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:146
 msgid "Percentage of estimated budget hours / hours consumed"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:500
-msgid "Automatic"
-msgstr ""
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/CriterionBandboxFinder.java:44
 msgid "Criterion Name"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:500
+msgid "Automatic"
+msgstr ""
+
 #: 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/webapp/expensesheet/expenseSheet.zul:127
-#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:167
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:667
+#: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:48
+#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:23
 #: 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
+#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:127
+#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:167
 msgid "Task"
 msgstr ""
 
@@ -3475,13 +3504,13 @@ msgstr ""
 msgid "LibrePlan: Change password"
 msgstr ""
 
-#: 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/orders/labels/AssignedLabelsController.java:90
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:130
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:125
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:308
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:168
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:174
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/ProjectStatusReportController.java:188
 msgid "please, select a label"
 msgstr ""
 
@@ -3501,13 +3530,13 @@ msgstr ""
 msgid "cost assignment with end date before start date"
 msgstr ""
 
-#: 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 ""
 
-#: libreplan-webapp/src/main/webapp/resources/_criterions.zul:40
 #: libreplan-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:27
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:46
+#: libreplan-webapp/src/main/webapp/resources/_criterions.zul:40
 msgid "Criterion name"
 msgstr ""
 
@@ -3528,10 +3557,10 @@ msgstr ""
 msgid "Spreading progress"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:32
 #: 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/orders/_orderElementDetails.zul:32
 msgid "Task name"
 msgstr ""
 
@@ -3539,20 +3568,20 @@ msgstr ""
 msgid "cost assignment's resource not specified"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementBandboxFinder.java:51
 #: 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/common/components/finders/OrderElementBandboxFinder.java:51
+#: libreplan-webapp/src/main/webapp/myaccount/_myTasksArea.zul:31
+#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:138
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:47
 #: 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 ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:371
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:463
 msgid ""
 "Starting date cannot be empty because there is a task with constraint \"as "
 "soon as possible\""
@@ -3562,6 +3591,10 @@ msgstr ""
 msgid "last material sequence code not specified"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/TwoWaySelector.java:79
+msgid "Unassigned"
+msgstr ""
+
 #: 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 "
@@ -3572,11 +3605,7 @@ msgstr ""
 msgid "Extra"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/TwoWaySelector.java:79
-msgid "Unassigned"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1587
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1763
 msgid "It already exists a end date with the same date. "
 msgstr ""
 
@@ -3606,13 +3635,13 @@ msgstr ""
 msgid "Disabled"
 msgstr ""
 
-#: 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/planner/order/OrderPlanningModel.java:737
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:353
 msgid "Earned value"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:35
 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:163
+#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:35
 msgid "Overtime Effort"
 msgstr ""
 
@@ -3630,10 +3659,6 @@ msgstr ""
 msgid "Normal Effort"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java:138
-msgid "{0} reassignations finished"
-msgstr ""
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/TreeElementOperationsController.java:254
 msgid ""
 "Templates can only be created out of existent tasks.You are trying to create "
@@ -3641,6 +3666,10 @@ msgid ""
 "Please save your project before proceeding."
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java:138
+msgid "{0} reassignations finished"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:66
 #: libreplan-webapp/src/main/webapp/myaccount/_personalTimesheetsArea.zul:33
 msgid "Total work"
@@ -3687,11 +3716,11 @@ msgstr ""
 msgid "New entry"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:278
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:102
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:111
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:138
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:160
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:278
 msgid "Resources Load"
 msgstr ""
 
@@ -3715,7 +3744,7 @@ msgstr ""
 msgid "Authentication"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:88
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:89
 msgid "Select language"
 msgstr ""
 
@@ -3723,8 +3752,8 @@ msgstr ""
 msgid "Appropriative allocation"
 msgstr ""
 
-#: 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 ""
 
@@ -3736,17 +3765,17 @@ msgstr ""
 msgid "Calendar Exception Day"
 msgstr ""
 
-#: 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/workingArrangementsPerOrderReport.zul:125
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:117
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:147
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:117
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:155
+#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:105
 msgid "Filter by criteria"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/templates/_advances.zul:37
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:43
+#: libreplan-webapp/src/main/webapp/templates/_advances.zul:37
 msgid "Max value"
 msgstr ""
 
@@ -3781,12 +3810,12 @@ msgstr ""
 msgid "Period"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/templates/_advances.zul:38
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:47
+#: libreplan-webapp/src/main/webapp/templates/_advances.zul:38
 msgid "Spread"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1021
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1023
 msgid "Disabled because of it contains more than one hours group"
 msgstr ""
 
@@ -3798,7 +3827,7 @@ msgstr ""
 msgid "Select start date"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:882
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1017
 msgid "Removed {0}"
 msgstr ""
 
@@ -3808,7 +3837,7 @@ msgid ""
 "resources"
 msgstr ""
 
-#: 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 ""
 
@@ -3820,12 +3849,12 @@ msgstr ""
 msgid "description value: the timesheet has not assigned the description field"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:140
 #: libreplan-webapp/src/main/webapp/profiles/_editProfile.zul:60
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:140
 msgid "Role name"
 msgstr ""
 
-#: 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 ""
 
@@ -3837,13 +3866,13 @@ msgstr ""
 msgid "The same resource is assigned twice inside an interval"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:75
-msgid "Value is not valid, the precision value must not be empty"
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:904
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:543
+msgid "h"
 msgstr ""
 
-#: 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"
+#: 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 ""
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:363
@@ -3874,7 +3903,7 @@ msgstr ""
 msgid "Assign selected items"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:468
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:513
 msgid "init"
 msgstr ""
 
@@ -3898,7 +3927,7 @@ msgstr ""
 msgid "Calculated progress measurements cannot be removed"
 msgstr ""
 
-#: 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 ""
 
@@ -3932,9 +3961,9 @@ msgstr ""
 msgid "Estimation deviation on completed tasks"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/planner/order.zul:108
 #: 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 ""
 
@@ -3942,12 +3971,12 @@ msgstr ""
 msgid "MonteCarlo method"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -3957,23 +3986,23 @@ msgstr ""
 
 #: 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/webapp/subcontract/customerCommunications.zul:56
+#: libreplan-webapp/src/main/webapp/orders/_list.zul:32
 #: 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
+#: libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul:56
 msgid "Customer"
 msgstr ""
 
-#: 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
-msgid "Hours type"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:43
 msgid "Show money cost bar"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:847
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:34
+#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:116
+msgid "Hours type"
+msgstr ""
+
 #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:211
 msgid "criterion type name not specified"
 msgstr ""
@@ -3996,16 +4025,28 @@ msgstr ""
 msgid "Add Exception"
 msgstr ""
 
-#: 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/webapp/myaccount/settings.zul:123
+msgid "Projects view filtering"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/montecarlo/MonteCarloController.java:159
+#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:310
 #: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:128
 #: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:148
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:310
-#: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:193
-#: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:197
-#: 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/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/criterionrequirements/AssignedCriterionRequirementController.java:320
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:173
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:439
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1674
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1698
+#: 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/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
@@ -4016,88 +4057,88 @@ msgstr ""
 #: 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/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/criterion/CriterionTreeController.java:135
 #: 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/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/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/common/ConfigurationController.java:751
+#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:110
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignController.java:143
+#: 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/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/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/users/UserCRUDController.java:483
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:234
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:997
+#: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.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/workreports/workReport.zul:161
 #: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:34
+#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:38
+#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:52
+#: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:35
+#: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:41
 #: 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/workreports/workReport.zul:161
 #: 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/_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/resources/worker/_edition.zul:53
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:60
+#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:39
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:43
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:50
+#: libreplan-webapp/src/main/webapp/profiles/_editProfile.zul:43
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:43
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:54
 #: 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/users/_editUser.zul:50
 msgid "cannot be empty"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:159
+msgid "Dedication"
+msgstr ""
+
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:147
+msgid "Resources load since"
+msgstr ""
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:425
 msgid "Effort must be greater than zero"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:50
-#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:54
 #: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:40
 #: libreplan-webapp/src/main/webapp/orders/_orderFilter.zul:27
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:50
+#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:54
 msgid "from"
 msgstr ""
 
@@ -4114,27 +4155,27 @@ msgstr ""
 msgid "Assigned Label Type cannot be repeated in a Timesheet Template."
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:444
 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:143
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:444
 msgid ""
 "Hours types are empty. Please, create some hours types before proceeding"
 msgstr ""
 
-#: 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 ""
 
+#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:35
+msgid "Expand taskgroups"
+msgstr ""
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkRelationshipsController.java:155
 msgid ""
 "Time period contains non valid data. Ending data must be older than starting "
 "date"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:35
-msgid "Expand taskgroups"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/common/layout/template.zul:141
 msgid "The admin's account password remains the default one. This is insecure"
 msgstr ""
@@ -4165,113 +4206,113 @@ msgstr ""
 msgid "Variance At Completion"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/common/layout/template.zul:171
-msgid "default password was not changed"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/unittypes/unitTypes.zul:21
 msgid "LibrePlan: Material Units"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/common/layout/template.zul:171
+msgid "default password was not changed"
+msgstr ""
+
 #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java:256
 msgid "Virtual resources cannot be bound to any user"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:498
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:499
 msgid "Code sequence is already in use and cannot be updated"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/SettingsController.java:96
-msgid "Settings saved"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:71
 msgid "Exportation options"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/SettingsController.java:133
+msgid "Settings saved"
+msgstr ""
+
 #: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:94
 msgid "effort not specified"
 msgstr ""
 
-#: 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/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/BaseCalendarBandboxFinder.java:46
+#: 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/LabelBandboxFinder.java:52
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ExternalCompanyBandboxFinder.java:51
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:935
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:443
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:94
+#: 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/labels/_listLabelTypes.zul:26
-#: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:27
-#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:31
-#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:50
-#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:26
 #: libreplan-webapp/src/main/webapp/materials/materials.zul:60
+#: libreplan-webapp/src/main/webapp/scenarios/_list.zul:27
+#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:32
+#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:52
+#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:66
+#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:76
+#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:27
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:110
+#: libreplan-webapp/src/main/webapp/orders/_list.zul:28
+#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:36
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:78
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:51
+#: 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/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/calendars/_list.zul:28
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:40
+#: 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/_editMachine.zul:56
+#: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:35
+#: 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/_edition.zul:39
+#: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:41
+#: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:34
+#: libreplan-webapp/src/main/webapp/myaccount/_myTasksArea.zul:27
+#: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:27
+#: libreplan-webapp/src/main/webapp/templates/_listTemplates.zul:26
+#: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:48
+#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:62
+#: 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/externalcompanies/_listExternalCompanies.zul:26
+#: libreplan-webapp/src/main/webapp/profiles/_editProfile.zul:40
+#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:46
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:50
+#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:31
 #: 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/typeofworkhours/_editTypeOfWorkHours.zul:52
+#: libreplan-webapp/src/main/webapp/unittypes/_editUnitType.zul:51
+#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:96
+#: 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/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
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:98
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.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/projectStatusReport.zul:87
+#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:127
 msgid "Name"
 msgstr ""
 
@@ -4297,14 +4338,14 @@ msgstr ""
 msgid "a label can not be assigned twice in the same branch"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:224
-msgid "Day of week"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:22
 msgid "Companies List"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:224
+msgid "Day of week"
+msgstr ""
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:441
 msgid "Normal resource assignment"
 msgstr ""
@@ -4317,10 +4358,14 @@ msgstr ""
 msgid "indirect progress assignments should have different types"
 msgstr ""
 
-#: 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 ""
 
+#: libreplan-webapp/src/main/webapp/common/help2.zul:19
+msgid "LibrePlan: Help"
+msgstr ""
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:451
 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:39
 msgid "Hours Worked Per Resource"
@@ -4335,7 +4380,7 @@ msgstr ""
 msgid "Category name"
 msgstr ""
 
-#: 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 ""
 
@@ -4351,14 +4396,14 @@ msgstr ""
 msgid "MonteCarlo"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:49
-msgid "Duration"
-msgstr ""
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:593
 msgid "Exception: {0}"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:49
+msgid "Duration"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/myaccount/changePassword.zul:54
 msgid "Password settings"
 msgstr ""
@@ -4367,7 +4412,7 @@ msgstr ""
 msgid "Delete expense sheet \"{0}\". Are you sure?"
 msgstr ""
 
-#: 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/components/schedulingStateToggler.zul:29
 msgid "Schedule"
 msgstr ""
@@ -4380,8 +4425,8 @@ msgstr ""
 msgid "a personal expense sheet must have the same resource in all the lines"
 msgstr ""
 
-#: 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 ""
 
@@ -4393,9 +4438,9 @@ msgstr ""
 msgid "This progress type cannot cannot be removed"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:85
 #: 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 ""
 
@@ -4403,7 +4448,7 @@ msgstr ""
 msgid "Allocation: [{0},{1}]"
 msgstr ""
 
-#: 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 ""
 
@@ -4411,14 +4456,14 @@ msgstr ""
 msgid "Changes saved"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1261
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1399
 msgid "See scheduling"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationController.java:107
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationController.java:110
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:338
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:341
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationController.java:107
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationController.java:110
 msgid "Progress measurements"
 msgstr ""
 
@@ -4426,13 +4471,10 @@ msgstr ""
 msgid "Add measure"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:52
-msgid "Found resources"
-msgstr ""
-
-#: libreplan-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:27
-#: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:30
-msgid "Relationship"
+#: 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 ""
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractCommand.java:53
@@ -4441,10 +4483,13 @@ msgstr ""
 msgid "Subcontract"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/planner/main.zul:57
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:41
-#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:121
-msgid "End"
+#: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:52
+msgid "Found resources"
+msgstr ""
+
+#: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:30
+#: libreplan-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:27
+msgid "Relationship"
 msgstr ""
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:482
@@ -4467,14 +4512,14 @@ msgstr ""
 msgid "criterion type not specified"
 msgstr ""
 
-#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/TypeOfWorkHours.java:103
-msgid "default price not specified"
-msgstr ""
-
 #: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:134
 msgid "timesheet template not specified"
 msgstr ""
 
+#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/TypeOfWorkHours.java:103
+msgid "default price not specified"
+msgstr ""
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:220
 msgid "Timesheet removed successfully"
 msgstr ""
@@ -4483,22 +4528,26 @@ msgstr ""
 msgid "Users List"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:27
-#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:56
-#: libreplan-webapp/src/main/webapp/orders/_edition.zul:55
-msgid "Task quality forms"
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:106
+msgid "Has bound resource"
 msgstr ""
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/UserBandboxFinder.java:47
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:144
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:53
 #: 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 ""
 
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:106
-msgid "Has bound resource"
+#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:56
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:55
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:27
+msgid "Task quality forms"
+msgstr ""
+
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:125
+msgid "Label filter"
 msgstr ""
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1235
@@ -4527,7 +4576,7 @@ msgstr ""
 msgid "Quality form cannot be removed as it is spreading progress"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:712
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:713
 msgid "It can not be deleted. At least one sequence is necessary."
 msgstr ""
 
@@ -4552,8 +4601,8 @@ msgid "please, select a quality form"
 msgstr ""
 
 #: 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/resources/worker/WorkerCRUDController.java:1065
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:134
 msgid "Edit {0}: {1}"
 msgstr ""
 
@@ -4573,7 +4622,7 @@ msgstr ""
 msgid "Constraint"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:390
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:482
 msgid ""
 "Deadline cannot be empty because there is a task with constraint \"as late "
 "as possible\""
@@ -4593,22 +4642,22 @@ msgstr ""
 msgid "Customer reference"
 msgstr ""
 
-#: 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/orders/OrderCRUDController.java:828
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:973
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1031
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1040
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1067
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:397
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:407
 #: 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/planner/order/SaveCommandBuilder.java:363
+#: 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/limitingresources/LimitingResourcesController.java:331
 msgid "Information"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:931
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1066
 msgid "Sorry, you do not have permissions to access this project"
 msgstr ""
 
@@ -4616,7 +4665,7 @@ msgstr ""
 msgid "END"
 msgstr ""
 
-#: 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 ""
 
@@ -4628,14 +4677,14 @@ msgstr ""
 msgid "New hours group "
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:462
-msgid "Assign element to queue manually"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:47
 msgid "Please remember that only saved changes will be printed"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:462
+msgid "Assign element to queue manually"
+msgstr ""
+
 #: libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialCategory.java:254
 msgid "There are repeated material codes"
 msgstr ""
@@ -4652,27 +4701,27 @@ msgstr ""
 msgid "Heading"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:22
-msgid "Criterion Types List"
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:274
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:528
+msgid "must be after the previous date"
 msgstr ""
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:459
 msgid "Do you want to split the material assignment {0}?"
 msgstr ""
 
-#: 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 ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:112
-msgid "Hours Type"
+#: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:22
+msgid "Criterion Types List"
 msgstr ""
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/montecarlo/MonteCarloController.java:192
 msgid "Percentages should sum 100"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:112
+msgid "Hours Type"
+msgstr ""
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:81
 msgid "Total task budget"
 msgstr ""
@@ -4685,14 +4734,14 @@ msgstr ""
 msgid "Some criterion satisfactions overlap in time"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:50
-msgid "Value last progress measurement"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:21
 msgid "LibrePlan: Materials Needs At Date"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:50
+msgid "Value last progress measurement"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:44
 msgid "Worker assignments"
 msgstr ""
@@ -4706,18 +4755,18 @@ msgstr ""
 #: 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/calendars/BaseCalendarModel.java:603
 #: 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 ""
 
-#: 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 ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementInExpenseSheetBandboxFinder.java:45
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderInExpenseSheetBandboxFinder.java:44
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementInExpenseSheetBandboxFinder.java:45
 msgid "Project name (Project code)"
 msgstr ""
 
@@ -4725,30 +4774,30 @@ msgstr ""
 msgid "items cannot be checked until the previous items are checked before."
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:38
-msgid "Code "
-msgstr ""
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:595
 msgid "Exception: {0} (Inh)"
 msgstr ""
 
-#: 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
-msgid "Password confirmation"
+#: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:38
+msgid "Code "
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:72
-msgid "Indent selected task"
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:153
+#: libreplan-webapp/src/main/webapp/myaccount/changePassword.zul:77
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:72
+msgid "Password confirmation"
 msgstr ""
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:665
 msgid "Regular"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:39
+#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:72
+msgid "Indent selected task"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/common/configuration.zul:88
+#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:39
 msgid "Show progress"
 msgstr ""
 
@@ -4772,16 +4821,16 @@ msgstr ""
 msgid "LibrePlan: Machines"
 msgstr ""
 
-#: 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 ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:403
 #: 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/orders/criterionrequirements/AssignedCriterionRequirementController.java:403
 #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:628
 msgid "Error"
 msgstr ""
@@ -4827,7 +4876,7 @@ msgstr ""
 msgid "My tasks"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:729
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:832
 msgid "Show all elements"
 msgstr ""
 
@@ -4848,7 +4897,11 @@ msgstr ""
 msgid "SPREAD"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:709
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:247
+msgid "Budgeted Cost Work Scheduled"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:717
 msgid "Changes applied"
 msgstr ""
 
@@ -4856,10 +4909,6 @@ msgstr ""
 msgid "Adapting planning according to timesheets"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:247
-msgid "Budgeted Cost Work Scheduled"
-msgstr ""
-
 #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:471
 msgid "criterion type does not allow hierarchy"
 msgstr ""
@@ -4922,23 +4971,23 @@ msgstr ""
 msgid "Cost Variance"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:625
-#: 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
-msgid "Total"
-msgstr ""
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:403
 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:66
 msgid "User Accounts"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:625
+#: 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/orders/_edition.zul:182
+#: libreplan-webapp/src/main/webapp/myaccount/_expensesArea.zul:33
+#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:92
+#: 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
+msgid "Total"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:158
 msgid "Effort"
 msgstr ""
@@ -4984,15 +5033,15 @@ msgstr ""
 msgid "Select destination"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:203
-msgid "cannot be empty or less than zero"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/planner/order.zul:89
 #: libreplan-webapp/src/main/webapp/planner/order.zul:95
 msgid "Check consolidated progresses"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:203
+msgid "cannot be empty or less than zero"
+msgstr ""
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractController.java:287
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractController.java:290
 msgid "Update task end"
@@ -5007,20 +5056,20 @@ msgstr ""
 msgid "Default price"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:827
-msgid "Periods available depend on resources' calendar."
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:39
 msgid "Estimated hours"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:827
+msgid "Periods available depend on resources' calendar."
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:121
 msgid "Apply tab changes"
 msgstr ""
 
-#: 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 ""
 
@@ -5032,15 +5081,19 @@ msgstr ""
 msgid " (%d tasks)"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:82
+msgid "Hours groups"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:259
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:751
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1470
 #: 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/order/OrderPlanningController.java:375
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:320
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:145
 msgid "must be lower than end date"
 msgstr ""
 
@@ -5048,10 +5101,6 @@ msgstr ""
 msgid "Week {0}"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:82
-msgid "Hours groups"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/common/configuration.zul:116
 msgid ""
 "Enable/Disable autocomplete property in login form, if the admin password is "
@@ -5070,16 +5119,16 @@ msgstr ""
 msgid "Work Hours Types List"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:764
-msgid "Consolidated progress cannot be removed"
-msgstr ""
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:945
 msgid ""
 "Spread progress cannot be changed if there is a consolidation in any "
 "progress assignment"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:764
+msgid "Consolidated progress cannot be removed"
+msgstr ""
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/GlobalProgressChart.java:63
 msgid "By critical path duration"
 msgstr ""
@@ -5104,7 +5153,7 @@ msgstr ""
 msgid "Show dependencies"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:310
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:402
 msgid "Schedule from start to deadline"
 msgstr ""
 
@@ -5114,9 +5163,9 @@ msgstr ""
 msgid "Estimated days"
 msgstr ""
 
-#: 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/workingProgressPerTaskReport.zul:53
 msgid "Reference date"
 msgstr ""
 
@@ -5128,7 +5177,7 @@ msgstr ""
 msgid "quality form item percentage not specified"
 msgstr ""
 
-#: 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 ""
 
@@ -5136,14 +5185,6 @@ msgstr ""
 msgid "quality form name not specified"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:81
-msgid "Progress Evolution"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/Type.java:55
-msgid "From chosen date"
-msgstr ""
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:259
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:727
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1257
@@ -5152,11 +5193,23 @@ msgid ""
 "subcontractor company."
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/Type.java:55
+msgid "From chosen date"
+msgstr ""
+
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:81
+msgid "Progress Evolution"
+msgstr ""
+
 #: 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 ""
 
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:91
+msgid "Original"
+msgstr ""
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:250
 msgid "CV"
 msgstr ""
@@ -5166,10 +5219,6 @@ msgstr ""
 msgid "My dashboard"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:91
-msgid "Original"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/common/layout/template.zul:179
 msgid ""
 "A new version of LibrePlan is available. Please check next link for more "
@@ -5185,10 +5234,8 @@ msgstr ""
 msgid "Not indentable"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:341
-msgid ""
-"The original workable days value {0} cannot be modified as it has "
-"consolidations"
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:74
+msgid "Resource allocation type"
 msgstr ""
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:259
@@ -5200,8 +5247,10 @@ msgstr ""
 msgid "List of materials for all categories (select one to filter)"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:74
-msgid "Resource allocation type"
+#: 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 ""
 
 #: libreplan-webapp/src/main/webapp/common/layout/login.zul:104
@@ -5239,7 +5288,7 @@ msgstr ""
 msgid "Reception date"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:21
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:22
 msgid "LibrePlan: Settings"
 msgstr ""
 
@@ -5247,12 +5296,12 @@ msgstr ""
 msgid "worker's surname not specified"
 msgstr ""
 
-#: 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 ""
 
-#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:80
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:81
 msgid "Application settings"
 msgstr ""
 
@@ -5272,11 +5321,11 @@ msgstr ""
 msgid "the same task is marked as finished by more than one timesheet line"
 msgstr ""
 
-#: 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 ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:745
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:746
 msgid "Select entity, please"
 msgstr ""
 
@@ -5292,8 +5341,8 @@ msgstr ""
 msgid "total not specified"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:48
 #: libreplan-webapp/src/main/webapp/myaccount/_expensesArea.zul:38
+#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:48
 msgid "Last expense"
 msgstr ""
 
@@ -5318,9 +5367,9 @@ msgstr ""
 msgid "Only one sequence per entity can be active at the same time."
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:274
 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:953
 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1213
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:274
 msgid "Please, select an item"
 msgstr ""
 
@@ -5345,18 +5394,18 @@ msgstr ""
 msgid "Project: {0}"
 msgstr ""
 
-#: 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 ""
-
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:94
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:97
 msgid "Non Consolidated"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:363
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:153
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:114
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:60
+msgid "Timesheets"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:43
 msgid "From date"
 msgstr ""
@@ -5365,14 +5414,14 @@ msgstr ""
 msgid "Task of project"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:229
-msgid "Hours cost"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/planner/reassign.zul:34
 msgid "Reassigning type"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:229
+msgid "Hours cost"
+msgstr ""
+
 #: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:308
 msgid "There are repeated description values in the timesheet "
 msgstr ""
@@ -5400,9 +5449,9 @@ msgstr ""
 msgid "Incorrect authentication"
 msgstr ""
 
-#: 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
+#: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:42
+#: libreplan-webapp/src/main/webapp/planner/editTask.zul:53
 msgid "Edit task"
 msgstr ""
 
@@ -5436,8 +5485,8 @@ msgstr ""
 msgid "Capacity must be a positive integer number"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:94
 #: libreplan-webapp/src/main/webapp/calendars/calendars.zul:48
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:94
 msgid "Save and Continue"
 msgstr ""
 
@@ -5470,7 +5519,7 @@ msgstr ""
 msgid "The name of the label is empty."
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:366
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:458
 msgid "Starting date cannot be empty in forward mode"
 msgstr ""
 
@@ -5506,7 +5555,7 @@ msgstr ""
 msgid "Personal timesheet \"{0}\" saved"
 msgstr ""
 
-#: 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 ""
 
@@ -5524,14 +5573,14 @@ msgstr ""
 msgid "Timesheet templates"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:715
 #: 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/webapp/dashboard/_costStatus.zul:42
 msgid "Hours invested"
 msgstr ""
 
-#: 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-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:305
 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:48
 msgid "Templates"
 msgstr ""
@@ -5540,15 +5589,15 @@ msgstr ""
 msgid "Authorization"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:363
-msgid "Project saved"
-msgstr ""
-
 #: 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 ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:363
+msgid "Project saved"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:49
 msgid "task"
 msgstr ""
@@ -5571,6 +5620,7 @@ msgstr ""
 msgid "quality form item position not specified"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:606
 #: 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 "Machines"
@@ -5585,7 +5635,7 @@ msgid "Destination scenario"
 msgstr ""
 
 #: 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 ""
 
@@ -5597,8 +5647,8 @@ msgstr ""
 msgid "Both"
 msgstr ""
 
-#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityForm.java:389
 #: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/TaskQualityForm.java:171
+#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityForm.java:389
 msgid "report progress not specified"
 msgstr ""
 
@@ -5606,18 +5656,18 @@ msgstr ""
 msgid "Filter by"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:48
-msgid "Up to date"
-msgstr ""
-
 #: 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 ""
 
+#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:48
+msgid "Up to date"
+msgstr ""
+
 #: 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
+#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:33
 msgid "Category"
 msgstr ""
 
@@ -5625,15 +5675,15 @@ msgstr ""
 msgid "LibrePlan: Progress Types"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:27
+msgid "Category data"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:79
 #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:203
 msgid "[generic all workers]"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:27
-msgid "Category data"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:97
 msgid "Search"
 msgstr ""
@@ -5654,22 +5704,22 @@ msgstr ""
 msgid "Add New Complementary Field"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:244
-msgid "Work weeks list"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:38
 msgid "Source scenario"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/resources/criterions/criterions.zul:24
-msgid "LibrePlan: Criteria"
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:244
+msgid "Work weeks list"
 msgstr ""
 
 #: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:23
 msgid "LibrePlan: Transfer Projects Between Scenarios"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/resources/criterions/criterions.zul:24
+msgid "LibrePlan: Criteria"
+msgstr ""
+
 #: libreplan-business/src/main/java/org/libreplan/business/planner/entities/Task.java:171
 msgid "element associated to a task must be not empty"
 msgstr ""
@@ -5679,8 +5729,8 @@ msgstr ""
 msgid "%"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/resources/worker/_calendar.zul:50
 #: libreplan-webapp/src/main/webapp/resources/machine/_calendar.zul:43
+#: libreplan-webapp/src/main/webapp/resources/worker/_calendar.zul:50
 msgid "Remove calendar"
 msgstr ""
 
@@ -5693,32 +5743,32 @@ msgid "Communications From Customers"
 msgstr ""
 
 #: 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/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/webapp/expensesheet/expenseSheet.zul:95
-#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:151
-#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:171
+#: 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/java/org/libreplan/web/common/components/finders/ResourceAllocationFilterEnum.java:30
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:33
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:86
 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:185
 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:81
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul: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
+#: 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
 msgid "Resource"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/UserDashboardController.java:71
-msgid "Expense sheet \"{0}\" saved"
-msgstr ""
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:71
 msgid "Total task hours"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/UserDashboardController.java:71
+msgid "Expense sheet \"{0}\" saved"
+msgstr ""
+
 #: 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
 msgid "Virtual Workers"
@@ -5767,22 +5817,22 @@ msgstr ""
 msgid "Specific Allocations"
 msgstr ""
 
-#: 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 ""
-
 #: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:221
 msgid "progress type marked as quality form but is updatable"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:64
-msgid "Move selected task up"
+#: 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 ""
 
 #: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:27
 msgid "Select criteria set or specific resources for allocation"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:64
+msgid "Move selected task up"
+msgstr ""
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:350
 msgid "Create copy"
 msgstr ""
@@ -5791,25 +5841,25 @@ msgstr ""
 msgid "Company data"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:145
+msgid "Label Type fields"
+msgstr ""
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:274
 msgid "Users"
 msgstr ""
 
-#: 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 ""
 
-#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:145
-msgid "Label Type fields"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:105
 msgid "Hours Management"
 msgstr ""
 
-#: 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/templates/entities/OrderLineTemplate.java:170
 msgid "last hours group sequence code not specified"
 msgstr ""
 
@@ -5817,15 +5867,15 @@ msgstr ""
 msgid "label type name is already in use"
 msgstr ""
 
+#: 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 ""
+
 #: 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 ""
 
-#: 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 ""
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/NewAllocationSelector.java:94
 msgid "specific allocation"
 msgstr ""
@@ -5874,6 +5924,10 @@ msgstr ""
 msgid "Imputed hours calculation"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1721
+msgid "Regular project"
+msgstr ""
+
 #: 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
@@ -5886,19 +5940,11 @@ msgstr ""
 msgid "Exit session"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:30
-msgid "Statistics list "
-msgstr ""
-
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:113
-msgid "Apply filter to"
-msgstr ""
-
-#: 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/resources/criterions/_edition.zul:61
+#: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:28
 #: libreplan-webapp/src/main/webapp/typeofworkhours/_listTypesOfWorkHours.zul:29
 #: libreplan-webapp/src/main/webapp/typeofworkhours/_editTypeOfWorkHours.zul:66
 msgid "Enabled"
@@ -5908,6 +5954,14 @@ msgstr ""
 msgid "Please, enter a valid effort"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:30
+msgid "Statistics list "
+msgstr ""
+
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:113
+msgid "Apply filter to"
+msgstr ""
+
 #: 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 "
@@ -5928,12 +5982,12 @@ msgstr ""
 msgid "Timesheets Templates"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:117
-msgid "Any"
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:1143
+msgid "Confirm user edition"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:1129
-msgid "Confirm user edition"
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:117
+msgid "Any"
 msgstr ""
 
 #: libreplan-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:47
@@ -5965,23 +6019,23 @@ msgid "Date format is wrong. Please, use the following format: {0}"
 msgstr ""
 
 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:114
-#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:39
-#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:104
-#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:182
-#: 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/profiles/_editProfile.zul:72
-#: libreplan-webapp/src/main/webapp/unittypes/unitTypes.zul:42
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:186
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:234
+#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:38
 #: 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/resources/worker/_edition.zul:186
+#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:136
+#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:39
+#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:127
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:104
+#: libreplan-webapp/src/main/webapp/profiles/_editProfile.zul:72
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:134
 #: libreplan-webapp/src/main/webapp/typeofworkhours/_editTypeOfWorkHours.zul:79
+#: libreplan-webapp/src/main/webapp/unittypes/unitTypes.zul:42
+#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:182
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:186
 msgid "Save & Continue"
 msgstr ""
 
@@ -5989,40 +6043,40 @@ msgstr ""
 msgid "Subcategory names must be unique."
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:21
-msgid "LibrePlan: Work And Progress Per Project"
-msgstr ""
-
-#: 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 ""
-
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:145
 msgid "Scheduling mode"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:34
+#: libreplan-webapp/src/main/webapp/orders/_orderFilter.zul:23
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:54
+#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:83
+#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:51
+#: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:29
+msgid "Filter"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/common/configuration.zul:78
 msgid "Personal timesheets peridocity"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:21
+msgid "LibrePlan: Work And Progress Per Project"
+msgstr ""
+
 #: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskMilestone.java:121
 msgid "a milestone cannot have a task associated"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1329
+msgid "Assignment function will be changed. Are you sure?"
+msgstr ""
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:81
 msgid ""
 "Invalid value. Precission value must be lower than the Default Max value."
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1321
-msgid "Assignment function will be changed. Are you sure?"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:127
 msgid "Total expenses"
 msgstr ""
@@ -6031,7 +6085,7 @@ msgstr ""
 msgid "Assigned locations"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/orders/_orderFilter.zul:31
+#: libreplan-webapp/src/main/webapp/orders/_orderFilter.zul:33
 msgid "subelements"
 msgstr ""
 
@@ -6041,8 +6095,8 @@ msgstr ""
 msgid "Subcontracting date"
 msgstr ""
 
-#: 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 ""
 
@@ -6058,15 +6112,15 @@ msgstr ""
 msgid "ACWP"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:457
+msgid "cannot be empty."
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/users/_listUsers.zul:31
 #: libreplan-webapp/src/main/webapp/users/_editUser.zul:89
 msgid "Authentication type"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:457
-msgid "cannot be empty."
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/common/layout/_customMenu.zul:55
 msgid "START"
 msgstr ""
@@ -6079,10 +6133,10 @@ msgstr ""
 msgid "Subcontrated task"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:68
-#: libreplan-webapp/src/main/webapp/planner/order.zul:70
-#: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:75
 #: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:86
+#: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:75
+#: libreplan-webapp/src/main/webapp/planner/order.zul:70
+#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:68
 msgid "Back"
 msgstr ""
 
@@ -6090,8 +6144,8 @@ msgstr ""
 msgid "Our company username"
 msgstr ""
 
-#: 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 ""
 
@@ -6103,8 +6157,8 @@ msgstr ""
 msgid "Cancel and return"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:34
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:31
+#: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:34
 msgid "Assign quality form"
 msgstr ""
 
@@ -6112,14 +6166,14 @@ msgstr ""
 msgid "Planning Configuration"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:388
-msgid "Delete item {0}. Are you sure?"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:188
 msgid "Calculated budget"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:388
+msgid "Delete item {0}. Are you sure?"
+msgstr ""
+
 #: libreplan-business/src/main/java/org/libreplan/business/orders/entities/Order.java:356
 msgid "the project must have a deadline"
 msgstr ""
@@ -6150,17 +6204,17 @@ msgstr ""
 msgid "Length"
 msgstr ""
 
-#: 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 ""
-
 #: 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 ""
 
+#: 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 ""
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioCRUDController.java:133
 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:333
 msgid "Create derived"
@@ -6170,7 +6224,7 @@ msgstr ""
 msgid "Label Types"
 msgstr ""
 
-#: 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 ""
 
@@ -6178,10 +6232,6 @@ msgstr ""
 msgid "must be a real positive number"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:33
-msgid "No Allocations have been done"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:111
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:122
 msgid "Total hours task"
@@ -6193,6 +6243,10 @@ msgid ""
 "order to fix it as soon as possible."
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:33
+msgid "No Allocations have been done"
+msgstr ""
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:442
 msgid "Removed calendar \"{0}\""
 msgstr ""
@@ -6205,7 +6259,7 @@ msgstr ""
 msgid "LibrePlan: Timesheets Templates"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1066
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1205
 msgid "Create project"
 msgstr ""
 
@@ -6213,28 +6267,28 @@ msgstr ""
 msgid "Next"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/myaccount/_personalTimesheetsArea.zul:22
-msgid "Personal timesheets"
-msgstr ""
-
 #: 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 ""
 
+#: libreplan-webapp/src/main/webapp/myaccount/_personalTimesheetsArea.zul:22
+msgid "Personal timesheets"
+msgstr ""
+
 #: 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"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/planner/editTask.zul:67
-msgid "Normal resource allocation"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:36
 msgid "Human hours per machine working hour within configuration unit"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/planner/editTask.zul:67
+msgid "Normal resource allocation"
+msgstr ""
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/users/OrderAuthorizationController.java:109
 msgid ""
 "Could not add those authorizations to user {0} because they were already "
@@ -6245,24 +6299,24 @@ msgstr ""
 msgid "Root calendar"
 msgstr ""
 
-#: 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 "yes"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:113
-msgid "Select gap"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/common/configuration.zul:302
 msgid "Port"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:113
+msgid "Select gap"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:64
 msgid "Date Finish"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:455
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:544
 msgid "From"
 msgstr ""
 
@@ -6270,7 +6324,7 @@ msgstr ""
 msgid "At least one hours group is needed for each task"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:556
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:659
 msgid "Resources or criteria"
 msgstr ""
 
@@ -6299,9 +6353,9 @@ msgstr ""
 msgid "There are repeated material category codes"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:36
-#: 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/_costCategoryAssignment.zul:25
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:36
 msgid "Cost category assignment"
 msgstr ""
 
@@ -6325,17 +6379,17 @@ msgstr ""
 msgid "You have exceeded the maximum limit of resources"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:766
-msgid "The field name must be unique and not empty"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/resources/search/allocation_selector_combo.zul:25
 msgid "Select criteria or resources"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:26
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:766
+msgid "The field name must be unique and not empty"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:24
 #: libreplan-webapp/src/main/webapp/orders/_orderFilter.zul:24
+#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:26
 msgid "Select required criteria set and press filter button"
 msgstr ""
 
@@ -6356,9 +6410,9 @@ msgid "Estimate To Complete"
 msgstr ""
 
 #: 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/templates/_materialAssignmentsBox.zul:30
 msgid "Unit type"
 msgstr ""
 
@@ -6414,20 +6468,20 @@ msgstr ""
 msgid "format sequence code invalid. It must not contain '_'"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:76
 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:200
 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:227
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:76
 msgid "Extra Effort"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:269
-msgid "Already exists other label with the same name"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:60
 msgid "Move selected task down"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:269
+msgid "Already exists other label with the same name"
+msgstr ""
+
 #: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityForm.java:101
 msgid "quality form type not specified"
 msgstr ""
@@ -6449,30 +6503,30 @@ msgstr ""
 msgid "Optimistic"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:250
-msgid "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/HoursWorkedPerWorkerController.java:313
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:174
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:179
+msgid "Label has already been added."
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:136
-#: 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
-msgid "Label has already been added."
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:250
+msgid "SV"
 msgstr ""
 
 #: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:122
 msgid "Add task"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:714
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:682
 #: 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/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/_editOrderElement.zul:48
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:46
+#: libreplan-webapp/src/main/webapp/myaccount/_myTasksArea.zul:38
+#: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:49
+#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:45
 #: libreplan-webapp/src/main/webapp/dashboard/_dashboardfororder.zul:58
 msgid "Progress"
 msgstr ""
@@ -6498,9 +6552,9 @@ msgstr ""
 msgid "Calendars"
 msgstr ""
 
+#: 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
 #: 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
 msgid "value not specified"
 msgstr ""
 
@@ -6510,7 +6564,7 @@ msgid ""
 "quality form"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:457
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:546
 msgid "To"
 msgstr ""
 
@@ -6518,19 +6572,19 @@ msgstr ""
 msgid "options"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1202
-msgid "Queue-based assignment"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/resources/_criterions.zul:32
 msgid "Show only current satisfied criteria"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1210
+msgid "Queue-based assignment"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:92
 msgid "Latest date"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:385
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:477
 msgid "Deadline cannot be empty in backwards mode"
 msgstr ""
 
@@ -6565,12 +6619,12 @@ msgstr ""
 msgid "Planned start"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:62
-#: 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
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:62
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:98
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:62
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:73
 msgid "Filter by projects"
 msgstr ""
 
@@ -6578,8 +6632,8 @@ msgstr ""
 msgid "Task Quality Form item name not specified"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:44
 #: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:43
+#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:45
 #: libreplan-webapp/src/main/webapp/common/configuration.zul:258
 msgid "Active"
 msgstr ""
@@ -6588,13 +6642,13 @@ msgstr ""
 msgid "Inherited labels"
 msgstr ""
 
-#: 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 ""
 
-#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:55
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:249
+#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:55
 msgid "Delivery date"
 msgstr ""
 
@@ -6624,49 +6678,49 @@ msgstr ""
 msgid "Project name"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:55
-msgid "Precision"
-msgstr ""
-
 #: 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 ""
 
+#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:56
+msgid "Precision"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:942
+msgid "Efforts"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:41
 msgid "Show all reported hours"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:934
-msgid "Efforts"
-msgstr ""
-
-#: 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/web/planner/tabs/OrdersTabCreator.java:106
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/OrdersTabCreator.java:143
 msgid "Projects List"
 msgstr ""
 
-#: 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/templates/entities/OrderLineTemplate.java:235
 msgid "budget not specified"
 msgstr ""
 
 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:56
-#: 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/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/_projectDetails.zul:53
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:88
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:45
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:163
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:60
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:60
+#: 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/resources/worker/_edition.zul:55
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:44
 #: libreplan-webapp/src/main/webapp/typeofworkhours/_editTypeOfWorkHours.zul:46
+#: libreplan-webapp/src/main/webapp/unittypes/_editUnitType.zul:45
+#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:81
 msgid "Generate code"
 msgstr ""
 
@@ -6674,7 +6728,7 @@ msgstr ""
 msgid "Scheduling state"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:44
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:45
 msgid "Personal Data"
 msgstr ""
 
@@ -6682,19 +6736,27 @@ msgstr ""
 msgid "LibrePlan: Hours Worked Per Resource"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/users/users.zul:23
-msgid "LibrePlan: User Accounts"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:213
 msgid "Budget in money"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:601
+msgid "Machine"
+msgstr ""
+
 #: 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 ""
 
+#: libreplan-webapp/src/main/webapp/users/users.zul:23
+msgid "LibrePlan: User Accounts"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:200
+msgid "Criterion Type"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/common/error.zul:54
 #: libreplan-webapp/src/main/webapp/common/event_error.zul:50
 msgid "Reload"
@@ -6704,39 +6766,39 @@ msgstr ""
 msgid "Profiles authorization"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:71
-msgid "Assignation"
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:99
+msgid "Planning charts expanded"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:98
-msgid "Planning charts expanded"
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:71
+msgid "Assignation"
 msgstr ""
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:702
 msgid "Inh"
 msgstr ""
 
-#: 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 ""
-
 #: libreplan-business/src/main/java/org/libreplan/business/expensesheet/entities/ExpenseSheetLine.java:92
 msgid "value must be greater or equal than 0"
 msgstr ""
 
+#: 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 ""
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeModel.java:397
 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesModel.java:311
 msgid "name cannot be empty"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:466
-msgid "task is already marked as finished in another timesheet"
-msgstr ""
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java:190
 msgid "Doing {0} reassignations"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:466
+msgid "task is already marked as finished in another timesheet"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/common/configuration.zul:232
 msgid "Select entity"
 msgstr ""
@@ -6749,17 +6811,17 @@ msgstr ""
 msgid "Go to worker edition window"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:40
-msgid "Worked hours"
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:129
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:142
+msgid "Invalid Spread values. At least one value should be true"
 msgstr ""
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:95
 msgid "Invalid value. Default Max Value cannot be empty"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:129
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:142
-msgid "Invalid Spread values. At least one value should be true"
+#: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:40
+msgid "Worked hours"
 msgstr ""
 
 #: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:604
@@ -6775,24 +6837,24 @@ msgstr ""
 msgid "last sequence code not specified"
 msgstr ""
 
-#: 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 ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:663
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:664
 msgid ""
 "Invalid format prefix. Format prefix cannot be empty, contain '_' or contain "
 "whitespaces."
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:191
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:91
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:161
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:184
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:213
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:164
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:183
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:223
+#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:173
+msgid "if the report is not opened automatically"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:55
 msgid "Create template from selected task"
 msgstr ""
@@ -6806,11 +6868,11 @@ msgstr ""
 msgid "Completed: {0}%"
 msgstr ""
 
-#: 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/myaccount/changePassword.zul:49
 #: 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
 msgid "Password"
 msgstr ""
 
@@ -6819,19 +6881,23 @@ msgstr ""
 msgid "Observations"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:939
-msgid "Edit project"
-msgstr ""
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:909
 msgid "Hours cost: {0}, Expenses cost: {1}"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/templates/_advances.zul:27
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1074
+msgid "Edit project"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:25
+#: libreplan-webapp/src/main/webapp/templates/_advances.zul:27
 msgid "Progress assignments"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:205
+msgid "Criterion Types"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:252
 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:274
 msgid "Valid from"
@@ -6841,12 +6907,12 @@ msgstr ""
 msgid "Month"
 msgstr ""
 
-#: 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 ""
 
-#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:32
 #: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:58
+#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:32
 msgid "Color"
 msgstr ""
 
@@ -6862,27 +6928,31 @@ msgstr ""
 msgid "Expense lines"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:311
-msgid "Delete {0} \"{1}\". Are you sure?"
-msgstr ""
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:441
 msgid "Only {0} resources per day were achieved for current allocation"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/planner/editTask.zul:81
-#: libreplan-webapp/src/main/webapp/planner/reassign.zul:48
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:313
+msgid "Delete {0} \"{1}\". Are you sure?"
+msgstr ""
+
+#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:88
+#: libreplan-webapp/src/main/webapp/common/layout/template.zul:102
 #: 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/orders/_projectDetails.zul:88
+#: libreplan-webapp/src/main/webapp/planner/reassign.zul:48
+#: libreplan-webapp/src/main/webapp/planner/main.zul:66
+#: libreplan-webapp/src/main/webapp/planner/editTask.zul:81
 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:133
-#: libreplan-webapp/src/main/webapp/common/layout/template.zul:102
 msgid "Accept"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:81
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:969
+msgid ""
+"Cannot delete timesheet template. There are some timesheets bound to it."
+msgstr ""
+
 #: 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
@@ -6891,21 +6961,17 @@ msgstr ""
 #: 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/externalcompanies/_editExternalCompany.zul:81
 msgid "Example: {0}"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:969
-msgid ""
-"Cannot delete timesheet template. There are some timesheets bound to it."
-msgstr ""
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:617
 msgid "Please, select type of exception"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:86
 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:69
 #: libreplan-webapp/src/main/webapp/common/configuration.zul:218
+#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:86
 msgid "cannot be negative or empty"
 msgstr ""
 
@@ -6948,8 +7014,8 @@ msgstr ""
 msgid "Priority"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:47
-msgid "Apply changes and continue edition"
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:246
+msgid "Money spent"
 msgstr ""
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:221
@@ -6957,56 +7023,56 @@ msgstr ""
 msgid "Infinitely Over Assignable"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:246
-msgid "Money spent"
+#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:47
+msgid "Apply changes and continue edition"
 msgstr ""
 
 #: 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/common/components/finders/OrderFilterEnum.java:31
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:85
+#: 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/labels/_listLabelTypes.zul:27
-#: 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/scenarios/_edition.zul:51
+#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:65
+#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:75
+#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:26
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:109
+#: libreplan-webapp/src/main/webapp/orders/_list.zul:29
+#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:48
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:83
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:40
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:78
 #: 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
-#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:65
-#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:75
-#: 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/machine/_listMachines.zul:37
 #: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:26
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:71
 #: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:42
-#: 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/resources/worker/_list.zul:38
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:50
+#: libreplan-webapp/src/main/webapp/myaccount/_myTasksArea.zul:29
+#: libreplan-webapp/src/main/webapp/myaccount/_expensesArea.zul:31
+#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:28
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:38
 #: 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
+#: 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
 msgid "Code"
 msgstr ""
 
@@ -7038,15 +7104,15 @@ msgid "unit name not specified"
 msgstr ""
 
 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:81
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:54
+#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:37
+#: libreplan-webapp/src/main/webapp/myaccount/_myTasksArea.zul:33
 #: 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/machine/_machineConfigurationUnits.zul:54
+#: 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
 msgid "Start date"
 msgstr ""
 
@@ -7058,24 +7124,24 @@ msgstr ""
 msgid "Operation cannot be done"
 msgstr ""
 
-#: 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/orders/_orderElementDetails.zul:65
+#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeComponent.java:90
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:168
+#: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:65
+#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:82
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:62
+#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:54
 msgid "Budget"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:38
-msgid "Unit name"
-msgstr ""
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:750
 msgid "Progress that are reported by quality forms cannot be modified"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:38
+msgid "Unit name"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/common/configuration.zul:23
 msgid "LibrePlan: Main Settings"
 msgstr ""
@@ -7084,6 +7150,11 @@ msgstr ""
 msgid "default label not specified"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:32
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:57
+msgid "Write"
+msgstr ""
+
 #: 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
@@ -7092,19 +7163,14 @@ msgstr ""
 msgid "Project code"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:32
-#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:57
-msgid "Write"
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:501
+msgid "Assign element to queue automatically"
 msgstr ""
 
 #: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:39
 msgid "Number of applications"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:501
-msgid "Assign element to queue automatically"
-msgstr ""
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:427
 msgid "Confirm worker edition"
 msgstr ""
@@ -7129,7 +7195,7 @@ msgstr ""
 msgid "Task Code"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:111
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:112
 msgid "Project view"
 msgstr ""
 
@@ -7139,33 +7205,33 @@ msgstr ""
 msgid "Probability %"
 msgstr ""
 
-#: 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/planner/_legendLoadChartOrder.zul:49
-msgid "Load"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/resources/_criterions.zul:27
 #: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:28
 msgid "New criterion"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:702
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:957
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:736
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:352
+#: libreplan-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:49
+msgid "Load"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:719
 #: 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/orders/_edition.zul:98
+#: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:59
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:62
+#: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:36
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:67
+#: libreplan-webapp/src/main/webapp/myaccount/_expensesArea.zul:29
+#: libreplan-webapp/src/main/webapp/templates/_listTemplates.zul:31
+#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:77
 #: 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/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/orders/_orderElementDetails.zul:59
-#: libreplan-webapp/src/main/webapp/orders/_edition.zul:98
+#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:54
+#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:87
 msgid "Description"
 msgstr ""
 
@@ -7178,7 +7244,7 @@ msgstr ""
 msgid "Apply"
 msgstr ""
 
-#: 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 ""
 
@@ -7191,19 +7257,19 @@ msgstr ""
 msgid "Selected node"
 msgstr ""
 
-#: 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 ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:514
-msgid "Code cannot be empty."
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:216
 msgid "Project type"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:310
+#: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:514
+msgid "Code cannot be empty."
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:402
 msgid "Forward"
 msgstr ""
 
@@ -7211,20 +7277,28 @@ msgstr ""
 msgid "Invalid date. Date must be unique for this Progress Assignment"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:43
-msgid "Number of finished applications"
-msgstr ""
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:469
 msgid "Invalid queue element"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:43
+msgid "Number of finished applications"
+msgstr ""
+
 #: 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 ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:269
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:116
+#: libreplan-webapp/src/main/webapp/common/layout/login.zul:75
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:63
+#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:167
+msgid "User"
+msgstr ""
+
 #: 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
@@ -7235,24 +7309,16 @@ msgstr ""
 msgid "At least one HoursGroup is needed"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:269
-#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:63
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:116
-#: libreplan-webapp/src/main/webapp/common/layout/login.zul:75
-#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:167
-msgid "User"
-msgstr ""
-
-#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:71
-msgid "Interacts with applications"
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:295
+msgid "Virtual worker"
 msgstr ""
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceInExpenseSheetBandboxFinder.java:44
 msgid "Resource name (Resource code)"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:295
-msgid "Virtual worker"
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:71
+msgid "Interacts with applications"
 msgstr ""
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionController.java:343
@@ -7263,18 +7329,14 @@ msgstr ""
 msgid "Multiple values per resource"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:60
 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:59
+#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:60
 msgid "Split"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:443
-msgid "Communications"
-msgstr ""
-
-#: 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 ""
 
@@ -7282,6 +7344,10 @@ msgstr ""
 msgid "Cannot remove the predefined calendar exception day \"{0}\""
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:443
+msgid "Communications"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/common/layout/login.zul:123
 msgid "Supported Chrome, Firefox, Safari and Epiphany browsers"
 msgstr ""
@@ -7290,20 +7356,20 @@ msgstr ""
 msgid "Task deadline violations"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:53
+#: libreplan-webapp/src/main/webapp/orders/_list.zul:30
+#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:58
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:127
+#: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:45
+#: libreplan-webapp/src/main/webapp/resources/_criterions.zul:41
+#: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:28
+#: 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/orders/_orderElementDetails.zul:45
-#: libreplan-webapp/src/main/webapp/orders/_edition.zul:127
-#: libreplan-webapp/src/main/webapp/orders/_list.zul:30
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:53
 msgid "Starting date"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:913
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:914
 msgid ""
 "Periocity cannot be changed because there is already any personal timesheet "
 "stored"
@@ -7317,57 +7383,57 @@ msgstr ""
 msgid "Load 100%"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:908
 msgid "New project version"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:166
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:66
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:137
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:159
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:190
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:139
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:158
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:196
+#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:148
+msgid "Format"
+msgstr ""
+
 #: libreplan-business/src/main/java/org/libreplan/business/labels/entities/LabelType.java:110
 msgid "label names must be unique inside a label type"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:551
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1367
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:366
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/Util.java:656
 #: 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/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/criterions/_edition.zul:28
+#: 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/resources/criterions/_list.zul:40
 #: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:33
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:28
+#: 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/advance/_editAdvanceTypes.zul:26
+#: libreplan-webapp/src/main/webapp/templates/_listTemplates.zul:46
+#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:43
+#: libreplan-webapp/src/main/webapp/profiles/_listProfiles.zul:36
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:26
+#: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:47
 #: libreplan-webapp/src/main/webapp/typeofworkhours/_listTypesOfWorkHours.zul:45
+#: libreplan-webapp/src/main/webapp/unittypes/_editUnitType.zul:25
 msgid "Edit"
 msgstr ""
 
@@ -7379,14 +7445,14 @@ msgstr ""
 msgid "Click the following link to return to home page: "
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:20
-msgid "LibrePlan: Project Status Report"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/myaccount/changePassword.zul:71
 msgid "New password"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:20
+msgid "LibrePlan: Project Status Report"
+msgstr ""
+
 #: 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"
@@ -7419,14 +7485,14 @@ msgid "Tree {0} sucessfully flattened"
 msgstr ""
 
 #: 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
+#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:31
 msgid "Unit price"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:288
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1286
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:333
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1424
 msgid "Not enough permissions to create templates"
 msgstr ""
 
@@ -7436,33 +7502,33 @@ msgid ""
 "Invalid value. Value must be greater than the value of previous progress."
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:102
+#: libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul:55
+#: libreplan-webapp/src/main/webapp/subcontract/subcontractorCommunications.zul:55
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:66
+msgid "Project Code"
+msgstr ""
+
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:250
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:278
 #: 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
 msgid "Communication date"
 msgstr ""
 
-#: 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
-msgid "Project Code"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/planner/reassign.zul:30
 msgid "Reassigning"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:651
-msgid "{0} already assigned to resource allocation list"
-msgstr ""
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/FilterCommunicationEnum.java:28
 msgid "Not Reviewed"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:655
+msgid "{0} already assigned to resource allocation list"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:22
 msgid "Label Types List"
 msgstr ""
@@ -7472,45 +7538,45 @@ msgid "Hours type for personal timesheets"
 msgstr ""
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/QualityFormBandboxFinder.java:51
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/LabelBandboxFinder.java:52
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceInExpenseSheetBandboxFinder.java:44
 #: 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/expensesheet/expenseSheet.zul:56
-#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:91
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/LabelBandboxFinder.java:52
+#: libreplan-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:28
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:42
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:48
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:47
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:153
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:79
 #: 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/calendars/_edition.zul:47
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:113
+#: 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/criterions/_list.zul:27
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:44
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:83
+#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:62
+#: libreplan-webapp/src/main/webapp/templates/_advances.zul:36
+#: libreplan-webapp/src/main/webapp/templates/_listTemplates.zul:25
+#: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:49
 #: 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/expensesheet/expenseSheet.zul:56
+#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:91
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:105
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:146
 #: 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/_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/reports/workingProgressPerTaskReport.zul:97
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.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/projectStatusReport.zul:86
+#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:126
 msgid "Type"
 msgstr ""
 
@@ -7563,8 +7629,8 @@ msgstr ""
 msgid "delivery date not specified"
 msgstr ""
 
-#: 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 ""
 
@@ -7578,20 +7644,20 @@ msgstr ""
 msgid "Task name (Task code)"
 msgstr ""
 
-#: 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 ""
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:656
 msgid "Edit Timesheet"
 msgstr ""
 
+#: 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: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/ResourceFilterEnum.java:29
+#: 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/OrderFilterEnum.java:30
+msgid "Criterion"
+msgstr ""
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:104
 msgid "unl"
 msgstr ""
@@ -7611,12 +7677,12 @@ msgstr ""
 #: 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/orders/entities/OrderElement.java:533
 #: 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/costcategories/entities/CostCategory.java:193
 #: 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/templates/entities/OrderElementTemplate.java:373
 msgid "name not specified"
 msgstr ""
 
@@ -7638,7 +7704,7 @@ msgstr ""
 msgid "Queue-based Resources Planning"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:137
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:147
 msgid "Create project from Template"
 msgstr ""
 
@@ -7646,22 +7712,22 @@ msgstr ""
 msgid "Previous"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:436
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1253
+msgid "Values already sent to the customer. Values cannot be changed "
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:481
 msgid ""
 "Value is not valid.\n"
 " Code cannot contain chars like '_' \n"
 " and should not be empty"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1253
-msgid "Values already sent to the customer. Values cannot be changed "
-msgstr ""
-
 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/OrderAuthorization.java:43
 msgid "an authorization type must be set"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:869
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1004
 msgid ""
 "This project is a subcontracted project. If you delete it, you won't be able "
 "to report progress anymore. Are you sure?"
@@ -7680,30 +7746,30 @@ msgstr ""
 #: 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/orders/_edition.zul:268
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:35
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:166
+#: libreplan-webapp/src/main/webapp/resources/_criterions.zul:29
+#: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:30
 #: 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/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:66
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:86
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:127
+#: 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/reports/completedEstimatedHoursPerTask.zul:86
 #: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:127
-#: 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/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/orders/_listOrderElementCriterionRequirements.zul:35
-#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:166
-#: libreplan-webapp/src/main/webapp/orders/_edition.zul:268
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:86
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.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/projectStatusReport.zul:75
+#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:115
 msgid "Add"
 msgstr ""
 
@@ -7717,12 +7783,22 @@ msgid "timesheet template name is already being used"
 msgstr ""
 
 #: libreplan-webapp/src/main/webapp/materials/materials.zul:50
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:122
 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:43
 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:79
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:122
 msgid "Unselect"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:103
+#: libreplan-webapp/src/main/webapp/orders/_list.zul:31
+#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:64
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:132
+#: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:52
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:46
+#: libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul:54
+msgid "Deadline"
+msgstr ""
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:284
 msgid "Queue-based Resources"
 msgstr ""
@@ -7731,18 +7807,8 @@ msgstr ""
 msgid "Hours Group at {0}"
 msgstr ""
 
-#: 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/_orderElementDetails.zul:52
-#: libreplan-webapp/src/main/webapp/orders/_edition.zul:132
-#: libreplan-webapp/src/main/webapp/orders/_list.zul:31
-msgid "Deadline"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:241
 #: 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 ""
 
@@ -7807,8 +7873,8 @@ msgstr ""
 msgid "effort is not properly calculated based on clock"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:65
 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:33
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:65
 msgid "Status"
 msgstr ""
 
@@ -7816,41 +7882,41 @@ msgstr ""
 msgid "from {0}"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:114
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:115
 msgid "Resource load view"
 msgstr ""
 
-#: 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 ""
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:606
 msgid "Could not save the new calendar"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:56
-msgid "Quality form type"
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:70
+#: 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/templates/TemplatesTreeComponent.java:81
+#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:36
+#: libreplan-webapp/src/main/webapp/orders/_list.zul:34
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:154
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:35
+#: 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/_tabPanelLimitingResourceAllocation.zul:72
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:34
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:82
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:54
+#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:37
+msgid "Hours"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:318
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:320
 msgid "{0} \"{1}\" deleted"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:56
+msgid "Quality form type"
+msgstr ""
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:364
 msgid " hours"
 msgstr ""
@@ -7877,19 +7943,15 @@ msgstr ""
 msgid "LDAP Roles (separated by ;)"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_allocationConfiguration.zul:27
-#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:78
-msgid "Allocation configuration"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:732
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:786
 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"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:61
-msgid "Subcontract price"
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_allocationConfiguration.zul:27
+#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:78
+msgid "Allocation configuration"
 msgstr ""
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:434
@@ -7901,17 +7963,21 @@ msgstr ""
 msgid "The page that you are requesting does not exist."
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:61
+msgid "Subcontract price"
+msgstr ""
+
 #: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:496
 msgid ""
 "In personal timesheets, all timesheet lines should be in the same period"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:835
-msgid "Resources per day are zero"
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1136
+msgid "Value is not valid in current list of Hours Group"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1134
-msgid "Value is not valid in current list of Hours Group"
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:835
+msgid "Resources per day are zero"
 msgstr ""
 
 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:38
@@ -7922,8 +7988,8 @@ msgstr ""
 msgid "Total extra per day"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:32
 #: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:31
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:32
 msgid "Assigned criteria"
 msgstr ""
 
@@ -7952,50 +8018,50 @@ msgid "Could not save the scenario"
 msgstr ""
 
 #: 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 ""
 
-#: 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 ""
-
 #: 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 ""
 
+#: 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 ""
+
 #: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/ExternalCompany.java:149
 msgid "company name must be unique. Company name already used"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1005
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:315
+#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:378
 #: 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
 msgid "Confirm"
 msgstr ""
 
 #: 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/workreports/_listWorkReportTypes.zul:56
 #: 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/criterions/_list.zul:52
+#: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:45
+#: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:33
+#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:56
+#: libreplan-webapp/src/main/webapp/profiles/_listProfiles.zul:50
+#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:40
+#: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:58
 #: libreplan-webapp/src/main/webapp/typeofworkhours/_listTypesOfWorkHours.zul:58
+#: libreplan-webapp/src/main/webapp/unittypes/_listUnitTypes.zul:32
+#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:38
 msgid "Create"
 msgstr ""
 
@@ -8012,16 +8078,16 @@ msgstr ""
 msgid "List of materials for category: {0}"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/adaptplanning/AdaptPlanningCommand.java:60
-msgid "Adapt planning according to timesheets"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/orders/_ordersTab.zul:36
 msgid "Cancel edition"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:32
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/adaptplanning/AdaptPlanningCommand.java:60
+msgid "Adapt planning according to timesheets"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:32
+#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:32
 msgid "Total price"
 msgstr ""
 
@@ -8033,9 +8099,9 @@ msgstr ""
 msgid "Warning: Not editing from home page of bound users"
 msgstr ""
 
+#: 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 ""
 
@@ -8048,101 +8114,85 @@ msgstr ""
 msgid "start date not specified"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:46
+msgid "Labels without inheritance"
+msgstr ""
+
 #: 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/expensesheet/ExpenseSheetCRUDController.java:212
-#: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:412
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java: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/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/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:1383
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1818
 #: 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/workreports/WorkReportTypeCRUDController.java:341
+#: 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/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/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:973
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractController.java:210
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:648
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionController.java:408
+#: 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/tree/TreeController.java:1160
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1166
 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:42
-#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:48
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:99
 #: libreplan-webapp/src/main/webapp/materials/materials.zul:107
+#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:56
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:67
+#: libreplan-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:102
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:79
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:91
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:212
+#: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:42
 #: 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/criterions/_list.zul:45
-#: libreplan-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:102
-#: 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/resources/worker/_workRelationships.zul:46
+#: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:52
+#: libreplan-webapp/src/main/webapp/templates/_listTemplates.zul:51
+#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:57
+#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:48
+#: libreplan-webapp/src/main/webapp/profiles/_listProfiles.zul:41
+#: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:52
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:116
 #: libreplan-webapp/src/main/webapp/typeofworkhours/_listTypesOfWorkHours.zul:50
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:169
+#: 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/reports/completedEstimatedHoursPerTask.zul:107
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:148
+#: 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/workingProgressPerTaskReport.zul:107
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.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/projectStatusReport.zul:96
+#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:136
 msgid "Delete"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:46
-msgid "Labels without inheritance"
-msgstr ""
-
-#: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/CommunicationType.java:31
-msgid "New project"
-msgstr ""
-
-#: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/CommunicationType.java:31
-msgid "Progress Update"
-msgstr ""
-
-#: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/CommunicationType.java:32
-msgid "Update Delivering Date"
-msgstr ""
-
-#: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/CommunicationType.java:32
-msgid "End date update"
-msgstr ""
-
 #: libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialStatusEnum.java:32
 msgid "RECEIVED"
 msgstr ""
@@ -8163,6 +8213,88 @@ msgstr ""
 msgid "CANCELED"
 msgstr ""
 
+#: 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
+msgid "Cannot spread two progress in the same task"
+msgstr ""
+
+#: 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 ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:1158
+msgid "Quality form already exists"
+msgstr ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/HoursGroup.java:208
+msgid "Total percentage should be less than 100%"
+msgstr ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/CriterionRequirementHandler.java:539
+msgid "The criterion already exists into another task"
+msgstr ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/SchedulingState.java:366
+msgid "Fully scheduled"
+msgstr ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/SchedulingState.java:368
+msgid "Partially scheduled"
+msgstr ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/SchedulingState.java:370
+msgid "Unscheduled"
+msgstr ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/SchedulingState.java:376
+msgid "F"
+msgstr ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/SchedulingState.java:378
+msgid "P"
+msgstr ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/SchedulingState.java:380
+msgid "U"
+msgstr ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:35
+msgid "PRE-SALES"
+msgstr ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:36
+msgid "OFFERED"
+msgstr ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:37
+msgid "OUTSOURCED"
+msgstr ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:38
+msgid "ACCEPTED"
+msgstr ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:39
+msgid "STARTED"
+msgstr ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:40
+msgid "ON HOLD"
+msgstr ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:41
+msgid "FINISHED"
+msgstr ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:42
+msgid "CANCELLED"
+msgstr ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:43
+msgid "STORED"
+msgstr ""
+
 #: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/PositionInWorkReportEnum.java:34
 msgid "heading"
 msgstr ""
@@ -8183,20 +8315,104 @@ msgstr ""
 msgid "Number of assigned hours and time"
 msgstr ""
 
-#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityFormType.java:29
-msgid "by percentage"
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:31
+msgid "red (default)"
 msgstr ""
 
-#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityFormType.java:29
-msgid "by items"
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:32
+msgid "green"
 msgstr ""
 
-#: libreplan-business/src/main/java/org/libreplan/business/settings/entities/Language.java:36
-msgid "Use browser language configuration"
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:33
+msgid "blue"
 msgstr ""
 
-#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/StretchesFunction.java:410
-msgid "Stretches must sum 100%"
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:34
+msgid "cyan"
+msgstr ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:35
+msgid "magenta"
+msgstr ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:36
+msgid "yellow"
+msgstr ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:37
+msgid "black"
+msgstr ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:38
+msgid "orange"
+msgstr ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:39
+msgid "purple"
+msgstr ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/Capacity.java:172
+msgid "unlimited"
+msgstr ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:207
+msgid "[generic all machines]"
+msgstr ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/ResourceEnum.java:32
+msgid "WORKER"
+msgstr ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/ResourceEnum.java:33
+msgid "MACHINE"
+msgstr ""
+
+#: 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 ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/common/entities/ProgressType.java:37
+msgid "Progress with all tasks by hours"
+msgstr ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/common/entities/ProgressType.java:38
+msgid "Progress with critical path tasks by hours"
+msgstr ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/common/entities/ProgressType.java:39
+msgid "Progress with critical path tasks by duration"
+msgstr ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/common/entities/PersonalTimesheetsPeriodicityEnum.java:35
+msgid "Monthly"
+msgstr ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/common/entities/PersonalTimesheetsPeriodicityEnum.java:66
+msgid "Twice-monthly"
+msgstr ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/common/entities/PersonalTimesheetsPeriodicityEnum.java:123
+msgid "Weekly"
+msgstr ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderLineTemplate.java:156
+msgid "Line"
+msgstr ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:29
+msgid "In progress"
+msgstr ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:30
+msgid "Pending"
+msgstr ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:31
+msgid "Blocked"
+msgstr ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:32
+msgid "Ready to start"
 msgstr ""
 
 #: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:76
@@ -8215,24 +8431,8 @@ msgstr ""
 msgid "Sigmoid"
 msgstr ""
 
-#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractState.java:32
-msgid "Pending initial send"
-msgstr ""
-
-#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractState.java:33
-msgid "Pending update delivering date"
-msgstr ""
-
-#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractState.java:34
-msgid "Failed sent"
-msgstr ""
-
-#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractState.java:34
-msgid "Failed update"
-msgstr ""
-
-#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractState.java:35
-msgid "Success sent"
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskDeadlineViolationStatusEnum.java:35
+msgid "Deadline violated"
 msgstr ""
 
 #: libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:95
@@ -8263,24 +8463,28 @@ msgstr ""
 msgid "Resource is not available according to task's calendar"
 msgstr ""
 
-#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:29
-msgid "In progress"
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/StretchesFunction.java:410
+msgid "Stretches must sum 100%"
 msgstr ""
 
-#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:30
-msgid "Pending"
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractState.java:32
+msgid "Pending initial send"
 msgstr ""
 
-#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:31
-msgid "Blocked"
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractState.java:33
+msgid "Pending update delivering date"
 msgstr ""
 
-#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:32
-msgid "Ready to start"
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractState.java:34
+msgid "Failed sent"
 msgstr ""
 
-#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskDeadlineViolationStatusEnum.java:35
-msgid "Deadline violated"
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractState.java:34
+msgid "Failed update"
+msgstr ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractState.java:35
+msgid "Success sent"
 msgstr ""
 
 #: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:31
@@ -8311,12 +8515,40 @@ msgstr ""
 msgid "A queue dependency has to have an origin different from destiny"
 msgstr ""
 
-#: libreplan-business/src/main/java/org/libreplan/business/users/entities/OrderAuthorizationType.java:33
-msgid "Read authorization"
+#: libreplan-business/src/main/java/org/libreplan/business/settings/entities/Language.java:36
+msgid "Use browser language configuration"
 msgstr ""
 
-#: libreplan-business/src/main/java/org/libreplan/business/users/entities/OrderAuthorizationType.java:34
-msgid "Write authorization"
+#: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/CommunicationType.java:31
+msgid "New project"
+msgstr ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/CommunicationType.java:31
+msgid "Progress Update"
+msgstr ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/CommunicationType.java:32
+msgid "Update Delivering Date"
+msgstr ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/CommunicationType.java:32
+msgid "End date update"
+msgstr ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityFormType.java:29
+msgid "by percentage"
+msgstr ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityFormType.java:29
+msgid "by items"
+msgstr ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:360
+msgid "Database"
+msgstr ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:360
+msgid "LDAP"
 msgstr ""
 
 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:37
@@ -8375,176 +8607,10 @@ msgstr ""
 msgid "Materials Needs At Date Report"
 msgstr ""
 
-#: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:345
-msgid "Database"
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/OrderAuthorizationType.java:33
+msgid "Read authorization"
 msgstr ""
 
-#: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:345
-msgid "LDAP"
-msgstr ""
-
-#: libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderLineTemplate.java:156
-msgid "Line"
-msgstr ""
-
-#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:31
-msgid "red (default)"
-msgstr ""
-
-#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:32
-msgid "green"
-msgstr ""
-
-#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:33
-msgid "blue"
-msgstr ""
-
-#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:34
-msgid "cyan"
-msgstr ""
-
-#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:35
-msgid "magenta"
-msgstr ""
-
-#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:36
-msgid "yellow"
-msgstr ""
-
-#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:37
-msgid "black"
-msgstr ""
-
-#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:38
-msgid "orange"
-msgstr ""
-
-#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:39
-msgid "purple"
-msgstr ""
-
-#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/Capacity.java:172
-msgid "unlimited"
-msgstr ""
-
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:207
-msgid "[generic all machines]"
-msgstr ""
-
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/ResourceEnum.java:32
-msgid "WORKER"
-msgstr ""
-
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/ResourceEnum.java:33
-msgid "MACHINE"
-msgstr ""
-
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:33
-msgid "PRE-SALES"
-msgstr ""
-
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:34
-msgid "OFFERED"
-msgstr ""
-
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:35
-msgid "OUTSOURCED"
-msgstr ""
-
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:36
-msgid "ACCEPTED"
-msgstr ""
-
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:37
-msgid "STARTED"
-msgstr ""
-
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:38
-msgid "ON HOLD"
-msgstr ""
-
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:39
-msgid "FINISHED"
-msgstr ""
-
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:40
-msgid "CANCELLED"
-msgstr ""
-
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:41
-msgid "STORED"
-msgstr ""
-
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/SchedulingState.java:366
-msgid "Fully scheduled"
-msgstr ""
-
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/SchedulingState.java:368
-msgid "Partially scheduled"
-msgstr ""
-
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/SchedulingState.java:370
-msgid "Unscheduled"
-msgstr ""
-
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/SchedulingState.java:376
-msgid "F"
-msgstr ""
-
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/SchedulingState.java:378
-msgid "P"
-msgstr ""
-
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/SchedulingState.java:380
-msgid "U"
-msgstr ""
-
-#: 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
-msgid "Cannot spread two progress in the same task"
-msgstr ""
-
-#: 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 ""
-
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:1158
-msgid "Quality form already exists"
-msgstr ""
-
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/HoursGroup.java:208
-msgid "Total percentage should be less than 100%"
-msgstr ""
-
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/CriterionRequirementHandler.java:539
-msgid "The criterion already exists into another task"
-msgstr ""
-
-#: libreplan-business/src/main/java/org/libreplan/business/common/entities/PersonalTimesheetsPeriodicityEnum.java:35
-msgid "Monthly"
-msgstr ""
-
-#: libreplan-business/src/main/java/org/libreplan/business/common/entities/PersonalTimesheetsPeriodicityEnum.java:66
-msgid "Twice-monthly"
-msgstr ""
-
-#: libreplan-business/src/main/java/org/libreplan/business/common/entities/PersonalTimesheetsPeriodicityEnum.java:123
-msgid "Weekly"
-msgstr ""
-
-#: libreplan-business/src/main/java/org/libreplan/business/common/entities/ProgressType.java:37
-msgid "Progress with all tasks by hours"
-msgstr ""
-
-#: libreplan-business/src/main/java/org/libreplan/business/common/entities/ProgressType.java:38
-msgid "Progress with critical path tasks by hours"
-msgstr ""
-
-#: libreplan-business/src/main/java/org/libreplan/business/common/entities/ProgressType.java:39
-msgid "Progress with critical path tasks by duration"
-msgstr ""
-
-#: libreplan-business/src/main/java/org/libreplan/business/common/daos/EntitySequenceDAO.java:82
-msgid "Entity Sequence cannot be deleted. Entity Sequence already in use"
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/OrderAuthorizationType.java:34
+msgid "Write authorization"
 msgstr ""
diff --git a/libreplan-webapp/src/main/resources/i18n/zh.po b/libreplan-webapp/src/main/resources/i18n/zh.po
new file mode 100644
index 000000000..c3b04fd56
--- /dev/null
+++ b/libreplan-webapp/src/main/resources/i18n/zh.po
@@ -0,0 +1,8552 @@
+# 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.
+# This file is distributed under the same license as the LibrePlan package.
+#
+# Translators:
+# Swanson Chan <lacidophilin@yahoo.com>, 2013.
+msgid ""
+msgstr ""
+"Project-Id-Version: libreplan-1.3.3\n"
+"Report-Msgid-Bugs-To: http://bugs.libreplan.org/\n"
+"POT-Creation-Date: 2012-12-07 13:59+0100\n"
+"PO-Revision-Date: 2013-03-12 07:35+0000\n"
+"Last-Translator: Swanson Chan <lacidophilin@yahoo.com>\n"
+"Language-Team: 中文\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java:452
+msgid "currency code not specified"
+msgstr "不指定货币代码"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:495
+msgid "You do not have permissions to create new users"
+msgstr "您没有权限创建新用户"
+
+#: libreplan-webapp/src/main/webapp/dashboard/_dashboardfororder.zul:92
+msgid "Availability ratio"
+msgstr "空置率"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:378
+msgid "Group path"
+msgstr "集团路径"
+
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1150
+msgid ""
+"resource cost category assignments codes must be unique inside a resource"
+msgstr "资源成本类别内的资源分配代码必须是唯一的"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/OrderAuthorizationController.java:92
+msgid "No authorizations were added because you did not select any."
+msgstr "没有选择任何授权。"
+
+#: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:88
+#: libreplan-webapp/src/main/webapp/common/layout/_customMenu.zul:71
+#: libreplan-webapp/src/main/webapp/common/layout/login.zul:59
+msgid "en"
+msgstr "zh"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:161
+msgid "must be after end date"
+msgstr "必须结束日期后"
+
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:204
+msgid "Origin"
+msgstr "起源"
+
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:180
+msgid "Create exception"
+msgstr "创建例外"
+
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:43
+msgid "Select report data"
+msgstr "选择报表数据"
+
+#: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:60
+msgid "Create Virtual Worker"
+msgstr "创建虚拟工作人员"
+
+#: 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/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/planner/taskpanels/_tabPanelSubcontract.zul:110
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:127
+#: 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/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/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/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/orders/_listOrderElementAdvances.zul:50
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:70
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:57
+#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:143
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:266
+msgid "Operations"
+msgstr "操作"
+
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:41
+msgid "Basic data"
+msgstr "基本数据"
+
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:84
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:112
+msgid "Select"
+msgstr "选择"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:498
+msgid "Project Status"
+msgstr "项目状态"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:345
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:180
+msgid "Start date cannot be empty"
+msgstr "开始日期不能为空"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:340
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:35
+#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:48
+#: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:52
+#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:22
+#: 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
+msgid "Materials"
+msgstr "物料"
+
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/BaseCalendar.java:1106
+msgid "dates must be sorted and cannot overlap"
+msgstr "日期必须进行分类，并不能重叠"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java:361
+msgid "Reassign"
+msgstr "重新分配"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:180
+msgid "Not bound"
+msgstr "不绑定"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/GlobalProgressChart.java:62
+msgid "By critical path hours"
+msgstr "通过关键路径小时的"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MonteCarloTabCreator.java:51
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MonteCarloTabCreator.java:159
+msgid "MonteCarlo Method"
+msgstr "蒙特卡罗方法"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:183
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskDeadlineViolationStatusEnum.java:34
+msgid "No deadline"
+msgstr "无截止日期"
+
+#: 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
+msgid "Project Scheduling"
+msgstr "项目计划"
+
+#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLabelTypeAssigment.java:61
+msgid "label type not specified"
+msgstr "不指定标签类型"
+
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:29
+msgid "Managing fields and labels"
+msgstr "字段和标签管理"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:542
+msgid ""
+"Machine cannot be deleted. Machine is allocated to a project or contains "
+"imputed hours"
+msgstr "机器无法被删除。机分配到一个项目或包含估算小时"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:269
+msgid "Please, select a calendar"
+msgstr "请选择一个日历"
+
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:256
+msgid "Summary"
+msgstr "总结"
+
+#: 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 "预定义"
+
+#: 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
+msgid "Quality Forms"
+msgstr "质量表格"
+
+#: 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 "比以前的拉伸舒展值小于或等于"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:502
+msgid "Reports"
+msgstr "报告"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java:149
+msgid "Assignments could not be completed"
+msgstr "作业无法完成"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/assigntemplates/TemplateFinderPopup.java:117
+msgid "Create task"
+msgstr "创建任务"
+
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:122
+msgid "username not specified"
+msgstr "用户名不指定"
+
+#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:22
+msgid "LibrePlan: Advanced allocation"
+msgstr "LibrePlan：高级配置"
+
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:82
+msgid "Criterion requirements"
+msgstr "规范要求"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1631
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1637
+msgid "please, select a timesheet template type"
+msgstr "请选择一个时间表模板类型"
+
+#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:68
+msgid "Dedication chart"
+msgstr "分配图"
+
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:118
+msgid "Sum of expenses imputed in children tasks"
+msgstr "费用估算的子任务的总和"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:714
+msgid "Progress that are reported by quality forms can not be modified"
+msgstr "不能修改由质量表格所报告的进展"
+
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:66
+msgid "Own exception"
+msgstr "自己的异常"
+
+#: libreplan-webapp/src/main/webapp/common/layout/timeout.zul:27
+msgid "Your session has expired because of inactivity. Please log in again."
+msgstr "您的会话已过期，因为没有活动。请重新登录。"
+
+#: 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 "无法删除的材料，因为它被分配到一个项目。"
+
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/MachineWorkersConfigurationUnit.java:169
+msgid "Alpha must be greater than 0"
+msgstr "alpha必须是大于0的"
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:1171
+msgid "code is already used in another project"
+msgstr "在另一个项目中的代码已被使用"
+
+#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:40
+msgid "Active period from"
+msgstr "活动期间从"
+
+#: libreplan-webapp/src/main/webapp/myaccount/_myTasksArea.zul:40
+msgid "Work done"
+msgstr "所做的工作"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:485
+msgid "Unassign"
+msgstr "取消分配"
+
+#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:37
+msgid "Filter timesheet lines by"
+msgstr "过滤时间表线"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/ManualAllocationController.java:506
+msgid "Manual assignment"
+msgstr "手动分配"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:146
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:419
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:68
+msgid "Companies"
+msgstr "公司"
+
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:74
+msgid "Quality form items list"
+msgstr "优质表格的项目清单"
+
+#: 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
+msgid "Create {0}: {1}"
+msgstr "创建{0}：{1}"
+
+#: libreplan-business/src/main/java/org/libreplan/business/common/entities/EntitySequence.java:192
+msgid "entity name not specified"
+msgstr "不指定实体名称"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:445
+msgid "You do not have permissions to go to worker edition window"
+msgstr "您没有权限去工人的编辑窗口"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/NewAllocationSelector.java:51
+msgid "generic workers allocation"
+msgstr "一般工人分配"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:315
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:895
+msgid "The project has no scheduled elements"
+msgstr "该项目并无预定的元素"
+
+#: libreplan-webapp/src/main/webapp/planner/main.zul:53
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:36
+#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:120
+msgid "Start"
+msgstr "开始"
+
+#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/ResourcesCostCategoryAssignment.java:119
+msgid "cost assignment's category not specified"
+msgstr "未指定成本分配的类别"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:121
+msgid "Check for updates"
+msgstr "检查更新"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeComponent.java:72
+msgid "Delete Template element"
+msgstr "删除模板元素"
+
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:516
+msgid "Criteria of this criterion type have been assigned to some resource."
+msgstr "该标准型标准已被分配给某些资源。"
+
+#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:22
+msgid "LibrePlan: Calendars"
+msgstr "LibrePlan：日历"
+
+#: libreplan-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:37
+msgid "Resources capability"
+msgstr "资源能力"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:501
+msgid "must be greater or equal than 0"
+msgstr "必须大于或等于0的"
+
+#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:31
+msgid "Transfer Projects Between Scenarios"
+msgstr "转移项目"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:109
+msgid "changing perspective"
+msgstr "更改透视"
+
+#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:47
+msgid "Estimated hours average"
+msgstr "估计时间平均"
+
+#: 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 "无法添加这些授权，配置文件{0}，因为他们已经存在。"
+
+#: 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-business/src/main/java/org/libreplan/business/resources/entities/CriterionSatisfaction.java:216
+msgid "resource not specified"
+msgstr "资源不指定"
+
+#: libreplan-business/src/main/java/org/libreplan/business/materials/entities/UnitType.java:76
+msgid "measure not specified"
+msgstr "测量不指定"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:64
+msgid "Default calendar"
+msgstr "默认日历"
+
+#: libreplan-business/src/main/java/org/libreplan/business/requirements/entities/CriterionRequirement.java:68
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionSatisfaction.java:206
+msgid "criterion not specified"
+msgstr "标准未指定"
+
+#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:474
+msgid ""
+"only one timesheet line per day and task is allowed in personal timesheets"
+msgstr "每天和任务只有一个时间表线允许在个人时间表"
+
+#: 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/timeLineMaterialReport.zul:158
+msgid "Click on this"
+msgstr "点击"
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/Order.java:423
+msgid "project calendar not specified"
+msgstr "不指定项目日历"
+
+#: 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
+msgid "Project Name"
+msgstr "项目名"
+
+#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/TypeOfWorkHours.java:146
+msgid "type of work hours for personal timesheets cannot be disabled"
+msgstr "个人时间表类型的工作时间不能被禁用"
+
+#: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/ExternalCompany.java:166
+msgid "Company ID already used. It must be unique"
+msgstr "公司ID已被使用，它必须是唯一"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:209
+msgid "Cannot be higher than Ending Date"
+msgstr "不能高于结束日期"
+
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:129
+msgid ""
+"Roles of LDAP users cannot be managed because LDAP is enabled and LDAP roles"
+" are being used."
+msgstr "无法管理，因为启用LDAP和LDAP角色正在使用LDAP用户的角色。"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:306
+msgid "Indent"
+msgstr "缩进"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java:256
+msgid "Reassignation"
+msgstr "重新分配"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:351
+msgid "Save passwords in database"
+msgstr "保存在数据库中的密码"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1249
+msgid "Consolidated progress measurement cannot be removed"
+msgstr "综合进度测量不能被删除"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTree.java:42
+msgid "New template"
+msgstr "新模板"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:970
+msgid "Delete bound user"
+msgstr "删除绑定用户"
+
+#: libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialInfo.java:61
+msgid "unit price not specified"
+msgstr "未指定的单位价格"
+
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:38
+msgid "Total estimated hours"
+msgstr "估计总额小时"
+
+#: libreplan-webapp/src/main/webapp/common/error.zul:21
+#: libreplan-webapp/src/main/webapp/common/event_error.zul:22
+msgid "LibrePlan: Runtime Error"
+msgstr "LibrePlan：运行时错误"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:137
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:153
+msgid "Base calendar \"{0}\" saved"
+msgstr "基准日历“{0}”保存"
+
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:189
+msgid "Exceptions list"
+msgstr "例外列表"
+
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:33
+msgid "Locations"
+msgstr "地点"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:520
+msgid "The code must be unique."
+msgstr "该代码必须是唯一的。"
+
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:77
+msgid "New quality form item"
+msgstr "新的质量表格项目"
+
+#: libreplan-webapp/src/main/webapp/labels/labelTypes.zul:21
+msgid "LibrePlan: Labels"
+msgstr "LibrePlan：标签"
+
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:363
+msgid "You have exceeded the maximum limit of users"
+msgstr "您已超过最大用户限制"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:254
+msgid "LDAP connection was successful"
+msgstr "LDAP连接成功"
+
+#: 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 "
+"order element which has a progress that is of type subcontractor. "
+msgstr "这种资源分配类型是不兼容的。任务有相关的Order元素，其中有一个进步，是类型的分包商。"
+
+#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/TaskQualityFormItem.java:87
+msgid "position not specified"
+msgstr "位置不指定"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/GlobalProgressChart.java:57
+#: libreplan-webapp/src/main/webapp/resources/_criterions.zul:43
+msgid "Current"
+msgstr "当前"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:84
+msgid "{0} List"
+msgstr "{0}列表"
+
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:65
+msgid "Dependencies"
+msgstr "依存关系"
+
+#: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:78
+msgid "Current selection"
+msgstr "当前选择"
+
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1130
+msgid ""
+"there exist criterion satisfactions referring to criterion types not "
+"applicable to this resource"
+msgstr "标准类型不适用此资源"
+
+#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:47
+#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:52
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:50
+msgid "Criterion Requirement"
+msgstr "标准要求"
+
+#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:31
+msgid "Show labels"
+msgstr "显示标签"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/EffortDurationPicker.java:63
+msgid "Minutes"
+msgstr "会议纪要"
+
+#: libreplan-business/src/main/java/org/libreplan/business/scenarios/entities/OrderVersion.java:55
+msgid "owner scenario not specified"
+msgstr "不指定所有者的情况"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/ExpensesAreaController.java:98
+msgid "Expense sheet \"{0}\" deleted"
+msgstr "费用表“{0}”删除"
+
+#: libreplan-business/src/main/java/org/libreplan/business/expensesheet/entities/ExpenseSheet.java:117
+#: libreplan-business/src/main/java/org/libreplan/business/expensesheet/entities/ExpenseSheet.java:118
+msgid "the expense sheet must have least a expense sheet line."
+msgstr "费用表必须有至少一个牺牲片材生产线。"
+
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:91
+msgid "Available materials"
+msgstr "可用的材料"
+
+#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:55
+msgid "Maximum/minimum of estimated hours"
+msgstr "最大/最小的估计小时"
+
+#: libreplan-webapp/src/main/webapp/qualityforms/qualityForms.zul:22
+msgid "LibrePlan: Quality Forms"
+msgstr "LibrePlan：质量表格"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:388
+msgid "Checked"
+msgstr "经过"
+
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:415
+msgid "a disabled resource has enabled subresources"
+msgstr "启用已禁用的资源的子资源"
+
+#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:28
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:53
+msgid "Client"
+msgstr "客户"
+
+#: 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
+msgid ""
+"there are no resources for required criteria: {0}. So the generic allocation"
+" can't be added"
+msgstr "有没有资源所需的条件：{0}。因此，通用的分配不能被添加"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1565
+msgid "must be later than start date"
+msgstr "必须晚于开始日期"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:371
+msgid "Role search strategy"
+msgstr "角色的搜索策略"
+
+#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:401
+msgid "fields should match with timesheet data if are shared by lines"
+msgstr "字段应与时间表数据，如果共享的线"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractController.java:154
+msgid "It already exists a deliver date with the same date. "
+msgstr "它已经存在一个交货日期相同的日期。"
+
+#: libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialCategory.java:153
+msgid "material category name has to be unique. It is already used"
+msgstr "材料种类名称已在使用中。"
+
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:169
+msgid "Imputed hours"
+msgstr "推算小时"
+
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractorCommunicationValue.java:73
+msgid "progress should be greater than 0% and less than 100%"
+msgstr "进展应该是大于0% 且小于100％的"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:668
+msgid "A description field with the same name already exists."
+msgstr "具有相同名称的说明字段已经存在。"
+
+#: 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 "确认删除这个小时费用。你确定吗？"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/milestone/DeleteMilestoneCommand.java:59
+msgid "Delete Milestone"
+msgstr "删除里程碑"
+
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractedTaskData.java:248
+msgid "external company should be subcontractor"
+msgstr "外部公司应分包商"
+
+#: libreplan-webapp/src/main/webapp/resources/worker/_localizations.zul:48
+msgid "Non-assigned locations"
+msgstr "非指定地点"
+
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:77
+msgid "Application URI"
+msgstr "应用地址"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:373
+msgid "Group strategy"
+msgstr "集团策略"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:904
+msgid "Budget: {0}, Consumed: {1} ({2}%)"
+msgstr "财政预算案：{0}，消耗：{1}（{2}）"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1562
+msgid "Configure"
+msgstr "配置"
+
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:55
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:59
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:61
+#: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:36
+msgid "First name"
+msgstr "名字"
+
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:122
+msgid "Complementary text fields"
+msgstr "补充文本字段"
+
+#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:22
+msgid "LibrePlan: Send To Subcontractors"
+msgstr "LibrePlan：发送给分包商"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:291
+#: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:211
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java: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
+msgid "Confirm deleting {0}. Are you sure?"
+msgstr "确认删除{0}。你确定吗？"
+
+#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:51
+msgid "Edit selected task"
+msgstr "编辑选定的任务"
+
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:220
+msgid "External code"
+msgstr "外部代码"
+
+#: 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"
+msgstr "保存个人时间表"
+
+#: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:51
+msgid "View"
+msgstr "看"
+
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractedTaskData.java:226
+msgid "subcontratation date not specified"
+msgstr "subcontratation不指定日期"
+
+#: libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java:180
+msgid "base not specified"
+msgstr "基地不指定"
+
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:95
+msgid "New delivery date"
+msgstr "新的交货日期"
+
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:60
+msgid "Required materials"
+msgstr "所需材料"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:312
+msgid "Backwards"
+msgstr "后退"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:181
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:104
+msgid "Existing user"
+msgstr "现有用户"
+
+#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:52
+msgid "Apply filtering to resources satisfying required criteria"
+msgstr "筛选满足要求的资源"
+
+#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:67
+#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:77
+msgid "Version"
+msgstr "版本"
+
+#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:35
+msgid "Communications To Customers"
+msgstr "客户通讯"
+
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:105
+msgid "Up"
+msgstr "上"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:252
+msgid "EAC"
+msgstr "EAC"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:539
+msgid "it already exists another expense sheet with the same code."
+msgstr "它已经存在另一种费用表具有相同的代码。"
+
+#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:39
+msgid "Predecessor"
+msgstr "前任"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:601
+msgid "Not workable day"
+msgstr "没有可行的一天"
+
+#: 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 "有一些拉伸值高于或等于比以前的拉伸"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/TreeElementOperationsController.java:55
+msgid "Please select a task"
+msgstr "请选择一个任务"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:101
+msgid ""
+"Value is not valid, the default max value must be greater than the precision"
+" value "
+msgstr "值无效，默认的最大值必须大于精度值"
+
+#: 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/machine/_machineConfigurationUnits.zul:55
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:277
+msgid "End date"
+msgstr "结束日期"
+
+#: libreplan-webapp/src/main/webapp/excetiondays/exceptionDays.zul:22
+msgid "LibrePlan: Calendar Exception Days"
+msgstr "LibrePlan：日历例外日"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:976
+msgid "Worker and bound user deleted"
+msgstr "工人和绑定用户已删除"
+
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java:271
+msgid "Bound user does not have the proper role"
+msgstr "绑定用户没有适当的作用"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeModel.java:330
+msgid "Already exists another criterion with the same name"
+msgstr "已经存在另一个具有相同名称的标准"
+
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/Profile.java:89
+msgid "profile name is already being used by another profile"
+msgstr "另一个配置文件配置文件的名称已被使用"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioModel.java:126
+msgid "You cannot remove the current scenario"
+msgstr "您不能删除当前情况下"
+
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:84
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:71
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:122
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:158
+msgid "E-mail"
+msgstr "电子邮件"
+
+#: 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
+msgid "This project has already been added."
+msgstr "该项目已被添加。"
+
+#: 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/webapp/resources/search/allocation_selector.zul:39
+#: 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
+msgid "Criteria"
+msgstr "标准"
+
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:28
+msgid "User data"
+msgstr "用户数据"
+
+#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:140
+msgid "Resource / Criteria"
+msgstr "资源/标准"
+
+#: 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
+msgid "field name not specified or empty"
+msgstr "字段名不在指定或为空"
+
+#: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:44
+msgid "Lines"
+msgstr "线"
+
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:29
+msgid "Add new progress assignment"
+msgstr "添加新的任务分配"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1342
+msgid ""
+"Value must be a multiple of the precision value of the progress type: {0}"
+msgstr "值必须是一个多精度值的进展类型：{0}"
+
+#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:32
+msgid "Set Filter Options"
+msgstr "设置过滤器选项"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:377
+#: libreplan-webapp/src/main/webapp/myaccount/_expensesArea.zul:22
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:62
+msgid "Expenses"
+msgstr "支出"
+
+#: 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 "名称已被使用"
+
+#: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:22
+msgid "Quality Forms List"
+msgstr "质量表格列表"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/TransferOrdersModel.java:170
+msgid "Project version is the same in source and destination scenarios"
+msgstr "来源和目标的项目版本相同"
+
+#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityForm.java:210
+msgid "Quality form item name must be unique"
+msgstr "质量形式的项目名称必须是唯一的"
+
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:50
+msgid "Subcontracting communication date"
+msgstr "分包通信日期"
+
+#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:162
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:28
+msgid "Finished"
+msgstr "成品"
+
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:31
+msgid "Personal data"
+msgstr "个人资料"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:164
+#: 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
+msgid "please, select a Criterion"
+msgstr "请选择一个标准"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/entrypoints/EntryPointsHandler.java:143
+msgid "{0} annotation required on {1}"
+msgstr " {0}需要注释在{1}之\n上"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:239
+msgid "Some sequences to be removed do not exist"
+msgstr "部分序列以除去不存在"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1290
+msgid "Modified"
+msgstr "已修改"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:999
+msgid "cannot be negative"
+msgstr "不能为负数"
+
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:215
+msgid "Add Criterion"
+msgstr "添加标准"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:665
+msgid "format prefix invalid. It cannot be empty or contain whitespaces."
+msgstr "格式前缀无效。它不能为空或包含空格。"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1227
+msgid "inherited exception can not be removed"
+msgstr "继承异常不能被删除"
+
+#: 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 "MessagesContainer是必要的"
+
+#: libreplan-webapp/src/main/webapp/dashboard/_dashboardfororder.zul:100
+msgid ""
+"Load percentage of resources participating in the project while they are "
+"assigned"
+msgstr "参与该项目的资源负载百分比，而他们分配"
+
+#: 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/_workRelationships.zul:29
+#: libreplan-webapp/src/main/webapp/resources/_criterions.zul:42
+msgid "Ending date"
+msgstr "结束日期"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationModel.java:517
+msgid "There is not any assigned progress to current task"
+msgstr "没有任何分配到当前的任务方面取得的进展"
+
+#: libreplan-webapp/src/main/webapp/common/page_not_found.zul:22
+msgid "LibrePlan: Page not found"
+msgstr "LibrePlan：找不到网页"
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/Order.java:576
+msgid "project name is already being used"
+msgstr "项目名称已被使用"
+
+#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:29
+msgid "Export options"
+msgstr "导出选项"
+
+#: libreplan-webapp/src/main/webapp/templates/_listTemplates.zul:21
+msgid "Templates List"
+msgstr "模板列表"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:221
+msgid "Criteria: {0}"
+msgstr "标准：{0}"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:264
+msgid "Last value"
+msgstr "最后一个值"
+
+#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:51
+msgid "Average of worked hours in finished applications"
+msgstr "平均工作小时完成的应用程序"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:723
+msgid "Calculated progress can not be modified"
+msgstr "不能修改计算的进度"
+
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:60
+msgid "Work done from starting date"
+msgstr "所做的工作起始日期"
+
+#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:51
+msgid "Statistics log"
+msgstr "统计日志"
+
+#: libreplan-webapp/src/main/webapp/resources/worker/_calendar.zul:47
+#: libreplan-webapp/src/main/webapp/resources/machine/_calendar.zul:40
+msgid "Edit Calendar"
+msgstr "编辑日历"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:235
+msgid "item"
+msgstr "项目"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:119
+msgid "Profile"
+msgstr "配置文件"
+
+#: 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 "个人时间表"
+
+#: 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 "物料需求日期"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:316
+msgid "UserDn"
+msgstr "UserDn"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:233
+msgid "{0} \"{1}\" saved"
+msgstr "{0}“{1}”保存"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:307
+msgid "filtering"
+msgstr "过滤"
+
+#: libreplan-webapp/src/main/webapp/orders/_list.zul:33
+msgid "Total Budget"
+msgstr "总预算"
+
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:55
+msgid "Hierarchy"
+msgstr "等级"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:955
+msgid ""
+"This worker cannot be deleted because it has assignments to projects or "
+"imputed hours"
+msgstr "工人不能被删除，因为它有指定的项目或估算小时"
+
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:64
+msgid "Work done until ending date"
+msgstr "结束日期的工作完成"
+
+#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:22
+#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:26
+msgid "Print configuration"
+msgstr "打印配置"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeModel.java:422
+msgid "There is another timesheet template with the same code"
+msgstr "还有另外一个时间表模板使用相同的代码"
+
+#: libreplan-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:27
+msgid "Overload due to other assignments"
+msgstr "超载由于其他任务"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/GlobalProgressChart.java:123
+msgid "Project progress percentage"
+msgstr "项目的进度百分比"
+
+#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:104
+msgid "Expense properties"
+msgstr "费用性质"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkRelationshipsController.java:149
+msgid "Time period saved"
+msgstr "保存时间段"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:252
+msgid ""
+"Are you sure of changing the resource type? You will lose the criteria with "
+"different resource type."
+msgstr "你确定资源类型的改变吗？会失去旧资源类型的的准则。"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:170
+#: 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
+msgid "This Criterion has already been added."
+msgstr "这个准则已经被添加。"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:246
+msgid "add"
+msgstr "加"
+
+#: 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 "未保存的更改将丢失。你想继续吗？"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:290
+msgid "please select a user to bound"
+msgstr "请选择一个用户结合"
+
+#: 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 "工人"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:862
+msgid ""
+"You can not remove the project \"{0}\" because it has time tracked at some "
+"of its tasks"
+msgstr "您无法删除项目“{0}”，因为它有时间跟踪一些任务"
+
+#: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:53
+msgid "Resources matching selected criteria"
+msgstr "符合所选准则的资源"
+
+#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:27
+msgid "with"
+msgstr "同"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:293
+msgid "Label Type"
+msgstr "标签类型"
+
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:50
+msgid "Year"
+msgstr "年"
+
+#: 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}”不能被删除，它已经被删除"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:429
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:70
+msgid "Received From Subcontractors"
+msgstr "收到从分包商"
+
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/Profile.java:68
+msgid "profile name not specified"
+msgstr "没有指定的配置文件名"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:112
+msgid "you do not have permissions to create new labels"
+msgstr "你没有权限创建新标签"
+
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:63
+msgid "Date Start"
+msgstr "日期开始"
+
+#: libreplan-webapp/src/main/webapp/typeofworkhours/typeOfWorkHours.zul:23
+msgid "LibrePlan: Hours Types"
+msgstr "LibrePlan：时间类型"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/GlobalProgressChart.java:61
+msgid "By all tasks hours"
+msgstr "所有任务时间"
+
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:66
+msgid "Hour costs"
+msgstr "小时成本"
+
+#: 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/orders/_listOrderElementAdvances.zul:67
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:35
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:56
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:87
+msgid "Value"
+msgstr "值"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeModel.java:91
+msgid "Progress type cannot be modified"
+msgstr "进展类型不能被修改"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:809
+msgid "there are no valid periods for this calendar"
+msgstr "有没有有效期为这个日历"
+
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:133
+#: libreplan-webapp/src/main/webapp/profiles/_editProfile.zul:54
+msgid "Add role"
+msgstr "添加角色"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:642
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1278
+msgid "Exception end date should be greater or equals than start date"
+msgstr "异常,结束日期应该是大于或等于于开始日期"
+
+#: 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
+msgid "Repeated Project code {0} in Project {1}"
+msgstr "重复的项目代码{0}项目{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
+msgid "End date is not valid, the new end date must be after start date"
+msgstr "结束日期是无效的，新的结束日期必须在开始日期"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:284
+msgid "Stretch date must not be before task start date: "
+msgstr "伸展日期不得早于任务开始日期："
+
+#: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:22
+msgid "Progress Types List"
+msgstr "进展类型列表"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/AssignedCriterionsModel.java:335
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/AssignedMachineCriterionsModel.java:398
+msgid ""
+"The {0} can not be assigned to this resource. Its interval overlaps with "
+"other criterion"
+msgstr "{0}不能被分配​​到这个资源。其时间间隔与其他准则重叠"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:257
+msgid "Schedule Performance Index"
+msgstr "进度绩效指数"
+
+#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:141
+msgid "Earlier starting date"
+msgstr "早期开始日期"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:536
+msgid "The code cannot be empty and it must be unique."
+msgstr "该代码不能是空的，它必须是唯一的。"
+
+#: 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
+msgid "Profiles"
+msgstr "配置文件"
+
+#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:46
+#: libreplan-webapp/src/main/webapp/myaccount/_expensesArea.zul:35
+msgid "First expense"
+msgstr "首先费用"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:295
+msgid "Host"
+msgstr "主持人"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:207
+msgid "Perspectives"
+msgstr "展望"
+
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:119
+msgid "Workable time"
+msgstr "可行的时间"
+
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:40
+msgid "Company name"
+msgstr "公司名称"
+
+#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:22
+msgid "LibrePlan: Send To Customers"
+msgstr "LibrePlan：发送给客户"
+
+#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:493
+msgid "there are repeated description values in the timesheet lines"
+msgstr "有重复的描述值的时间表"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:489
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:521
+msgid "This date cannot be empty"
+msgstr "这个日期不能为空"
+
+#: libreplan-webapp/src/main/webapp/dashboard/_dashboardfororder.zul:82
+msgid "Resources usage"
+msgstr "资源的使用"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:464
+msgid "Split new assignment"
+msgstr "分割新任务"
+
+#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/DirectAdvanceAssignment.java:226
+msgid "maxixum value of percentage progress type must be 100"
+msgstr "maxixum进度百分比值的类型必须是100"
+
+#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:84
+msgid "Total personal timesheet"
+msgstr "总的个人时间表"
+
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:275
+msgid "Expiry date"
+msgstr "到期日"
+
+#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:57
+#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:73
+msgid "Pagination"
+msgstr "分页"
+
+#: libreplan-webapp/src/main/webapp/common/layout/template.zul:86
+msgid "Change scenario"
+msgstr "变化情景"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/montecarlo/MonteCarloModel.java:70
+#: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:69
+msgid "Critical path"
+msgstr "关键路径"
+
+#: 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 "分类"
+
+#: 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 "值无效。它必须小于最大值"
+
+#: 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
+msgid "Project Details"
+msgstr "项目详情"
+
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:167
+msgid "Add new hours group"
+msgstr "添加新的时间组"
+
+#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:44
+msgid "Cancel changes and back to scheduling"
+msgstr "取消更改并返回到调度"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:212
+msgid "Task: {0}"
+msgstr "任务：{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 "百分比"
+
+#: libreplan-webapp/src/main/webapp/dashboard/_costStatus.zul:55
+msgid "Remaining time"
+msgstr "剩余时间"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:97
+msgid "Company logo URL"
+msgstr "公司标志URL"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineConfigurationController.java:129
+msgid "No worker selected"
+msgstr "没有选择工人"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:244
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:262
+msgid "Number of digits"
+msgstr "数字位数"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportQueryController.java:290
+msgid "Task not found"
+msgstr "任务未找到"
+
+#: libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java:152
+msgid "company code cannot contain whitespaces"
+msgstr "公司代码不能包含空格"
+
+#: libreplan-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:39
+#: libreplan-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:39
+msgid "Total capability"
+msgstr "总容量"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ReportAdvancesModel.java:224
+msgid "Problems connecting with client web service"
+msgstr "客户端Web Service连接有问题"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:721
+msgid ""
+"You cannot remove the task \"{0}\" because it has work reported on it or any"
+" of its children"
+msgstr "您不能删除任务“{0}”，因为它的工作报告上或任何其子"
+
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:169
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:198
+msgid "Exception Type"
+msgstr "异常类型"
+
+#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceMeasurement.java:155
+#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceMeasurement.java:169
+msgid "The current value must be less than the max value."
+msgstr "的电流值必须小于最大值。"
+
+#: libreplan-webapp/src/main/webapp/profiles/_listProfiles.zul:22
+msgid "Profiles List"
+msgstr "配置文件列表"
+
+#: 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 "{0},{1},{2},{3}有相同的代码"
+
+#: 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 "标签"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:442
+msgid "Queue-based resource assignation"
+msgstr "基于队列的资源分配"
+
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:106
+#: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:47
+msgid "New timesheet"
+msgstr "新的时间表"
+
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:116
+msgid "End date communicated by the subcontractor."
+msgstr "结束日期由分包商的沟通。"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportQueryController.java:374
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:195
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:68
+msgid "Total hours"
+msgstr "总时数"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateModel.java:344
+msgid "Reassigning {0} projects"
+msgstr "重新分配{0}项目"
+
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:39
+msgid "Data"
+msgstr "数据"
+
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:57
+msgid "Filter by task status"
+msgstr "任务状态过滤"
+
+#: 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
+msgid "Select date"
+msgstr "选择日期"
+
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractedTaskData.java:265
+msgid "state not specified"
+msgstr "状态不指定"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1319
+msgid ""
+"Spread progress cannot be removed. Please select another progress as spread."
+msgstr "传播进步不能被删除。请选择另一个进步为传播。"
+
+#: libreplan-webapp/src/main/webapp/common/concurrent_modification.zul:34
+msgid "Please try it again."
+msgstr "请再试一次。"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:266
+msgid "cannot be checked until the previous item is checked before"
+msgstr "不能被选中，直到上一个项目之前检查"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:57
+msgid "Company code"
+msgstr "公司代码"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/TwoWaySelector.java:110
+msgid "Unknown attribute '{0}' in class {1}"
+msgstr "未知属性“{0}”在类{1}"
+
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:62
+msgid "Sum of imputed hours in children tasks"
+msgstr "子任务估算时间的总和"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordController.java:96
+msgid "passwords can not be empty"
+msgstr "密码不能为空"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:1074
+msgid "Task {0}"
+msgstr "任务{0}"
+
+#: libreplan-webapp/src/main/webapp/common/access_forbidden.zul:40
+msgid ""
+"Please try to contact with any administrator in order to review your "
+"permissions in LibrePlan."
+msgstr "请尝试与任何管理员联系，以审查您的权限LibrePlan。"
+
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Machine.java:101
+msgid "machine name not specified"
+msgstr "没有指定的机器名"
+
+#: 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 "已分配"
+
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:132
+msgid "Activation periods"
+msgstr "激活期"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:505
+#: 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/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 "日历"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:357
+#: libreplan-webapp/src/main/webapp/dashboard/_dashboardfororder.zul:76
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:157
+msgid "Resources"
+msgstr "资源"
+
+#: libreplan-webapp/src/main/webapp/myaccount/changePassword.zul:56
+msgid ""
+"LDAP users cannot change their password if LDAP authentication is enabled. "
+"Talk to one of the administrators"
+msgstr "如果启用了LDAP身份验证LDAP用户无法更改他们的密码。交谈的管理员之一"
+
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:31
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:56
+msgid "Read"
+msgstr "阅读"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/TransferOrdersModel.java:153
+msgid "Source and destination scenarios should be different"
+msgstr "源和目的地的情况应该是不同的"
+
+#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:33
+msgid "Overallocated"
+msgstr "过度"
+
+#: libreplan-webapp/src/main/webapp/common/layout/login.zul:142
+msgid "The browser you are using"
+msgstr "您所使用的浏览器"
+
+#: libreplan-webapp/src/main/webapp/common/layout/template.zul:82
+msgid "scenario"
+msgstr "脚本"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:220
+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 "定义的时间后，自去年节能运行，在项目规划的角度提出警告离开。如果设置为0以禁用警告。"
+
+#: 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
+msgid "to"
+msgstr "对"
+
+#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:567
+msgid ""
+"there is a timesheet line in another work report marking as finished the "
+"same task"
+msgstr "有一个时间表，在另一个工作报告标记为完成同样的任务"
+
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java:122
+msgid "worker's first name not specified"
+msgstr "没有指定工人的名字"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1411
+msgid "End date can only be deleted in the the last activation"
+msgstr "结束日期只能被删除的最后一个激活"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:374
+msgid "Property strategy"
+msgstr "产权战略"
+
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:107
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:276
+msgid "Save date"
+msgstr "保存日期"
+
+#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityForm.java:248
+msgid ""
+"The quality item positions must be correct in function to the percentage."
+msgstr "优质项目的位置必须是正确的，在功能上的百分比。"
+
+#: 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/qualityforms/entities/TaskQualityFormItem.java:139
+msgid "date not specified"
+msgstr "未指定的日期"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:826
+msgid ""
+"Periods available depend on the satisfaction of the criteria of resources "
+"and their calendars."
+msgstr "期间依赖于资源和他们的日历满意的标准。"
+
+#: 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
+msgid "Projects Planning"
+msgstr "项目规划"
+
+#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:37
+msgid "Shrink to fit page width"
+msgstr "收缩以适应页面的宽度"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioModel.java:132
+msgid "You cannot remove a scenario with derived scenarios"
+msgstr "与派生的情况下，您不能删除场景"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:812
+msgid "The max value must be greater than 0"
+msgstr "最大的值必须大于0"
+
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:61
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:65
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:73
+msgid "Last name"
+msgstr "姓"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:382
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/Util.java:568
+msgid "Remove"
+msgstr "清除"
+
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_allocationConfiguration.zul:41
+msgid "Planned workable days"
+msgstr "计划可作业天数"
+
+#: libreplan-business/src/main/java/org/libreplan/business/workreports/valueobjects/DescriptionField.java:80
+msgid "length less than 1"
+msgstr "长度小于1"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:256
+msgid "SPI"
+msgstr "SPI"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:232
+msgid "Progress Type"
+msgstr "进展类型"
+
+#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportType.java:85
+msgid "name not specified or empty"
+msgstr "名称未指定或为空"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1311
+msgid "Task contains consolidated progress. Cannot apply sigmoid function."
+msgstr "任务包含综合进度。无法应用S型函数。"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:535
+msgid "Date cannot include the entire next work week"
+msgstr "日期不能包括整个的下一个工作周"
+
+#: libreplan-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:22
+msgid "LibrePlan: Virtual Worker Groups"
+msgstr "LibrePlan：虚拟的职工群体"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:344
+msgid "UserId"
+msgstr "用户ID"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:509
+msgid "This date can not include the whole previous work week"
+msgstr "这个日期可以不包括以前的每周工作时间"
+
+#: 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
+msgid ""
+"Start date is not valid, the new start date must be previous the current "
+"start date"
+msgstr "开始日期是无效的，新的开始日期必须比现在的开始日期更早"
+
+#: libreplan-webapp/src/main/webapp/common/layout/template.zul:123
+msgid "Create New Project"
+msgstr "创建新项目"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1446
+msgid "Stretches list"
+msgstr "伸展列表"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:313
+msgid "to {0}"
+msgstr "{0}"
+
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:21
+msgid "LibrePlan: Total Worked Hours By Resource In A Month"
+msgstr "LibrePlan：在一个月内通过资源的总工作小时"
+
+#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:65
+msgid "Zoom"
+msgstr "放大"
+
+#: 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/webapp/externalcompanies/_editExternalCompany.zul:102
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:118
+#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:180
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:232
+#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:37
+#: 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/profiles/_editProfile.zul:70
+#: 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/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 "保存"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractController.java:147
+msgid ""
+"It will only be possible to add a Deliver Date if all the deliver date "
+"exiting in the table have a CommunicationDate not empty. "
+msgstr "它只会是可以添加一个交货日期，如果所有的交付日期表中的退出有一个CommunicationDate，不是空的。"
+
+#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:34
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:72
+msgid "Standard Effort"
+msgstr "标准努力"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:167
+msgid "Material categories"
+msgstr "材料类"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:285
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:588
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:686
+msgid "number of digits must be between {0} and {1}"
+msgstr "数字位数必须介于{0}和{1}"
+
+#: libreplan-business/src/main/java/org/libreplan/business/materials/entities/UnitType.java:85
+msgid "the measure has to be unique"
+msgstr "这项措施必须是唯一的"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:161
+msgid ""
+"Deleting this item will disable the report progress option. Are you sure?"
+msgstr "删除此项将禁用报告进度“选项。你确定吗？"
+
+#: libreplan-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:22
+msgid "Criteria Requirement"
+msgstr "标准要求"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineConfigurationController.java:158
+msgid "Criterion previously selected"
+msgstr "标准之前选择的"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:923
+msgid ""
+"Spread progress cannot be changed if there is a consolidation in any "
+"progress assignment from root task"
+msgstr "从根任务，如果有一个整合的任何任务分配，传播进步不能改变"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:313
+msgid "Schedule from deadline to start"
+msgstr "安排期限开始"
+
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:51
+msgid "Users authorization"
+msgstr "用户授权"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksModel.java:248
+#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksModel.java:294
+msgid "Problems connecting with subcontractor web service"
+msgstr "与分包商的Web服务连接有问题"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:377
+msgid "Delete template. Are you sure?"
+msgstr "删除模板。你确定吗？"
+
+#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:117
+msgid "Expense date"
+msgstr "费用日期"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:256
+msgid "Entity type"
+msgstr "实体类型"
+
+#: 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
+msgid "Unsaved changes will be lost. Are you sure?"
+msgstr "未保存的更改将丢失。你确定吗？"
+
+#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.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/resourceload/resourceload.zul:22
+msgid "LibrePlan: Scheduling"
+msgstr "LibrePlan：调度"
+
+#: libreplan-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:44
+msgid "Assigned load"
+msgstr "分配负载"
+
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:66
+msgid "Filter by workers"
+msgstr "过滤工人"
+
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:154
+msgid "End Date"
+msgstr "结束日期"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/AdvancedAllocationTaskController.java:73
+msgid "Some allocations needed"
+msgstr "需要一些分配"
+
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:83
+msgid "Resources Per Day"
+msgstr "每日资源"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:105
+msgid ""
+"Estimated end date for the task (press enter in textbox to open calendar "
+"popup or type in date directly)"
+msgstr "预计结束日期的任务（在文本框中按回车打开日历弹出或日期）"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:310
+msgid "Expand/Collapse all"
+msgstr "展开/收起所有"
+
+#: libreplan-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:32
+msgid "Overload due to current project"
+msgstr "由于目前的项目过载"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:887
+msgid "Name: {0}"
+msgstr "产品名称：{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
+msgid "Please, select a project"
+msgstr "请选择一个项目"
+
+#: libreplan-webapp/src/main/webapp/calendars/_list.zul:29
+msgid "Inherits from date"
+msgstr "继承之日起"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:589
+msgid "Expense Sheet"
+msgstr "费用表"
+
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:28
+msgid "Report structure"
+msgstr "报告结构"
+
+#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:524
+msgid "resource has to be bound to a user in personal timesheets"
+msgstr "资源必须绑定到用户的个人时间表"
+
+#: 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
+msgid "Yes"
+msgstr "是"
+
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:127
+msgid "Go to user edition window"
+msgstr "用户编辑窗口"
+
+#: 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/webapp/dashboard/_dashboardfororder.zul:67
+msgid "Cost"
+msgstr "成本"
+
+#: 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
+msgid "General data"
+msgstr "通用数据"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:251
+msgid "BAC"
+msgstr "BAC"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeComponent.java:111
+msgid "Deadline (days since project start)"
+msgstr "截止日期（日以来，项目启动）"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:381
+msgid "Calculate Number of Hours"
+msgstr "计算的小时数"
+
+#: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:38
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:35
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:81
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:99
+msgid "Assign"
+msgstr "分配"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1276
+msgid "Create Template"
+msgstr "创建模板"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/DashboardTabCreator.java:108
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/DashboardTabCreator.java:126
+msgid "Dashboard"
+msgstr "仪表盘"
+
+#: libreplan-webapp/src/main/webapp/dashboard/_dashboardfororder.zul:108
+msgid "Time"
+msgstr "时间"
+
+#: libreplan-business/src/main/java/org/libreplan/business/expensesheet/entities/ExpenseSheet.java:127
+msgid "last expense sheet line sequence code not specified"
+msgstr "最后费用片材生产线没有指定的序列码"
+
+#: 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
+msgid "Not enough permissions to edit this project"
+msgstr "没有足够的权限来编辑该项目"
+
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:60
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:68
+msgid "Advanced search"
+msgstr "高级搜索"
+
+#: 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/workingArrangementsPerOrderReport.zul:84
+msgid "Filter by labels"
+msgstr "过滤器的标签"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:643
+msgid ""
+"IMPORTANT: Don't forget to communicate to subcontractor that his contract "
+"has been cancelled"
+msgstr "重要提示：不要忘记传达给分包商，他的合同已被取消"
+
+#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:36
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:82
+msgid "Project Status Report"
+msgstr "项目状态报告"
+
+#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:36
+msgid "MonteCarlo chart"
+msgstr "蒙特卡洛图"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:251
+msgid "Schedule Variance"
+msgstr "进度偏差"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:684
+msgid "resources per day cannot be empty or less than zero"
+msgstr "每天的资源不能为空或小于零"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionsModel.java:217
+msgid "Criterion cannot be empty"
+msgstr "标准不能为空"
+
+#: libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java:147
+msgid "company code not specified"
+msgstr "不指定公司代码"
+
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:426
+msgid "criterion names must be unique inside a criterion  type"
+msgstr "标准名称必须是唯一的标准型内"
+
+#: libreplan-webapp/src/main/webapp/common/error.zul:44
+#: libreplan-webapp/src/main/webapp/common/event_error.zul:39
+msgid "Status code"
+msgstr "状态代码"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:900
+msgid "Index fields and labels must be unique and consecutive"
+msgstr "索引字段和标签必须是唯一的和连续的"
+
+#: 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 "警告"
+
+#: 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 "选择主日历"
+
+#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:66
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:67
+msgid "Identification"
+msgstr "鉴定"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:218
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:242
+msgid "Invaldid End Date. New End Date must be after current End Date "
+msgstr "Invaldid结束日期。新的结束日期必须是在当前的结束日期"
+
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java:248
+msgid "Queue-based resources cannot be bound to any user"
+msgstr "基于队列的资源不能被绑定到任何用户"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/limiting/allocation/LimitingResourceAllocationModel.java:222
+msgid "All resources must be queue-based"
+msgstr "所有的资源必须是基于队列的"
+
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:120
+msgid "Unbound resource"
+msgstr "未绑定的资源"
+
+#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:212
+#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/TaskQualityForm.java:81
+msgid "quality form not specified"
+msgstr "优质形式，不指定"
+
+#: 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/timeLineMaterialReport.zul:165
+#: libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul:37
+#: libreplan-webapp/src/main/webapp/subcontract/subcontractorCommunications.zul:37
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:49
+msgid "Show"
+msgstr "显示"
+
+#: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:71
+msgid "Assignment Type"
+msgstr "分配类型"
+
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:58
+msgid "Duration (days)"
+msgstr "时间（天）"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:424
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:69
+msgid "Send To Subcontractors"
+msgstr "发送给分包商"
+
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:204
+msgid "Customer information"
+msgstr "客户信息"
+
+#: libreplan-webapp/src/main/webapp/common/layout/timeout.zul:29
+msgid "Back to log in"
+msgstr "备份登录"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:651
+msgid "Label type already assigned"
+msgstr "标签类型已经分配"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:939
+msgid "Timesheets Template"
+msgstr "时程表模板"
+
+#: libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java:160
+msgid "host not specified"
+msgstr "未指定主机"
+
+#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityForm.java:266
+msgid "percentages in quality form items must be unique"
+msgstr "百分比质量的表单项目中必须是唯一的"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:443
+msgid "Edit queue-based resource element"
+msgstr "编辑基于队列的资源要素"
+
+#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:558
+msgid "finished not specified"
+msgstr "结束指定"
+
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:236
+msgid "Expenses cost"
+msgstr "费用成本"
+
+#: 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
+msgid ""
+"Value is not valid.\n"
+" Code cannot contain chars like '_'."
+msgstr "值无效。⏎ 代码不能包含字符，如'_'。"
+
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:73
+msgid "Node without children"
+msgstr "没有孩子的节点"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:141
+#: libreplan-webapp/src/main/webapp/subcontract/subcontractorCommunications.zul:56
+#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:49
+msgid "Company"
+msgstr "公司"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateModel.java:348
+msgid "{0} projects remaining to reassign"
+msgstr "{0}项目剩余的重新分配"
+
+#: libreplan-webapp/src/main/webapp/planner/editTask.zul:65
+msgid "Task properties"
+msgstr "任务属性"
+
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:56
+msgid "Sum of direct imputed hours"
+msgstr "直接估算时间的总和"
+
+#: 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 "未指定类型的工作时间"
+
+#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/TypeOfWorkHours.java:125
+msgid "the type of work hours name has to be unique. It is already used"
+msgstr "工作时间的类型名必须是唯一的。它已经用"
+
+#: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:35
+#: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:28
+msgid "Surname"
+msgstr "姓"
+
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/BaseCalendar.java:1218
+msgid "calendars with zero hours are not allowed"
+msgstr "日历零时不允许"
+
+#: 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/expensesheet/expenseSheet.zul:170
+#: 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
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:32
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:84
+msgid "Date"
+msgstr "日期"
+
+#: libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul:58
+#: libreplan-webapp/src/main/webapp/subcontract/subcontractorCommunications.zul:59
+msgid "Reviewed"
+msgstr "评论"
+
+#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:42
+msgid "Add From Template"
+msgstr "添加模板"
+
+#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:32
+msgid "Expense Sheets List"
+msgstr "费用表列表"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:574
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:612
+msgid "Assigned resources for this task will be deleted. Are you sure?"
+msgstr "这个任务分配的资源将被删除。你确定吗？"
+
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:43
+msgid "Filter by month"
+msgstr "按月筛选"
+
+#: 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 "代码是无效的。还有另外一个单元类型具有相同的代码"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:279
+msgid "Enable LDAP authentication"
+msgstr "启用LDAP身份验证"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationModel.java:488
+msgid "( max: {0} )"
+msgstr "（最大值：{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
+msgid "Criterion already assigned"
+msgstr "标准已经分配"
+
+#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/TaskQualityFormItem.java:100
+msgid "passed not specified"
+msgstr "通过不指定"
+
+#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:54
+msgid "Select queue"
+msgstr "选择队列"
+
+#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:60
+msgid "Cannot calculate charts for current data"
+msgstr "无法计算当前数据的图表"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:172
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1505
+msgid "project name already being used"
+msgstr "项目名称已被使用"
+
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:56
+msgid "Work description"
+msgstr "工作描述"
+
+#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:61
+#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:60
+msgid "Split assignment"
+msgstr "分割转让"
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/Order.java:349
+msgid "the project must have a start date"
+msgstr "项目必须有一个起始日期"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:259
+msgid "percentage must be unique"
+msgstr "百分比必须是唯一的"
+
+#: 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 "直接链接"
+
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:111
+msgid "Down"
+msgstr "下"
+
+#: libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderTemplate.java:71
+msgid "template calendar not specified"
+msgstr "不指定模板日历"
+
+#: 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
+msgid "Label"
+msgstr "标签"
+
+#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/HourCost.java:87
+msgid "price cost not specified"
+msgstr "未指定价格成本"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:218
+msgid "Task Completation Lead/Lag"
+msgstr "任务Completation超前/滞后"
+
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:127
+#: libreplan-webapp/src/main/webapp/profiles/_editProfile.zul:51
+msgid "Association with roles"
+msgstr "协会与角色"
+
+#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:36
+#: libreplan-webapp/src/main/webapp/myaccount/_expensesArea.zul:44
+msgid "New expense sheet"
+msgstr "新的支出表"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:639
+msgid "Create Timesheet"
+msgstr "创建时间表"
+
+#: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:30
+msgid "Quality forms"
+msgstr "质量形式"
+
+#: 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
+msgid "Repeated Hours Group code {0} in Project {1}"
+msgstr "反复小时组代码{0}项目{1}"
+
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:144
+msgid "Hours group"
+msgstr "h组"
+
+#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:72
+#: libreplan-webapp/src/main/webapp/templates/_listTemplates.zul:29
+msgid "Days from Beginning to Deadline"
+msgstr "从开始到截止日期的天数"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:253
+msgid "Estimate At Completion"
+msgstr "估计完成"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportQueryController.java:262
+#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:78
+msgid "Indirect"
+msgstr "间接"
+
+#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/ResourcesCostCategoryAssignment.java:102
+msgid "cost assignment's start date not specified"
+msgstr "未指定的成本分配的开始日期"
+
+#: libreplan-webapp/src/main/webapp/dashboard/_dashboardfororder.zul:123
+msgid "No tasks available yet"
+msgstr "还没有任务"
+
+#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:158
+msgid "Output format:"
+msgstr "输出格式："
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportQueryController.java:259
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1199
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/CriterionRequirementWrapper.java:45
+#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:77
+msgid "Direct"
+msgstr "直接"
+
+#: 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/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:86
+#: 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
+#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:34
+msgid "Op."
+msgstr "运算。"
+
+#: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:44
+msgid "Pessimistic"
+msgstr "悲观"
+
+#: libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderElementTemplate.java:483
+msgid "template name is already in use"
+msgstr "模板名称已在使用中"
+
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:131
+msgid "Work week"
+msgstr "工作周"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/TransferOrdersModel.java:144
+msgid "Please select a source scenario"
+msgstr "请选择一个信号源的情况下"
+
+#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:27
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:47
+msgid "Company ID"
+msgstr "公司ID"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1582
+msgid ""
+"It will only be possible to add an end date if all the exiting ones in the "
+"table have already been sent to the customer."
+msgstr "它只会是可以添加的结束日期，如果表中的所有现有的已经发送给客户。"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:43
+msgid "Entity sequences"
+msgstr "实体序列"
+
+#: 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
+msgid "must be after start date"
+msgstr "后，必须开始日期"
+
+#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:251
+msgid ""
+"closckStart:the clockStart must be not null if number of hours is calcultate"
+" by clock"
+msgstr "closckStart：clockStart必须不为空，如果小时数calcultate的时钟"
+
+#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:67
+#: libreplan-webapp/src/main/webapp/templates/_listTemplates.zul:27
+msgid "Delay from beginning (days)"
+msgstr "从开始的延迟（天）"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:455
+msgid "Total Hours"
+msgstr "总时数"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:409
+msgid "LibrePlan Role"
+msgstr "LibrePlan角色"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:853
+msgid "Task finished"
+msgstr "任务完成"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeComponent.java:100
+msgid "Must start after (days since project start)"
+msgstr "必须从（日以来，项目启动后）"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionController.java:129
+msgid "Confirm cancel"
+msgstr "确认取消"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:470
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:39
+msgid "Work And Progress Per Task"
+msgstr "每个任务的工作及进展情况"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1529
+msgid "project code already being used"
+msgstr "项目中的代码已被使用"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:191
+msgid "The {0} sequence prefixes cannot be repeated"
+msgstr "{0}前缀不能重复序列"
+
+#: libreplan-business/src/main/java/org/libreplan/business/labels/entities/Label.java:47
+msgid "type not specified"
+msgstr "键入不指定"
+
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:40
+msgid "WBS (tasks)"
+msgstr "WBS（工作）"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:713
+msgid "Deleting sequence"
+msgstr "删除序列"
+
+#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:104
+msgid "Total extra"
+msgstr "总额外的"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:439
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:72
+msgid "Received From Customers"
+msgstr "向客户收取"
+
+#: libreplan-webapp/src/main/webapp/common/layout/template.zul:92
+msgid "Select scenario"
+msgstr "选择场景"
+
+#: libreplan-webapp/src/main/webapp/templates/templates.zul:22
+msgid "LibrePlan: Templates"
+msgstr "LibrePlan：模板"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:417
+msgid "Edit Virtual Workers Group: {0}"
+msgstr "编辑虚拟工人组：{0}"
+
+#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:88
+msgid "Total other"
+msgstr "其他项目合计"
+
+#: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:51
+msgid "Criterion requirement"
+msgstr "标准要求"
+
+#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:21
+msgid "LibrePlan: Expenses"
+msgstr "LibrePlan：费用"
+
+#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:63
+msgid "Maximum/minimum of worked hours in finished applications"
+msgstr "在完成的应用程序的最大/最小工作小时"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:331
+msgid "Scheduling saved"
+msgstr "调度保存"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:711
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:851
+msgid ""
+"You can not remove the project \"{0}\" because this one has imputed expense "
+"sheets."
+msgstr "您无法删除项目“{0}”，因为这个估算的费用表。"
+
+#: 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 "添加新行"
+
+#: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:23
+msgid "Criteria list"
+msgstr "标准列表"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:492
+msgid "Move"
+msgstr "移动"
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/Order.java:363
+msgid "deadline must be after start date"
+msgstr "截止日期后，必须开始日期"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordController.java:68
+msgid "Password saved"
+msgstr "密码保存"
+
+#: libreplan-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:34
+#: libreplan-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:29
+msgid "Overload"
+msgstr "超载"
+
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractorCommunication.java:76
+msgid "subcontrated task data not specified"
+msgstr "未指定的subcontrated任务数据"
+
+#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:50
+#: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:30
+msgid "Assignment log"
+msgstr "分配日志"
+
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:75
+#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:160
+msgid "New"
+msgstr "新"
+
+#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:49
+msgid "Date last progress measurement"
+msgstr "日期最近的进展测量"
+
+#: libreplan-webapp/src/main/webapp/externalcompanies/externalcompanies.zul:23
+msgid "LibrePlan: Companies"
+msgstr "LibrePlan公司"
+
+#: 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
+msgid "Queue-based"
+msgstr "基于队列"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:303
+msgid "Derived of calendar {0}"
+msgstr "派生的日历{0}"
+
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:90
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:108
+msgid "Deliver date"
+msgstr "交货日期"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:235
+msgid ""
+"Days Interval (Calculated as task completion end date minus estimated end "
+"date)"
+msgstr "天的间隔（任务完成的最后日期减去估计值，的结束日期计算）"
+
+#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/TaskQualityForm.java:101
+msgid ""
+"Each date must be greater than the dates of the previous task quality form "
+"items."
+msgstr "每一个日期必须大于以前的工作质量的表单项目的日期。"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:290
+msgid "Stretch date must be earlier than End date: "
+msgstr "拉伸日期必须早于结束日期："
+
+#: libreplan-webapp/src/main/webapp/common/access_forbidden.zul:38
+msgid "You do not have permissions to access to this page."
+msgstr "您没有权限访问此页。"
+
+#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityForm.java:216
+msgid "The quality form item positions must be unique and consecutive."
+msgstr "质量形式的项目的位置必须是唯一的，有连贯性。"
+
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:27
+msgid "External company"
+msgstr "外部公司"
+
+#: 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/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 "操作"
+
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:130
+msgid "Exceptions"
+msgstr "例外"
+
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:33
+msgid "User settings"
+msgstr "用户设置"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:833
+#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:110
+msgid "Start hour"
+msgstr "开始小时"
+
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:130
+msgid "Assign materials"
+msgstr "指定材料"
+
+#: 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
+#: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:29
+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 "格式过滤器是无效的"
+
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:21
+msgid "LibrePlan: Project Costs"
+msgstr "LibrePlan：项目成本"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/ProjectStatusReportController.java:212
+msgid "please, select a criterion"
+msgstr "请选择一个标准"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:294
+msgid "Set Code as autogenerated to create a new project from templates"
+msgstr "设置代码自动生成创建一个新的项目模板"
+
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:161
+msgid "Hours Group"
+msgstr "h组"
+
+#: 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 "绑定用户"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:819
+msgid "Unallocated name"
+msgstr "未分配名称"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:282
+msgid "Password cannot be empty"
+msgstr "密码不能为空"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:249
+msgid "BCWP"
+msgstr "BCWP"
+
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:149
+msgid "Dependencies have priority"
+msgstr "依赖关系有优先权"
+
+#: 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
+msgid "Create {0}"
+msgstr "创建{0}"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesModel.java:317
+msgid "Already exists another template with the same name"
+msgstr "已经存在具有相同名称的另一个模板"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:220
+msgid "Unlimited"
+msgstr "无限"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:252
+msgid "Budget At Completion"
+msgstr "完成财政预算案"
+
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:77
+msgid "Assign Label"
+msgstr "指定标签"
+
+#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:79
+msgid "Page up"
+msgstr "上页"
+
+#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:24
+msgid "Create new project"
+msgstr "创建新项目"
+
+#: 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
+msgid "date in the future"
+msgstr "未来的日期"
+
+#: 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/webapp/subcontract/subcontractedTasks.zul:56
+#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:51
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:104
+#: libreplan-webapp/src/main/webapp/orders/_list.zul:35
+msgid "State"
+msgstr "州"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:90
+msgid "Must start after"
+msgstr "必须在这之后启动"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:118
+msgid "Fully, Partially or Unscheduled. (Drag and drop to move tasks)"
+msgstr "完全，部分或不定期。（拖放移动任务）"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1322
+msgid "Confirm change"
+msgstr "确认更改"
+
+#: 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 "成本类别名称必须是唯一的，它已经在使用"
+
+#: libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialInfo.java:48
+msgid "units not specified"
+msgstr "未指定的单位"
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLine.java:328
+msgid "Code already included in Hours Group codes"
+msgstr "代码已经包含在h组码"
+
+#: 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-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:47
+msgid "Planning"
+msgstr "规划"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:370
+msgid ""
+"The task has got progress consolidations. To change resource allocation type"
+" all consolidations must be removed before"
+msgstr "任务有进度合并。要改变资源分配类型合并之前，必须删除"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ReportAdvancesController.java:199
+#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksController.java:207
+msgid "Send"
+msgstr "发送"
+
+#: libreplan-webapp/src/main/webapp/common/layout/template.zul:108
+msgid "user"
+msgstr "用户"
+
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:21
+msgid "LibrePlan: Materials"
+msgstr "LibrePlan：材料"
+
+#: 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"
+msgstr "新任务"
+
+#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:30
+msgid "Associated user"
+msgstr "相关的用户"
+
+#: libreplan-webapp/src/main/webapp/typeofworkhours/_listTypesOfWorkHours.zul:27
+msgid "Type name"
+msgstr "型号名称"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportQueryController.java:250
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/TimeLineRequiredMaterialController.java:207
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:181
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:728
+#: 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/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 "所有"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/advances/AdvanceAssignmentPlanningCommand.java:69
+msgid "Progress assignment"
+msgstr "任务分配"
+
+#: 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 "手册"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioModel.java:118
+msgid "You cannot remove the default scenario \"{0}\""
+msgstr "您不能删除默认的情况下，“{0}”"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:179
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskDeadlineViolationStatusEnum.java:36
+msgid "On schedule"
+msgstr "如期"
+
+#: libreplan-webapp/src/main/webapp/calendars/_list.zul:22
+msgid "Calendars List"
+msgstr "日历列表"
+
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:281
+msgid "Create activation period"
+msgstr "激活期限"
+
+#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:31
+msgid "Personal details"
+msgstr "个人详细信息"
+
+#: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:22
+msgid "Workers List"
+msgstr "工作人员名单"
+
+#: 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 "遗传"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:519
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:597
+msgid ""
+"Cannot allocate selected element. There is not any queue that matches "
+"resource allocation criteria at any interval of time"
+msgstr "无法分配选中的元素。没有任何相匹配的资源分配准则"
+
+#: 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 "工人"
+
+#: 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 "日期是无效的，它必须晚于上一次进度报给客户的"
+
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java:224
+msgid "User already bound to other worker"
+msgstr "用户已经绑定到其他工人"
+
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:300
+msgid "criterion name not specified"
+msgstr "准则名称未指定"
+
+#: libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java:170
+msgid "port not specified"
+msgstr "端口没有指定"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:263
+msgid "calendar not specified"
+msgstr "日历不指定"
+
+#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:277
+msgid "Start hour cannot be greater than finish hour"
+msgstr "开始每小时不能大于终点小时"
+
+#: 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 ""
+"There are unsaved changes in the current personal timesheet, please save "
+"before moving"
+msgstr "目前的个人时间表有未保存的更改，请保存在移动前"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:511
+msgid "Preferences"
+msgstr "首选项"
+
+#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:25
+msgid "Manual allocation"
+msgstr "手动分配"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:386
+msgid "Role property"
+msgstr "角色属性"
+
+#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceAssignment.java:75
+msgid "progress type not specified"
+msgstr "不指定进步型"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/ExpensesAreaController.java:108
+msgid "Expense sheet \"{1}\" could not be deleted, it was already removed"
+msgstr "费用表“{1}”不能被删除，它已删除"
+
+#: libreplan-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:29
+msgid "External overload"
+msgstr "外部过载"
+
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:33
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:58
+msgid "Authorize"
+msgstr "授权"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:330
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1111
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1174
+msgid ""
+"Progress Measurement cannot be deleted. Progress Measurement already "
+"consolidated"
+msgstr "进展测量不能被删除。进展测量已经巩固"
+
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:47
+msgid "Recommended allocation"
+msgstr "推荐配置"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:278
+msgid "Activation"
+msgstr "激活"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:759
+msgid "Calculated progress cannot be removed"
+msgstr "计算的进步不能被删除"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:375
+msgid "Materials saved"
+msgstr "材料保存"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:458
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:39
+msgid "Total Worked Hours By Resource In A Month"
+msgstr "在一个月内通过资源的总工作小时"
+
+#: libreplan-webapp/src/main/webapp/common/access_forbidden.zul:20
+msgid "LibrePlan: Access Forbidden"
+msgstr "LibrePlan：拒绝访问"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadModel.java:703
+msgid "Other projects"
+msgstr "其他项目"
+
+#: 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 "如果不能为空的小时数calcultate的时钟时钟完成"
+
+#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:117
+msgid "Tasks input buffer"
+msgstr "任务输入缓冲区"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeModel.java:412
+msgid "Code cannot be empty"
+msgstr "代码不能为空"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:391
+msgid "Template cannot be removed because it has applications"
+msgstr "模板不能被删除，因为它的应用"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:187
+msgid "At least one {0} sequence must be active"
+msgstr "至少有一个{0}序列必须是活动的"
+
+#: 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
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:66
+msgid "Profile name"
+msgstr "配置文件名称"
+
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionSatisfaction.java:297
+msgid "criterion satisfaction with end date before start"
+msgstr "标准的满意度开始前与结束日期"
+
+#: libreplan-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:107
+msgid "Disable Delete"
+msgstr "禁用删除"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:476
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:39
+msgid "Estimated/Planned Hours Per Task"
+msgstr "估计小时数/计划任务"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:182
+msgid "At least one {0} sequence is needed"
+msgstr "至少有一个{0}序列需要"
+
+#: libreplan-webapp/src/main/webapp/costcategories/costCategory.zul:23
+msgid "LibrePlan: Cost Categories"
+msgstr "LibrePlan：成本类别"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/TwoWaySelector.java:68
+msgid "Assigned"
+msgstr "分配"
+
+#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:96
+msgid "Total capacity"
+msgstr "总容量"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:281
+msgid "Use LDAP roles"
+msgstr "使用LDAP的角色"
+
+#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:44
+msgid "Details"
+msgstr "详细信息"
+
+#: 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
+msgid "Error: {0}"
+msgstr "错误：{0}"
+
+#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:65
+#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:36
+msgid "More options"
+msgstr "更多选项"
+
+#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:21
+msgid "LibrePlan: Personal timesheet"
+msgstr "LibrePlan：个人时间表"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/TreeElementOperationsController.java:244
+msgid "Confirm create template"
+msgstr "确认创建模板"
+
+#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:50
+msgid "Work amount"
+msgstr "工程量"
+
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:250
+msgid "Parent"
+msgstr "亲"
+
+#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:91
+msgid "Earliest date"
+msgstr "最早的日期"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:513
+msgid "Change Password"
+msgstr "更改密码"
+
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:21
+msgid "LibrePlan: Work And Progress Per Task"
+msgstr "LibrePlan：每个任务的工作和进展"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:270
+#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:48
+msgid "Projects"
+msgstr "项目"
+
+#: 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
+msgid "Confirm exit dialog"
+msgstr "确认退出对话框"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/converters/ConverterFactory.java:64
+msgid "Not found converter for {0}"
+msgstr "找不到转换器的{0}"
+
+#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportType.java:427
+msgid ""
+"In the lines part, index labels and fields must be unique and consecutive"
+msgstr "在线部分，索引标签和字段必须是唯一的和连续的"
+
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:66
+#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:52
+msgid "Subcontracting code"
+msgstr "分包代码"
+
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:79
+msgid "Material assignments"
+msgstr "材质指定"
+
+#: libreplan-business/src/main/java/org/libreplan/business/common/entities/EntitySequence.java:101
+msgid "last value not specified"
+msgstr "未指定的最后一个值"
+
+#: 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 "任务不指定"
+
+#: libreplan-webapp/src/main/webapp/myaccount/changePassword.zul:43
+msgid "Change password"
+msgstr "更改密码"
+
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:38
+msgid ""
+"Password cannot be managed for LDAP users because LDAP authentication is "
+"enabled."
+msgstr "因为启用了LDAP身份验证密码不能为LDAP的用户管理。"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1325
+msgid ""
+"Progress measurement cannot be canged to {0}, because it is consolidated"
+msgstr "进展测量不能canged {0}“，因为它是综合"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:826
+msgid "Text field"
+msgstr "文本字段"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:97
+msgid "Question"
+msgstr "问题"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:133
+msgid ""
+"The meausure name is not valid. There is another unit type with the same "
+"measure name"
+msgstr "测量名称是无效的。还有另一种单位类型相同的测量名称"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:626
+msgid "{0} cannot be fulfilled"
+msgstr "{0}不能满足"
+
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:69
+msgid "Extended view"
+msgstr "扩展视图"
+
+#: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/CustomerCommunication.java:132
+msgid "project not specified"
+msgstr "项目不指定"
+
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:34
+msgid "Work record"
+msgstr "工作记录"
+
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:168
+#: 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 "输出格式"
+
+#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:49
+msgid "Print"
+msgstr "打印"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionsModel.java:179
+msgid "{0} not found type for criterion "
+msgstr "{0}未找到准则类型"
+
+#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:74
+msgid "Page down"
+msgstr "翻下页"
+
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:486
+msgid "resource type does not allow enabled criteria"
+msgstr "资源类型不允许启用准则"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/TransferOrdersModel.java:148
+msgid "Please, select a destination scenario"
+msgstr "请选择一个目的地的情况"
+
+#: 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 "取消"
+
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:36
+msgid "General user data"
+msgstr "一般的用户数据"
+
+#: libreplan-webapp/src/main/webapp/common/components/schedulingStateToggler.zul:32
+msgid "Unschedule"
+msgstr "取消预定"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksController.java:216
+msgid "Subcontracted task sent successfully"
+msgstr "分包任务发送成功"
+
+#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:77
+msgid "Accumulated hours chart"
+msgstr "累计小时图"
+
+#: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:22
+msgid "Machines List"
+msgstr "机器分类"
+
+#: 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 "你没有这个项目的读取权"
+
+#: 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/resources/criterion/CriterionAdminController.java:96
+msgid ""
+"Disable hierarchy will cause criteria tree to be flattened. Are you sure?"
+msgstr "禁用层次结构将导致扁平化标准树。你确定吗？"
+
+#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:231
+msgid "default maximum value of percentage progress type must be 100"
+msgstr "默认的最大值的百分比进度类型必须是100"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:139
+msgid "Cannot create another progress of the same type"
+msgstr "无法创建另一个相同类型的进度"
+
+#: 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
+msgid "Dates"
+msgstr "日期"
+
+#: 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
+msgid "Units"
+msgstr "单位"
+
+#: 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"
+msgstr "中的至少一个需要拉伸"
+
+#: libreplan-business/src/main/java/org/libreplan/business/expensesheet/entities/ExpenseSheet.java:140
+msgid "The expense sheet line codes must be unique."
+msgstr "费用表行代码必须是唯一的。"
+
+#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:285
+msgid "description value: the timesheet has some description field missing"
+msgstr "描述值的时间表有一些缺少描述字段"
+
+#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:23
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:237
+msgid "Create new Workweek"
+msgstr "创建新的工作周"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:112
+msgid "Autocomplete login form"
+msgstr "自动完成登录表单"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesCommand.java:61
+msgid "Task Properties"
+msgstr "任务属性"
+
+#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:69
+msgid "hours type"
+msgstr "小时类型"
+
+#: libreplan-business/src/main/java/org/libreplan/business/common/entities/ConfigurationRolesLDAP.java:56
+msgid "LibrePlan role not specified"
+msgstr "LibrePlan没有指定的角色"
+
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:21
+msgid "LibrePlan: Task Scheduling Status In Project"
+msgstr "LibrePlan：项目的任务调度状态"
+
+#: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:27
+msgid "name"
+msgstr "名称"
+
+#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:76
+msgid "Delete selected task"
+msgstr "删除选定的任务"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesModel.java:133
+msgid "{0} (max: {1})"
+msgstr "{0}（最大：{1}）"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:526
+msgid "Cost Category"
+msgstr "成本类别"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:492
+msgid "end"
+msgstr "结束"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:393
+msgid "Role search query"
+msgstr "角色的搜索查询"
+
+#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:285
+msgid "The hour cost codes must be unique."
+msgstr "一小时的费用代码必须是唯一的。"
+
+#: libreplan-webapp/src/main/webapp/resources/worker/_localizations.zul:63
+msgid "Log"
+msgstr "登录"
+
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:68
+msgid "Inherited exception"
+msgstr "继承的例外"
+
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:57
+msgid "Authorizations"
+msgstr "授权"
+
+#: libreplan-webapp/src/main/webapp/common/concurrent_modification.zul:36
+#: libreplan-webapp/src/main/webapp/common/event_error.zul:49
+msgid "Continue"
+msgstr "继续"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementController.java:122
+msgid "Edit task {0}"
+msgstr "编辑任务{0}"
+
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:23
+msgid "LibrePlan: Timesheets"
+msgstr "LibrePlan：时间表"
+
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:231
+msgid "username is already being used by another user"
+msgstr "用户名已经被另一个用户使用"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:328
+msgid "references"
+msgstr "引用"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractController.java:140
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1575
+msgid "You must select a valid date. "
+msgstr "你必须选择一个有效的日期。"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/GenericAllocationRow.java:55
+msgid "Generic"
+msgstr "通用"
+
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:43
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:65
+#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:42
+msgid "Template"
+msgstr "模板"
+
+#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityFormItem.java:112
+#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityForm.java:277
+#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/TaskQualityFormItem.java:126
+msgid "percentage should be greater than 0% and less than 100%"
+msgstr "比例应为大于0% 且小于100％的"
+
+#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportType.java:187
+msgid "The field name must be unique."
+msgstr "字段名称必须是唯一的。"
+
+#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:49
+msgid "Default max value"
+msgstr "默认的最大值"
+
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:36
+msgid "Add criterion requirement"
+msgstr "标准要求"
+
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:146
+msgid "Percentage of estimated budget hours / hours consumed"
+msgstr "估计预算小时/小时消耗的百分比"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:500
+msgid "Automatic"
+msgstr "自动"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/CriterionBandboxFinder.java:44
+msgid "Criterion Name"
+msgstr "标准名称"
+
+#: 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/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 "任务"
+
+#: libreplan-webapp/src/main/webapp/myaccount/changePassword.zul:21
+msgid "LibrePlan: Change password"
+msgstr "LibrePlan：更改密码"
+
+#: 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/orders/labels/AssignedLabelsController.java:90
+msgid "please, select a label"
+msgstr "请选择一个标签"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/GlobalProgressChart.java:58
+msgid "Expected"
+msgstr "预期"
+
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:154
+msgid "Add profile"
+msgstr "添加配置文件"
+
+#: libreplan-webapp/src/main/webapp/scenarios/scenarios.zul:23
+msgid "LibrePlan: Scenarios Management"
+msgstr "LibrePlan：场景管理"
+
+#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/ResourcesCostCategoryAssignment.java:145
+msgid "cost assignment with end date before start date"
+msgstr "成本分配结束日期早于开始日期"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/bandboxsearch/BandboxMultipleSearch.java:227
+msgid "filter already exists"
+msgstr "过滤器已存在"
+
+#: libreplan-webapp/src/main/webapp/resources/_criterions.zul:40
+#: libreplan-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:27
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:46
+msgid "Criterion name"
+msgstr "标准名称"
+
+#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:224
+msgid "date cannot be empty if it is shared by lines"
+msgstr "如果它是共享的线日期不能为空"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:126
+msgid "values are not valid, the values must not be null"
+msgstr "值是无效的，这些值必须不能为空"
+
+#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:41
+msgid "Apply changes and go back to scheduling"
+msgstr "应用更改并返回到调度"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/GlobalProgressChart.java:60
+#: libreplan-business/src/main/java/org/libreplan/business/common/entities/ProgressType.java:36
+msgid "Spreading progress"
+msgstr "传播进步"
+
+#: 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/orders/_orderElementDetails.zul:32
+msgid "Task name"
+msgstr "任务名称"
+
+#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/ResourcesCostCategoryAssignment.java:128
+msgid "cost assignment's resource not specified"
+msgstr "成本分配的资源没有指定"
+
+#: 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/common/components/finders/OrderElementBandboxFinder.java:51
+#: 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 "项目"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:371
+msgid ""
+"Starting date cannot be empty because there is a task with constraint \"as "
+"soon as possible\""
+msgstr "开始日期不能是空的，因为有一个约束的任务“尽快”"
+
+#: libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialCategory.java:290
+msgid "last material sequence code not specified"
+msgstr "最后材料未指定的序列码"
+
+#: 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 "不能删除，因为它有提前的措施，已经报给客户的提前分配"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:480
+msgid "Extra"
+msgstr "额外"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/TwoWaySelector.java:79
+msgid "Unassigned"
+msgstr "未分配"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1587
+msgid "It already exists a end date with the same date. "
+msgstr "它已经存在具有相同的日期结束日期。"
+
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:102
+msgid "Add new criterion requirement"
+msgstr "新准则要求"
+
+#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:237
+msgid "resource cannot be empty if it is shared by lines"
+msgstr "资源不能是空的，如果它是共享的线"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:249
+msgid "Budgeted Cost Work Performed"
+msgstr "预算工作的成本"
+
+#: libreplan-webapp/src/main/webapp/common/layout/template.zul:142
+msgid "Change the password"
+msgstr "更改密码"
+
+#: libreplan-business/src/main/java/org/libreplan/business/labels/entities/LabelType.java:158
+msgid "label code is already being used"
+msgstr "标签代码已被使用"
+
+#: 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
+msgid "Disabled"
+msgstr "禁用"
+
+#: 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
+msgid "Earned value"
+msgstr "挣值"
+
+#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:35
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:163
+msgid "Overtime Effort"
+msgstr "加班"
+
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:231
+msgid "Inherited from parent calendar"
+msgstr "继承自父日历。"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportQueryController.java:338
+msgid "You do not have permissions to edit this timesheet"
+msgstr "您没有权限编辑这个时间表"
+
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:161
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:199
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:225
+msgid "Normal Effort"
+msgstr "普通"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java:138
+msgid "{0} reassignations finished"
+msgstr "{0} 重新分配完成"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/TreeElementOperationsController.java:254
+msgid ""
+"Templates can only be created out of existent tasks.You are trying to create a template out of a new task.\n"
+"Please save your project before proceeding."
+msgstr "只可以从存在的任务创造模板.你尝试从新的任务创建一个模板。⏎ 在继续操作之前，请保存您的项目。"
+
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:66
+#: libreplan-webapp/src/main/webapp/myaccount/_personalTimesheetsArea.zul:33
+msgid "Total work"
+msgstr "总的工作"
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:1497
+msgid "a quality form cannot be assigned twice to the same task"
+msgstr "优质的形式不能被分配​​了两次相同的任务"
+
+#: libreplan-business/src/main/java/org/libreplan/business/common/entities/EntitySequence.java:145
+msgid "number of digits out of range"
+msgstr "超出范围的数字数"
+
+#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:436
+msgid "The timesheet line codes must be unique."
+msgstr "时间表行代码必须是唯一的。"
+
+#: 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
+msgid "Calendar Exception Days"
+msgstr "日历例外日"
+
+#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:114
+msgid "Time tracking"
+msgstr "实时跟踪"
+
+#: libreplan-webapp/src/main/webapp/common/page_not_found.zul:43
+msgid ""
+"If you entered the URL directly in the navigation bar of the browser, please"
+" review it or click in the following link in order to go to initial page: "
+msgstr "如果你的浏览器在导航栏中直接输入URL，请查看或点击以下链接，以进入到最初的页面："
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1124
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1139
+msgid "{0} not supported yet"
+msgstr "{0}不支持"
+
+#: libreplan-webapp/src/main/webapp/common/layout/login.zul:144
+msgid "is not supported for its use with LibrePlan."
+msgstr "不支持它与LibrePlan的使用。"
+
+#: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:53
+msgid "New entry"
+msgstr "新的条目"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:102
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:111
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:138
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:160
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:278
+msgid "Resources Load"
+msgstr "资源负载"
+
+#: libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java:190
+msgid "userId not specified"
+msgstr "用户标识没有指定"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:226
+msgid "Changes have been canceled"
+msgstr "更改已被取消"
+
+#: libreplan-webapp/src/main/webapp/planner/index.zul:22
+msgid "LibrePlan: Planning"
+msgstr "LibrePlan：规划"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:197
+msgid "Expense sheets"
+msgstr "费用表"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:336
+msgid "Authentication"
+msgstr "认证"
+
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:88
+msgid "Select language"
+msgstr "选择语言"
+
+#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:104
+msgid "Appropriative allocation"
+msgstr "专用配置"
+
+#: 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
+msgid "This criterion type cannot have multiple values in the same period"
+msgstr "在同一时期，此标准类型不能有多个值"
+
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:31
+msgid "Assigned criterion requirements"
+msgstr "分配的标准要求"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java:247
+msgid "Calendar Exception Day"
+msgstr "日历例外日"
+
+#: 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/workingArrangementsPerOrderReport.zul:125
+msgid "Filter by criteria"
+msgstr "过滤器通过标准"
+
+#: libreplan-webapp/src/main/webapp/templates/_advances.zul:37
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:43
+msgid "Max value"
+msgstr "最大值"
+
+#: 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
+msgid "No"
+msgstr "没有"
+
+#: libreplan-webapp/src/main/webapp/scenarios/_list.zul:22
+msgid "Scenarios List"
+msgstr "方案列表"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:115
+msgid "The name is not valid, the name must not be null "
+msgstr "的名称是无效的，该名称必须不能为空"
+
+#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:142
+msgid "Hours to allocate"
+msgstr "时间分配"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:115
+msgid "A category must be selected"
+msgstr "必须选择一个类别"
+
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:264
+msgid "Delivery dates asked by the subcontractor. "
+msgstr "交货日期要求的分包商。"
+
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:149
+msgid "Period"
+msgstr "期"
+
+#: libreplan-webapp/src/main/webapp/templates/_advances.zul:38
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:47
+msgid "Spread"
+msgstr "传播"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1021
+msgid "Disabled because of it contains more than one hours group"
+msgstr "禁用，因为它包含了一个多小时组"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:333
+msgid "Confirm remove user"
+msgstr "确认删除用户"
+
+#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:93
+msgid "Select start date"
+msgstr "选择“开始日期”"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:882
+msgid "Removed {0}"
+msgstr "移除{0}"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:257
+msgid ""
+"This criterion type cannot be deleted because it is assigned to projects or "
+"resources"
+msgstr "这个标准不能被删除，因为它是分配给项目或资源类型"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:959
+msgid "Confirm deleting this worker. Are you sure?"
+msgstr "确认删除这名工人。你确定吗？"
+
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:67
+msgid "Group name"
+msgstr "组名"
+
+#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:470
+msgid ""
+"description value: the timesheet has not assigned the description field"
+msgstr "描述值的时间表还没有分配的描述字段"
+
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:140
+#: libreplan-webapp/src/main/webapp/profiles/_editProfile.zul:60
+msgid "Role name"
+msgstr "角色名称"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:984
+msgid "This worker was already removed by other user"
+msgstr "这名工人已经删除由其他用户"
+
+#: libreplan-webapp/src/main/webapp/typeofworkhours/_editTypeOfWorkHours.zul:27
+msgid "Work hour type data"
+msgstr "工作时间类型的数据"
+
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/MachineWorkersConfigurationUnit.java:188
+msgid "The same resource is assigned twice inside an interval"
+msgstr "相同的资源被分配的时间间隔内两次"
+
+#: 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 "值无效，精度值不能为空"
+
+#: 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 "Ĥ"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:363
+msgid "Workable capacity for this period "
+msgstr "这一时期的可行能力"
+
+#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:312
+msgid "last hours cost sequence code not specified"
+msgstr "最后一个小时的成本没有指定的序列码"
+
+#: libreplan-webapp/src/main/webapp/myaccount/userDashboard.zul:21
+msgid "LibrePlan: My Dashboard"
+msgstr "LibrePlan：我的仪表板"
+
+#: libreplan-webapp/src/main/webapp/subcontract/subcontractorCommunications.zul:33
+msgid "Communications From Subcontractors"
+msgstr "从分包商的通信"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:339
+msgid "Quality Form"
+msgstr "质量表"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/milestone/AddMilestoneCommand.java:67
+msgid "Add Milestone"
+msgstr "添加里程碑"
+
+#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:122
+msgid "Assign selected items"
+msgstr "分配给选定的项目"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:468
+msgid "init"
+msgstr "初始化"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1296
+msgid "Add new progress measurement"
+msgstr "添加新的进展测量"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:530
+msgid "Select for automatic queuing"
+msgstr "选择自动排队"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/TransferOrdersController.java:192
+msgid "Project {0} transfered"
+msgstr "项目{0}转移"
+
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:96
+msgid "Create & Assign"
+msgstr "创建和分配"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1244
+msgid "Calculated progress measurements cannot be removed"
+msgstr "计算进度的测量值不能被删除"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1565
+msgid "Not configurable"
+msgstr "不可配置"
+
+#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:204
+msgid "timesheet not specified"
+msgstr "时间表没有指定"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:774
+msgid "The length must be greater than 0 and not empty"
+msgstr "该长度必须大于0和不为空"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:280
+msgid "Task Status"
+msgstr "任务状态"
+
+#: 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
+msgid "Bound resource"
+msgstr "绑定资源"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:187
+msgid "Calendar exception days"
+msgstr "日历例外日"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationCommand.java:47
+msgid "Advanced allocation"
+msgstr "高级配置"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:246
+msgid "Estimation deviation on completed tasks"
+msgstr "估计偏差已完成的任务"
+
+#: 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 "综合"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:209
+msgid "MonteCarlo method"
+msgstr "蒙特卡罗方法"
+
+#: 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
+msgid "Edit Worker: {0}"
+msgstr "编辑工作者：{0}"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:1143
+msgid "You do not have permissions to go to user edition window"
+msgstr "您没有权限去用户编辑窗口"
+
+#: libreplan-webapp/src/main/webapp/common/layout/login.zul:21
+msgid "LibrePlan: User access"
+msgstr "LibrePlan：用户访问"
+
+#: 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/webapp/subcontract/customerCommunications.zul:56
+#: 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 "顾客"
+
+#: 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
+msgid "Hours type"
+msgstr "小时类型"
+
+#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:43
+msgid "Show money cost bar"
+msgstr "显示资金成本栏"
+
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:211
+msgid "criterion type name not specified"
+msgstr "标准类型名称未指定"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:428
+msgid ""
+"Default calendar cannot be removed. Please, change the default calendar in "
+"the Main Settings window before."
+msgstr "不能删除默认日历。请更改默认的日历在主设置窗口前。"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:258
+msgid "Cannot connect to LDAP server"
+msgstr "无法连接到LDAP服务器"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1582
+msgid "must be before end date"
+msgstr "必须在结束日期之前"
+
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:219
+msgid "Add Exception"
+msgstr "添加例外"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:123
+#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:125
+#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:127
+#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:128
+#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:148
+#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:310
+#: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:193
+#: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:197
+#: 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/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
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:364
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:377
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:390
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:401
+#: 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/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/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/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/workreports/workReport.zul:161
+#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:34
+#: 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/_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
+msgid "cannot be empty"
+msgstr "不能为空"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:425
+msgid "Effort must be greater than zero"
+msgstr "努力必须大于零"
+
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:50
+#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:54
+#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:40
+#: libreplan-webapp/src/main/webapp/orders/_orderFilter.zul:27
+msgid "from"
+msgstr "从"
+
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:173
+msgid "Heading Fields"
+msgstr "标题字段"
+
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:72
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:82
+msgid "Progress type"
+msgstr "进展型"
+
+#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportType.java:198
+msgid "Assigned Label Type cannot be repeated in a Timesheet Template."
+msgstr "指定标签类型不能重复的时间表模板。"
+
+#: 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 "营业时间类型是空的。请创建了几个小时，然后再进行"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:851
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/ResourceType.java:30
+msgid "Normal resource"
+msgstr "普通资源"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkRelationshipsController.java:155
+msgid ""
+"Time period contains non valid data. Ending data must be older than starting"
+" date"
+msgstr "时间段中包含非有效数据。，结束数据必须是老年人，比出发日期"
+
+#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:35
+msgid "Expand taskgroups"
+msgstr "展开taskgroups"
+
+#: libreplan-webapp/src/main/webapp/common/layout/template.zul:141
+msgid "The admin's account password remains the default one. This is insecure"
+msgstr "该管理员帐户的密码仍然是默认的。这是不安全的"
+
+#: libreplan-webapp/src/main/webapp/orders/_ordersTab.zul:33
+msgid "Save Project"
+msgstr "保存项目"
+
+#: 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"
+msgstr "天是无效的"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:627
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1263
+msgid "You should select a start date for the exception"
+msgstr "你应该选择的开始日期异常"
+
+#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/DirectAdvanceAssignment.java:237
+msgid "maximum value must be greater than zero"
+msgstr "最大值必须大于零"
+
+#: libreplan-webapp/src/main/webapp/common/layout/_customMenu.zul:72
+msgid "Help"
+msgstr "帮助"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:254
+msgid "Variance At Completion"
+msgstr "完成差异"
+
+#: libreplan-webapp/src/main/webapp/common/layout/template.zul:171
+msgid "default password was not changed"
+msgstr "默认情况下未更改密码"
+
+#: libreplan-webapp/src/main/webapp/unittypes/unitTypes.zul:21
+msgid "LibrePlan: Material Units"
+msgstr "LibrePlan：材料单位"
+
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java:256
+msgid "Virtual resources cannot be bound to any user"
+msgstr "虚拟资源不能被绑定到任何用户"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:498
+msgid "Code sequence is already in use and cannot be updated"
+msgstr "码序列是已经在使用中，不能被更新"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/SettingsController.java:96
+msgid "Settings saved"
+msgstr "设置保存"
+
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:71
+msgid "Exportation options"
+msgstr "出口选项"
+
+#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:94
+msgid "effort not specified"
+msgstr "努力没有指定"
+
+#: 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/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/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/materials/materials.zul:60
+#: 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/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/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 "名称"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkRelationshipsController.java:160
+msgid ""
+"Could not save time period. Time period overlaps with another non-compatible"
+" time period"
+msgstr "无法保存的时间段。与另一非兼容的时间周期的时间段重叠"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:168
+msgid "Delete task"
+msgstr "删除任务"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/EffortDurationPicker.java:69
+msgid "Seconds"
+msgstr "秒"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:119
+msgid "please, select an item"
+msgstr "请选择一个项目"
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:1181
+msgid "a label can not be assigned twice in the same branch"
+msgstr "不能两次在同一个分支分配一个标签"
+
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:224
+msgid "Day of week"
+msgstr "每周日"
+
+#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:22
+msgid "Companies List"
+msgstr "企业名录"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:441
+msgid "Normal resource assignment"
+msgstr "正常的资源分配"
+
+#: libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java:135
+msgid "default calendar not specified"
+msgstr "不指定默认日历"
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLineGroup.java:1146
+msgid "indirect progress assignments should have different types"
+msgstr "间接进度任务应该有不同的类型"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1469
+msgid "Stretches with Interpolation"
+msgstr "伸展与插值"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:451
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:39
+msgid "Hours Worked Per Resource"
+msgstr "工作时数资源"
+
+#: libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialInfo.java:39
+msgid "material not specified"
+msgstr "材料不指定"
+
+#: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:26
+#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:36
+msgid "Category name"
+msgstr "分类名称"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:760
+msgid "Date must be inside visualization area"
+msgstr "日期必须是区域内的可视化"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:124
+msgid "Show a notification when new LibrePlan versions are released"
+msgstr "新LibrePlan版本发布时显示通知"
+
+#: libreplan-webapp/src/main/webapp/common/layout/template.zul:69
+msgid "Main menu"
+msgstr "主菜单"
+
+#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:31
+msgid "MonteCarlo"
+msgstr "蒙特卡洛"
+
+#: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:49
+msgid "Duration"
+msgstr "为期"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:593
+msgid "Exception: {0}"
+msgstr "异常：{0}"
+
+#: libreplan-webapp/src/main/webapp/myaccount/changePassword.zul:54
+msgid "Password settings"
+msgstr "密码设置"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/ExpensesAreaController.java:90
+msgid "Delete expense sheet \"{0}\". Are you sure?"
+msgstr "删除费用表“{0}”。你确定吗？"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:150
+#: libreplan-webapp/src/main/webapp/common/components/schedulingStateToggler.zul:29
+msgid "Schedule"
+msgstr "时间表"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkRelationshipsController.java:164
+msgid "Unexpected: {0}"
+msgstr "意外：{0}"
+
+#: libreplan-business/src/main/java/org/libreplan/business/expensesheet/entities/ExpenseSheet.java:241
+msgid "a personal expense sheet must have the same resource in all the lines"
+msgstr "- 个人开支片必须具有相同的的所有行中的资源"
+
+#: libreplan-webapp/src/main/webapp/planner/main.zul:61
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:50
+msgid "Notes"
+msgstr "笔记"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioCRUDController.java:178
+msgid "Connect"
+msgstr "连"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1240
+msgid "This progress type cannot cannot be removed"
+msgstr "这一进展类型不能不能被删除"
+
+#: 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 "概念"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:223
+msgid "Allocation: [{0},{1}]"
+msgstr "配置：[{0}，{1}]"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:1036
+msgid "Virtual Workers Group"
+msgstr "虚拟工群体"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:210
+msgid "Changes saved"
+msgstr "更改已保存"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1261
+msgid "See scheduling"
+msgstr "见调度"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationController.java:107
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationController.java:110
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:338
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:341
+msgid "Progress measurements"
+msgstr "进展测量"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1295
+msgid "Add measure"
+msgstr "新增措施"
+
+#: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:52
+msgid "Found resources"
+msgstr "发现资源"
+
+#: libreplan-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:27
+#: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:30
+msgid "Relationship"
+msgstr "关系"
+
+#: 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 "分包"
+
+#: libreplan-webapp/src/main/webapp/planner/main.zul:57
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:41
+#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:121
+msgid "End"
+msgstr "结束"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:482
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:39
+msgid "Project Costs"
+msgstr "项目成本"
+
+#: 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
+msgid "Cost Categories"
+msgstr "成本类别"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:420
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:690
+msgid "Other"
+msgstr "其他"
+
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:313
+msgid "criterion type not specified"
+msgstr "不指定标准型"
+
+#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/TypeOfWorkHours.java:103
+msgid "default price not specified"
+msgstr "未指定默认价格"
+
+#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:134
+msgid "timesheet template not specified"
+msgstr "没有规定的时间表模板"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:220
+msgid "Timesheet removed successfully"
+msgstr "时间表成功删除"
+
+#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:22
+msgid "Users List"
+msgstr "用户列表"
+
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:27
+#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:56
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:55
+msgid "Task quality forms"
+msgstr "工作质量形式"
+
+#: 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 "用户名"
+
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:106
+msgid "Has bound resource"
+msgstr "已绑定资源"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1235
+msgid ""
+"Progress measurements that are reported by quality forms cannot be removed"
+msgstr "进展测量所报告的质量形式不能被删除"
+
+#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:426
+msgid ""
+"Number of hours is not properly calculated according to start date and end "
+"date"
+msgstr "根据开始日期和结束日期的小时数，不能正确计算"
+
+#: 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
+msgid "Progress Types"
+msgstr "进展类型"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceFilterEnum.java:29
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:193
+msgid "Cost category"
+msgstr "成本类别"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:342
+msgid "Quality form cannot be removed as it is spreading progress"
+msgstr "质量形式不能被删除，因为它是传播进步"
+
+#: 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 "它不能被删除。至少一个序列是必要的。"
+
+#: libreplan-business/src/main/java/org/libreplan/business/materials/entities/Material.java:105
+msgid "description is not specified"
+msgstr "未指定的描述"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationCommand.java:74
+msgid "Resource allocation"
+msgstr "资源分配"
+
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:266
+msgid "New end date for the customer"
+msgstr "为客户的新的结束日期"
+
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java:161
+msgid "ID already used. It has to be be unique"
+msgstr "ID已被使用。它必须是唯一的"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:172
+msgid "please, select a quality form"
+msgstr "请选择一个质量形式"
+
+#: 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
+msgid "Edit {0}: {1}"
+msgstr "编辑：{0} {1}"
+
+#: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:26
+msgid "Filter quality forms by"
+msgstr "滤波器的品质表格"
+
+#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:68
+msgid "Unindent selected task"
+msgstr "取消缩进选定的任务"
+
+#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:45
+msgid "Customer reference code"
+msgstr "客户参考代码"
+
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:67
+msgid "Constraint"
+msgstr "约束"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:390
+msgid ""
+"Deadline cannot be empty because there is a task with constraint \"as late "
+"as possible\""
+msgstr "截止日期不能为空，因为有约束“的任务尽可能晚地”"
+
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:150
+msgid "Add New Label Type Field"
+msgstr "添加新的标签类型字段"
+
+#: 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 "进展的测量必须有一个值低于其下面的进度测量。"
+
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:233
+msgid "Customer reference"
+msgstr "客户参考"
+
+#: 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/limitingresources/LimitingResourcesController.java:331
+msgid "Information"
+msgstr "信息"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:931
+msgid "Sorry, you do not have permissions to access this project"
+msgstr "对不起，您没有权限访问这个项目"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/ManualAllocationController.java:492
+msgid "END"
+msgstr "END"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:272
+msgid "Worker saved"
+msgstr "工人保存"
+
+#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:35
+msgid "Communications To Subcontractors"
+msgstr "给分包商的通信"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementModel.java:206
+msgid "New hours group "
+msgstr "新h组"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:462
+msgid "Assign element to queue manually"
+msgstr "队列手动分配单元"
+
+#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:47
+msgid "Please remember that only saved changes will be printed"
+msgstr "请记住，只有保存的更改将被打印"
+
+#: libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialCategory.java:254
+msgid "There are repeated material codes"
+msgstr "有重复的材料代码"
+
+#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:36
+msgid "Edit Template"
+msgstr "编辑模板"
+
+#: libreplan-webapp/src/main/webapp/subcontract/subcontractorCommunications.zul:68
+msgid "Progress %"
+msgstr "进度％"
+
+#: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:27
+msgid "Heading"
+msgstr "标题"
+
+#: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:22
+msgid "Criterion Types List"
+msgstr "标准类型列表"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:459
+msgid "Do you want to split the material assignment {0}?"
+msgstr "你想分裂材料的分配{0}？"
+
+#: 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 "以前的日期后，必须"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:112
+msgid "Hours Type"
+msgstr "小时类型"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/montecarlo/MonteCarloController.java:192
+msgid "Percentages should sum 100"
+msgstr "百分比应总结100"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:81
+msgid "Total task budget"
+msgstr "总任务预算"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerModel.java:245
+msgid "Worker must be not-null"
+msgstr "工人必须不能为空"
+
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1063
+msgid "Some criterion satisfactions overlap in time"
+msgstr "一些标准的满意度在时间上重叠"
+
+#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:50
+msgid "Value last progress measurement"
+msgstr "值最后的进步测量"
+
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:21
+msgid "LibrePlan: Materials Needs At Date"
+msgstr "LibrePlan：材料需要在日期"
+
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:44
+msgid "Worker assignments"
+msgstr "工人作业"
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/Order.java:435
+msgid "last task sequence code not specified"
+msgstr "没有指定的最后一个任务序列码"
+
+#: 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}已经存在"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:437
+msgid "Create Worker"
+msgstr "创建工作"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementInExpenseSheetBandboxFinder.java:45
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderInExpenseSheetBandboxFinder.java:44
+msgid "Project name (Project code)"
+msgstr "项目名称（项目编号）"
+
+#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/TaskQualityForm.java:114
+msgid "items cannot be checked until the previous items are checked before."
+msgstr "项目不能进行检查，直到前一个项目之前进行检查。"
+
+#: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:38
+msgid "Code "
+msgstr "码"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:595
+msgid "Exception: {0} (Inh)"
+msgstr "异常：{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
+msgid "Password confirmation"
+msgstr "确认密码"
+
+#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:72
+msgid "Indent selected task"
+msgstr "缩进选定的任务"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:665
+msgid "Regular"
+msgstr "定期"
+
+#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:39
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:88
+msgid "Show progress"
+msgstr "显示进度"
+
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:170
+msgid "Work"
+msgstr "工作"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:342
+msgid ""
+"Error saving the project\n"
+"{0}"
+msgstr "错误保存项目⏎ {0}"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:375
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:220
+msgid ""
+"You are about to leave the planning edition, unsaved changes will be lost."
+msgstr "你即将离开的规划版本，未保存的更改将丢失。"
+
+#: libreplan-webapp/src/main/webapp/resources/machine/machines.zul:22
+msgid "LibrePlan: Machines"
+msgstr "LibrePlan：机"
+
+#: 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
+msgid "{0} h"
+msgstr "{0} H"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:343
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:351
+#: 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/orders/criterionrequirements/AssignedCriterionRequirementController.java:403
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:628
+msgid "Error"
+msgstr "错误"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:256
+msgid "Cost Performance Index"
+msgstr "成本绩效指数"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:254
+msgid "ETC"
+msgstr "ETC"
+
+#: libreplan-webapp/src/main/webapp/common/layout/template.zul:109
+msgid "Log out"
+msgstr "注销"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/ProjectStatusReportController.java:107
+msgid "You should filter the report by project, labels or criteria"
+msgstr "您应该过滤的项目，标签或标准的报告"
+
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:42
+msgid "Filter timesheet by"
+msgstr "筛选时间表由"
+
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:25
+msgid "Add new configuration unit"
+msgstr "添加新的配置单元"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:42
+msgid "Main preferences"
+msgstr "主要的喜好"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationCommand.java:67
+#: libreplan-webapp/src/main/webapp/planner/order.zul:80
+msgid "Progress consolidation"
+msgstr "进展合并"
+
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:47
+msgid "Add new worker assignment"
+msgstr "添加新的工作分配"
+
+#: libreplan-webapp/src/main/webapp/myaccount/_myTasksArea.zul:22
+msgid "My tasks"
+msgstr "我的任务"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:729
+msgid "Show all elements"
+msgstr "显示所有元素"
+
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:27
+msgid "Task Information"
+msgstr "任务信息"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationModel.java:515
+msgid "Progress cannot be consolidated."
+msgstr "进展不能合并。"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeModel.java:403
+msgid "There is another timesheet template with the same name"
+msgstr "还有另外一个时间表的模板具有相同名称的"
+
+#: 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 "传播"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:709
+msgid "Changes applied"
+msgstr "应用的更改"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/adaptplanning/AdaptPlanningCommand.java:70
+msgid "Adapting planning according to timesheets"
+msgstr "适应规划，根据时间表"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:247
+msgid "Budgeted Cost Work Scheduled"
+msgstr "预算成本计划工作"
+
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:471
+msgid "criterion type does not allow hierarchy"
+msgstr "标准型不允许的层次结构"
+
+#: libreplan-webapp/src/main/webapp/dashboard/_costStatus.zul:66
+msgid "Project closing previsions"
+msgstr "项目结束向导"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:186
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:346
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:173
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:58
+msgid "Material Units"
+msgstr "材料单位"
+
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/StretchesFunction.java:351
+msgid ""
+"Last stretch should have one hundred percent length and one hundred percent "
+"of work percentage"
+msgstr "最后一段应该有百分之百的长度和百分之百的工作的百分比"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionsModel.java:216
+msgid "Resource type cannot be empty"
+msgstr "资源类型不能为空"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:44
+msgid "LDAP configuration"
+msgstr "LDAP配置"
+
+#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityForm.java:406
+msgid "progress type should must be defined if quality form reports progress"
+msgstr "进步类型应该必须被定义，如果质量形式报告进度"
+
+#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:30
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:35
+msgid "Superuser"
+msgstr "超级用户"
+
+#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:32
+msgid "Queue Element Information"
+msgstr "队列元素信息"
+
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:98
+msgid "Select template"
+msgstr "选择模板"
+
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:151
+msgid "Start Date"
+msgstr "开始日期"
+
+#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceMeasurement.java:111
+msgid "progress assignment not specified"
+msgstr "不指定任务分配"
+
+#: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:22
+msgid "Virtual Workers Groups List"
+msgstr "虚拟工群体"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:250
+msgid "Cost Variance"
+msgstr "成本差异"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:625
+#: 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
+msgid "Total"
+msgstr "总"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:403
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:66
+msgid "User Accounts"
+msgstr "用户帐户"
+
+#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:158
+msgid "Effort"
+msgstr "功夫"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/CriterionRequirementWrapper.java:222
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:99
+msgid "Invalidate"
+msgstr "废止"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:331
+msgid ""
+"User is bound to resource \"{0}\" and it will be unbound. Do you want to "
+"continue with user removal?"
+msgstr "用户绑定资源“{0}”，这将是未绑定的。你想继续与用户切除？"
+
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:163
+msgid "Budget hours"
+msgstr "财政预算案小时"
+
+#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/TaskQualityFormItem.java:78
+msgid "percentage not specified"
+msgstr "未指定百分比"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:151
+msgid "Edit task: {0}"
+msgstr "编辑任务：{0}"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:129
+msgid ""
+"Check this option if you would like to send feedback to LibrePlan developers"
+" about program usage"
+msgstr "勾选这个选项，如果你想发送反馈给有关程序使用的LibrePlan开发"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:554
+msgid "Machine was already removed"
+msgstr "机已经删除"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:232
+msgid "expense line of the "
+msgstr "费用线"
+
+#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:52
+msgid "Select destination"
+msgstr "选择目的地"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:203
+msgid "cannot be empty or less than zero"
+msgstr "不能为空或小于零"
+
+#: libreplan-webapp/src/main/webapp/planner/order.zul:89
+#: libreplan-webapp/src/main/webapp/planner/order.zul:95
+msgid "Check consolidated progresses"
+msgstr "检查综合进展"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractController.java:287
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractController.java:290
+msgid "Update task end"
+msgstr "更新任务结束"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportModel.java:591
+msgid "Show all"
+msgstr "显示所有"
+
+#: libreplan-webapp/src/main/webapp/typeofworkhours/_listTypesOfWorkHours.zul:28
+#: libreplan-webapp/src/main/webapp/typeofworkhours/_editTypeOfWorkHours.zul:59
+msgid "Default price"
+msgstr "默认价格"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:827
+msgid "Periods available depend on resources' calendar."
+msgstr "期间依赖于资源的日历。"
+
+#: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:39
+msgid "Estimated hours"
+msgstr "估计小时"
+
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:121
+msgid "Apply tab changes"
+msgstr "应用选项卡中的变化"
+
+#: 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
+msgid "passwords don't match"
+msgstr "密码不匹配"
+
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:100
+msgid "Day properties"
+msgstr "Day属性"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:271
+msgid " (%d tasks)"
+msgstr "(%d 工作)"
+
+#: 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
+msgid "must be lower than end date"
+msgstr "必须低于结束日期的"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetDTO.java:120
+msgid "Week {0}"
+msgstr "星期{0}"
+
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:82
+msgid "Hours groups"
+msgstr "小时组"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:116
+msgid ""
+"Enable/Disable autocomplete property in login form, if the admin password is"
+" still the default one"
+msgstr "启用/禁用“自动完成”，在登录表单中，如果系统管理员的密码是默认的"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:182
+msgid "Create new user"
+msgstr "创建新用户"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/TransferOrdersController.java:183
+msgid "Transfer"
+msgstr "转让"
+
+#: libreplan-webapp/src/main/webapp/typeofworkhours/_listTypesOfWorkHours.zul:22
+msgid "Work Hours Types List"
+msgstr "工作时间类型列表"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:764
+msgid "Consolidated progress cannot be removed"
+msgstr "综合进度也不会被删除"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:945
+msgid ""
+"Spread progress cannot be changed if there is a consolidation in any "
+"progress assignment"
+msgstr "不能改变任何任务分配中，如果有一个巩固传播进步"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/GlobalProgressChart.java:63
+msgid "By critical path duration"
+msgstr "通过关键路径时间"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/milestone/AddMilestoneCommand.java:54
+msgid "new milestone"
+msgstr "新的里程碑"
+
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:236
+msgid "Save & New timesheet"
+msgstr "保存新的时间表"
+
+#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:48
+msgid "Value last progress reported"
+msgstr "值最后报告进展"
+
+#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:118
+msgid "Timesheet"
+msgstr "时间表"
+
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:75
+msgid "Show dependencies"
+msgstr "显示依赖关系"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:310
+msgid "Schedule from start to deadline"
+msgstr "从开始到最后期限附表"
+
+#: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:50
+#: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:52
+#: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:54
+msgid "Estimated days"
+msgstr "估计天"
+
+#: 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
+msgid "Reference date"
+msgstr "参考日期"
+
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:21
+msgid "LibrePlan: Estimated/Planned Hours Per Task"
+msgstr "LibrePlan：估计小时数/计划任务"
+
+#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityFormItem.java:94
+msgid "quality form item percentage not specified"
+msgstr "质量形式的项目百分比"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:316
+msgid "passwords do not match"
+msgstr "密码不匹配"
+
+#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityForm.java:84
+msgid "quality form name not specified"
+msgstr "质量表格名称未指定"
+
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:81
+msgid "Progress Evolution"
+msgstr "过程演进"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/Type.java:55
+msgid "From chosen date"
+msgstr "从选择的日期"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:259
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:727
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1257
+msgid ""
+"Subcontractor values are read only because they were reported by the "
+"subcontractor company."
+msgstr "阅读不仅是因为他们的报告由分包商公司的分包商值。"
+
+#: 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 "总项目的截止日期(%.2f %%)前有%d天的余量。"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:250
+msgid "CV"
+msgstr "CV"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:613
+#: libreplan-webapp/src/main/webapp/myaccount/userDashboard.zul:35
+msgid "My dashboard"
+msgstr "我的控制面板"
+
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:91
+msgid "Original"
+msgstr "原"
+
+#: libreplan-webapp/src/main/webapp/common/layout/template.zul:179
+msgid ""
+"A new version of LibrePlan is available. Please check next link for more "
+"information:"
+msgstr "LibrePlan是一个新的版本可用。请检查下链接了解更多信息："
+
+#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:31
+msgid "Stretches function configuration"
+msgstr "拉伸功能配置"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:295
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:309
+msgid "Not indentable"
+msgstr "不indentable"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:341
+msgid ""
+"The original workable days value {0} cannot be modified as it has "
+"consolidations"
+msgstr "原来的可作业天数的价值{0}不能被修改，因为它有合并"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:259
+msgid "Timesheet saved"
+msgstr "时间表保存"
+
+#: 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 "适用于所有类别的材料清单（选择一个过滤器）"
+
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:74
+msgid "Resource allocation type"
+msgstr "资源分配类型"
+
+#: libreplan-webapp/src/main/webapp/common/layout/login.zul:104
+msgid "User disabled"
+msgstr "用户已禁用"
+
+#: libreplan-webapp/src/main/webapp/common/error.zul:40
+#: libreplan-webapp/src/main/webapp/common/event_error.zul:35
+msgid "Exception type"
+msgstr "异常类型"
+
+#: 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 "在可用时段{0} {1}小时。"
+
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:148
+msgid "Association with profiles"
+msgstr "协会与配置文件"
+
+#: libreplan-webapp/src/main/webapp/common/error.zul:30
+#: libreplan-webapp/src/main/webapp/common/event_error.zul:25
+msgid "Message - {0}"
+msgstr "留言 - {0}"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1379
+msgid ""
+"Date is not valid, it must be later than the last progress consolidation"
+msgstr "日期是无效的，它必须比过去进步盘整"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:214
+msgid "Seconds planning warning"
+msgstr "秒的规划警告"
+
+#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:28
+msgid "Reception date"
+msgstr "接收日期"
+
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:21
+msgid "LibrePlan: Settings"
+msgstr "LibrePlan：设置"
+
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java:131
+msgid "worker's surname not specified"
+msgstr "工人的名字，没有指定"
+
+#: libreplan-webapp/src/main/webapp/resources/worker/_calendar.zul:48
+#: libreplan-webapp/src/main/webapp/resources/machine/_calendar.zul:41
+msgid "Save changes"
+msgstr "保存更改"
+
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:80
+msgid "Application settings"
+msgstr "应用程序设置"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:309
+msgid "Base"
+msgstr "应用程序设置"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:321
+msgid "Total dedication"
+msgstr "总计奉献"
+
+#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:44
+msgid "Select source"
+msgstr "选择源"
+
+#: 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 "标记为完成相同的任务由一个以上的时间表线"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:977
+msgid "Worker deleted"
+msgstr "工人被删除"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:745
+msgid "Select entity, please"
+msgstr "请选择实体，"
+
+#: libreplan-webapp/src/main/webapp/profiles/profiles.zul:23
+msgid "LibrePlan: Profiles"
+msgstr "LibrePlan：配置文件"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:837
+msgid "Finish Hour"
+msgstr "完成一小时"
+
+#: libreplan-business/src/main/java/org/libreplan/business/expensesheet/entities/ExpenseSheet.java:112
+msgid "total not specified"
+msgstr "总不能指定"
+
+#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:48
+#: libreplan-webapp/src/main/webapp/myaccount/_expensesArea.zul:38
+msgid "Last expense"
+msgstr "最后费用"
+
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:132
+msgid "Go to personal timesheet"
+msgstr "转到个人时间表"
+
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:108
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:197
+msgid "Day"
+msgstr "日"
+
+#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:76
+msgid "Timesheet summary"
+msgstr "时间表总结"
+
+#: libreplan-webapp/src/main/webapp/myaccount/changePassword.zul:65
+msgid "Current password"
+msgstr "目前的密码"
+
+#: libreplan-business/src/main/java/org/libreplan/business/common/entities/EntitySequence.java:201
+msgid "Only one sequence per entity can be active at the same time."
+msgstr "可以活跃在同一时间只有一个序列的每个实体。"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:953
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1213
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:274
+msgid "Please, select an item"
+msgstr "请选择一个项目"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1128
+msgid "Cannot be higher than finish hour"
+msgstr "不能高于光洁度小时"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:241
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:260
+msgid "Prefix"
+msgstr "字首"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetDTO.java:123
+msgid "{0} 1st fortnight"
+msgstr "{0}第一两星期"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeComponent.java:64
+msgid "New Template element"
+msgstr "新的模板元素"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:211
+msgid "Project: {0}"
+msgstr "项目名称：{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 "时程表"
+
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:94
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:97
+msgid "Non Consolidated"
+msgstr "非综合"
+
+#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:43
+msgid "From date"
+msgstr "开始日期"
+
+#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:108
+msgid "Task of project"
+msgstr "项目任务"
+
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:229
+msgid "Hours cost"
+msgstr "小时费用"
+
+#: libreplan-webapp/src/main/webapp/planner/reassign.zul:34
+msgid "Reassigning type"
+msgstr "重新分配类型"
+
+#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:308
+msgid "There are repeated description values in the timesheet "
+msgstr "说明有重复值的时间表"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:179
+msgid "{0} \"{1}\" can not be deleted because of it is being used"
+msgstr "{0}“{1}”不能被删除，因为它正在被使用"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:594
+msgid "Expense Sheets"
+msgstr "费用表"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:380
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:136
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:157
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:84
+msgid "Position"
+msgstr "位置"
+
+#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/DirectAdvanceAssignment.java:84
+msgid "maximum value not specified"
+msgstr "最大的价值不指定"
+
+#: libreplan-webapp/src/main/webapp/common/layout/login.zul:109
+msgid "Incorrect authentication"
+msgstr "不正确的验证"
+
+#: 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 "编辑任务"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:104
+msgid "Currency"
+msgstr "货币"
+
+#: 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 "结束日期是无效的，新的结束日期必须在开始日期之后"
+
+#: 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 "时间表行列表"
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/Order.java:678
+msgid "task code is repeated inside the project"
+msgstr "在项目中重复任务的代码"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/montecarlo/MonteCarloController.java:163
+msgid "Number of iterations should be between 1 and {0}"
+msgstr "的迭代次数应介于1和{0}"
+
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:44
+msgid "Current value"
+msgstr "当前值"
+
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/ResourceCalendar.java:73
+msgid "Capacity must be a positive integer number"
+msgstr "容量必须是一个正整数"
+
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:94
+#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:48
+msgid "Save and Continue"
+msgstr "保存并继续"
+
+#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:50
+msgid "Zoom level"
+msgstr "缩放级别"
+
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:29
+#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:170
+msgid "Quality form"
+msgstr "质量形式"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:419
+msgid "Calendar cannot be removed as it has other derived calendars from it"
+msgstr "日历不能删除，因为它具有其他衍生日历"
+
+#: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:97
+msgid "Go!"
+msgstr "加油！"
+
+#: libreplan-webapp/src/main/webapp/calendars/_list.zul:30
+msgid "Inherits up to date"
+msgstr "继承迄今"
+
+#: libreplan-webapp/src/main/webapp/profiles/_editProfile.zul:27
+msgid "Profile data"
+msgstr "个人资料"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:280
+msgid "The name of the label is empty."
+msgstr "标签的名称，是空的。"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:366
+msgid "Starting date cannot be empty in forward mode"
+msgstr "在正向模式下，开始日期不能为空"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:413
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:33
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:287
+msgid "Configuration"
+msgstr "组态"
+
+#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/HourCost.java:122
+msgid "cost category not specified"
+msgstr "成本不指定类别"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:181
+msgid "Violated deadline"
+msgstr "违反了期限"
+
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:243
+msgid "Delivery dates requested by customer. "
+msgstr "按客户要求交货日期。"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:128
+msgid ""
+"Help the project developers to collect information about which LibrePlan "
+"version you are using"
+msgstr "帮助项目开发商LibrePlan版本，你使用的是收集信息"
+
+#: libreplan-webapp/src/main/webapp/resources/worker/worker.zul:22
+msgid "LibrePlan: Workers"
+msgstr "LibrePlan："
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/UserDashboardController.java:64
+msgid "Personal timesheet \"{0}\" saved"
+msgstr "个人时间表“{0}”保存"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:719
+msgid "Create Virtual Workers Group"
+msgstr "创建虚拟工群体"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:125
+msgid "Enable/Disable warning about new LibrePlan versions available"
+msgstr "新的LibrePlan版本的启用/禁用警告"
+
+#: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/ExternalCompany.java:183
+msgid ""
+"interaction fields are empty and company is marked as interact with "
+"applications"
+msgstr "互动字段是空的，公司被标记为与应用程序交互"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:183
+msgid "Timesheet templates"
+msgstr "时间表模板"
+
+#: 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/webapp/dashboard/_costStatus.zul:42
+msgid "Hours invested"
+msgstr "营业时间投资"
+
+#: 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 "模板"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:363
+msgid "Authorization"
+msgstr "授权"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:363
+msgid "Project saved"
+msgstr "保存项目"
+
+#: 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 "名称是无效的，还有另一种具有相同名称的类型进展。"
+
+#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:49
+msgid "task"
+msgstr "任务"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionController.java:128
+msgid "All changes will be lost. Are you sure?"
+msgstr "所有更改都将丢失。你确定吗？"
+
+#: libreplan-webapp/src/main/webapp/common/page_not_found.zul:51
+msgid "Sorry for the inconvenience."
+msgstr "很抱歉给您带来不便。"
+
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:150
+msgid ""
+"Profiles of LDAP users cannot be managed because LDAP is enabled and LDAP "
+"roles are being used."
+msgstr "无法管理，因为启用LDAP和LDAP角色正在使用的LDAP用户的配置文件。"
+
+#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityFormItem.java:81
+msgid "quality form item position not specified"
+msgstr "没有指定的质量形式的项目位置"
+
+#: 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 "Machines"
+msgstr "机"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:611
+msgid "My account"
+msgstr "我的账户"
+
+#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:39
+msgid "Destination scenario"
+msgstr "目标的情况"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:264
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:108
+msgid "Company view"
+msgstr "公司风貌"
+
+#: libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java:461
+msgid "currency symbol not specified"
+msgstr "未指定的货币符号"
+
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:116
+msgid "Both"
+msgstr "都"
+
+#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityForm.java:389
+#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/TaskQualityForm.java:171
+msgid "report progress not specified"
+msgstr "报告未指定的进展"
+
+#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:25
+msgid "Filter by"
+msgstr "筛选条件"
+
+#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:48
+msgid "Up to date"
+msgstr "直至目前为止，"
+
+#: 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 "日历分配"
+
+#: 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 "类别"
+
+#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:22
+msgid "LibrePlan: Progress Types"
+msgstr "LibrePlan进展"
+
+#: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:79
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:203
+msgid "[generic all workers]"
+msgstr "[通用所有工人]"
+
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:27
+msgid "Category data"
+msgstr "分类数据"
+
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:97
+msgid "Search"
+msgstr "搜索"
+
+#: libreplan-business/src/main/java/org/libreplan/business/common/entities/EntitySequence.java:106
+msgid "Prefix cannot contain whitespaces"
+msgstr "前缀不能包含空格"
+
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:254
+msgid "Valid until"
+msgstr "有效期至"
+
+#: libreplan-business/src/main/java/org/libreplan/business/common/entities/ConfigurationRolesLDAP.java:51
+msgid "role ldap not specified"
+msgstr "角色LDAP不指定"
+
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:128
+msgid "Add New Complementary Field"
+msgstr "添加新的互补场"
+
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:244
+msgid "Work weeks list"
+msgstr "工作周列表"
+
+#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:38
+msgid "Source scenario"
+msgstr "来源场景"
+
+#: libreplan-webapp/src/main/webapp/resources/criterions/criterions.zul:24
+msgid "LibrePlan: Criteria"
+msgstr "LibrePlan：标准"
+
+#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:23
+msgid "LibrePlan: Transfer Projects Between Scenarios"
+msgstr "LibrePlan：调水工程方案之间"
+
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/Task.java:171
+msgid "element associated to a task must be not empty"
+msgstr "元素相关的任务，必须不为空"
+
+#: 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 "删除日历"
+
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:109
+msgid "Sum of direct expenses"
+msgstr "直接费用之和"
+
+#: libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul:33
+msgid "Communications From Customers"
+msgstr "从客户的沟通"
+
+#: 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/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/webapp/expensesheet/expenseSheet.zul:95
+#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:151
+#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:171
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:185
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:81
+#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul: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 "资源"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/UserDashboardController.java:71
+msgid "Expense sheet \"{0}\" saved"
+msgstr "费用表“{0}”保存"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:71
+msgid "Total task hours"
+msgstr "总的工作时间"
+
+#: 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
+msgid "Virtual Workers"
+msgstr "虚拟工作者"
+
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:33
+msgid "Configuration unit name"
+msgstr "配置单元的名称"
+
+#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:47
+msgid "Date last progress reported"
+msgstr "日期最近的进展报告"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/entrypoints/RedirectorSynthetiser.java:125
+msgid "Could not load any resource"
+msgstr "无法加载任何资源"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:464
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:39
+msgid "Work And Progress Per Project"
+msgstr "每个项目的工作及进展情况"
+
+#: libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java:497
+msgid "seconds planning warning not specified"
+msgstr "秒的规划警告，不指定"
+
+#: libreplan-business/src/main/java/org/libreplan/business/expensesheet/entities/ExpenseSheet.java:111
+msgid "total must be greater or equal than 0"
+msgstr "总量必须是大于或等于0"
+
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:158
+msgid "Default Label"
+msgstr "默认标签"
+
+#: 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 "关闭"
+
+#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:23
+msgid "LibrePlan: Timesheet Lines List"
+msgstr "LibrePlan：时间表行列表"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadModel.java:976
+msgid "Specific Allocations"
+msgstr "具体的分配"
+
+#: 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 "标签类型：时间表已经指定了这个标签类型"
+
+#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:221
+msgid "progress type marked as quality form but is updatable"
+msgstr "进步型标记为质量形式，但更新"
+
+#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:64
+msgid "Move selected task up"
+msgstr "移动选定的任务"
+
+#: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:27
+msgid "Select criteria set or specific resources for allocation"
+msgstr "选择标准集或特定资源分配"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:350
+msgid "Create copy"
+msgstr "创建副本"
+
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:28
+msgid "Company data"
+msgstr "公司数据"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:274
+msgid "Users"
+msgstr "用户"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/AssignedCriterionsModel.java:340
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/AssignedMachineCriterionsModel.java:401
+msgid "The {0} is not valid. Other value exists from the same criterion type"
+msgstr "{0}是无效的。其他值存在同样的标准型"
+
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:145
+msgid "Label Type fields"
+msgstr "标签类型字段"
+
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:105
+msgid "Hours Management"
+msgstr "小时管理"
+
+#: 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
+msgid "last hours group sequence code not specified"
+msgstr "没有指定的最后几个小时组序列码"
+
+#: libreplan-business/src/main/java/org/libreplan/business/labels/entities/LabelType.java:127
+msgid "label type name is already in use"
+msgstr "标签类型名称已在使用中"
+
+#: 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 "请选择一个结束日期异常"
+
+#: 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 "无法删除{0}，因为它正在使用一些例外日"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/NewAllocationSelector.java:94
+msgid "specific allocation"
+msgstr "具体的分配"
+
+#: libreplan-webapp/src/main/webapp/common/layout/login.zul:145
+msgid ""
+"Please use some of the compatible browsers: Chrome, Firefox, Safari or "
+"Epiphany."
+msgstr "请使用兼容的浏览器：Chrome，火狐，Safari或顿悟。"
+
+#: libreplan-webapp/src/main/webapp/common/concurrent_modification.zul:33
+msgid ""
+"Another user has modified the same data, so the operation cannot be safely "
+"completed."
+msgstr "另一个用户修改了相同的数据，所以不能安全地完成操作。"
+
+#: 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 "模板保存"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1684
+msgid "Please set a date"
+msgstr "请设定日期"
+
+#: libreplan-business/src/main/java/org/libreplan/business/common/entities/EntitySequence.java:93
+msgid "prefix not specified"
+msgstr "前缀不指定"
+
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:533
+msgid "last criterion sequence code not specified"
+msgstr "最后一个标准未指定的序列码"
+
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:47
+msgid "Task quality form name"
+msgstr "工作质量的表单名称"
+
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1093
+#: 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 "一些成本的类别分配在时间上重叠"
+
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:26
+msgid "Imputed hours calculation"
+msgstr "的推算小时计算"
+
+#: 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
+msgid "Group"
+msgstr "组"
+
+#: libreplan-webapp/src/main/webapp/common/error.zul:55
+#: libreplan-webapp/src/main/webapp/common/event_error.zul:51
+msgid "Exit session"
+msgstr "退出会话"
+
+#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:30
+msgid "Statistics list "
+msgstr "统计列表"
+
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:113
+msgid "Apply filter to"
+msgstr "应用过滤器"
+
+#: 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
+msgid "Enabled"
+msgstr "启用"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1148
+msgid "Please, enter a valid effort"
+msgstr "请输入一个有效的努力"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:321
+msgid ""
+"Quality form should include an item with a value of 100% in order to report "
+"progress"
+msgstr "在汇报工作前,质量表应包括一个100% 的项目."
+
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractedTaskData.java:126
+msgid "external company not specified"
+msgstr "没有指定的外部公司"
+
+#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityForm.java:192
+msgid "Quality form name is already being used"
+msgstr "质量表格名称已被使用"
+
+#: 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
+msgid "Timesheets Templates"
+msgstr "时程表模板"
+
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:117
+msgid "Any"
+msgstr "任何"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:1129
+msgid "Confirm user edition"
+msgstr "确认用户版"
+
+#: libreplan-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:47
+msgid "Load due to current project"
+msgstr "载入由于目前的项目"
+
+#: libreplan-business/src/main/java/org/libreplan/business/workreports/valueobjects/DescriptionField.java:81
+msgid "length not specified"
+msgstr "未指定的长度"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MyTasksAreaController.java:146
+msgid "Track time"
+msgstr "跟踪时间"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:182
+msgid "There must be at least 2 stretches for doing interpolation"
+msgstr "必须有至少2伸展做插值"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:477
+msgid "Remove queue-based resource element"
+msgstr "删除队列为基础的资源元素"
+
+#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:268
+msgid "default maximum value must be greater than precision value"
+msgstr "默认的最大值必须大于精度值"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/DynamicDatebox.java:149
+msgid "Date format is wrong. Please, use the following format: {0}"
+msgstr "日期格式是错误的。请使用以下格式：{0}"
+
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:114
+#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:39
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:104
+#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:182
+#: 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/profiles/_editProfile.zul:72
+#: 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
+msgid "Save & Continue"
+msgstr "保存并继续"
+
+#: libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialCategory.java:222
+msgid "Subcategory names must be unique."
+msgstr "子目录名称必须是唯一的。"
+
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:21
+msgid "LibrePlan: Work And Progress Per Project"
+msgstr "LibrePlan：每个项目的工作及进展情况"
+
+#: 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 "过滤器"
+
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:145
+msgid "Scheduling mode"
+msgstr "调度模式"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:78
+msgid "Personal timesheets peridocity"
+msgstr "个人时间表peridocity"
+
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskMilestone.java:121
+msgid "a milestone cannot have a task associated"
+msgstr "一个里程碑，不能有关联的任务"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:81
+msgid ""
+"Invalid value. Precission value must be lower than the Default Max value."
+msgstr "无效值。Precission值必须低于预设的最大值。"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1321
+msgid "Assignment function will be changed. Are you sure?"
+msgstr "分配函数将被改变。你确定吗？"
+
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:127
+msgid "Total expenses"
+msgstr "总开支"
+
+#: libreplan-webapp/src/main/webapp/resources/worker/_localizations.zul:26
+msgid "Assigned locations"
+msgstr "指定地点"
+
+#: libreplan-webapp/src/main/webapp/orders/_orderFilter.zul:31
+msgid "subelements"
+msgstr "子元素"
+
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:44
+#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:45
+#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:46
+msgid "Subcontracting date"
+msgstr "分包日期"
+
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:66
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:49
+msgid "Report progress"
+msgstr "报告进度"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/GlobalProgressChart.java:124
+msgid "Progress percentage per progress type"
+msgstr "每进步型的进度百分比"
+
+#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:168
+msgid "Ok"
+msgstr "行"
+
+#: 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 "身份验证类型"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:457
+msgid "cannot be empty."
+msgstr "不能为空。"
+
+#: libreplan-webapp/src/main/webapp/common/layout/_customMenu.zul:55
+msgid "START"
+msgstr "开始"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/NewAllocationSelector.java:71
+msgid "generic machines allocation"
+msgstr "通用机分配"
+
+#: libreplan-webapp/src/main/webapp/subcontract/subcontractorCommunications.zul:53
+msgid "Subcontrated task"
+msgstr "Subcontrated任务"
+
+#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:68
+#: libreplan-webapp/src/main/webapp/planner/order.zul:70
+#: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:75
+#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:86
+msgid "Back"
+msgstr "背面"
+
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:85
+msgid "Our company username"
+msgstr "本公司的用户名"
+
+#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:29
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:58
+msgid "Subcontractor"
+msgstr "分包商"
+
+#: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:41
+msgid "Administration"
+msgstr "管理"
+
+#: libreplan-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:47
+msgid "Cancel and return"
+msgstr "取消并返回"
+
+#: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:34
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:31
+msgid "Assign quality form"
+msgstr "分配质量表"
+
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:116
+msgid "Planning Configuration"
+msgstr "规划配置"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:388
+msgid "Delete item {0}. Are you sure?"
+msgstr "删除项“{0}。你确定吗？"
+
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:188
+msgid "Calculated budget"
+msgstr "计算预算"
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/Order.java:356
+msgid "the project must have a deadline"
+msgstr "该项目必须有一个最后期限"
+
+#: libreplan-business/src/main/java/org/libreplan/business/labels/entities/LabelType.java:199
+msgid "last label sequence code not specified"
+msgstr "没有指定的最后一个标签序列码"
+
+#: libreplan-webapp/src/main/webapp/myaccount/_personalTimesheetsArea.zul:31
+msgid "Available hours"
+msgstr "可用小时"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:663
+msgid "Personal"
+msgstr "个人"
+
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:52
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:59
+msgid "Allocations"
+msgstr "分配"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/assigntemplates/TemplateFinderPopup.java:137
+msgid "Choosing Template"
+msgstr "选择模板"
+
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:135
+#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:49
+msgid "Length"
+msgstr "长度"
+
+#: 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 "任务代码"
+
+#: 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 "容量"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioCRUDController.java:133
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:333
+msgid "Create derived"
+msgstr "创建派生"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:298
+msgid "Label Types"
+msgstr "标签类型"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:645
+msgid "it must be greater than zero"
+msgstr "它必须是大于零"
+
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:131
+msgid "must be a real positive number"
+msgstr "必须是一个真正的正数"
+
+#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:33
+msgid "No Allocations have been done"
+msgstr "未分配已经完成"
+
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:111
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:122
+msgid "Total hours task"
+msgstr "任务的总时数"
+
+#: 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 "如果您从另一页LibrePlan到达了该网页，请立即通知我们，为了解决这个问题，尽快。"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:442
+msgid "Removed calendar \"{0}\""
+msgstr "移除日历“{0}”"
+
+#: libreplan-business/src/main/java/org/libreplan/business/expensesheet/entities/ExpenseSheetLine.java:155
+msgid "expense sheet not specified"
+msgstr "不指定费用表"
+
+#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:23
+msgid "LibrePlan: Timesheets Templates"
+msgstr "LibrePlan时间表模板"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1066
+msgid "Create project"
+msgstr "创建项目"
+
+#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:63
+msgid "Next"
+msgstr "下"
+
+#: libreplan-webapp/src/main/webapp/myaccount/_personalTimesheetsArea.zul:22
+msgid "Personal timesheets"
+msgstr "个人时间表"
+
+#: 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 "在相同的时间内，允许多个这种类型的标准值"
+
+#: 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"
+msgstr "在标题部分，索引标签和字段必须是唯一的和连续的"
+
+#: libreplan-webapp/src/main/webapp/planner/editTask.zul:67
+msgid "Normal resource allocation"
+msgstr "正常的资源分配"
+
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:36
+msgid "Human hours per machine working hour within configuration unit"
+msgstr "人类的机器小时，每工作小时内配置单元"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/OrderAuthorizationController.java:109
+msgid ""
+"Could not add those authorizations to user {0} because they were already "
+"present."
+msgstr "无法添加这些授权，用户{0}，因为他们已经存在。"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:306
+msgid "Root calendar"
+msgstr "根日历"
+
+#: 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 "是"
+
+#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:113
+msgid "Select gap"
+msgstr "选择差距"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:302
+msgid "Port"
+msgstr "端口"
+
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:64
+msgid "Date Finish"
+msgstr "日期完成"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:455
+msgid "From"
+msgstr "从"
+
+#: 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 "至少一个小时，并在每个任务所需的组"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:556
+msgid "Resources or criteria"
+msgstr "资源或标准"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeModel.java:344
+msgid "Name of criterion is empty."
+msgstr "标准的名称是空的。"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/CriterionRequirementWrapper.java:224
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:95
+msgid "Validate"
+msgstr "验证"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:181
+msgid "This resource has already been added."
+msgstr "该资源已被添加。"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/IntegrationEntityModel.java:79
+msgid "Could not retrieve Code. Please, try again later"
+msgstr "无法检索守则。请稍后再试"
+
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:445
+msgid "Criterion Type name is already being used"
+msgstr "标准类型名称已被使用"
+
+#: libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialCategory.java:239
+msgid "There are repeated material category codes"
+msgstr "有重复的材料分类代码"
+
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:36
+#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:25
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:34
+msgid "Cost category assignment"
+msgstr "成本类别分配"
+
+#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:246
+msgid "progress type name is already in use"
+msgstr "进步类型的名称已在使用中"
+
+#: libreplan-business/src/main/java/org/libreplan/business/common/entities/EntitySequence.java:140
+msgid "number of digits not specified"
+msgstr "未指定的位数数"
+
+#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:250
+msgid "task cannot be empty if it is shared by lines"
+msgstr "任务不能是空的，如果它是共享的线"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:843
+msgid "All workers"
+msgstr "所有工人"
+
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1189
+msgid "You have exceeded the maximum limit of resources"
+msgstr "您已超出最大限制的资源"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:766
+msgid "The field name must be unique and not empty"
+msgstr "字段名称必须是唯一的，而不是空"
+
+#: libreplan-webapp/src/main/webapp/resources/search/allocation_selector_combo.zul:25
+msgid "Select criteria or resources"
+msgstr "选择的标准或资源"
+
+#: 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 "选择所需的标准设定，然后按过滤器按钮"
+
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:217
+msgid "Timesheet lines"
+msgstr "时间表线"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1521
+msgid "It cannot be empty"
+msgstr "它不能为空"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:394
+msgid "Calculate Resources per Day"
+msgstr "每天的计算资源"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:255
+msgid "Estimate To Complete"
+msgstr "估计完成"
+
+#: 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
+msgid "Unit type"
+msgstr "单位类型"
+
+#: libreplan-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:42
+msgid "Load due to other assignments"
+msgstr "载入由于其他任务"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:515
+msgid "Personal area"
+msgstr "个人区域"
+
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:26
+msgid "Calendar data"
+msgstr "日历数据"
+
+#: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:22
+msgid "Cost Categories List"
+msgstr "成本类别列表"
+
+#: libreplan-webapp/src/main/webapp/dashboard/_costStatus.zul:28
+msgid "Current state indicators"
+msgstr "目前的状态指示灯"
+
+#: libreplan-business/src/main/java/org/libreplan/business/common/IntegrationEntity.java:109
+msgid "code is already used"
+msgstr "已经使用的代码"
+
+#: libreplan-webapp/src/main/webapp/subcontract/subcontractorCommunications.zul:20
+msgid "LibrePlan: Received From Subcontractors"
+msgstr "LibrePlan：收稿从分包商"
+
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:67
+msgid "Labels list"
+msgstr "标签列表"
+
+#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:461
+msgid "last timesheet line sequence code not specified"
+msgstr "没有指定的最后时间表线序列码"
+
+#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityFormItem.java:72
+msgid "quality form item name not specified or empty"
+msgstr "质量形式的项目名称未指定或为空"
+
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:152
+msgid "Criterion Requirements"
+msgstr "规范要求"
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/HoursGroup.java:187
+msgid "working hours not specified"
+msgstr "未指定的工作时间"
+
+#: libreplan-business/src/main/java/org/libreplan/business/common/entities/EntitySequence.java:155
+msgid "format sequence code invalid. It must not contain '_'"
+msgstr "格式序列码无效。它不能包含'_'"
+
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:76
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:200
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:227
+msgid "Extra Effort"
+msgstr "额外的努力"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:269
+msgid "Already exists other label with the same name"
+msgstr "已经存在具有相同名称的标签"
+
+#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:60
+msgid "Move selected task down"
+msgstr "向下移动选定的任务"
+
+#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityForm.java:101
+msgid "quality form type not specified"
+msgstr "没有指定的质量表单类型"
+
+#: 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
+msgid "Customer Reference"
+msgstr "客户参考"
+
+#: libreplan-webapp/src/main/webapp/dashboard/_dashboardfororder.zul:88
+msgid "Overtime ratio"
+msgstr "加班比"
+
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:89
+msgid "Create and assign label"
+msgstr "创建和分配标签"
+
+#: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:42
+msgid "Optimistic"
+msgstr "乐观的"
+
+#: 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/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
+msgid "Label has already been added."
+msgstr "已添加标签。"
+
+#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:122
+msgid "Add task"
+msgstr "添加任务"
+
+#: 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/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/_editOrderElement.zul:48
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:46
+#: libreplan-webapp/src/main/webapp/dashboard/_dashboardfororder.zul:58
+msgid "Progress"
+msgstr "进步"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1305
+msgid "All progress types have already been assigned."
+msgstr "一切进步的类型已经被分配。"
+
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:80
+msgid "Price per hour"
+msgstr "价格每小时"
+
+#: 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 "最后一段应该有100% 的长度和工作"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:169
+msgid "No project deadline defined"
+msgstr "未定义项目的最后期限"
+
+#: 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 "Calendars"
+msgstr "日历"
+
+#: 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
+msgid "value not specified"
+msgstr "未指定的值"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:315
+msgid ""
+"Another task in the same branch is already reporting progress for this "
+"quality form"
+msgstr "这种质量的形式在同一个分支的另一项任务是汇报工作进度"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:457
+msgid "To"
+msgstr "对"
+
+#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:30
+msgid "options"
+msgstr "选项"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1202
+msgid "Queue-based assignment"
+msgstr "基于队列的分配"
+
+#: libreplan-webapp/src/main/webapp/resources/_criterions.zul:32
+msgid "Show only current satisfied criteria"
+msgstr "只显示当前的满意标准"
+
+#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:92
+msgid "Latest date"
+msgstr "最新日期"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:385
+msgid "Deadline cannot be empty in backwards mode"
+msgstr "在向后模式的截止日期不能为空"
+
+#: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:88
+msgid "Group by weeks"
+msgstr "本集团按周"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/UserBandboxFinder.java:47
+msgid "Full name"
+msgstr "全名"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:125
+msgid "Default user \"admin\" cannot be removed as it is mandatory"
+msgstr "默认用户“admin”不能被删除，因为它是强制性的"
+
+#: 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
+msgid "Hours Types"
+msgstr "营业时间类型"
+
+#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:112
+msgid "Finish hour"
+msgstr "完成小时"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java:200
+msgid "Done {0} of {1}"
+msgstr "完成{0} {1}"
+
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_allocationConfiguration.zul:31
+msgid "Planned start"
+msgstr "计划开始"
+
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:62
+#: 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 "通过项目筛选"
+
+#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/TaskQualityFormItem.java:69
+msgid "Task Quality Form item name not specified"
+msgstr "工作质量表项目名称未指定"
+
+#: 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
+msgid "Active"
+msgstr "活跃"
+
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:29
+msgid "Inherited labels"
+msgstr "继承的标签"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:850
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/ResourceType.java:31
+msgid "Queue-based resource"
+msgstr "基于队列的资源"
+
+#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:55
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:249
+msgid "Delivery date"
+msgstr "交货日期"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:292
+msgid "Unindent"
+msgstr "撤消"
+
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:50
+msgid "Direct labels"
+msgstr "直接标签"
+
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/consolidations/ConsolidatedValue.java:70
+msgid "task end date not specified"
+msgstr "未指定任务的结束日期"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/Type.java:43
+msgid "From today"
+msgstr "从今天开始"
+
+#: libreplan-webapp/src/main/webapp/common/layout/login.zul:97
+msgid "Log in"
+msgstr "登录"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderBandboxFinder.java:44
+#: libreplan-webapp/src/main/webapp/subcontract/subcontractorCommunications.zul:54
+#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:51
+msgid "Project name"
+msgstr "项目名称"
+
+#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:55
+msgid "Precision"
+msgstr "精确"
+
+#: 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 "预计开始日期的任务（在文本框中按回车打开日历弹出或日期）"
+
+#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:41
+msgid "Show all reported hours"
+msgstr "显示所有报告的时间"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:934
+msgid "Efforts"
+msgstr "努力"
+
+#: 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
+msgid "Projects List"
+msgstr "项目列表"
+
+#: 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
+msgid "budget not specified"
+msgstr "预算不指定"
+
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:56
+#: 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/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/_projectDetails.zul:53
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:88
+#: libreplan-webapp/src/main/webapp/typeofworkhours/_editTypeOfWorkHours.zul:46
+msgid "Generate code"
+msgstr "生成的代码"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:116
+msgid "Scheduling state"
+msgstr "调度状态"
+
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:44
+msgid "Personal Data"
+msgstr "个人资料"
+
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:21
+msgid "LibrePlan: Hours Worked Per Resource"
+msgstr "LibrePlan：工作时数资源"
+
+#: libreplan-webapp/src/main/webapp/users/users.zul:23
+msgid "LibrePlan: User Accounts"
+msgstr "LibrePlan：用户帐号"
+
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:213
+msgid "Budget in money"
+msgstr "财政预算案中钱"
+
+#: 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 "进入到init"
+
+#: libreplan-webapp/src/main/webapp/common/error.zul:54
+#: libreplan-webapp/src/main/webapp/common/event_error.zul:50
+msgid "Reload"
+msgstr "刷新"
+
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:26
+msgid "Profiles authorization"
+msgstr "配置文件授权"
+
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:71
+msgid "Assignation"
+msgstr "分配"
+
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:98
+msgid "Planning charts expanded"
+msgstr "规划图扩大"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:702
+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 "必须定义一个工作组相关联的元素"
+
+#: libreplan-business/src/main/java/org/libreplan/business/expensesheet/entities/ExpenseSheetLine.java:92
+msgid "value must be greater or equal than 0"
+msgstr "值必须大于或等于0的"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeModel.java:397
+#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesModel.java:311
+msgid "name cannot be empty"
+msgstr "名不能为空"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:466
+msgid "task is already marked as finished in another timesheet"
+msgstr "任务标记为已完成的另一个时间表"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java:190
+msgid "Doing {0} reassignations"
+msgstr "否则{0} reassignations的"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:232
+msgid "Select entity"
+msgstr "选择实体"
+
+#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/HourCost.java:153
+msgid "The end date cannot be before the start date"
+msgstr "结束日期不得早于开始日期"
+
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:115
+msgid "Go to worker edition window"
+msgstr "工人的编辑窗口"
+
+#: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:40
+msgid "Worked hours"
+msgstr "工作小时"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:95
+msgid "Invalid value. Default Max Value cannot be empty"
+msgstr "无效值。默认的最高值不能为空"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:129
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:142
+msgid "Invalid Spread values. At least one value should be true"
+msgstr "传播值无效。的至少一个值应该是真实的"
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:604
+#: libreplan-business/src/main/java/org/libreplan/business/common/IntegrationEntity.java:48
+msgid "code not specified"
+msgstr "代码不指定"
+
+#: libreplan-webapp/src/main/webapp/orders/_list.zul:22
+msgid "Projects list"
+msgstr "项目列表"
+
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/BaseCalendar.java:1213
+msgid "last sequence code not specified"
+msgstr "没有指定的最后一个序列代码"
+
+#: 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 "如果没有自动打开报告"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:663
+msgid ""
+"Invalid format prefix. Format prefix cannot be empty, contain '_' or contain"
+" whitespaces."
+msgstr "无效的格式前缀。格式前缀不能为空，包含'_'或包含空格。"
+
+#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:55
+msgid "Create template from selected task"
+msgstr "创建模板从选定的任务"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:160
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:259
+msgid "All projects"
+msgstr "所有项目"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:213
+msgid "Completed: {0}%"
+msgstr "完成：{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/layout/login.zul:84
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:323
+msgid "Password"
+msgstr "密码"
+
+#: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:36
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:92
+msgid "Observations"
+msgstr "观察"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:939
+msgid "Edit project"
+msgstr "编辑项目"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:909
+msgid "Hours cost: {0}, Expenses cost: {1}"
+msgstr "时间成本：{1} {0}，费用成本："
+
+#: libreplan-webapp/src/main/webapp/templates/_advances.zul:27
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:25
+msgid "Progress assignments"
+msgstr "进展的任务"
+
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:252
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:274
+msgid "Valid from"
+msgstr "有效期从"
+
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:55
+msgid "Month"
+msgstr "月"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:919
+msgid "{0} could not be allocated. Cannot allocate more than one resource"
+msgstr "{0}不能被分配​​。无法分配多个资源"
+
+#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:32
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:58
+msgid "Color"
+msgstr "颜色"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordController.java:111
+msgid "Current password is incorrect"
+msgstr "当前密码不正确"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:366
+msgid "Cannot insert material in general view. Please, select a category"
+msgstr "不能插入材料的普遍看法。请选择一个类别"
+
+#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:125
+msgid "Expense lines"
+msgstr "支出线"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:311
+msgid "Delete {0} \"{1}\". Are you sure?"
+msgstr "删除{0}“{1}”。你确定吗？"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:441
+msgid "Only {0} resources per day were achieved for current allocation"
+msgstr "{0}每天的电流分配资源"
+
+#: 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/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 "接受"
+
+#: 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
+msgid "Example: {0}"
+msgstr "例如：{0}"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:969
+msgid ""
+"Cannot delete timesheet template. There are some timesheets bound to it."
+msgstr "无法删除时间表模板。有一些绑定到它的时间表。"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:617
+msgid "Please, select type of exception"
+msgstr "请选择类型的异常"
+
+#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:86
+#: 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 "不能为负数或空"
+
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:48
+msgid "Calculated"
+msgstr "计算"
+
+#: libreplan-webapp/src/main/webapp/common/layout/login.zul:56
+msgid "Access to the system"
+msgstr "到系统中的访问"
+
+#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:48
+msgid "Probability"
+msgstr "可能性"
+
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:139
+msgid "Report data"
+msgstr "报告数据"
+
+#: 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 "材料单位"
+
+#: libreplan-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:44
+msgid "External load"
+msgstr "外部负载"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ReportAdvancesController.java:207
+msgid "Progress sent successfully"
+msgstr "进展发送成功"
+
+#: 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"
+" Assignment Strategy"
+msgstr "请允许多个活动在这种类型的标准，以使用选定的分配策略"
+
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:73
+msgid "Priority"
+msgstr "优先"
+
+#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:47
+msgid "Apply changes and continue edition"
+msgstr "应用更改并继续编辑"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:221
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:80
+msgid "Infinitely Over Assignable"
+msgstr "无限超过可分配的"
+
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:246
+msgid "Money spent"
+msgstr "花的钱"
+
+#: 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/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/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/workreports/workReport.zul:67
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:158
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:54
+#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:65
+#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:75
+#: 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/_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
+msgid "Code"
+msgstr "码"
+
+#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:40
+msgid "Add stretch"
+msgstr "添加拉伸"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:302
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:513
+msgid ""
+"Progress Assignment cannot be deleted or changed. Progress Assignment "
+"contains Progress Consolidations values"
+msgstr "任务分配，不能删除或更改。任务分配的进展合并值"
+
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:70
+msgid "Assignation type"
+msgstr "分配类型"
+
+#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:33
+msgid "Show resource assignments"
+msgstr "资源分配"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:369
+msgid "Calculate Workable Days"
+msgstr "计算可作业天数"
+
+#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:116
+msgid "unit name not specified"
+msgstr "不指定单位名称"
+
+#: 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/machine/_machineConfigurationUnits.zul:54
+msgid "Start date"
+msgstr "开始日期"
+
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:183
+msgid "Update exception"
+msgstr "更新异常"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/TreeElementOperationsController.java:257
+msgid "Operation cannot be done"
+msgstr "操作不能被做"
+
+#: 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/orders/_orderElementDetails.zul:65
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:168
+msgid "Budget"
+msgstr "预算"
+
+#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:38
+msgid "Unit name"
+msgstr "单位名称"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:750
+msgid "Progress that are reported by quality forms cannot be modified"
+msgstr "所报告的质量形式的进展，不能修改"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:23
+msgid "LibrePlan: Main Settings"
+msgstr "LibrePlan：主要设置"
+
+#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLabelTypeAssigment.java:64
+msgid "default label not specified"
+msgstr "未指定默认标签"
+
+#: 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
+msgid "Project code"
+msgstr "项目代码"
+
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:32
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:57
+msgid "Write"
+msgstr "写"
+
+#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:39
+msgid "Number of applications"
+msgstr "申请宗数"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:501
+msgid "Assign element to queue automatically"
+msgstr "队列自动分配单元"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:427
+msgid "Confirm worker edition"
+msgstr "确认工人版"
+
+#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:74
+msgid "type"
+msgstr "类型"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:604
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/ResourceAllocationBehaviour.java:38
+#: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:43
+msgid "Normal"
+msgstr "正常"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:398
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:36
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:65
+msgid "Main Settings"
+msgstr "主要设置"
+
+#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:106
+msgid "Task Code"
+msgstr "任务代码"
+
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:111
+msgid "Project view"
+msgstr "项目视图"
+
+#: 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 "概率％"
+
+#: 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/planner/_legendLoadChartOrder.zul:49
+msgid "Load"
+msgstr "加载"
+
+#: libreplan-webapp/src/main/webapp/resources/_criterions.zul:27
+#: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:28
+msgid "New criterion"
+msgstr "新标准"
+
+#: 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/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/orders/_orderElementDetails.zul:59
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:98
+msgid "Description"
+msgstr "描述"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:218
+msgid "Resource: {0}"
+msgstr "资源：{0}"
+
+#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:39
+#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:45
+msgid "Apply"
+msgstr "申请"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:969
+msgid "Do you want to remove bound user \"{0}\" too?"
+msgstr "你要删除绑定用户“{0}”吗？"
+
+#: libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul:52
+#: libreplan-webapp/src/main/webapp/subcontract/subcontractorCommunications.zul:52
+msgid "Communication Type"
+msgstr "通信类型"
+
+#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:49
+msgid "Selected node"
+msgstr "选择节点"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:678
+msgid "already exists an allocation for criteria {0}"
+msgstr "已经存在的配置为标准{0}"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:514
+msgid "Code cannot be empty."
+msgstr "代码不能为空。"
+
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:216
+msgid "Project type"
+msgstr "项目类型"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:310
+msgid "Forward"
+msgstr "前"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1359
+msgid "Invalid date. Date must be unique for this Progress Assignment"
+msgstr "无效的日期。取得这一进展的分配必须是唯一的日期"
+
+#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:43
+msgid "Number of finished applications"
+msgstr "完成的应用程序数量"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:469
+msgid "Invalid queue element"
+msgstr "无效的队列元素"
+
+#: 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 "Unnasigned"
+
+#: 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 "任务数"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:403
+msgid "At least one HoursGroup is needed"
+msgstr "至少有一个HoursGroup需要"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:269
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:63
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:116
+#: libreplan-webapp/src/main/webapp/common/layout/login.zul:75
+#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:167
+msgid "User"
+msgstr "用户"
+
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:71
+msgid "Interacts with applications"
+msgstr "与应用程序进行交互"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceInExpenseSheetBandboxFinder.java:44
+msgid "Resource name (Resource code)"
+msgstr "资源名称（资源代码）"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:295
+msgid "Virtual worker"
+msgstr "虚拟工作者"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionController.java:343
+msgid "Length percentage should be between 0 and 100"
+msgstr "长度比例应为0和100之间"
+
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:50
+msgid "Multiple values per resource"
+msgstr "每一个资源的多个值"
+
+#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:60
+#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:59
+msgid "Split"
+msgstr "分裂"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:443
+msgid "Communications"
+msgstr "通信"
+
+#: 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
+msgid "please, select a project"
+msgstr "请选择一个项目"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java:200
+msgid "Cannot remove the predefined calendar exception day \"{0}\""
+msgstr "无法删除预定义的日历例外日“{0}”"
+
+#: libreplan-webapp/src/main/webapp/common/layout/login.zul:123
+msgid "Supported Chrome, Firefox, Safari and Epiphany browsers"
+msgstr "支持Chrome浏览器浏览器，火狐，Safari浏览器和顿悟浏览器"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:178
+msgid "Task deadline violations"
+msgstr "违反任务期限"
+
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:53
+#: 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/orders/_orderElementDetails.zul:45
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:127
+#: libreplan-webapp/src/main/webapp/orders/_list.zul:30
+msgid "Starting date"
+msgstr "开始日期"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:913
+msgid ""
+"Periocity cannot be changed because there is already any personal timesheet "
+"stored"
+msgstr "Periocity不能改变，因为已经有存储任何个人时间表"
+
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:62
+msgid "Add materials"
+msgstr "添加材料"
+
+#: libreplan-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:34
+msgid "Load 100%"
+msgstr "负载100％"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:940
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:84
+msgid "Function"
+msgstr "功能"
+
+#: 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 "格式"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:908
+msgid "New project version"
+msgstr "新的项目版本"
+
+#: libreplan-business/src/main/java/org/libreplan/business/labels/entities/LabelType.java:110
+msgid "label names must be unique inside a label type"
+msgstr "标签名称必须是唯一的内部标签类型"
+
+#: 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/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/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
+msgid "Edit"
+msgstr "编辑"
+
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:93
+msgid "Responsible"
+msgstr "负责"
+
+#: libreplan-webapp/src/main/webapp/common/access_forbidden.zul:43
+msgid "Click the following link to return to home page: "
+msgstr "点击以下链接返回首页："
+
+#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:20
+msgid "LibrePlan: Project Status Report"
+msgstr "LibrePlan：项目状态报告"
+
+#: libreplan-webapp/src/main/webapp/myaccount/changePassword.zul:71
+msgid "New password"
+msgstr "新密码"
+
+#: 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 "的规划，这项任务是不是在目前的scenenario。，⏎ 你应该改变在以下情况中的任何一种：{0}"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetDTO.java:124
+msgid "{0} 2nd fortnight"
+msgstr "{0}第二个两周"
+
+#: libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul:20
+msgid "LibrePlan: Received From Customers"
+msgstr "LibrePlan：从客户收取"
+
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:134
+msgid "New user"
+msgstr "新用户"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTree.java:43
+#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTree.java:51
+msgid "New Description"
+msgstr "新的说明"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:851
+msgid "Done"
+msgstr "完成"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:114
+msgid "Tree {0} sucessfully flattened"
+msgstr "树{0}成功地扁平化"
+
+#: 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 "单价"
+
+#: 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 "没有足够的权限来创建模板"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1347
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1369
+msgid ""
+"Invalid value. Value must be greater than the value of previous progress."
+msgstr "无效值。值必须大于比以前进步的价值。"
+
+#: 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
+msgid "Communication date"
+msgstr "通信日期"
+
+#: 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
+msgid "Project Code"
+msgstr "项目代码"
+
+#: libreplan-webapp/src/main/webapp/planner/reassign.zul:30
+msgid "Reassigning"
+msgstr "重新分配"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:651
+msgid "{0} already assigned to resource allocation list"
+msgstr "{0}已经分配给资源分配列表"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/FilterCommunicationEnum.java:28
+msgid "Not Reviewed"
+msgstr "不评论"
+
+#: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:22
+msgid "Label Types List"
+msgstr "标签类型列表"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:72
+msgid "Hours type for personal timesheets"
+msgstr "小时类型的个人时间表"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/QualityFormBandboxFinder.java:51
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/LabelBandboxFinder.java:52
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceInExpenseSheetBandboxFinder.java:44
+#: 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/expensesheet/expenseSheet.zul:56
+#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:91
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:154
+#: libreplan-webapp/src/main/webapp/workreports/_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/_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
+msgid "Type"
+msgstr "类型"
+
+#: libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul:43
+#: libreplan-webapp/src/main/webapp/subcontract/subcontractorCommunications.zul:43
+msgid "Refresh"
+msgstr "刷新"
+
+#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:270
+#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:131
+#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:140
+msgid "Two Hour Cost of the same type overlap in time"
+msgstr "二小时相同类型的成本在时间上重叠的"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:508
+msgid "Home"
+msgstr "家"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:114
+msgid "Enable/Disable"
+msgstr "启用/禁用"
+
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:90
+msgid "Company password"
+msgstr "公司密码"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:247
+msgid "BCWS"
+msgstr "BCWS"
+
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1144
+msgid "criterion satisfaction codes must be unique inside a resource"
+msgstr "标准满意代码必须是独特的内部资源"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:719
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:755
+msgid "This progress type cannot be modified"
+msgstr "这一进展类型不能被修改"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:253
+msgid "percentage should be between 1 and 100"
+msgstr "比例应为1和100之间的"
+
+#: libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul:57
+#: libreplan-webapp/src/main/webapp/subcontract/subcontractorCommunications.zul:57
+msgid "Communication Date"
+msgstr "通讯日期"
+
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractedTaskData.java:281
+msgid "delivery date not specified"
+msgstr "没有指定的交货日期"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:1009
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:578
+msgid "no"
+msgstr "没有"
+
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/MachineWorkersConfigurationUnit.java:174
+msgid ""
+"All machine worker assignments must have a start date earlier than the end "
+"date"
+msgstr "所有的机器的工人分配必须有一个起始日期早于结束日期"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementInExpenseSheetBandboxFinder.java:45
+msgid "Task name (Task code)"
+msgstr "任务的名称（任务代码）"
+
+#: 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 "标准"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:656
+msgid "Edit Timesheet"
+msgstr "编辑时间表"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:104
+msgid "unl"
+msgstr "UNL"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1690
+msgid "Please select a worker"
+msgstr "请选择一个工人"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:329
+msgid "Test LDAP connection"
+msgstr "测试LDAP连接"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:134
+msgid "Generate code for"
+msgstr "生成代码"
+
+#: 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
+msgid "name not specified"
+msgstr "名称未指定"
+
+#: libreplan-webapp/src/main/webapp/planner/editTask.zul:68
+msgid "Queue-based resource allocation"
+msgstr "基于队列的资源分配"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioCRUDController.java:225
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateController.java:121
+msgid "error doing reassignment: {0}"
+msgstr "做重新分配错误：{0}"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:248
+msgid "Actual Cost Work Performed"
+msgstr "工作的实际成本"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:96
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:117
+msgid "Queue-based Resources Planning"
+msgstr "基于队列的资源规划"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:137
+msgid "Create project from Template"
+msgstr "从模板创建项目"
+
+#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:56
+msgid "Previous"
+msgstr "前"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:436
+msgid ""
+"Value is not valid.\n"
+" Code cannot contain chars like '_' \n"
+" and should not be empty"
+msgstr "值无效。⏎ 代码不能包含字符，如'_' ⏎ 和不应该是空的"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1253
+msgid "Values already sent to the customer. Values cannot be changed "
+msgstr "值已经发送给客户。值不能改变"
+
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/OrderAuthorization.java:43
+msgid "an authorization type must be set"
+msgstr "授权类型必须设置"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:869
+msgid ""
+"This project is a subcontracted project. If you delete it, you won't be able"
+" to report progress anymore. Are you sure?"
+msgstr "这个项目是一个分包项目。如果你删除它，你将无法汇报工作进度了。你确定吗？"
+
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:194
+msgid "Percentage of estimated budget in money / money spent"
+msgstr "在货币/金钱花费的估计预算的百分比"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:907
+msgid ""
+"Confirm creating a new project version for this scenario and derived. Are "
+"you sure?"
+msgstr "确认这种情况下，衍生创建一个新的项目版本。你确定吗？"
+
+#: 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/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:66
+#: 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/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/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/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 "加"
+
+#: libreplan-webapp/src/main/webapp/common/error.zul:48
+#: libreplan-webapp/src/main/webapp/common/event_error.zul:43
+msgid "Stacktrace"
+msgstr "堆栈跟踪"
+
+#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportType.java:167
+msgid "timesheet template name is already being used"
+msgstr "时间表模板名称已被使用"
+
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:50
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:122
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:43
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:79
+msgid "Unselect"
+msgstr "取消选择"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:284
+msgid "Queue-based Resources"
+msgstr "基于队列的资源"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:1084
+msgid "Hours Group at {0}"
+msgstr "h组的{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/_orderElementDetails.zul:52
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:132
+#: libreplan-webapp/src/main/webapp/orders/_list.zul:31
+msgid "Deadline"
+msgstr "期限"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:241
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:216
+msgid "Invalid Start Date. New Start Date must be earlier than End Date"
+msgstr "开始日期无效。新的开始日期必须早于结束日期"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportQueryController.java:373
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:115
+msgid "Tasks"
+msgstr "任务"
+
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:120
+msgid "Filter by categories or materials"
+msgstr "按类别或材料筛选"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionController.java:389
+msgid "Amount work percentage should be between 0 and 100"
+msgstr "金额的比例应是介于0和100之间"
+
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:30
+msgid "Machine data"
+msgstr "机床数据"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:253
+msgid "VAC"
+msgstr "VAC"
+
+#: 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 "标签类型"
+
+#: 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 "高级配置"
+
+#: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:93
+msgid "Number of iterations"
+msgstr "迭代次数。"
+
+#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:263
+msgid "label type:the timesheet have not assigned this label type"
+msgstr "标签类型：时间表已指定了这个标签类型"
+
+#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:42
+msgid "Template Tree"
+msgstr "模板树"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:449
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:35
+msgid "Alpha"
+msgstr "阿尔法"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:329
+msgid "Criterion has subelements"
+msgstr "标准有子元素"
+
+#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:47
+msgid "Last communication"
+msgstr "最后沟通"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:434
+msgid "effort is not properly calculated based on clock"
+msgstr "努力还没有正确地计算基于时钟"
+
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:65
+#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:33
+msgid "Status"
+msgstr "状态"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:322
+msgid "from {0}"
+msgstr "from {0}"
+
+#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:114
+msgid "Resource load view"
+msgstr "资源加载视图"
+
+#: 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 "小时"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:606
+msgid "Could not save the new calendar"
+msgstr "无法保存新的日历"
+
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:56
+msgid "Quality form type"
+msgstr "质量表单类型"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:318
+msgid "{0} \"{1}\" deleted"
+msgstr "{0}“{1}”删除"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:364
+msgid " hours"
+msgstr "小时"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:262
+msgid ""
+"% Deviation interval (difference % between consumed and estimated hours)"
+msgstr "％偏差区间（消耗和估计小时之间的差别％）"
+
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:69
+msgid "New label"
+msgstr "新标签"
+
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java:144
+msgid "Worker ID cannot be empty"
+msgstr "工人的ID不能为空"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/Type.java:31
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:306
+msgid "All project tasks"
+msgstr "所有的项目任务"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:410
+msgid "LDAP Roles (separated by ;)"
+msgstr "LDAP角色（;)分隔"
+
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_allocationConfiguration.zul:27
+#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:78
+msgid "Allocation configuration"
+msgstr "分配配置"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:732
+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"
+msgstr "您不能删除任务“{0}”，因为它是唯一的孩子，其母公司及其母公司一直在跟踪时间或估算费用"
+
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:61
+msgid "Subcontract price"
+msgstr "分包合同价格"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:434
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:71
+msgid "Send To Customers"
+msgstr "发送给客户"
+
+#: libreplan-webapp/src/main/webapp/common/page_not_found.zul:40
+msgid "The page that you are requesting does not exist."
+msgstr "您所请求的页面不存在。"
+
+#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:496
+msgid ""
+"In personal timesheets, all timesheet lines should be in the same period"
+msgstr "在个人时间表，时间表行应在同期"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:835
+msgid "Resources per day are zero"
+msgstr "每天有资源为零"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1134
+msgid "Value is not valid in current list of Hours Group"
+msgstr "在当前列表中的h组的值无效"
+
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:38
+msgid "Timesheets List"
+msgstr "工时单列表"
+
+#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:100
+msgid "Total extra per day"
+msgstr "总的额外每天"
+
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:32
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:31
+msgid "Assigned criteria"
+msgstr "分配标准"
+
+#: libreplan-webapp/src/main/webapp/common/layout/login.zul:58
+msgid "Help on authentication (opens a new window)"
+msgstr "帮助认证（打开一个新窗口）"
+
+#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:42
+msgid "Timesheet data"
+msgstr "时间表数据"
+
+#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:34
+msgid "Base calendar type"
+msgstr "基准日历类型"
+
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:78
+msgid "Imputed expenses"
+msgstr "之估算费用"
+
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_allocationConfiguration.zul:35
+msgid "Planned end"
+msgstr "计划结束"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioModel.java:224
+msgid "Could not save the scenario"
+msgstr "无法保存方案"
+
+#: 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
+msgid "Apply filtering to tasks satisfying required criteria"
+msgstr "应用过滤任务，满足要求的标准"
+
+#: 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 "在项目的任务调度状态"
+
+#: 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 "不仅是因​​为他们的报告由分包商公司，分包商中读取值"
+
+#: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/ExternalCompany.java:149
+msgid "company name must be unique. Company name already used"
+msgstr "公司名称必须是唯一的。公司名称已使用"
+
+#: 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
+msgid "Confirm"
+msgstr "确认"
+
+#: 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/criterions/_list.zul:52
+#: libreplan-webapp/src/main/webapp/typeofworkhours/_listTypesOfWorkHours.zul:58
+msgid "Create"
+msgstr "创建"
+
+#: libreplan-business/src/main/java/org/libreplan/business/requirements/entities/IndirectCriterionRequirement.java:77
+msgid "parent not specified"
+msgstr "家长不指定"
+
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:43
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:67
+msgid "Permissions"
+msgstr "权限"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:491
+msgid "List of materials for category: {0}"
+msgstr "材料类列表：{0}"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/adaptplanning/AdaptPlanningCommand.java:60
+msgid "Adapt planning according to timesheets"
+msgstr "根据时间表，适应规划"
+
+#: libreplan-webapp/src/main/webapp/orders/_ordersTab.zul:36
+msgid "Cancel edition"
+msgstr "取消版"
+
+#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:32
+#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:32
+msgid "Total price"
+msgstr "总价格"
+
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:420
+msgid "criterion codes must be unique inside a criterion  type"
+msgstr "标准代码必须是唯一的标准型内"
+
+#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:37
+msgid "Warning: Not editing from home page of bound users"
+msgstr "警告：不绑定的用户主页编辑"
+
+#: 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 "无效的努力时间"
+
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/VirtualWorker.java:97
+msgid "Virtual worker group name must be unique"
+msgstr "虚拟工作组的名称必须是唯一的"
+
+#: 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
+msgid "start date not specified"
+msgstr "未指定开始日期"
+
+#: 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/expensesheet/ExpenseSheetCRUDController.java:212
+#: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:412
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java: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/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/criterions/_list.zul:45
+#: libreplan-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:102
+#: 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
+msgid "Delete"
+msgstr "删除"
+
+#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:46
+msgid "Labels without inheritance"
+msgstr "没有继承的标签"
+
+#: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/CommunicationType.java:31
+msgid "New project"
+msgstr "新项目"
+
+#: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/CommunicationType.java:31
+msgid "Progress Update"
+msgstr "最新进展"
+
+#: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/CommunicationType.java:32
+msgid "Update Delivering Date"
+msgstr "更新交付日期"
+
+#: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/CommunicationType.java:32
+msgid "End date update"
+msgstr "更新结束日期"
+
+#: libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialStatusEnum.java:32
+msgid "RECEIVED"
+msgstr "收到"
+
+#: libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialStatusEnum.java:33
+msgid "PENDING"
+msgstr "PENDING"
+
+#: libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialStatusEnum.java:34
+msgid "ORDERED"
+msgstr "指令"
+
+#: libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialStatusEnum.java:35
+msgid "PROCESSING"
+msgstr "加工"
+
+#: libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialStatusEnum.java:36
+msgid "CANCELED"
+msgstr "已取消"
+
+#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/PositionInWorkReportEnum.java:34
+msgid "heading"
+msgstr "标题"
+
+#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/PositionInWorkReportEnum.java:34
+msgid "line"
+msgstr "线"
+
+#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/HoursManagementEnum.java:31
+msgid "Number of assigned hours"
+msgstr "号码分配时间"
+
+#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/HoursManagementEnum.java:32
+msgid "Number of hours calculated by clock"
+msgstr "由时钟计算的小时数"
+
+#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/HoursManagementEnum.java:33
+msgid "Number of assigned hours and time"
+msgstr "号码分配的时间和时间"
+
+#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityFormType.java:29
+msgid "by percentage"
+msgstr "按百分比"
+
+#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityFormType.java:29
+msgid "by items"
+msgstr "通过项目"
+
+#: libreplan-business/src/main/java/org/libreplan/business/settings/entities/Language.java:36
+msgid "Use browser language configuration"
+msgstr "使用浏览器的语言设置"
+
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/StretchesFunction.java:410
+msgid "Stretches must sum 100%"
+msgstr "伸展合计100％"
+
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:76
+msgid "Flat"
+msgstr "平"
+
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:78
+msgid "Stretches"
+msgstr "伸展"
+
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:79
+msgid "Interpolation"
+msgstr "插值"
+
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:80
+msgid "Sigmoid"
+msgstr "乙状结肠"
+
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractState.java:32
+msgid "Pending initial send"
+msgstr "待处理的初始发送"
+
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractState.java:33
+msgid "Pending update delivering date"
+msgstr "更新交付日期之前"
+
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractState.java:34
+msgid "Failed sent"
+msgstr "失败发送"
+
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractState.java:34
+msgid "Failed update"
+msgstr "更新失败"
+
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractState.java:35
+msgid "Success sent"
+msgstr "成功发送"
+
+#: 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 "有没有几天由于不符合标准。"
+
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:96
+msgid ""
+"Another possibility is that the resources do not have days available due to "
+"their calendars."
+msgstr "另一种可能性是没有的资源由于他们的日历天。"
+
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:102
+msgid ""
+"There are no days available in the days marked available by the task "
+"calendar."
+msgstr "有天在天的任务日历标记为可用。"
+
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:103
+msgid "Maybe the criteria are not satisfied in those days."
+msgstr "在那些日子里，也许不满意的标准。"
+
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:175
+msgid "Resource is not available from task's start"
+msgstr "资源是不可用的，从任务的开始"
+
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:180
+msgid "Resource is not available according to task's calendar"
+msgstr "根据任务的日历，资源不可用"
+
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:29
+msgid "In progress"
+msgstr "进行"
+
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:30
+msgid "Pending"
+msgstr "有待"
+
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:31
+msgid "Blocked"
+msgstr "被阻止"
+
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:32
+msgid "Ready to start"
+msgstr "准备开始"
+
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskDeadlineViolationStatusEnum.java:35
+msgid "Deadline violated"
+msgstr "截止违反"
+
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:31
+msgid "as soon as possible"
+msgstr "及早"
+
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:38
+msgid "start not earlier than"
+msgstr "开始不早于"
+
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:45
+msgid "start in fixed date"
+msgstr "在固定的日期开始"
+
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:57
+msgid "as late as possible"
+msgstr "尽可能晚地"
+
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:64
+msgid "finish not later than"
+msgstr "完成不得迟于"
+
+#: libreplan-business/src/main/java/org/libreplan/business/planner/limiting/entities/QueuePosition.java:53
+msgid "Hour should be between 0 and 23"
+msgstr "小时应该是0和23之间"
+
+#: 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 "一个队列依赖的起源有不同的命运"
+
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/OrderAuthorizationType.java:33
+msgid "Read authorization"
+msgstr "阅读授权"
+
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/OrderAuthorizationType.java:34
+msgid "Write authorization"
+msgstr "写授权"
+
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:37
+msgid "Web service reader"
+msgstr "Web服务读者"
+
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:38
+msgid "Web service writer"
+msgstr "Web服务的作家"
+
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:39
+msgid "Web service subcontractor operations"
+msgstr "Web服务分包业务"
+
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:41
+msgid "Read all projects"
+msgstr "所有项目"
+
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:42
+msgid "Edit all projects"
+msgstr "编辑所有项目"
+
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:43
+msgid "Create projects"
+msgstr "创建项目"
+
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:74
+msgid "Hours Worked Per Resource Report"
+msgstr "资源报告工作时数"
+
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:75
+msgid "Total Worked Hours By Resource In A Month Report"
+msgstr "总工作小时的资源在一个月内报告"
+
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:76
+msgid "Work And Progress Per Project Report"
+msgstr "每个项目的工作和进展报告"
+
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:77
+msgid "Work And Progress Per Task Report"
+msgstr "每个任务的工作和进展报告"
+
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:78
+msgid "Estimated/Planned Hours Per Task Report"
+msgstr "估计小时数/计划任务报告"
+
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:79
+msgid "Project Costs Report"
+msgstr "项目成本报告"
+
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:80
+msgid "Task Scheduling Status In Project Report"
+msgstr "在项目报告中的任务调度状态"
+
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:81
+msgid "Materials Needs At Date Report"
+msgstr "材料需要的日期报告"
+
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:345
+msgid "Database"
+msgstr "数据库"
+
+#: 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 "线"
+
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:31
+msgid "red (default)"
+msgstr "红色（默认）"
+
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:32
+msgid "green"
+msgstr "绿色"
+
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:33
+msgid "blue"
+msgstr "蓝色"
+
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:34
+msgid "cyan"
+msgstr "青色"
+
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:35
+msgid "magenta"
+msgstr "品红"
+
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:36
+msgid "yellow"
+msgstr "黄"
+
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:37
+msgid "black"
+msgstr "黑色"
+
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:38
+msgid "orange"
+msgstr "橙"
+
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:39
+msgid "purple"
+msgstr "紫色"
+
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/Capacity.java:172
+msgid "unlimited"
+msgstr "无限"
+
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:207
+msgid "[generic all machines]"
+msgstr "[通用机械]"
+
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/ResourceEnum.java:32
+msgid "WORKER"
+msgstr "工人"
+
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/ResourceEnum.java:33
+msgid "MACHINE"
+msgstr "机"
+
+#: 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/orders/entities/OrderStatusEnum.java:34
+msgid "OFFERED"
+msgstr "提呈发售"
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:35
+msgid "OUTSOURCED"
+msgstr "外包"
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:36
+msgid "ACCEPTED"
+msgstr "被接受"
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:37
+msgid "STARTED"
+msgstr "入门"
+
+#: 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 "FINISHED"
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:40
+msgid "CANCELLED"
+msgstr "已取消"
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:41
+msgid "STORED"
+msgstr "STORED"
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/SchedulingState.java:366
+msgid "Fully scheduled"
+msgstr "全计划"
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/SchedulingState.java:368
+msgid "Partially scheduled"
+msgstr "部分计划"
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/SchedulingState.java:370
+msgid "Unscheduled"
+msgstr "不定期"
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/SchedulingState.java:376
+msgid "F"
+msgstr "F"
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/SchedulingState.java:378
+msgid "P"
+msgstr "P"
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/SchedulingState.java:380
+msgid "U"
+msgstr "ü"
+
+#: 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
+msgid "Cannot spread two progress in the same task"
+msgstr "不能传播两个在同一个任务进度"
+
+#: 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 "有关任务，重复任务分配"
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:1158
+msgid "Quality form already exists"
+msgstr "质量形式已经存在"
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/HoursGroup.java:208
+msgid "Total percentage should be less than 100%"
+msgstr "总比例应为小于100％"
+
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/CriterionRequirementHandler.java:539
+msgid "The criterion already exists into another task"
+msgstr "该标准已经存在到另一个任务"
+
+#: libreplan-business/src/main/java/org/libreplan/business/common/entities/PersonalTimesheetsPeriodicityEnum.java:35
+msgid "Monthly"
+msgstr "每月一次"
+
+#: libreplan-business/src/main/java/org/libreplan/business/common/entities/PersonalTimesheetsPeriodicityEnum.java:66
+msgid "Twice-monthly"
+msgstr "每月两次"
+
+#: libreplan-business/src/main/java/org/libreplan/business/common/entities/PersonalTimesheetsPeriodicityEnum.java:123
+msgid "Weekly"
+msgstr "每周"
+
+#: libreplan-business/src/main/java/org/libreplan/business/common/entities/ProgressType.java:37
+msgid "Progress with all tasks by hours"
+msgstr "几个小时的所有任务的进展"
+
+#: libreplan-business/src/main/java/org/libreplan/business/common/entities/ProgressType.java:38
+msgid "Progress with critical path tasks by hours"
+msgstr "关键路径任务的进展小时"
+
+#: libreplan-business/src/main/java/org/libreplan/business/common/entities/ProgressType.java:39
+msgid "Progress with critical path tasks by duration"
+msgstr "关键路径任务的持续时间的研究进展"
+
+#: 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 "实体序列不能被删除。已在使用中的实体序列"
diff --git a/libreplan-webapp/src/main/webapp/myaccount/settings.zul b/libreplan-webapp/src/main/webapp/myaccount/settings.zul
index 20243b223..22d8d88f9 100644
--- a/libreplan-webapp/src/main/webapp/myaccount/settings.zul
+++ b/libreplan-webapp/src/main/webapp/myaccount/settings.zul
@@ -2,6 +2,7 @@
   This file is part of LibrePlan
 
   Copyright (C) 2011 ComtecSF, S.L.
+  Copyright (C) 2013 Igalia, S.L.
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU Affero General Public License as
@@ -117,6 +118,40 @@
                                         </rows>
                                     </grid>
                                 </row>
+                                <row>
+                                    <label
+                                        value="${i18n:_('Projects view filtering')}" />
+                                    <hbox>
+                                        <label value="${i18n:_('Label filter')}" />
+                                        <bandboxSearch
+                                            id="projectsFilterLabelBandboxSearch"
+                                            finder="LabelBandboxFinder"
+                                            model="@{settingsController.allLabels}"
+                                            selectedElement="@{settingsController.projectsFilterLabel}"
+                                            widthListbox="450px" widthBandbox="200px"/>
+                                        <label value="${i18n:_('Projects since')}" />
+                                        <intbox id="projectsFilterPeriodSince" value="@{settingsController.projectsFilterPeriodSince}" width="50px"/>
+                                        <label value="${i18n:_('months to')}" />
+                                        <intbox id="projectsFilterPeriodTo" value="@{settingsController.projectsFilterPeriodTo}" width="50px"/>
+                                    </hbox>
+                                </row>
+                                <row>
+                                    <label
+                                        value="${i18n:_('Resources load filtering')}" />
+                                    <hbox>
+                                        <label value="${i18n:_('Criterion filter')}" />
+                                        <bandboxSearch
+                                            id="resourcesLoadFilterCriterionBandboxSearch"
+                                            finder="CriterionBandboxFinder"
+                                            model="@{settingsController.allCriteria}"
+                                            selectedElement="@{settingsController.resourcesLoadFilterCriterion}"
+                                            widthListbox="450px" widthBandbox="200px"/>
+                                        <label value="${i18n:_('Resources load since')}" />
+                                        <intbox id="resourcesLoadFilterPeriodSince" value="@{settingsController.resourcesLoadFilterPeriodSince}" width="50px"/>
+                                        <label value="${i18n:_('months to')}" />
+                                        <intbox id="resourcesLoadFilterPeriodTo" value="@{settingsController.resourcesLoadFilterPeriodTo}" width="50px"/>
+                                    </hbox>
+                                </row>
                             </rows>
                         </grid>
                     </groupbox>
diff --git a/libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul b/libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul
index 33573ef87..e11c8600a 100644
--- a/libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul
+++ b/libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul
@@ -23,10 +23,10 @@
     <label value="${i18n:_('Task')}"
         tooltiptext="${i18n:_('Select required criteria set and press filter button')}"/>
     <textbox id="filterNameOrderElement" width="100px"
-        onOK="treeController.onApplyFilter()" />
+        onChange="treeController.onApplyFilter()" />
     <label value="${i18n:_('with')}"/>
     <bandboxMultipleSearch id="bdFiltersOrderElement" widthBandbox="260px" widthListbox="550px"
-        finder="orderElementsMultipleFiltersFinder" />
+        finder="orderElementsMultipleFiltersFinder" onChange="treeController.onApplyFilter()" />
     <button id="optionsButton" label="${i18n:_('options')}" dir="reverse"
         image="/common/img/ico_dropdown.png" style="margin-top: -2px"
         tooltiptext="${i18n:_('Set Filter Options')}"
@@ -38,12 +38,12 @@
     <popup id="filterOptionsPopup" sclass="filter-options-popup">
                 <hbox align="pack">
                     <label value="${i18n:_('from')}"/>
-                    <datebox id="filterStartDateOrderElement" constraint = "@{treeController.checkConstraintStartDate}" />
+                    <datebox id="filterStartDateOrderElement" constraint = "@{treeController.checkConstraintStartDate}" onChange="treeController.onApplyFilter()" />
                     <label value="${i18n:_('to')}"/>
-                    <datebox id="filterFinishDateOrderElement" constraint = "@{treeController.checkConstraintFinishDate}" />
+                    <datebox id="filterFinishDateOrderElement" constraint = "@{treeController.checkConstraintFinishDate}" onChange="treeController.onApplyFilter()" />
                 </hbox>
                 <hbox align="pack">
-                    <checkbox id="labelsWithoutInheritance" checked="false" label="${i18n:_('Labels without inheritance')}"/>
+                    <checkbox id="labelsWithoutInheritance" checked="false" label="${i18n:_('Labels without inheritance')}" onChange="treeController.onApplyFilter()" />
                 </hbox>
     </popup>
 </hbox>
diff --git a/libreplan-webapp/src/main/webapp/orders/_orderFilter.zul b/libreplan-webapp/src/main/webapp/orders/_orderFilter.zul
index 651929c3e..bfe58e142 100644
--- a/libreplan-webapp/src/main/webapp/orders/_orderFilter.zul
+++ b/libreplan-webapp/src/main/webapp/orders/_orderFilter.zul
@@ -23,11 +23,13 @@
     <label value=" ${i18n:_('Filter')}"
         tooltiptext="${i18n:_('Select required criteria set and press filter button')}"/>
     <bandboxMultipleSearch id="bdFilters" widthBandbox="260px" widthListbox="550px"
-        finder="ordersMultipleFiltersFinder"/>
+        finder="ordersMultipleFiltersFinder" onChange="orderFilterController.onApplyFilter()" />
     <label value="${i18n:_('from')}"/>
-    <datebox id="filterStartDate" constraint = "@{orderFilterController.checkConstraintStartDate}"/>
+    <datebox id="filterStartDate" constraint = "@{orderFilterController.checkConstraintStartDate}"
+        onChange="orderFilterController.onApplyFilter()"/>
     <label value="${i18n:_('to')}"/>
-    <datebox id="filterFinishDate" constraint = "@{orderFilterController.checkConstraintFinishDate}"/>
+    <datebox id="filterFinishDate" constraint = "@{orderFilterController.checkConstraintFinishDate}"
+        onChange="orderFilterController.onApplyFilter()"/>
     <label value="${i18n:_('subelements')}"/>
     <checkbox id="checkIncludeOrderElements"
         tooltiptext="${i18n:_('Apply filtering to tasks satisfying required criteria')}" />
diff --git a/libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul b/libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul
index 436f98a9c..42f7798c0 100644
--- a/libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul
+++ b/libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul
@@ -32,7 +32,7 @@
                 <vbox sclass="allocation-criterion-selector">
 
                     <tree id="criterionsTree" width="420px"
-                            height="340px" vflex="true" multiple="true"
+                            height="412px" vflex="true" multiple="true"
                             model="@{selectorController.criterions}"
                             zclass="z-dottree" style="margin-top:5px;margin-bottom:5px;">
                         <treecols>
@@ -44,14 +44,44 @@
 
                 <!--Matchings -->
                 <vbox>
-
-                    <listbox id="listBoxResources" width="420px" height="340px"
+                    <label value="${i18n:_('Load ratios calculated between')}:"/>
+                    <separator/>
+                    <grid fixedLayout="true">
+                       <columns>
+                          <column/>
+                          <column/>
+                       </columns>
+                       <rows>
+                         <row>
+                           <label value="${i18n:_('Start date')}:"/>
+                           <datebox id="startDateLoadRatiosDatebox"
+                                    onChange="selectorController.updateLoadRatios()"/>
+                         </row>
+                         <row>
+                           <label value="${i18n:_('End date')}:"/>
+                           <datebox id="endDateLoadRatiosDatebox"
+                                    onChange="selectorController.updateLoadRatios()"/>
+                         </row>
+                       </rows>
+                     </grid>
+                     <style>
+                        .z-listcell-cnt {
+                            height: 20px;
+                        }
+                        div.z-listcell-cnt {
+                            padding: 5px 0 1px 0;
+                        }
+                     </style>
+                     <listbox id="listBoxResources" width="420px" height="340px"
                             vflex="true" multiple="@{selectorController.allowSelectMultipleResources}" style="margin:5px;"
                             itemRenderer="@{selectorController.listitemRenderer}" >
                         <listhead>
                             <listheader label="${i18n:_('Found resources')}"
-                                    tooltiptext="${i18n:_('Resources matching selected criteria')}" sort="auto" />
-                        </listhead>
+                                    tooltiptext="${i18n:_('Resources matching selected criteria')}"
+                                    sort="auto" sortDirection="ascending"/>
+                            <listheader label="${i18n:_('Availability')}" hflex="min"/>
+                            <listheader label="${i18n:_('Overtime')}" hflex="min"/>
+                       </listhead>
                     </listbox>
 
                 </vbox>