diff --git a/ganttzk/src/main/resources/i18n/ru.po b/ganttzk/src/main/resources/i18n/ru.po
new file mode 100644
index 000000000..042839e8e
--- /dev/null
+++ b/ganttzk/src/main/resources/i18n/ru.po
@@ -0,0 +1,243 @@
+# Russian translations for NavalPlan - GanttZK module.
+# Copyright (C) 2011 Pavel Rudensky <prudensky@gmail.com>
+# This file is distributed under the same license as the NavalPlan package.
+# Pavel Rudensky <prudensky@gmail.com>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: 1.1.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-05-11 18:16+0200\n"
+"PO-Revision-Date: 2011-08-30 16:46+0400\n"
+"Last-Translator: Pavel Rudensky <prudensky@gmail.com>\n"
+"Language-Team: Russian\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:215
+#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:234
+msgid "Erase"
+msgstr "Стереть"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java:319
+msgid "Add Dependency"
+msgstr "Добавить зависимости"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:58
+msgid "Worker"
+msgstr "Работник"
+
+#: ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul:29
+msgid "Start"
+msgstr "Начало"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:592
+msgid "Show reported hours"
+msgstr "Показать затраченные часы"
+
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:78
+msgid "Show/Hide Progress"
+msgstr "Показать/Убрать "
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:92
+msgid "by criteria"
+msgstr "по критериям"
+
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:70
+msgid "Show/Hide reported hours"
+msgstr "Показать/Скрыть сообщенные часы"
+
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:45
+#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:36
+msgid "Zoom"
+msgstr "Масштаб"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/TabsRegistry.java:121
+msgid "Limiting resources"
+msgstr "Ограничение ресурсов"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:68
+msgid "The specified dependency is not allowed"
+msgstr "Указанные зависимости не допускаются"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:254
+msgid "Set End-End"
+msgstr "Установить Конец-Конец"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:58
+msgid "Task"
+msgstr "Задача"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:91
+msgid "by resources"
+msgstr "по ресурсам"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:64
+msgid "Criterion"
+msgstr "Критерий"
+
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:40
+msgid "Print"
+msgstr "Печать"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:190
+msgid "total work hours: {0}, assigned hours: {1}"
+msgstr "Общее количество часов: {0}, назначенные часы: {1}"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:71
+msgid "Week"
+msgstr "Неделя"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadLeftPane.java:111
+msgid "See scheduling"
+msgstr "Просмотр планирования"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:489
+msgid "filtering by name"
+msgstr "фильтрация по имени"
+
+#: ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul:30
+msgid "End"
+msgstr "Конец"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/TimeTracker.java:243
+msgid "changing zoom"
+msgstr "изменение масштаба"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:45
+msgid "Quarter"
+msgstr "Квартал"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:58
+msgid "None"
+msgstr "Ничто"
+
+#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:44
+msgid "Filter"
+msgstr "Фильтр"
+
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:67
+msgid "Flatten/Unflatten tree"
+msgstr "Развернуть/Свернуть дерево"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:58
+msgid "Project"
+msgstr "Проект"
+
+#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:51
+msgid "Name filter"
+msgstr "Наименование фильтра"
+
+#: ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul:28
+#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:69
+msgid "Name"
+msgstr "Наименование"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:572
+msgid "Show progress"
+msgstr "Показать шкалу развития"
+
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:64
+msgid "Expand/Collapse all"
+msgstr "Развернуть/Свернуть все"
+
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:36
+msgid "Create Project"
+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:145
+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:61
+msgid "Show/Hide resources"
+msgstr "Показать/Скрыть ресурсы"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:246
+msgid "Set End-Start"
+msgstr "Установить Конец-Начало"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:302
+msgid "decreasing zoom"
+msgstr "уменьшить масштаб"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:559
+msgid "Hide critical path"
+msgstr "Скрыть критическую часть"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:599
+msgid "Hide reported hours"
+msgstr "Скрыть затраченные часы"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:84
+msgid "Day"
+msgstr "День"
+
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:55
+msgid "Show/Hide Critical path"
+msgstr "Показать/Скрыть критическую часть"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:142
+msgid "showing resources"
+msgstr "Показать ресурсы"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:184
+msgid "Load: {0}%"
+msgstr "Загрузка: {0}%"
+
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:58
+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/plannerLayout.zul:114
+#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:92
+msgid "Graphics"
+msgstr "Графика"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:250
+msgid "Set Start-Start"
+msgstr "Установить Начало-Начало"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:143
+msgid "See resource allocation"
+msgstr "Просмотр распределения ресурсов"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:285
+msgid "increasing zoom"
+msgstr "увеличить масштаб"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:455
+msgid "Show all elements"
+msgstr "Посмотреть все элементы"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:454
+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:577
+msgid "Hide progress"
+msgstr "Спрятать шкалу развития"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:554
+msgid "Show critical path"
+msgstr "Показать критическую часть"
diff --git a/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul b/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul
index 16e6f6396..bd47a2649 100644
--- a/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul
+++ b/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul
@@ -43,6 +43,7 @@ planner = self;
         <separator/>
 
         <!--  Visualization modes -->
+        <space bar="true" />
         <label>${ganttzk_i18n:_('Zoom')}:</label>
         <listbox id="listZoomLevels" mold="select" rows="1"
             model="${planner.zoomLevels}">
diff --git a/navalplanner-webapp/src/main/webapp/js/advanceAllocations.js b/ganttzk/src/main/resources/web/js/ganttz/advanceAllocations.js
similarity index 99%
rename from navalplanner-webapp/src/main/webapp/js/advanceAllocations.js
rename to ganttzk/src/main/resources/web/js/ganttz/advanceAllocations.js
index 6ecc655b3..4eaf7e93e 100644
--- a/navalplanner-webapp/src/main/webapp/js/advanceAllocations.js
+++ b/ganttzk/src/main/resources/web/js/ganttz/advanceAllocations.js
@@ -35,4 +35,4 @@ ADVANCE_ALLOCATIONS.listenToScroll = function() {
 
     if (timeTracker != undefined ) innerScrollableArea.width(timeTracker.realWidth());
 
-};
\ No newline at end of file
+};
diff --git a/ganttzk/src/main/resources/web/js/ganttz/zk.wpd b/ganttzk/src/main/resources/web/js/ganttz/zk.wpd
index 6bcfbfb4b..c29b78828 100644
--- a/ganttzk/src/main/resources/web/js/ganttz/zk.wpd
+++ b/ganttzk/src/main/resources/web/js/ganttz/zk.wpd
@@ -8,6 +8,8 @@
     <script src="../yui/2.7.0/resize/resize-min.js"/>
     <script src="../yui/2.7.0/logger/logger-min.js"/>
 
+    <script src="advanceAllocations.js"/>
+
     <widget name="GanttPanel"/>
     <widget name="TaskRow"/>
     <widget name="TaskComponent"/>
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/DirectAdvanceAssignment.java b/navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/DirectAdvanceAssignment.java
index c4f2b13a9..1d25d307c 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/DirectAdvanceAssignment.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/DirectAdvanceAssignment.java
@@ -240,6 +240,11 @@ public class DirectAdvanceAssignment extends AdvanceAssignment {
         return true;
     }
 
+    @AssertTrue(message = "max value must be greater than zero")
+    public boolean checkConstraintMaxValueMustBeGreaterThanZero() {
+        return maxValue.compareTo(BigDecimal.ZERO) > 0;
+    }
+
     public void setNonCalculatedConsolidation(
             Set<NonCalculatedConsolidation> nonCalculatedConsolidation) {
         this.nonCalculatedConsolidations = nonCalculatedConsolidation;
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/BaseCalendar.java b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/BaseCalendar.java
index 5cccf0723..2894def9f 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/BaseCalendar.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/BaseCalendar.java
@@ -77,6 +77,12 @@ public class BaseCalendar extends IntegrationEntity implements ICalendar,
         return calendar;
     }
 
+    public static BaseCalendar createBasicCalendar(String code) {
+        BaseCalendar calendar = create(code);
+        resetDefaultCapacities(calendar);
+        return calendar;
+    }
+
     public static List<BaseCalendar> sortByName(List<BaseCalendar> baseCalendars) {
         Collections.sort(baseCalendars, new Comparator<BaseCalendar>() {
 
@@ -140,7 +146,6 @@ public class BaseCalendar extends IntegrationEntity implements ICalendar,
 
     }
 
-    @NotEmpty
     private String name;
 
     @Valid
@@ -170,6 +175,7 @@ public class BaseCalendar extends IntegrationEntity implements ICalendar,
         this.name = name;
     }
 
+    @NotEmpty(message = "name not specified")
     public String getName() {
         return name;
     }
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarExceptionType.java b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarExceptionType.java
index ab8a7e83a..04d1c4f33 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarExceptionType.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarExceptionType.java
@@ -150,8 +150,7 @@ public class CalendarExceptionType extends IntegrationEntity implements
         EnumMap<Granularity, Integer> values = duration.decompose();
         Integer hours = values.get(Granularity.HOURS);
         Integer minutes = values.get(Granularity.MINUTES);
-        Integer seconds = values.get(Granularity.SECONDS);
-        return hours + ":" + minutes + ":" + seconds ;
+        return hours + ":" + minutes;
     }
 
     public void setDuration(EffortDuration duration) {
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarExceptionTypeColor.java b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarExceptionTypeColor.java
index 993c5f177..bb2c7be40 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarExceptionTypeColor.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarExceptionTypeColor.java
@@ -28,9 +28,15 @@ import static org.navalplanner.business.i18n.I18nHelper._;
  * @author Manuel Rego Casasnovas <rego@igalia.com>
  */
 public enum CalendarExceptionTypeColor {
-    DEFAULT(_("red (default)"), "red", "lightcoral"),
-    GREEN(_("green"), "green", "lightgreen"),
-    BLUE(_("blue"), "blue", "lightblue");
+    DEFAULT(_("red (default)"), "#FF3333", "#FF9999"),
+    GREEN(_("green"),"#2ee62e", "#8ae68a"),
+    BLUE(_("blue"), "#3333FF", "#9999FF"),
+    CYAN(_("cyan"), "#33FFFF", "#99FFFF"),
+    MAGENTA(_("magenta"), "#FF33FF", "#FF99FF"),
+    YELLOW(_("yellow"), "#e6e62e", "#e6e6a1"),
+    BLACK(_("black"), "#333333", "#999999"),
+    ORANGE(_("orange"), "#ffb733", "#ffdb99"),
+    PURPLE(_("purple"), "#801a80", "#b38eb3");
 
     private final String name;
     private final String colorOwnException;
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/Capacity.java b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/Capacity.java
index d9caefd1d..211338a72 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/Capacity.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/Capacity.java
@@ -181,8 +181,7 @@ public class Capacity {
         EnumMap<Granularity, Integer> values = duration.decompose();
         Integer hours = values.get(Granularity.HOURS);
         Integer minutes = values.get(Granularity.MINUTES);
-        Integer seconds = values.get(Granularity.SECONDS);
-        return hours + ":" + minutes + ":" + seconds;
+        return hours + ":" + minutes;
     }
 
     @Override
@@ -267,4 +266,4 @@ public class Capacity {
                 + "]";
     }
 
-}
\ No newline at end of file
+}
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/Material.java b/navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/Material.java
index 0d5768f54..9679dc9f9 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/Material.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/Material.java
@@ -24,6 +24,7 @@ package org.navalplanner.business.materials.entities;
 import java.math.BigDecimal;
 
 import org.apache.commons.lang.StringUtils;
+import org.hibernate.validator.NotEmpty;
 import org.hibernate.validator.NotNull;
 import org.navalplanner.business.common.IntegrationEntity;
 import org.navalplanner.business.common.Registry;
@@ -101,6 +102,7 @@ public class Material extends IntegrationEntity implements Comparable {
         this.category = category;
     }
 
+    @NotEmpty(message = "description is not specified")
     public String getDescription() {
         return description;
     }
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/orders/daos/IOrderDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/orders/daos/IOrderDAO.java
index 8f958c4a7..dd121d456 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/orders/daos/IOrderDAO.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/orders/daos/IOrderDAO.java
@@ -97,4 +97,6 @@ public interface IOrderDAO extends IIntegrationEntityDAO<Order> {
 
     public List<Order> loadOrdersAvoidingProxyFor(
             List<OrderElement> orderElement);
+
+    boolean existsByNameAnotherTransaction(String name);
 }
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/orders/daos/OrderDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/orders/daos/OrderDAO.java
index 98ce2d71d..0fe549c2a 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/orders/daos/OrderDAO.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/orders/daos/OrderDAO.java
@@ -401,4 +401,15 @@ public class OrderDAO extends IntegrationEntityDAO<Order> implements
         return result;
     }
 
+    @Override
+    @Transactional(readOnly = true, propagation = Propagation.REQUIRES_NEW)
+    public boolean existsByNameAnotherTransaction(String name) {
+        try {
+            Order order = findByName(name);
+            return order.getName().equals(name);
+        } catch (InstanceNotFoundException e) {
+            return false;
+        }
+    }
+
 }
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/Order.java b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/Order.java
index 5a50a132c..4355418b9 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/Order.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/Order.java
@@ -38,8 +38,11 @@ import org.navalplanner.business.advance.bootstrap.PredefinedAdvancedTypes;
 import org.navalplanner.business.advance.entities.AdvanceType;
 import org.navalplanner.business.advance.entities.DirectAdvanceAssignment;
 import org.navalplanner.business.calendars.entities.BaseCalendar;
+import org.navalplanner.business.common.Registry;
 import org.navalplanner.business.common.entities.EntitySequence;
+import org.navalplanner.business.common.exceptions.InstanceNotFoundException;
 import org.navalplanner.business.externalcompanies.entities.ExternalCompany;
+import org.navalplanner.business.orders.daos.IOrderDAO;
 import org.navalplanner.business.planner.entities.DayAssignment;
 import org.navalplanner.business.planner.entities.Task;
 import org.navalplanner.business.planner.entities.TaskElement;
@@ -538,4 +541,23 @@ public class Order extends OrderLineGroup {
         return getAdvanceAssignmentByType(advanceType);
     }
 
+    @AssertTrue(message = "project name is already being used")
+    public boolean checkConstraintProjectUniqueName() {
+
+        IOrderDAO orderDAO = Registry.getOrderDAO();
+
+        if (isNewObject()) {
+            return !orderDAO.existsByNameAnotherTransaction(getName());
+        } else {
+            try {
+                Order o = orderDAO.findByNameAnotherTransaction(getName());
+                return o.getId().equals(getId());
+            } catch (InstanceNotFoundException e) {
+                return true;
+            }
+
+        }
+
+    }
+
 }
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java
index 5e257aecd..ed1d15ece 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java
@@ -159,17 +159,34 @@ public abstract class OrderElement extends IntegrationEntity implements
 
     public SchedulingState getSchedulingState() {
         if (schedulingState == null) {
-            schedulingState = SchedulingState.createSchedulingState(
-                    getSchedulingStateType(), getChildrenStates(),
-                    getCurrentSchedulingData().onTypeChangeListener());
+            ensureSchedulingStateInitializedFromTop();
+            initializeSchedulingState(); // maybe this order element was added
+                                         // later
         }
         return schedulingState;
     }
 
+    private void ensureSchedulingStateInitializedFromTop() {
+        OrderElement current = this;
+        while (current.getParent() != null) {
+            current = current.getParent();
+        }
+        current.initializeSchedulingState();
+    }
+
+    private SchedulingState initializeSchedulingState() {
+        if (schedulingState != null) {
+            return schedulingState;
+        }
+        return schedulingState = SchedulingState.createSchedulingState(
+                getSchedulingStateType(), getChildrenStates(),
+                getCurrentSchedulingData().onTypeChangeListener());
+    }
+
     private List<SchedulingState> getChildrenStates() {
         List<SchedulingState> result = new ArrayList<SchedulingState>();
         for (OrderElement each : getChildren()) {
-            result.add(each.getSchedulingState());
+            result.add(each.initializeSchedulingState());
         }
         return result;
     }
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/AssignmentFunction.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/AssignmentFunction.java
index 721c58792..bf67f94d0 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/AssignmentFunction.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/AssignmentFunction.java
@@ -32,16 +32,16 @@ import org.navalplanner.business.common.BaseEntity;
  * @author Diego Pino García <dpino@igalia.com>
  *
  */
-public class AssignmentFunction extends BaseEntity {
-
-    public static AssignmentFunction create() {
-        return create(new AssignmentFunction());
-    }
+public abstract class AssignmentFunction extends BaseEntity {
 
     /**
      * This method goes over the {@link ResourceAllocation} list and apply the
      * assignment function if it is defined.
      *
+     * As this is called at the end of {@link Task#doAllocation} and a flat
+     * allocation was already applied before. If assignment function was set to
+     * manual it is reseted to flat again.
+     *
      * @param resourceAllocations
      *            List of {@link ResourceAllocation}
      */
@@ -51,38 +51,37 @@ public class AssignmentFunction extends BaseEntity {
             AssignmentFunction assignmentFunction = resourceAllocation
                     .getAssignmentFunction();
             if (assignmentFunction != null) {
-                assignmentFunction.applyTo(resourceAllocation);
+                if (assignmentFunction.isManual()) {
+                    // reset to flat
+                    resourceAllocation.setAssignmentFunctionWithoutApply(null);
+                } else {
+                    assignmentFunction.applyTo(resourceAllocation);
+                }
             }
         }
     }
 
-    public AssignmentFunction() {
-
-    }
-
     /**
      * This method applies the function to the received resourceAllocation
      * <i>This method is intended to be overridden by subclasses</i>
      * @param resourceAllocation
      */
-    public void applyTo(ResourceAllocation<?> resourceAllocation) {
-        // override at subclasses
-    }
+    public abstract void applyTo(ResourceAllocation<?> resourceAllocation);
 
-    public String getName() {
-        // override at subclasses
-        return null;
-    }
+    public abstract String getName();
 
-    public enum ASSIGNMENT_FUNCTION_NAME {
+    public abstract boolean isManual();
+
+    public enum AssignmentFunctionName {
         FLAT(_("Flat")),
+        MANUAL(_("Manual")),
         STRETCHES(_("Stretches")),
         INTERPOLATION(_("Interporlation")),
         SIGMOID(_("Sigmoid"));
 
         private String name;
 
-        private ASSIGNMENT_FUNCTION_NAME(String name) {
+        private AssignmentFunctionName(String name) {
             this.name = name;
         }
 
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/FlatFunction.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/FlatFunction.java
deleted file mode 100644
index 1456a1a41..000000000
--- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/FlatFunction.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * This file is part of NavalPlan
- *
- * 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.
- *
- * 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.navalplanner.business.planner.entities;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.navalplanner.business.planner.entities.allocationalgorithms.ResourcesPerDayModification;
-import org.navalplanner.business.workingday.EffortDuration;
-
-/**
- * Calculate hours per day for resource based on total amount of hours to be
- * done and number of resources per day using a flat allocation
- *
- * @author Diego Pino García <dpino@igalia.com>
- */
-public class FlatFunction extends AssignmentFunction {
-
-    public static FlatFunction create() {
-        return create(new FlatFunction());
-    }
-
-    protected FlatFunction() {
-
-    }
-
-    public String getName() {
-        return ASSIGNMENT_FUNCTION_NAME.FLAT.toString();
-    }
-
-
-    public void applyTo(ResourceAllocation<?> resourceAllocation) {
-        apply(resourceAllocation);
-    }
-
-    private void apply(ResourceAllocation<?> resourceAllocation) {
-        int hours = resourceAllocation.getAssignedHours();
-
-        List<ResourcesPerDayModification> resourcesPerDayModification = Arrays.asList(resourceAllocation
-                    .asResourcesPerDayModification());
-
-        ResourceAllocation
-            .allocating(resourcesPerDayModification)
-            .untilAllocating(EffortDuration.hours(hours));
-    }
-
-}
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ManualFunction.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ManualFunction.java
new file mode 100644
index 000000000..bb3ea8c08
--- /dev/null
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ManualFunction.java
@@ -0,0 +1,49 @@
+/*
+ * This file is part of NavalPlan
+ *
+ * Copyright (C) 2011 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.navalplanner.business.planner.entities;
+
+
+/**
+ * Manual allocation function, it used to represent when user has done a manual
+ * allocation.
+ *
+ * @author Manuel Rego Casasnovas <rego@igalia.com>
+ */
+public class ManualFunction extends AssignmentFunction {
+
+    public static ManualFunction create() {
+        return create(new ManualFunction());
+    }
+
+    @Override
+    public String getName() {
+        return AssignmentFunctionName.MANUAL.toString();
+    }
+
+    @Override
+    public void applyTo(ResourceAllocation<?> resourceAllocation) {
+        // Do nothing
+    }
+
+    @Override
+    public boolean isManual() {
+        return true;
+    }
+
+}
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java
index 8b0a21553..ec5c73b12 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java
@@ -87,8 +87,6 @@ public abstract class ResourceAllocation<T extends DayAssignment> extends
 
     private static final Log LOG = LogFactory.getLog(ResourceAllocation.class);
 
-    private static final FlatFunction FLAT_FUNCTION = FlatFunction.create();
-
     public static <T extends ResourceAllocation<?>> List<T> getSatisfied(
             Collection<T> resourceAllocations) {
         Validate.notNull(resourceAllocations);
@@ -1418,18 +1416,20 @@ public abstract class ResourceAllocation<T extends DayAssignment> extends
         return assignmentFunction;
     }
 
-    public void setAssignmentFunction(AssignmentFunction assignmentFunction) {
-        // If the assignment function is empty, avoid creating an association
-        // between the resource allocation and the assignment function
-        if (assignmentFunction == null) {
-            FLAT_FUNCTION.applyTo(this);
-            return;
-        }
+    /**
+     * If {@link AssignmentFunction} is null, it's just set and nothing is
+     * applied
+     *
+     * @param assignmentFunction
+     */
+    public void setAssignmentFunctionAndApplyIfNotFlat(AssignmentFunction assignmentFunction) {
         this.assignmentFunction = assignmentFunction;
-        this.assignmentFunction.applyTo(this);
+        if (this.assignmentFunction != null) {
+            this.assignmentFunction.applyTo(this);
+        }
     }
 
-    private void setWithoutApply(AssignmentFunction assignmentFunction) {
+    public void setAssignmentFunctionWithoutApply(AssignmentFunction assignmentFunction) {
         this.assignmentFunction = assignmentFunction;
     }
 
@@ -2071,7 +2071,7 @@ public abstract class ResourceAllocation<T extends DayAssignment> extends
             updateOriginalTotalAssigment();
             updateResourcesPerDay();
         }
-        setWithoutApply(modifications.getAssignmentFunction());
+        setAssignmentFunctionWithoutApply(modifications.getAssignmentFunction());
         mergeDerivedAllocations(scenario, modifications.getDerivedAllocations());
     }
 
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SigmoidFunction.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SigmoidFunction.java
index 037bec397..98cfa2b40 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SigmoidFunction.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SigmoidFunction.java
@@ -52,7 +52,7 @@ public class SigmoidFunction extends AssignmentFunction {
 
     @Override
     public String getName() {
-        return ASSIGNMENT_FUNCTION_NAME.SIGMOID.toString();
+        return AssignmentFunctionName.SIGMOID.toString();
     }
 
     @Override
@@ -266,4 +266,9 @@ public class SigmoidFunction extends AssignmentFunction {
                 PRECISSION, ROUND_MODE);
     }
 
+    @Override
+    public boolean isManual() {
+        return false;
+    }
+
 }
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/StretchesFunction.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/StretchesFunction.java
index 82ef542e2..04bcf80aa 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/StretchesFunction.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/StretchesFunction.java
@@ -387,9 +387,9 @@ public class StretchesFunction extends AssignmentFunction {
     @Override
     public String getName() {
         if (StretchesFunctionTypeEnum.INTERPOLATED.equals(type)) {
-            return ASSIGNMENT_FUNCTION_NAME.INTERPOLATION.toString();
+            return AssignmentFunctionName.INTERPOLATION.toString();
         } else {
-            return ASSIGNMENT_FUNCTION_NAME.STRETCHES.toString();
+            return AssignmentFunctionName.STRETCHES.toString();
         }
     }
 
@@ -476,4 +476,9 @@ public class StretchesFunction extends AssignmentFunction {
         }
     }
 
+    @Override
+    public boolean isManual() {
+        return false;
+    }
+
 }
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/qualityforms/daos/IQualityFormDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/qualityforms/daos/IQualityFormDAO.java
index 160e8a60c..d0fc7d28c 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/qualityforms/daos/IQualityFormDAO.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/qualityforms/daos/IQualityFormDAO.java
@@ -26,6 +26,7 @@ import java.util.List;
 import org.hibernate.NonUniqueResultException;
 import org.navalplanner.business.common.daos.IGenericDAO;
 import org.navalplanner.business.common.exceptions.InstanceNotFoundException;
+import org.navalplanner.business.common.exceptions.ValidationException;
 import org.navalplanner.business.qualityforms.entities.QualityForm;
 import org.navalplanner.business.qualityforms.entities.QualityFormType;
 
@@ -52,4 +53,6 @@ public interface IQualityFormDAO extends IGenericDAO<QualityForm, Long> {
     boolean existsOtherWorkReportTypeByName(QualityForm qualityForm);
 
     boolean existsByNameAnotherTransaction(QualityForm qualityForm);
+
+    void checkHasTasks(QualityForm qualityForm) throws ValidationException;
 }
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/qualityforms/daos/QualityFormDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/qualityforms/daos/QualityFormDAO.java
index 3beb45b08..cfa4933d1 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/qualityforms/daos/QualityFormDAO.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/qualityforms/daos/QualityFormDAO.java
@@ -22,11 +22,13 @@
 package org.navalplanner.business.qualityforms.daos;
 
 import java.math.BigDecimal;
+import java.util.Collections;
 import java.util.List;
 
 import org.apache.commons.lang.Validate;
 import org.hibernate.Criteria;
 import org.hibernate.NonUniqueResultException;
+import org.hibernate.Query;
 import org.hibernate.criterion.Restrictions;
 import org.navalplanner.business.advance.daos.IAdvanceTypeDAO;
 import org.navalplanner.business.advance.entities.AdvanceType;
@@ -150,4 +152,16 @@ public class QualityFormDAO extends GenericDAOHibernate<QualityForm, Long>
         super.save(entity);
     }
 
+    @Override
+    public void checkHasTasks(QualityForm qualityForm) throws ValidationException {
+        Query query = getSession().createQuery(
+                "FROM TaskQualityForm taskQualityForm JOIN taskQualityForm.qualityForm tq WHERE tq IN (:qualityForms)");
+        query.setParameterList("qualityForms", Collections.singleton(qualityForm));
+        if (!query.list().isEmpty()) {
+            throw ValidationException
+                    .invalidValue(
+                            "Cannot delete quality form. It is being used at this moment by some task.",
+                            qualityForm);
+        }
+    }
 }
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/settings/entities/Language.java b/navalplanner-business/src/main/java/org/navalplanner/business/settings/entities/Language.java
index 8730921f4..a95f34544 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/settings/entities/Language.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/settings/entities/Language.java
@@ -34,7 +34,8 @@ public enum Language {
     BROWSER_LANGUAGE(_("Use browser language configuration"), null),
     GALICIAN_LANGUAGE(_("Galician"), new Locale("gl")),
     SPANISH_LANGUAGE(_("Spanish"), new Locale("es")),
-    ENGLISH_LANGUAGE(_("English"), Locale.ENGLISH);
+    ENGLISH_LANGUAGE(_("English"), Locale.ENGLISH),
+    RUSSIAN_LANGUAGE(_("Russian"), new Locale("ru"));
 
     private final String displayName;
 
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/workingday/EffortDuration.java b/navalplanner-business/src/main/java/org/navalplanner/business/workingday/EffortDuration.java
index 254aa71e5..ce592bd14 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/workingday/EffortDuration.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/workingday/EffortDuration.java
@@ -365,7 +365,7 @@ public class EffortDuration implements Comparable<EffortDuration> {
         Integer hours = valuesForEachUnit.get(Granularity.HOURS);
         Integer minutes = valuesForEachUnit.get(Granularity.MINUTES);
         Integer seconds = valuesForEachUnit.get(Granularity.SECONDS);
-        return hours + ":" + minutes + ":" + seconds;
+        return String.format("%d:%02d:%02d", hours, minutes, seconds);
     }
 
     public String toFormattedString() {
@@ -374,9 +374,9 @@ public class EffortDuration implements Comparable<EffortDuration> {
         int hours = byGranularity.get(Granularity.HOURS);
         int minutes = byGranularity.get(Granularity.MINUTES);
         if (minutes == 0) {
-            return String.format("%s", hours);
+            return String.format("%d", hours);
         } else {
-            return String.format("%s:%s", hours, minutes);
+            return String.format("%d:%02d", hours, minutes);
         }
     }
 
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/IWorkReportsElements.java b/navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/IWorkReportsElements.java
new file mode 100644
index 000000000..0190d47fa
--- /dev/null
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/IWorkReportsElements.java
@@ -0,0 +1,58 @@
+/*
+ * This file is part of NavalPlan
+ *
+ * Copyright (C) 2011 - ComtecSF 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.navalplanner.business.workreports.entities;
+
+import java.util.Date;
+import java.util.Set;
+
+import org.navalplanner.business.labels.entities.Label;
+import org.navalplanner.business.orders.entities.OrderElement;
+import org.navalplanner.business.resources.entities.Resource;
+import org.navalplanner.business.workreports.valueobjects.DescriptionValue;
+
+/**
+ * Interface which must be implemented by {@link WorkReport} and
+ * {@link WorkReportLine}
+ *
+ * @author Ignacio Diaz Teijido <ignacio.diaz@comtecsf.es>
+ *
+ */
+public interface IWorkReportsElements {
+
+    Date getDate();
+
+    void setDate(Date date);
+
+    Resource getResource();
+
+    void setResource(Resource resource);
+
+    Set<Label> getLabels();
+
+    void setLabels(Set<Label> labels);
+
+    Set<DescriptionValue> getDescriptionValues();
+
+    void setDescriptionValues(Set<DescriptionValue> descriptionValues);
+
+    OrderElement getOrderElement();
+
+    void setOrderElement(OrderElement orderElement);
+
+}
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/WorkReport.java b/navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/WorkReport.java
index 5211e097b..9ee25c058 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/WorkReport.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/WorkReport.java
@@ -47,7 +47,8 @@ import org.navalplanner.business.workreports.valueobjects.DescriptionValue;
  * @author Diego Pino García <dpino@igalia.com>
  * @author Susana Montes Pedreira <smontes@wirelessgalicia.com>
  */
-public class WorkReport extends IntegrationEntity {
+public class WorkReport extends IntegrationEntity implements
+        IWorkReportsElements {
 
     public static final String DATE = "date";
     public static final String RESOURCE = "resource";
@@ -105,10 +106,12 @@ public class WorkReport extends IntegrationEntity {
         this.orderElement = orderElement;
     }
 
+    @Override
     public Date getDate() {
         return date != null ? new Date(date.getTime()) : null;
     }
 
+    @Override
     public void setDate(Date date) {
         this.date = date != null ? new Date(date.getTime()) : null;
         if (workReportType != null) {
@@ -154,27 +157,33 @@ public class WorkReport extends IntegrationEntity {
         workReportLines.remove(workReportLine);
     }
 
+    @Override
     @Valid
     public Set<DescriptionValue> getDescriptionValues() {
         return Collections.unmodifiableSet(descriptionValues);
     }
 
+    @Override
     public void setDescriptionValues(Set<DescriptionValue> descriptionValues) {
         this.descriptionValues = descriptionValues;
     }
 
+    @Override
     public Set<Label> getLabels() {
         return labels;
     }
 
+    @Override
     public void setLabels(Set<Label> labels) {
         this.labels = labels;
     }
 
+    @Override
     public Resource getResource() {
         return resource;
     }
 
+    @Override
     public void setResource(Resource resource) {
         this.resource = resource;
         if (workReportType != null) {
@@ -186,10 +195,12 @@ public class WorkReport extends IntegrationEntity {
         }
     }
 
+    @Override
     public OrderElement getOrderElement() {
         return orderElement;
     }
 
+    @Override
     public void setOrderElement(OrderElement orderElement) {
         this.orderElement = orderElement;
         if (workReportType != null) {
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/WorkReportLine.java b/navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/WorkReportLine.java
index 33819f0c4..913bd5c16 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/WorkReportLine.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/WorkReportLine.java
@@ -51,7 +51,8 @@ import org.navalplanner.business.workreports.valueobjects.DescriptionValue;
  * @author Diego Pino García <dpino@igalia.com>
  * @author Susana Montes Pedreira <smontes@wirelessgalicia.com>
  */
-public class WorkReportLine extends IntegrationEntity implements Comparable {
+public class WorkReportLine extends IntegrationEntity implements Comparable,
+        IWorkReportsElements {
 
     public static WorkReportLine create(WorkReport workReport) {
         return create(new WorkReportLine(workReport));
@@ -132,6 +133,7 @@ public class WorkReportLine extends IntegrationEntity implements Comparable {
         updateEffort();
     }
 
+    @Override
     @NotNull(message = "date not specified")
     public Date getDate() {
         return date;
@@ -144,6 +146,7 @@ public class WorkReportLine extends IntegrationEntity implements Comparable {
         return LocalDate.fromDateFields(getDate());
     }
 
+    @Override
     public void setDate(Date date) {
         this.date = date;
         if ((workReport != null) && (workReport.getWorkReportType() != null)) {
@@ -153,11 +156,13 @@ public class WorkReportLine extends IntegrationEntity implements Comparable {
         }
     }
 
+    @Override
     @NotNull(message = "resource not specified")
     public Resource getResource() {
         return resource;
     }
 
+    @Override
     public void setResource(Resource resource) {
         this.resource = resource;
         if ((workReport != null) && (workReport.getWorkReportType() != null)) {
@@ -167,11 +172,13 @@ public class WorkReportLine extends IntegrationEntity implements Comparable {
         }
     }
 
+    @Override
     @NotNull(message = "order element not specified")
     public OrderElement getOrderElement() {
         return orderElement;
     }
 
+    @Override
     public void setOrderElement(OrderElement orderElement) {
         this.orderElement = orderElement;
         if ((workReport != null) && (workReport.getWorkReportType() != null)) {
@@ -181,10 +188,12 @@ public class WorkReportLine extends IntegrationEntity implements Comparable {
         }
     }
 
+    @Override
     public Set<Label> getLabels() {
         return labels;
     }
 
+    @Override
     public void setLabels(Set<Label> labels) {
         this.labels = labels;
     }
@@ -207,11 +216,13 @@ public class WorkReportLine extends IntegrationEntity implements Comparable {
         updateEffort();
     }
 
+    @Override
     @Valid
     public Set<DescriptionValue> getDescriptionValues() {
         return descriptionValues;
     }
 
+    @Override
     public void setDescriptionValues(Set<DescriptionValue> descriptionValues) {
         this.descriptionValues = descriptionValues;
     }
diff --git a/navalplanner-business/src/main/resources/db.changelog-1.1.xml b/navalplanner-business/src/main/resources/db.changelog-1.1.xml
index 51645ef73..1e9d2e89d 100644
--- a/navalplanner-business/src/main/resources/db.changelog-1.1.xml
+++ b/navalplanner-business/src/main/resources/db.changelog-1.1.xml
@@ -230,6 +230,24 @@
         </update>
     </changeSet>
 
+    <changeSet author="mrego" id="create-table-manual_function">
+        <createTable tableName="manual_function">
+            <column name="assignment_function_id" type="BIGINT">
+                <constraints nullable="false" primaryKey="true" primaryKeyName="manual_function_pkey" />
+            </column>
+        </createTable>
+        <addForeignKeyConstraint baseColumnNames="assignment_function_id"
+            baseTableName="manual_function"
+            constraintName="mnual_function_assignment_function_fkey"
+            deferrable="false"
+            initiallyDeferred="false"
+            onDelete="NO ACTION"
+            onUpdate="NO ACTION"
+            referencedColumnNames="id"
+            referencedTableName="assignment_function"
+            referencesUniqueColumn="false" />
+    </changeSet>
+
     <changeSet id="change-numhours-to-effort-in-work-report-lines" author="idiazt">
         <comment>Changing work_report_line numHours to effort</comment>
         <renameColumn tableName="work_report_line" oldColumnName="num_hours" newColumnName="effort"/>
@@ -274,5 +292,4 @@
             newColumnName="sum_charged_effort_id" />
     </changeSet>
 
-
 </databaseChangeLog>
diff --git a/navalplanner-business/src/main/resources/org/navalplanner/business/planner/entities/ResourceAllocations.hbm.xml b/navalplanner-business/src/main/resources/org/navalplanner/business/planner/entities/ResourceAllocations.hbm.xml
index f47b4476a..a557bab4c 100644
--- a/navalplanner-business/src/main/resources/org/navalplanner/business/planner/entities/ResourceAllocations.hbm.xml
+++ b/navalplanner-business/src/main/resources/org/navalplanner/business/planner/entities/ResourceAllocations.hbm.xml
@@ -327,6 +327,9 @@
         <joined-subclass name="SigmoidFunction" table="sigmoid_function">
             <key column="assignment_function_id" />
         </joined-subclass>
+        <joined-subclass name="ManualFunction" table="manual_function">
+            <key column="assignment_function_id" />
+        </joined-subclass>
     </class>
 
     <class name="DerivedAllocation" table="derived_allocation">
diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/advance/daos/AdvanceAssignmentDAOTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/advance/daos/AdvanceAssignmentDAOTest.java
new file mode 100644
index 000000000..9ec05e307
--- /dev/null
+++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/advance/daos/AdvanceAssignmentDAOTest.java
@@ -0,0 +1,94 @@
+/*
+ * This file is part of NavalPlan
+ *
+ * Copyright (C) 2011 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.navalplanner.business.test.advance.daos;
+
+import static org.junit.Assert.assertTrue;
+import static org.navalplanner.business.BusinessGlobalNames.BUSINESS_SPRING_CONFIG_FILE;
+import static org.navalplanner.business.test.BusinessGlobalNames.BUSINESS_SPRING_CONFIG_TEST_FILE;
+
+import java.math.BigDecimal;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.navalplanner.business.advance.daos.IAdvanceAssignmentDAO;
+import org.navalplanner.business.advance.daos.IAdvanceTypeDAO;
+import org.navalplanner.business.advance.entities.AdvanceAssignment;
+import org.navalplanner.business.advance.entities.AdvanceType;
+import org.navalplanner.business.advance.entities.DirectAdvanceAssignment;
+import org.navalplanner.business.common.exceptions.ValidationException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = { BUSINESS_SPRING_CONFIG_FILE,
+        BUSINESS_SPRING_CONFIG_TEST_FILE })
+/**
+ * Test for {@link AdvanceAssignmentDAO}
+ *
+ * @author Manuel Rego Casasnovas <rego@igalia.com>
+ */
+@Transactional
+public class AdvanceAssignmentDAOTest {
+
+    @Autowired
+    private IAdvanceAssignmentDAO advanceAssignmentDAO;
+
+    @Autowired
+    private IAdvanceTypeDAO advanceTypeDAO;
+
+    private AdvanceType givenAdvanceType() {
+        BigDecimal value = new BigDecimal(100);
+        BigDecimal precision = BigDecimal.ONE;
+        AdvanceType advanceType = AdvanceType.create("advance-type", value,
+                true, precision, true, false);
+        advanceTypeDAO.save(advanceType);
+        return advanceType;
+    }
+
+    @Test
+    public void saveValidAdvanceAssignment() {
+        AdvanceAssignment advance = DirectAdvanceAssignment.create(false,
+                BigDecimal.TEN);
+        advance.setAdvanceType(givenAdvanceType());
+        advanceAssignmentDAO.save(advance);
+        assertTrue(advance.getId() != null);
+    }
+
+    @Test(expected = ValidationException.class)
+    public void saveAdvanceAssignmentWithZeroAsMaxValue() {
+        AdvanceAssignment advance = DirectAdvanceAssignment.create(false,
+                BigDecimal.ZERO);
+        advance.setAdvanceType(givenAdvanceType());
+        advanceAssignmentDAO.save(advance);
+        assertTrue(advance.getId() != null);
+    }
+
+    @Test(expected = ValidationException.class)
+    public void saveAdvanceAssignmentWithNegativeNumberAsMaxValue() {
+        AdvanceAssignment advance = DirectAdvanceAssignment.create(false,
+                BigDecimal.valueOf(-10));
+        advance.setAdvanceType(givenAdvanceType());
+        advanceAssignmentDAO.save(advance);
+        assertTrue(advance.getId() != null);
+    }
+
+}
diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/calendars/entities/BaseCalendarTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/calendars/entities/BaseCalendarTest.java
index 4ebfc49d5..85f1f3c3c 100644
--- a/navalplanner-business/src/test/java/org/navalplanner/business/test/calendars/entities/BaseCalendarTest.java
+++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/calendars/entities/BaseCalendarTest.java
@@ -32,6 +32,7 @@ import static org.navalplanner.business.workingday.EffortDuration.zero;
 import static org.navalplanner.business.workingday.IntraDayDate.PartialDay.wholeDay;
 
 import java.util.Set;
+import java.util.UUID;
 
 import org.joda.time.LocalDate;
 import org.junit.Test;
@@ -82,7 +83,7 @@ public class BaseCalendarTest {
     public static BaseCalendar createBasicCalendar() {
         BaseCalendar calendar = BaseCalendar.create();
 
-        calendar.setName("Test");
+        calendar.setName("test-" + UUID.randomUUID());
 
         Capacity eightHours = withNormalDuration(hours(8));
         calendar.setCapacityAt(Days.MONDAY, eightHours);
diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/materials/daos/MaterialAssignmentDAOTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/materials/daos/MaterialAssignmentDAOTest.java
index e47c0b2ae..6a0a5e6b9 100644
--- a/navalplanner-business/src/test/java/org/navalplanner/business/test/materials/daos/MaterialAssignmentDAOTest.java
+++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/materials/daos/MaterialAssignmentDAOTest.java
@@ -73,6 +73,7 @@ public class MaterialAssignmentDAOTest {
         UnitType unitType = UnitType.create("m");
         unitTypeDAO.save(unitType);
         Material material = Material.create(UUID.randomUUID().toString());
+        material.setDescription("material");
         material.setCategory(materialCategory);
         material.setUnitType(unitType);
         materialDAO.save(material);
diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/materials/daos/MaterialDAOTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/materials/daos/MaterialDAOTest.java
index e331a2e1f..98954b21c 100644
--- a/navalplanner-business/src/test/java/org/navalplanner/business/test/materials/daos/MaterialDAOTest.java
+++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/materials/daos/MaterialDAOTest.java
@@ -38,6 +38,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.navalplanner.business.IDataBootstrap;
 import org.navalplanner.business.common.exceptions.InstanceNotFoundException;
+import org.navalplanner.business.common.exceptions.ValidationException;
 import org.navalplanner.business.materials.daos.IMaterialCategoryDAO;
 import org.navalplanner.business.materials.daos.IMaterialDAO;
 import org.navalplanner.business.materials.entities.Material;
@@ -93,6 +94,7 @@ public class MaterialDAOTest {
         MaterialCategory materialCategory = MaterialCategory.create(UUID.randomUUID().toString());
         materialCategoryDAO.save(materialCategory);
         Material material = Material.create(UUID.randomUUID().toString());
+        material.setDescription("material");
         material.setCategory(materialCategory);
         return material;
     }
@@ -104,6 +106,13 @@ public class MaterialDAOTest {
         assertTrue(material.getId() != null);
     }
 
+    @Test(expected = ValidationException.class)
+    public void testSaveMaterialWithoutDescription() {
+        Material material = createValidMaterial();
+        material.setDescription(null);
+        materialDAO.save(material);
+    }
+
     @Test
     public void testRemoveMaterial() throws InstanceNotFoundException {
         Material material = createValidMaterial();
diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/orders/daos/OrderDAOTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/orders/daos/OrderDAOTest.java
new file mode 100644
index 000000000..6140e2e6a
--- /dev/null
+++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/orders/daos/OrderDAOTest.java
@@ -0,0 +1,151 @@
+/*
+ * This file is part of NavalPlan
+ *
+ * Copyright (C) 2011 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.navalplanner.business.test.orders.daos;
+
+import static junit.framework.Assert.assertNotNull;
+import static org.navalplanner.business.BusinessGlobalNames.BUSINESS_SPRING_CONFIG_FILE;
+import static org.navalplanner.business.test.BusinessGlobalNames.BUSINESS_SPRING_CONFIG_TEST_FILE;
+
+import java.util.Date;
+import java.util.UUID;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.navalplanner.business.calendars.daos.IBaseCalendarDAO;
+import org.navalplanner.business.calendars.entities.BaseCalendar;
+import org.navalplanner.business.common.IAdHocTransactionService;
+import org.navalplanner.business.common.IOnTransaction;
+import org.navalplanner.business.common.exceptions.ValidationException;
+import org.navalplanner.business.orders.daos.IOrderDAO;
+import org.navalplanner.business.orders.entities.Order;
+import org.navalplanner.business.scenarios.IScenarioManager;
+import org.navalplanner.business.scenarios.bootstrap.IScenariosBootstrap;
+import org.navalplanner.business.scenarios.entities.OrderVersion;
+import org.navalplanner.business.test.calendars.entities.BaseCalendarTest;
+import org.navalplanner.business.test.planner.daos.ResourceAllocationDAOTest;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * Test for {@link IOrderDAO}
+ *
+ * @author Manuel Rego Casasnovas <rego@igalia.com>
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = { BUSINESS_SPRING_CONFIG_FILE,
+        BUSINESS_SPRING_CONFIG_TEST_FILE })
+@Transactional
+public class OrderDAOTest {
+
+    @Before
+    public void loadRequiredaData() {
+        transactionService.runOnAnotherTransaction(new IOnTransaction<Void>() {
+            @Override
+            public Void execute() {
+                scenariosBootstrap.loadRequiredData();
+                return null;
+            }
+        });
+    }
+
+    @Autowired
+    private IOrderDAO orderDAO;
+
+    @Autowired
+    private IBaseCalendarDAO calendarDAO;
+
+    @Autowired
+    private IScenariosBootstrap scenariosBootstrap;
+
+    @Autowired
+    private IScenarioManager scenarioManager;
+
+    @Autowired
+    private IAdHocTransactionService transactionService;
+
+    @Test
+    public void testInSpringContainer() {
+        assertNotNull(orderDAO);
+    }
+
+    private Order createValidOrder(String name) {
+        Order order = Order.create();
+        order.setName(name);
+        order.setCode(UUID.randomUUID().toString());
+        order.setInitDate(new Date());
+        BaseCalendar basicCalendar = BaseCalendarTest.createBasicCalendar();
+        calendarDAO.save(basicCalendar);
+        order.setCalendar(basicCalendar);
+        OrderVersion orderVersion = ResourceAllocationDAOTest
+                .setupVersionUsing(scenarioManager, order);
+        order.useSchedulingDataFor(orderVersion);
+        return order;
+    }
+
+    @Test
+    public void testSaveTwoOrdersWithDifferentNames() {
+        transactionService.runOnAnotherTransaction(new IOnTransaction<Void>() {
+            @Override
+            public Void execute() {
+                Order order = createValidOrder("test");
+                orderDAO.save(order);
+                orderDAO.flush();
+                return null;
+            }
+        });
+
+        transactionService.runOnAnotherTransaction(new IOnTransaction<Void>() {
+            @Override
+            public Void execute() {
+                Order order = createValidOrder("test2");
+                orderDAO.save(order);
+                orderDAO.flush();
+                return null;
+            }
+        });
+    }
+
+    @Test(expected = ValidationException.class)
+    public void testSaveTwoOrdersWithSameNames() {
+        transactionService.runOnAnotherTransaction(new IOnTransaction<Void>() {
+            @Override
+            public Void execute() {
+                Order order = createValidOrder("test");
+                orderDAO.save(order);
+                orderDAO.flush();
+                return null;
+            }
+        });
+
+        transactionService.runOnAnotherTransaction(new IOnTransaction<Void>() {
+            @Override
+            public Void execute() {
+                Order order = createValidOrder("test");
+                orderDAO.save(order);
+                orderDAO.flush();
+                return null;
+            }
+        });
+    }
+
+}
diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/orders/entities/AddAdvanceAssignmentsToOrderElementTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/orders/entities/AddAdvanceAssignmentsToOrderElementTest.java
index 21518598c..10fd72c89 100644
--- a/navalplanner-business/src/test/java/org/navalplanner/business/test/orders/entities/AddAdvanceAssignmentsToOrderElementTest.java
+++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/orders/entities/AddAdvanceAssignmentsToOrderElementTest.java
@@ -153,7 +153,7 @@ public class AddAdvanceAssignmentsToOrderElementTest {
     private DirectAdvanceAssignment createValidAdvanceAssignment(
             boolean reportGlobalAdvance) {
     DirectAdvanceAssignment advanceAssignment = DirectAdvanceAssignment
-                .create(reportGlobalAdvance, new BigDecimal(0));
+                .create(reportGlobalAdvance, BigDecimal.TEN);
         return advanceAssignment;
     }
 
diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/daos/AssignmentFunctionDAOTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/daos/AssignmentFunctionDAOTest.java
index ef94006f8..f6ade18a2 100644
--- a/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/daos/AssignmentFunctionDAOTest.java
+++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/daos/AssignmentFunctionDAOTest.java
@@ -34,6 +34,7 @@ import org.junit.runner.RunWith;
 import org.navalplanner.business.common.exceptions.InstanceNotFoundException;
 import org.navalplanner.business.planner.daos.IAssignmentFunctionDAO;
 import org.navalplanner.business.planner.entities.AssignmentFunction;
+import org.navalplanner.business.planner.entities.ManualFunction;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -57,7 +58,7 @@ public class AssignmentFunctionDAOTest {
     }
 
     private AssignmentFunction createValidAssignmentFunction() {
-        return AssignmentFunction.create();
+        return ManualFunction.create();
     }
 
     @Test
diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/daos/TaskElementDAOTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/daos/TaskElementDAOTest.java
index 0b4dccdb0..3bc8877e9 100644
--- a/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/daos/TaskElementDAOTest.java
+++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/daos/TaskElementDAOTest.java
@@ -172,7 +172,7 @@ public class TaskElementDAOTest {
         Order order = Order.create();
         OrderVersion orderVersion = ResourceAllocationDAOTest
                 .setupVersionUsing(scenarioManager, order);
-        order.setName("bla");
+        order.setName("bla-" + UUID.randomUUID());
         order.setInitDate(new Date());
         order.setCode("code-" + UUID.randomUUID());
         order.useSchedulingDataFor(orderVersion);
diff --git a/navalplanner-webapp/pom.xml b/navalplanner-webapp/pom.xml
index cdf93a768..0f0b31617 100644
--- a/navalplanner-webapp/pom.xml
+++ b/navalplanner-webapp/pom.xml
@@ -111,6 +111,9 @@
                             <copy todir="src/main/webapp/help/en" failonerror="false">
                                 <fileset dir="../doc/src/user/en/html"/>
                             </copy>
+                            <copy todir="src/main/webapp/help/ru" failonerror="false">
+                                <fileset dir="../doc/src/user/en/html"/>
+                            </copy>
                           </tasks>
                          </configuration>
                         </execution>
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java
index 80c581cef..7869661cd 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java
@@ -32,6 +32,7 @@ import org.navalplanner.business.calendars.entities.BaseCalendar;
 import org.navalplanner.business.calendars.entities.CalendarData;
 import org.navalplanner.business.common.exceptions.ValidationException;
 import org.navalplanner.web.common.BaseCRUDController.CRUDControllerState;
+import org.navalplanner.web.common.ConstraintChecker;
 import org.navalplanner.web.common.IMessagesForUser;
 import org.navalplanner.web.common.Level;
 import org.navalplanner.web.common.MessagesForUser;
@@ -127,6 +128,7 @@ public class BaseCalendarCRUDController extends GenericForwardComposer {
 
     public void save() {
         try {
+            ConstraintChecker.isValid(editWindow);
             validateCalendarExceptionCodes();
             baseCalendarModel.generateCalendarCodes();
             baseCalendarModel.confirmSave();
@@ -141,6 +143,7 @@ public class BaseCalendarCRUDController extends GenericForwardComposer {
 
     public void saveAndContinue() {
         try {
+            ConstraintChecker.isValid(editWindow);
             validateCalendarExceptionCodes();
             baseCalendarModel.generateCalendarCodes();
             baseCalendarModel.confirmSaveAndContinue();
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java
index 1f55991be..9f4e3b05b 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java
@@ -122,7 +122,7 @@ public class BaseCalendarModel extends IntegrationEntityModel implements
                 .getConfiguration().getGenerateCodeForBaseCalendars()
                 : false;
 
-        this.baseCalendar = BaseCalendar.createBasicCalendar();
+        this.baseCalendar = BaseCalendar.createBasicCalendar("");
 
         if (codeGenerated) {
             setDefaultCode();
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java
index 341fa466e..58a11b709 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java
@@ -267,7 +267,7 @@ public class CustomMenuController extends Div implements IMenuItemsRegister {
                         globalView.goToCompanyScheduling();
                     }
                 }, "01-introducion.html"),
-                subItem(_("Projects"), new ICapture() {
+                subItem(_("Projects List"), new ICapture() {
                     @Override
                     public void capture() {
                         globalView.goToOrdersList();
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeCRUDController.java
index f9fffea14..d469c33a8 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeCRUDController.java
@@ -49,6 +49,7 @@ import org.zkoss.zul.Checkbox;
 import org.zkoss.zul.Grid;
 import org.zkoss.zul.Hbox;
 import org.zkoss.zul.Label;
+import org.zkoss.zul.Listbox;
 import org.zkoss.zul.Listcell;
 import org.zkoss.zul.Listitem;
 import org.zkoss.zul.ListitemRenderer;
@@ -75,6 +76,8 @@ public class CalendarExceptionTypeCRUDController extends
 
     private EffortDurationPicker extraEffort;
 
+    private Listbox colorsListbox;
+
     private static ListitemRenderer calendarExceptionTypeColorRenderer = new ListitemRenderer() {
         @Override
         public void render(Listitem item, Object data) throws Exception {
@@ -265,4 +268,19 @@ public class CalendarExceptionTypeCRUDController extends
         return exceptionDayTypeRenderer;
     }
 
+    public String getStyleColorOwnException() {
+        return (getExceptionDayType() == null) ? "" : "background-color: "
+                + getExceptionDayType().getColor().getColorOwnException();
+    }
+
+    public String getStyleColorDerivedException() {
+        return (getExceptionDayType() == null) ? "" : "background-color: "
+                + getExceptionDayType().getColor().getColorDerivedException();
+    }
+
+    public void reloadSampleColors() {
+        Util.reloadBindings(editWindow.getFellow("colorSampleOwn"));
+        Util.reloadBindings(editWindow.getFellow("colorSampleDerived"));
+    }
+
 }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java
index 8e9eefa25..b79968399 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java
@@ -31,6 +31,7 @@ import org.navalplanner.business.common.exceptions.ValidationException;
 import org.navalplanner.business.externalcompanies.entities.ExternalCompany;
 import org.navalplanner.business.users.entities.User;
 import org.navalplanner.web.common.BaseCRUDController;
+import org.navalplanner.web.common.Level;
 import org.navalplanner.web.common.components.Autocomplete;
 import org.zkoss.zk.ui.Component;
 import org.zkoss.zul.Column;
@@ -180,4 +181,18 @@ public class ExternalCompanyCRUDController extends
     protected void delete(ExternalCompany company) {
         externalCompanyModel.deleteCompany(company);
     }
+
+    @Override
+    protected boolean beforeDeleting(ExternalCompany company) {
+        if (externalCompanyModel.isAlreadyInUse(company)) {
+            messagesForUser.showMessage(
+                    Level.WARNING,
+                            _("{0} \"{1}\" can not be deleted because of it is being used",
+                                    getEntityType(),
+                            company.getHumanId()));
+            return false;
+        }
+        return true;
+    }
+
 }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java
index fda915637..e1162d5bb 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java
@@ -50,6 +50,7 @@ import org.zkoss.zk.ui.event.Events;
 import org.zkoss.zk.ui.event.InputEvent;
 import org.zkoss.zk.ui.util.GenericForwardComposer;
 import org.zkoss.zul.Button;
+import org.zkoss.zul.Caption;
 import org.zkoss.zul.Checkbox;
 import org.zkoss.zul.Grid;
 import org.zkoss.zul.Listbox;
@@ -96,7 +97,7 @@ public class MaterialsController extends
 
     private Component messagesContainer;
 
-    private Panel materialsPanel;
+    private Caption materialsCaption;
 
     private UnitTypeListRenderer unitTypeListRenderer = new UnitTypeListRenderer();
 
@@ -385,10 +386,10 @@ public class MaterialsController extends
     private void reloadCategoriesTree(Treeitem treeitem) {
         if (treeitem != null) {
             final MaterialCategory materialCategory = (MaterialCategory) treeitem.getValue();
-            Util.reloadBindings(categoriesTree);
+            categoriesTree.invalidate();
             locateAndSelectMaterialCategory(materialCategory);
         } else {
-            Util.reloadBindings(categoriesTree);
+            categoriesTree.invalidate();
         }
     }
 
@@ -483,11 +484,12 @@ public class MaterialsController extends
     private void refreshMaterialsListTitle() {
         Treeitem treeitem = categoriesTree.getSelectedItem();
         if (treeitem != null) {
-            materialsPanel.setTitle(_("List of materials for category: {0}",
+            materialsCaption.setLabel(_("List of materials for category: {0}",
                     ((MaterialCategory) treeitem.getValue()).getName()));
         }
         else {
-            materialsPanel.setTitle
+            materialsCaption
+                    .setLabel
                 (_("List of materials for all categories (select one to filter)"));
         }
     }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java
index 77271578c..9f52f173b 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java
@@ -39,6 +39,7 @@ import org.zkoss.zk.ui.event.CheckEvent;
 import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zk.ui.event.EventListener;
 import org.zkoss.zk.ui.event.Events;
+import org.zkoss.zul.Button;
 import org.zkoss.zul.Constraint;
 import org.zkoss.zul.Hbox;
 import org.zkoss.zul.Label;
@@ -96,13 +97,17 @@ public class UnitTypeController extends BaseCRUDController<UnitType> {
                     }
                 }));
 
-                hbox.appendChild(Util.createRemoveButton(new EventListener() {
+                Button removeButton = Util
+                        .createRemoveButton(new EventListener() {
 
                     @Override
                     public void onEvent(Event event) {
                         confirmDelete(unitType);
                     }
-                }));
+                });
+                removeButton.setDisabled(unitTypeModel
+                        .isUnitTypeUsedInAnyMaterial(unitType));
+                hbox.appendChild(removeButton);
 
                 row.appendChild(hbox);
             }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementModel.java
index 35cfb71a8..1728f196e 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementModel.java
@@ -159,9 +159,14 @@ public class AssignedTaskQualityFormsToOrderElementModel implements
             TaskQualityForm taskQualityForm) {
         AdvanceType advanceType = taskQualityForm.getQualityForm()
                 .getAdvanceType();
-        advanceTypeDAO.reattach(advanceType);
-        return taskQualityForm.getOrderElement()
-                .getDirectAdvanceAssignmentByType(advanceType);
+        if (advanceType == null) {
+            return null;
+        }
+        else {
+            advanceTypeDAO.reattach(advanceType);
+            return taskQualityForm.getOrderElement()
+                    .getDirectAdvanceAssignmentByType(advanceType);
+        }
     }
 
     @Override
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java
index 43a7793ba..0aeedb09d 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java
@@ -764,11 +764,13 @@ public class ManageOrderElementAdvancesController extends
                         .getValue();
                 if (!manageOrderElementAdvancesModel
                         .hasConsolidatedAdvances(advance)) {
-                    if (value == null) {
-                        ((Decimalbox) comp).setValue(advance.getMaxValue());
+                    if (value == null
+                            || (BigDecimal.ZERO.compareTo((BigDecimal) value) >= 0)) {
+                        ((Decimalbox) comp).setValue(advance.getAdvanceType()
+                                .getDefaultMaxValue());
                         ((Decimalbox) comp).invalidate();
                         throw new WrongValueException(comp,
-                                _("The max value must be not empty"));
+                                _("The max value must be greater than 0"));
                     }
                 }
             }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesModel.java
index 410635321..37bea4793 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesModel.java
@@ -696,7 +696,7 @@ public class ManageOrderElementAdvancesModel implements
                 if (listAdvanceMeasurements.size() > 1) {
                     for (AdvanceMeasurement advanceMeasurement : listAdvanceMeasurements) {
                         BigDecimal value = advanceMeasurement.getValue();
-                        if ((selectedAdvances.size() > 1) && (value != null)) {
+                        if ((selectedAdvances.size() > 1) && (value != null) && (value.compareTo(BigDecimal.ZERO) > 0)) {
                             BigDecimal maxValue = directAdvanceAssignment
                                     .getMaxValue();
                             value = value.setScale(2).divide(maxValue,
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java
index 42f590d51..5fed9ec51 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java
@@ -45,9 +45,10 @@ import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
 import org.navalplanner.business.planner.entities.AggregateOfResourceAllocations;
 import org.navalplanner.business.planner.entities.AssignmentFunction;
-import org.navalplanner.business.planner.entities.AssignmentFunction.ASSIGNMENT_FUNCTION_NAME;
+import org.navalplanner.business.planner.entities.AssignmentFunction.AssignmentFunctionName;
 import org.navalplanner.business.planner.entities.CalculatedValue;
 import org.navalplanner.business.planner.entities.GenericResourceAllocation;
+import org.navalplanner.business.planner.entities.ManualFunction;
 import org.navalplanner.business.planner.entities.ResourceAllocation;
 import org.navalplanner.business.planner.entities.SigmoidFunction;
 import org.navalplanner.business.planner.entities.SpecificResourceAllocation;
@@ -58,9 +59,9 @@ import org.navalplanner.business.resources.entities.Criterion;
 import org.navalplanner.business.workingday.EffortDuration;
 import org.navalplanner.web.common.EffortDurationBox;
 import org.navalplanner.web.common.IMessagesForUser;
-import org.navalplanner.web.common.Level;
 import org.navalplanner.web.common.MessagesForUser;
 import org.navalplanner.web.common.OnlyOneVisible;
+import org.navalplanner.web.common.Util;
 import org.navalplanner.web.planner.allocation.streches.StrechesFunctionConfiguration;
 import org.zkoss.ganttz.timetracker.ICellForDetailItemRenderer;
 import org.zkoss.ganttz.timetracker.IConvertibleToColumn;
@@ -227,8 +228,7 @@ public class AdvancedAllocationController extends GenericForwardComposer {
         public static Restriction build(IRestrictionSource restrictionSource) {
             switch (restrictionSource.getCalculatedValue()) {
             case END_DATE:
-                return Restriction.fixedEffort(restrictionSource.getStart(),
-                        restrictionSource.getTotalEffort());
+                return Restriction.emptyRestriction();
             case NUMBER_OF_HOURS:
                 return Restriction.onlyAssignOnInterval(restrictionSource
                         .getStart(), restrictionSource.getEnd());
@@ -249,11 +249,6 @@ public class AdvancedAllocationController extends GenericForwardComposer {
             return new OnlyOnIntervalRestriction(start, end);
         }
 
-        private static Restriction fixedEffort(LocalDate start,
-                EffortDuration effort) {
-            return new FixedEffortRestriction(start, effort);
-        }
-
         abstract LocalDate limitStartDate(LocalDate startDate);
 
         abstract LocalDate limitEndDate(LocalDate localDate);
@@ -320,55 +315,6 @@ public class AdvancedAllocationController extends GenericForwardComposer {
         }
     }
 
-    private static class FixedEffortRestriction extends Restriction {
-
-        private final EffortDuration effort;
-
-        private final LocalDate start;
-
-        private FixedEffortRestriction(LocalDate start, EffortDuration effort) {
-            this.start = start;
-            this.effort = effort;
-        }
-
-        @Override
-        boolean isDisabledEditionOn(DetailItem item) {
-            return false;
-        }
-
-        @Override
-        LocalDate limitEndDate(LocalDate endDate) {
-            return endDate;
-        }
-
-        @Override
-        LocalDate limitStartDate(LocalDate argStart) {
-            return start.compareTo(argStart) > 0 ? start : argStart;
-        }
-
-        @Override
-        public boolean isInvalidTotalEffort(EffortDuration totalEffort) {
-            return this.effort.compareTo(totalEffort) != 0;
-        }
-
-        @Override
-        public void showInvalidEffort(IMessagesForUser messages,
-                EffortDuration totalEffort) {
-            messages.showMessage(Level.WARNING, getMessage(totalEffort));
-        }
-
-        private String getMessage(EffortDuration totalEffort) {
-            return _("there must be {0} effort instead of {1}",
-                    effort.toFormattedString(), totalEffort.toFormattedString());
-        }
-
-        @Override
-        public void markInvalidEffort(Row groupingRow,
-                EffortDuration totalEffort) {
-            groupingRow.markErrorOnTotal(getMessage(totalEffort));
-        }
-    }
-
     private static class NoRestriction extends Restriction {
 
         @Override
@@ -1192,20 +1138,28 @@ class Row {
         effortDurationBox.addEventListener(Events.ON_CHANGE,
                 new EventListener() {
 
-            @Override
+                    @Override
                     public void onEvent(Event event) {
                         EffortDuration value = effortDurationBox
                                 .getEffortDurationValue();
 
-                getAllocation().withPreviousAssociatedResources().onIntervalWithinTask(
-                        getAllocation().getStartDate(),
-                        getAllocation().getEndDate())
-                        .allocate(value);
-                fireCellChanged();
+                        ResourceAllocation<?> resourceAllocation = getAllocation();
+                        resourceAllocation
+                                .withPreviousAssociatedResources()
+                                .onIntervalWithinTask(
+                                        resourceAllocation.getStartDate(),
+                                        resourceAllocation.getEndDate())
+                                .allocate(value);
+                        AssignmentFunction assignmentFunction = resourceAllocation.getAssignmentFunction();
+                        if (assignmentFunction != null) {
+                            assignmentFunction.applyTo(resourceAllocation);
+                        }
+
+                        fireCellChanged();
                         reloadEffortsSameRowForDetailItems();
                         reloadAllEffort();
-            }
-        });
+                    }
+                });
     }
 
     private void reloadEffortsSameRowForDetailItems() {
@@ -1245,13 +1199,17 @@ class Row {
         }
     }
 
+    private AssignmentFunctionListbox assignmentFunctionsCombo = null;
+
+    private Button assignmentFunctionsConfigureButton = null;
+
     private void initializeAssigmentFunctionsCombo() {
         hboxAssigmentFunctionsCombo = new Hbox();
-        AssignmentFunctionListbox assignmentFunctionsCombo = new AssignmentFunctionListbox(
+        assignmentFunctionsCombo = new AssignmentFunctionListbox(
                 functions, getAllocation().getAssignmentFunction());
         hboxAssigmentFunctionsCombo.appendChild(assignmentFunctionsCombo);
-        hboxAssigmentFunctionsCombo
-                .appendChild(getAssignmentFunctionsConfigureButton(assignmentFunctionsCombo));
+        assignmentFunctionsConfigureButton = getAssignmentFunctionsConfigureButton(assignmentFunctionsCombo);
+        hboxAssigmentFunctionsCombo.appendChild(assignmentFunctionsConfigureButton);
     }
 
     /**
@@ -1273,7 +1231,7 @@ class Row {
                     selectItemAndSavePreviousValue(listitem);
                 }
             }
-            this.addEventListener(Events.ON_SELECT, onSelectListbox(this));
+            this.addEventListener(Events.ON_SELECT, onSelectListbox());
             this.setMold("select");
         }
 
@@ -1289,33 +1247,35 @@ class Row {
             return listitem;
         }
 
-        private EventListener onSelectListbox(
-                final AssignmentFunctionListbox listbox) {
+        private EventListener onSelectListbox() {
             return new EventListener() {
 
                 @Override
                 public void onEvent(Event event) throws Exception {
-                    IAssignmentFunctionConfiguration function = (IAssignmentFunctionConfiguration) listbox
-                            .getSelectedItem().getValue();
+                    IAssignmentFunctionConfiguration function = (IAssignmentFunctionConfiguration) getSelectedItem()
+                            .getValue();
 
                     // Cannot apply function if task contains consolidated day assignments
                     final ResourceAllocation<?> resourceAllocation = getAllocation();
-                    if (isSigmoid(function.getName())
+                    if (function.isSigmoid()
                             && !resourceAllocation
                                     .getConsolidatedAssignments().isEmpty()) {
                         showCannotApplySigmoidFunction();
-                        listbox.setSelectedItem(listbox.getPreviousListitem());
+                        setSelectedItem(getPreviousListitem());
                         return;
                     }
                     // User didn't accept
                     if (showConfirmChangeFunctionDialog() != Messagebox.YES) {
-                        listbox.setSelectedItem(listbox.getPreviousListitem());
+                        setSelectedItem(getPreviousListitem());
                         return;
                     }
-                    // Apply sigmoid function
+                    // Apply assignment function
                     if (function != null) {
-                        setPreviousListitem(listbox.getSelectedItem());
+                        setPreviousListitem(getSelectedItem());
                         function.applyOn(resourceAllocation);
+                        updateAssignmentFunctionsConfigureButton(
+                                assignmentFunctionsConfigureButton,
+                                function.isConfigurable());
                     }
                 }
             };
@@ -1329,10 +1289,6 @@ class Row {
             this.previousListitem = previousListitem;
         }
 
-        private boolean isSigmoid(String value) {
-            return ASSIGNMENT_FUNCTION_NAME.SIGMOID.toString().equals(value);
-        }
-
         private void showCannotApplySigmoidFunction() {
             try {
                 Messagebox
@@ -1351,23 +1307,30 @@ class Row {
                             Messagebox.YES | Messagebox.NO, Messagebox.QUESTION);
         }
 
+        private void setSelectedFunction(String functionName) {
+            List<Listitem> children = getChildren();
+            for (Listitem item : children) {
+                IAssignmentFunctionConfiguration function = (IAssignmentFunctionConfiguration) item
+                        .getValue();
+                if (function.getName().equals(functionName)) {
+                    setSelectedItem(item);
+                }
+            }
+        }
+
     }
 
     private IAssignmentFunctionConfiguration flat = new IAssignmentFunctionConfiguration() {
 
         @Override
         public void goToConfigure() {
-            try {
-                Messagebox.show(_("Flat allocation is not configurable"),
-                        _("Warning"), Messagebox.OK, Messagebox.EXCLAMATION);
-            } catch (InterruptedException e) {
-                throw new RuntimeException(e);
-            }
+            throw new UnsupportedOperationException(
+                    "Flat allocation is not configurable");
         }
 
         @Override
         public String getName() {
-            return ASSIGNMENT_FUNCTION_NAME.FLAT.toString();
+            return AssignmentFunctionName.FLAT.toString();
         }
 
         @Override
@@ -1378,7 +1341,12 @@ class Row {
         @Override
         public void applyOn(
                 ResourceAllocation<?> resourceAllocation) {
-            resourceAllocation.setAssignmentFunction(null);
+            resourceAllocation.setAssignmentFunctionWithoutApply(null);
+            resourceAllocation
+                    .withPreviousAssociatedResources()
+                    .onIntervalWithinTask(resourceAllocation.getStartDate(),
+                            resourceAllocation.getEndDate())
+                    .allocate(allEffortInput.getEffortDurationValue());
             reloadEfforts();
         }
 
@@ -1388,6 +1356,51 @@ class Row {
             fireCellChanged();
         }
 
+        @Override
+        public boolean isSigmoid() {
+            return false;
+        }
+
+        @Override
+        public boolean isConfigurable() {
+            return false;
+        }
+
+    };
+
+    private IAssignmentFunctionConfiguration manualFunction = new IAssignmentFunctionConfiguration() {
+
+        @Override
+        public void goToConfigure() {
+            throw new UnsupportedOperationException(
+                    "Manual allocation is not configurable");
+        }
+
+        @Override
+        public String getName() {
+            return AssignmentFunctionName.MANUAL.toString();
+        }
+
+        @Override
+        public boolean isTargetedTo(AssignmentFunction function) {
+            return function instanceof ManualFunction;
+        }
+
+        @Override
+        public void applyOn(ResourceAllocation<?> resourceAllocation) {
+            resourceAllocation.setAssignmentFunctionAndApplyIfNotFlat(ManualFunction.create());
+        }
+
+        @Override
+        public boolean isSigmoid() {
+            return false;
+        }
+
+        @Override
+        public boolean isConfigurable() {
+            return false;
+        }
+
     };
 
     private abstract class CommonStrechesConfiguration extends
@@ -1429,7 +1442,7 @@ class Row {
 
         @Override
         public String getName() {
-            return ASSIGNMENT_FUNCTION_NAME.STRETCHES.toString();
+            return AssignmentFunctionName.STRETCHES.toString();
         }
     };
 
@@ -1452,7 +1465,7 @@ class Row {
 
         @Override
         public String getName() {
-            return ASSIGNMENT_FUNCTION_NAME.INTERPOLATION.toString();
+            return AssignmentFunctionName.INTERPOLATION.toString();
         }
     };
 
@@ -1460,17 +1473,13 @@ class Row {
 
         @Override
         public void goToConfigure() {
-            try {
-                Messagebox.show(_("Sigmoid function is not configurable"),
-                        _("Warning"), Messagebox.OK, Messagebox.EXCLAMATION);
-            } catch (InterruptedException e) {
-                throw new RuntimeException(e);
-            }
+            throw new UnsupportedOperationException(
+                    "Sigmoid function is not configurable");
         }
 
         @Override
         public String getName() {
-            return ASSIGNMENT_FUNCTION_NAME.SIGMOID.toString();
+            return AssignmentFunctionName.SIGMOID.toString();
         }
 
         @Override
@@ -1481,7 +1490,7 @@ class Row {
         @Override
         public void applyOn(
                 ResourceAllocation<?> resourceAllocation) {
-            resourceAllocation.setAssignmentFunction(SigmoidFunction.create());
+            resourceAllocation.setAssignmentFunctionAndApplyIfNotFlat(SigmoidFunction.create());
             reloadEfforts();
         }
 
@@ -1491,10 +1500,21 @@ class Row {
             fireCellChanged();
         }
 
+        @Override
+        public boolean isSigmoid() {
+            return true;
+        }
+
+        @Override
+        public boolean isConfigurable() {
+            return false;
+        }
+
     };
 
     private IAssignmentFunctionConfiguration[] functions = {
             flat,
+            manualFunction,
             defaultStrechesFunction,
             strechesWithInterpolation,
             sigmoidFunction
@@ -1504,12 +1524,7 @@ class Row {
 
     private Button getAssignmentFunctionsConfigureButton(
             final Listbox assignmentFunctionsListbox) {
-        final Button button = new Button("", "/common/img/ico_editar1.png");
-        button.setHoverImage("/common/img/ico_editar.png");
-        button.setSclass("icono");
-        button.setTooltiptext(_("Configure"));
-        button.addEventListener(Events.ON_CLICK, new EventListener() {
-
+        Button button = Util.createEditButton(new EventListener() {
             @Override
             public void onEvent(Event event) {
                 IAssignmentFunctionConfiguration configuration = (IAssignmentFunctionConfiguration) assignmentFunctionsListbox
@@ -1517,9 +1532,25 @@ class Row {
                 configuration.goToConfigure();
             }
         });
+
+        IAssignmentFunctionConfiguration configuration = (IAssignmentFunctionConfiguration) assignmentFunctionsListbox
+                .getSelectedItem().getValue();
+        updateAssignmentFunctionsConfigureButton(button,
+                configuration.isConfigurable());
         return button;
     }
 
+    private void updateAssignmentFunctionsConfigureButton(Button button,
+            boolean configurable) {
+        if (configurable) {
+            button.setTooltiptext(_("Configure"));
+            button.setDisabled(false);
+        } else {
+            button.setTooltiptext(_("Not configurable"));
+            button.setDisabled(true);
+        }
+    }
+
     Component getNameLabel() {
         if (nameLabel == null) {
             nameLabel = new Label();
@@ -1554,7 +1585,7 @@ class Row {
             List<? extends ResourceAllocation<?>> allocations) {
         AssignmentFunction function = getAssignmentFunction(allocations);
         return (function != null) ? function.getName()
-                : ASSIGNMENT_FUNCTION_NAME.FLAT.toString();
+                : AssignmentFunctionName.FLAT.toString();
     }
 
     private AssignmentFunction getAssignmentFunction(
@@ -1608,6 +1639,7 @@ class Row {
                         .getStartDate().toLocalDate());
                 LocalDate endDate = restriction.limitEndDate(item.getEndDate()
                         .toLocalDate());
+                changeAssignmentFunctionToManual();
                 getAllocation().withPreviousAssociatedResources()
                                    .onIntervalWithinTask(startDate, endDate)
                                    .allocate(value);
@@ -1618,6 +1650,15 @@ class Row {
         });
     }
 
+    private void changeAssignmentFunctionToManual() {
+        assignmentFunctionsCombo
+                .setSelectedFunction(AssignmentFunctionName.MANUAL.toString());
+        ResourceAllocation<?> allocation = getAllocation();
+        if (!(allocation.getAssignmentFunction() instanceof ManualFunction)) {
+            allocation.setAssignmentFunctionAndApplyIfNotFlat(ManualFunction.create());
+        }
+    }
+
     private void reloadEffortOnInterval(Component component, DetailItem item) {
         if (cannotBeEdited(item)) {
             Label label = (Label) component;
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java
index 339845fbb..5f9bb80a5 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java
@@ -42,6 +42,8 @@ import org.navalplanner.business.calendars.entities.ThereAreHoursOnWorkHoursCalc
 import org.navalplanner.business.calendars.entities.ThereAreHoursOnWorkHoursCalculator.ResourcesPerDayIsZero;
 import org.navalplanner.business.calendars.entities.ThereAreHoursOnWorkHoursCalculator.ThereAreNoValidPeriods;
 import org.navalplanner.business.calendars.entities.ThereAreHoursOnWorkHoursCalculator.ValidPeriodsDontHaveCapacity;
+import org.navalplanner.business.planner.entities.AssignmentFunction;
+import org.navalplanner.business.planner.entities.AssignmentFunction.AssignmentFunctionName;
 import org.navalplanner.business.planner.entities.CalculatedValue;
 import org.navalplanner.business.planner.entities.DerivedAllocation;
 import org.navalplanner.business.planner.entities.ResourceAllocation;
@@ -287,6 +289,8 @@ public abstract class AllocationRow {
 
     private Grid derivedAllocationsGrid;
 
+    private Label assignmentFunctionLabel = new Label();
+
     public AllocationRow(CalculatedValue calculatedValue) {
         this.currentCalculatedValue = calculatedValue;
         this.origin = null;
@@ -342,6 +346,17 @@ public abstract class AllocationRow {
         effortInput.setSclass("assigned-hours-input");
         effortInput.setConstraint(constraintForHoursInput());
         loadEffort();
+        updateAssignmentFunctionLabel();
+    }
+
+    private void updateAssignmentFunctionLabel() {
+        AssignmentFunction function = getAssignmentFunction();
+        if (function == null) {
+            assignmentFunctionLabel.setValue(_(AssignmentFunctionName.FLAT
+                    .toString()));
+        } else {
+            assignmentFunctionLabel.setValue(_(function.getName()));
+        }
     }
 
     public abstract ResourcesPerDayModification toResourcesPerDayModification(
@@ -464,6 +479,10 @@ public abstract class AllocationRow {
         effortInput.setValue(getEffort());
     }
 
+    public void loadAssignmentFunctionName() {
+        updateAssignmentFunctionLabel();
+    }
+
     protected EffortDuration getEffortFromInput() {
         return effortInput.getValue() != null ? effortInput
                 .getEffortDurationValue()
@@ -497,6 +516,20 @@ public abstract class AllocationRow {
                 .setConstraint(constraintForResourcesPerDayInput());
     }
 
+    private AssignmentFunction getAssignmentFunction() {
+        if (temporal != null) {
+            return temporal.getAssignmentFunction();
+        }
+        if (origin != null) {
+            return origin.getAssignmentFunction();
+        }
+        return null;
+    }
+
+    public boolean isAssignmentFunctionNotFlat() {
+        return getAssignmentFunction() != null;
+    }
+
     private Constraint constraintForHoursInput() {
         return (effortInput.isDisabled()) ? null : CONSTRAINT_FOR_HOURS_INPUT;
     }
@@ -746,4 +779,8 @@ public abstract class AllocationRow {
         });
     }
 
+    public Label getAssignmentFunctionLabel() {
+        return assignmentFunctionLabel;
+    }
+
 }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRowsHandler.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRowsHandler.java
index 4bf33e181..d569a0819 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRowsHandler.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRowsHandler.java
@@ -34,6 +34,7 @@ import org.joda.time.LocalDate;
 import org.navalplanner.business.calendars.entities.ThereAreHoursOnWorkHoursCalculator.CapacityResult;
 import org.navalplanner.business.common.Flagged;
 import org.navalplanner.business.orders.entities.HoursGroup;
+import org.navalplanner.business.planner.entities.AssignmentFunction;
 import org.navalplanner.business.planner.entities.CalculatedValue;
 import org.navalplanner.business.planner.entities.DerivedAllocationGenerator.IWorkerFinder;
 import org.navalplanner.business.planner.entities.ResourceAllocation;
@@ -272,16 +273,24 @@ public class AllocationRowsHandler {
     }
 
     private List<? extends AllocationModification> doSuitableAllocation() {
+        List<? extends AllocationModification> allocationModifications;
         switch (calculatedValue) {
         case NUMBER_OF_HOURS:
-            return calculateNumberOfHoursAllocation();
+            allocationModifications = calculateNumberOfHoursAllocation();
+            break;
         case END_DATE:
-            return calculateEndDateOrStartDateAllocation();
+            allocationModifications = calculateEndDateOrStartDateAllocation();
+            break;
         case RESOURCES_PER_DAY:
-            return calculateResourcesPerDayAllocation();
+            allocationModifications = calculateResourcesPerDayAllocation();
+            break;
         default:
             throw new RuntimeException("cant handle: " + calculatedValue);
         }
+
+        AssignmentFunction.applyAssignmentFunctionsIfAny(AllocationModification
+                .getBeingModified(allocationModifications));
+        return allocationModifications;
     }
 
     private List<ResourcesPerDayModification> calculateNumberOfHoursAllocation() {
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java
index 0657245e2..42cf2d95d 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java
@@ -540,6 +540,7 @@ public class FormBinder {
         loadValueForEffortInput();
         loadDerivedAllocations();
         loadSclassRowSatisfied();
+        loadAssignmentFunctionNames();
         workableDaysAndDatesBinder.afterApplicationReloadValues();
         Util.reloadBindings(allocationsGrid);
     }
@@ -563,6 +564,12 @@ public class FormBinder {
         }
     }
 
+    private void loadAssignmentFunctionNames() {
+        for (AllocationRow each : rows) {
+            each.loadAssignmentFunctionName();
+        }
+    }
+
     private void loadEffortValues() {
         for (AllocationRow each : rows) {
             each.loadEffort();
@@ -906,4 +913,14 @@ public class FormBinder {
         this.behaviour = behaviour;
     }
 
+    public boolean isAnyNotFlat() {
+        for (AllocationRow allocationRow : allocationRowsHandler
+                .getCurrentRows()) {
+            if (allocationRow.isAssignmentFunctionNotFlat()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
 }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/GenericAllocationRow.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/GenericAllocationRow.java
index ae6675c1c..3d28d7a37 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/GenericAllocationRow.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/GenericAllocationRow.java
@@ -142,6 +142,7 @@ public class GenericAllocationRow extends AllocationRow {
         if (origin != null) {
             result.overrideConsolidatedDayAssignments(origin);
             discountFrom.add(origin);
+            result.setAssignmentFunctionWithoutApply(origin.getAssignmentFunction());
         }
         result.discountAssignedHoursForResourceFrom(discountFrom);
         return result;
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/IAssignmentFunctionConfiguration.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/IAssignmentFunctionConfiguration.java
index 1d3420f81..54ec9f2bd 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/IAssignmentFunctionConfiguration.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/IAssignmentFunctionConfiguration.java
@@ -34,4 +34,8 @@ public interface IAssignmentFunctionConfiguration {
 
     public void goToConfigure();
 
+    public boolean isSigmoid();
+
+    public boolean isConfigurable();
+
 }
\ No newline at end of file
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java
index 408ac5cc5..fcd6ad4b1 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java
@@ -635,6 +635,8 @@ public class ResourceAllocationController extends GenericForwardComposer {
                     data.getRealResourcesPerDay());
             realResourcesPerDay.setStyle("float: right; padding-right: 1em;");
 
+            append(row, data.getAssignmentFunctionLabel());
+
             // On click delete button
             Button deleteButton = appendDeleteButton(row);
             formBinder.setDeleteButtonFor(data, deleteButton);
@@ -701,4 +703,8 @@ public class ResourceAllocationController extends GenericForwardComposer {
         return ((getResourceAllocations().size() > 1));
     }
 
+    public boolean isAnyNotFlat() {
+        return formBinder != null && formBinder.isAnyNotFlat();
+    }
+
 }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/SpecificAllocationRow.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/SpecificAllocationRow.java
index 89e03497d..0f408bb12 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/SpecificAllocationRow.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/SpecificAllocationRow.java
@@ -126,8 +126,11 @@ public class SpecificAllocationRow extends AllocationRow {
         SpecificResourceAllocation specific = SpecificResourceAllocation
                 .create(task);
         specific.setResource(resource);
-        specific
-                .overrideConsolidatedDayAssignments((SpecificResourceAllocation) getOrigin());
+        SpecificResourceAllocation origin = (SpecificResourceAllocation) getOrigin();
+        specific.overrideConsolidatedDayAssignments(origin);
+        if (origin != null) {
+            specific.setAssignmentFunctionWithoutApply(origin.getAssignmentFunction());
+        }
         return specific;
     }
 
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StrechesFunctionConfiguration.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StrechesFunctionConfiguration.java
index b50dada59..704531035 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StrechesFunctionConfiguration.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StrechesFunctionConfiguration.java
@@ -58,7 +58,7 @@ public abstract class StrechesFunctionConfiguration implements
 
         int exitStatus = stretchesFunctionController.showWindow();
         if (exitStatus == Messagebox.OK) {
-            getAllocation().setAssignmentFunction(
+            getAllocation().setAssignmentFunctionAndApplyIfNotFlat(
                     stretchesFunctionController.getAssignmentFunction());
             assignmentFunctionChanged();
         }
@@ -94,7 +94,17 @@ public abstract class StrechesFunctionConfiguration implements
 
     @Override
     public void applyOn(ResourceAllocation<?> resourceAllocation) {
-        resourceAllocation.setAssignmentFunction(StretchesFunction.create());
+        resourceAllocation.setAssignmentFunctionAndApplyIfNotFlat(StretchesFunction.create());
+    }
+
+    @Override
+    public boolean isSigmoid() {
+        return false;
+    }
+
+    @Override
+    public boolean isConfigurable() {
+        return true;
     }
 
 }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java
index 9c1fca13f..c6103af13 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java
@@ -94,6 +94,7 @@ import org.navalplanner.web.planner.consolidations.IAdvanceConsolidationCommand;
 import org.navalplanner.web.planner.milestone.IAddMilestoneCommand;
 import org.navalplanner.web.planner.milestone.IDeleteMilestoneCommand;
 import org.navalplanner.web.planner.order.ISaveCommand.IAfterSaveListener;
+import org.navalplanner.web.planner.order.PlanningStateCreator.IActionsOnRetrieval;
 import org.navalplanner.web.planner.order.PlanningStateCreator.PlanningState;
 import org.navalplanner.web.planner.reassign.IReassignCommand;
 import org.navalplanner.web.planner.taskedition.EditTaskController;
@@ -327,6 +328,7 @@ public class OrderPlanningModel implements IOrderPlanningModel {
             List<ICommand<TaskElement>> additional) {
         long time = System.currentTimeMillis();
         this.planner = planner;
+        planningState = createPlanningStateFor(order);
         currentScenario = scenarioManager.getCurrent();
         PlannerConfiguration<TaskElement> configuration = createConfiguration(order);
         PROFILING_LOG.info("load data and create configuration took: "
@@ -1090,7 +1092,6 @@ public class OrderPlanningModel implements IOrderPlanningModel {
 
     private PlannerConfiguration<TaskElement> createConfiguration(Order order) {
         taskElementAdapter.useScenario(currentScenario);
-        planningState = createPlanningStateFor(order);
         taskElementAdapter.setInitDate(asLocalDate(order.getInitDate()));
         taskElementAdapter.setDeadline(asLocalDate(order.getDeadline()));
         PlannerConfiguration<TaskElement> result = new PlannerConfiguration<TaskElement>(
@@ -1113,7 +1114,14 @@ public class OrderPlanningModel implements IOrderPlanningModel {
 
     private PlanningState createPlanningStateFor(Order order) {
         return planningStateCreator.retrieveOrCreate(planner.getDesktop(),
-                order);
+                order, new IActionsOnRetrieval() {
+
+                    @Override
+                    public void onRetrieval(PlanningState planningState) {
+                        planningState.reattach();
+                        planningState.reassociateResourcesWithSession();
+                    }
+                });
     }
 
     public static final String COLOR_ASSIGNED_LOAD_GLOBAL = "#E0F3D3"; // Soft
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/PlanningStateCreator.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/PlanningStateCreator.java
index 98ed97fe8..30ca8ae53 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/PlanningStateCreator.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/PlanningStateCreator.java
@@ -130,10 +130,24 @@ public class PlanningStateCreator {
     @Autowired
     private ITaskSourceDAO taskSourceDAO;
 
+    public interface IActionsOnRetrieval {
+
+        public void onRetrieval(PlanningState planningState);
+    }
+
     public PlanningState retrieveOrCreate(Desktop desktop, Order order) {
+        return retrieveOrCreate(desktop, order, null);
+    }
+
+    public PlanningState retrieveOrCreate(Desktop desktop, Order order,
+            IActionsOnRetrieval onRetrieval) {
         Object existent = desktop.getAttribute(ATTRIBUTE_NAME);
         if (existent instanceof PlanningState) {
-            return (PlanningState) existent;
+            PlanningState result = (PlanningState) existent;
+            if (onRetrieval != null) {
+                onRetrieval.onRetrieval(result);
+            }
+            return result;
         }
         PlanningState result = createInitialPlanning(reload(order));
         desktop.setAttribute(ATTRIBUTE_NAME, result);
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/Type.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/Type.java
index 273280c61..d41a10a45 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/Type.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/Type.java
@@ -28,7 +28,7 @@ public enum Type {
 
         @Override
         public String getName() {
-            return _("All");
+            return _("All project tasks");
         }
 
         @Override
@@ -40,7 +40,7 @@ public enum Type {
 
         @Override
         public String getName() {
-            return _("From Today");
+            return _("From today");
         }
 
         @Override
@@ -52,7 +52,7 @@ public enum Type {
 
         @Override
         public String getName() {
-            return _("From Chosen");
+            return _("From chosen date");
         }
 
         @Override
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java
index abeca30de..922260e3e 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java
@@ -110,7 +110,7 @@ public class OrdersTabCreator {
                 breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR));
                 breadcrumbs.appendChild(new Label(getSchedulingLabel()));
                 breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR));
-                breadcrumbs.appendChild(new Label(_("Projects")));
+                breadcrumbs.appendChild(new Label(_("Projects List")));
             }
         };
     }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java
index a216f72d0..cefe59f4d 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java
@@ -364,18 +364,10 @@ public class CutyPrint {
             int minWidthPixels) {
         String css = "/* ------ Make the area for task names wider ------ */\n";
         css += "th.z-tree-col {width: 76px !important;}\n";
-        css += "th.tree-text {width: " + (24 + minWidthPixels) + "px !important;}\n";
+        css += "th.tree-text {width: " + (34 + minWidthPixels)
+                + "px !important;}\n";
         css += ".taskdetailsContainer, .z-west-body, .z-tree-header, .z-tree-body {";
         css += "width: " + (176 + minWidthPixels) + "px !important;}\n";
-        css += ".listdetails .depth_1 input.task_title {";
-        css += "width: " + (minWidthPixels - 1) + "px !important;}\n";
-        css += ".listdetails .depth_2 input.task_title {";
-        css += "width: " + (minWidthPixels - 22) + "px !important;}\n";
-        css += ".listdetails .depth_3 input.task_title {";
-        css += "width: " + (minWidthPixels - 43) + "px !important;}\n";
-        css += ".listdetails .depth_4 input.task_title {";
-        css += "width: " + (minWidthPixels - 64) + "px !important;}\n";
-
         return css;
     }
 }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/IQualityFormModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/IQualityFormModel.java
index be5e972b0..672bfbe31 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/IQualityFormModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/IQualityFormModel.java
@@ -132,4 +132,6 @@ public interface IQualityFormModel {
      * @param qualityFormItem
      */
     Boolean isTotalPercentage(QualityFormItem item);
+
+    void checkHasTasks(QualityForm qualityForm) throws ValidationException;
 }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java
index c4c22a7df..2bad3ad79 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java
@@ -27,15 +27,18 @@ import java.math.BigDecimal;
 import java.util.Iterator;
 import java.util.List;
 
+import org.apache.commons.logging.LogFactory;
 import org.hibernate.validator.InvalidValue;
 import org.navalplanner.business.common.exceptions.InstanceNotFoundException;
 import org.navalplanner.business.common.exceptions.ValidationException;
 import org.navalplanner.business.qualityforms.entities.QualityForm;
 import org.navalplanner.business.qualityforms.entities.QualityFormItem;
 import org.navalplanner.business.qualityforms.entities.QualityFormType;
+import org.navalplanner.business.users.entities.Profile;
 import org.navalplanner.web.common.BaseCRUDController;
 import org.navalplanner.web.common.Level;
 import org.navalplanner.web.common.Util;
+import org.navalplanner.web.users.ProfileCRUDController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.WrongValueException;
@@ -58,6 +61,8 @@ import org.zkoss.zul.impl.InputElement;
  */
 public class QualityFormCRUDController extends BaseCRUDController<QualityForm> {
 
+    private static final org.apache.commons.logging.Log LOG = LogFactory.getLog(QualityFormCRUDController.class);
+
     @Autowired
     private IQualityFormModel qualityFormModel;
 
@@ -465,4 +470,31 @@ public class QualityFormCRUDController extends BaseCRUDController<QualityForm> {
             Util.reloadBindings(qualityForms);
         }
     }
+
+    @Override
+    protected boolean beforeDeleting(QualityForm qualityForm){
+        return !isReferencedByOtherEntities(qualityForm);
+    }
+
+    private boolean isReferencedByOtherEntities(QualityForm qualityForm) {
+        try {
+            qualityFormModel.checkHasTasks(qualityForm);
+            return false;
+        } catch (ValidationException e) {
+            showCannotDeleteQualityFormDialog(e.getInvalidValue().getMessage(),
+                    qualityForm);
+        }
+        return true;
+    }
+
+    private void showCannotDeleteQualityFormDialog(String message, QualityForm qualityForm) {
+        try {
+            Messagebox.show(_(message), _("Warning"), Messagebox.OK,
+                    Messagebox.EXCLAMATION);
+        } catch (InterruptedException e) {
+            LOG.error(
+                    _("Error on showing warning message removing qualityForm: ",
+                            qualityForm.getId()), e);
+        }
+    }
 }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormModel.java
index e153982fc..7bb75e5da 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormModel.java
@@ -31,6 +31,7 @@ import org.navalplanner.business.common.exceptions.ValidationException;
 import org.navalplanner.business.qualityforms.daos.IQualityFormDAO;
 import org.navalplanner.business.qualityforms.entities.QualityForm;
 import org.navalplanner.business.qualityforms.entities.QualityFormItem;
+import org.navalplanner.business.users.entities.Profile;
 import org.navalplanner.web.common.concurrentdetection.OnConcurrentModification;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.BeanDefinition;
@@ -217,4 +218,9 @@ public class QualityFormModel implements IQualityFormModel {
                 .equals(totalPercentage)) : false;
     }
 
+    @Override
+    @Transactional(readOnly = true)
+    public void checkHasTasks(QualityForm qualityForm) throws ValidationException {
+        qualityFormDAO.checkHasTasks(qualityForm);
+    }
 }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/NavalplannerReportController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/NavalplannerReportController.java
index f6705cac8..9d715096e 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/NavalplannerReportController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/NavalplannerReportController.java
@@ -30,6 +30,8 @@ import java.util.Set;
 import net.sf.jasperreports.engine.JRDataSource;
 import net.sf.jasperreports.engine.JRParameter;
 
+import org.navalplanner.business.common.Registry;
+import org.springframework.transaction.annotation.Transactional;
 import org.zkoss.util.Locales;
 import org.zkoss.zk.au.out.AuDownload;
 import org.zkoss.zk.ui.Executions;
@@ -100,7 +102,12 @@ public abstract class NavalplannerReportController extends GenericForwardCompose
 
     protected Map<String, Object> getParameters() {
         Map<String, Object> parameters = new HashMap<String, Object>();
-        parameters.put("logo", String.format("/logos/%s/logo.png", getLanguage()));
+        String companyLogo = Registry.getConfigurationDAO()
+                .getConfigurationWithReadOnlyTransaction().getCompanyLogoURL();
+        if (companyLogo == "") {
+            companyLogo = "/logos/logo.png";
+        }
+        parameters.put("logo", companyLogo);
         parameters.put(JRParameter.REPORT_LOCALE, getCurrentLocale());
         return parameters;
     }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java
index c94df033c..6b7efa09c 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java
@@ -932,8 +932,19 @@ public class ResourceLoadController implements Composer {
     }
 
     public void filterBy(Order order) {
-        this.filterBy = order == null ? null : planningStateCreator
-                .retrieveOrCreate(parent.getDesktop(), order);
+        this.filterBy = order == null ? null : createPlanningState(order);
+    }
+
+    PlanningState createPlanningState(final Order order) {
+        return transactionService
+                .runOnReadOnlyTransaction(new IOnTransaction<PlanningState>() {
+
+                    @Override
+                    public PlanningState execute() {
+                        return planningStateCreator.retrieveOrCreate(
+                                parent.getDesktop(), order);
+                    }
+                });
     }
 
     public void setPlanningControllerEntryPoints(
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java
index c6236b5a4..74befe55d 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java
@@ -540,6 +540,7 @@ public class MachineCRUDController extends BaseCRUDController<Machine> {
                     .showMessage(
                             Level.WARNING,
                             _("This machine cannot be deleted because it has assignments to projects or imputed hours"));
+            return false;
         }
         return true;
     }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/settings/ISettingsModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/settings/ISettingsModel.java
index 4093a18af..2005979cc 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/settings/ISettingsModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/settings/ISettingsModel.java
@@ -63,8 +63,6 @@ public interface ISettingsModel {
 
     void setEmail(String email);
 
-    void setLoginName(String loginName);
-
     String getLoginName();
 
 }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/settings/SettingsController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/settings/SettingsController.java
index 4d713740c..54fda3807 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/settings/SettingsController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/settings/SettingsController.java
@@ -21,15 +21,18 @@ package org.navalplanner.web.users.settings;
 
 import static org.navalplanner.web.I18nHelper._;
 
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
 import org.navalplanner.business.common.exceptions.ValidationException;
 import org.navalplanner.business.settings.entities.Language;
 import org.navalplanner.web.common.IMessagesForUser;
 import org.navalplanner.web.common.Level;
 import org.navalplanner.web.common.MessagesForUser;
 import org.zkoss.zk.ui.Component;
-import org.zkoss.zk.ui.WrongValueException;
 import org.zkoss.zk.ui.util.GenericForwardComposer;
-import org.zkoss.zul.Constraint;
 import org.zkoss.zul.ListitemRenderer;
 import org.zkoss.zul.Textbox;
 
@@ -66,8 +69,21 @@ public class SettingsController extends GenericForwardComposer {
         settingsModel.initEditLoggedUser();
     }
 
-    public Language[] getLanguages() {
-        return Language.values();
+    public List<Language> getLanguages() {
+        List<Language> languages = Arrays.asList(Language.values());
+        Collections.sort(languages, new Comparator<Language>() {
+            @Override
+            public int compare(Language o1, Language o2) {
+                if (o1.equals(Language.BROWSER_LANGUAGE)) {
+                    return -1;
+                }
+                if (o2.equals(Language.BROWSER_LANGUAGE)) {
+                    return 1;
+                }
+                return _(o1.getDisplayName()).compareTo(_(o2.getDisplayName()));
+            }
+        });
+        return languages;
     }
 
     public boolean save() {
@@ -144,10 +160,6 @@ public class SettingsController extends GenericForwardComposer {
         return settingsModel.getLoginName();
     }
 
-    public void setLoginName(String loginName) {
-        settingsModel.setLoginName(loginName);
-    }
-
     public void setEmail(String email) {
         settingsModel.setEmail(email);
     }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/settings/SettingsModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/settings/SettingsModel.java
index 9d27a8e6d..f401fa240 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/settings/SettingsModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/settings/SettingsModel.java
@@ -182,13 +182,6 @@ public class SettingsModel implements ISettingsModel {
         return user.getLoginName();
     }
 
-    @Override
-	public void setLoginName(String loginName) {
-        if (user != null) {
-            user.setLoginName(loginName);
-        }
-    }
-
     @Override
 	public void setEmail(String email) {
         if (user != null) {
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java
index 00de8b948..928be2aa8 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java
@@ -210,6 +210,8 @@ public class WorkReportCRUDController extends GenericForwardComposer implements
                     Messagebox.OK | Messagebox.CANCEL, Messagebox.QUESTION);
             if (Messagebox.OK == status) {
                 workReportModel.remove(workReport);
+                messagesForUser.showMessage(Level.INFO,
+                        _("Work report removed successfully"));
                 loadComponentslist(listWindow);
                 Util.reloadBindings(listWindow);
             }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/ws/calendarexceptiontypes/api/CalendarExceptionTypeColorDTO.java b/navalplanner-webapp/src/main/java/org/navalplanner/ws/calendarexceptiontypes/api/CalendarExceptionTypeColorDTO.java
index 84850897c..288ce902e 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/ws/calendarexceptiontypes/api/CalendarExceptionTypeColorDTO.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/ws/calendarexceptiontypes/api/CalendarExceptionTypeColorDTO.java
@@ -30,5 +30,5 @@ import org.navalplanner.business.calendars.entities.CalendarExceptionTypeColor;
  */
 @XmlEnum
 public enum CalendarExceptionTypeColorDTO {
-    DEFAULT, RED, GREEN, BLUE;
+    DEFAULT, RED, GREEN, BLUE, CYAN, MAGENTA, YELLOW, BLACK, ORANGE, PURPLE;
 }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/ws/calendarexceptiontypes/impl/CalendarExceptionTypeColorConverter.java b/navalplanner-webapp/src/main/java/org/navalplanner/ws/calendarexceptiontypes/impl/CalendarExceptionTypeColorConverter.java
index 4e47302a9..f11b0a9ef 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/ws/calendarexceptiontypes/impl/CalendarExceptionTypeColorConverter.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/ws/calendarexceptiontypes/impl/CalendarExceptionTypeColorConverter.java
@@ -44,24 +44,36 @@ public class CalendarExceptionTypeColorConverter {
                 CalendarExceptionTypeColorDTO.RED,
                 CalendarExceptionTypeColor.DEFAULT);
 
-        calendarExceptionTypeColorToDTO.put(CalendarExceptionTypeColor.DEFAULT,
+        addEquivalence(CalendarExceptionTypeColor.DEFAULT,
                 CalendarExceptionTypeColorDTO.DEFAULT);
-        calendarExceptionTypeColorFromDTO.put(
-                CalendarExceptionTypeColorDTO.DEFAULT,
-                CalendarExceptionTypeColor.DEFAULT);
 
-        calendarExceptionTypeColorToDTO.put(CalendarExceptionTypeColor.GREEN,
+        addEquivalence(CalendarExceptionTypeColor.GREEN,
                 CalendarExceptionTypeColorDTO.GREEN);
-        calendarExceptionTypeColorFromDTO.put(
-                CalendarExceptionTypeColorDTO.GREEN,
-                CalendarExceptionTypeColor.GREEN);
 
-        calendarExceptionTypeColorToDTO.put(CalendarExceptionTypeColor.BLUE,
+        addEquivalence(CalendarExceptionTypeColor.BLUE,
                 CalendarExceptionTypeColorDTO.BLUE);
-        calendarExceptionTypeColorFromDTO.put(
-                CalendarExceptionTypeColorDTO.BLUE,
-                CalendarExceptionTypeColor.BLUE);
 
+        addEquivalence(CalendarExceptionTypeColor.MAGENTA,
+                CalendarExceptionTypeColorDTO.MAGENTA);
+
+        addEquivalence(CalendarExceptionTypeColor.CYAN,
+                CalendarExceptionTypeColorDTO.CYAN);
+
+        addEquivalence(CalendarExceptionTypeColor.YELLOW,
+                CalendarExceptionTypeColorDTO.YELLOW);
+
+        addEquivalence(CalendarExceptionTypeColor.ORANGE,
+                CalendarExceptionTypeColorDTO.ORANGE);
+
+        addEquivalence(CalendarExceptionTypeColor.BLACK,
+                CalendarExceptionTypeColorDTO.BLACK);
+
+    }
+
+    private static void addEquivalence(CalendarExceptionTypeColor origin,
+            CalendarExceptionTypeColorDTO destination) {
+        calendarExceptionTypeColorToDTO.put(origin, destination);
+        calendarExceptionTypeColorFromDTO.put(destination, origin);
     }
 
     public final static CalendarExceptionTypeColorDTO toDTO(
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java b/navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java
index bc46887cb..eb291c92c 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java
@@ -497,6 +497,8 @@ public final class OrderElementConverter {
                             materialAssignmentDTO.materialCode);
         } catch (InstanceNotFoundException e) {
             material = Material.create(materialAssignmentDTO.materialCode);
+            material.setDescription("material-"
+                    + materialAssignmentDTO.materialCode);
 
             MaterialCategory defaultMaterialCategory = PredefinedMaterialCategories.IMPORTED_MATERIALS_WITHOUT_CATEGORY
                     .getMaterialCategory();
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/api/IBindingOrderElementStrategy.java b/navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/api/IBindingOrderElementStrategy.java
new file mode 100644
index 000000000..569f0ac93
--- /dev/null
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/api/IBindingOrderElementStrategy.java
@@ -0,0 +1,76 @@
+/*
+ * This file is part of NavalPlan
+ *
+ * Copyright (C) 2011 - ComtecSF 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.navalplanner.ws.workreports.api;
+
+import java.util.List;
+
+import org.navalplanner.business.common.exceptions.ValidationException;
+import org.navalplanner.business.orders.entities.OrderElement;
+import org.navalplanner.business.workreports.entities.IWorkReportsElements;
+import org.navalplanner.business.workreports.entities.WorkReportLine;
+
+/**
+ * This interface should be implemented for each strategy that allows to look
+ * for the set of {@link OrderElement} associated to
+ * {@link IWorkReportsElements}, i.e.: an strategy could be only one
+ * {@link OrderElement} per {@link WorkReportLine}.
+ *
+ * @author Ignacio Diaz Teijido <ignacio.diaz@comtecsf.es>
+ *
+ */
+public interface IBindingOrderElementStrategy {
+
+    /**
+     * This method allows to get the list of {@link OrderElement} associated to
+     * a given {@link IWorkReportDTOsElements}, depending on implementation, the
+     * result could have one or more elements.
+     *
+     * @param workReportDTO
+     * @return list of {@link OrderElement} associated to the
+     *         {@link IWorkReportDTOsElements} param
+     * @throws ValidationException
+     */
+    List<OrderElement> getOrderElementsBound(
+            IWorkReportDTOsElements workReportDTO) throws ValidationException;
+
+    /**
+     * This method returns an string representing the code of the
+     * {@link OrderElement} associated to the {@link IWorkReportsElements} given
+     * as parameter
+     *
+     * @param workReportEntity
+     * @return the code
+     */
+    String getOrderElementCodesBound(IWorkReportsElements workReportEntity);
+
+    /**
+     * This method allows to assign a list of {@link OrderElement} to the
+     * {@link IWorkReportsElements} given as parameter. It should throw a
+     * {@link ValidationException} when the operation could not be done,
+     * depending on the strategy implemented
+     *
+     * @param workReportEntity
+     * @param list
+     * @throws ValidationException
+     */
+    void assignOrderElementsToWorkReportLine(
+            IWorkReportsElements workReportEntity, List<OrderElement> list)
+            throws ValidationException;
+
+}
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/api/IWorkReportDTOsElements.java b/navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/api/IWorkReportDTOsElements.java
new file mode 100644
index 000000000..b67db0499
--- /dev/null
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/api/IWorkReportDTOsElements.java
@@ -0,0 +1,55 @@
+/*
+ * This file is part of NavalPlan
+ *
+ * Copyright (C) 2011 - ComtecSF 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.navalplanner.ws.workreports.api;
+
+import java.util.Set;
+
+import javax.xml.datatype.XMLGregorianCalendar;
+
+import org.navalplanner.ws.common.api.LabelReferenceDTO;
+
+/**
+ * Interface which must be implemented by {@link WorkReportDTO} and
+ * {@link WorkReportLineDTO}
+ *
+ * @author Ignacio Diaz Teijido <ignacio.diaz@comtecsf.es>
+ *
+ */
+public interface IWorkReportDTOsElements {
+    XMLGregorianCalendar getDate();
+
+    void setDate(XMLGregorianCalendar calendar);
+
+    String getResource();
+
+    void setResource(String resource);
+
+    String getOrderElement();
+
+    void setOrderElement(String orderElement);
+
+    Set<LabelReferenceDTO> getLabels();
+
+    void setLabels(Set<LabelReferenceDTO> labels);
+
+    Set<DescriptionValueDTO> getDescriptionValues();
+
+    void setDescriptionValues(Set<DescriptionValueDTO> descriptionValues);
+
+}
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/api/OneOrderElementPerWorkReportLine.java b/navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/api/OneOrderElementPerWorkReportLine.java
new file mode 100644
index 000000000..52b8a9c57
--- /dev/null
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/api/OneOrderElementPerWorkReportLine.java
@@ -0,0 +1,91 @@
+/*
+ * This file is part of NavalPlan
+ *
+ * Copyright (C) 2011 - ComtecSF 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.navalplanner.ws.workreports.api;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.navalplanner.business.common.Registry;
+import org.navalplanner.business.common.exceptions.InstanceNotFoundException;
+import org.navalplanner.business.common.exceptions.ValidationException;
+import org.navalplanner.business.orders.entities.OrderElement;
+import org.navalplanner.business.workreports.entities.IWorkReportsElements;
+import org.navalplanner.business.workreports.entities.WorkReportLine;
+
+/**
+ * Singleton implementation for {@link IBindingOrderElementStrategy}, with this
+ * implementation there could be only one {@link OrderElement} for each
+ * {@link WorkReportLine}
+ *
+ * @author Ignacio Díaz Teijido <ignacio.diaz@comtecsf.es>
+ *
+ */
+public class OneOrderElementPerWorkReportLine implements
+        IBindingOrderElementStrategy {
+
+    private static OneOrderElementPerWorkReportLine instance = null;
+
+    // This avoids external instantiation
+    private OneOrderElementPerWorkReportLine() {
+
+    }
+
+    // Singleton instantiator
+    public static OneOrderElementPerWorkReportLine getInstance() {
+        if (instance == null)
+            instance = new OneOrderElementPerWorkReportLine();
+        return instance;
+    }
+
+    @Override
+    public List<OrderElement> getOrderElementsBound(
+            IWorkReportDTOsElements workReportDTO) throws ValidationException {
+        List<OrderElement> result = new ArrayList<OrderElement>();
+        if (workReportDTO.getOrderElement() != null) {
+            OrderElement orderElement;
+            try {
+                orderElement = Registry.getOrderElementDAO().findUniqueByCode(
+                        workReportDTO.getOrderElement());
+            } catch (InstanceNotFoundException e) {
+                throw new UnsupportedOperationException("Element not found");
+            }
+            result.add(orderElement);
+        }
+        return result;
+    }
+
+    @Override
+    public String getOrderElementCodesBound(
+            IWorkReportsElements workReportEntity) {
+        return workReportEntity.getOrderElement().getCode();
+    }
+
+    @Override
+    public void assignOrderElementsToWorkReportLine(
+            IWorkReportsElements workReportEntity, List<OrderElement> list)
+            throws ValidationException {
+        if (list.size() == 1)
+            workReportEntity.setOrderElement(list.get(0));
+        else {
+            if (workReportEntity instanceof WorkReportLine)
+                throw new ValidationException(
+                    "List must have exactly one element");
+        }
+    }
+}
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/api/WorkReportDTO.java b/navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/api/WorkReportDTO.java
index 1197f4bc9..c7f9f3d00 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/api/WorkReportDTO.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/api/WorkReportDTO.java
@@ -40,7 +40,8 @@ import org.navalplanner.ws.common.api.LabelReferenceDTO;
  * @author Manuel Rego Casasnovas <mrego@igalia.com>
  */
 @XmlRootElement(name = "work-report")
-public class WorkReportDTO extends IntegrationEntityDTO {
+public class WorkReportDTO extends IntegrationEntityDTO implements
+        IWorkReportDTOsElements {
 
     public final static String ENTITY_TYPE = "work-report";
 
@@ -91,4 +92,54 @@ public class WorkReportDTO extends IntegrationEntityDTO {
         return ENTITY_TYPE;
     }
 
+    @Override
+    public XMLGregorianCalendar getDate() {
+        return date;
+    }
+
+    @Override
+    public void setDate(XMLGregorianCalendar calendar) {
+        this.date = calendar;
+    }
+
+    @Override
+    public String getResource() {
+        return resource;
+    }
+
+    @Override
+    public void setResource(String resource) {
+        this.resource = resource;
+    }
+
+    @Override
+    public String getOrderElement() {
+        return orderElement;
+    }
+
+    @Override
+    public void setOrderElement(String orderElement) {
+        this.orderElement = orderElement;
+    }
+
+    @Override
+    public Set<LabelReferenceDTO> getLabels() {
+        return labels;
+    }
+
+    @Override
+    public void setLabels(Set<LabelReferenceDTO> labels) {
+        this.labels = labels;
+    }
+
+    @Override
+    public Set<DescriptionValueDTO> getDescriptionValues() {
+        return descriptionValues;
+    }
+
+    @Override
+    public void setDescriptionValues(Set<DescriptionValueDTO> descriptionValues) {
+        this.descriptionValues = descriptionValues;
+    }
+
 }
\ No newline at end of file
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/api/WorkReportLineDTO.java b/navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/api/WorkReportLineDTO.java
index 80fc19704..81307d036 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/api/WorkReportLineDTO.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/api/WorkReportLineDTO.java
@@ -40,7 +40,8 @@ import org.navalplanner.ws.common.api.LabelReferenceDTO;
  * @author Manuel Rego Casasnovas <mrego@igalia.com>
  */
 @XmlRootElement(name = "work-report-line")
-public class WorkReportLineDTO extends IntegrationEntityDTO {
+public class WorkReportLineDTO extends IntegrationEntityDTO implements
+        IWorkReportDTOsElements {
 
     public final static String ENTITY_TYPE = "work-report-line";
 
@@ -99,4 +100,55 @@ public class WorkReportLineDTO extends IntegrationEntityDTO {
         return ENTITY_TYPE;
     }
 
+    @Override
+    public XMLGregorianCalendar getDate() {
+        return date;
+    }
+
+    @Override
+    public void setDate(XMLGregorianCalendar calendar) {
+        this.date = calendar;
+
+    }
+
+    @Override
+    public String getResource() {
+        return resource;
+    }
+
+    @Override
+    public void setResource(String resource) {
+        this.resource = resource;
+    }
+
+    @Override
+    public String getOrderElement() {
+        return orderElement;
+    }
+
+    @Override
+    public void setOrderElement(String orderElement) {
+        this.orderElement = orderElement;
+    }
+
+    @Override
+    public Set<LabelReferenceDTO> getLabels() {
+        return labels;
+    }
+
+    @Override
+    public void setLabels(Set<LabelReferenceDTO> labels) {
+        this.labels = labels;
+    }
+
+    @Override
+    public Set<DescriptionValueDTO> getDescriptionValues() {
+        return descriptionValues;
+    }
+
+    @Override
+    public void setDescriptionValues(Set<DescriptionValueDTO> descriptionValues) {
+        this.descriptionValues = descriptionValues;
+    }
+
 }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java b/navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java
index ec83af281..fc02f7b40 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java
@@ -48,17 +48,24 @@ import org.navalplanner.ws.common.api.LabelReferenceDTO;
 import org.navalplanner.ws.common.impl.DateConverter;
 import org.navalplanner.ws.common.impl.LabelReferenceConverter;
 import org.navalplanner.ws.workreports.api.DescriptionValueDTO;
+import org.navalplanner.ws.workreports.api.IBindingOrderElementStrategy;
+import org.navalplanner.ws.workreports.api.OneOrderElementPerWorkReportLine;
 import org.navalplanner.ws.workreports.api.WorkReportDTO;
 import org.navalplanner.ws.workreports.api.WorkReportLineDTO;
 import org.springframework.transaction.annotation.Transactional;
 
 /**
  * Converter from/to work report related entities to/from DTOs.
+ *
  * @author Manuel Rego Casasnovas <mrego@igalia.com>
  * @author Susana Montes Pedreira <smontes@wirelessgalicia.com>
+ * @author Ignacio Diaz Teijido <ignacio.diaz@comtecsf.es>
  */
 public final class WorkReportConverter {
 
+    private static IBindingOrderElementStrategy bindingStrategy = OneOrderElementPerWorkReportLine
+            .getInstance();
+
     public static WorkReport toEntity(WorkReportDTO workReportDTO)
             throws InstanceNotFoundException {
 
@@ -86,17 +93,8 @@ public final class WorkReportConverter {
             workReport.setDate(DateConverter.toDate(workReportDTO.date));
         }
 
-        if (workReportDTO.orderElement != null) {
-            try {
-                OrderElement orderElement = Registry.getOrderElementDAO()
-                    .findUniqueByCode(workReportDTO.orderElement);
-                workReport.setOrderElement(orderElement);
-            } catch (InstanceNotFoundException e) {
-                workReport.setOrderElement(null);
-                throw new ValidationException(
-                        _("There is no task with this code"));
-            }
-        }
+        bindingStrategy.assignOrderElementsToWorkReportLine(workReport,
+                bindingStrategy.getOrderElementsBound(workReportDTO));
 
         if (workReportDTO.resource != null) {
             try {
@@ -158,17 +156,8 @@ public final class WorkReportConverter {
                     .setDate(DateConverter.toDate(workReportLineDTO.date));
         }
 
-        if (workReportLineDTO.orderElement != null) {
-            try {
-                OrderElement orderElement = Registry.getOrderElementDAO()
-                    .findUniqueByCode(workReportLineDTO.orderElement);
-                workReportLine.setOrderElement(orderElement);
-            } catch (InstanceNotFoundException e) {
-                workReportLine.setOrderElement(null);
-                throw new ValidationException(
-                        _("There is no task with this code"));
-            }
-        }
+        bindingStrategy.assignOrderElementsToWorkReportLine(workReportLine,
+                bindingStrategy.getOrderElementsBound(workReportLineDTO));
 
         if (workReportLineDTO.resource != null) {
             try {
@@ -240,10 +229,8 @@ public final class WorkReportConverter {
             date = DateConverter.toXMLGregorianCalendar(workReport.getDate());
         }
 
-        String orderElementCode = null;
-        if (workReport.getOrderElement() != null) {
-            orderElementCode = workReport.getOrderElement().getCode();
-        }
+        String orderElementCode = bindingStrategy
+                .getOrderElementCodesBound(workReport);
 
         String resourceNif = null;
         if ((workReport.getResource() != null)) {
@@ -294,10 +281,7 @@ public final class WorkReportConverter {
             resource = ((Worker)line.getResource()).getNif();
         }
 
-        String orderElement = null;
-        if(line.getOrderElement() != null){
-            orderElement = line.getOrderElement().getCode();
-        }
+        String orderElement = bindingStrategy.getOrderElementCodesBound(line);
 
         String typeOfWorkHours = null;
         if(line.getTypeOfWorkHours() != null){
diff --git a/navalplanner-webapp/src/main/resources/i18n/ru.po b/navalplanner-webapp/src/main/resources/i18n/ru.po
new file mode 100644
index 000000000..c08669018
--- /dev/null
+++ b/navalplanner-webapp/src/main/resources/i18n/ru.po
@@ -0,0 +1,6713 @@
+# Russian translations for NavalPlan - Webapp module.
+# Copyright (C) 2011 Pavel Rudensky <prudensky@gmail.com>
+# This file is distributed under the same license as the NavalPlan package.
+# Pavel Rudensky <prudensky@gmail.com>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: 1.1.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-05-11 18:16+0200\n"
+"PO-Revision-Date: 2011-08-30 16:43+0400\n"
+"Last-Translator: Pavel Rudensky <prudensky@gmail.com>\n"
+"Language-Team: Russian\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:368
+msgid "The resource cannot be null"
+msgstr "Ресурс не может быть null"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:419
+msgid "criterion codes must be unique inside a criterion type"
+msgstr "Коды критерия должны быть уникальными внутри типа критерия"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationController.java:96
+msgid "No authorizations were added because you did not select any."
+msgstr "Ни одной авторизации не добавлено, потому что Вы ничего не выбрали."
+
+#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:88
+#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:45
+#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:54
+#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:58
+#: navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:71
+msgid "en"
+msgstr "ru"
+
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:188
+msgid "Origin"
+msgstr "Первоисточник"
+
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:165
+msgid "Create exception"
+msgstr "Создать исключение"
+
+#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:45
+msgid "Select report data"
+msgstr "Выбрать отчетную дату"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:399
+msgid "Up to company view"
+msgstr "К просмотру по компании"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:207
+msgid "there exist multiple resource calendars with name {0}"
+msgstr "существует несколько календарей ресурсов с именем {0}"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:60
+msgid "Create Virtual Worker"
+msgstr "Создать Виртуального работника"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:98
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:820
+#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:109
+#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:150
+#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:122
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:99
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:138
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:91
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:119
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:159
+#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:97
+#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:139
+#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:180
+#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:101
+#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:101
+#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:142
+#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:77
+#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:28
+#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:81
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:29
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:44
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:26
+#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:31
+#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:40
+#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:37
+#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:38
+#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:44
+#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:36
+#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:55
+#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:108
+#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:39
+#: navalplanner-webapp/src/main/webapp/materials/materials.zul:61
+#: navalplanner-webapp/src/main/webapp/materials/materials.zul:87
+#: navalplanner-webapp/src/main/webapp/materials/_listUnitTypes.zul:29
+#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:38
+#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:86
+#: navalplanner-webapp/src/main/webapp/calendars/_list.zul:28
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:269
+#: navalplanner-webapp/src/main/webapp/templates/_list.zul:34
+#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:39
+#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:40
+#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:50
+#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:51
+#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:54
+#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:69
+#: navalplanner-webapp/src/main/webapp/scenarios/_list.zul:28
+#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:141
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:50
+#: navalplanner-webapp/src/main/webapp/orders/_list.zul:36
+#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:57
+#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:29
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:50
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:70
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:48
+#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:28
+#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:135
+#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:159
+#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:36
+#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:52
+#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:30
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:231
+#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:35
+msgid "Operations"
+msgstr "Операции"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/costcategories/impl/CostCategoryConverter.java:135
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/costcategories/impl/CostCategoryConverter.java:195
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:150
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:536
+msgid "There is no type of work hours with this code"
+msgstr "Не существует типов рабочих часов с этим кодом"
+
+#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:107
+#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:84
+msgid "Select"
+msgstr "Выбрать"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1356
+msgid "It can not be empty"
+msgstr "Это не может быть пустым"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:315
+#: navalplanner-webapp/src/main/webapp/materials/materials.zul:33
+#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:52
+#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:22
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:66
+#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:98
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:53
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:145
+#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:55
+msgid "Materials"
+msgstr "Материалы"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignCommand.java:360
+msgid "Reassign"
+msgstr "Переназначить"
+
+#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:62
+msgid "Description cannot be null or empty"
+msgstr "Описание не может быть пустым или null"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:79
+msgid "login name not specified"
+msgstr "имя пользователя не указано"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MonteCarloTabCreator.java:79
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MonteCarloTabCreator.java:356
+msgid "MonteCarlo Method"
+msgstr "Метод МонтеКарло"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:292
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:310
+msgid "Project Scheduling"
+msgstr "Планирование проекта"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:42
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:62
+msgid "February"
+msgstr "Февраль"
+
+#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:28
+msgid "Managing fields and labels"
+msgstr "Управление полями и метками"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:356
+msgid "Please, select a calendar"
+msgstr "Пожалуйста, выберите календарь"
+
+#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:29
+msgid "Predefined"
+msgstr "Предопределенный"
+
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:267
+msgid "Summary"
+msgstr "Сводка"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:316
+#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:53
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:67
+msgid "Quality Forms"
+msgstr "Формы качества"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:330
+msgid "Reports"
+msgstr "Отчеты"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:168
+msgid "The {0} sequence prefixes can not be repeated"
+msgstr "{0} последовательность префиксов не может быть повторена"
+
+#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:81
+msgid "Criterion requirements"
+msgstr "Критерий требований"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:97
+msgid "START_NOT_EARLIER_THAN"
+msgstr "Начать не позже чем"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:287
+msgid "Stretch date must not be less than task start date: "
+msgstr "Растягиваемая дата не должна быть меньше чем дата начала задачи:"
+
+#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:66
+msgid "Dedication chart"
+msgstr "График затраченного времени"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:701
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:728
+msgid "Progress that are reported by quality forms can not be modified"
+msgstr "Шкала, информирующая формой качества, не может быть изменена"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:748
+msgid "Not the same hours group, impossible to update"
+msgstr "Нет такой часовой группы, невозможно обновить"
+
+#: navalplanner-webapp/src/main/webapp/common/event_error.zul:43
+#: navalplanner-webapp/src/main/webapp/common/error.zul:48
+msgid "Stacktracke:"
+msgstr "Трассировка стека:"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:520
+msgid "Cannot delete that material because it is assigned to a project."
+msgstr "Невозможно удалить материал, так как он используется в проекте."
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java:141
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java:155
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:275
+msgid "Resource Usage"
+msgstr "Использование ресурсов"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:475
+msgid "Remove limiting resource element"
+msgstr "Удалить предельный ресурс элемента"
+
+#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:39
+msgid "Active period from"
+msgstr "Активный период с"
+
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:52
+msgid "hours type :"
+msgstr "тип часов:"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:481
+msgid "Unassign"
+msgstr "Отменить назначение"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:295
+msgid "Companies"
+msgstr "Компании"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java:505
+msgid "Manual assignment"
+msgstr "Назначить вручную"
+
+#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:73
+msgid "Quality form items list"
+msgstr "Список элементов формы качества"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:218
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:240
+msgid ""
+"End date is not valid, the new end date must be later the current end date"
+msgstr ""
+"Дата окончания не действительна, новая дата должна быть позже текущей даты "
+"окончания"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/NewAllocationSelector.java:51
+msgid "generic workers allocation"
+msgstr "общее распределение работников"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:796
+msgid "Hour start"
+msgstr "Час начала"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:516
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:915
+msgid "The project has no scheduled elements"
+msgstr "Проект не имеет запланированных элементов"
+
+#: navalplanner-webapp/src/main/webapp/planner/main.zul:53
+#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:36
+#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:120
+msgid "Start"
+msgstr "Начало"
+
+#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:34
+msgid "Progress Report"
+msgstr "Отчет о ходе работ"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:119
+msgid "cost assignment's category not specified"
+msgstr "категория стоимости не определена"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeComponent.java:72
+msgid "Delete Template element"
+msgstr "Удалить временный элемент"
+
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:90
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:97
+msgid "Progress Consolidation"
+msgstr "Консолидация хода работ"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/services/DBUserDetailsService.java:66
+msgid "User with login name '{0}': not found"
+msgstr "Пользователь '{0}': не найден"
+
+#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:37
+msgid "Resources capability"
+msgstr "Ресурсы возможностей"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:204
+msgid "The first stretch must be after the first day for doing interpolation"
+msgstr ""
+"Для произведения интерполяции начало нитки должно быть после первого дня"
+
+#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:26
+msgid "Filter quality forms by :"
+msgstr "Фильтр форм качества по:"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:305
+#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:32
+msgid "Transfer Projects Between Scenarios"
+msgstr "Передача Проектов Между Сценариями"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:106
+msgid "changing perspective"
+msgstr "Сменить период отображения"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationController.java:124
+msgid ""
+"Could not add those authorizations to profile {0} because they were already "
+"present."
+msgstr ""
+"Не удается добавить разрешение на профиль {0} , так как такие разрешения уже "
+"предоставлены."
+
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:55
+msgid "Default calendar"
+msgstr "Календарь по умолчанию"
+
+#: navalplanner-webapp/src/main/webapp/users/profiles.zul:23
+msgid "NavalPlan: Profiles"
+msgstr "NavalPlans: Профили"
+
+#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:36
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:74
+msgid "Project Name"
+msgstr "Наименование проекта"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:306
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:931
+msgid "Indent"
+msgstr "Отступ"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignCommand.java:255
+msgid "Reassignation"
+msgstr "Переназначение"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:730
+msgid ""
+"The periods available depend on the satisfaction of the criterions by the "
+"resources and their calendars."
+msgstr ""
+"Периоды доступны в зависимости от удовлетворения критериев на ресурсы и их "
+"календарей."
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTree.java:42
+msgid "New template"
+msgstr "Новый шаблон"
+
+#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:38
+msgid "Total estimated hours"
+msgstr "Итоговый расчет часов"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:130
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:144
+msgid "Base calendar \"{0}\" saved"
+msgstr "Базовый календарь \"{0}\" сохранен"
+
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:174
+msgid "Exceptions list"
+msgstr "Список исключений"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:32
+msgid "Locations"
+msgstr "Местоположения"
+
+#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:76
+msgid "New quality form item"
+msgstr "Новая форма качества из пункта"
+
+#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:41
+msgid "Login name"
+msgstr "Имя пользователя"
+
+#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:43
+msgid "Current"
+msgstr "Текущий"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:632
+msgid "Machine deleted"
+msgstr "Машина удалена"
+
+#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:22
+msgid "NavalPlan: Progress Report"
+msgstr "NavalPlan: Отчет о ходе работ"
+
+#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:67
+msgid "Dependencies"
+msgstr "Зависимости"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:187
+msgid "missing code in a calendar exception"
+msgstr "Отсутствует код в календаре исключений"
+
+#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:78
+msgid "Current selection"
+msgstr "Текущий выбор"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1134
+msgid ""
+"there exist criterion satisfactions referring to criterion types not "
+"applicable to this resource"
+msgstr ""
+"Существующий критерий удовлетворенности, ссылающийся на критерий типа не "
+"применим к данному ресурсу"
+
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:65
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:50
+#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:53
+msgid "Criterion Requirement"
+msgstr "Критерий Требования"
+
+#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:31
+msgid "Show labels"
+msgstr "Показать метки"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/EffortDurationPicker.java:63
+msgid "Minutes"
+msgstr "Минуты"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioModel.java:132
+msgid "You can not remove a scenario with derived scenarios"
+msgstr "Вы не можете удалить сценарии с производными сценариями"
+
+#: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:23
+msgid "Create new version"
+msgstr "Создать новую версию"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/ResourceAllocationBehaviour.java:65
+msgid "LIMITING"
+msgstr "Ограничения"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:324
+msgid "Derived"
+msgstr "Производные"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:414
+msgid "a disabled resource has enabled subresources"
+msgstr "отключенные ресурсы имеют включенные подресурсы"
+
+#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:29
+#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:51
+msgid "Client"
+msgstr "Клиент"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/limiting/allocation/LimitingResourceAllocationModel.java:153
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:614
+msgid ""
+"there are no resources for required criteria: {0}. So the generic allocation "
+"can't be added"
+msgstr ""
+"нет ресурсов удовлетворяющих критерию: {0}. Таким образом общее "
+"распределение не может быть добавлено"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:446
+msgid "Error on showing warning message removing calendar: "
+msgstr "Ошибка на показе предупреждения на удаляемый календарь:"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:428
+msgid "work report has not any description value with this field name"
+msgstr ""
+"рабочий отчет не имеет никаких описательных значений с этим именем поля"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialCategory.java:153
+msgid "material category name has to be unique. It is already used"
+msgstr "наименование категории материалов не уникально. Оно уже используется"
+
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:44
+#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:47
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:109
+msgid "Imputed hours"
+msgstr "Вмененные часы"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:337
+#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:41
+msgid "Project Costs Per Resource"
+msgstr "Стоимость проекта на ресурс"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:530
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:143
+msgid "Confirm deleting this hour cost. Are you sure?"
+msgstr "Принять удаление стоимости часа?"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/milestone/DeleteMilestoneCommand.java:59
+msgid "Delete Milestone"
+msgstr "Удалить Майлстоун"
+
+#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:152
+msgid "default password were not changed"
+msgstr "пароль по умолчанию не изменен"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:48
+msgid "Non-assigned locations"
+msgstr "Не установленное место нахождение"
+
+#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:75
+msgid "Application URI"
+msgstr "URI приложения"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java:418
+msgid ""
+"The {0} is not valid, criterionType overlaps with other "
+"criterionSatisfaction from the same criterionType"
+msgstr ""
+"{0} не является допустимым, тип критерия пересекается с другим типом "
+"удовлетворенности от другого типа критерия."
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:331
+msgid "Work Report Lines"
+msgstr "Строки рабочего отчета"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1466
+msgid "Configure"
+msgstr "Конфигурация"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:44
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:70
+msgid "October"
+msgstr "Октябрь"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:36
+#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:57
+msgid "First name"
+msgstr "Имя"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java:252
+msgid "Could not execute print command"
+msgstr "Невозможно выполнить команду печати"
+
+#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:119
+msgid "Complementary text fields"
+msgstr "Дополнительные текстовые поля"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:125
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:137
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:291
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:141
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:418
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:852
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:199
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:208
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1242
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:181
+msgid "Confirm deleting {0}. Are you sure?"
+msgstr "Принять удаление {0}. Вы уверены?"
+
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:37
+msgid "Work Reports List"
+msgstr "Список рабочих отчетов"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:312
+msgid "Accounts"
+msgstr "Учетные записи"
+
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:85
+msgid "External code"
+msgstr "Внешний код"
+
+#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:47
+msgid "Edit selected task"
+msgstr "Редактировать выделенную задачу"
+
+#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:49
+msgid "View"
+msgstr "Вид"
+
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:88
+#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:39
+#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:38
+msgid "Limiting"
+msgstr "Ограничение"
+
+#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:61
+msgid "Required materials"
+msgstr "Требуемые материалы"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:311
+msgid "Backwards"
+msgstr "Назад"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:629
+msgid "resources per day must be not empty and bigger than zero"
+msgstr "ресурсы на день не должны быть пустыми и больше чем ноль"
+
+#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:68
+#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:78
+msgid "Version"
+msgstr "Версия"
+
+#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:51
+msgid "Apply filtering to resources satisfying required criteria"
+msgstr "Применить фильтрацию на ресурс удовлетворяющий критерию фильтра"
+
+#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:104
+msgid "Up"
+msgstr "Вверх"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:184
+msgid ""
+"CriterionType is not valid, it overlaps other criterionSatisfaction with the "
+"same criterionType"
+msgstr ""
+"Тип критерия не является допустимым, он пересекается с другим критерием "
+"удовлетворения с тем же типом критерия"
+
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:105
+msgid "Types of work hours"
+msgstr "Типы рабочих часов"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:127
+msgid "EAC"
+msgstr "Оценка по завершении"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:143
+msgid ""
+"Its planning is not in the current scene.\n"
+"Should change to any of the following scenarios:\n"
+msgstr ""
+"Это планирование не является текущим.\n"
+"Необходимо изменить на один из следующих сценариев:\n"
+
+#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:37
+msgid "Predecessor"
+msgstr "Предшественник"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/TreeElementOperationsController.java:55
+msgid "Please select a task"
+msgstr "Пожалуйста, выберите задачу"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:189
+msgid "Some stretch has higher or equal values than the previous stretch"
+msgstr ""
+"Некоторые протяжения имеют более высокие или эквивалентные значения, чем "
+"предыдущие протяжения"
+
+#: navalplanner-webapp/src/main/webapp/costcategories/costCategory.zul:23
+msgid "NavalPlan: Cost Categories"
+msgstr "NavalPlan: Категории расходов"
+
+#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:62
+#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:80
+#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:37
+#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:54
+#: navalplanner-webapp/src/main/webapp/planner/montecarlo_function.zul:58
+#: navalplanner-webapp/src/main/webapp/planner/montecarlo_function.zul:75
+#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:60
+msgid "End date"
+msgstr "Дата окончания"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:255
+msgid "missing worker code in the work report"
+msgstr "отсутствует код работника в рабочем отчете"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:142
+msgid ""
+"Value is not valid, the default max value must be greater than the precision "
+"value "
+msgstr ""
+"Значение не действительно, максимальное значение параметра по умолчанию "
+"должно быть больше текущего значения"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:146
+msgid ""
+"You can not remove the company \"{0}\" because is already in use in some "
+"project or in some subcontrated task."
+msgstr "Вы не можете удалить компанию \"{0}\" "
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/Profile.java:88
+msgid "profile name is already being used by another profile"
+msgstr "имя профиля уже используется в другом профиле"
+
+#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:63
+msgid "E-mail"
+msgstr "E-Mail"
+
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:209
+msgid "Prefix:"
+msgstr "Префикс:"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:107
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:110
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/TimeLineRequiredMaterialController.java:112
+msgid "This project has already been added."
+msgstr "Этот проект уже добавлен"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:580
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:320
+#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:39
+#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:32
+#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:36
+msgid "Criteria"
+msgstr "Критерий"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:381
+msgid "The task code cannot be null"
+msgstr "Код задачи не может быть пустым"
+
+#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:138
+msgid "Resource / Criteria"
+msgstr "Ресурс/Критерий"
+
+#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:26
+msgid "User data"
+msgstr "Данные пользователя"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:97
+msgid "Error setting up creation form."
+msgstr "Ошибка установки создания формы."
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:86
+msgid "AS_SOON_AS_POSSIBLE"
+msgstr "ASAP"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:29
+msgid "Add new progress assignment"
+msgstr "Добавить новый ход выполнения работ"
+
+#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:44
+msgid "Lines"
+msgstr "Линии"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:193
+msgid "Error on showing warning message removing workReportType: "
+msgstr "Ошибка просмотра предупреждения workReportType:"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:624
+msgid "Edit Work Report"
+msgstr "Редактировать рабочий отчет"
+
+#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:22
+msgid "Quality Forms List"
+msgstr "Список Форм Качества"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersModel.java:170
+msgid "Project version is the same in source and destination scenarios"
+msgstr "Версия проекта такая же как в источнике и назначении"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:30
+msgid "Personal data"
+msgstr "Персональные данные"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:299
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java:162
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java:158
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java:199
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:200
+msgid "please, select a Criterion"
+msgstr "Пожалуйста, выберите критерии"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:732
+msgid "Calculated progress can not be removed"
+msgstr "Вычисленный ход работ не может быть удален"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:43
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:66
+msgid "June"
+msgstr "Июнь"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationModel.java:127
+msgid "Project does not exist"
+msgstr "Проект не найден"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/entrypoints/EntryPointsHandler.java:143
+msgid "{0} annotation required on {1}"
+msgstr "{0} требуется примечание на {1}"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:1031
+msgid "Modified"
+msgstr "Изменено"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:216
+msgid "Add Criterion"
+msgstr "Добавить Критерий"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioModel.java:126
+msgid "You can not remove the current scenario"
+msgstr "Вы не можете удалить текущий сценарий"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:643
+msgid "format prefix invalid. It cannot be empty or contain whitespaces."
+msgstr ""
+"Ошибка в форме префикса. Он не может быть пустым или содержать пробелы."
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:334
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:89
+msgid "MessagesContainer is needed"
+msgstr "Требуется MessagesContainer"
+
+#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:37
+msgid "Project element code"
+msgstr "Код элемента проекта"
+
+#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:60
+#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:26
+#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:29
+#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:69
+#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:42
+msgid "Ending date"
+msgstr "Дата окончания"
+
+#: navalplanner-webapp/src/main/webapp/templates/_list.zul:21
+msgid "Templates List"
+msgstr "Список Шаблонов"
+
+#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:29
+msgid "Export options"
+msgstr "Опции экспорта"
+
+#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:34
+msgid "Subcontracted Tasks List"
+msgstr "Список задач субподряда"
+
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:229
+msgid "Last value"
+msgstr "Последнее значение"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:705
+msgid "Calculated progress can not be modified"
+msgstr "Вычисленный ход работ не может быть изменен"
+
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:69
+msgid "Statistics log"
+msgstr "Журнал статистики"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:47
+#: navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:40
+#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:51
+msgid "Edit Calendar"
+msgstr "Редактировать календарь"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:339
+#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:41
+msgid "Materials Needs At Date"
+msgstr "Материалы требуемые на дату"
+
+#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:35
+#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:41
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:52
+msgid "Cannot be empty or null"
+msgstr "Не может быть пустым или null"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java:275
+msgid "filtering"
+msgstr "фильтрация"
+
+#: navalplanner-webapp/src/main/webapp/orders/_list.zul:33
+msgid "Total Budget"
+msgstr "Итоговый бюджет"
+
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:53
+msgid "Hierarchy"
+msgstr "Иерархия"
+
+#: navalplanner-webapp/src/main/webapp/costcategories/typeOfWorkHours.zul:23
+msgid "NavalPlan: Work Hours"
+msgstr "NavalPlan: Рабочие часы"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:830
+msgid ""
+"This worker cannot be deleted because it has assignments to projects or "
+"imputed hours"
+msgstr ""
+"Этот работник не может быть удален, потому что он имеет назначения на проект "
+"или часы работы"
+
+#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:22
+#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:26
+msgid "Print configuration"
+msgstr "Конфигурация печати"
+
+#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:27
+msgid "Overload due to other assignments"
+msgstr "Перегрузка из-за других заданий"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:149
+msgid "Time period saved"
+msgstr "Временной период сохранен"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:305
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java:168
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java:164
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java:205
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:206
+msgid "This Criterion has already been added."
+msgstr "Критерий был добавлен."
+
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:215
+msgid "add"
+msgstr "добавить"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/TreeElementOperationsController.java:239
+msgid "Unsaved changes will be lost. Would you like to continue?"
+msgstr "Не сохраненные данные будут потеряны. Вы хотите продолжить?"
+
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:35
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:41
+msgid "Filter work report by :"
+msgstr "Фильтр рабочего отчета по :"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:290
+msgid "Workers"
+msgstr "Работники"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/ResourceAllocationBehaviour.java:40
+msgid "NON_LIMITING"
+msgstr "Нет ограничений"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeModel.java:102
+msgid "Cannot remove {0}, since it is being used by some Exception Day"
+msgstr ""
+"Невозможно удалить {0}, так как оно используется некоторыми днями исключения"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:44
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:68
+msgid "August"
+msgstr "Август"
+
+#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:53
+msgid "Resources matching selected criteria"
+msgstr "Ресурсы соответствующие выбранным критериям"
+
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:52
+msgid "Year"
+msgstr "Год"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/Profile.java:67
+msgid "profile name not specified"
+msgstr "имя пользователя не указано"
+
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:62
+msgid "Date Start"
+msgstr "Дата начала"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1281
+msgid "Value is not valid, the current value must be less than max value"
+msgstr ""
+"Значение не действительно, текущее значение должно быть меньше чем "
+"максимальное значение"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/Type.java:55
+msgid "From Chosen"
+msgstr "Из всех выбранных"
+
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:109
+#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:35
+#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:56
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:67
+msgid "Value"
+msgstr "Значение"
+
+#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:64
+msgid "Hour costs"
+msgstr "Стоимость часа"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:713
+msgid "there are no valid periods for this calendar"
+msgstr "Нет действительных периодов для этого календаря"
+
+#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:76
+#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:52
+msgid "Add role"
+msgstr "Добавить роль"
+
+#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:41
+msgid "Edit Scenario"
+msgstr "Редактировать сценарий"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:643
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1113
+msgid "Exception end date should be greater or equals than start date"
+msgstr ""
+"Ошибка: дата окончания должна быть больше или эквивалентной дате начала"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/subcontract/impl/SubcontractServiceREST.java:274
+msgid "Project from client"
+msgstr "Проект от клиента"
+
+#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:22
+msgid "Progress Types List"
+msgstr "Список типов хода работ"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java:415
+msgid ""
+"The {0} can not be assigned to this resource. Its interval overlaps with "
+"other criterion"
+msgstr ""
+"{0} не может быть назначен на этот ресурс. Его интервал пересекается с "
+"другим критерием."
+
+#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:66
+msgid "Work done until ending date:"
+msgstr "Работа закончилась до наступления конечной даты:"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:132
+msgid "Schedule Performance Index"
+msgstr "Расписать индекс производительности"
+
+#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:139
+msgid "Earlier starting date"
+msgstr "Позже даты начала"
+
+#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:26
+msgid "Type data"
+msgstr "Тип данных"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:313
+msgid "Profiles"
+msgstr "Профили"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:800
+msgid "Hour finish"
+msgstr "Час окончания"
+
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:173
+msgid "Perspectives"
+msgstr "Обзор плана"
+
+#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:40
+msgid "Edit Work Report Type"
+msgstr "Редактировать тип рабочего отчета"
+
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:104
+msgid "Workable time"
+msgstr "Рабочее время"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:240
+msgid "missing code in a subcategory"
+msgstr "отсутствует код в подкатегории"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:544
+msgid "Confirm deleting this cost category. Are you sure?"
+msgstr "Подтверждение удаления категории стоимости. Вы уверены?"
+
+#: navalplanner-webapp/src/main/webapp/planner/editTask.zul:66
+msgid "Non limiting resource allocation"
+msgstr "Не ограниченно распределяемый ресурс"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:191
+msgid "Error removing element: "
+msgstr "Ошибка удаления элемента:"
+
+#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:39
+msgid "Company name"
+msgstr "Наименование компании"
+
+#: navalplanner-webapp/src/main/webapp/planner/editTask.zul:67
+msgid "Limiting resource allocation"
+msgstr "Ограничение занятости ресурсов"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:463
+msgid "Split new assignment"
+msgstr "Разделить новое назначение"
+
+#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:53
+#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:68
+msgid "Pagination"
+msgstr "Нумерация страниц"
+
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:265
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:286
+msgid "Expiry date"
+msgstr "Дата истечения срока действия"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:337
+msgid ""
+"The operation does not perform because the task has progress reports that is "
+"spread associated with this quality form"
+msgstr ""
+"Операция не может быть выполнена, поскольку задача имеющаяся в отчете хода "
+"работ протяжено ассоциирована с этой формой качества"
+
+#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:82
+msgid "Change scenario"
+msgstr "Изменить сценарий"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:344
+msgid ""
+"Deleting this item, it will disable the report progress option. Are you sure?"
+msgstr ""
+"Удаление этого пункта повлечет отключение отчета о ходе работ. Вы уверены?"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/montecarlo/MonteCarloModel.java:84
+#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:69
+msgid "Critical path"
+msgstr "Критическая часть"
+
+#: navalplanner-webapp/src/main/webapp/materials/materials.zul:38
+#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:42
+#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:83
+msgid "Categories"
+msgstr "Категории"
+
+#: navalplanner-webapp/src/main/webapp/common/event_error.zul:39
+#: navalplanner-webapp/src/main/webapp/common/error.zul:44
+msgid "Status code:"
+msgstr "Код статуса:"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java:46
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:181
+msgid "Project Details"
+msgstr "Детали проекта"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:94
+msgid "Create Criterion Type"
+msgstr "Создать тип критерия"
+
+#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:193
+#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:166
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:107
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:182
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:202
+#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:225
+#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:163
+#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:185
+msgid " to go to output directly"
+msgstr "направить сразу в производство"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:167
+msgid "Add new hours group"
+msgstr "Добавить новую часовую группу"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:219
+msgid "Criteria: {0} "
+msgstr "Критерий: {0} "
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:385
+#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:85
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:110
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:45
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:68
+#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:63
+msgid "Percentage"
+msgstr "Проценты"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:136
+msgid "Updated"
+msgstr "Обновлено"
+
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:71
+msgid "Company logo URL"
+msgstr "URL логотипа компании"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineConfigurationController.java:131
+msgid "No worker selected"
+msgstr "Не выбран работник"
+
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:227
+msgid "Number of digits"
+msgstr "Количество цифр"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1651
+msgid "Task not found"
+msgstr "Задача не найдена"
+
+#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:39
+#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:39
+msgid "Total capability"
+msgstr "Итог возможностей"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:684
+msgid "It not could remove the task "
+msgstr "Это не может удалить задачу"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesModel.java:217
+msgid "Problems connecting with client web service"
+msgstr "Проблема соединения с клиентским web сервисом"
+
+#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:21
+msgid "NavalPlan: User access"
+msgstr "NavalPlan: Доступ пользователя"
+
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:154
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:183
+msgid "Exception Type"
+msgstr "Тип исключения"
+
+#: navalplanner-webapp/src/main/webapp/materials/materials.zul:21
+msgid "NavalPlan: Materials"
+msgstr "NavalPlan: Материалы"
+
+#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:22
+msgid "Profiles List"
+msgstr "Список профилей"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsModel.java:278
+msgid "both {0} of category {1} and {2} of category {3} have the same code"
+msgstr "и {0} of category {1} and {2} of category {3} have the same code"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeController.java:236
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:853
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:567
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:896
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:322
+#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:50
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:64
+#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:68
+#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:51
+msgid "Labels"
+msgstr "Метки"
+
+#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:139
+msgid "is not supported for its use with NavalPlan."
+msgstr "не поддерживается для использования в NavalPlan."
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:318
+msgid "Data Types"
+msgstr "Типы данных"
+
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:155
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:68
+msgid "Total hours"
+msgstr "Итого часов"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/TemplateModel.java:343
+msgid "Reassigning {0} projects"
+msgstr "Переназначено {0} проектов"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:84
+msgid "Create Work Hours Type"
+msgstr "Создать тип рабочих часов"
+
+#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:59
+msgid "Filter by task status"
+msgstr "Отфильтровать по статусу задач"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:423
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:533
+msgid "Select date:"
+msgstr "Выбрать дату:"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:636
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1106
+msgid "You should select a end date for the exception"
+msgstr "Вы должны выбрать дату окончания для исключения"
+
+#: navalplanner-webapp/src/main/webapp/common/concurrent_modification.zul:34
+msgid "Please try it again."
+msgstr "Пожалуйста повторите попытку"
+
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:49
+msgid "Company code"
+msgstr "Код компании"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/TwoWaySelector.java:110
+msgid "Unknown attribute '{0}' in class {1}"
+msgstr "Неопределенный атрибут '{0}' в классе {1}"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:714
+msgid "NON LIMITING RESOURCE"
+msgstr "Не ограниченный ресурс"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:22
+msgid "NavalPlan: Workers"
+msgstr "NavalPlan: Работники"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:125
+msgid "as late as possible"
+msgstr "ALAP"
+
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:117
+msgid "Activation periods"
+msgstr "Периоды активации"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:389
+msgid "Passed"
+msgstr "Пройденный"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:88
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:128
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:175
+msgid "already assigned"
+msgstr "уже назначен"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:34
+#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:31
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:155
+#: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:68
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:131
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:119
+msgid "Calendar"
+msgstr "Календарь"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:300
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:99
+msgid "Resources"
+msgstr "Ресурсы"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:31
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:56
+msgid "Read"
+msgstr "Читать"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersModel.java:153
+msgid "Source and destination scenarios should be different"
+msgstr "Исходный сценарий и сценарий назначения должны быть разными "
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:230
+msgid "CriterionType and its criteria saved"
+msgstr "Тип критерия и его критерий записаны"
+
+#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:137
+msgid "The browser you are using"
+msgstr "Браузер который Вы используете"
+
+#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:78
+msgid "scenario"
+msgstr "сценарий"
+
+#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:41
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:248
+#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:30
+#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:29
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:50
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:51
+msgid "to"
+msgstr "к"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:197
+msgid "Error on removing typeOfWorkHours: "
+msgstr "Ошибка удаления типа рабочего времени"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java:112
+msgid "worker's first name not specified"
+msgstr "Имя работника не указано"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:276
+msgid "date not specified"
+msgstr "не указана дата"
+
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:95
+msgid "Select type :"
+msgstr "Выберите тип:"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:259
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:269
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:263
+msgid "Projects Planning"
+msgstr "Планирование проекта"
+
+#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:37
+msgid "Shrink to fit page width"
+msgstr "По ширине страницы"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:67
+msgid "Last name"
+msgstr "Фамилия"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:348
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/Util.java:551
+msgid "Remove"
+msgstr "Переместить"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:254
+msgid "cost category name not specified"
+msgstr "Не указана категория стоимости"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:22
+msgid "NavalPlan: Virtual Workers Groups"
+msgstr "NavalPlan: Виртуальная группа работников"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:131
+msgid "SPI"
+msgstr "SPI"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:245
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:218
+msgid ""
+"Start date is not valid, the new start date must be previous the current "
+"start date"
+msgstr ""
+"Дата начала не верна, новая дата начала должна быть раньше чем текущая дата "
+"начала"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:390
+msgid "the code must be not null or not empty"
+msgstr "Код должен быть не пустым или не null"
+
+#: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:34
+msgid "Create New Project"
+msgstr "Создать новый проект"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1357
+msgid "Stretches list"
+msgstr "Список отрезков"
+
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:187
+msgid "Enable scenarios module"
+msgstr "Включить модуль сценариев"
+
+#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:60
+msgid "Zoom"
+msgstr "Увеличение"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:519
+#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:100
+#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:106
+#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:92
+#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:73
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:88
+#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:45
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:48
+#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:45
+#: navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:41
+#: navalplanner-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:40
+#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:95
+#: navalplanner-webapp/src/main/webapp/materials/materials.zul:117
+#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:39
+#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:130
+#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:46
+#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:52
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:130
+#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:38
+#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:42
+#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:54
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:185
+#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:37
+#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:41
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:211
+#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:38
+#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:41
+#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:135
+#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:80
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:241
+#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:80
+msgid "Save"
+msgstr "Сохранить"
+
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:109
+msgid "Material categories"
+msgstr "Категория материалов"
+
+#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:61
+#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:33
+msgid "Standard Effort"
+msgstr "Стандартная работа"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:133
+msgid "Pending update"
+msgstr "Ожидаемое обновление"
+
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:59
+msgid "End date:"
+msgstr "Дата окончания:"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineConfigurationController.java:160
+msgid "Criterion previously selected"
+msgstr "Ранее выбранные критерии"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:51
+msgid "Users authorization"
+msgstr "Авторизация пользователя"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksModel.java:177
+msgid "Problems connecting with subcontractor web service"
+msgstr "Проблема соединения с web сервисом поставщиком"
+
+#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:44
+msgid "Assigned load"
+msgstr "Назначенная загрузка"
+
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:68
+msgid "Filter by workers"
+msgstr "Фильтр по работникам"
+
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:139
+msgid "End Date"
+msgstr "Дата Окончания"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java:374
+msgid "Some allocations needed"
+msgstr "Требуются распределения"
+
+#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:82
+msgid "Resources Per Day"
+msgstr "Ресурсы в день"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:216
+msgid "ResourceType must be not-null"
+msgstr "Тип ресурса не должен быть null"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:95
+msgid ""
+"Estimated end date for the task (press enter in textbox to open calendar "
+"popup or type in date directly)"
+msgstr ""
+"Предполагаемая дата окончания задачи (нажмите Enter в текстовом поле для "
+"открытия календаря или введите дату)"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:281
+msgid "Expand/Collapse all"
+msgstr "Развернуть/Свернуть все"
+
+#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:32
+msgid "Overload due to current project"
+msgstr "Перегрузка из за текущего проекта"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:867
+msgid "Move down"
+msgstr "Переместить вниз"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java:116
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java:112
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java:137
+msgid "Please, select a project"
+msgstr "Пожалуйста, выберите проект"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:841
+msgid "Name: {0}"
+msgstr "Имя: {0}"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:44
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:69
+msgid "September"
+msgstr "Сентябрь"
+
+#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:27
+msgid "Report structure"
+msgstr "Структура отчета"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:88
+msgid "password not specified"
+msgstr "пароль не установлен"
+
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:59
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:42
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:118
+msgid "General data"
+msgstr "Общие данные"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:126
+msgid "BAC"
+msgstr "BAC"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:399
+msgid "Calculate Number of Hours"
+msgstr "Рассчитать количество часов"
+
+#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:38
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:35
+#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:81
+msgid "Assign"
+msgstr "Назначить"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/criterion/impl/CriterionConverter.java:130
+msgid "missing code in a criterion"
+msgstr "отсутствует код в критерии"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1297
+msgid "Create Template"
+msgstr "Создать шаблон"
+
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:23
+#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:23
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:23
+msgid "NavalPlan: Work Reports"
+msgstr "NavalPlan: Рабочие отчеты"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:115
+msgid "Edit Company"
+msgstr "Редактировать компанию"
+
+#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:67
+#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:60
+msgid "Advanced search"
+msgstr "Расширенный поиск"
+
+#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:86
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:78
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:99
+#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:116
+#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:78
+msgid "Filter by labels"
+msgstr "Отфильтровать по метке"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:672
+msgid ""
+"IMPORTANT: Don't forget to communicate to subcontractor that his contract "
+"has been cancelled"
+msgstr ""
+"ВАЖНО: Не забудьте сообщить субподрядчику, что контракт с ним был прекращен"
+
+#: navalplanner-webapp/src/main/webapp/planner/montecarlo_function.zul:38
+msgid "MonteCarlo chart"
+msgstr "Диаграмма MonteCarlo"
+
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:21
+msgid "NavalPlan: Hours Worked Per Resource"
+msgstr "NavalPlan: Время отработанное работниками"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:126
+msgid "Schedule Variance"
+msgstr "Расписание расхождений"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:410
+msgid "Service does not manage resource of type: {0}"
+msgstr "Сервис не управляет ресурсами типа: {0}"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:185
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:442
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1302
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:604
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:642
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:673
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:191
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:210
+msgid "Warning"
+msgstr "Предупреждение"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:35
+#: navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:30
+msgid "Select parent calendar"
+msgstr "Выбрать родительский календарь"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:96
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:168
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:463
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:526
+msgid "There is no task with this code"
+msgstr "Нет задачи с таким кодом"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:214
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:433
+msgid "The type of hours cannot be null"
+msgstr "Тип часов не может быть null"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:297
+msgid "criterion satisfaction with end date less than start date"
+msgstr "критерий удовлетворенности с конечной датой меньше чем дата начала"
+
+#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:197
+#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:170
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:112
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:186
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:206
+#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:230
+#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:167
+#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:189
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:49
+msgid "Show"
+msgstr "Показать"
+
+#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:58
+msgid "Duration (days)"
+msgstr "Продолжительность (дни)"
+
+#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:71
+msgid "Assignment Type"
+msgstr "Назначение типа"
+
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:22
+#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:22
+#: navalplanner-webapp/src/main/webapp/planner/index.zul:22
+#: navalplanner-webapp/src/main/webapp/planner/main.zul:22
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:22
+#: navalplanner-webapp/src/main/webapp/planner/montecarlo_function.zul:22
+#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:22
+#: navalplanner-webapp/src/main/webapp/planner/resources_use.zul:22
+#: navalplanner-webapp/src/main/webapp/resourceload/resourceload.zul:22
+msgid "NavalPlan: Scheduling"
+msgstr "NavalPlan: Расписание"
+
+#: navalplanner-webapp/src/main/webapp/common/layout/timeout.zul:29
+msgid "Back to log in"
+msgstr "Перейти на форму регистрации в системе"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:481
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:483
+msgid "Error on splitting"
+msgstr "Ошибка разделения"
+
+#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_allocationConfiguration.zul:31
+msgid "Planned start :"
+msgstr "Планируемое начало:"
+
+#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:66
+msgid "Node without children"
+msgstr "Узел без потомка"
+
+#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:47
+msgid "Company"
+msgstr "Компания"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:118
+msgid "There is no label with this code "
+msgstr "Нет метки с таким кодом"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:138
+msgid "Profile saved"
+msgstr "Профиль записан"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:210
+msgid "Task: {0} "
+msgstr "Задача: {0} "
+
+#: navalplanner-webapp/src/main/webapp/planner/editTask.zul:65
+msgid "Task properties"
+msgstr "Свойства задачи"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:75
+msgid "There is no type of work report with this code"
+msgstr "Не существует типов рабочих отчетов с этим кодом"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:56
+msgid "Sum of direct imputed hours"
+msgstr "Сумма обязательных часов"
+
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:28
+#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:35
+msgid "Surname"
+msgstr "Фамилия"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1301
+msgid "You need to select some function to configure"
+msgstr "Необходимо выбрать функцию для конфигурации"
+
+#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:22
+msgid "Exception Day Types List"
+msgstr "Список типов исключенных дней"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:375
+msgid "the name must be not null or not empty"
+msgstr "Имя не должно быть пустым или null"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:393
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:741
+#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:45
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:45
+#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:45
+#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:49
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:111
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:46
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:69
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:77
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:32
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:68
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:131
+#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:67
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:157
+msgid "Date"
+msgstr "Дата"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:363
+msgid "there must be {0} effort instead of {1}"
+msgstr "должно быть {0} работ вместо {1}"
+
+#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:41
+msgid "Add From Template"
+msgstr "Добавить из шаблона"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:603
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:641
+msgid "Assigned resources for this task will be deleted. Are you sure?"
+msgstr "Ресурсы назначенные на эту задачу будут удалены. Вы уверены?"
+
+#: navalplanner-webapp/src/main/webapp/excetiondays/exceptionDays.zul:22
+msgid "NavalPlan: Exception Days"
+msgstr "NavalPlan: Исключенные дни"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:641
+msgid ""
+"format prefix invalid. It cannot be empty or contain '_' or whitespaces."
+msgstr ""
+"формат префикса неверный. Он не может быть пустым, содержать пробелы или "
+"символ '_'"
+
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:45
+msgid "Filter by month"
+msgstr "Фильтр по месяцам"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:361
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:351
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:320
+msgid "The criterion and its type cannot be null"
+msgstr "Критерий и его тип не может быть null"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:526
+msgid "The quality form must have an item with 100% value to report progress"
+msgstr ""
+"Форма качества должна иметь элемент со значением 100% чтобы создать отчет о "
+"ходе работ"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:43
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:67
+msgid "July"
+msgstr "Июль"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:220
+msgid "The code is not valid. There is another unit type with the same code"
+msgstr "Код не действительный. Существует еще один тип единиц с тем-же кодом"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationModel.java:543
+msgid "( max: {0} )"
+msgstr "( макс: {0} )"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:218
+msgid "Error on removing element: "
+msgstr "Ошибка при удалении элемента:"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:42
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:61
+msgid "January"
+msgstr "Январь"
+
+#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:54
+msgid "Select queue"
+msgstr "Выбор очереди"
+
+#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:64
+msgid "Cannot calculate charts for current data"
+msgstr "Не удается вычислить диаграммы для текущих данных"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:582
+msgid "The cost category had already been removed."
+msgstr "Категория стоимости уже удалена."
+
+#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:48
+msgid "Work description"
+msgstr "Описание работы"
+
+#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:59
+#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:63
+msgid "Split assignment"
+msgstr "Назначение разрыва"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioModel.java:118
+msgid "You can not remove the default scenario called \"{0}\""
+msgstr "Вы не можете удалить сценарий по умолчанию называемый \"{0}\""
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationModel.java:572
+msgid "There are not any assigned progress to current task"
+msgstr "Нет присвоенного хода работ на эту задачу"
+
+#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:110
+msgid "Down"
+msgstr "Вниз"
+
+#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:192
+#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:165
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:106
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:181
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:201
+#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:224
+#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:162
+#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:184
+msgid "direct link"
+msgstr "прямая ссылка"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:934
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:30
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementFilterEnum.java:36
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:48
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:89
+msgid "Label"
+msgstr "Метка"
+
+#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:37
+msgid "Create Scenario"
+msgstr "Создать сценарий"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:834
+msgid "Value is not valid, taking into account the current list of HoursGroup"
+msgstr "Значение не является допустимым учитывая текущий список групп часов"
+
+#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:72
+#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:48
+msgid "Association with roles"
+msgstr "Ассоциации с ролями"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:384
+msgid "missing type of work hours in a work report line"
+msgstr "Отсутствует тип рабочих часов в строке рабочего отчета"
+
+#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:30
+msgid "Quality forms"
+msgstr "Формы качества"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:144
+msgid "Hours group"
+msgstr "Группы часов"
+
+#: navalplanner-webapp/src/main/webapp/templates/_list.zul:30
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:96
+msgid "Days from Beginning to Deadline"
+msgstr "Дни от начала до Deadline"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:128
+msgid "Estimate At Completion"
+msgstr "Оценка на завершение"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:421
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:194
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:373
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:200
+msgid "Delete item. Are you sure?"
+msgstr "Удаление элемента. Вы уверены?"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:102
+msgid "cost assignment's start date not specified"
+msgstr "стоимость присваиваемая на дату начала не установлена"
+
+#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:178
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:92
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:167
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:189
+#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:208
+#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:170
+msgid "Output format:"
+msgstr "Выходной формат:"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1030
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:45
+msgid "Direct"
+msgstr "Прямой"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:818
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:189
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:268
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:289
+#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:52
+#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:83
+#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:34
+msgid "Op."
+msgstr "Оп."
+
+#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:44
+msgid "Pessimistic"
+msgstr "Пессимистический"
+
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:55
+#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:55
+msgid "Reference date:"
+msgstr "Указанная дата:"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:471
+msgid "Limiting resource assignation"
+msgstr "Ограниченное ассигнование ресурса"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1235
+msgid ""
+"This progress can not be removed, because it is spread. It is necessary to "
+"select another progress as spread."
+msgstr ""
+"Этот ход работ не может быть удален, так как он протяжен. Необходимо выбрать "
+"другой ход работ как протяжение."
+
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:116
+msgid "Work week"
+msgstr "Рабочая неделя"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:128
+msgid "You will lose the changes. Are you sure?"
+msgstr "Вы потеряете все изменения. Вы уверены?"
+
+#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:28
+#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:45
+msgid "Company ID"
+msgstr "ID Компании"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:192
+msgid "Unit type name cannot be empty"
+msgstr "Наименование единицы не может быть пустым"
+
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:38
+msgid "Entity sequences"
+msgstr "Последовательности сущности"
+
+#: navalplanner-webapp/src/main/webapp/templates/_list.zul:28
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:91
+msgid "Delay from beginning (days)"
+msgstr "Пауза от начала (дней)"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:319
+msgid "Resource cannot be null"
+msgstr "Ресурс не может быть null"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:505
+msgid "Total Hours"
+msgstr "Всего часов"
+
+#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:37
+msgid "Create Progress Type"
+msgstr "Создать тип хода работ"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:129
+msgid "Confirm cancel"
+msgstr "Подтвердить отмену"
+
+#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:62
+msgid "Label list"
+msgstr "Список меток"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:335
+#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:41
+msgid "Work And Progress Per Task"
+msgstr "Работы и ход работ по задаче"
+
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:40
+msgid "WBS (tasks)"
+msgstr "WBS (задачи)"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:690
+msgid "Deleting sequence"
+msgstr "Удаление последовательности"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:133
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:538
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:552
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:150
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:299
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:423
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:860
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:895
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:207
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:262
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1250
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:227
+msgid "Error on showing removing element: "
+msgstr "Ошибка показа удаления элемента:"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:92
+msgid "start not earlier than"
+msgstr "начать не раньше чем"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:130
+msgid "AS_LATE_AS_POSSIBLE"
+msgstr "ALAP"
+
+#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:87
+msgid "Select scenario"
+msgstr "Выбрать сценарий"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:218
+msgid "Create Label Type"
+msgstr "Создать тип метки"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:233
+msgid "missing work report code in a work report"
+msgstr "ожидается код рабочего отчета в рабочем отчете"
+
+#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:36
+msgid "Create Work Report Type"
+msgstr "Создать тип рабочего отчета"
+
+#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:51
+msgid "Criterion requirement"
+msgstr "Критерий требования"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1246
+msgid "Only the last activation period allows to delete end date."
+msgstr "Только последний период активации доступен для удаления даты окончания"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:153
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:329
+msgid "Scheduling saved"
+msgstr "Планирование сохранено"
+
+#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:68
+#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:27
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:171
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:197
+msgid "Add new row"
+msgstr "Добавить новую строку"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:783
+msgid "incorrect initialization of the progress assignment controller."
+msgstr "неверная инициализация хода работ назначенного контролеру"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:488
+msgid "Move"
+msgstr "Переместить"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:224
+msgid "missing code in the resource calendar"
+msgstr "Отсутствует код в календаре ресурсов"
+
+#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:29
+#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:34
+msgid "Overload"
+msgstr "Перегрузка"
+
+#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:30
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:68
+msgid "Assignment log"
+msgstr "Назначение журнала"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:325
+#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:22
+msgid "Work Report Models"
+msgstr "Модели рабочего отчета"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyCaptTimeout.java:45
+msgid "CutycaptTimeout thread exception"
+msgstr "CutycaptTimeout thread exception"
+
+#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:48
+msgid "Date last progress measurement"
+msgstr "Дата последнего измерения хода работ"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeComponent.java:103
+msgid "Deadline (days since beggining project)"
+msgstr "Deadline (дней с момента начала проекта)"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:422
+msgid "number of hours is not properly calculated based on clock"
+msgstr "Количество часов не верно рассчитывается на основе часов"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:385
+msgid ""
+"Calendar cannot be removed because it still has children. Some other "
+"calendar is derived from this one."
+msgstr ""
+"Календарь не может быть удален, так как он имеет потомков. Какие то другие "
+"календари получены при помощи этого."
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:918
+msgid "Value is not valid, the type must be not empty"
+msgstr "Значение не действительно, тип не должен быть пустым"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:444
+msgid "criterion type name is already being used"
+msgstr "Наименование типа критерия уже используется"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:326
+msgid "Task code cannot be null"
+msgstr "Код задачи не может быть null"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationModel.java:570
+msgid "It is not allowed to consolidate progress."
+msgstr "Не допускается для закрепления хода работ."
+
+#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:31
+msgid "Create Task"
+msgstr "Создать задачу"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:98
+msgid "Error setting up creation form for Criterion Type"
+msgstr "Ошибка установки создания формы для типа критерия"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:151
+msgid "Edit Cost Category"
+msgstr "Редактировать категорию стоимости"
+
+#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:27
+msgid "External company"
+msgstr "Внешняя компания"
+
+#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:32
+#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:30
+#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:28
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:44
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:68
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:66
+#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:29
+#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:27
+#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:82
+#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:112
+#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:58
+msgid "Actions"
+msgstr "Действия"
+
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:80
+msgid "Start hour"
+msgstr "Час начала"
+
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:115
+msgid "Exceptions"
+msgstr "Исключения"
+
+#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:32
+msgid "Over assignable"
+msgstr "Превышение назначаемых"
+
+#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:139
+msgid "Assign materials"
+msgstr "Назначить материалы"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/bandboxsearch/BandboxMultipleSearch.java:226
+msgid "format filters are not valid"
+msgstr "формат фильтра не верен"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ExternalCompanyBandboxFinder.java:51
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:29
+#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:37
+#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:72
+msgid "ID"
+msgstr "ID"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:419
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:181
+msgid "The init date cannot be empty"
+msgstr "Начальная дата не может пустой"
+
+#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:28
+msgid "Is administrator"
+msgstr "Является администратором"
+
+#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:88
+msgid "Our company password"
+msgstr "Пароль нашей компании"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:275
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java:134
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java:130
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java:171
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:172
+msgid "This label has already been added."
+msgstr "Эта метка была уже добавлена"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/IntegrationEntityModel.java:79
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceServiceREST.java:179
+msgid "Could not get code, please try again later"
+msgstr "Не удалось получить код, пожалуйста попробуйте позже"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:394
+msgid ""
+"Value is not valid.\n"
+" Code cannot contain chars like '_'."
+msgstr ""
+"Значение является недопустимым.\n"
+"Код не должен содержать символы такие как '_'."
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:625
+msgid "Confirm deleting this machine. Are you sure?"
+msgstr "Принять удаление этой машины. Вы уверены?"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:161
+msgid "Hours Group"
+msgstr "Группы часов"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:915
+msgid "Unallocated name"
+msgstr "Не распределенное имя "
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:888
+msgid "Move up"
+msgstr "Переместить вверх"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:124
+msgid "BCWP"
+msgstr "BCWP"
+
+#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:43
+msgid "Subcontract communication date"
+msgstr "Дата связи с субподрядчиком"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:281
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:129
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:132
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:262
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:354
+msgid "Scheduling"
+msgstr "Планирование"
+
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:126
+msgid "Dependencies have priority"
+msgstr "Зависимости имеющие приоритет"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:206
+msgid "Unlimited"
+msgstr "Неограниченный"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:127
+msgid "Budget At Completion"
+msgstr "Бюджет на завершение"
+
+#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:77
+msgid "Assign Label"
+msgstr "Назначить метку"
+
+#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:74
+msgid "Page up"
+msgstr "Страницу вверх"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:231
+msgid "Create new project"
+msgstr "Создать новый проект"
+
+#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:62
+msgid "Work done from starting date:"
+msgstr "Завершенность работы с даты начала:"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:849
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:31
+#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:50
+#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:53
+#: navalplanner-webapp/src/main/webapp/orders/_list.zul:35
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:159
+msgid "State"
+msgstr "Состояние"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:80
+msgid "Must start after"
+msgstr "Должен начаться после"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1287
+msgid "Confirm change"
+msgstr "Принять изменения"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:865
+msgid "You don't have permissions to edit this project"
+msgstr "Вы не имеете привилегий для редактирования этого проекта"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:104
+msgid "Edit Profile"
+msgstr "Редактировать профиль"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:192
+msgid "missing date in a calendar exception"
+msgstr "Отсутствует дата в календаре исключений"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:213
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:432
+msgid ""
+"Type of hours is empty. Please, create some type of hours before proceeding"
+msgstr ""
+"Тип часов пуст. Пожалуйста, создайте какой нибудь тип часов перед началом "
+"производства."
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:599
+msgid "Exception"
+msgstr "Исключение"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:108
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:180
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:450
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:515
+msgid "There is no resource with this ID"
+msgstr "Не существует ресурсов с этим идентификатором"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksController.java:192
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:196
+msgid "Send"
+msgstr "Послать"
+
+#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:103
+msgid "user"
+msgstr "пользователь"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeModel.java:53
+msgid "New task"
+msgstr "Новая задача"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:125
+msgid "The password for a new user cannot be empty"
+msgstr "Пароль для нового пользователя не может быть пустым"
+
+#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:31
+msgid "Associated user"
+msgstr "Связанный пользователь"
+
+#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:27
+msgid "Type name"
+msgstr "Тип наименования"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:182
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/TimeLineRequiredMaterialController.java:205
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/Type.java:31
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:440
+msgid "All"
+msgstr "Все"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/advances/AdvanceAssignmentPlanningCommand.java:69
+msgid "Progress assignment"
+msgstr "Назначения хода работ"
+
+#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:40
+msgid "Edit Progress Type"
+msgstr "Редактировать тип хода работ"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:459
+msgid "Manual"
+msgstr "Ручной"
+
+#: navalplanner-webapp/src/main/webapp/calendars/_list.zul:22
+msgid "Calendars List"
+msgstr "Список календарей"
+
+#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:27
+msgid "Receipt date"
+msgstr "Дата квитанции об оплате"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:210
+msgid "Cannot be higher than Ending date"
+msgstr "Не может быть больше чем дата окончания"
+
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:292
+msgid "Create activation period"
+msgstr "Создать период активации"
+
+#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:31
+msgid "Personal details"
+msgstr "Личные данные"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:22
+msgid "Workers List"
+msgstr "Список работников"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:355
+msgid "Delete project template. Are you sure?"
+msgstr "Удаление шаблона проекта. Вы уверены?"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1028
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:48
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:214
+msgid "Inherited"
+msgstr "Унаследованный"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:217
+msgid "Criterion must be not-null"
+msgstr "Критерий не должен быть null"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:255
+msgid "Worker"
+msgstr "Работник"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:517
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:595
+msgid ""
+"Cannot allocate selected element. There is not any queue that matches "
+"resource allocation criteria at any interval of time"
+msgstr ""
+"Не могу выбрать выделенный элемент. Нету очередей, которые соответсвуют "
+"критериям распределения ресурсов в любой промежуток времени."
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:161
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:299
+msgid "criterion name not specified"
+msgstr "имя критерия не указано"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:136
+msgid "Value is not valid, the default max value must not be empty "
+msgstr ""
+"Значение не действительно, максимальное значение по умолчанию не должно быть "
+"пустым"
+
+#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:25
+msgid "Manual allocation"
+msgstr "Распределение в ручную"
+
+#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:29
+msgid "External overload"
+msgstr "Внешняя перегрузка"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:33
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:58
+msgid "Authorize"
+msgstr "Санкционировать"
+
+#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:47
+msgid "Recommended allocation"
+msgstr "Рекомендуемое распределение"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:303
+msgid "Scenarios"
+msgstr "Сценарии"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:375
+msgid "Materials saved"
+msgstr "Материалы сохранены"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1249
+msgid ""
+"This progress measurement can not be in current date, because it is "
+"consolidated. it is necessary to select other date."
+msgstr ""
+"Измерение хода работ не может быть в текущую дату, потому что она "
+"закреплена. Необходимо выбрать другую дату."
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java:704
+msgid "Other projects"
+msgstr "Другие проекты"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:164
+msgid "At least one {0} sequence must be active"
+msgstr "По крайней мере одна {0} последовательность должна быть активной"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:42
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:66
+#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:26
+#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:111
+msgid "Profile name"
+msgstr "Имя профиля"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java:248
+msgid "Could open generated PDF"
+msgstr "Удалось открыть сгенеренный PDF"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:107
+msgid "Disable Delete"
+msgstr "Отключить удаление"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersModel.java:144
+msgid "You should select a source scenario"
+msgstr "Вы должны выбрать исходный сценарий"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:159
+msgid "At least one {0} sequence is needed"
+msgstr "По крайней мере одина {0} последовательность необходима"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:336
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:41
+msgid "Estimated/Planned Hours Per Task"
+msgstr "Расчетные/Планируемые часы на каждую задачу"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/TwoWaySelector.java:68
+msgid "Assigned"
+msgstr "Назначенный"
+
+#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:45
+msgid "Details"
+msgstr "Подробнее"
+
+#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:45
+msgid "Communication"
+msgstr "Связь"
+
+#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:35
+msgid "More options"
+msgstr "Дополнительные параметры"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesModel.java:219
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksModel.java:179
+msgid "Error: {0}"
+msgstr "Ошибка: {0}"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:185
+msgid "Company saved"
+msgstr "Компания записана"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/TreeElementOperationsController.java:240
+msgid "Confirm create template"
+msgstr "Подтверждение создания шаблона"
+
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:261
+msgid "Parent"
+msgstr "Родитель"
+
+#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:91
+msgid "Earliest date"
+msgstr "Первый день"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:126
+msgid "Type of work hours saved"
+msgstr "Тип рабочих часов записан"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java:113
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:269
+#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:46
+msgid "Projects"
+msgstr "Проекты"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/converters/ConverterFactory.java:64
+msgid "Not found converter for {0}"
+msgstr "Не найден конвертер для {0}"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:150
+msgid "Create Quality Form"
+msgstr "Создать форму качества"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:103
+msgid "start in fixed date"
+msgstr "Начало в фиксированную дату"
+
+#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:70
+msgid "Material assignments"
+msgstr "Задание материалов"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:45
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:72
+msgid "December"
+msgstr "Декабрь"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:922
+msgid "Text field"
+msgstr "Текстовое поле"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:122
+msgid ""
+"Value is not valid, the Precision value must be less than the defalt max "
+"value."
+msgstr ""
+"Значение не верно, точность значения должна быть меньше чем максимальное "
+"значение по умолчанию "
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:181
+msgid "Question"
+msgstr "Вопрос"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1246
+msgid ""
+"This progress measurement can not be changed or removed, because it is "
+"consolidated. It is needed to remove its consolidation."
+msgstr ""
+"Этот ход работ измерения не может быть изменен или удален, потому что он "
+"связан. Необходимо удалить его связанность."
+
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:222
+msgid "Create new work week"
+msgstr "Создать новую рабочую неделю"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:713
+msgid "LIMITING RESOURCE"
+msgstr "ОГРАНИЧЕННЫЙ РЕСУРС"
+
+#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:43
+msgid "Subcontratation"
+msgstr "Субподряд"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:534
+msgid "{0} cannot be fulfilled"
+msgstr "{0} не может быть выполнен"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:198
+msgid ""
+"The meausure name is not valid. There is another unit type with the same "
+"measure name"
+msgstr ""
+"Наименование единицы измерения не верно. Существует другой тип единиц с "
+"таким же названием."
+
+#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:68
+msgid "Extended view"
+msgstr "Развернутый вид"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:33
+msgid "Work record"
+msgstr "Запись о работе"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:116
+msgid "Error setting up edition form."
+msgstr "Ошибка формы установки издания."
+
+#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:151
+#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:149
+msgid "Output format"
+msgstr "Формат вывода"
+
+#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:44
+msgid "Print"
+msgstr "Печать"
+
+#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:22
+msgid "NavalPlan: Calendars"
+msgstr "NavalPlan: Календари"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:179
+msgid "{0} not found type for criterion "
+msgstr "{0} не нашел тип для критерия"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:412
+msgid "Hours cannot be null"
+msgstr "Часы не могут быть null"
+
+#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:69
+msgid "Page down"
+msgstr "Страницу вниз"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:485
+msgid "resource type does not allow enabled criteria"
+msgstr "Тип ресурса не позволяет включить критерии"
+
+#: navalplanner-webapp/src/main/webapp/common/event_error.zul:22
+#: navalplanner-webapp/src/main/webapp/common/error.zul:21
+msgid "NavalPlan: Runtime Error"
+msgstr "NavalPlan: Runtime Error"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/assigntemplates/TemplateFinderPopup.java:52
+#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:104
+#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:112
+#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:96
+#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:77
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:92
+#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:46
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:49
+#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:101
+#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:41
+#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:136
+#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:49
+#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:55
+#: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:34
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:134
+#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:40
+#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:44
+#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:85
+#: navalplanner-webapp/src/main/webapp/planner/editTask.zul:81
+#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:41
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:72
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:135
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:170
+#: navalplanner-webapp/src/main/webapp/planner/reassign.zul:50
+#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:45
+#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:135
+#: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:81
+#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:141
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:191
+#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:39
+#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:43
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:217
+#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:139
+#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:84
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:243
+#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:99
+#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:86
+msgid "Cancel"
+msgstr "Отменить"
+
+#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:32
+msgid "General user data"
+msgstr "Общие данные пользователя"
+
+#: navalplanner-webapp/src/main/webapp/common/components/schedulingStateToggler.zul:32
+msgid "Unschedule"
+msgstr "Распланировать"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksController.java:201
+msgid "Subcontracted task sent successfully"
+msgstr "Субподрядная задача успешно отправлена"
+
+#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:73
+msgid "Accumulated hours chart"
+msgstr "Накопительный график часов"
+
+#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:22
+msgid "Machines List"
+msgstr "Список машин"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:526
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:661
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:924
+msgid "You don't have read access to this project"
+msgstr "Вы не имеете доступ чтения на это проект"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:130
+msgid "CPI"
+msgstr "CPI"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:180
+msgid ""
+"Disable hierarchy will cause criteria tree to be flattened. Are you sure?"
+msgstr ""
+"Отключение иерархии приведет к спрямлению дерева критериев. Вы уверены?"
+
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:45
+#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:52
+#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:47
+msgid "Dates"
+msgstr "Даты"
+
+#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:29
+#: navalplanner-webapp/src/main/webapp/orders/_splitMaterialAssignmentDlg.zul:38
+#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:28
+msgid "Units"
+msgstr "Единицы"
+
+#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:45
+msgid "Create Calendar"
+msgstr "Создать Календарь"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:185
+msgid "At least one stretch is needed"
+msgstr "По крайней мере одно растяжение необходимо"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:307
+msgid "a day is not valid"
+msgstr "день не действительный"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesCommand.java:61
+msgid "Task Properties"
+msgstr "Свойства Задачи"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:192
+msgid "Cost category saved"
+msgstr "Категория стоимости записана"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:214
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:237
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineConfigurationController.java:229
+msgid ""
+"End date is not valid, the new end date must be greater than the start date"
+msgstr ""
+"Конечная дата не действительна, новая конечная дата должна быть больше чем "
+"дата начала"
+
+#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:27
+#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:33
+msgid "name"
+msgstr "наименование"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:170
+msgid "Progress type saved"
+msgstr "Тип хода работ записан"
+
+#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:72
+msgid "Delete selected task"
+msgstr "Удалить выделенную задачу"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesModel.java:130
+msgid "{0} (max: {1})"
+msgstr "{0} (максимум: {1})"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:459
+msgid "end"
+msgstr "конец"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:63
+msgid "Log"
+msgstr "Журнал действий"
+
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:57
+msgid "Authorizations"
+msgstr "Разрешения"
+
+#: navalplanner-webapp/src/main/webapp/common/event_error.zul:49
+#: navalplanner-webapp/src/main/webapp/common/concurrent_modification.zul:36
+msgid "Continue"
+msgstr "Продолжить"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java:121
+msgid "Edit task {0}"
+msgstr "Редактировать задачу {0}"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:236
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:210
+msgid "Start date cannot be null"
+msgstr "Дата начала не может быть null"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:297
+msgid "Subcontracting"
+msgstr "Субподряд"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:328
+msgid "references"
+msgstr "ссылки"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1284
+msgid "Value is not valid, the Precision value must be exact "
+msgstr "Значение не является допустимым, точность значения должна быть верным"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/GenericAllocationRow.java:55
+msgid "Generic"
+msgstr "Общий"
+
+#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_allocationConfiguration.zul:41
+msgid "Planned workable days :"
+msgstr "Планируемые рабочие дни :"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:36
+msgid "Add criterion requirement"
+msgstr "Добавить критерий требования"
+
+#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:47
+msgid "Default max value"
+msgstr "Максимальное значение по умолчанию"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:880
+msgid ""
+"You can not remove the project \"{0}\" because of any of its tasks are "
+"already in use in some work reports and the project just exists in the "
+"current scenario"
+msgstr ""
+"Вы не можете удалить проект \"{0}\" так как некоторые его задачи "
+"используются в некоторых рабочих отчетах и проект присутствует в текущем "
+"сценарии "
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:86
+msgid "Percentage of estimated budget hours / hours consumed"
+msgstr "Процентная оценка отношения бюджетных часов / потребленных часов"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:498
+msgid "Automatic"
+msgstr "Автоматический"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/CriterionBandboxFinder.java:44
+msgid "Criterion Name"
+msgstr "Наименование критерия"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java:52
+#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:48
+#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:137
+#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:91
+msgid "Task"
+msgstr "Задача"
+
+#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_allocationConfiguration.zul:35
+msgid "Planned end :"
+msgstr "Планируемое окончание:"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:270
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java:128
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java:124
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java:165
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:167
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:85
+msgid "please, select a label"
+msgstr "Пожалуйста, выберите метку"
+
+#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:106
+msgid "Add profile"
+msgstr "Добавить профиль"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/bandboxsearch/BandboxMultipleSearch.java:215
+msgid "filter already exists"
+msgstr "Фильтр уже присутсвует"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:225
+msgid "missing code in a calendar data version"
+msgstr "отсутствует код в данных версии календаря"
+
+#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:40
+#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:27
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:46
+msgid "Criterion name"
+msgstr "Наименование критерия"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:131
+msgid "values are not valid, the values must not be null"
+msgstr "значение не действительно, значение не может быть null"
+
+#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:50
+#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:32
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:78
+msgid "Task name"
+msgstr "Наименование задачи"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:128
+msgid "cost assignment's resource not specified"
+msgstr "стоимость назначенного ресурса не указана"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:126
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java:51
+#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:136
+msgid "Project"
+msgstr "Проект"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/TwoWaySelector.java:79
+msgid "Unassigned"
+msgstr "Нераспределенные"
+
+#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:101
+msgid "Add new criterion requirement"
+msgstr "Добавить новое требования критерия"
+
+#: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:25
+msgid "Select the date from which the new version will be valid"
+msgstr "Выберите дату с которой новая версия будет действительной"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:124
+msgid "Budgeted Cost Work Performed"
+msgstr "Бюджетная стоимость выполненных работ"
+
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:95
+msgid "Work report"
+msgstr "Рабочий отчет"
+
+#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:135
+msgid "Change the password"
+msgstr "Изменить пароль"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesModel.java:302
+msgid "the name must be not empty"
+msgstr "наименование не должно быть пустым"
+
+#: navalplanner-webapp/src/main/webapp/materials/materials.zul:86
+#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:27
+#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:58
+msgid "Disabled"
+msgstr "Отключено"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:350
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:736
+msgid "Earned value"
+msgstr "Освоенный объем"
+
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:216
+msgid "Inherited from parent calendar"
+msgstr "Унаследованный от родительского календаря"
+
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:146
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:184
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:210
+msgid "Normal Effort"
+msgstr "Нормальные Усилия"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/TreeElementOperationsController.java:250
+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 ""
+"Шаблон может быть создан из существующей задачи. Вы пытаетесь создать шаблон "
+"из новой задачи.\n"
+"Пожалуйста сохраните ваш проект перед выполнением действия."
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignCommand.java:137
+msgid "{0} reassignations finished"
+msgstr "{0} переназначения выполнены"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:92
+msgid "Edit Work Hours Type"
+msgstr "Редактировать тип рабочих часов"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/Type.java:43
+msgid "From Today"
+msgstr "от сегодняшнего дня"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:1044
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:1059
+msgid "{0} not supported yet"
+msgstr "{0} пока не поддерживается"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:53
+msgid "New entry"
+msgstr "Новая запись"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java:105
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java:114
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:212
+msgid "Resources Load"
+msgstr "Нагрузка ресурсов"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:216
+msgid "Some sequences to remove not existed"
+msgstr "Некоторые удаляемые последовательности не существуют"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:211
+msgid "Changes have been canceled"
+msgstr "Изменения были отменены"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:266
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:281
+msgid "Machine saved"
+msgstr "Машина сохранена"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:143
+msgid "Create Cost Category"
+msgstr "Создать категорию стоимости"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:43
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:63
+msgid "March"
+msgstr "Март"
+
+#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:104
+msgid "Appropriative allocation"
+msgstr "Присвоенные распределения"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:31
+msgid "Assigned criterion requirements"
+msgstr "Назначенные критерию требования"
+
+#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:127
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:117
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:138
+#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:157
+#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:119
+msgid "Filter by criteria"
+msgstr "Фильтр по критерию"
+
+#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:37
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:43
+msgid "Max value"
+msgstr "Максимальное значение"
+
+#: navalplanner-webapp/src/main/webapp/scenarios/_list.zul:22
+msgid "Scenarios List"
+msgstr "Список сценариев"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:156
+msgid "The name is not valid, the name must not be null "
+msgstr "Наименование не действительно, наименование не должно быть null"
+
+#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:140
+msgid "Hours to allocate"
+msgstr "Часы для выделения"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:115
+msgid "A category must be selected"
+msgstr "Категория должна быть выбрана"
+
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:134
+msgid "Period"
+msgstr "Периуд"
+
+#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:38
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:47
+msgid "Spread"
+msgstr "Распространение"
+
+#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:93
+msgid "Select start date"
+msgstr "Выберите дату начала"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:151
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:153
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:902
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:189
+msgid "Removed {0}"
+msgstr "Удален {0}"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:188
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:214
+msgid "Error on showing warning message removing typeOfWorkHours: "
+msgstr "Ошибка показа предупреждающего сообщения удаления typeOfWorkHours:"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:818
+msgid "Confirm deleting this worker. Are you sure?"
+msgstr "Принять удаление этого работника. Вы уверены?"
+
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:55
+msgid "Start date:"
+msgstr "Дата начала:"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:62
+msgid "Group name"
+msgstr "Наименование группы"
+
+#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:81
+#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:57
+msgid "Role name"
+msgstr "Наименование роли"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:837
+msgid "This worker was already removed by other user"
+msgstr "Этот работник был удален другим пользователем"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:476
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:816
+msgid "h"
+msgstr "час."
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:611
+msgid "Create Work Report"
+msgstr "Создать рабочий отчет"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:116
+msgid "Value is not valid, the precision value must not be empty"
+msgstr "Значение не действительно, точность не должна быть пустой"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:359
+msgid "Workable capacity for this period "
+msgstr "Работающая мощность на этот период"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:218
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/montecarlo/MonteCarloController.java:159
+msgid "Cannot be null or empty"
+msgstr "Не может быть null или пустой"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:190
+msgid "Cannot delete profile: it does not exist anymore"
+msgstr "Не могу удалить профиль: он больше не присутсвует"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:225
+msgid "Edit Machine"
+msgstr "Редактировать машину"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/milestone/AddMilestoneCommand.java:77
+msgid "Add Milestone"
+msgstr "Добавить Майлстоун"
+
+#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:120
+msgid "Assign selected items"
+msgstr "Назначить выбранные элементы"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:438
+msgid "init"
+msgstr "init"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1212
+msgid "Add new progress measurement"
+msgstr "Добавить новую единицу измерения хода выполнения работ"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:528
+msgid "Select for automatic queuing"
+msgstr "Выберите для автоматического создания очереди"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersController.java:192
+msgid "Project {0} transfered"
+msgstr "Проект {0} передан"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:304
+msgid "Scenarios Management"
+msgstr "Управление сценариями"
+
+#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:96
+msgid "Create & Assign"
+msgstr "Создать и назначить"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:141
+msgid "Edit User"
+msgstr "Редактировать пользователя"
+
+#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:55
+msgid "Maximum/minimum of the estimated hours"
+msgstr "Максимальное/минимальное значение расчетных часов"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:754
+msgid "D"
+msgstr "D"
+
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:112
+#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:90
+#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:93
+msgid "Consolidated"
+msgstr "Консолидированный"
+
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:125
+msgid "Work report types"
+msgstr "Типы рабочего отчета"
+
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:182
+msgid "MonteCarlo method"
+msgstr "Метод МонтеКарло"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1058
+msgid "derived exception can not be removed"
+msgstr "производные исключения не могут быть удалены"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:217
+msgid "missing code in a material"
+msgstr "отсутствует код в материале"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:30
+#: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:61
+#: navalplanner-webapp/src/main/webapp/orders/_list.zul:32
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:109
+msgid "Customer"
+msgstr "Заказчик"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:810
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:34
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:86
+msgid "Hours type"
+msgstr "Тип часов"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:156
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:210
+msgid "criterion type name not specified"
+msgstr "наименование типа критерия не указано"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:220
+msgid "Add Exception"
+msgstr "Добавить Исключение"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:405
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:427
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:451
+msgid "cannot be empty"
+msgstr "не может быть пустым"
+
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:121
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:147
+msgid "Heading Fields"
+msgstr "Заголовок поля"
+
+#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:27
+#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:27
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:48
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:49
+msgid "from"
+msgstr "из"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1405
+msgid "Sigmoid function"
+msgstr "Сигмовидная функция"
+
+#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:74
+#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:84
+msgid "Progress type"
+msgstr "Тип хода работ"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:581
+msgid "Task {0} : Project is incompatible type with {1}"
+msgstr "Задача {0} : Проект имеет несовместимый тип с {1}"
+
+#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:35
+msgid "Expand taskgroups"
+msgstr "Развернуть группу задач"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:155
+msgid ""
+"Time period contains non valid data. Ending data must be older than starting "
+"date"
+msgstr ""
+"Временной период содержит не действительную дату. Конечная дата должна быть "
+"позднее чем дата начала"
+
+#: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:42
+msgid "Save Project"
+msgstr "Сохранить проект"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java:318
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java:324
+msgid "Day is not valid"
+msgstr "День не действительный"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:628
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1098
+msgid "You should select a start date for the exception"
+msgstr "Вы должны выбрать начальную дату для исключения"
+
+#: navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:72
+msgid "Help"
+msgstr "Помощь"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:129
+msgid "Variance At Completion"
+msgstr "Отклонения от завершения"
+
+#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:64
+msgid "Exportation options"
+msgstr "Варианты экспорта"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:160
+msgid ""
+"Could not save time period. Time period overlaps with another non-compatible "
+"time period"
+msgstr ""
+"Невозможно записать временной период. Временной период совпадает с другим "
+"несовместимым временным периодом"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:88
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:977
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:493
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:375
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/BaseCalendarBandboxFinder.java:46
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/LabelBandboxFinder.java:52
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ExternalCompanyBandboxFinder.java:51
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ScenarioBandboxFinder.java:46
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/QualityFormBandboxFinder.java:51
+#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:108
+#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:149
+#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:119
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:98
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:137
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:89
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:118
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:158
+#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:94
+#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:138
+#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:179
+#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:98
+#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:100
+#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:141
+#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:27
+#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:41
+#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:74
+#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:26
+#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:50
+#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:51
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:25
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:38
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:41
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:27
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:45
+#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:34
+#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:31
+#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:52
+#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:107
+#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:55
+#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:35
+#: navalplanner-webapp/src/main/webapp/materials/materials.zul:58
+#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:36
+#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:41
+#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:82
+#: navalplanner-webapp/src/main/webapp/calendars/_list.zul:27
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:40
+#: navalplanner-webapp/src/main/webapp/templates/_list.zul:27
+#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:48
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:80
+#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:45
+#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:67
+#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:77
+#: navalplanner-webapp/src/main/webapp/scenarios/_list.zul:27
+#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:31
+#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:50
+#: navalplanner-webapp/src/main/webapp/planner/main.zul:49
+#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:80
+#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:32
+#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:92
+#: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:35
+#: navalplanner-webapp/src/main/webapp/orders/_list.zul:28
+#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:115
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:72
+#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:27
+#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:42
+#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:132
+#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:156
+#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:34
+#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:50
+#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:27
+#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:39
+#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:49
+#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:30
+msgid "Name"
+msgstr "Наименование"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:162
+msgid "Delete task"
+msgstr "Удалить задачу"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/EffortDurationPicker.java:69
+msgid "Seconds"
+msgstr "Секунды"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:108
+msgid "please, select an item"
+msgstr "Пожалуйста, выберите элемент"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:392
+msgid "Time Start cannot be null"
+msgstr "Время начала не должно быть null"
+
+#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:22
+msgid "Companies List"
+msgstr "Список компаний"
+
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:208
+msgid "Day of week"
+msgstr "День недели"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1380
+msgid "Stretches with Interpolation"
+msgstr "Участки с интерполяцией"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:332
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:41
+msgid "Hours Worked Per Resource"
+msgstr "Часы отработанные ресурсом"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/HourCost.java:146
+msgid "The end date cannot be before the init date"
+msgstr "Конечная дата не может быть перед инициирующей датой"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:145
+msgid "cost assignment with end date less than start date"
+msgstr "Стоимость назначения с даты окончания меньше чем с даты начала"
+
+#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:26
+#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:35
+msgid "Category name"
+msgstr "Наименование категории"
+
+#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:63
+msgid "Maximum/minimum of the worked hours"
+msgstr "Максимальное/минимальное значение рабочих часов"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:766
+msgid "Not the same material, impossible to update"
+msgstr "Не тот же материал, невозможно обновить"
+
+#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:21
+msgid "NavalPlan: Work And Progress Per Task"
+msgstr "NavalPlan: Работа и Ход Работ на задачу"
+
+#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:64
+msgid "Main menu"
+msgstr "Главное меню"
+
+#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:22
+msgid "NavalPlan: Progress"
+msgstr "NavalPlan: Ход работ"
+
+#: navalplanner-webapp/src/main/webapp/planner/montecarlo_function.zul:31
+msgid "MonteCarlo"
+msgstr "MonteCarlo"
+
+#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:49
+msgid "Duration"
+msgstr "Продолжительность"
+
+#: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:38
+msgid "Create From Template"
+msgstr "Создать из шаблона"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:381
+msgid "There exists other workReportType with the same name."
+msgstr "Присутствует другой workReportType с тем же наименованием."
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:150
+#: navalplanner-webapp/src/main/webapp/common/components/schedulingStateToggler.zul:29
+msgid "Schedule"
+msgstr "Расписание"
+
+#: navalplanner-webapp/src/main/webapp/common/event_error.zul:35
+#: navalplanner-webapp/src/main/webapp/common/error.zul:40
+msgid "Exception type:"
+msgstr "Тип исключения:"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:164
+msgid "Unexpected: {0}"
+msgstr "Неожиданный: {0}"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:112
+msgid "s"
+msgstr "s"
+
+#: navalplanner-webapp/src/main/webapp/planner/main.zul:61
+#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:50
+msgid "Notes"
+msgstr "Заметки"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioCRUDController.java:224
+msgid "Connect"
+msgstr "Соединение"
+
+#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:21
+msgid "NavalPlan: Units"
+msgstr "NavalPlan: Единицы"
+
+#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:23
+msgid "NavalPlan: Transfer Projects Between Scenarios"
+msgstr "NavalPlan: Передача проектов между сценариями"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:221
+msgid "Allocation: [{0},{1}]"
+msgstr "Распределение: [{0},{1}]"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:194
+msgid "Changes saved"
+msgstr "Изменения записаны"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1282
+msgid "See scheduling"
+msgstr "Просмотр планирования"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationController.java:107
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:338
+msgid "Progress measurements"
+msgstr "Единицы измерения хода работ"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1211
+msgid "Add measure"
+msgstr "Добавить единицу измерения"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:472
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SubcontractCommand.java:52
+#: navalplanner-webapp/src/main/webapp/planner/editTask.zul:68
+msgid "Subcontract"
+msgstr "Субподряд"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:253
+msgid "Work report saved"
+msgstr "Рабочий отчет записан"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:27
+#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:30
+msgid "Relationship"
+msgstr "Отношение"
+
+#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:52
+msgid "Found resources"
+msgstr "Найдено ресурсов"
+
+#: navalplanner-webapp/src/main/webapp/planner/main.zul:57
+#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:41
+#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:121
+msgid "End"
+msgstr "Конец"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1366
+msgid "The date is not valid, the date must be not empty"
+msgstr "Дата не действительна, дата не должна быть пустой"
+
+#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:26
+msgid "User login name"
+msgstr "Регистрационное имя пользователя"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:317
+msgid "Cost Categories"
+msgstr "Категории стоимости"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:312
+msgid "criterion type not specified"
+msgstr "критерий типа не указан"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:43
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:64
+msgid "April"
+msgstr "Апрель"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignController.java:143
+msgid "must be not empty"
+msgstr "не должен быть пустым"
+
+#: navalplanner-webapp/src/main/webapp/externalcompanies/externalcompanies.zul:23
+msgid "NavalPlan: Companies"
+msgstr "NavalPlan: Компании"
+
+#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:22
+msgid "Users List"
+msgstr "Список пользователей"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:27
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:55
+#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:57
+msgid "Task quality forms"
+msgstr "Форма качества задач"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:601
+msgid "Not working day"
+msgstr "Не рабочие дни"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceFilterEnum.java:29
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:135
+msgid "Cost category"
+msgstr "Категория стоимости"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:689
+msgid "It can not be deleted. At least one sequence is necessary."
+msgstr ""
+"Это не может быть удалено. По крайней мере одна последовательность является "
+"необходимой."
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationCommand.java:74
+msgid "Resource allocation"
+msgstr "Распределение ресурсов"
+
+#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:51
+msgid "Amount work"
+msgstr "Объем работы"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:171
+msgid "please, select a quality form"
+msgstr "пожалуйста, выберите форму качества"
+
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:201
+msgid "Select entity:"
+msgstr "Выберите сущность:"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:400
+msgid "Exist other workReportType with the same code."
+msgstr "Присутствует другой workReportType с тем же кодом."
+
+#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:64
+msgid "Unindent selected task"
+msgstr "Расклеймить выбранную задачу"
+
+#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:62
+msgid "Constraint"
+msgstr "Ограничение"
+
+#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:44
+msgid "Customer reference code"
+msgstr "Код связи клиента"
+
+#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:150
+msgid "Add New Label Type Field"
+msgstr "Добавить новую метку типа поля"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeCRUDController.java:155
+msgid "Create Exception Day Type"
+msgstr "Создать тип исключенного дня"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:333
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:41
+msgid "Hours Worked Per Resource In A Month"
+msgstr "Часы отработанные на ресурс в месяц"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:402
+msgid "Time finish cannot be null"
+msgstr "Время окончания не может быть null"
+
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:116
+msgid "Customer reference"
+msgstr "Соотношение с заказчиком"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:145
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:758
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java:461
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:153
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:329
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:517
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:527
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:662
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:741
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:866
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:916
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:925
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:948
+msgid "Information"
+msgstr "Информация"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:947
+msgid "Sorry, you do not have permissions to access this project"
+msgstr "Извините, вы не имеете разрешения для доступа к этому проекту"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java:492
+msgid "END"
+msgstr "КОНЕЦ"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:223
+msgid "Worker saved"
+msgstr "Работник записан"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:261
+msgid "can not pass until the previous item is passed."
+msgstr "не может пройти пока предыдущий пункт не пройден."
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementModel.java:206
+msgid "New hours group "
+msgstr "Новая группа часов"
+
+#: navalplanner-webapp/src/main/webapp/qualityforms/qualityForms.zul:22
+msgid "NavalPlan: Quality Forms"
+msgstr "NavalPlan: Форма качества"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:460
+msgid "Assign element to queue manually"
+msgstr "Назначить элемент в очередь вручную"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:463
+msgid "percentage cannot be duplicated"
+msgstr "процентаж не может быть дублирован"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:216
+msgid "Resource: {0} "
+msgstr "Ресурс: {0} "
+
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:55
+msgid "Edit Template"
+msgstr "Редактировать шаблон"
+
+#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:27
+msgid "Heading"
+msgstr "Заголовок"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:114
+msgid "finish not later than"
+msgstr "закончить не позднее чем"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:324
+msgid "Work Hours"
+msgstr "Рабочие часы"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/externalcompanies/entities/ExternalCompany.java:164
+msgid "Company ID already used. It has to be be unique"
+msgstr "ID компании уже используется. Он должен быть уникальным"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:122
+msgid "There is no material category with this code"
+msgstr "Нет категории материалов с этим кодом"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/montecarlo/MonteCarloController.java:188
+msgid "Percentages should sum 100"
+msgstr "Процентаж в сумме должен давать 100"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:284
+msgid "Could not save machine"
+msgstr "Не могу сохранить машину"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:339
+msgid "The calendar exception type not found"
+msgstr "Календарь типов исключений не найден"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/ResourceEnumConverter.java:81
+msgid "Unable to convert value to {0} type"
+msgstr "Невозможно конвертировать значение в тип {0}"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerModel.java:220
+msgid "Worker must be not-null"
+msgstr "Работник не должен быть null"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1067
+msgid "Some criterion satisfactions overlap in time"
+msgstr "Некоторые критерии удовлетворения перекрываются во времени "
+
+#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:49
+msgid "Value last progress measurement"
+msgstr "Значение последнего измерения хода работ "
+
+#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:43
+msgid "Worker assignments"
+msgstr "Назначения работнику"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeModel.java:147
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeModel.java:174
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:402
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsModel.java:173
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:409
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:431
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java:533
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioModel.java:221
+msgid "{0} already exists"
+msgstr "{0} уже присутсвует"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:314
+msgid "Create Worker"
+msgstr "Создать работника"
+
+#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:38
+msgid "Code "
+msgstr "Код"
+
+#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:52
+msgid "Password confirmation"
+msgstr "Подтверждение пароля"
+
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:88
+msgid "Work Report"
+msgstr "Рабочий отчет"
+
+#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:68
+msgid "Indent selected task"
+msgstr "Отступ выбранной задачи"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:323
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:115
+msgid "Unit Measures"
+msgstr "Единицы измерения"
+
+#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:39
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:63
+msgid "Show progress"
+msgstr "Показать шкалу хода работ"
+
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:140
+msgid "Work"
+msgstr "Работа"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java:459
+msgid ""
+"The task has got progress consolidations. It must delete all consolidations "
+"to change the resource allocation type "
+msgstr ""
+"Задача имеет консолидированный ход работ. Необходимо удалить все "
+"консолидации чтобы изменить тип распределения ресурсов"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:121
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:626
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:403
+msgid "Error"
+msgstr "Ошибка"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:131
+msgid "Cost Performance Index"
+msgstr "Индекс стоимости исполнения"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:182
+msgid ""
+"Criterion is not valid, the criterion overlap other criterionSatisfaction "
+"whith same criterion"
+msgstr ""
+"Критерий не является допустимым, критерий перекрывает другой "
+"criterionSatisfaction с тем же критерием"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:129
+msgid "ETC"
+msgstr "ETC"
+
+#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:104
+msgid "Log out"
+msgstr "Выход из системы"
+
+#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:24
+msgid "Add new configuration unit"
+msgstr "Добавить новую единицу конфигурации"
+
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:37
+msgid "Main preferences"
+msgstr "Главные установки"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:180
+msgid ""
+"Criterion is not valid, it overlaps other criterionSatisfaction with the "
+"same criterion"
+msgstr ""
+"Тип критерия не является допустимым, он пересекается с другим критерием "
+"удовлетворения с тем же типом критерия"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationCommand.java:67
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:82
+msgid "Progress consolidation"
+msgstr "Консолидация хода работ"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:246
+msgid "Label type saved"
+msgstr "Тип метки записан"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:419
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:568
+msgid "missing field name in a description value"
+msgstr "отсутствует имя поля в описании значения"
+
+#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:46
+msgid "Add new worker assignment"
+msgstr "Добавить новое назначение работнику"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:441
+msgid "Show all elements"
+msgstr "Посмотреть все элементы"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignCommand.java:148
+msgid "It couldn't complete all the reassignations"
+msgstr "Невозможно закончить все переназначения"
+
+#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:77
+msgid "Show dependencies:"
+msgstr "Показать зависимости:"
+
+#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:66
+msgid "Limited resource"
+msgstr "Ограниченный ресурс"
+
+#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:27
+msgid "Task Information"
+msgstr "Информация о задаче"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:139
+msgid "Hours Group at "
+msgstr "Часы группы на"
+
+#: navalplanner-webapp/src/main/webapp/common/layout/timeout.zul:27
+msgid "Your session has expired after inactivity period. Please log in again."
+msgstr ""
+"Ваша сессия истекла после периода не активности. Пожалуйста войдите в "
+"систему снова."
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:166
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:191
+msgid "SPREAD"
+msgstr "Протяженность"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:309
+msgid "a day is empty"
+msgstr "день пуст"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:122
+msgid "Budgeted Cost Work Scheduled"
+msgstr "Бюджетная стоимость запланированных работ"
+
+#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:57
+msgid "Name cannot be null or empty"
+msgstr "Наименование не может быть пустым или null"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationController.java:110
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:341
+msgid "Progress measurements: "
+msgstr "Измерения ходя работ:"
+
+#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:32
+msgid "Queue Element Information"
+msgstr "Информация об элементе очереди"
+
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:136
+msgid "Start Date"
+msgstr "Дата начала"
+
+#: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:31
+msgid "Create Order"
+msgstr "Создать заказ"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:22
+msgid "Virtual Workers Groups List"
+msgstr "Список работников виртуальной группы"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:125
+msgid "Cost Variance"
+msgstr "Отклонение стоимости"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:470
+msgid "criterion type does not allow resource hierarchy"
+msgstr "Тип критерия не позволяет иерархию ресурсов"
+
+#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:89
+#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:92
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:150
+msgid "Total"
+msgstr "Итог"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:222
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:99
+msgid "Invalidate"
+msgstr "Аннулировать"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:103
+msgid "Budget hours"
+msgstr "Бюджетные часы"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java:165
+msgid "Edit task: {0}"
+msgstr "Редактировать задачу: {0}"
+
+#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:53
+msgid "Select destination"
+msgstr "Выбрать назначение"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:529
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:269
+msgid "must be greater than the previous date."
+msgstr "должно быть больше предыдущей даты"
+
+#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:22
+msgid "NavalPlan: Advanced allocation"
+msgstr "NavalPlan: Расширенные распределения"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1481
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportModel.java:583
+msgid "Show all"
+msgstr "Показать все"
+
+#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:28
+#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:57
+msgid "Default price"
+msgstr "Стоимость по умолчанию"
+
+#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:38
+msgid "Estimated hours"
+msgstr "Расчетные часы"
+
+#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:116
+msgid "Apply tab changes"
+msgstr "Применить вкладку изменений"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:246
+msgid "passwords don't match"
+msgstr "пароли не совпадают"
+
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:85
+msgid "Day properties"
+msgstr "Свойства дня"
+
+#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:72
+msgid "Hours groups"
+msgstr "Группы часов"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersController.java:183
+msgid "Transfer"
+msgstr "Передача"
+
+#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:22
+msgid "Work Hours Types List"
+msgstr "Список типов рабочих часов"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/milestone/AddMilestoneCommand.java:62
+msgid "new milestone"
+msgstr "новый майлстоун"
+
+#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:47
+msgid "Value last progress reported"
+msgstr "Значение последнего хода работ сообщено"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:299
+msgid "Report Progress"
+msgstr "Отчет обрабатывается"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:154
+msgid "Unit {0} cannot be  removed because it is used in materials"
+msgstr ""
+"Единица {0} не может быть удалена, потому что она используется в материалах"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:126
+msgid "Create User"
+msgstr "Создать пользователя"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:309
+msgid "Schedule from start to deadline"
+msgstr "Расписание с начала до deadline"
+
+#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:50
+#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:52
+#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:54
+msgid "Estimated days"
+msgstr "Расчитано дней"
+
+#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:65
+msgid "Reference date"
+msgstr "Указанная дата"
+
+#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:45
+msgid "Selected node:"
+msgstr "Выбранный узел:"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:74
+msgid "Progress Evolution"
+msgstr "Эволюция хода работ"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:252
+msgid "Create new project from template"
+msgstr "Создать новый проект из шаблона"
+
+#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:21
+msgid "NavalPlan: Task Scheduling Status In Project"
+msgstr "NavalPlan: Статус расписания задач в проекте"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:112
+msgid "Complete, Partially or Not Scheduled. (Drag and drop to move tasks)"
+msgstr ""
+"Полное, частично или не запланировано. (Перетаскивать для перемещения задач)"
+
+#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:88
+msgid "Original"
+msgstr "Первоисточник"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:125
+msgid "CV"
+msgstr "CV"
+
+#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:31
+msgid "Stretches function configuration"
+msgstr "Участки конфигурации функции"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:295
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:309
+msgid "Not indentable"
+msgstr "Без отступа"
+
+#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:69
+msgid "Resource allocation type"
+msgstr "Тип распределения ресурсов"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:491
+#: navalplanner-webapp/src/main/webapp/materials/materials.zul:70
+msgid "List of materials for all categories (select one to filter)"
+msgstr "Список материалов для всех категорий (выберите один фильтр)"
+
+#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:99
+msgid "User disabled"
+msgstr "Пользователь отключен"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:728
+msgid "In the available periods {0} only {1} hours are available."
+msgstr "В доступные периоды {0} только {1} часов доступно."
+
+#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:100
+msgid "Association with profiles"
+msgstr "Ассоциации с профилями"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:627
+msgid "Task {0} : Duplicate code in DB"
+msgstr "Задача {0} : Дублируется код в базе данных"
+
+#: navalplanner-webapp/src/main/webapp/common/event_error.zul:25
+#: navalplanner-webapp/src/main/webapp/common/error.zul:30
+msgid "Message - {0}"
+msgstr "Сообщение - {0}"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java:121
+msgid "worker's surname not specified"
+msgstr "фамилия работника не указана"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:211
+msgid "Error on removing workReportType: "
+msgstr "Ошибка при удалении workReportType: "
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:48
+#: navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:41
+msgid "Save changes"
+msgstr "Сохранить изменения"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceModel.java:192
+msgid "Total dedication"
+msgstr "Итого преданность"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:669
+msgid ""
+"You can not remove the task \"{0}\" because of this or any of its children "
+"are already in use in some work reports"
+msgstr ""
+"Вы не можете удалить задачу \"{0}\" так как она или какой то из ее потомков "
+"уже используют отчеты о работе"
+
+#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:45
+msgid "Select source"
+msgstr "Выберите источник"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:825
+msgid "Worker deleted"
+msgstr "Работник удален"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:727
+msgid "Select entity, please"
+msgstr "Пожалуйста, выберите сущность"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:293
+msgid "Stretch date must not be greater than the task's end date: "
+msgstr "Растягиваемая дата должна быть больше, чем дата окончания задачи:"
+
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:212
+msgid "Number of digits:"
+msgstr "Количество цифр:"
+
+#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:44
+#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:38
+msgid "Subcontratation date"
+msgstr "Дата субподряда"
+
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:93
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:182
+msgid "Day"
+msgstr "День"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:233
+msgid "Edit Label Type"
+msgstr "Редактировать тип метки"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:349
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:911
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1197
+msgid "Please, select an item"
+msgstr "Пожалуйста, выберите элемент"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:180
+msgid "Work report type saved"
+msgstr "Тип рабочего отчета сохранен"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1122
+msgid "Cannot be higher than finish hour"
+msgstr "Не может быть больше чем последний час"
+
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:225
+msgid "Prefix"
+msgstr "Префикс"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeComponent.java:64
+msgid "New Template element"
+msgstr "Новый шаблон элемента"
+
+#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:49
+#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:56
+msgid "Subcontracted code"
+msgstr "Код субподряда"
+
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:21
+msgid "NavalPlan: Hours Worked Per Worker In A Month"
+msgstr "NavalPlan: Рабочих часов на работника в месяц"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:251
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:325
+msgid "The base calendar parent not found"
+msgstr "Родитель базового календаря не найден"
+
+#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:91
+#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:94
+msgid "Non Consolidated"
+msgstr "Не консолидированный"
+
+#: navalplanner-webapp/src/main/webapp/planner/reassign.zul:34
+msgid "Reassigning type"
+msgstr "Переназначение типа"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:295
+msgid "Edit Virtual Workers Group"
+msgstr "Редактировать виртуальную рабочую группу"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:441
+msgid "Edit limiting resource element"
+msgstr "Редактировать элемент ограниченного ресурса"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:381
+#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:83
+#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:134
+#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:157
+msgid "Position"
+msgstr "Позиция"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:862
+msgid "The field name must be unique, not null and not empty"
+msgstr "Наименование поля должно быть уникальным, не null и не пустым"
+
+#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:104
+msgid "Incorrect authentication"
+msgstr "Неверная идентификация"
+
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:112
+msgid "Edit work report"
+msgstr "Редактировать рабочий отчет"
+
+#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:42
+#: navalplanner-webapp/src/main/webapp/planner/editTask.zul:53
+#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:35
+msgid "Edit task"
+msgstr "Редактировать задачу"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/LimitingResourcesTabCreator.java:45
+msgid "Limiting resources (project)"
+msgstr "Ограничение ресурсов (проект)"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1174
+msgid ""
+"Progress measurements that are reported by quality forms can not be removed"
+msgstr ""
+"Единицы измерения хода работ, которые представлены формами качества не могут "
+"быть удалены"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:764
+msgid "A description field of the same name already exists."
+msgstr "Поле описания с тем же наименованием уже присутствует."
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:44
+msgid "Current value"
+msgstr "Текущее значение"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:165
+msgid "Edit Quality Form"
+msgstr "Редактировать форму качества"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:823
+msgid "Duplicate progress assignment for task "
+msgstr "Дублировать назначенный ход работ на задачу"
+
+#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:48
+#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:54
+#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:83
+msgid "Save and Continue"
+msgstr "Записать и продолжить"
+
+#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:46
+msgid "Zoom level"
+msgstr "Уровень приближения"
+
+#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:28
+msgid "Quality form"
+msgstr "Форма качества"
+
+#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:97
+msgid "Go!"
+msgstr "Go!"
+
+#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:26
+msgid "Profile data"
+msgstr "Данные профиля"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeModel.java:271
+msgid "The name of the label is empty."
+msgstr "Наименование метки не может быть пустым"
+
+#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:32
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:31
+msgid "Configuration"
+msgstr "Конфигурация"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeModel.java:99
+msgid "It was not possible load entity. Not found. Id: "
+msgstr "Невозможно загрузить сущность. Не найден ID:"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:569
+msgid "Create Virtual Workers Group"
+msgstr "Создать виртуальную рабочую группу"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:845
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:885
+msgid "Hours invested"
+msgstr "Вложено часов"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:741
+msgid "Project saved"
+msgstr "Проект записан"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:160
+msgid ""
+"The name is not valid, there is another progress type with the same name. "
+msgstr ""
+"Наименование не действительно, другой тип хода работ уже использует это "
+"наименование."
+
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:45
+msgid "task :"
+msgstr "задача :"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:712
+msgid "ALL"
+msgstr "ВСЕ"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:215
+msgid "criterion satisfaction's resource not specified"
+msgstr "критерий удовлетворенности в ресурсах не указан"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:597
+msgid "Derived exception"
+msgstr "Производные исключением"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:291
+msgid "Machines"
+msgstr "Машины"
+
+#: navalplanner-webapp/src/main/webapp/materials/_listUnitTypes.zul:22
+msgid "Unit Measures List"
+msgstr "Список единиц измерения"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:153
+msgid "Couldn't find element: {0}"
+msgstr "Не могу найти элемент {0}"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:222
+msgid "Confirm deleting this profile. Are you sure?"
+msgstr "Подтверждение удаление профиля. Вы уверены?"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersModel.java:148
+msgid "You should select a destination scenario"
+msgstr "Вы должны выбрать сценарий назначения"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:185
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:269
+msgid "unit type code not found"
+msgstr "код типа единицы не найден"
+
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:42
+msgid "Resource :"
+msgstr "Ресурс :"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeCRUDController.java:180
+msgid "Calendar Exception Type saved"
+msgstr "Тип календаря исключений записан"
+
+#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:40
+msgid "Destination scenario"
+msgstr "Сценарий пункта назначения"
+
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:153
+msgid "Company view"
+msgstr "Обзор компании"
+
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:18
+msgid "NavalPlan: Configuration"
+msgstr "NavalPlan: Конфигурация"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:751
+msgid "Not editable for containing more that an hours group."
+msgstr "Не редактируется для сдерживания более чем группу часов."
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:76
+#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:45
+msgid "Limiting resource"
+msgstr "Ограничение ресурса"
+
+#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:25
+msgid "Filter by"
+msgstr "Фильтр по"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/calendar/CalendarAllocationCommand.java:58
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:147
+msgid "Calendar allocation"
+msgstr "Распределение календаря"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:819
+msgid "Duplicate value true report global progress for task"
+msgstr "Дублируется значение true глобального отчета хода работ для задачи"
+
+#: navalplanner-webapp/src/main/webapp/materials/materials.zul:85
+#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:33
+#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:118
+#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:32
+msgid "Category"
+msgstr "Категория"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:154
+msgid "must be greater than finish date"
+msgstr "Должно быть больше чем дата окончания"
+
+#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:21
+msgid "NavalPlan: Materials Needs At Date"
+msgstr "NavalPlan: Материалы требуются к дате"
+
+#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:26
+msgid "Category data"
+msgstr "Категория данных"
+
+#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:79
+msgid "[generic all workers]"
+msgstr "[общие всех работников]"
+
+#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:103
+msgid "Search"
+msgstr "Поиск"
+
+#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:126
+msgid "Add New Complementary Field"
+msgstr "Добавить дополнительные поля"
+
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:229
+msgid "Work weeks list"
+msgstr "Список рабочих недель"
+
+#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:39
+msgid "Source scenario"
+msgstr "Источник сценария"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:118
+msgid "%"
+msgstr "%"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:50
+#: navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:43
+msgid "Remove calendar"
+msgstr "Удалить календарь"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:139
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:648
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:512
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java:256
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java:312
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ProjectDetailsController.java:228
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1347
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:656
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1548
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1712
+msgid "must be lower than finish date"
+msgstr "Должно быть позже чем дата окончания"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:71
+msgid "Total task hours"
+msgstr "Итого часов на задачу"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:757
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceAllocationFilterEnum.java:29
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:33
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:70
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:135
+#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:79
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:161
+msgid "Resource"
+msgstr "Ресурс"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/entrypoints/RedirectorSynthetiser.java:123
+msgid "Could not load any resource"
+msgstr "Не могу загрузить какой нибудь ресурс"
+
+#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:46
+msgid "Date last progress reported"
+msgstr "Дата последнего хода работ сообщена"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:334
+#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:41
+msgid "Work And Progress Per Project"
+msgstr "Работа и ход работ на проект"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerModel.java:383
+msgid ""
+"You must allow multiple active criteria for this type to use this assignment "
+"strategy"
+msgstr ""
+"Вы должны позволить нескольким активным критериям для этого типа "
+"использовать стратегию назначения"
+
+#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:31
+msgid "sub elements"
+msgstr "подэлементы"
+
+#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:158
+msgid "Default Label"
+msgstr "Метка по умолчанию"
+
+#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:108
+#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:85
+#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:188
+msgid "Close"
+msgstr "Закрыть"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java:470
+msgid "Specific Allocations"
+msgstr "Специфические назначения"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioCRUDController.java:271
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/TemplateController.java:126
+msgid "error doing reassignation: {0}"
+msgstr "ошибка переназначения: {0}"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:349
+msgid "Time filter"
+msgstr "Фильтр по времени"
+
+#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:60
+msgid "Move selected task up"
+msgstr "Переместить выбранную задачу вверх"
+
+#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:27
+msgid "Select criteria set or specific resources for allocation"
+msgstr "Выберите набор критериев или специфический ресурс для назначения"
+
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:34
+msgid "Work Report Lines List"
+msgstr "Список строк рабочего отчета"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:316
+msgid "Create copy"
+msgstr "Создать копию"
+
+#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:27
+msgid "Company data"
+msgstr "Данные компании"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:22
+msgid "Criterions Requirement"
+msgstr "Критерии требований"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:215
+msgid "Unit type code cannot be empty"
+msgstr "Код типа единицы не может быть пустым"
+
+#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:47
+msgid "Average of the estimated hours"
+msgstr "Средняя расчетных часов"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:178
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:240
+msgid "Quality form saved"
+msgstr "Форма качества записана"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:167
+msgid "Create Unit Type"
+msgstr "Создать тип единицы"
+
+#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:143
+msgid "Label Type fields"
+msgstr "Поля типа метки"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:311
+msgid "Users"
+msgstr "Пользователи"
+
+#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:103
+msgid "Hours Management"
+msgstr "Управление часами"
+
+#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:32
+msgid "New task:"
+msgstr "Новая задача:"
+
+#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:140
+msgid ""
+"Please use some of the compatible browsers: Chrome, Firefox, Safari or "
+"Epiphany."
+msgstr ""
+"Пожалуйста, используйте совместимые браузеры: Chrome, Firefox, Safari или "
+"Epiphany."
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/NewAllocationSelector.java:94
+msgid "specific allocation"
+msgstr "конкретное распределение"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/externalcompanies/entities/ExternalCompany.java:147
+msgid "company name has to be unique. It is already used"
+msgstr ""
+"Наименование компании должно быть уникальным. Это название уже используется"
+
+#: navalplanner-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 ""
+"Другой пользователь изменил те же данные, поэтому операция не может быть "
+"благополучно завершена."
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:218
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:232
+msgid "Template saved"
+msgstr "Шаблон сохранен"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:577
+msgid "work report have not any description value with this field name"
+msgstr "рабочий отчет не имеет описание значения с этим именем поля"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:172
+msgid "User saved"
+msgstr "Пользователь сохранен"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:47
+msgid "Task quality form name"
+msgstr "Наименование формы качества задачи"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1097
+msgid "Some cost category assignments overlap in time"
+msgstr "Некоторые категории стоимости расходов пересекаются во времени"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:26
+msgid "Imputed hours calculation"
+msgstr "Временный расчет часов"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:119
+msgid "FINISH_NOT_LATER_THAN"
+msgstr "Окончить не позднее чем"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:274
+msgid ": code not found"
+msgstr ": код не найден"
+
+#: navalplanner-webapp/src/main/webapp/common/event_error.zul:51
+#: navalplanner-webapp/src/main/webapp/common/error.zul:55
+msgid "Exit session"
+msgstr "Окончить сессию"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:31
+#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:53
+#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:67
+msgid "Group"
+msgstr "Группа"
+
+#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:29
+#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:27
+#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:56
+#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:62
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:28
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:59
+#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:28
+msgid "Enabled"
+msgstr "Включено"
+
+#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:30
+msgid "Statistics list "
+msgstr "Список статистик"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeCRUDController.java:143
+msgid "Edit Exception Day Type"
+msgstr "Редактировать тип исключенного дня"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/limiting/allocation/LimitingResourceAllocationModel.java:222
+msgid "All resources must be limiting. "
+msgstr "Все ресурсы должны быть ограниченны."
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:327
+msgid "Filter by worker"
+msgstr "Фильтр по работнику"
+
+#: navalplanner-webapp/src/main/webapp/resources/machine/machines.zul:22
+msgid "NavalPlan: Machines"
+msgstr "NavalPlan: Машины"
+
+#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:47
+msgid "Load due to current project"
+msgstr "Нагрузки в связи с текущим проектом"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1286
+msgid "You are going to change the assignment function. Are you sure?"
+msgstr "Вы собираетесь изменить назначенную функцию. Вы уверены?"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:200
+msgid "There must be at least 2 stretches for doing interpolation"
+msgstr "Должно быть не менее 2 участков для производства интерполяции"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:321
+msgid "Exception Days"
+msgstr "Исключенные дни"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:296
+msgid "Incompatible update: stored resource is not of type: {0}"
+msgstr "Несовместимое обновление: сохраненный ресурс не типа {0}"
+
+#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:102
+#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:109
+#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:94
+#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:75
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:90
+#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:114
+#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:98
+#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:40
+#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:133
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:132
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:187
+#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:38
+#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:42
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:213
+#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:39
+#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:42
+#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:137
+#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:82
+msgid "Save & Continue"
+msgstr "Записать и продолжить"
+
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:90
+msgid "Scheduling mode"
+msgstr "режим планирования"
+
+#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:50
+#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:29
+#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:23
+#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:23
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:55
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:53
+msgid "Filter"
+msgstr "Фильтр"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:26
+msgid "Assigned locations"
+msgstr "Назначенные места"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:247
+msgid "Unit type saved"
+msgstr "Тип единицы сохранен"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/CostCategory.java:267
+msgid "Two hour costs with the same type overlap in time"
+msgstr "Стоимость двух часов с тем же типом перекрываются во времени"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:201
+msgid "Create Machine"
+msgstr "Создать Машину"
+
+#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:64
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:49
+msgid "Report progress"
+msgstr "Отчет обрабатывается"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:123
+msgid "ACWP"
+msgstr "ACWP"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:731
+msgid "The periods available depend on the resource's calendar."
+msgstr "Периоды доступны в зависимости от календаря ресурса."
+
+#: navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:55
+msgid "START"
+msgstr "Старт"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:312
+msgid "Schedule from the deadline to start"
+msgstr "Расписание от deadline до начала"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/NewAllocationSelector.java:71
+msgid "generic machines allocation"
+msgstr "общее распределение машин"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:470
+msgid "Non limiting resource assignation"
+msgstr "Распределение не ограниченного ресурса"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:887
+msgid ""
+"Deleting this subcontracted project, you are going to lose the relation to "
+"report progress. Are you sure?"
+msgstr ""
+"Вы потеряете связи с отчетом о ходе работ если удалите проект этого "
+"субподрядчика. Вы уверены?"
+
+#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:75
+#: navalplanner-webapp/src/main/webapp/planner/montecarlo_function.zul:82
+#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:87
+msgid "Back"
+msgstr "Назад"
+
+#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:30
+#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:56
+msgid "Subcontractor"
+msgstr "Субподрядчик"
+
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:41
+msgid "Administration"
+msgstr "Администрирование"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:631
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:495
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java:239
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java:293
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ProjectDetailsController.java:211
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1330
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:638
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1531
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1694
+msgid "must be greater than start date"
+msgstr "должно быть больше даты начала"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:93
+msgid "Create Company"
+msgstr "Создать компанию"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:47
+msgid "Cancel and return"
+msgstr "Отмена и возврат"
+
+#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:34
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:31
+msgid "Assign quality form"
+msgstr "Назначить форму качества"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeCRUDController.java:222
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:387
+msgid "Delete item {0}. Are you sure?"
+msgstr "Удаление элемента {0}. Вы уверены?"
+
+#: navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul:50
+msgid "Unit measure name"
+msgstr "Наименование единицы измерения"
+
+#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:39
+msgid "worked hours"
+msgstr "отработанные часы"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:773
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:144
+msgid "cannot include a progress of the same progress type twice"
+msgstr "невозможно включить ход работ в тот же тип хода работ дважды "
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:489
+msgid "a work report line has not this label type assigned"
+msgstr "Строка рабочего отчета не имеет этой установленной метки"
+
+#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:59
+#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:52
+msgid "Allocations"
+msgstr "Ассигнования"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java:52
+msgid "Task code"
+msgstr "Код задачи"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:85
+#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:35
+msgid "Capacity"
+msgstr "Объем"
+
+#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:50
+#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:133
+msgid "Length"
+msgstr "Длинна"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:299
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioCRUDController.java:178
+msgid "Create derived"
+msgstr "Создать производный"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:590
+msgid "it must be greater than zero"
+msgstr "должно быть больше нуля"
+
+#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:130
+msgid "must be a real positive number"
+msgstr "Должно быть положительным дробным числом"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:111
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:122
+msgid "Total hours task"
+msgstr "Итого часов на задачу"
+
+#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:33
+msgid "No Allocations have been done"
+msgstr "Не все Ассигнования были сделаны"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:409
+msgid "Removed calendar \"{0}\""
+msgstr "Удален календарь \"{0}\""
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1084
+#: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:23
+msgid "Create project"
+msgstr "Создать проект"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:108
+msgid "START_IN_FIXED_DATE"
+msgstr "Начать в фиксированную дату"
+
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:49
+msgid ""
+"Allow multiple values of this type of criterion in the same period of time"
+msgstr ""
+"Разрешить несколько значений этого типа критерия в тот же период времени"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1300
+msgid ""
+"The date is not valid, the date must be unique for this progress assignment"
+msgstr ""
+"Дата не действительна, дата должна быть уникальна для назначения этого ходя "
+"работ"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:113
+msgid "Edit Criterion Type"
+msgstr "Редактировать тип критерия"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:81
+msgid "as soon as possible"
+msgstr "как можно скорее"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:445
+msgid "The code cannot be empty."
+msgstr "Код не может быть пустым"
+
+#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:35
+msgid "Human hours per machine working hour within configuration unit"
+msgstr "Человеко-часы на машинные рабочие часы в конфигурационном блоке"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationController.java:113
+msgid ""
+"Could not add those authorizations to user {0} because they were already "
+"present."
+msgstr ""
+"Не удается добавить разрешение пользователю {0} , так как такие разрешения "
+"уже предоставлены."
+
+#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:47
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:103
+msgid "New work report"
+msgstr "Новый отчет о работе"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:862
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:668
+msgid "yes"
+msgstr "да"
+
+#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:113
+msgid "Select gap"
+msgstr "Выбрать вершину"
+
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:63
+msgid "Date Finish"
+msgstr "Дата Окончания"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:224
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:95
+msgid "Validate"
+msgstr "Проверка"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:143
+msgid "This resource has already been added."
+msgstr "Этот ресурс уже добавлен"
+
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:129
+msgid "Calendar exception types"
+msgstr "Типы исключения в календаре"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:35
+#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:24
+#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:33
+msgid "Cost category assignment"
+msgstr "Назначение категории стоимости"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/costcategories/impl/CostCategoryConverter.java:150
+msgid "missing code in a hour cost"
+msgstr "отсутствует код в стоимости часа"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:806
+msgid "All workers"
+msgstr "Все работники"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:304
+msgid "Label saved"
+msgstr "Метка сохранена"
+
+#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector_combo.zul:25
+msgid "Select criteria or resources"
+msgstr "Выбрать критерий или ресурс"
+
+#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:26
+#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:24
+#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:24
+msgid "Select required criteria set and press filter button"
+msgstr "Выберите необходимый набор критериев и нажмите кнопку фильтра"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:229
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:231
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:233
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:280
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:380
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:135
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:311
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1019
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1280
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:115
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ProjectDetailsController.java:147
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:732
+#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:42
+#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:48
+#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:44
+#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:50
+#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:84
+#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:88
+#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:43
+#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:53
+#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:43
+#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:54
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:44
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:72
+#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:49
+#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:128
+#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:47
+#: navalplanner-webapp/src/main/webapp/materials/materials.zul:93
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:43
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:63
+#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:39
+#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:96
+#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:33
+#: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:37
+#: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:44
+#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:39
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:135
+#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:44
+#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:42
+#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:42
+msgid "cannot be null or empty"
+msgstr "Не может быть null или пустым"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:632
+msgid "Hours Group {0} : Duplicate code in DB"
+msgstr "Группа часов {0} : Повторяющийся код в базе данных"
+
+#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:21
+msgid "NavalPlan: Work And Progress Per Project"
+msgstr "NavalPlan: Работа и Ход Работ на Проекте"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTree.java:43
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTree.java:52
+msgid "New code"
+msgstr "Новый код"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeModel.java:91
+msgid "The progress type cannot be modified"
+msgstr "Тип хода работ не может быть модифицирован"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:412
+msgid "Calculate Resources per Day"
+msgstr "Вычислить ресурсы на день"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:996
+msgid "The index fields and labels must be uniques and consecutives"
+msgstr "Индекс полей и меток должен быть уникальным и последовательным"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:250
+msgid ""
+"Are you sure of changing the resource type? You will lose the criterions "
+"with different resource type."
+msgstr ""
+"Вы уверены в изменении типа ресурса? Вы потеряете критерии с различными "
+"типами ресурса."
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:130
+msgid "Estimate To Complete"
+msgstr "Приблизительный расчет до окончания"
+
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:21
+msgid "NavalPlan: Estimated/Planned Hours Per Task"
+msgstr "NavalPlan: Рассчитанные/Запланированные Часы По Задачам"
+
+#: navalplanner-webapp/src/main/webapp/materials/materials.zul:84
+#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:30
+#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:116
+#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:29
+msgid "Unit type"
+msgstr "Тип единицы"
+
+#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:42
+msgid "Load due to other assignments"
+msgstr "Нагрузка за счет других заданий"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:62
+msgid "Sum of all task leafs imputed hours"
+msgstr "Сумма временных часов всех листьев задач"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:644
+msgid "This machine was already removed by other user"
+msgstr "Эта машина была удалена другим пользователем"
+
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:26
+msgid "Calendar data"
+msgstr "Календарная дата"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:293
+msgid "Work Reports"
+msgstr "Рабочие отчеты"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:173
+msgid "login name is already being used by another user"
+msgstr "Имя пользователя уже используется другим пользователем"
+
+#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:22
+msgid "Cost Categories List"
+msgstr "Список Категорий Стоимости"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/common/IntegrationEntity.java:109
+msgid "code is already used"
+msgstr "код уже используется"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:152
+msgid "Criterion Requirements"
+msgstr "Критерий Требования"
+
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:148
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:185
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:212
+#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:65
+#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:34
+msgid "Extra Effort"
+msgstr "Дополнительные Усилия"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeModel.java:260
+msgid "Already exists other label with the same name"
+msgstr "Уже присутствует метка с таким же именем"
+
+#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:56
+msgid "Move selected task down"
+msgstr "Передвинуть выбранную задачу вниз"
+
+#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:134
+msgid "The admin's account password remains the default one. This is unsecure"
+msgstr ""
+"По прежнему используется пароль администратора по умолчанию. Это не "
+"безопасно."
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:32
+msgid "Customer Reference"
+msgstr "Отношение с заказчиком"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:778
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:134
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:147
+msgid "spread values are not valid, at least one value should be true"
+msgstr ""
+"распространенные значение не действительны, как минимум одно из них должно "
+"быть TRUE"
+
+#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:42
+msgid "Optimistic"
+msgstr "Оптимистический"
+
+#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:89
+msgid "Create and assign label"
+msgstr "Создать и назначить метку"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:125
+msgid "SV"
+msgstr "SV"
+
+#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:83
+msgid "Our company login"
+msgstr "Войти в нашу компанию"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1483
+msgid "Filter work reports"
+msgstr "Фильтр рабочих отчетов"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:395
+msgid ""
+"Default calendar cannot be removed. Please, change the default calendar in "
+"the Configuration window before."
+msgstr ""
+"Календарь по умолчанию не может быть удален. Пожалуйста, вначале измените "
+"календарь по умолчанию в конфигурационном окне"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:842
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:587
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:884
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:319
+#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:49
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:63
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:46
+#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:49
+msgid "Progress"
+msgstr "Ход работ"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:128
+msgid ""
+"This criterion type cannot be deleted because it has assignments to projects "
+"or resources"
+msgstr ""
+"Тип критерия не может быть удален, потому что он присвоен проекту или "
+"ресурсу."
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1221
+msgid "All progress types have already been assigned."
+msgstr "Все типы хода работ уже назначены."
+
+#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:78
+msgid "Price per hour"
+msgstr "Стоимость часа"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:314
+msgid "Calendars"
+msgstr "Календари"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:209
+msgid "Project: {0} "
+msgstr "Проект: {0} "
+
+#: navalplanner-webapp/src/main/webapp/common/page_not_found.zul:21
+msgid "NavalPlan: Page not found"
+msgstr "NavalPlan: Страница не найдена"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:355
+msgid "The date cannot be null"
+msgstr "Дата не может быть null"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:316
+msgid ""
+"Another task in the same branch is already reporting progress for this "
+"quality form"
+msgstr ""
+"Другая задача в том же отделении уже отчиталась о ходе работ по этой форме "
+"качества"
+
+#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:32
+msgid "Show only current satisfied criteria"
+msgstr "Показать только текущие критерии удовлетворенности"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeCRUDController.java:231
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:373
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:393
+msgid "Error on showing delete confirm"
+msgstr "Ошибка показа подтверждения удаления"
+
+#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:92
+msgid "Latest date"
+msgstr "Последняя дата"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:671
+msgid "Sum of all rows"
+msgstr "Сумма всех строк"
+
+#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:88
+msgid "Group by weeks"
+msgstr "Группировка по неделям"
+
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:82
+msgid "Finish hour"
+msgstr "Час окончания"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignCommand.java:199
+msgid "Done {0} of {1}"
+msgstr "Закончено {0} из {1}"
+
+#: navalplanner-webapp/src/main/webapp/users/users.zul:23
+msgid "NavalPlan: Accounts"
+msgstr "NavalPlan: Счета"
+
+#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:23
+msgid "NavalPlan: Scenarios Management"
+msgstr "NavalPlan: Сценарии управления"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:194
+msgid ""
+"Last stretch should have one hundred percent for length and amount of work "
+"percentage"
+msgstr "Последняя растяжка"
+
+#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:45
+#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:100
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:64
+#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:75
+#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:79
+#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:64
+msgid "Filter by projects"
+msgstr "Фильтр по проекту"
+
+#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:32
+msgid "Each worker configuration unit name"
+msgstr "Наименование единицы конфигурации каждого работника"
+
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:23
+msgid "Criteria of selected type "
+msgstr "Критерий выбранного типа"
+
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:43
+#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:42
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:224
+msgid "Active"
+msgstr "Активный"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1258
+msgid "This progress measurement can not be in "
+msgstr "Эта единица измерения хода работ не может быть в"
+
+#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:29
+msgid "Inherited labels"
+msgstr "Унаследованные метки"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1243
+msgid ""
+"This progress can not be changed or removed, because it has got consolidated "
+"progress. It is needed to remove the consolidation on all its progress."
+msgstr ""
+"Ход работ не может быть изменен или удален, потому что он имеет "
+"консолидированный ход работ. Необходимо удалить все консолидированные ходы "
+"работ."
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:292
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:910
+msgid "Unindent"
+msgstr "Расклеймить"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:932
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1390
+msgid "Value is not valid, the current value must be not empty"
+msgstr "Значение не действительно, текущее значение не должно быть пустым"
+
+#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:50
+msgid "Direct labels"
+msgstr "Прямые метки"
+
+#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:92
+msgid "Log in"
+msgstr "Входите"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderBandboxFinder.java:44
+msgid "Project name"
+msgstr "Наименование проекта"
+
+#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:53
+msgid "Precision"
+msgstr "Точность"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:372
+msgid "missing code in a work report line"
+msgstr "отсутствует код в линии рабочего отчета "
+
+#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:22
+msgid "NavalPlan: Subcontracted Tasks"
+msgstr "NavalPlan: Список задач субподряда"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:984
+msgid "Efforts"
+msgstr "Усилия"
+
+#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:41
+msgid "Show all reported hours"
+msgstr "Просмотр всех отчетных часов "
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java:102
+msgid "Projects List"
+msgstr "Список проектов"
+
+#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:52
+#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:44
+#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:45
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:74
+#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:51
+#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:49
+#: navalplanner-webapp/src/main/webapp/materials/materials.zul:60
+#: navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul:44
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:65
+#: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:45
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:80
+#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:58
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:137
+#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:43
+msgid "Generate code"
+msgstr "Генерировать код"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:483
+msgid "The code sequence is already in use and it can not be updated."
+msgstr ""
+"Последовательность кодов уже используется и она не может быть обновлена."
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:110
+msgid "Scheduling state"
+msgstr "Планирование состояния"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:369
+msgid "This template can not be removed because it has applications."
+msgstr "Шаблон не может быть удален, потому что он имеет приложения."
+
+#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:21
+msgid "NavalPlan: Project Costs Per Resource"
+msgstr "NavalPlan: Стоимость проекта на ресурс"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:206
+msgid "criterion satisfaction's criterion not specified"
+msgstr "критерий критерия удовлетворенности не указан"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/montecarlo/MonteCarloController.java:163
+msgid "Number of iterations should be between 1 and "
+msgstr "Число итераций должно быть между 1 и "
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:126
+msgid "Scenarios must be enabled as more elements than master exist"
+msgstr "Сценарии должны включать больше элементов чем существующий мастер"
+
+#: navalplanner-webapp/src/main/webapp/common/event_error.zul:50
+#: navalplanner-webapp/src/main/webapp/common/error.zul:54
+msgid "Reload"
+msgstr "Перезагрузить"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:558
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:614
+msgid "Task {0} : Task group is incompatible type with {1}"
+msgstr "Задача {0} : Группа задачи имеет несовместимый тип с {1}"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:292
+msgid "Virtual Workers Groups"
+msgstr "Виртуальная Рабочая Группа"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:26
+msgid "Profiles authorization"
+msgstr "Профили авторизации"
+
+#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:71
+msgid "Assignation"
+msgstr "Назначение"
+
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:144
+msgid "Planning charts expanded"
+msgstr "Расширенные диаграммы планирования"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:431
+msgid "Not deletable"
+msgstr "Не удаяемое"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignCommand.java:189
+msgid "Doing {0} reassignations"
+msgstr "Производится {0} переназначений"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/common/IntegrationEntity.java:48
+msgid "code not specified"
+msgstr "Код не указан"
+
+#: navalplanner-webapp/src/main/webapp/orders/_list.zul:22
+msgid "Projects list"
+msgstr "Список проектов"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:190
+msgid ""
+"Cannot delete work report type. There are some work reports bound to it."
+msgstr ""
+"Невозможно удалить тип рабочего отчета. Есть некоторые рабочие отчеты "
+"связанные с ним."
+
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:22
+msgid "Criterion Type List"
+msgstr "Список типов критерия"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:737
+msgid "Overall progress"
+msgstr "Общий ход работ"
+
+#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:51
+msgid "Create template from selected task"
+msgstr "Создать шаблон из выделенной задачи"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceModel.java:119
+msgid "All projects"
+msgstr "Все проекты"
+
+#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:47
+#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:79
+msgid "Password"
+msgstr "Пароль"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:89
+#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:36
+msgid "Observations"
+msgstr "Наблюдения"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:963
+msgid "Edit project"
+msgstr "Редактировать проект"
+
+#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:27
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:24
+msgid "Progress assignments"
+msgstr "Назначения хода работ"
+
+#: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:27
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:244
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:263
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:285
+msgid "Valid from"
+msgstr "Действует с"
+
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:59
+msgid "Month"
+msgstr "Месяц"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:206
+msgid "exception date already exists"
+msgstr "исключенная дата уже присутсвует"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesModel.java:308
+msgid "There exists other template with the same name."
+msgstr "Присутствует другой шаблон с тем же именем "
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:863
+msgid "{0} could not be allocated. Cannot allocate more than one resource"
+msgstr ""
+"{0} не может быть назначена. Невозможно назначить более чем один ресурс"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:758
+msgid "Advanced assignment saved"
+msgstr "Расширенное назначение сохранено"
+
+#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:55
+#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:31
+msgid "Color"
+msgstr "Цвет"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:366
+msgid "Cannot insert material in general view. Please, select a category"
+msgstr ""
+"Невозможно вставить материал в общем виде. Пожалуйста, выберите категорию"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:193
+msgid "criterion satisfaction's start date not specified"
+msgstr "Начальная дата критерия удовлетворенности не установлена"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:371
+msgid "Only {0} resources per day were achieved for current allocation"
+msgstr "Только {0} ресурсы в день  были достигнуты для текущего распределения"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/assigntemplates/TemplateFinderPopup.java:51
+#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:83
+#: navalplanner-webapp/src/main/webapp/planner/editTask.zul:79
+#: navalplanner-webapp/src/main/webapp/planner/main.zul:66
+#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:39
+#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:43
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:69
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:132
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:167
+#: navalplanner-webapp/src/main/webapp/planner/reassign.zul:48
+#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:133
+#: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:79
+#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:97
+msgid "Accept"
+msgstr "Принять"
+
+#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:79
+msgid "Example: {0}"
+msgstr "Пример: {0}"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:283
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:303
+#: navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:40
+msgid "Edit Worker"
+msgstr "Редактировать работника"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:458
+msgid ""
+"Create new material assignment out of material assignment {0}. Are you sure?"
+msgstr ""
+"Создать новое назначение материала, из материала назначения {0}. Вы уверены?"
+
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:167
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:193
+msgid "Work report lines"
+msgstr "Строки рабочего отчета"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:48
+msgid "Calculated"
+msgstr "Рассчитано"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:118
+msgid "Error setting up edition form for Criterion Type with id: {0}"
+msgstr "Ошибка установки формы издания для типа критерия с ID: {0}"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:211
+msgid "Completed: {0}% "
+msgstr "Завершено: {0}% "
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1178
+msgid "Calculated progress measurement can not be removed"
+msgstr "Вычисленная единица измерения хода работы не может быть удалена"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/AssignedCriterionsModel.java:335
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/AssignedCriterionsModel.java:341
+msgid " The "
+msgstr "!The"
+
+#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:51
+msgid "Access to the system"
+msgstr "Доступ к системе"
+
+#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:190
+#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:163
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:104
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:179
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:199
+#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:222
+#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:160
+#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:182
+msgid "Click on "
+msgstr "Нажмите на "
+
+#: navalplanner-webapp/src/main/webapp/planner/montecarlo_function.zul:61
+msgid "Probability"
+msgstr "Вероятность"
+
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:115
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:112
+msgid "Report data"
+msgstr "Данные отчета"
+
+#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:44
+msgid "External load"
+msgstr "Внешняя загрузка"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:204
+msgid "Progress sent successfully"
+msgstr "Ход работ послан успешно"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/InstanceNotFoundRecoverableErrorException.java:46
+msgid "instance not found"
+msgstr "партия не найдена"
+
+#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:73
+msgid "Priority"
+msgstr "Приоритет"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:207
+#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:69
+msgid "Infinitely Over Assignable"
+msgstr "Бесконечно Над Назначаемыми"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:425
+msgid "criterion names must be unique inside a criterion type"
+msgstr "наименования критерия должно быть уникально внутри типа критерия"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:79
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:814
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:31
+#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:120
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:90
+#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:95
+#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:99
+#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:47
+#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:76
+#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:27
+#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:26
+#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:39
+#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:76
+#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:39
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:26
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:69
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:42
+#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:38
+#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:46
+#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:44
+#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:37
+#: navalplanner-webapp/src/main/webapp/materials/materials.zul:59
+#: navalplanner-webapp/src/main/webapp/materials/materials.zul:81
+#: navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul:36
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:59
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:186
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:287
+#: navalplanner-webapp/src/main/webapp/templates/_list.zul:26
+#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:28
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:85
+#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:66
+#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:76
+#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:49
+#: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:40
+#: navalplanner-webapp/src/main/webapp/orders/_list.zul:29
+#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:114
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:76
+#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:26
+#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:52
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:65
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:132
+#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:37
+msgid "Code"
+msgstr "Код"
+
+#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:41
+msgid "Add stretch"
+msgstr "Добавить протяжение"
+
+#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:70
+msgid "Assignation type"
+msgstr "Тип назначения"
+
+#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:33
+msgid "Show resource assignments"
+msgstr "Показать задачи ресурса"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:241
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:214
+msgid ""
+"Start date is not valid, the new start date must be lower than the end date"
+msgstr ""
+"Дата начала не действительна, новая начальная дата должна быть меньше чем "
+"дата окончания"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:387
+msgid "Calculate Workable Days"
+msgstr "Рассчитать рабочие дни"
+
+#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:121
+#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:96
+#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:57
+#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:100
+#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:53
+#: navalplanner-webapp/src/main/webapp/planner/montecarlo_function.zul:55
+msgid "Start date"
+msgstr "Дата начала"
+
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:168
+msgid "Update exception"
+msgstr "Обновить исключение"
+
+#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:52
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:138
+msgid "Budget"
+msgstr "Бюджет"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/TreeElementOperationsController.java:253
+msgid "Operation cannot be done"
+msgstr "Операция не может быть завершена"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeModel.java:330
+msgid "Already exists other criterion with the same name"
+msgstr "Уже присутствует критерий с таким же именем"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:43
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:65
+msgid "May"
+msgstr "Май"
+
+#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:37
+msgid "Unit name"
+msgstr "Наименование единицы"
+
+#: navalplanner-webapp/src/main/webapp/labels/labelTypes.zul:21
+msgid "NavalPlan: Labels"
+msgstr "NavalPlan: Метки"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java:51
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderBandboxFinder.java:44
+#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:35
+#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:43
+#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:48
+msgid "Project code"
+msgstr "Код проекта"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:32
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:57
+msgid "Write"
+msgstr "Запись"
+
+#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:39
+msgid "Number of applications"
+msgstr "Количество приложений"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:499
+msgid "Assign element to queue automatically"
+msgstr "Назначить элемент в очередь автоматически"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:82
+msgid ""
+"Date which the task must start after (press enter in textbox to open "
+"calendar popup or type in date directly)"
+msgstr ""
+"Дата после которой задача должна начаться (нажмите ввод в текстовом поле для "
+"открытия ниспадающего календаря или введите дату вручную)"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:326
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:604
+#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:43
+msgid "Normal"
+msgstr "Нормальный"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:312
+msgid "Date cannot be null"
+msgstr "Дата не может быть null"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:765
+#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:49
+#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:68
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:76
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:142
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:169
+msgid "Task Code"
+msgstr "Код Задачи"
+
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:157
+msgid "Project view"
+msgstr "Просмотр проекта"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:96
+msgid "Create Profile"
+msgstr "Создать Профиль"
+
+#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:51
+#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:53
+#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:55
+msgid "Probability %"
+msgstr "Вероятность %"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:747
+msgid "This label type already is assigned to the work report type."
+msgstr "Этот тип метки уже назначен на тип рабочего отчета."
+
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:28
+#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:27
+msgid "New criterion"
+msgstr "Новый критерий"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:349
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:735
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:542
+#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:49
+msgid "Load"
+msgstr "Загрузка"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:889
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:65
+#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:60
+#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:36
+#: navalplanner-webapp/src/main/webapp/materials/materials.zul:82
+#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:37
+#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:47
+#: navalplanner-webapp/src/main/webapp/templates/_list.zul:32
+#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:51
+#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:41
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:120
+#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:59
+msgid "Description"
+msgstr "Описание"
+
+#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:24
+msgid "NavalPlan: Criteria"
+msgstr "NavalPlan: Критерий"
+
+#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:117
+msgid "Go to advanced Allocation"
+msgstr "Перейти к расширенным назначениям"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:283
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:287
+msgid "Project Templates"
+msgstr "Шаблон проекта"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:623
+msgid "already exists an allocation for criteria {0}"
+msgstr "для критерия {0} назначение уже присутсвует"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:309
+msgid "Forward"
+msgstr "Вперед"
+
+#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:43
+msgid "Number of finished applications"
+msgstr "Количество законченных приложений"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:465
+msgid "Invalid queue element"
+msgstr "Неверный элемент очереди"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java:575
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java:584
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java:592
+msgid "Unnasigned"
+msgstr "Нераспределенный"
+
+#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:61
+#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:70
+msgid "User"
+msgstr "Пользователь"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:403
+msgid "At least one HoursGroup is needed"
+msgstr "По крайней мере одно группа часов необходима"
+
+#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:69
+msgid "Interacts with applications"
+msgstr "Взаимодействие с приложениями"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:257
+msgid "Virtual worker"
+msgstr "Виртуальный работник"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:343
+msgid "Length percentage should be between 0 and 100"
+msgstr "Длина процентажа должна быть между 0 и 100"
+
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:48
+msgid "Multiple values per resource"
+msgstr "Несколько значений на ресурс"
+
+#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:35
+msgid "Hours:"
+msgstr "Часы:"
+
+#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:58
+#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:62
+msgid "Split"
+msgstr "Разрыв"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:101
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:105
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/TimeLineRequiredMaterialController.java:106
+msgid "please, select a project"
+msgstr "Пожалуйста, выберите проект"
+
+#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:118
+msgid "Supported Chrome, Firefox, Safari and Epiphany browsers"
+msgstr "Поддерживаются Chrome, Firefox, Safari и Epiphany браузеры"
+
+#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:55
+#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:25
+#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:28
+#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:33
+#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:68
+#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:41
+#: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:50
+#: navalplanner-webapp/src/main/webapp/orders/_list.zul:30
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:94
+#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:45
+msgid "Starting date"
+msgstr "Дата начала"
+
+#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:64
+msgid "Add materials"
+msgstr "Добавить материалы"
+
+#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:34
+msgid "Load 100%"
+msgstr "Загрузка 100%"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:990
+msgid "Function"
+msgstr "Функция"
+
+#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:168
+#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:141
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:82
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:157
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:179
+#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:198
+#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:139
+#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:160
+msgid "Format"
+msgstr "Формат"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:541
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:606
+msgid "New project version"
+msgstr "Новая версия проекта"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:332
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeController.java:77
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:474
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1250
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:472
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/Util.java:532
+#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:44
+#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:37
+#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:42
+#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:37
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:40
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:27
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:33
+#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:42
+#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:47
+#: navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul:24
+#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:47
+#: navalplanner-webapp/src/main/webapp/templates/_list.zul:48
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:104
+#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:37
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:78
+#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:25
+#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:39
+#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:35
+#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:25
+#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:49
+msgid "Edit"
+msgstr "Редактировать"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:174
+msgid "Edit Unit Type"
+msgstr "Редактировать тип единицы"
+
+#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:79
+#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:36
+msgid "Init date"
+msgstr "Дата инициализации"
+
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:104
+msgid "Responsible"
+msgstr "Ответственный"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:457
+msgid "percentage must be in range (0,100]"
+msgstr "Процентаж должен быть в диапазоне (0; 100]"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTree.java:44
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTree.java:53
+msgid "New Description"
+msgstr "Новое Описание"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1154
+msgid ""
+"resources cost category assignment codes must be unique inside a resource"
+msgstr ""
+"код назначенный стоимости категории ресурса должен быть уникальным внутри "
+"ресурса "
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksController.java:160
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:164
+msgid "XML"
+msgstr "XML"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:187
+msgid ""
+"CriterionType is not valid, the criterionType overlap other "
+"criterionSatisfaction whith same criterionType"
+msgstr ""
+"Тип критерия не является допустимым, тип критерия перекрывает другой "
+"criterionSatisfaction с тем же типом критерия"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/ResourceEnumConverter.java:61
+msgid "Unable to convert {0} value to {1} type"
+msgstr "Невозможно конвертировать значение {0} в тип {1}"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:198
+msgid "Tree {0} sucessfully flattened"
+msgstr "Дерево {0} успешно спрямлено"
+
+#: navalplanner-webapp/src/main/webapp/materials/materials.zul:83
+#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:31
+#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:117
+#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:30
+msgid "Unit price"
+msgstr "Цена единицы"
+
+#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:46
+msgid "Communication date"
+msgstr "Дата связи"
+
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:68
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:72
+msgid "Project Code"
+msgstr "Код проекта"
+
+#: navalplanner-webapp/src/main/webapp/planner/reassign.zul:30
+msgid "Reassigning"
+msgstr "Переназначение"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:588
+msgid ""
+"Cannot delete that cost category because there are resources assigned to it."
+msgstr ""
+"Невозможно удалить эту категорию стоимости, потому что на нее назначен ресурс"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:596
+msgid "{0} already assigned to resource allocation list"
+msgstr "{0} назначена на список назначений ресурса"
+
+#: navalplanner-webapp/src/main/webapp/materials/_listUnitTypes.zul:27
+msgid "Unit Measure"
+msgstr "Единица измерения"
+
+#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:22
+msgid "Label Types List"
+msgstr "Список типов меток"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/TemplateModel.java:347
+msgid "{0} projects reassignation remaining"
+msgstr "{0} проектов осталось переназначить"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/LabelBandboxFinder.java:52
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/CriterionBandboxFinder.java:44
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/QualityFormBandboxFinder.java:51
+#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:107
+#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:148
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:97
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:136
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:87
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:117
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:157
+#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:137
+#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:178
+#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:99
+#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:140
+#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:77
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:27
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:42
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:46
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:98
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:232
+#: navalplanner-webapp/src/main/webapp/templates/_list.zul:25
+#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:36
+#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:49
+#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:33
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:48
+#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:28
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:42
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:47
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:153
+#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:35
+#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:51
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:42
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:64
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:128
+#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:59
+msgid "Type"
+msgstr "Тип"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:637
+msgid ""
+"This machine cannot be deleted because it has assignments to projects or "
+"imputed hours"
+msgstr ""
+"Эта машина не может быть удалена, потому что она имеет назначения на проект "
+"или вмененные часы"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:44
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:71
+msgid "November"
+msgstr "Ноябрь"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:122
+msgid "BCWS"
+msgstr "BCWS"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1288
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1310
+msgid ""
+"Value is not valid, the value must be greater than the value of the previous "
+"progress."
+msgstr ""
+"Значение не действительно, значение должно быть больше чем предыдущее "
+"значение хода работ"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java:347
+msgid " in the specified directory."
+msgstr "в указанный каталог."
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1148
+msgid "criterion satisfaction codes must be unique inside a resource"
+msgstr "код критерия удовлетворенности должен быть уникальным внутри ресурса "
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:862
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:668
+msgid "no"
+msgstr "нет"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:360
+msgid "missing code in a work report."
+msgstr "ожидается код в рабочем отчете."
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceAllocationFilterEnum.java:29
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceFilterEnum.java:29
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:30
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementFilterEnum.java:36
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:85
+msgid "Criterion"
+msgstr "Критерий"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:94
+msgid "unl"
+msgstr "неогр."
+
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:76
+msgid "Generate code for"
+msgstr "Генерировать код для"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/labels/impl/LabelConverter.java:103
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:397
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:481
+msgid "missing code in a label"
+msgstr "отсутствует код в метке"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:123
+msgid "Actual Cost Work Performed"
+msgstr "Фактическая стоимость выполненных работ"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:184
+msgid "Create project from Template"
+msgstr "Создать проект из шаблона"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:310
+msgid "NavalPlan Configuration"
+msgstr "NavalPlan Конфигурация"
+
+#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:51
+msgid "Average of the worked hours"
+msgstr "Средняя отработанных часов"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:406
+msgid ""
+"Value is not valid.\n"
+" Code cannot contain chars like '_' \n"
+" and should not be empty"
+msgstr ""
+"Значение не действительно.\n"
+" Код не может содержать символ '_' \n"
+" и не может быть пустым"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/OrderAuthorization.java:43
+msgid "an authorization type must be set"
+msgstr "тип авторизации должен быть установлен"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeComponent.java:92
+msgid "Must start after (days since beginning project)"
+msgstr "Должен начаться после (дней после начала проекта)"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:540
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:605
+msgid ""
+"Confirm creating a new project version for this scenario and derived. Are "
+"you sure?"
+msgstr ""
+"Подтвердите создание новой версии проекта для этого сценария и производные. "
+"Вы уверены?"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:150
+#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:96
+#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:137
+#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:109
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:86
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:125
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:77
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:107
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:146
+#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:84
+#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:126
+#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:167
+#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:88
+#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:88
+#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:129
+#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:68
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:30
+#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:29
+#: navalplanner-webapp/src/main/webapp/materials/materials.zul:44
+#: navalplanner-webapp/src/main/webapp/materials/materials.zul:74
+#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:66
+#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:59
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:35
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:166
+msgid "Add"
+msgstr "Добавить"
+
+#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:124
+#: navalplanner-webapp/src/main/webapp/materials/materials.zul:47
+#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:44
+#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:85
+msgid "Unselect"
+msgstr "Очистить"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:618
+msgid "You should select the type of exception"
+msgstr "Вы должны выбрать тип исключения"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:93
+#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:46
+#: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:56
+#: navalplanner-webapp/src/main/webapp/orders/_list.zul:31
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:99
+#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:52
+msgid "Deadline"
+msgstr "Deadline"
+
+#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:122
+msgid "Filter by categories or materials"
+msgstr "Фильтр по категориям или материалам"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:298
+msgid "Subcontracted Tasks"
+msgstr "Задачи субподряда"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:389
+msgid "Amount work percentage should be between 0 and 100"
+msgstr "Процентное количество работы должно быть между 0 и 100"
+
+#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:29
+msgid "Machine data"
+msgstr "Данные машины"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:128
+msgid "VAC"
+msgstr "VAC"
+
+#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:28
+#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:34
+#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:55
+msgid "Label type"
+msgstr "Тип метки"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:309
+msgid "Administration / Management"
+msgstr "Администрирование / Менеджмент"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/AdvancedAllocationTabCreator.java:246
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/AdvancedAllocationTabCreator.java:319
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:243
+msgid "Advanced Allocation"
+msgstr "Расширенное распределение"
+
+#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:93
+msgid "Number of iterations"
+msgstr "Количество итераций"
+
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:60
+msgid "Template Tree"
+msgstr "Дерево шаблонов"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:329
+msgid "Criterion has subelements"
+msgstr "Критерий имеет подэлементы"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:499
+#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:34
+msgid "Alpha"
+msgstr "Альфа"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:163
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:204
+msgid "inconsistent parent code."
+msgstr "несовместимый код родителя."
+
+#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:67
+#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:33
+msgid "Status"
+msgstr "Статус"
+
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:163
+msgid "Resource load view"
+msgstr "Просмотр загрузки ресурса"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeComponent.java:82
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:70
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:806
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/EffortDurationPicker.java:62
+#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:69
+#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:76
+#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:81
+#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:34
+#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:54
+#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:72
+#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:37
+#: navalplanner-webapp/src/main/webapp/orders/_list.zul:34
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:154
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:35
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:84
+msgid "Hours"
+msgstr "Часы"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:768
+msgid "the date must be inside the visualization area"
+msgstr "Дата должна быть внутри визуализируемого пространства"
+
+#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:54
+msgid "Quality form type"
+msgstr "Тип формы качества"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:405
+msgid "work report has not this label type assigned"
+msgstr "рабочий отчет не имеет этого типа метки"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1229
+msgid "Limiting assignment"
+msgstr "Ограничение назначения"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:522
+msgid "date not specified."
+msgstr "не указана дата."
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeModel.java:344
+msgid "The name of the criterion is empty."
+msgstr "Наименование критерия не может быть пустым"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/LimitingResourcesTabCreator.java:134
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/LimitingResourcesTabCreator.java:147
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:281
+msgid "Limiting Resources Planning"
+msgstr "Ограничение планирования ресурсов"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:360
+msgid " hours"
+msgstr "часы"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:770
+msgid "The max value must be not empty"
+msgstr "Максимальное значение не должно быть пустым"
+
+#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:66
+msgid "New label"
+msgstr "Новая метка"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java:134
+msgid "Worker ID cannot be empty"
+msgstr "ID работника не должен быть пустым"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceModel.java:177
+msgid "All project tasks"
+msgstr "Все задачи проекта"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:352
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:343
+msgid "The start date cannot be null"
+msgstr "Начальная дата не может быть null"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioCRUDController.java:125
+msgid "Scenario \"{0}\" saved"
+msgstr "Сценарий \"{0}\" записан"
+
+#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_allocationConfiguration.zul:27
+#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:78
+msgid "Allocation configuration"
+msgstr "Конфигурация назначений"
+
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:189
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:215
+msgid "Save & New work report"
+msgstr "Сохранить и Новый отчет работы"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:148
+msgid ""
+"Some entity sequence was created during the configuration process, it is "
+"impossible to update entity sequence table. Please, try again later"
+msgstr ""
+"Некоторые последовательности сущностей были создана в процессе "
+"конфигурирования, невозможно обновить таблицу  последовательности сужностей. "
+"Пожалуйста, повторите попытку позже"
+
+#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:52
+msgid "Subcontract price"
+msgstr "Стоимость субподряда"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:739
+msgid "Resources per day are zero"
+msgstr "Ресурсы в день нулевые"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:31
+#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:30
+msgid "Assigned criteria"
+msgstr "Заданный критерий"
+
+#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:53
+msgid "Help on authentication (opens a new window)"
+msgstr "Справка о проверке подлинности (открывается в новом окне)"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/EffortDurationBox.java:39
+msgid "Not a valid effort duration"
+msgstr "Не действительное продолжительность усилий"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:870
+msgid "The length must be greater than 0, and not null."
+msgstr "Длинна должна быть длиннее чем 0 и не null"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java:536
+msgid "Could not save new calendar"
+msgstr "Невозможно сохранить новый календарь"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1404
+msgid "Sigmoid function applied to current resource"
+msgstr "Сигмовидная функция примененная к текущему ресурсу"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:160
+msgid "Deleted unit type {0}"
+msgstr "Удален тип единиц {0}"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioModel.java:224
+msgid "Could not save the scenario"
+msgstr "Невозможно сохранить сценарий"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:136
+msgid "Couldn't find criterion {0}"
+msgstr "Не могу найти критерий {0}"
+
+#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:37
+#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:33
+#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:35
+msgid "Apply filtering to tasks satisfying required criteria"
+msgstr "Применить фильтрацию задач удовлетворяющих требуемым критериям"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:338
+#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:41
+msgid "Task Scheduling Status In Project"
+msgstr "Статус планированных задач в проекте"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:421
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:194
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:345
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:373
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:356
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:888
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:200
+msgid "Confirm"
+msgstr "Подтвердить"
+
+#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:57
+#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:48
+#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:55
+#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:49
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:51
+#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:45
+#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:43
+#: navalplanner-webapp/src/main/webapp/materials/_listUnitTypes.zul:32
+#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:58
+#: navalplanner-webapp/src/main/webapp/calendars/_list.zul:32
+#: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:32
+#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:56
+#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:33
+#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:47
+#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:49
+#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:61
+msgid "Create"
+msgstr "Создать"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1728
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1734
+msgid "please, select a work report type"
+msgstr "пожалуйста, выберите тип рабочего отчета"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:43
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:67
+msgid "Permissions"
+msgstr "Разрешения"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:486
+msgid "List of materials for category: {0}"
+msgstr "Перечень материалов для категории: {0}"
+
+#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:32
+#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:31
+msgid "Total price"
+msgstr "Итоговая стоимость"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:232
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeCRUDController.java:223
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:126
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:362
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:530
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:544
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:143
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:163
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:818
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:625
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:138
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:324
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:948
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:954
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:271
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:292
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:787
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1045
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1296
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:419
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:408
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:694
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1266
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:388
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:200
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:332
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:405
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1204
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1230
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1242
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:436
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:223
+#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:117
+#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:158
+#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:131
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:107
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:146
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:127
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:167
+#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:106
+#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:147
+#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:188
+#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:110
+#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:109
+#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:150
+#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:49
+#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:92
+#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:42
+#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:47
+#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:42
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:45
+#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:46
+#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:52
+#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:88
+#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:69
+#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:117
+#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:132
+#: navalplanner-webapp/src/main/webapp/materials/materials.zul:104
+#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:52
+#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:115
+#: navalplanner-webapp/src/main/webapp/templates/_list.zul:53
+#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:55
+#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:67
+#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:102
+#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:59
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:79
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:91
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:213
+#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:43
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:84
+#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:40
+#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:90
+#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:120
+#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:66
+#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:54
+msgid "Delete"
+msgstr "Удалить"
diff --git a/navalplanner-webapp/src/main/webapp/calendars/_edition.zul b/navalplanner-webapp/src/main/webapp/calendars/_edition.zul
index a71be43f5..6eea956e8 100644
--- a/navalplanner-webapp/src/main/webapp/calendars/_edition.zul
+++ b/navalplanner-webapp/src/main/webapp/calendars/_edition.zul
@@ -83,7 +83,7 @@
                 </attribute>
             </calendar>
 
-            <grid width="160px" sclass="day-details">
+            <grid width="180px" sclass="day-details">
               <auxhead>
                 <auxheader colspan="2" label="${i18n:_('Day properties')}" />
               </auxhead>
@@ -94,7 +94,7 @@
               <rows>
                 <row>
                   <label value="${i18n:_('Day')}" />
-                  <datebox disabled="true"
+                  <datebox disabled="true" buttonVisible="false"
                     value="@{calendarController.editionController.selectedDay}" />
                 </row>
                 <row>
diff --git a/navalplanner-webapp/src/main/webapp/calendars/calendars.zul b/navalplanner-webapp/src/main/webapp/calendars/calendars.zul
index 9639cf3ec..ac125e75c 100644
--- a/navalplanner-webapp/src/main/webapp/calendars/calendars.zul
+++ b/navalplanner-webapp/src/main/webapp/calendars/calendars.zul
@@ -20,7 +20,6 @@
 -->
 
 <?page title="${i18n:_('NavalPlan: Calendars')}"?>
-
 <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
 <?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
 
diff --git a/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css b/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css
index 5e0f8a7ad..2c4752f6e 100644
--- a/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css
+++ b/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css
@@ -552,6 +552,9 @@ div.z-grid {
     padding: 0;
 }
 
+.listdetails .z-tree-header {
+    position:relative;
+}
 
 .z-listbox .z-textbox,.z-listbox .z-decimalbox,.z-listbox .z-intbox,
 .z-listbox .z-longbox,.z-listbox .z-doublebox {
@@ -923,6 +926,9 @@ span.z-dottree-line {
     width: 84px;
     height: 84px;
     margin: 0 0 4px 4px;
+}
+
+.perspective tr td, .perspective-active  tr td {
     font-weight: normal;
     font-size: 10px;
 }
@@ -972,10 +978,19 @@ span.z-dottree-line {
     background-color: #E6F2F9;
 }
 
+span.perspective, span.perspective-active {
+    margin: 0 2px;
+}
+
 .perspectives-label {
     display: none;
 }
 
+.taskdetailsContainer {
+    border-left:0;
+    border-top:0;
+}
+
 .z-button.perspective .z-button-cm,
 .z-button.perspective-active .z-button-cm {
     white-space:normal;
@@ -1395,6 +1410,12 @@ display:none;
     overflow: hidden;
 }
 
+.color-sample {
+    height: 10px;
+    width: 20px;
+    border: solid 1px black;
+}
+
 /* Expand vertical boxes for non-ffox browsers */
 .z-vbox {
     width:100%;
@@ -1489,6 +1510,11 @@ display:none;
     color: #555555;
 }
 
+.advanced-assignment-area > .z-center-body {
+    overflow: visible !important;
+    overflow: visible !important;
+}
+
 input.z-spinner-text-disd,
 input.z-datebox-text-disd {
     color: #000000 !important;
@@ -1498,6 +1524,14 @@ input.z-datebox-text-disd {
     padding: 0;
 }
 
+.z-calendar .z-outside {
+    color: #CCC;
+}
+
+.z-calendar-calday td.z-calendar-seld {
+    font-weight: bold;
+}
+
 .add-resources-or-criteria span {
     white-space: nowrap;
 }
@@ -1734,4 +1768,16 @@ select {
     width: 0;
     border-right: 1px solid #9ECAD8;
     border-left: 1px solid #d9f3ff;
-}
\ No newline at end of file
+}
+
+.logo-area img {
+    margin-right:10px;
+}
+
+.logo-area {
+    width: 1px;
+}
+
+.z-borderlayout {
+    background-color: transparent;
+}
diff --git a/navalplanner-webapp/src/main/webapp/common/img/en/logo.png b/navalplanner-webapp/src/main/webapp/common/img/en/logo.png
deleted file mode 100644
index 91d135180..000000000
Binary files a/navalplanner-webapp/src/main/webapp/common/img/en/logo.png and /dev/null differ
diff --git a/navalplanner-webapp/src/main/webapp/common/img/en/logo_login.png b/navalplanner-webapp/src/main/webapp/common/img/en/logo_login.png
deleted file mode 100644
index 96898096e..000000000
Binary files a/navalplanner-webapp/src/main/webapp/common/img/en/logo_login.png and /dev/null differ
diff --git a/navalplanner-webapp/src/main/webapp/common/img/es/logo.png b/navalplanner-webapp/src/main/webapp/common/img/es/logo.png
deleted file mode 100644
index 91d135180..000000000
Binary files a/navalplanner-webapp/src/main/webapp/common/img/es/logo.png and /dev/null differ
diff --git a/navalplanner-webapp/src/main/webapp/common/img/es/logo_login.png b/navalplanner-webapp/src/main/webapp/common/img/es/logo_login.png
deleted file mode 100644
index 96898096e..000000000
Binary files a/navalplanner-webapp/src/main/webapp/common/img/es/logo_login.png and /dev/null differ
diff --git a/navalplanner-webapp/src/main/webapp/common/img/logo.png b/navalplanner-webapp/src/main/webapp/common/img/logo.png
new file mode 100644
index 000000000..4e7d02651
Binary files /dev/null and b/navalplanner-webapp/src/main/webapp/common/img/logo.png differ
diff --git a/navalplanner-webapp/src/main/webapp/common/img/logo_login.png b/navalplanner-webapp/src/main/webapp/common/img/logo_login.png
new file mode 100644
index 000000000..cb05d1198
Binary files /dev/null and b/navalplanner-webapp/src/main/webapp/common/img/logo_login.png differ
diff --git a/navalplanner-webapp/src/main/webapp/common/layout/login.zul b/navalplanner-webapp/src/main/webapp/common/layout/login.zul
index f46008697..199231ce3 100644
--- a/navalplanner-webapp/src/main/webapp/common/layout/login.zul
+++ b/navalplanner-webapp/src/main/webapp/common/layout/login.zul
@@ -46,7 +46,7 @@
 </n:table>
 <n:table width="750" border="0" align="center" cellpadding="0" cellspacing="0" bgcolor="#FFFFFF">
   <n:tr>
-    <n:td height="100" align="left" valign="middle"><n:img src="${contextPath}/common/img/${i18n:_('en')}/logo_login.png" alt="NavalPlan" /></n:td>
+    <n:td height="100" align="left" valign="middle"><n:img src="${contextPath}/common/img/logo_login.png" alt="NavalPlan" /></n:td>
   </n:tr>
 </n:table>
 <n:table width="750" border="0" align="center" cellpadding="0" cellspacing="0" bgcolor="#FFFFFF">
diff --git a/navalplanner-webapp/src/main/webapp/common/layout/template.zul b/navalplanner-webapp/src/main/webapp/common/layout/template.zul
index 04a513590..54f47eb67 100644
--- a/navalplanner-webapp/src/main/webapp/common/layout/template.zul
+++ b/navalplanner-webapp/src/main/webapp/common/layout/template.zul
@@ -52,9 +52,11 @@ signature="java.lang.Boolean isDefaultPasswordsControl()"?>
 
 <n:table width="100%" border="0" cellpadding="0" cellspacing="0">
   <n:tr>
-    <n:td width="180" valign="center">
+    <n:td valign="center" class="logo-area">
         <n:a href="${contextPath}/">
-        <n:img src="${contextPath}/common/img/${i18n:_('en')}/logo.png" /></n:a></n:td>
+            <n:img src="${templateCtrl.companyLogoURL}" if="${templateCtrl.companyLogoURL!=''}" />
+            <n:img src="${contextPath}/common/img/logo.png" if="${templateCtrl.companyLogoURL==''}" />
+        </n:a></n:td>
   <n:td valign="top">
   <n:table width="100%"  border="0" cellspacing="0" cellpadding="0">
     <n:tr>
@@ -122,9 +124,6 @@ signature="java.lang.Boolean isDefaultPasswordsControl()"?>
 <south border="none">
 <n:table width="100%">
   <n:tr class="footer">
-    <n:td height="40" align="left" valign="bottom">
-        <n:img height="40" src="${templateCtrl.companyLogoURL}" if="${templateCtrl.companyLogoURL!=''}" />
-    </n:td>
     <n:td  valign="center">
         <n:div if="${project:passwd_control()}" id="warningDefaultPasswdadmin"
             class="footer-messages-area"
@@ -157,7 +156,6 @@ signature="java.lang.Boolean isDefaultPasswordsControl()"?>
         <n:img width="110" height="40" src="${contextPath}/common/img/logos_footer_fundacion.png"/>
         <n:img width="253" height="40" src="${contextPath}/common/img/logos_footer_administracion.png"/>
     </n:td>
-
   </n:tr>
 </n:table>
 </south>
diff --git a/navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul b/navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul
index 7e598c996..3d4e3c880 100644
--- a/navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul
+++ b/navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul
@@ -56,12 +56,19 @@
                         </row>
                         <row>
                             <label value="${i18n:_('Color')}" />
-                            <listbox id="colorsListbox" mold="select"
+                            <hbox align="pack">
+                                <listbox id="colorsListbox" mold="select"
                                     model="@{controller.colors}"
                                     selectedItem="@{controller.exceptionDayType.color}"
-                                    itemRenderer="@{controller.colorsRenderer}"/>
+                                    itemRenderer="@{controller.colorsRenderer}"
+                                    onSelect="controller.reloadSampleColors()" />
+                                <div id="colorSampleOwn" sclass="color-sample" style="@{controller.styleColorOwnException}" />
+                                <label value="${i18n:_('Own exception')}" />
+                                <div id="colorSampleDerived" sclass="color-sample" style="@{controller.styleColorDerivedException}" />
+                                <label value="${i18n:_('Derived exception')}" />
+                            </hbox>
                         </row>
-                         <row>
+                        <row>
                             <label value="${i18n:_('Standard Effort')}" />
                             <effortDurationPicker id="standardEffort" />
                         </row>
diff --git a/navalplanner-webapp/src/main/webapp/materials/materials.zul b/navalplanner-webapp/src/main/webapp/materials/materials.zul
index 92a9d0a6b..64aaaf8a7 100644
--- a/navalplanner-webapp/src/main/webapp/materials/materials.zul
+++ b/navalplanner-webapp/src/main/webapp/materials/materials.zul
@@ -30,14 +30,15 @@
 <zk>
     <window self="@{define(content)}"
         apply="org.navalplanner.web.materials.MaterialsController"
-        title="${i18n:_('Materials')}">
-        <vbox id="messagesContainer" />
+        title="${i18n:_('Materials')}" >
 
         <!-- Categories  -->
-        <hbox width="100%">
-            <panel title="${i18n:_('Categories')}"
-                border="normal">
-                <panelchildren>
+        <vbox width="100%">
+
+        <vbox id="messagesContainer" />
+
+            <groupbox closable="false">
+                    <caption label="${i18n:_('Categories')}" />
                     <hbox>
                         <textbox id="txtCategory" onOK="materialsController.addMaterialCategory()"
                             style="padding-bottom: 4px" />
@@ -47,7 +48,6 @@
                         <button label="${i18n:_('Unselect')}" onClick="materialsController.clearSelectionCategoriesTree()" />
                     </hbox>
 
-                    <separator spacing="5px" orient="horizontal" />
 
                     <tree id="categoriesTree" zclass="z-dottree"
                         rows="5" vflex="true" multiple="false"
@@ -61,15 +61,14 @@
                             <treecol label="${i18n:_('Operations')}" width="80px" />
                         </treecols>
                     </tree>
-                </panelchildren>
-            </panel>
-        </hbox>
+                </groupbox>
+        </vbox>
 
         <!-- Materials -->
-        <hbox width="100%">
-            <panel title="${i18n:_('List of materials for all categories (select one to filter)')}"
-                id="materialsPanel" border="normal">
-                <panelchildren>
+        <vbox width="100%">
+
+        <groupbox closable="false">
+            <caption id="materialsCaption" label="${i18n:_('List of materials for all categories (select one to filter)')}"/>
                     <button id="btnAddMaterial"
                         label="${i18n:_('Add')}"
                         onClick="materialsController.addMaterialToMaterialCategory(categoriesTree.selectedItem)" />
@@ -91,7 +90,8 @@
                                 <textbox id="code" value="@{material.code}" width="95%"
                                     disabled="@{material.category.codeAutogenerated}"
                                     constraint="no empty:${i18n:_('cannot be null or empty')}" />
-                                <textbox value="@{material.description}" width="95%" />
+                                <textbox value="@{material.description}" width="95%"
+                                    constraint="no empty:${i18n:_('cannot be null or empty')}" />
                                 <doublebox value="@{material.defaultUnitPrice}" />
                                 <listbox mold="select"  model="@{materialsController.unitTypes}"
                                     onSelect = "materialsController.selectUnitType(self)"
@@ -107,10 +107,8 @@
                             </row>
                         </rows>
                     </newdatasortablegrid>
-
-                </panelchildren>
-            </panel>
-        </hbox>
+                </groupbox>
+        </vbox>
 
         <!-- Save button -->
         <button onClick="materialsController.saveAndContinue()"
diff --git a/navalplanner-webapp/src/main/webapp/orders/_list.zul b/navalplanner-webapp/src/main/webapp/orders/_list.zul
index f725e4ec9..d19722a59 100644
--- a/navalplanner-webapp/src/main/webapp/orders/_list.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/_list.zul
@@ -21,7 +21,7 @@
 
 <window id="${arg.top_id}" title="${i18n:_('Projects list')}">
     <grid id="listing" model="@{controller.orders}" mold="paging"
-        pageSize="10" fixedLayout="true"
+        pageSize="15" fixedLayout="true"
         rowRenderer= "@{controller.ordersRowRender}"
         onInitRender ="controller.sortOrders();" sclass="clickable-rows projects-list">
         <columns sizable="true">
diff --git a/navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul b/navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul
index ae5ef1a7d..c2b66b27f 100644
--- a/navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul
+++ b/navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul
@@ -36,13 +36,14 @@
 <borderlayout id="normalLayout" width="auto" apply="${advancedAllocationController}" class="advancedallocationlayout">
     <north height="30px" border="0" sclass="toolbar-box">
         <hbox align="center">
-            <button label="${i18n:_('Accept')}" id="acceptButton" class="save-button global-action"
+            <button label="${i18n:_('Accept')}" id="acceptButton" image="/common/img/bt_ok.png"
                 if="${advancedAllocationController.advancedAllocationOfSingleTask}" />
-            <button label="${i18n:_('Cancel')}" id="cancelButton" class="cancel-button global-action"
+            <button label="${i18n:_('Cancel')}" id="cancelButton" image="/common/img/bt_cancel.png"
                 if="${advancedAllocationController.advancedAllocationOfSingleTask}" />
-            <button image="/common/img/ico_ok.png" tooltiptext="${i18n:_('Accept')}" id="saveButton" class="planner-command"
+            <button label="${i18n:_('Accept')}" id="saveButton" image="/common/img/bt_ok.png"
                 if="${!(advancedAllocationController.advancedAllocationOfSingleTask)}" />
             <separator/>
+            <space bar="true" />
             <label>${i18n:_('Zoom level')}:</label>
             <listbox mold="select" rows="1" id="advancedAllocationZoomLevel"
                 model="${advancedAllocationController.zoomLevels}"
diff --git a/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css b/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css
index b4795735a..e36f2c5e2 100644
--- a/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css
+++ b/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css
@@ -1176,17 +1176,10 @@ height: 100%
     background-image: url("../../zkau/web/ganttz/img/deadline.png");
 }
 
-
-
 body .perspectives-column {
     display:inline;
 }
 
-.perspectives-column .z-west-body {
-    width: 200px !important;
-}
-
-
 #watermark .timetracker_column .today_deadline {
     background-image:url(../img/watermark_today.png);
     background-repeat: repeat-y;
diff --git a/navalplanner-webapp/src/main/webapp/planner/css/print.css b/navalplanner-webapp/src/main/webapp/planner/css/print.css
index dbed5f94e..8fc3682c9 100644
--- a/navalplanner-webapp/src/main/webapp/planner/css/print.css
+++ b/navalplanner-webapp/src/main/webapp/planner/css/print.css
@@ -22,6 +22,10 @@ body .footer {
     display: none !important;
 }
 
+body .footer-print {
+    display: inline !important;
+}
+
 /* ------ Remove scrolls  ------ */
 .leftpanelcontainer {
     overflow: hidden !important;
@@ -43,7 +47,7 @@ body .footer {
 /* ------ Reposition main-area  ------ */
 body .main-area {
     margin-left: 0;
-    margin-top: -32px;
+    margin-top: -31px;
 }
 
 /* ------ Hide possible Javascript execution exceptions  ------ */
@@ -51,20 +55,10 @@ body .main-area {
     display: none;
 }
 
-/* Hack for hiding breadcrumbs part in printed diagrams */
-a.ruta,
-.ruta tr td,
-.ruta tr td+td,
-.ruta tr td+td+td {
-    display:none;
+td.migas_linea {
+    padding-top:25px;
 }
 
-.ruta tr td+td+td+td+td+td {
-    font-size: 20px;
-    display: inline !important;
-}
-
-
 .border-container .taskgroup_start,
 .border-container .taskgroup_end {
     repeat-y: none;
@@ -82,4 +76,16 @@ a.ruta,
     display:none;
 }
 
+.z-center div, .taskpanel div {
+ overflow: hidden !important;
+}
+
+.logo-area {
+    height: 70px;
+}
+
+.listdetails input.task_title {
+    width: 100% !important;
+}
+
 /* ------ Calculated body width and height added via CutyPrint CSS generator ------ */
diff --git a/navalplanner-webapp/src/main/webapp/planner/reassign.zul b/navalplanner-webapp/src/main/webapp/planner/reassign.zul
index 1fc89bed3..45684616e 100644
--- a/navalplanner-webapp/src/main/webapp/planner/reassign.zul
+++ b/navalplanner-webapp/src/main/webapp/planner/reassign.zul
@@ -27,21 +27,21 @@
     ]]>
     </zscript>
 
-    <window border="normal" title="${i18n:_('Reassigning')}"
-        apply="${controllerForReassigning}">
+    <window border="none" title="${i18n:_('Reassigning')}"
+        apply="${controllerForReassigning}" width="300px">
 
-        <groupbox mold="3d" style="margin-top: 5px" closable="false">
-            <caption label="${i18n:_('Reassigning type')}:" />
-            <hbox>
-                <radiogroup id="reassigningTypeSelector">
-                    <grid id="reassigningTypesGrid">
+        <groupbox closable="false">
+            <caption label="${i18n:_('Reassigning type')}" />
+            <vbox width="100%">
+                <radiogroup id="reassigningTypeSelector" width="100%">
+                    <grid id="reassigningTypesGrid" fixedLayout="true" width="100%">
                         <columns>
-                          <column />
+                            <column width="100%"/>
                         </columns>
                     </grid>
                 </radiogroup>
                 <datebox id="associatedDate" />
-            </hbox>
+            </vbox>
         </groupbox>
 
         <hbox>
diff --git a/navalplanner-webapp/src/main/webapp/planner/stretches_function.zul b/navalplanner-webapp/src/main/webapp/planner/stretches_function.zul
index 94290e3d1..582527d8f 100644
--- a/navalplanner-webapp/src/main/webapp/planner/stretches_function.zul
+++ b/navalplanner-webapp/src/main/webapp/planner/stretches_function.zul
@@ -28,15 +28,14 @@
 ]]>
 </zscript>
 
-<window border="false" title="${i18n:_('Stretches function configuration')}"
+<window title="${i18n:_('Stretches function configuration')}"
     apply="${stretchesFunctionController}" closable="true">
 
 <hbox>
     <vbox>
 
-        <panel title="@{stretchesFunctionController.title}">
-
-        <panelchildren>
+    <groupbox closable="false">
+    <caption label="@{stretchesFunctionController.title}" />
 
         <button label="${i18n:_('Add stretch')}" onClick="stretchesFunctionController.addStretch()" />
 
@@ -53,30 +52,37 @@
             </listhead>
         </listbox>
 
-        </panelchildren>
-
-        </panel>
-
+    </groupbox>
     </vbox>
 
     <vbox id="charts">
-        <div visible="@{stretchesFunctionController.chartsDisabled}">
-            <n:h4>${i18n:_('Cannot calculate charts for current data')}</n:h4>
+        <div visible="@{stretchesFunctionController.chartsDisabled}" height="30px" style="padding:15px;">
+            <label visible="@{stretchesFunctionController.chartsDisabled}" class="message_WARNING">${i18n:_('Cannot calculate charts for current data')}</label>
         </div>
+        <zscript>
+            import java.awt.Font;
+            String fontname = "Verdana";
+            Font tfont = new Font(fontname, Font.BOLD, 14); //for title
+            Font lbfont = new Font(fontname, Font.PLAIN, 12); //for label
+        </zscript>
         <chart id="dedicationChart" title="${i18n:_('Dedication chart')}"
+            titleFont="${tfont}"
             type="time_series" threeD="false"
             model="@{stretchesFunctionController.getDedicationChartData}"
             yAxis= "${i18n:_('Hours')}" paneColor="#FFFFFF"
+            xAxisFont="${lbfont}" xAxisTickFont="${lbfont}"
+            yAxisFont="${lbfont}" yAxisTickFont="${lbfont}"
             showLegend="false"/>
-
         <chart id="accumulatedHoursChart"
             title="${i18n:_('Accumulated hours chart')}"
+            titleFont="${tfont}"
             type="time_series" threeD="false"
             model="@{stretchesFunctionController.getAccumulatedHoursChartData}"
             yAxis= "${i18n:_('Hours')}" paneColor="#FFFFFF"
+            xAxisFont="${lbfont}" xAxisTickFont="${lbfont}"
+            yAxisFont="${lbfont}" yAxisTickFont="${lbfont}"
             showLegend="false" />
     </vbox>
-
 </hbox>
 
 <hbox>
diff --git a/navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul b/navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul
index 822f0fbe4..f7882a66f 100644
--- a/navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul
+++ b/navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul
@@ -80,6 +80,8 @@
                             <auxheader label="${i18n:_('Name')}" colspan="1" align="center"/>
                             <auxheader label="${i18n:_('Hours')}" colspan="@{allocationController.colspanHours}" align="center"/>
                             <auxheader label="${i18n:_('Resources Per Day')}" colspan="@{allocationController.colspanResources}" align="center"/>
+                            <auxheader label="${i18n:_('Function')}" colspan="1" align="center"
+                                visible="@{allocationController.anyNotFlat}" />
                             <auxheader label="${i18n:_('Op.')}" colspan="1" align="center"/>
                         </auxhead>
                         <columns sclass="details">
@@ -92,6 +94,8 @@
                             <column label="${i18n:_('Total')}" align="center" visible="@{allocationController.extendedView}" width="70px"/>
                             <column label="${i18n:_('Consolidated')}" align="center" visible="@{allocationController.extendedView}" width="70px"/>
                             <column label="${i18n:_('Non Consolidated')}" align="center" width="120px"/>
+                            <column label="" align="center" width="70px"
+                                visible="@{allocationController.anyNotFlat}" />
                             <column label="" align="center" width="40px"/>
                         </columns>
                     </grid>
diff --git a/navalplanner-webapp/src/main/webapp/resources/worker/_list.zul b/navalplanner-webapp/src/main/webapp/resources/worker/_list.zul
index 0b98f26e9..1069fbaec 100644
--- a/navalplanner-webapp/src/main/webapp/resources/worker/_list.zul
+++ b/navalplanner-webapp/src/main/webapp/resources/worker/_list.zul
@@ -30,7 +30,7 @@
 
     <newdatasortablegrid id="listing" model="@{controller.realWorkers}" mold="paging"
         rowRenderer="@{controller.workersRenderer}"
-        pageSize="10" fixedLayout="true" sclass="clickable-rows">
+        pageSize="15" fixedLayout="true" sclass="clickable-rows">
         <columns>
             <newdatasortablecolumn label="${i18n:_('Surname')}" sort="auto(lower(surname))" sortDirection="ascending" />
             <newdatasortablecolumn label="${i18n:_('First name')}" sort="auto(lower(firstName))" />
diff --git a/navalplanner-webapp/src/main/webapp/settings/settings.zul b/navalplanner-webapp/src/main/webapp/settings/settings.zul
index 739d8a46a..4857a1d1a 100644
--- a/navalplanner-webapp/src/main/webapp/settings/settings.zul
+++ b/navalplanner-webapp/src/main/webapp/settings/settings.zul
@@ -48,6 +48,13 @@
                                 <column />
                             </columns>
                             <rows>
+                                <row>
+                                    <label value="${i18n:_('Login')}:" />
+                                    <textbox id="loginName"
+                                        value="@{settingsController.loginName}"
+                                        disabled="true"
+                                        width="300px" />
+                                </row>
                                 <row>
                                     <label value="${i18n:_('First name')}:" />
                                     <textbox id="firstName"
@@ -58,12 +65,6 @@
                                     <textbox id="lastName"
                                         value="@{settingsController.lastName}" width="300px"/>
                                 </row>
-                                <row>
-                                    <label value="${i18n:_('Login name')}:" />
-                                    <textbox id="loginName"
-                                        value="@{settingsController.loginName}" width="300px"
-                                        constraint="no empty:${i18n:_('cannot be null or empty')}"/>
-                                </row>
                                 <row>
                                     <label value="${i18n:_('E-mail')}:" />
                                     <textbox id="email"
diff --git a/navalplanner-webapp/src/test/java/org/navalplanner/web/test/ws/subcontract/ReportAdvancesServiceTest.java b/navalplanner-webapp/src/test/java/org/navalplanner/web/test/ws/subcontract/ReportAdvancesServiceTest.java
index 1f99f7452..ab546b634 100644
--- a/navalplanner-webapp/src/test/java/org/navalplanner/web/test/ws/subcontract/ReportAdvancesServiceTest.java
+++ b/navalplanner-webapp/src/test/java/org/navalplanner/web/test/ws/subcontract/ReportAdvancesServiceTest.java
@@ -37,9 +37,9 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Set;
 import java.util.UUID;
-import java.util.Map.Entry;
 
 import javax.annotation.Resource;
 
@@ -282,7 +282,7 @@ public class ReportAdvancesServiceTest {
     private Order givenValidOrderAlreadyStored() {
         Order order = Order.create();
         order.setCode(UUID.randomUUID().toString());
-        order.setName("Order name");
+        order.setName("Order name " + UUID.randomUUID());
         order.setInitDate(new Date());
         order.setCalendar(configurationDAO.getConfiguration()
                 .getDefaultCalendar());
diff --git a/pom.xml b/pom.xml
index c99cefc23..0483c7646 100644
--- a/pom.xml
+++ b/pom.xml
@@ -157,7 +157,7 @@
         </repository>
     <repository>
          <id>thirdparty</id>
-         <url>http://nexus.naval.igalia.com/content/repositories/thirdparty</url>
+         <url>http://nexus.libreplan.org/content/repositories/thirdparty</url>
      </repository>
     </repositories>
 
diff --git a/scripts/functional-tests/administration-management/all_administration_test.suite b/scripts/functional-tests/administration-management/all_administration_test.suite
new file mode 100644
index 000000000..0366d700f
--- /dev/null
+++ b/scripts/functional-tests/administration-management/all_administration_test.suite
@@ -0,0 +1,5 @@
+calendar_test.sah
+material_test.sah
+quality_forms_test.sah
+cost_categories_test.sah
+configuration_test.sah
diff --git a/scripts/functional-tests/administration-management/calendar_test.sah b/scripts/functional-tests/administration-management/calendar_test.sah
new file mode 100644
index 000000000..96d1cc631
--- /dev/null
+++ b/scripts/functional-tests/administration-management/calendar_test.sah
@@ -0,0 +1,163 @@
+/*
+ * This file is part of NavalPlan
+ *
+ * Copyright (C) 2011 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/>.
+ */
+
+/* Included tests
+ *
+ * 1 - Create a new Calendar
+ * 2 - Create a Calendar with duplicate type (it should be a failure)
+ * 3 - Create a Calendar with empty type (it should be a failure)
+ * 4 - Create a derived calendar
+ * 5 - Edit the Calendar
+ * 6 - Assign the child calendar
+ *   6.1 - Create a worker with the assigned calendar
+ *   6.2 - Try to delete the assigned calendar (it should be a failure)
+ *   6.3 - Delete the worker
+ * 6 - Try to delete the parent calendar (it should be a failure)
+ * 7 - Delete the child calendar
+ * 8 - Delete the parent Calendar
+ *
+*/
+
+_include("../common_functions.sah");
+
+function calendarCreateDuplicateType($name) {
+    commonCreate("Calendars");
+    commonCalendarForm($name);
+    calendarNotValid($name);
+    _log("Do not allow create a calendar with duplicate name", "custom1");
+}
+
+function calendarCreateEmpty() {
+    commonCreate("Calendars");
+    commonCalendarForm("");
+    /* calendarNotEmptyNameValidation(); */
+    _log("Do not allow create a calendar without name", "custom1");
+}
+
+function calendarCreateChild($parentName, $sonName, $cell) {
+    calendarGoToCreateChildForm($parentName, $cell);
+    commonCalendarForm($sonName);
+    commonSaveValidation("Base calendar", $sonName);
+    _log("Create a son calendar", "custom1");
+}
+
+function calendarEdit($oldName, $newName, $cell) {
+    commonEdit($oldName, $cell);
+    commonCalendarForm($newName);
+    commonSaveValidation("Base calendar", $newName);
+    _log("Edit the parent calendar", "custom1");
+}
+
+function calendarGoToCreateChildForm($name, $cell) {
+    _click(_link("Calendars"));
+    _click(_image("ico_derived1.png", _in(_cell($cell, _near(_cell($name))))));
+}
+
+function calendarTryDeleteParentWithSon($name, $cell) {
+    _click(_link("Calendars"));
+    _click(_image("ico_borrar1.png", _in(_cell($cell, _near(_cell($name))))));
+    calendarNotAllowDeleteWithChildValidation();
+    _log("Do not allow delete the parent calendar", "custom1");
+}
+
+function calendarCheckCode($name){
+    commonConfigurationChangeCheckboxMainPreferences("Calendar");
+    calendarCreateWithoutCode($name);
+    commonConfigurationChangeCheckboxMainPreferences("Calendar");
+    _log("Check code label", "custom1");
+}
+
+function calendarCreateWithoutCode($name){
+    commonCreate("Calendars");
+    calendarForm($name);
+    commonEmptyCodeValidation();
+}
+
+function calendarAssignWorker($name, $id, $calendar) {
+    workerCreate($name, $id, $calendar);
+    commonCalendarTryDeleteAssignedCalendar($calendar, 3);
+    commonWorkerDelete($name);
+}
+
+/*
+ * Worker functions
+ * */
+
+function workerCreate($name, $id, $calendar) {
+    commonCreate("Workers");
+    workerForm($name, $id, $calendar);
+    _assertExists(_span("Worker saved"));
+    _assert(_isVisible(_span("Worker saved")));
+    _log("Create a new worker", "custom1");
+}
+
+function workerForm($name, $id, $calendar) {
+    _setValue(_textbox(0, _near(_span("First name"))), $name);
+    _setValue(_textbox(0, _near(_span("Last name"))), $name);
+    _setValue(_textbox(0, _near(_span("ID"))), $id);
+    _click(_span("Calendar"));
+    _click(_italic(0, _near(_span("Select parent calendar"))));
+    _click(_cell($calendar));
+    _click(_cell("Save"));
+}
+
+/*
+ * Validations
+ */
+
+/* Text will be changed pending of a bug
+
+function calendarNotEmptyNameValidation(){
+    _assertExists(_div("name: no debe ser nulo o vacío"));
+    _assert(_isVisible(_div("name: no debe ser nulo o vacío")));
+}
+*/
+
+function calendarNotValid($calendar){
+    _assertExists(_div("name: "+$calendar+" already exists"));
+    _assert(_isVisible(_div("name: "+$calendar+" already exists")));
+}
+
+function calendarNotAllowDeleteWithChildValidation(){
+    _assertExists(_span("Calendar cannot be removed because it still has children. Some other calendar is derived from this one."));
+    _assert(_isVisible(_span("Calendar cannot be removed because it still has children. Some other calendar is derived from this one.")));
+}
+
+/* test values */
+var $calendarName = "parent";
+var $calendarSonName = "Son calendar";
+var $calendarNewName = "newest";
+var $workerId = "36123456P";
+var $workerName = "worker1";
+
+/* test actions */
+commonLogin("admin", "admin");
+
+commonCalendarCreate($calendarName);
+calendarCreateDuplicateType($calendarName);
+calendarCreateEmpty();
+calendarCreateChild($calendarName, $calendarSonName, 3);
+calendarEdit($calendarName, $calendarNewName, 3);
+calendarAssignWorker($workerName, $workerId, $calendarSonName)
+calendarTryDeleteParentWithSon($calendarNewName, 3);
+/* calendarCheckCode($calendarName); PENDING OF A BUG */
+commonCalendarDelete($calendarSonName);
+commonCalendarDelete($calendarNewName);
+
+commonLogout();
diff --git a/scripts/functional-tests/administration-management/configuration_test.sah b/scripts/functional-tests/administration-management/configuration_test.sah
new file mode 100644
index 000000000..55ed18137
--- /dev/null
+++ b/scripts/functional-tests/administration-management/configuration_test.sah
@@ -0,0 +1,230 @@
+/*
+ * This file is part of NavalPlan
+ *
+ * Copyright (C) 2011 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/>.
+ */
+
+/* Included tests
+ *
+ * 1 - Change Login checkbox
+ * 2 - Change Checkboxes of Generate code for all the elements
+ * 3 - Change perspectives of all elements
+ * 4 - Check login form
+ * 5 - Check perspective is visible
+ * 6 - Check that the code is not auto generated in all the elements
+ * 7 - Change configuration like default configuration
+ * 8 - Change default Calendar
+ *   8.1 - Create a new calendar
+ *   8.2 - Change the configuration
+ *   8.3 - Check Calendar in Workers
+ *   8.4 - Check Calendar in Projects
+ *   8.5 - Change the calendar configuration like default configuration
+ *   8.6 - Delete calendar
+ *
+*/
+
+_include("../common_functions.sah");
+
+/*
+ * Functions for config checkboxes element
+ */
+
+function configChangeInCheckboxes($list) {
+    _click(_link("NavalPlan Configuration"));
+    configPressCheckboxes($list);
+    _click(_cell("Save"));
+    configSaveValidation();
+    _log("All checkboxes changed", "custom1");
+}
+
+function configCheckChangesInCheckboxes($list){
+    configCheckLogin();
+    configCheckScenario();
+    configCheckMonteCarlo();
+    configCheckTypes($list);
+}
+
+function configCheckLogin(){
+    commonLogout();
+    if (_condition(_textbox(0, _near(_cell("User"))).value == "") &&
+    _condition(_textbox(0, _near(_cell("Password"))).value == "")){
+    _log("Log form is empty", "custom1");
+    }
+    else{
+    _log("Log form is not empty", "error");
+    }
+    commonLogin("admin", "admin");
+}
+
+function configCheckMonteCarlo(){
+    commonCreateProject("projectForCheckMontecarlo");
+    _click(_cell("OK"));
+    _assertExists(_cell("MonteCarlo Method"));
+    _assert(_isVisible(_cell("MonteCarlo Method")));
+    _log("Monte Carlo is showed", "custom1");
+    _click(_link("NavalPlan Configuration"));
+    _click(_checkbox(0, _near(_label("Enable scenarios module"))));
+    _click(_cell("Save"));
+    commonDeleteProject("projectForCheckMontecarlo");
+}
+
+function configCheckScenario(){
+    _click(_link("Projects List"));
+    _assertExists(_span("scenario:"));
+    _assert(_isVisible(_span("scenario:")));
+    _log("Scenario is showed", "custom1");
+    _click(_link("NavalPlan Configuration"));
+    _click(_checkbox(0, _near(_label("Enable scenarios module"))));
+    _click(_cell("Save"));
+}
+
+function configCheckTypes($list){
+    var $code;
+    for (var $i = 0; $i < $list.length; $i++){
+        commonCreate($list[$i]);
+        try{
+        _set($code, _textbox(0, _near(_span("Code"))).value);
+        }
+        catch(e){
+        _set($code, _textbox(0, _near(_span("Code:"))).value);
+        }
+    if ($code == ""){
+        _log($list[$i]+" code is empty", "custom1");
+    }
+    else{
+        _log($list[$i]+" is not empty ERROR", "error");
+    }
+    }
+    configCheckMaterial();
+    configCheckWorkReport();
+}
+function configCheckMaterial(){
+    var $code;
+    var $label;
+    _click(_link("Materials"));
+    _click(_span("z-dottree-ico z-dottree-firstspacer"));
+    _click(_cell("z-button-cm", _near(_span("List of materials for category: Imported materials without category"))));
+    _set($label, _textbox(0, _near(_span("List of materials for category: Imported materials without category"))).id);
+    _set($code, _textbox(0, _in(_cell(_parentTable(_textbox($label)),1,0))).value);
+    if ($code == ""){
+    _log("Material code is empty", "custom1");
+    }
+    else{
+    _log("Material is not empty ERROR", "error");
+    }
+}
+
+function configCheckWorkReport(){
+    _click(_link("NavalPlan Configuration"));
+    _click(_checkbox(0, _near(_label("Work report types"))));
+    _click(_cell("Save"));
+    commonWorkReportModelCreate("modelForConfiguration", "line")
+    configCheckWorkReportCreate();
+    commonWorkReportModelDelete("modelForConfiguration");
+    _click(_link("NavalPlan Configuration"));
+    _click(_checkbox(0, _near(_label("Work report types"))));
+    _click(_cell("Save"));
+}
+
+function configCheckWorkReportCreate(){
+    var $code;
+    _click(_cell("New work report"));
+    _click(_cell("Add new row"));
+    _set($code, _textbox(0, _near(_span("Code:"))).value);
+    if ($code == ""){
+    _log("Work report code is empty", "custom1");
+    }
+    else{
+    _log("Work report is not empty ERROR", "error");
+    }
+}
+
+function configPressCheckboxes($list){
+    for (var $i = 0; $i < $list.length; $i++){
+    _click(_checkbox(0, _near(_label($list[$i]))));
+    }
+}
+
+function configSaveValidation(){
+    _assertExists(_span("Changes saved"));
+    _assert(_isVisible(_span("Changes saved")));
+}
+
+/*
+ * Functions for configuration Calendar
+ */
+
+function configChangeCalendar($name){
+    commonCalendarCreate($name);
+    configChangeCalendarOption($name);
+    configCheckCalendar($name);
+    configChangeCalendarOption("Default");
+    commonCalendarDelete($name);
+    _log("Calendar option checked", "custom1");
+}
+
+function configChangeCalendarOption($name){
+    _click(_link("NavalPlan Configuration"));
+    _click(_italic(0, _near(_span("Default calendar"))));
+    _click(_div($name));
+    _click(_cell("Save"));
+}
+
+function configCheckCalendar($name){
+    configCheckCalendarWorker($name);
+    configCheckCalendarProject($name);
+}
+
+function configCheckCalendarWorker($name){
+    commonCreate("Workers");
+    _click(_span("Calendar"));
+    if (_condition(_textbox(0, _near(_cell("Select parent calendar"))).value == $name)){
+    _log("The correct calendar is assigned", "custom1");
+    }
+    else{
+    _log("This is not the correct calendar", "error");
+    }
+}
+
+function configCheckCalendarProject($name){
+    _click(_link("Projects List"));
+    _click(_image("ico_add.png"));
+    if (_condition(_textbox(0, _near(_span("Calendar"))).value == $name)){
+    _log("The correct calendar is assigned", "custom1");
+    }
+    else{
+    _log("This is not the correct calendar", "error");
+    }
+}
+
+/* test values */
+var $listCheckoxes = ["Criterion", "Label", "Work report", "Resources", "Types of work hours",
+"Material categories", "Unit Measures", "Calendar", "Work report types",
+"Calendar exception types", "Cost category", "MonteCarlo method", "Enable scenarios module",
+"Enable/Disable"];
+var $listMenuOptions = ["Criteria", "Exception Days", "Labels", "Unit Measures", "Work Hours",
+"Work Report Models", "Cost Categories", "Calendars", "Workers", "Machines"];
+var $calendarName = "CalendarForConfig";
+
+/* test actions */
+commonLogin("admin", "admin");
+
+configChangeInCheckboxes($listCheckoxes);
+configCheckChangesInCheckboxes($listMenuOptions);
+configChangeInCheckboxes($listCheckoxes);
+configChangeCalendar($calendarName);
+
+commonLogout();
diff --git a/scripts/functional-tests/administration-management/cost_categories_test.sah b/scripts/functional-tests/administration-management/cost_categories_test.sah
new file mode 100644
index 000000000..8bd9d5862
--- /dev/null
+++ b/scripts/functional-tests/administration-management/cost_categories_test.sah
@@ -0,0 +1,98 @@
+/*
+ * This file is part of NavalPlan
+ *
+ * Copyright (C) 2011 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/>.
+ */
+
+/* Included tests
+ *
+ * 1 - Create a new Cost Category
+ *   1.1 - Create a work hour data type
+ * 2 - Create a Cost Category with duplicate type (it should be a failure)
+ * 3 - Create a Cost Category with empty type (it should be a failure)
+ * 4 - Edit a Cost Category
+ * 5 - Delete Cost Category
+ *   5.1 - Delete the work hour data type
+ *
+*/
+_include("../common_functions.sah");
+
+function costCategoryAndWorkHourCreate($name, $hWorkType, $price) {
+    commonWorkHourCreate($hWorkType, $price);
+    commonCreate("Cost Categories");
+    commonCostCategoryForm($name, $hWorkType);
+    commonSaveValidation("Cost Category", $name);
+    _log("Create a new Cost Category", "custom1");
+}
+
+function costCategoryCreateDuplicateType($name, $hworkName) {
+    commonCreate("Cost Categories");
+    commonCostCategoryForm($name, $hworkName);
+    costCategoryNotValid();
+    _log("Do not allow create a cost category Duplicate", "custom1");
+}
+
+function costCategoryCreateEmpty($hworkName) {
+    commonCreate("Cost Categories");
+    commonCostCategoryForm("", $hworkName);
+    _assertExists(_div("name: name not specified"));
+    _assert(_isVisible(_div("name: name not specified")));
+    _log("Do not allow create an cost category without name", "custom1");
+}
+/*
+function costCategoryForm($name, $hworkName) {
+    _setValue(_textbox(0, _near(_span("Name:"))), $name);
+    _click(_cell("Add new row"));
+    _setSelected(_select(0), $hworkName);
+    _click(_cell("Save"));
+}
+*/
+/* test to check a that naval plan give us a error */
+function costCategoryNotValid(){
+    _assertExists(_div("checkConstraintUniqueName: the cost category name has to be unique. It is already used"));
+    _assert(_isVisible(_div("checkConstraintUniqueName: the cost category name has to be unique. It is already used")));
+}
+
+function costCategoryEdit($oldName, $newName, $cell) {
+    commonEdit($oldName, $cell);
+    _setValue(_textbox(0, _near(_span("Name:"))), $newName);
+    _click(_cell("Save & Continue"));
+    commonSaveValidation("Cost Category", $newName);
+    _log("Edit a cost category", "custom1");
+}
+
+/* test values */
+var $costCategoryName = "new";
+var $costCategoryName2 = "new2";
+var $costCategoryNewName = "newest";
+var $hWorkName = "hours";
+var $hWorkPrice = "12";
+
+
+/* test actions */
+commonLogin("admin", "admin");
+
+costCategoryAndWorkHourCreate($costCategoryName, $hWorkName, $hWorkPrice);
+costCategoryCreateDuplicateType($costCategoryName);
+costCategoryCreateEmpty();
+
+costCategoryEdit($costCategoryName, $costCategoryNewName, 2);
+
+commonDelete("Cost Categories", $costCategoryNewName, 2);
+commonDeleteValidation("Cost Category", $costCategoryNewName);
+_log("Delete de cost category", "custom1");
+commonWorkHourDelete($hWorkName);
+commonLogout();
diff --git a/scripts/functional-tests/administration-management/material_test.sah b/scripts/functional-tests/administration-management/material_test.sah
new file mode 100644
index 000000000..ab5b8efaf
--- /dev/null
+++ b/scripts/functional-tests/administration-management/material_test.sah
@@ -0,0 +1,163 @@
+/*
+ * This file is part of NavalPlan
+ *
+ * Copyright (C) 2011 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/>.
+ */
+
+/* Included tests
+ *
+ * 1 - Create a new Material
+ * 2 - Create a Material without any category selected
+ * 3 - Create a material with empty description (it should be a failure)
+ * 4 - Edit a Material
+ * 5 - Assign a mterial in a project
+ *   5.1 - Create a project
+ *   5.2 - Assign the material
+ *   5.3 - Try to delete the assigned material
+ *   5.4 _ Delete the calendar
+ * 6 - Delete Material
+ *
+*/
+_include("../common_functions.sah");
+
+function materialCreate($name) {
+    materialForm($name);
+    materialSaveValidation();
+    _log("Create a material", "custom1");
+}
+
+function materialCreateWithoutCategory(){
+    _click(_link("Materials"));
+    _click(_cell("z-button-cm[3]"));
+    materialWithoutCategoryValidation();
+}
+
+function materialCreateEmpty(){
+    materialForm("");
+    materialEmptyFieldValidation();
+    _log("Do not allow create empty materials", "custom1");
+}
+
+function materialForm($description) {
+    _click(_link("Materials"));
+    _click(_span("z-dottree-ico z-dottree-firstspacer"));
+    _click(_cell("z-button-cm[3]"));
+    _setValue(_textbox("z-textbox[2]"), $description);
+    _click(_cell("Save"));
+}
+
+/* test to check a that naval plan give us a error */
+function materialNotValid($material){
+    _assertExists(_div("There exists other Materials with the same name."));
+    _assert(_isVisible(_div("There exists other Materials with the same name.")));
+}
+
+function materialEdit($oldDescription, $newDescription, $cell) {
+    var $nrows;
+    var $table;
+    var $label;
+    _click(_link("Materials"));
+    _set($label, _textbox(0, _near(_span("List of materials for all categories (select one to filter)"))).id);
+    _set($nrows, _parentTable(_textbox($label)).rows.length);
+    for (var $i=1; $i<$nrows; $i++){
+    if (_condition(_textbox(0, _in(_cell(_parentTable(_textbox($label)),$i,1))).value == $oldDescription)){
+        var $idTextbox;
+        _set($idTextbox, _textbox(0, _in(_cell(_parentTable(_textbox($label)), $i, 1))).id);
+        _setValue(_textbox($idTextbox), $newDescription);
+        break;
+    }
+    }
+    _click(_cell("Save"));
+    _log("Edit a material", "custom1");
+}
+
+function materialAssignToProject($material, $project){
+    commonCreateProject($project);
+    commonEditProject($project);
+    _click(_span("Materials"));
+    _click(_cell("Add materials"));
+    _click(_div($material));
+    _click(_cell("Assign materials"));
+    _click(_image("ico_save.png"));
+    _click(_cell("OK"));
+    materialTryDeleteMaterial();
+    commonDeleteProject($project);
+    _log("Assign a material into a project", "custom1");
+}
+
+function materialTryDeleteMaterial(){
+    _click(_link("Materials"));
+    _assertExists(_image("ico_borrar_out.png"));
+    _assert(_isVisible(_image("ico_borrar_out.png")));
+    _log("Do not allow delete an assigned material", "custom1");
+}
+
+function materialDelete($materialNewName, $numer){
+    var $nrows;
+    var $table;
+    var $label;
+    _click(_link("Materials"));
+    _set($label,_textbox(0, _near(_span("List of materials for all categories (select one to filter)"))).id);
+    _set($nrows,_parentTable(_textbox($label)).rows.length);
+    for (var $i=1; $i<$nrows; $i++){
+    if (_condition(_textbox(0, _in(_cell(_parentTable(_textbox($label)),$i,1))).value == $materialNewName)){
+        var $idTextbox;
+        _set($idTextbox, _textbox(0, _in(_cell(_parentTable(_textbox($label)),$i,1))).id);
+        _click(_image("ico_borrar1.png", _in(_cell(6, _near(_textbox($idTextbox))))));
+        break;
+    }
+    }
+    _click(_cell("Save"));
+    _log("Delete the material", "custom1");
+}
+
+/*
+ * Validations
+ */
+
+function materialSaveValidation(){
+    _assertExists(_span("Materials saved"));
+    _assert(_isVisible(_span("Materials saved")));
+}
+
+function materialEmptyFieldValidation(){
+    _assertExists(_div("cannot be null or empty"));
+    _assert(_isVisible(_div("cannot be null or empty")));
+}
+
+function materialWithoutCategoryValidation(){
+    _assertExists(_div("Cannot insert material in general view. Please, select a category"));
+    _assert(_isVisible(_div("Cannot insert material in general view. Please, select a category")));
+}
+
+/* test values */
+var $materialDescription = "new";
+var $materialDescription2 = "new2";
+var $materialNewName = "newest";
+var $projectName = "ProjectForMaterials";
+var $category = "NewCategory";
+/* test actions */
+commonLogin("admin", "admin");
+
+materialCreate($materialDescription);
+materialCreateEmpty();
+materialCreateWithoutCategory();
+materialEdit($materialDescription, $materialDescription2, 6);
+materialAssignToProject($materialDescription2, $projectName);
+materialDelete($materialDescription2, 6);
+/* commonDeleteValidation("Materials", $materialNewName); PENDING OF A BUG */
+
+commonLogout();
diff --git a/scripts/functional-tests/administration-management/quality_forms_test.sah b/scripts/functional-tests/administration-management/quality_forms_test.sah
new file mode 100644
index 000000000..c88fb0588
--- /dev/null
+++ b/scripts/functional-tests/administration-management/quality_forms_test.sah
@@ -0,0 +1,136 @@
+/*
+ * This file is part of NavalPlan
+ *
+ * Copyright (C) 2011 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/>.
+ */
+
+/* Included tests
+ *
+ * 1 - Create a new Quality Form
+ * 2 - Create a Quality Form with duplicate name (it should be a failure)
+ * 3 - Create a Quality Form with empty type (it should be a failure)
+ * 4 - Create a Quality Form with duplicate items (it should be a failure)
+ * 5 - Edit the Quality Form
+ * 6 - Assign this Quality form to a project
+ *   6.1 - Create a project
+ *   6.2 - Assign the Quality form
+ *   6.3 - TRY TO DELETE IT(PENDING OF A BUG)
+ *   6.4 - Delete the project
+ * 6 - Delete the Quality Form
+ *
+*/
+
+_include("../common_functions.sah");
+
+function qualityFormCreate($name, $item) {
+    commonCreate("Quality Forms");
+    qualityForm($name, $item);
+    commonSaveValidation("Quality Form", $name);
+    _log("Create a new quality form", "custom1");
+}
+
+function qualityFormCreateDuplicateName($name, $item) {
+    commonCreate("Quality Forms");
+    qualityForm($name, $item);
+    qualityFormNotValid($name);
+    _log("Do not allow create a quality form with duplicate name", "custom1");
+}
+
+function qualityFormCreateEmpty($item) {
+    commonCreate("Quality Forms");
+    qualityForm("", $item);
+    _assertExists(_div("cannot be empty"));
+    _assert(_isVisible(_div("cannot be empty")));
+    _log("Do not allow create a quality form without name", "custom1");
+}
+
+function qualityFormCreateDuplicateItem($name, $item) {
+    commonCreate("Quality Forms");
+    _setValue(_textbox(0, _near(_span("Name"))), $name);
+    _click(_cell("New quality form item"));
+    _setValue(_textbox(0, _near(_div("Quality form items list"))), $item);
+    _setValue(_textbox("z-decimalbox", _in(_cell(2, _near(_span("1"))))),"10");
+    _click(_cell("New quality form item"));
+    _setValue(_textbox(0, _near(_div("Quality form items list"))), $item);
+    _click(_cell("Save"));
+    qualityFormNotValid($item);
+    _log("Do not allow create a quality form with duplicate items", "custom1");
+}
+
+function qualityForm($name, $item) {
+    _setValue(_textbox(0, _near(_span("Name"))), $name);
+    _click(_cell("New quality form item"));
+    _setValue(_textbox(0, _near(_div("Quality form items list"))), $item);
+    _setValue(_textbox("z-decimalbox", _in(_cell(2, _near(_span("1"))))),"10");
+    _click(_cell("Save"));
+}
+
+function qualityFormEdit($oldName, $newName, $cell) {
+    _click(_link("Quality Forms"));
+    commonEdit($oldName, $cell);
+    _setValue(_textbox(0, _near(_span("Name"))), $newName);
+    _click(_cell("Save & Continue"));
+    commonSaveValidation("Quality Form", $newName);
+    _log("Edit the quality form", "custom1");
+}
+
+function qualityFormAssign($qualityFormName, $project){
+    commonCreateProject($project);
+    qualityFormAssingProject($qualityFormName, $project);
+    commonDeleteProject($project);
+    _log("Assign quality form in a project", "custom1");
+}
+
+function qualityFormAssingProject($qualityFormName, $project){
+    _click(_link("Projects List"));
+    _click(_image("ico_editar1.png", _in(_cell(8,_near(_cell($project))))));
+    _click(_span("Task quality forms"));
+    _click(_italic(0, _near(_span("Assign quality form"))));
+    _click(_div("newest",_near(_span("Assign quality form"))))
+    _click(_cell("z-button-cm", _near(_span("Assign quality form"))))
+    _click(_image("ico_save.png"));
+}
+
+/*
+ * Validations
+ */
+
+function qualityFormNotValid($name){
+    _assertExists(_div($name+" already exists"));
+    _assert(_isVisible(_div($name+" already exists")));
+}
+
+/* test values */
+var $qualityFormName = "new";
+var $qualityFormName2 = "new2";
+var $qualityFormNewName = "newest";
+var $qualityFormitem = "item";
+var $projectName = "new Project";
+
+/* test actions */
+commonLogin("admin", "admin");
+
+qualityFormCreate($qualityFormName, $qualityFormitem);
+qualityFormCreateDuplicateName($qualityFormName, $qualityFormitem);
+qualityFormCreateEmpty($qualityFormitem);
+qualityFormCreateDuplicateItem($qualityFormName2, $qualityFormitem);
+qualityFormEdit($qualityFormName, $qualityFormNewName, 2);
+qualityFormAssign($qualityFormNewName, $projectName);
+commonDelete("Quality Forms", $qualityFormNewName, 2);
+commonDeleteValidation("Quality Form", $qualityFormNewName);
+_log("Delete the quality form", "custom1");
+
+commonLogout();
diff --git a/scripts/functional-tests/all_test.suite b/scripts/functional-tests/all_test.suite
new file mode 100644
index 000000000..0733047db
--- /dev/null
+++ b/scripts/functional-tests/all_test.suite
@@ -0,0 +1,28 @@
+# Data Type tests
+data-types/progress_test.sah
+data-types/criteria_test.sah
+data-types/unit_measures_test.sah
+data-types/label_test.sah
+data-types/work_report_model.sah
+data-types/exception_days_test.sah
+data-types/work_hours_test.sah
+
+# User tests
+users/user_test.sah
+users/profile_test.sah
+
+# Administration and Management
+administration-management/configuration_test.sah
+administration-management/calendar_test.sah
+administration-management/material_test.sah
+administration-management/quality_forms_test.sah
+administration-management/cost_categories_test.sah
+
+# Resources
+
+resources/worker_test.sah
+resources/machines_test.sah
+resources/virtual_worker_test.sah
+resources/work_report_test.sah
+resources/companies_test.sah
+resources/subcontracting_test.sah
diff --git a/scripts/functional-tests/common_functions.sah b/scripts/functional-tests/common_functions.sah
index 0eb40b726..6fce01d6b 100644
--- a/scripts/functional-tests/common_functions.sah
+++ b/scripts/functional-tests/common_functions.sah
@@ -49,16 +49,21 @@ function commonDelete ($something, $name, $cell) {
 
 /* Create new project */
 function commonCreateProject($name){
-    _click(_link("Projects"));
+    _click(_link("Projects List"));
     _click(_image("ico_add.png"));
     _setValue(_textbox(6), $name);
     _click(_cell("Accept"));
     _click(_image("ico_save.png"));
 }
 
+function commonEditProject($name){
+    _click(_link("Projects List"));
+    _click(_image("ico_editar1.png", _in(_cell(8,_near(_cell($name))))));
+}
+
 /* Delete a project */
 function commonDeleteProject($name){
-    _click(_link("Projects"));
+    _click(_link("Projects List"));
     _click(_image("ico_borrar1.png", _in(_cell(8, _near(_cell($name))))));
     _click(_cell("OK"));
     _assertExists(_div("Removed "+$name));
@@ -66,6 +71,39 @@ function commonDeleteProject($name){
     _assertEqual("Removed "+$name, _getText(_div("Removed "+$name)));
 }
 
+/* Create a task in a project */
+function commonCreateTask($projectName, $name, $hours){
+    _click(_link("Projects List"));
+    _click(_image("ico_editar1.png", _in(_cell(8,_near(_cell($projectName))))));
+    _setValue(_textbox(0, _near(_span("New task:"))), $name);
+    _setValue(_textbox("z-intbox", _near(_span("Hours:"))), $hours);
+    _click(_cell("Add"));
+    _click(_image("ico_save.png"));
+    _click(_cell("OK"));
+    _log("Create a task", "custom1");
+}
+
+function commonConfigurationChangeCheckboxMainPreferences($element){
+    _click(_link("NavalPlan Configuration"));
+    _click(_checkbox(0, _near(_label($element))));
+    _click(_cell("Save"));
+    commonSaveConfigurationValidation();
+}
+
+/*
+ * Common functions for Validations
+ */
+
+function commonSaveConfigurationValidation(){
+    _assertExists(_span("Changes saved"));
+    _assert(_isVisible(_span("Changes saved")));
+}
+
+function commonEmptyCodeValidation(){
+    _assertExists(_div("cannot be null or empty"));
+    _assert(_isVisible(_div("cannot be null or empty")));
+}
+
 /* test to check a correct save */
 function commonSaveValidation($something, $name){
     _assertExists(_div($something+" \""+$name+"\" saved"));
@@ -80,19 +118,338 @@ function commonDeleteValidation($something, $name){
     _assertEqual($something+" \""+$name+"\" deleted", _getText(_div($something+" \""+$name+"\" deleted")));
 }
 
-function commonConfigurationChangeCheckboxMainPreferences($element){
-    _click(_link("NavalPlan Configuration"));
-    _click(_checkbox(0, _near(_label($element))));
+/*
+ * commmon functions for Workers, Machines and Virtual Workers
+ */
+
+function commonResourceEditAssignedCriteriaForm($element, $name, $cell, $criterion){
+    _click(_link($element));
+    commonEdit($name, $cell);
+    _click(_span("Assigned criteria"));
+    _click(_cell("Add", _near(_span("New criterion"))));
     _click(_cell("Save"));
-    commonSaveConfigurationValidation();
+    commmonResourceEmptyFields();
+    _click(_italic(0, _near(_tableHeader("Criterion name"))));
+    _click(_div($criterion));
+    _click(_cell("Save"));
+    _log("Assign the created Criterion", "custom1");
 }
 
-function commonSaveConfigurationValidation(){
-    _assertExists(_span("Changes saved"));
-    _assert(_isVisible(_span("Changes saved")));
+function commonResourceEditAssignedCalendarForm($element, $name, $cell, $calendar){
+    _click(_link($element));
+    commonEdit($name, $cell);
+    _click(_cell("Remove calendar"));
+    _click(_span("Calendar"))
+    _click(_italic(0, _near(_span("Select parent calendar"))));
+    _click(_cell($calendar));
+    _click(_cell("Save"));
+    _log("Assign the created calendar", "custom1");
 }
 
-function commonEmptyCodeValidation(){
-    _assertExists(_div("cannot be null or empty"));
-    _assert(_isVisible(_div("cannot be null or empty")));
+function commonResourceEditAssignedCostCategoryForm($element, $name, $cell, $ccategory){
+    _click(_link($element));
+    commonEdit($name, $cell);
+    _click(_cell("Add new row"));
+    _click(_cell("Save"));
+    commonResourceEmptyCategoryName();
+    _click(_italic(0, _near(_div("Category name"))));
+    _click(_cell($ccategory+"[1]"));
+    _click(_cell("Save"));
+    commonResourceEmptyCategoryDate();
+    _click(_italic(1, _near(_div("Category name"))));
+    _click(_cell("z-calendar-wkday z-calendar-seld", _near(_div("Category name"))));
+    _click(_cell("Save"));
+}
+
+function commmonResourceEmptyFields(){
+    _assertExists(_div("This field may not be empty or contain only spaces."));
+    _assert(_isVisible(_div("This field may not be empty or contain only spaces.")));
+}
+
+function commonResourceEmptyCategoryName(){
+    _assertExists(_div("A category must be selected"));
+    _assert(_isVisible(_div("A category must be selected")));
+}
+
+function commonResourceEmptyCategoryDate(){
+_assertExists(_div("The init date cannot be empty"));
+_assert(_isVisible(_div("The init date cannot be empty")));
+}
+
+/*
+ * Common functions for Workers
+ */
+
+function commonWorkerDelete($name){
+commonDelete("Workers", $name, 5);
+commonWorkerAcctionValidation("deleted");
+_log("Delete the worker", "custom1");
+}
+
+function commonWorkerAcctionValidation($action){
+    _assertExists(_span("Worker "+$action));
+    _assert(_isVisible(_span("Worker "+$action)));
+}
+
+/*
+ * Common functions for Machines
+ */
+
+function commonMachineCreate($name, $description) {
+    commonCreate("Machines");
+    commonMachineForm($name, $description);
+    commonSaveValidation("Machine", $name);
+    _log("Create a new Machine", "custom1");
+}
+
+function commonMachineForm($name, $description) {
+    _setValue(_textbox(0, _near(_span("Name"))), $name);
+    _setValue(_textbox(0, _near(_span("Description"))), $description);
+    _click(_cell("Save"));
+}
+
+function commonMachineDelete($name){
+    commonDelete("Machines", $name, 4);
+    commonDeleteValidation("Machine", $name);
+    _log("Delete the machine", "custom1");
+}
+
+/*
+ * Common functions for Companies
+ */
+
+function commonCompanyCreate($name, $ID) {
+    commonCreate("Companies");
+    commonCompanyForm($name, $ID);
+    commonSaveValidation("Company", $name);
+    _log("Create a company", "custom1");
+}
+
+function commonCompanyForm($name, $ID) {
+    _setValue(_textbox(0, _near(_span("Company name:"))), $name);
+    _setValue(_textbox(0, _near(_span("Company ID:"))), $ID);
+    _click(_checkbox(0, _near(_span("Client:"))));
+    _click(_checkbox(0, _near(_span("Subcontractor:"))));
+    _setValue(_textbox(0, _near(_span("User:"))), "wswriter");
+    _click(_checkbox(0, _near(_span("Interacts with applications:"))));
+    _setValue(_textbox(0, _near(_span("Application URI:"))), "http://localhost:8080/navalplanner-webapp/");
+    _setValue(_textbox(0, _near(_span("Our company login:"))), "wswriter");
+    _setValue(_textbox(0, _near(_span("Our company password:"))), "wswriter");
+    _click(_cell("Save"));
+}
+
+function commonCompanyDelete($name){
+    commonDelete("Companies", $name, 5);
+    commonDeleteValidation("Company", $name);
+    _log("Delete a company", "custom1");
+}
+
+/*
+ * Common functions for Calendars
+ */
+
+function commonCalendarCreate($name) {
+    commonCreate("Calendars");
+    commonCalendarForm($name);
+    commonSaveValidation("Base calendar", $name);
+    _log("Create a new calendar", "custom1");
+}
+
+function commonCalendarForm($name) {
+    _setValue(_textbox(0, _near(_span("Name"))), $name);
+    _click(_cell("Save"));
+}
+
+function commonCalendarTryDeleteAssignedCalendar($name, $cell) {
+    _click(_link("Calendars"));
+    _click(_image("ico_borrar1.png", _in(_cell($cell, _near(_cell($name))))));
+    _assertExists(_span("Cannot delete calendar. It is being used at this moment by some resources."));
+    _assert(_isVisible(_span("Cannot delete calendar. It is being used at this moment by some resources.")));
+    _log("Do not allow delete assigned calendar", "custom1");
+}
+
+function commonCalendarDelete($name){
+    commonDelete("Calendars", $name, 3);
+    commonCalendarDeleteValidation($name);
+    _log("Delete de Calendar", "custom1");
+}
+
+function commonCalendarDeleteValidation($name) {
+    _assertExists(_span("Removed calendar \""+$name+"\""));
+    _assert(_isVisible(_span("Removed calendar \""+$name+"\"")));
+}
+
+/*
+ * Common functions for Cost Category
+ */
+
+function commonCostCategoryCreate($name, $hworkName){
+    commonCreate("Cost Categories");
+    commonCostCategoryForm($name, $hworkName);
+    commonSaveValidation("Cost Category", $name);
+    _log("Create a Cost Category", "custom1");
+}
+
+function commonCostCategoryForm($name, $hworkName){
+    _setValue(_textbox(0, _near(_span("Name:"))), $name);
+    _click(_cell("Add new row"));
+    _setSelected(_select(0), $hworkName);
+    _click(_cell("Save"));
+}
+
+function commonCostCategoryDelete($name){
+    commonDelete("Cost Categories", $name, 2);
+    commonDeleteValidation("Cost Category", $name);
+    _log("Delete de cost category", "custom1");
+}
+
+function commonCostCategoryTryDeleteAssignedCostCategory($cCategory, $cell){
+    _click(_link("Cost Categories"));
+    _assertExists(_image("ico_borrar_out.png"));
+    _assert(_isVisible(_image("ico_borrar_out.png")));
+    _log("Do not allow delete assigned cost category", "custom1");
+}
+
+/*
+ * Common functions for Progress
+ */
+
+function commonProgressCreate($name) {
+    commonCreate("Progress");
+    commonProgressForm($name);
+    commonSaveValidation("Progress Type", $name);
+    _log("Create a progress", "custom1");
+}
+
+
+function commonProgressForm($name) {
+    _setValue(_textbox(0, _near(_div("Unit name"))), $name);
+    _removeFocus(_textbox(0, _near(_div("Unit name"))));
+    _click(_cell("Save"));
+}
+
+function commonProgressAssigned($projectName, $progressNewName){
+    commonCreateProject($projectName);
+    commonProgressAssignProject($projectName, $progressNewName);
+    _click(_link("Progress"));
+    commonDeleteProject($projectName);
+}
+
+function commonProgressAssignProject($projectName, $progressNewName){
+    commonEditProject($projectName);
+    _click(_span("Progress"));
+    _click(_cell("Add new progress assignment"));
+    _setValue(_textbox("z-combobox-inp", _near(_row("footer"))), $progressNewName);
+    _click(_cell("z-button-cm", _near(_textbox("z-combobox-inp"))));
+    _setValue(_textbox(0, _near(_parentTable(_div("Value")))), "30");
+    _click(_image("ico_save.png"));
+    _click(_cell("OK"));
+    _log("Progress assigned", "custom1");
+}
+
+function commonProgressDelete($name){
+    commonDelete("Progress", $progressNewName, 3);
+    commonDeleteValidation("Progress Type", $progressNewName);
+    _log("Delete the progress", "custom1");
+}
+
+/*
+ * Common functions for Criteria
+ */
+
+function commonCriteriaCreate($type){
+    commonCreate("Criteria");
+    commonCriteriaForm($type);
+    commonSaveValidation("Criterion Type", $type);
+    _log("Create a new criterion", "custom1");
+}
+
+function commonCriteriaEdit($oldName, $newName, $cell){
+    commonEdit($oldName, $cell);
+    _setValue(_textbox(0, _near(_span("Name"))), $newName);
+    _removeFocus(_textbox(0, _near(_span("Name"))), $newName);
+    _click(_cell("Save & Continue"));
+    commonSaveValidation("Criterion Type", $newName);
+    _log("Edit a criterion", "custom1");
+}
+
+function commonCriteriaForm($name){
+    _setValue(_textbox(0, _near(_span("Name"))), $name);
+    _click(_checkbox(0, _near(_div("Multiple values per resource"))));
+    _click(_checkbox(0, _near(_div("Hierarchy"))));
+    _click(_cell("OK"));
+    _setValue(_textbox(0, _near(_span("New criterion"))), $name);
+    _click(_cell("Add"));
+    _click(_cell("Save"));
+}
+
+function commonCriteriaDelete($criteriaName){
+    commonDelete("Criteria", $criteriaName, 4);
+    commonDeleteValidation("Criterion Type", $criteriaName);
+    _log("Delete the criteria", "custom1");
+}
+
+function commonCriteriaTryDeleteAssigned($criteriaName){
+    _click(_link("Criteria"));
+    _click(_image("ico_borrar1.png", _in(_cell(4, _near(_cell($criteriaName))))));
+    _assertExists(_span("This criterion type cannot be deleted because it has assignments to projects or resources"));
+    _assert(_isVisible(_span("This criterion type cannot be deleted because it has assignments to projects or resources")));
+    _log("Do not allow criteria because it's assigned", "custom1");
+}
+
+/*
+ * Common functions for Work Report Model
+ */
+
+function commonWorkReportModelCreate($name, $type){
+    commonCreate("Work Report Models");
+    commonWorkReportModelForm($name, $type);
+    commonSaveValidation("Work Report Type", $name);
+    _log("Create a new Work Report Model", "custom1");
+}
+
+function commonWorkReportModelForm($name, $type){
+    _setValue(_textbox(0, _near(_span("Name:"))), $name);
+    _removeFocus(_textbox(0, _near(_div("Name:"))));
+    _setSelected(_select(0, _near(_span("Task:"))), $type);
+    _click(_cell("Add New Complementary Field"));
+    _setValue(_textbox(0, _near(_div("Complementary text fields"))), $name);
+    _setValue(_textbox(1, _near(_div("Complementary text fields"))), "12");
+    _click(_cell("Save"));
+}
+
+function commonWorkReportModelEdit($oldName, $newName, $cell){
+    commonEdit($oldName, $cell);
+    commonWorkReportModelForm($newName);
+    commonSaveValidation("Work Report Type", $newName);
+    _log("Edit a Work Report Model", "custom1");
+}
+
+function commonWorkReportModelDelete($name){
+    commonDelete("Work Report Models", $name, 1);
+    commonDeleteValidation("Work Report Type", $name);
+    _log("Delete the Work Report Model", "custom1");
+}
+
+/*
+ * Common functions for Work hours
+ */
+
+function commonWorkHourCreate($type, $price){
+    commonCreate("Work Hours");
+    commonWorkHourForm($type, $price);
+    commonSaveValidation("Type of hours", $type);
+    _log("Create a new Work Hour", "custom1");
+}
+
+function commonWorkHourForm($name, $price){
+    _setValue(_textbox(0, _near(_span("Name"))), $name);
+    _setValue(_textbox(0, _near(_span("Default price"))), $price);
+    _click(_cell("Save"));
+}
+
+function commonWorkHourDelete($name){
+    commonDelete("Work Hours", $name, 4);
+    commonDeleteValidation("Type of hours", $name);
+    _log("Delete the Work Hour", "custom1");
 }
diff --git a/scripts/functional-tests/data-types/all_data_type_test.suite b/scripts/functional-tests/data-types/all_data_type_test.suite
new file mode 100644
index 000000000..165f77477
--- /dev/null
+++ b/scripts/functional-tests/data-types/all_data_type_test.suite
@@ -0,0 +1,7 @@
+progress_test.sah
+criteria_test.sah
+unit_measures_test.sah
+label_test.sah
+work_report_model.sah
+exception_days_test.sah
+work_hours_test.sah
diff --git a/scripts/functional-tests/data-types/criteria_test.sah b/scripts/functional-tests/data-types/criteria_test.sah
index 2f88de03d..a9ee5a1dd 100644
--- a/scripts/functional-tests/data-types/criteria_test.sah
+++ b/scripts/functional-tests/data-types/criteria_test.sah
@@ -28,29 +28,23 @@
  * 7 - Edit a criterion
  * 8 - Check code
  *   8.1 - Change configuration
- *   8.2 - Try to create a new Criterion without Code (it should be a failure)
+ *   8.2 - Try to create a new criterion without Code (it should be a failure)
  *   8.3 - Change configuration like before
  * 9 - Delete all criteria
+ *
 */
 _include("../common_functions.sah");
 
-function criteriaCreate($type){
-    commonCreate("Criteria");
-    criteriaForm($type);
-    commonSaveValidation("Criterion Type", $type);
-    _log("Create a new criterion", "custom1");
-}
-
 function criteriaCreateDuplicateType($type){
     commonCreate("Criteria");
-    criteriaForm($type);
+    commonCriteriaForm($type);
     criteriaNotValid();
     _log("Do not allow create a criterion Duplicate type", "custom1");
 }
 
 function criteriaCreateEmpty(){
     commonCreate("Criteria");
-    criteriaForm("");
+    commonCriteriaForm("");
     _assertExists(_div("name: criterion type name not specified"));
     _assert(_isVisible(_div("name: criterion type name not specified")));
     _log("Do not allow create a criterion with empty type", "custom1");
@@ -107,16 +101,6 @@ function criteriaEdit($oldName, $newName, $cell){
     _log("Edit a criterion", "custom1");
 }
 
-function criteriaForm($name){
-    _setValue(_textbox(0, _near(_span("Name"))), $name);
-    _click(_checkbox(0, _near(_div("Multiple values per resource"))));
-    _click(_checkbox(0, _near(_div("Hierarchy"))));
-    _click(_cell("OK"));
-    _setValue(_textbox(0, _near(_span("New criterion"))), $name);
-    _click(_cell("Add"));
-    _click(_cell("Save"));
-}
-
 /* test to check a that naval plan give us a error */
 function criteriaNotValid(){
     _assertExists(_div("checkConstraintUniqueCriterionTypeName: criterion type name is already being used"));
@@ -132,7 +116,7 @@ function criteriaCheckCode($criteriaType){
 
 function criteriaCreateWithoutCode($type){
     commonCreate("Criteria");
-    criteriaForm($type);
+    commonCriteriaForm($type);
     commonEmptyCodeValidation();
 }
 
@@ -148,23 +132,17 @@ var $criteriaName2 = "criterion2";
 /* test actions */
 commonLogin("admin","admin");
 
-criteriaCreate($criteriaType);
+commonCriteriaCreate($criteriaType);
 criteriaCreateDuplicateType($criteriaType);
 criteriaCreateEmpty();
 criteriaCreateDuplicateName($criteriaType2, $criteriaName);
 criteriaCreateWithHierarchy($criteriaType2, $criteriaName, $criteriaName2);
 criteriaCreateWithoutHierarchy($criteriaType3, $criteriaName, $criteriaName2);
-
 criteriaEdit($criteriaType, $criteriaNewType, 4);
-
 criteriaCheckCode($criteriaType);
-
-commonDelete("Criteria", $criteriaNewType, 4);
-commonDeleteValidation("Criterion Type", $criteriaNewType);
-commonDelete("Criteria", $criteriaType2, 4);
-commonDeleteValidation("Criterion Type", $criteriaType2);
-commonDelete("Criteria", $criteriaType3, 4);
-commonDeleteValidation("Criterion Type", $criteriaType3);
-_log("Delete all criteria", "custom1");
+commonCriteriaDelete($criteriaNewType);
+commonCriteriaDelete($criteriaType2);
+commonCriteriaDelete($criteriaType3);
+_log("Deleted all criteria", "custom1");
 
 commonLogout();
diff --git a/scripts/functional-tests/data-types/label_test.sah b/scripts/functional-tests/data-types/label_test.sah
index 0eca741e1..a9e513a0e 100755
--- a/scripts/functional-tests/data-types/label_test.sah
+++ b/scripts/functional-tests/data-types/label_test.sah
@@ -102,7 +102,7 @@ function labelAssig($project, $labelName, $labelType2){
 }
 
 function labelAssignProject($project){
-    _click(_link("Projects"));
+    _click(_link("Projects List"));
     _click(_image("ico_editar1.png", _in(_cell(8, _near(_cell($project))))));
     _click(_span("Label"));
     _click(_textbox(0, _near(_cell("Assign"))));
diff --git a/scripts/functional-tests/data-types/progress_test.sah b/scripts/functional-tests/data-types/progress_test.sah
index 23cd61614..f01b368d1 100644
--- a/scripts/functional-tests/data-types/progress_test.sah
+++ b/scripts/functional-tests/data-types/progress_test.sah
@@ -136,7 +136,7 @@ function progressAssigned($projectName, $progressNewName){
 }
 
 function progressAssignProject($projectName, $progressNewName){
-    _click(_link("Projects"));
+    _click(_link("Projects List"));
     _click(_image("ico_editar1.png", _in(_cell(8,_near(_cell($projectName))))));
     _click(_span("Progress"));
     _click(_cell("Add new progress assignment"));
diff --git a/scripts/functional-tests/data-types/work_hours_test.sah b/scripts/functional-tests/data-types/work_hours_test.sah
index 888b77a8d..a8ba3e3be 100644
--- a/scripts/functional-tests/data-types/work_hours_test.sah
+++ b/scripts/functional-tests/data-types/work_hours_test.sah
@@ -49,34 +49,21 @@
 */
 _include("../common_functions.sah");
 
-function workHourCreate($type, $price){
-    commonCreate("Work Hours");
-    workHourForm($type, $price);
-    commonSaveValidation("Type of hours", $type);
-    _log("Create a new Work Hour", "custom1");
-}
-
 function workHourCreateDuplicateType($type, $price){
     commonCreate("Work Hours");
-    workHourForm($type, $price);
+    commonWorkHourForm($type, $price);
     workHourNotValid($type);
     _log("Do not allow create a duplicate Work Hour", "custom1");
 }
 
 function workHourCreateEmpty(){
     commonCreate("Work Hours");
-    workHourForm("", 10);
+    commonWorkHourForm("", 10);
     _assertExists(_div("cannot be null or empty"));
     _assert(_isVisible(_div("cannot be null or empty")));
     _log("Do not allow create a empty Work Hour", "custom1");
 }
 
-function workHourForm($name, $price){
-    _setValue(_textbox(0, _near(_span("Name"))), $name);
-    _setValue(_textbox(0, _near(_span("Default price"))), $price);
-    _click(_cell("Save"));
-}
-
 /* test to check a that naval plan give us a error */
 function workHourNotValid($hWorkType){
     _assertExists(_span("checkConstraintUniqueName: the type of work hours name has to be unique. It is already used"));
@@ -85,26 +72,25 @@ function workHourNotValid($hWorkType){
 
 function workHourEdit($oldName, $newName, $hWorkPrice, $cell) {
     commonEdit($oldName, $cell);
-    workHourForm($newName, $hWorkPrice);
+    commonWorkHourForm($newName, $hWorkPrice);
     commonSaveValidation("Type of hours", $newName);
     _log("Edit the Work Hour", "custom1");
 }
 
 function workHourAssign($hWorkNewName, $ModelName, $materialName, $materialDescription){
-    reportModelCreate($ModelName);
+    commonWorkReportModelCreate($ModelName);
     commonCreateProject("new project");
-    machineCreate($materialName, $materialDescription);
+    commonMachineCreate($materialName, $materialDescription);
     workReportCreate($materialName, "new project", $hWorkNewName);
     workHourTryDelete($hWorkNewName, "work report line");
     reportModelTryDelete($ModelName);
     commonTryDeleteProject("new project");
     commonDelete("Work Reports", $ModelName, 4);
+    // Pending of a bug 1131
+    // workReportDeleteValidation();
     commonDeleteProject("new project");
-    commonDelete("Machines", $materialName, 4);
-    commonDeleteValidation("Machine", $materialName);
-    commonDeleteValidation("Machine", $materialName);
-    commonDelete("Work Report Models", $ModelName, 1);
-    commonDeleteValidation("Work Report Type", $ModelName);
+    commonMachineDelete($materialName);
+    commonWorkReportModelDelete($ModelName);
     _log("Assign the work hour to project", "custom1");
 }
 
@@ -117,41 +103,23 @@ function workHourTryDelete($hWorkNewName,$something){
     _log("Do not allow delete the Work Hour", "custom1");
 }
 
-/*
- * Functions of Maquines
- * */
-
-function machineCreate($name, $description){
-    commonCreate("Machines");
-    machineForm($name, $description);
-    commonSaveValidation("Machine", $name);
-    _log("Create a new machine", "custom1");
+function workHourCheckCode($workHourName){
+    commonConfigurationChangeCheckboxMainPreferences("Types of work hours");
+    workHourCreateWithoutCode($workHourName);
+    commonConfigurationChangeCheckboxMainPreferences("Types of work hours");
+    _log("Check code label", "custom1");
 }
 
-function machineForm($name, $description){
-    _setValue(_textbox(0, _near(_span("Name"))), $name);
-    _setValue(_textbox(0, _near(_span("Description"))), $description);
-    _click(_cell("Save"));
+function workHourCreateWithoutCode($type){
+    commonCreate("Work Hours");
+    commonWorkHourForm($type);
+    commonEmptyCodeValidation();
 }
 
 /*
  * Functions of Report Model
  * */
 
-function reportModelCreate($modelName) {
-    commonCreate("Work Report Models");
-    reportModelForm($modelName);
-    commonSaveValidation("Work Report Type", $modelName);
-    _log("Create a Work Report Model", "custom1");
-}
-
-function reportModelForm($name) {
-    _setValue(_textbox(0, _near(_span("Name:"))), $name);
-    _removeFocus(_textbox(0, _near(_span("Name:"))));
-    _click(_cell("Save & Continue"));
-    _click(_cell("Save"));
-}
-
 function reportModelTryDelete($ModelName){
     _click(_link("Work Report Models"));
     _click(_image("ico_borrar1.png", _in(_cell(1, _near(_cell($ModelName))))));
@@ -185,7 +153,7 @@ function workReportForm($machine, $project, $workHour) {
 }
 
 function commonTryDeleteProject($name){
-    _click(_link("Projects"));
+    _click(_link("Projects List"));
     _click(_image("ico_borrar1.png", _in(_cell(8, _near(_cell($name))))));
     _click(_cell("OK"));
     _assertExists(_div("You can not remove the project \"new project\" because of any of its tasks are already in use in some work reports and the project just exists in the current scenario"));
@@ -198,40 +166,12 @@ function commonTryDeleteProject($name){
  * */
 
 function workHourAssignCostCategory($categoryName, $hworkName){
-    costCategoryCreate($categoryName, $hworkName);
+    commonCostCategoryCreate($categoryName, $hworkName);
     workHourTryDelete($hWorkName,"cost category");
-    commonDelete("Cost Categories", $categoryName, 2);
-    commonDeleteValidation("Cost Category", $categoryName);
+    commonCostCategoryDelete($categoryName);
     _log("Assign to a Cost Category", "custom1");
 }
 
-function costCategoryCreate($name, $hworkName){
-    commonCreate("Cost Categories");
-    costCategoryForm($name, $hworkName);
-    commonSaveValidation("Cost Category", $name);
-    _log("Create a Cost Category", "custom1");
-}
-
-function costCategoryForm($name, $hworkName){
-    _setValue(_textbox(0, _near(_span("Name:"))), $name);
-    _click(_cell("Add new row"));
-    _setSelected(_select(0), $hworkName);
-    _click(_cell("Save"));
-}
-
-function workHourCheckCode($workHourName){
-    commonConfigurationChangeCheckboxMainPreferences("Types of work hours");
-    workHourCreateWithoutCode($workHourName);
-    commonConfigurationChangeCheckboxMainPreferences("Types of work hours");
-    _log("Check code label", "custom1");
-}
-
-function workHourCreateWithoutCode($type){
-    commonCreate("Work Hours");
-    workHourForm($type);
-    commonEmptyCodeValidation();
-}
-
 /* test values */
 var $hWorkName = "new";
 var $hWorkNewName = "newest";
@@ -244,19 +184,15 @@ var $materialDescription = "strongeMachine";
 /* test actions */
 commonLogin("admin", "admin");
 
-workHourCreate($hWorkName, $hWorkPrice);
+commonWorkHourCreate($hWorkName, $hWorkPrice);
 workHourCreateDuplicateType($hWorkName, $hWorkPrice);
 workHourCreateEmpty();
 workHourEdit($hWorkName, $hWorkNewName, $hWorkPrice, 4);
 workHourAssign($hWorkNewName, $ModelName, $materialName, $materialDescription);
 workHourCheckCode($hWorkName);
-
-commonDelete("Work Hours", $hWorkNewName, 4);
-commonDeleteValidation("Type of hours", $hWorkNewName);
-
-workHourCreate($hWorkName, $hWorkPrice);
+commonWorkHourDelete($hWorkNewName);
+commonWorkHourCreate($hWorkName, $hWorkPrice);
 workHourAssignCostCategory($cCategoryName, $hWorkName);
-commonDelete("Work Hours", $hWorkName, 4);
-commonDeleteValidation("Type of hours", $hWorkName);
-_log("Delete the work Hour", "custom1");
+commonWorkHourDelete($hWorkName);
+
 commonLogout();
diff --git a/scripts/functional-tests/data-types/work_report_model.sah b/scripts/functional-tests/data-types/work_report_model.sah
new file mode 100644
index 000000000..9272fa2f7
--- /dev/null
+++ b/scripts/functional-tests/data-types/work_report_model.sah
@@ -0,0 +1,208 @@
+/*
+ * This file is part of NavalPlan
+ *
+ * Copyright (C) 2011 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/>.
+ */
+
+/* Included tests
+ *
+ * 1 - Create a new Work Report Model
+ * 2 - Create a Work Report Model with duplicate type (it should be a failure)
+ * 3 - Create a Work Report Model with empty type (it should be a failure)
+ * 4 - Create a Work Report Model with duplicate name (it should be a failure)
+ * 5 - Edit a Work Report Model
+ * 6 - Check Diferent Fields
+ *   6.1 - Check code
+ *     6.1.1 - Change configuration
+ *     6.1.2 - Try to create a new Work Report Model without Code (it should be a failure)
+ *     6.1.3 - Change configuration like before
+ *   6.2 - Check Complementary Text Fields
+ *   6.3 - Check Label Type Fields
+ *     6.3.1 - Create a label
+ *     6.3.2 - Check Fields
+ *     6.3.3 - Delete the label
+ * 7 - Delete Work Report Model
+ *
+*/
+_include("../common_functions.sah");
+
+function workReportModelCreate($name){
+    commonCreate("Work Report Models");
+    workReportModelForm($name);
+   commonSaveValidation("Work Report Type", $name);
+    _log("Create a new Work Report Model", "custom1");
+}
+
+function workReportModelCreateDuplicateName($name){
+    commonCreate("Work Report Models");
+    workReportModelForm($name);
+    workReportModelNotValid();
+    _log("Do not allow create a duplicate Work Report Model", "custom1");
+}
+
+function workReportModelCreateEmpty(){
+    commonCreate("Work Report Models");
+    workReportModelForm("");
+    _assertExists(_div("the name must be not null or not empty"));
+    _assert(_isVisible(_div("the name must be not null or not empty")));
+    _log("Do not allow create Work Report Model without name", "custom1");
+}
+
+function workReportModelForm($name){
+    _setValue(_textbox(0, _near(_span("Name:"))), $name);
+    _removeFocus(_textbox(0, _near(_div("Name:"))));
+    _setSelected(_select(0, _near(_span("Task:"))),"heading");
+    _click(_cell("Add New Complementary Field"));
+    _setValue(_textbox(0, _near(_div("Complementary text fields"))), $name);
+    _setValue(_textbox(1, _near(_div("Complementary text fields"))), "12");
+    _click(_cell("Save"));
+}
+
+/* test to check a that naval plan give us a error */
+function workReportModelNotValid(){
+    _assertExists(_div("There exists other workReportType with the same name."));
+    _assert(_isVisible(_div("There exists other workReportType with the same name.")));
+}
+
+function workReportModelEdit($oldName, $newName, $cell){
+    commonEdit($oldName, $cell);
+    workReportModelEditForm($newName);
+    commonSaveValidation("Work Report Type", $newName);
+    _log("Edit a Work Report Model", "custom1");
+}
+
+function workReportModelEditForm($name){
+    _setValue(_textbox(0, _near(_span("Name:"))), $name);
+    _removeFocus(_textbox(0, _near(_div("Name:"))));
+    _click(_cell("Save & Continue"));
+}
+
+function workReportModelCheckCode($name){
+    commonConfigurationChangeCheckboxMainPreferences("Work report types");
+    workReportModelCreateWithoutCode($name);
+    commonConfigurationChangeCheckboxMainPreferences("Work report types");
+    _log("Check code label", "custom1");
+}
+
+function workReportModelCheckValues($name, $name2){
+    workReportModelCheckCode($name);
+    workReportModelCheckComplementaryTextFields($name);
+    workReportModelCheckLabelTypeFields($name2);
+    _log("Check diferent labels", "custom1");
+}
+
+function workReportModelCreateWithoutCode($type){
+    commonCreate("Work Report Models");
+    workReportModelForm($type);
+    workReportModelEmptyCodeValidation();
+}
+
+function workReportModelEmptyCodeValidation(){
+    _assertExists(_div("the code must be not null or not empty"));
+    _assert(_isVisible(_div("the code must be not null or not empty")));
+}
+
+function workReportModelCheckComplementaryTextFields($name){
+    commonCreate("Work Report Models");
+   _setValue(_textbox(0, _near(_span("Name:"))), $name);
+    _removeFocus(_textbox(0, _near(_div("Name:"))));
+    _click(_cell("Add New Complementary Field"));
+    _click(_cell("Save"));
+    workReportModelCheckComplementaryTextFieldsValidationName();
+    _setValue(_textbox(0, _near(_div("Complementary text fields"))), $name);
+    _click(_cell("Save"));
+    workReportModelCheckComplementaryTextFieldsValidationLength();
+    _setValue(_textbox(1, _near(_div("Complementary text fields"))), "12");
+    _click(_cell("Save"));
+}
+
+function workReportModelCheckComplementaryTextFieldsValidationName(){
+    _assertExists(_div("The field name must be unique, not null and not empty"));
+    _assert(_isVisible(_div("The field name must be unique, not null and not empty")));
+}
+
+function workReportModelCheckComplementaryTextFieldsValidationLength(){
+    _assertExists(_div("The length must be greater than 0, and not null."));
+    _assert(_isVisible(_div("The length must be greater than 0, and not null.")))
+}
+
+function workReportModelCheckLabelTypeFields($name){
+    labelCreate("labelforModel","New");
+    commonCreate("Work Report Models");
+    _setValue(_textbox(0, _near(_span("Name:"))), $name);
+    _removeFocus(_textbox(0, _near(_div("Name:"))));
+    _click(_cell("Add New Label Type Field"));
+    _click(_cell("Save"));
+    workReportModelCheckLabelTypeFieldsValidationName();
+    _click(_italic(0, _near(_div("Label Type fields"))));
+    _click(_cell("labelforModel"));
+    _click(_cell("Save"));
+    workReportModelCheckLabelTypeFieldsValidationLabel();
+    commonDelete("Labels", "labelforModel", 2);
+    commonDeleteValidation("Label Type", "labelforModel");
+}
+
+function workReportModelCheckLabelTypeFieldsValidationName(){
+    _assertExists(_div("The label type must unique and not null."));
+    _assert(_isVisible(_div("The label type must unique and not null.")));
+}
+
+function workReportModelCheckLabelTypeFieldsValidationLabel() {
+    _assertExists(_div("The label must not null."));
+    _assert(_isVisible(_div("The label must not null.")));
+}
+
+/*
+ * Label functions
+ */
+
+function labelCreate($type, $name){
+    commonCreate("Labels");
+    labelForm($type, $name);
+    commonSaveValidation("Label Type", $type);
+    _log("Create a new label", "custom1");
+}
+
+function labelForm($name, $labelName){
+    _setValue(_textbox(0, _near(_span("Name"))), $name);
+    _setValue(_textbox(0, _near(_span("New label"))), $labelName);
+    _click(_cell("Add"));
+    _click(_cell("Save"));
+}
+
+/* test values */
+var $workReportModelName = "new";
+var $workReportModelName2 = "new2";
+var $workReportModelNewName = "newest";
+
+/* test actions */
+commonLogin("admin", "admin");
+
+workReportModelCreate($workReportModelName);
+workReportModelCreateDuplicateName($workReportModelName);
+workReportModelCreateEmpty();
+
+workReportModelEdit($workReportModelName, $workReportModelNewName, 1);
+workReportModelCheckCode($workReportModelName);
+workReportModelCheckValues($workReportModelName, $workReportModelName2);
+
+commonDelete("Work Report Models", $workReportModelNewName, 1);
+commonDeleteValidation("Work Report Type", $workReportModelNewName);
+commonDelete("Work Report Models", $workReportModelName, 1);
+commonDeleteValidation("Work Report Type", $workReportModelName);
+_log("Delete the Work Report Model", "custom1");
+
+commonLogout();
diff --git a/scripts/functional-tests/resources/all_resources_test.suite b/scripts/functional-tests/resources/all_resources_test.suite
new file mode 100644
index 000000000..1fcea88b2
--- /dev/null
+++ b/scripts/functional-tests/resources/all_resources_test.suite
@@ -0,0 +1,6 @@
+worker_test.sah
+machines_test.sah
+virtual_worker_test.sah
+work_report_test.sah
+companies_test.sah
+subcontracting_test.sah
diff --git a/scripts/functional-tests/resources/companies_test.sah b/scripts/functional-tests/resources/companies_test.sah
new file mode 100644
index 000000000..118cde46a
--- /dev/null
+++ b/scripts/functional-tests/resources/companies_test.sah
@@ -0,0 +1,93 @@
+/*
+ * This file is part of NavalPlan
+ *
+ * Copyright (C) 2011 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/>.
+ */
+
+/* Included tests
+ *
+ * 1 - Create a new Company
+ * 2 - Create a Company with duplicate type (it should be a failure)
+ * 3 - Create a Company with empty type (it should be a failure)
+ * 4 - Create a Company with duplicate name (it should be a failure)
+ * 5 - Edit a Company
+ * 6 - Delete Company
+ *
+*/
+
+_include("../common_functions.sah");
+
+function companyCreateDuplicateType($name, $ID) {
+    commonCreate("Companies");
+    commonCompanyForm($name, $ID);
+    companyDuplicatedName();
+    companyDuplicatedId();
+}
+
+function companyCreateEmpty($name, $ID) {
+    commonCreate("Companies");
+    _click(_cell("Save"));
+    companyEmptyField();
+    _setValue(_textbox(0, _near(_span("Company name:"))), $name);
+    _click(_cell("Save"));
+    companyEmptyField();
+    _setValue(_textbox(0, _near(_span("Company ID:"))), $ID);
+}
+
+function companyEdit($oldName, $newName, $cell) {
+    commonEdit($oldName, $cell);
+    commonCompanyForm($newName);
+    commonSaveValidation("Company", $newName);
+}
+
+/*
+ * Validations
+ */
+
+function companyDuplicatedName(){
+    _assertExists(_span("checkConstraintUniqueName: company name has to be unique. It is already used"));
+    _assert(_isVisible(_span("checkConstraintUniqueName: company name has to be unique. It is already used")));
+}
+
+function companyDuplicatedId(){
+    _assertExists(_span("checkConstraintUniqueNif: Company ID already used. It has to be be unique"));
+    _assert(_isVisible(_span("checkConstraintUniqueNif: Company ID already used. It has to be be unique")));
+}
+
+function companyEmptyField(){
+    _assertExists(_div("cannot be null or empty"));
+    _assert(_isVisible(_div("cannot be null or empty")));
+}
+
+/* test values */
+var $companyName = "subcompany";
+var $companyId = "SUbCOMPANY_CODE";
+var $companyNewName = "newest";
+
+
+/* test actions */
+commonLogin("admin", "admin");
+
+commonCompanyCreate($companyName, $companyId);
+companyCreateDuplicateType($companyName, $companyId);
+companyCreateEmpty("", $companyId);
+
+companyEdit($companyName, $companyNewName, 5);
+
+commonDelete("Companies", $companyNewName, 5);
+commonDeleteValidation("Company", $companyNewName);
+
+commonLogout();
diff --git a/scripts/functional-tests/resources/machines_test.sah b/scripts/functional-tests/resources/machines_test.sah
new file mode 100644
index 000000000..d6e2fd578
--- /dev/null
+++ b/scripts/functional-tests/resources/machines_test.sah
@@ -0,0 +1,147 @@
+/*
+ * This file is part of NavalPlan
+ *
+ * Copyright (C) 2011 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/>.
+ */
+
+/* Included tests
+ *
+ * 1 - Create a new Machine
+ * 2 - Create a Machine with empty name (it should be a failure)
+ * 3 - Edit a Machine
+ * 4 - ASSIGN A CRITERIA TO A MACHINE (PENDING FOF A BUG)
+ *   5.1 - Create a criteria
+ *   5.2 - Edit Assigned criteria tab
+ *   5.3 - Try to delete a assigned criteria
+ * 5 - Assign a calendar
+ *   5.1 - Create a calendar
+ *   5.2 - Edit Calendar tab
+ *   5.3 - Try to delete a assigned calendar
+ * 6 - Assign a cost category
+ *   6.1 - Create a cost category
+ *   6.2 - Edit cost category tab
+ *   6.3 - Try to delete a assigned cost category
+ * 7 - Delete Machine
+ * 8 - Delete all required elements
+ *
+*/
+_include("../common_functions.sah");
+
+function machineCreateEmpty() {
+    commonCreate("Machines");
+    _click(_cell("Save"));
+    machineNameEmptyValidation();
+    _setValue(_textbox(0, _near(_span("Name"))), "something");
+    _click(_cell("Save"));
+    machineDescriptionEmptyValidation();
+    _log("Do not allow create a machine without name or description", "custom1");
+}
+
+function machineEdit($oldName, $newName, $cell) {
+    commonEdit($oldName, $cell);
+    _setValue(_textbox(0, _near(_span("Name"))), $newName);
+    _setValue(_textbox(0, _near(_span("Description"))), $newName);
+    _click(_cell("Save & Continue"));
+    commonSaveValidation("Machine", $newName);
+    _log("Edit the machine", "custom1");
+}
+
+function machineCheckCode($name){
+    commonConfigurationChangeCheckboxMainPreferences("Resources");
+    machineCreateWithoutCode($name);
+    commonConfigurationChangeCheckboxMainPreferences("Resources");
+    _log("Check code label", "custom1");
+}
+
+function machineCreateWithoutCode($type){
+    commonCreate("Machines");
+    commonMachineForm($type);
+    commonEmptyCodeValidation();
+}
+
+function machineCheckTabs(){
+    /* machineCheckAssignedCriteria($machineNewName, 4, $criteriaName); Bug 1167 */
+    machineCheckAssignedCalendar($machineNewName, 4, $calendarName);
+    machineCheckAssignedCostCategory($machineNewName, 4, $costCategoryName);
+}
+
+function machineCheckAssignedCriteria($machineName, $cell, $criterion){
+    commonCriteriaCreate($criteriaName);
+    commonResourceEditAssignedCriteriaForm("Machines", $machineName, $cell, $criterion);
+    commonCriteriaTryDeleteAssigned($criteriaName);
+}
+
+function machineCheckAssignedCalendar($machineName, $cell, $calendar){
+    commonCalendarCreate($calendar);
+    commonResourceEditAssignedCalendarForm("Machines", $machineName, $cell, $calendar);
+    commonCalendarTryDeleteAssignedCalendar($calendar, 3);
+}
+
+function machineCheckAssignedCostCategory($machineName, $cell, $cCategory){
+    commonWorkHourCreate("HourForMachine", "12");
+    commonCostCategoryCreate($cCategory, "HourForMachine");
+    commonResourceEditAssignedCostCategoryForm("Machines", $machineName, $cell, $cCategory);
+    commonSaveValidation("Machine", $machineName);
+    _log("Assign the created cost category", "custom1");
+    commonCostCategoryTryDeleteAssignedCostCategory($cCategory, 3);
+}
+
+function machineDeleteRequiredElements(){
+    commonCalendarDelete($calendarName);
+    commonCostCategoryDelete($costCategoryName);
+    commonWorkHourDelete("HourForMachine");
+    _log("All required elements deleted", "custom1");
+}
+
+/*
+ * Validation functions
+ * */
+
+function machineNameEmptyValidation(){
+    _assertExists(_div("Name cannot be null or empty"));
+    _assert(_isVisible(_div("Name cannot be null or empty")));
+}
+
+function machineDescriptionEmptyValidation(){
+    _assertExists(_div("Description cannot be null or empty"));
+    _assert(_isVisible(_div("Description cannot be null or empty")));
+}
+
+function machineEmptyFields(){
+_assertExists(_div("This field may not be empty or contain only spaces."));
+_assert(_isVisible(_div("This field may not be empty or contain only spaces.")));
+}
+
+/* test values */
+var $machineName = "new";
+var $machineDescription = "something new";
+var $machineNewName = "newest";
+var $criteriaName = "criteriaForMachine";
+var $calendarName = "calendarForMachine";
+var $costCategoryName = "costCategoryforMachines";
+
+/* test actions */
+commonLogin("admin", "admin");
+
+commonMachineCreate($machineName, $machineDescription);
+machineCreateEmpty();
+machineEdit($machineName, $machineNewName, 4);
+machineCheckTabs();
+machineCheckCode($machineName);
+commonMachineDelete($machineNewName);
+machineDeleteRequiredElements();
+
+commonLogout();
diff --git a/scripts/functional-tests/resources/subcontracting_test.sah b/scripts/functional-tests/resources/subcontracting_test.sah
new file mode 100644
index 000000000..47d56413e
--- /dev/null
+++ b/scripts/functional-tests/resources/subcontracting_test.sah
@@ -0,0 +1,133 @@
+/*
+ * This file is part of NavalPlan
+ *
+ * Copyright (C) 2011 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/>.
+ */
+
+/* Included tests
+ *
+ * 1 - Create a Company
+ * 2 - Create a project
+ * 3 - Create a task
+ * 4 - Create a subcontract and assign the company like subcontractor
+ * 5 - Send the task
+ * 6 - Assign a progres to a subcontracted task
+ * 7 - Send the progress
+ * 8 - Check that the progress was send
+ * 9 - Delete all required elements
+ *
+*/
+
+_include("../common_functions.sah");
+
+function subcontractingAssignTask($company){
+    subcontractingGoToTaskForSubcontractSinceProjectDetails();
+    subcontractingTaskForSubcontractForm($company, $subProjectName);
+    _log("Assign the task to a Company", "custom1");
+}
+
+function subcontractingGoToTaskForSubcontractSinceProjectDetails(){
+    _click(_cell("Project Scheduling"));
+    _doubleClick(_div("box standard-task yui-resize unassigned"));
+    _click(_span("Task properties"));
+    _setSelected(_select(0, _near(_span("Resource allocation type"))), "Subcontract")
+}
+
+function subcontractingTaskForSubcontractForm($company, $subProjectName){
+    _setValue(_textbox(0, _near(_span("External company"))), $company);
+    _setValue(_textbox(0, _near(_span("Work description    "))), $subProjectName);
+    _setValue(_textbox(0, _near(_span("Subcontract price"))), "6000");
+    _setValue(_textbox(0, _near(_span("Subcontracted code"))), $companyId);
+    _click(_checkbox(0, _near(_span("Hours groups"))));
+    _click(_cell("z-button-cm[39]"));
+    _click(_image("ico_save.png"));
+    _click(_cell("OK"));
+}
+
+function subcontractingSendTask(){
+    _click(_link("Subcontracted Tasks"));
+    _click(_cell("Send"))
+    subcontractingSendSubValidation();
+    _log("Task was sent", "custom1");
+}
+
+function subcontractingReportTask($projectName, $progressName){
+    commonProgressAssignProject($projectName, $progressName);
+    _click(_link("Report Progress"));
+    _click(_cell("Send"));
+    subcontractingSendProgressValidation();
+    _log("Progress was sent", "custom1");
+}
+
+function subcontractingCheckAssignedProgress($projectName){
+    commonEditProject($projectName);
+    _click(_span("Progress"));
+    _assertExists(_span("30.00 %"));
+    _assert(_isVisible(_span("30.00 %")));
+    _log("Progress was assigned", "custom1");
+}
+
+function subcontractingDeleteAllRequiredElements(){
+    commonDeleteProject($projectName);
+    _click(_link("Projects List"));
+    _click(_image("ico_borrar1.png", _in(_cell(8, _near(_cell($subProjectName))))));
+    _click(_cell("OK"));
+    subcontractingDeleteValidation();
+    _click(_cell("OK"));
+    _assertExists(_div("Removed "+$subProjectName));
+    _assert(_isVisible(_div("Removed "+$subProjectName)));
+    commonCompanyDelete($companyName);
+}
+
+/*
+ * Validations
+ */
+
+function subcontractingSendSubValidation(){
+    _assertExists(_span("Subcontracted task sent successfully"));
+    _assert(_isVisible(_span("Subcontracted task sent successfully")));
+}
+
+function subcontractingSendProgressValidation(){
+    _assertExists(_span("Progress sent successfully"));
+    _assert(_isVisible(_span("Progress sent successfully")));
+}
+
+function subcontractingDeleteValidation(){
+    _assertExists(_span("Deleting this subcontracted project, you are going to lose the relation to report progress. Are you sure?"));
+    _assert(_isVisible(_span("Deleting this subcontracted project, you are going to lose the relation to report progress. Are you sure?")));
+}
+/* test values */
+var $companyName = "subcompany";
+var $companyId = "COMPANY_CODE";
+var $projectName = "projectToBeSubcontrated";
+var $subProjectName = "SomeDescription";
+var $taskName = "taskforsubcontract";
+var $taskHour =  "100";
+var $progressName = "Subcontractor";
+
+/* test actions */
+commonLogin("admin", "admin");
+
+commonCompanyCreate($companyName, $companyId);
+commonCreateProject($projectName);
+commonCreateTask($projectName, $taskName, $taskHour);
+subcontractingAssignTask($companyName, $subProjectName);
+subcontractingSendTask();
+subcontractingReportTask($subProjectName, $progressName);
+subcontractingCheckAssignedProgress($projectName);
+subcontractingDeleteAllRequiredElements();
+commonLogout();
diff --git a/scripts/functional-tests/resources/virtual_worker_test.sah b/scripts/functional-tests/resources/virtual_worker_test.sah
new file mode 100644
index 000000000..6c46c1e8c
--- /dev/null
+++ b/scripts/functional-tests/resources/virtual_worker_test.sah
@@ -0,0 +1,165 @@
+/*
+ * This file is part of NavalPlan
+ *
+ * Copyright (C) 2011 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/>.
+ */
+
+/* Included tests
+ *
+ * 1 - Create a new Virtual Worker
+ * 2 - Create a Virtual Worker with duplicate type (it should be a failure)
+ * 3 - Create a Virtual Worker with empty type (it should be a failure)
+ * 4 - Create a Virtual Worker with duplicate name (it should be a failure)
+ * 5 - Edit a Virtual Worker
+ * 6 - Check other tabs
+ *   6.1 - Check assigned criteria tab
+ *     6.1.1 - Create a criterion
+ *     6.1.2 - Assign this criterion to the Virtual worker
+ *     6.1.3 - Try to delete the criterion
+ *   6.2 - Check assigned calendar tab
+ *     6.2.1 - Create a calendar
+ *     6.2.2 - Assign this calendar to the Virtual worker
+ *     6.2.3 - Try to delete the calendar
+ *   6.3 - Check assigned cost category tab
+ *     6.3.1 - Create a work hour
+ *     6.3.2 - Create a cost category
+ *     6.3.3 - Assign this cost category to the Virtual worker
+ *     6.3.4 - Try to delete the cost category
+ * 7 - Delete Virtual Worker
+ * 8 - Delete all required elements
+ *
+*/
+_include("../common_functions.sah");
+
+function virtualWorkerCreate($name) {
+    virtualWorkerGoToCreate();
+    virtualWorkerForm($name);
+    virtualWorkerAcctionValidation("saved");
+    _log("Create a new virtual worker", "custom1");
+}
+
+function virtualWorkerCreateDuplicateType($name) {
+    virtualWorkerGoToCreate();
+    virtualWorkerForm($name);
+    virtualWorkerNotValid($name);
+    _log("Create a duplicate virtual worker", "custom1");
+}
+
+function virtualWorkerCreateEmpty($name) {
+    virtualWorkerGoToCreate();
+    virtualWorkerForm("");
+    _log("Create a empty virtual worker", "custom1");
+}
+
+function virtualWorkerGoToCreate (){
+    _click(_link("Virtual Workers Groups"));
+    _click(_cell("Create Virtual Worker"));
+}
+
+function virtualWorkerForm($name) {
+    _setValue(_textbox(0, _near(_span("Group name"))), $name);
+    _click(_cell("Save"));
+}
+
+function virtualWorkerEdit($oldName, $newName, $cell) {
+    commonEdit($oldName, $cell);
+    virtualWorkerForm($newName);
+    virtualWorkerAcctionValidation("saved");
+    _log("Edit a virtual worker", "custom1");
+}
+
+function virtualWorkerCheckCode($name){
+    commonConfigurationChangeCheckboxMainPreferences("Resources");
+    virtualWorkerCreateWithoutCode($name);
+    commonConfigurationChangeCheckboxMainPreferences("Resources");
+    _log("Check code label", "custom1");
+}
+
+function virtualWorkerCreateWithoutCode($name){
+    virtualWorkerGoToCreate();
+    virtualWorkerForm($name);
+    commonEmptyCodeValidation();
+}
+
+function virtualWorkerCheckTabs(){
+    virtualWorkerCheckAssignedCriteria($workerNewName, 3, $criteriaName);
+    virtualWorkerCheckAssignedCalendar($workerNewName, 3, $calendarName);
+    virtualWorkerCheckAssignedCostCategory($workerNewName, 3, $costCategoryName);
+}
+
+function virtualWorkerCheckAssignedCriteria($workerName, $cell, $criterion){
+    commonCriteriaCreate($criteriaName);
+    commonResourceEditAssignedCriteriaForm("Virtual Workers Groups", $workerName, $cell, $criterion);
+    commonCriteriaTryDeleteAssigned($criteriaName);
+}
+
+function virtualWorkerCheckAssignedCalendar($workerName, $cell, $calendar){
+    commonCalendarCreate($calendar);
+    commonResourceEditAssignedCalendarForm("Virtual Workers Groups", $workerName, $cell, $calendar);
+    commonCalendarTryDeleteAssignedCalendar($calendar, 3);
+}
+
+function virtualWorkerCheckAssignedCostCategory($workerName, $cell, $cCategory){
+    commonWorkHourCreate("HourForWorker", "12");
+    commonCostCategoryCreate($cCategory, "HourForWorker");
+    commonResourceEditAssignedCostCategoryForm("Virtual Workers Groups", $workerName, $cell, $cCategory);
+    virtualWorkerAcctionValidation("saved");
+    _log("Assign the created cost category", "custom1");
+    commonCostCategoryTryDeleteAssignedCostCategory($cCategory, 3);
+}
+
+function virtualWorkerDeleteRequiredElements(){
+    commonCriteriaDelete($criteriaName);
+    commonCalendarDelete($calendarName);
+    commonCostCategoryDelete($costCategoryName);
+    commonWorkHourDelete("HourForWorker");
+    _log("All required elements deleted", "custom1");
+}
+
+/* Validations */
+function virtualWorkerNotValid($worker){
+    _assertExists(_span("checkConstraintUniqueVirtualGroupName: Virtual worker group name must be unique"));
+    _assert(_isVisible(_span("checkConstraintUniqueVirtualGroupName: Virtual worker group name must be unique")));
+}
+
+function virtualWorkerAcctionValidation($action){
+    _assertExists(_span("Worker "+$action));
+    _assert(_isVisible(_span("Worker "+$action)));
+}
+
+/* test values */
+var $workerName = "new";
+var $workerSurName = "newSon";
+var $workerID = "12345678";
+var $workerName2 = "new2";
+var $workerNewName = "newest";
+var $criteriaName = "CriteriaForWorkers";
+var $costCategoryName ="costCategoryForWorker"
+var $calendarName = "calendarForWorker"
+/* test actions */
+commonLogin("admin", "admin");
+
+virtualWorkerCreate($workerName, $workerSurName, $workerID);
+virtualWorkerCreateDuplicateType($workerName, $workerSurName, $workerID);
+virtualWorkerCreateEmpty($workerName, $workerSurName, $workerID);
+virtualWorkerEdit($workerName, $workerNewName, 3);
+virtualWorkerCheckTabs();
+virtualWorkerCheckCode($workerName, $workerSurName, $workerID)
+commonDelete("Virtual Workers Groups", $workerNewName, 3);
+virtualWorkerAcctionValidation("deleted");
+_log("Delete the virtual worker", "custom1");
+virtualWorkerDeleteRequiredElements();
+commonLogout();
diff --git a/scripts/functional-tests/resources/work_report_test.sah b/scripts/functional-tests/resources/work_report_test.sah
new file mode 100644
index 000000000..388a5f6c7
--- /dev/null
+++ b/scripts/functional-tests/resources/work_report_test.sah
@@ -0,0 +1,198 @@
+/*
+ * This file is part of NavalPlan
+ *
+ * Copyright (C) 2011 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/>.
+ */
+
+/* Included tests
+ *
+ * 1 - Create a work report without any work report model (it should be a failure)
+ * 2 - Create a Work report from a lineal work report model
+ *   2.1 - Create a lineal work report model
+ *   2.2 - Create a work report
+ * 3 - Create a Work report from a heading work report model
+ *   3.1 - Create a heading work report model
+ *   3.2 - Try to create a work report froma heading model without task (it should be a failure)
+ * 4 - Edit the work report including a line
+ *   4.1 - Create a machine
+ *   4.2 - Create a Work hour
+ *   4.3 - Create a project
+ *   4.4 - Complete the form and check the fields
+ * 4 - Delete all the work reports
+ * 5 - Delete all required elements
+ *
+ */
+
+_include("../common_functions.sah");
+
+function workReportCreateWithoutElements(){
+    _click(_link("Work Reports"));
+    _click(_cell("New work report"));
+    workReportNoElementsValidation();
+}
+
+function workReportCreateLineModel($modelName){
+    workReportModelLineCreate($modelName);
+    _click(_link("Work Reports"));
+    _click(_cell("New work report"));
+    _click(_cell("Save"));
+    workReportAcctionValidation("saved");
+    _log("Create a new work report from a model type line", "custom1");
+}
+
+function workReportModelLineCreate($name){
+    commonCreate("Work Report Models");
+    workReportModelLineForm($name);
+    commonSaveValidation("Work Report Type", $name);
+    _log("Create a new Work Report Model", "custom1");
+}
+
+function workReportModelLineForm($name){
+    _setValue(_textbox(0, _near(_span("Name:"))), $name);
+    _removeFocus(_textbox(0, _near(_div("Name:"))));
+    _click(_cell("Add New Complementary Field"));
+    _setValue(_textbox(0, _near(_div("Complementary text fields"))), $name);
+    _setValue(_textbox(1, _near(_div("Complementary text fields"))), "12");
+    _click(_cell("Save"));
+}
+
+function workReportCreateHeadingModel($modelName){
+    workReportModelHeadingCreate($modelName);
+    _click(_link("Work Reports"));
+    _setSelected(_select(0, _near(_span("Select type :"))), $modelName);
+    _click(_cell("New work report"));
+    _click(_cell("Save"));
+    workReportHeadingCodeValidation();
+    _log("Do not allow create a new work report from a model type heading without task", "custom1");
+}
+
+function workReportModelHeadingCreate($name){
+    commonCreate("Work Report Models");
+    workReportModelHeadingForm($name);
+    commonSaveValidation("Work Report Type", $name);
+    _log("Create a new Work Report Model", "custom1");
+}
+
+function workReportModelHeadingForm($name){
+    _setValue(_textbox(0, _near(_span("Name:"))), $name);
+    _removeFocus(_textbox(0, _near(_div("Name:"))));
+    _setSelected(_select(0, _near(_span("Task:"))),"heading");
+    _click(_cell("Add New Complementary Field"));
+    _setValue(_textbox(0, _near(_div("Complementary text fields"))), $name);
+    _setValue(_textbox(1, _near(_div("Complementary text fields"))), "12");
+    _click(_cell("Save"));
+}
+
+function workReportEdit($name){
+    workReportLinesCreateRequiredElements();
+    workReportEditForm($name);
+}
+
+function workReportEditForm($name){
+    _click(_link("Work Reports"));
+    commonEdit($name, 4);
+    _click(_cell("Add new row"));
+    _click(_cell("Save"));
+    workReportResourceValidation();
+    _setValue(_textbox(2, _near(_parentTable(_div("Date")))), $machineName);
+    _click(_cell("Save"));
+    workReportTaskValidation();
+    _click(_italic(0, _near(_textbox(3, _near(_parentTable(_div("Date")))))));
+    _click(_div($projectName+"[2]", _parentTable(_div("Project code[1]"))));
+    _click(_cell("Save"));
+    workReportHourValidation();
+    _setValue(_textbox("z-intbox z-intbox-text-invalid"), "8");
+    _click(_cell("Save"));
+}
+
+function workReportLinesCreateRequiredElements(){
+    commonCreateProject($projectName);
+    commonMachineCreate($machineName, $machineDescription);
+    commonWorkHourCreate($workhourName, $workhourPrice);
+}
+
+function workReportLinesDeleteRequiredElements(){
+    commonMachineDelete($machineName);
+    commonWorkHourDelete($workhourName);
+    commonDeleteProject($projectName);
+    commonWorkReportModelDelete($workReportModelName);
+    commonWorkReportModelDelete($workReportModelName2);
+}
+
+function workReportDelete($modelName){
+    commonDelete("Work Reports", $modelName, 4);
+    _log("Delete the work report", "custom1")
+}
+
+function DeleteRequiredElements(){
+    commonWorkReportModelDelete($modelName);
+}
+
+/*
+ * Validations
+ */
+
+function workReportAcctionValidation($action){
+    _assertExists(_span("Work report "+$action));
+    _assert(_isVisible(_span("Work report "+$action)));
+}
+
+function workReportNoElementsValidation(){
+    _assertExists(_div("please, select a work report type"));
+    _assert(_isVisible(_div("please, select a work report type")));
+}
+
+function workReportHeadingCodeValidation(){
+    _assertExists(_div("Task code cannot be null"));
+    _assert(_isVisible(_div("Task code cannot be null")));
+}
+
+function workReportResourceValidation(){
+    _assertExists(_div("The resource cannot be null"));
+    _assert(_isVisible(_div("The resource cannot be null")));
+}
+
+function workReportTaskValidation(){
+    _assertExists(_div("The task code cannot be null"));
+    _assert(_isVisible(_div("The task code cannot be null")));
+}
+
+function workReportHourValidation(){
+    _assertExists(_div("Hours cannot be null"));
+    _assert(_isVisible(_div("Hours cannot be null")));
+}
+
+/* test values */
+var $workReportModelName = "line";
+var $workReportModelName2 = "heading";
+var $workReportNewName = "newSon";
+var $workReportNewName2 = "newSon";
+var $workhourName = "hourForWorkReport";
+var $workhourPrice = 12;
+var $machineName = "machineForWorkReport";
+var $machineDescription = "forWorkReport";
+var $projectName = "projectForWorkReport";
+
+commonLogin("admin", "admin");
+
+workReportCreateWithoutElements();
+workReportCreateLineModel($workReportModelName);
+workReportCreateHeadingModel($workReportModelName2);
+workReportEdit($workReportModelName);
+workReportDelete($workReportModelName);
+workReportLinesDeleteRequiredElements();
+
+commonLogout();
diff --git a/scripts/functional-tests/resources/worker_test.sah b/scripts/functional-tests/resources/worker_test.sah
new file mode 100644
index 000000000..cbb6f3ed1
--- /dev/null
+++ b/scripts/functional-tests/resources/worker_test.sah
@@ -0,0 +1,179 @@
+/*
+ * This file is part of NavalPlan
+ *
+ * Copyright (C) 2011 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/>.
+ */
+
+/* Included tests
+ *
+ * 1 - Create a new Worker
+ * 2 - Create a Worker with duplicate type (it should be a failure)
+ * 3 - Create a Worker with empty type (it should be a failure)
+ * 4 - Create a Worker with duplicate name (it should be a failure)
+ * 5 - Edit a Worker
+ * 6 - Check other tabs
+ *   6.1 - Check assigned criteria tab
+ *     6.1.1 - Create a criterion
+ *     6.1.2 - Assign this criterion to the worker
+ *     6.1.3 - Try to delete the criterion
+ *   6.2 - Check assigned calendar tab
+ *     6.2.1 - Create a calendar
+ *     6.2.2 - Assign this calendar to the worker
+ *     6.2.3 - Try to delete the calendar
+ *   6.3 - Check assigned cost category tab
+ *     6.3.1 - Create a work hour
+ *     6.3.2 - Create a cost category
+ *     6.3.3 - Assign this cost category to the worker
+ *     6.3.4 - Try to delete the cost category
+ * 7 - Delete Worker
+ * 8 - Delete all required elements
+ *
+*/
+
+_include("../common_functions.sah");
+
+function workerCreate($name, $surName, $id) {
+    commonCreate("Workers");
+    workerForm($name, $surName, $id);
+    workerAcctionValidation("saved");
+    _log("Create a new worker", "custom1");
+}
+
+function workerCreateDuplicateType($name, $surName, $id) {
+    commonCreate("Workers");
+    workerForm($name, $surName, $id);
+    workerNotValid($name);
+    _log("Create a duplicate worker", "custom1");
+}
+
+function workerCreateEmpty($name, $surName, $id) {
+    commonCreate("Workers");
+    workerEmptyForm($name, $surName, $id);
+    _log("Create a empty worker", "custom1");
+}
+
+function workerEmptyForm($name, $surName, $id) {
+    _click(_cell("Save"));
+    workerEmptyFields();
+    _setValue(_textbox(0, _near(_span("First name"))), $name);
+    _click(_cell("Save"));
+    workerEmptyFields();
+    _setValue(_textbox(0, _near(_span("Last name"))), $surName);
+    _click(_cell("Save"));
+    workerEmptyFields();
+}
+
+function workerForm($name, $surName, $id) {
+    _setValue(_textbox(0, _near(_span("First name"))), $name);
+    _setValue(_textbox(0, _near(_span("Last name"))), $surName);
+    _setValue(_textbox(0, _near(_span("ID"))), $id);
+    _click(_cell("Save"));
+}
+
+function workerEdit($oldName, $newName, $cell) {
+    commonEdit($oldName, $cell);
+    workerForm($newName);
+    workerAcctionValidation("saved");
+    _log("Edit a worker", "custom1");
+}
+
+function workerCheckCode($name, $surName, $ID){
+    commonConfigurationChangeCheckboxMainPreferences("Resources");
+    workerCreateWithoutCode($name, $surName, $ID);
+    commonConfigurationChangeCheckboxMainPreferences("Resources");
+    _log("Check code label", "custom1");
+}
+
+function workerCreateWithoutCode($name, $surName, $ID){
+    commonCreate("Workers");
+    workerForm($name, $surName, $ID);
+    commonEmptyCodeValidation();
+}
+
+function workerCheckTabs(){
+    workerCheckAssignedCriteria($workerNewName, 5, $criteriaName);
+    workerCheckAssignedCalendar($workerNewName, 5, $calendarName);
+    workerCheckAssignedCostCategory($workerNewName, 5, $costCategoryName);
+}
+
+function workerCheckAssignedCriteria($workerName, $cell, $criterion){
+    commonCriteriaCreate($criteriaName);
+    commonResourceEditAssignedCriteriaForm("Workers", $workerName, $cell, $criterion);
+    commonCriteriaTryDeleteAssigned($criteriaName);
+}
+
+function workerCheckAssignedCalendar($workerName, $cell, $calendar){
+    commonCalendarCreate($calendar);
+    commonResourceEditAssignedCalendarForm("Workers", $workerName, $cell, $calendar);
+    commonCalendarTryDeleteAssignedCalendar($calendar, 3);
+}
+
+function workerCheckAssignedCostCategory($workerName, $cell, $cCategory){
+    commonWorkHourCreate("HourForWorker", "12");
+    commonCostCategoryCreate($cCategory, "HourForWorker");
+    commonResourceEditAssignedCostCategoryForm("Workers", $workerName, $cell, $cCategory);
+    workerAcctionValidation("saved");
+    _log("Assign the created cost category", "custom1");
+    commonCostCategoryTryDeleteAssignedCostCategory($cCategory, 3);
+}
+
+function workerDeleteRequiredElements(){
+    commonCriteriaDelete($criteriaName);
+    commonCalendarDelete($calendarName);
+    commonCostCategoryDelete($costCategoryName);
+    commonWorkHourDelete("HourForWorker");
+    _log("All required elements deleted", "custom1");
+}
+
+/* Validations */
+function workerNotValid($worker){
+    _assertExists(_span("checkConstraintUniqueFiscalCode: ID already used. It has to be be unique"));
+    _assert(_isVisible(_span("checkConstraintUniqueFiscalCode: ID already used. It has to be be unique")));
+}
+
+function workerAcctionValidation($action){
+    _assertExists(_span("Worker "+$action));
+    _assert(_isVisible(_span("Worker "+$action)));
+}
+
+function workerEmptyFields(){
+    _assertExists(_div("This field may not be empty or contain only spaces."));
+    _assert(_isVisible(_div("This field may not be empty or contain only spaces.")));
+}
+
+/* test values */
+var $workerName = "new";
+var $workerSurName = "newSon";
+var $workerID = "12345678";
+var $workerName2 = "new2";
+var $workerNewName = "newest";
+var $criteriaName = "CriteriaForWorkers";
+var $costCategoryName ="costCategoryForWorker"
+var $calendarName = "calendarForWorker"
+/* test actions */
+commonLogin("admin", "admin");
+
+workerCreate($workerName, $workerSurName, $workerID);
+workerCreateDuplicateType($workerName, $workerSurName, $workerID);
+workerCreateEmpty($workerName, $workerSurName, $workerID);
+workerEdit($workerName, $workerNewName, 5);
+workerCheckTabs();
+workerCheckCode($workerName, $workerSurName, $workerID)
+commonDelete("Workers", $workerNewName, 5);
+workerAcctionValidation("deleted");
+_log("Delete the worker", "custom1");
+workerDeleteRequiredElements();
+commonLogout();
diff --git a/scripts/functional-tests/testrunner.sh b/scripts/functional-tests/testrunner.sh
index 5072a02d6..2b98533d1 100755
--- a/scripts/functional-tests/testrunner.sh
+++ b/scripts/functional-tests/testrunner.sh
@@ -4,8 +4,8 @@ then
 echo "Usage: testrunner.sh <sah file|suite file> <startURL> <browserType>"
 echo "File path is relative to <libreplan root folder>/scripts/functional-tests"
 echo "Example:"
-echo "testrunner.sh data-types/all_tests.suite http://localhost:8080/navalplanner-webapp <browserType>"
-echo "testrunner.sh data-types/progress_test.sah http://localhost:8080/navalplanner-webapp <browserType>"
+echo "./testrunner.sh data-types/all_data_type_test.suite http://localhost:8080/navalplanner-webapp <browserType>"
+echo "./testrunner.sh data-types/progress_test.sah http://localhost:8080/navalplanner-webapp <browserType>"
 else
 
 . ./sahi-common-env.sh
@@ -14,7 +14,7 @@ export USERDATA_DIR=$SAHI_HOME/userdata/
 export SCRIPTS_PATH=`pwd`/$1
 export BROWSER=$3
 export START_URL=$2
-export THREADS=2
+export THREADS=1
 export SINGLE_SESSION=false
 java -cp $SAHI_HOME/lib/ant-sahi.jar net.sf.sahi.test.TestRunner -test $SCRIPTS_PATH -browserType "$BROWSER" -baseURL $START_URL -host localhost -port 9999 -threads $THREADS -useSingleSession $SINGLE_SESSION
 fi
diff --git a/scripts/functional-tests/users/all_user_test.suite b/scripts/functional-tests/users/all_user_test.suite
new file mode 100644
index 000000000..4325bdf38
--- /dev/null
+++ b/scripts/functional-tests/users/all_user_test.suite
@@ -0,0 +1,2 @@
+user_test.sah
+profile_test.sah
diff --git a/scripts/functional-tests/users/profile_test.sah b/scripts/functional-tests/users/profile_test.sah
new file mode 100644
index 000000000..e99ddd046
--- /dev/null
+++ b/scripts/functional-tests/users/profile_test.sah
@@ -0,0 +1,113 @@
+/* Included tests
+ *
+ * 1 - Create a new Profile
+ * 2 - Create a Profile with duplicate type (It should be a failure)
+ * 3 - Create a Profile with empty type (It should be a failure)
+ * 4 - Create a Profile with duplicate name (It should be a failure)
+ * 5 - Edit a Profile
+ * 6 - Assign this profile
+ *   6.1 - Create bew Account with this profile
+ *   6.2 - Try to delete the profile
+ *   6.3 - Delete the Account
+ * 6 - Delete Profile
+ *
+*/
+
+_include("../common_functions.sah");
+
+function profileCreate($name) {
+    commonCreate("Profiles");
+    profileForm($name);
+    commonSaveValidation("Profile", $name);
+    _log("Create a new Profile", "custom1");
+}
+
+function profileCreateDuplicateType($name) {
+    commonCreate("Profiles");
+    profileForm($name);
+    profileNotValid($name);
+    _log("Do not allow create a Profile with duplicate Name", "custom1");
+}
+
+function profileCreateEmpty() {
+    commonCreate("Profiles");
+    profileForm("");
+    _assertExists(_div("cannot be null or empty"));
+    _assert(_isVisible(_div("cannot be null or empty")));
+    _log("Do not allow create a Profile with empty Name", "custom1");
+}
+
+function profileForm($name) {
+    _setValue(_textbox(0, _near(_span("Name:"))), $name);
+    _click(_italic(0, _near(_div("Association with roles"))));
+    _click(_cell("Administration"));
+    _click(_cell("Save"));
+}
+
+/* test to check a that naval plan give us a error */
+function profileNotValid($profile){
+    _assertExists(_span("checkConstraintUniqueLoginName: profile name is already being used by another profile"));
+    _assert(_isVisible(_span("checkConstraintUniqueLoginName: profile name is already being used by another profile")));
+}
+
+function profileEdit($oldName, $newName, $cell) {
+    commonEdit($oldName, $cell);
+    profileEditForm($newName);
+    commonSaveValidation("Profile", $newName);
+    _log("Edit the profile changing the name", "custom1");
+}
+
+function profileEditForm($name) {
+    _setValue(_textbox(0, _near(_span("Name:"))), $name);
+    _click(_cell("Save & Continue"));
+}
+
+function profileAssign($account, $password, $profile){
+    commonCreate("Accounts");
+    accountsForm($account, $password, $profile);
+    profileTryDelete($profile);
+    commonDelete("Accounts", $account, 4);
+    _log("Assign the profile to a account", "custom1");
+}
+
+function accountsForm($name, $password, $profile) {
+    _setValue(_textbox(0, _near(_span("Login name:"))), $name);
+    _setValue(_password(0, _near(_span("Password:"))), $password);
+    _setValue(_password(0, _near(_span("Password confirmation:"))), $password);
+    _click(_textbox(0, _near(_cell("Add role"))));
+    _click(_cell("Administration"));
+    _click(_cell("Add role"));
+    _click(_textbox(0, _near(_cell("Add profile"))));
+    _click(_cell($profile));
+    _click(_cell("Add profile"));
+    _click(_cell("Save"));
+}
+
+function profileTryDelete($name){
+    _click(_link("Profiles"));
+    _click(_image("ico_borrar1.png", _in(_cell(1, _near(_cell($name))))));
+    _assertExists(_span("Cannot delete profile. It is being used at this moment by some users."));
+    _assert(_isVisible(_span("Cannot delete profile. It is being used at this moment by some users.")));
+}
+
+/* test values */
+var $profileName = "new";
+var $profileName2 = "new2";
+var $profileNewName = "newest";
+var $accountName = "new";
+var $accountPassword = "1234";
+
+/* test actions */
+commonLogin("admin", "admin");
+
+profileCreate($profileName);
+profileCreateDuplicateType($profileName);
+profileCreateEmpty();
+
+profileEdit($profileName, $profileNewName, 1);
+profileAssign($accountName, $accountPassword, $profileNewName);
+
+commonDelete("Profiles", $profileNewName, 1);
+commonDeleteValidation("Profile", $profileNewName);
+_log("Delete the profile", "custom1");
+commonLogout();