diff --git a/navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul b/navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul
index e95b20cfb..0287b01eb 100644
--- a/navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul
+++ b/navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul
@@ -1,32 +1,32 @@
 <window id="${arg.top_id}" title="${arg.title}">
     <tabbox>
         <tabs>
-            <tab label="Edición"></tab>
+            <tab label="${i18n:_('Edit')}"></tab>
         </tabs>
         <tabpanels>
             <tabpanel>
                 <grid fixedLayout="false">
                     <rows>
                         <row>
-                            <label value="unitName" />
+                            <label value="${i18n:_('Unit name')}" />
                             <textbox value="@{controller.advanceType.unitName}" constraint="@{controller.distinctNames}"/>
                         </row>
                         <row>
-                            <label value="Active" />
+                            <label value="${i18n:_('Active')}" />
                             <checkbox checked="@{controller.advanceType.active}"/>
                         </row>
                         <row>
-                            <label value="Default max value" />
+                            <label value="${i18n:_('Default max value')}" />
                             <decimalbox id="defaultMaxValue" scale="2"
                                 value="@{controller.advanceType.defaultMaxValue}" constraint="@{controller.greaterThanPrecision}"/>
                         </row>
                         <row>
-                            <label value="Precision" />
+                            <label value="${i18n:_('Precision')}" />
                             <decimalbox id="precision" scale="4"
                                 value = "@{controller.advanceType.unitPrecision}" constraint = "@{controller.lessThanDefaultMaxValue}"/>
                         </row>
                         <row>
-                            <label value="Type" />
+                            <label value="${i18n:_('Type')}" />
                             <label value="@{controller.advanceType.type}" />
                         </row>
                     </rows>
diff --git a/navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul b/navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul
index f9515260e..2ef3cb3ad 100644
--- a/navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul
+++ b/navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul
@@ -1,17 +1,17 @@
-<window id="${arg.top_id}" title="Tipos de avance">
+<window id="${arg.top_id}" title="${i18n:_('Progress types')}">
     <grid id="listing" model="@{controller.advanceTypes}" mold="paging"
         pageSize="5">
         <columns>
-            <column label="Operacións"/>
-            <column label="Nome" sort="auto(name)"/>
-            <column label="Activo"/>
+            <column label="${i18n:_('Operations')}"/>
+            <column label="${i18n:_('Name')}" sort="auto(name)"/>
+            <column label="${i18n:_('Enabled')}"/>
         </columns>
         <rows>
             <row self="@{each='advanceType'}" value="@{advanceType}">
                 <hbox>
-                    <button label="Edit" disabled="@{advanceType.immutable}" onClick="controller.goToEditForm(self.parent.parent.value);">
+                    <button label="${i18n:_('Edit')}" disabled="@{advanceType.immutable}" onClick="controller.goToEditForm(self.parent.parent.value);">
                     </button>
-                    <button label="Remove" disabled="@{advanceType.immutable}" onClick="controller.confirmRemove(self.parent.parent.value);">
+                    <button label="${i18n:_('Delete')}" disabled="@{advanceType.immutable}" onClick="controller.confirmRemove(self.parent.parent.value);">
                     </button>
                 </hbox>
                 <label value="@{advanceType.unitName}"/>
@@ -19,6 +19,6 @@
             </row>
         </rows>
     </grid>
-    <button id="show_create_form" onClick="controller.goToCreateForm();" label="Create">
+    <button id="show_create_form" onClick="controller.goToCreateForm();" label="${i18n:_('Create')}">
     </button>
-</window>
\ No newline at end of file
+</window>
diff --git a/navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul b/navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul
index f55b99194..d497a6e60 100644
--- a/navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul
+++ b/navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul
@@ -1,4 +1,4 @@
-<?page title="Navalpro: AdvanceTypes"?>
+<?page title="${i18n:_('Navalpro: AdvanceTypes')}"?>
 <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
 <?page  id="List"?>
 <?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template_v02.zul"?>
@@ -13,23 +13,23 @@
         apply="org.navalplanner.web.advance.AdvanceTypeCRUDController">
         <vbox id="messagesContainer"></vbox>
         <list top_id="listWindow" />
-        <edition top_id="createWindow" title="Create"
-            save_button_label="Save" cancel_button_label="Cancel" />
-        <edition top_id="editWindow" title="Edit Advance Type Data"
-            save_button_label="Save" cancel_button_label="Cancel" />
+        <edition top_id="createWindow" title="${i18n:_('Create')}"
+            save_button_label="${i18n:_('Save')}" cancel_button_label="${i18n:_('Cancel')}" />
+        <edition top_id="editWindow" title="${i18n:_('Edit advance type data')}"
+            save_button_label="${i18n:_('Save')}" cancel_button_label="${i18n:_('Cancel')}" />
         <window visible="@{controller.confirmingRemove}"
-            id="confirmRemove" title="Confirmation" sizable="true"
+            id="confirmRemove" title="${i18n:_('Confirm')}" sizable="true"
             position="center">
             <vbox align = "center">
                 <hbox align = "center">
-                    <label value = "¿ Do you want to delete"/>
+                    <label value = "Confirm deleting"/>
                     <label value ="@{controller.advanceType.unitName}"/>
                     <label value = "?"/>
                 </hbox>
                 <hbox align = "center">
-                    <button label="Yes"
+                    <button label="${i18n:_('Yes')}"
                         onClick="controller.remove(controller.advanceType);" />
-                    <button label="No"
+                    <button label="${i18n:_('No')}"
                         onClick="controller.cancelRemove();" />
                 </hbox>
             </vbox>
diff --git a/navalplanner-webapp/src/main/webapp/common/components/twowayselector.zul b/navalplanner-webapp/src/main/webapp/common/components/twowayselector.zul
index f79bb275e..85400ff21 100644
--- a/navalplanner-webapp/src/main/webapp/common/components/twowayselector.zul
+++ b/navalplanner-webapp/src/main/webapp/common/components/twowayselector.zul
@@ -20,9 +20,9 @@
             </listbox>
 
             <vbox>
-                <button id="assignButton" label="&lt;&lt;"
+                <button id="assignButton" label="${i18n:_('&lt;&lt;')}"
                     onClick="top.assign(unassignedObjects);" />
-                <button id="unassignButton" label="&gt;&gt;"
+                <button id="unassignButton" label="${i18n:_('&gt;&gt;')}"
                     onClick="top.unassign(assignedObjects);" />
             </vbox>
 
diff --git a/navalplanner-webapp/src/main/webapp/common/concurrent_modification.zul b/navalplanner-webapp/src/main/webapp/common/concurrent_modification.zul
index a7dc31ad6..bcb2dfbe2 100644
--- a/navalplanner-webapp/src/main/webapp/common/concurrent_modification.zul
+++ b/navalplanner-webapp/src/main/webapp/common/concurrent_modification.zul
@@ -12,7 +12,7 @@
             Another user has modified the same data, so the operation couldn't be completed.
 
             <hbox style="margin-left:auto; margin-right:auto">
-                <button id="continue" label="Continue" />
+                <button id="continue" label="${i18n:_('Continue')}" />
             </hbox>
         </vbox>
     </window>
diff --git a/navalplanner-webapp/src/main/webapp/common/error.zul b/navalplanner-webapp/src/main/webapp/common/error.zul
index 8fc20d017..f31cadde2 100644
--- a/navalplanner-webapp/src/main/webapp/common/error.zul
+++ b/navalplanner-webapp/src/main/webapp/common/error.zul
@@ -9,13 +9,11 @@
         </caption-->
         <vbox apply="org.navalplanner.web.error.PageForErrorOnEvent"
             sclass="errorbox">
-            Prodúxose un erro na execución:
-            "${requestScope['javax.servlet.error.message']}". O erro
-            gardouse e procurarase arreglalo no menor tempo posible.
+            <i18n value="Run-time error: {0} . Error was registered and it&#039;ll be fixed as soon as possible." arg1="${requestScope['javax.servlet.error.message']}" />
             <hbox style="margin-left:auto; margin-right:auto">
-                <button id="reload" label="Reload" />
-                <button id="quitSession" label="Exit Session"></button>
+                <button id="reload" label="${i18n:_('Reload')}" />
+                <button id="quitSession" label="${i18n:_('Exit session')}"></button>
             </hbox>
         </vbox>
     </window>
-</zk>
\ No newline at end of file
+</zk>
diff --git a/navalplanner-webapp/src/main/webapp/common/event_error.zul b/navalplanner-webapp/src/main/webapp/common/event_error.zul
index 995e926c5..2fa0fc0d1 100644
--- a/navalplanner-webapp/src/main/webapp/common/event_error.zul
+++ b/navalplanner-webapp/src/main/webapp/common/event_error.zul
@@ -1,14 +1,12 @@
-<window title="Erro ${requestScope['javax.servlet.error.status_code']}"
+<window title="${i18n:_('Erro ${requestScope['javax.servlet.error.status_code']}')}"
     width="400px" border="normal" mode="modal"
     apply="org.navalplanner.web.error.PageForErrorOnEvent">
     <vbox>
-        Prodúxose un erro na execución:
-        "${requestScope['javax.servlet.error.message']}". O erro
-        gardouse e procurarase arreglalo no menor tempo posible.
+        <i18n value="Run-time error: {0} . Error was registered and it&#039;ll be fixed as soon as possible." arg1="${requestScope['javax.servlet.error.message']}" />
         <hbox style="margin-left:auto; margin-right:auto">
-            <button id="continueWorking" label="Continue" />
-            <button id="reload" label="Reload" />
-            <button id="quitSession" label="Exit Session"></button>
+            <button id="continueWorking" label="${i18n:_('Continue')}" />
+            <button id="reload" label="${i18n:_('Reload')}" />
+            <button id="quitSession" label="${i18n:_('Exit session')}"></button>
         </hbox>
     </vbox>
 </window>
diff --git a/navalplanner-webapp/src/main/webapp/common/layout/login_v01.zul b/navalplanner-webapp/src/main/webapp/common/layout/login_v01.zul
index 36b79c0e1..a4ed157df 100644
--- a/navalplanner-webapp/src/main/webapp/common/layout/login_v01.zul
+++ b/navalplanner-webapp/src/main/webapp/common/layout/login_v01.zul
@@ -13,7 +13,7 @@
 </n:table>
 <n:table width="850" border="0" align="center" cellpadding="0" cellspacing="0" bgcolor="#FFFFFF">
   <n:tr>
-    <n:td class="identificacion">ACCESO AL SISTEMA</n:td>
+    <n:td class="identificacion">${i18n:_('AUTHENTICATE')}</n:td>
   </n:tr>
 </n:table>
 <n:table width="850" border="0" align="center" cellpadding="0" cellspacing="0" bgcolor="#FFFFFF" class="fondo_identificacion">
@@ -23,7 +23,7 @@
           <n:td></n:td>
         </n:tr>
         <n:tr>
-          <n:td class="usuario_clave">Usuario</n:td>
+          <n:td class="usuario_clave">${i18n:_('User')}</n:td>
         </n:tr>
         <n:tr>
           <n:td><n:label> </n:label>
@@ -32,7 +32,7 @@
             </n:div></n:td>
         </n:tr>
         <n:tr>
-          <n:td class="usuario_clave">Clave</n:td>
+          <n:td class="usuario_clave">${i18n:_('Password')}</n:td>
         </n:tr>
         <n:tr>
           <n:td><n:div align="center">
@@ -45,7 +45,7 @@
         <n:tr>
           <n:td><n:label> </n:label>
               <n:div align="center">
-                <n:input name="button" type="submit" class="entrar" id="button" value="Validarse para entrar" />
+                <n:input name="button" type="submit" class="entrar" id="button" value="${i18n:_('Sign in')}" />
             </n:div></n:td>
         </n:tr>
     </n:table></n:td>
diff --git a/navalplanner-webapp/src/main/webapp/common/layout/template_v01.zul b/navalplanner-webapp/src/main/webapp/common/layout/template_v01.zul
index 853373091..b735b6665 100644
--- a/navalplanner-webapp/src/main/webapp/common/layout/template_v01.zul
+++ b/navalplanner-webapp/src/main/webapp/common/layout/template_v01.zul
@@ -9,11 +9,11 @@
     <n:td height="20" class="migas_linea"><n:table border="0" cellspacing="0" cellpadding="0">
       <n:tr>
         <n:td width="26"></n:td>
-        <n:td><n:a href="layout.html" class="ruta"><n:strong>INICIO</n:strong></n:a></n:td>
+        <n:td><n:a href="layout.html" class="ruta"><n:strong>${i18n:_('START')}</n:strong></n:a></n:td>
       <n:td width="15"><n:div align="center"><n:img src="/navalplanner-webapp/common/img/migas_separacion.gif" width="10" height="15" /></n:div></n:td>
-        <n:td><n:a href="#" class="ruta">Planificacion</n:a></n:td>
+        <n:td><n:a href="#" class="ruta">${i18n:_('Scheduling')}</n:a></n:td>
       <n:td width="15"><n:div align="center"><n:img src="/navalplanner-webapp/common/img/migas_separacion.gif" width="10" height="15" /></n:div></n:td>
-        <n:td><n:a href="#" class="ruta">Listado de planificacion</n:a></n:td>
+        <n:td><n:a href="#" class="ruta">${i18n:_('Scheduling listing')}</n:a></n:td>
       </n:tr>
     </n:table></n:td>
   </n:tr>
@@ -23,19 +23,19 @@
     <n:td><n:table border="0" cellspacing="0" cellpadding="0">
       <n:tr>
         <n:td width="20"></n:td>
-        <n:td><n:a href="#" class="menuup_activa">Planificacion</n:a></n:td>
-        <n:td><n:a href="recurso.html" class="menuup">Recursos</n:a></n:td>
-        <n:td><n:a href="pedidos.html" class="menuup">Pedidos</n:a></n:td>
-        <n:td><n:a href="#" class="menuup">Partes de Traballo</n:a></n:td>
-        <n:td><n:a href="#" class="menuup">Informes</n:a></n:td>
-      <n:td><n:a href="#" class="menuup">Xestión da Calidade</n:a></n:td>
+        <n:td><n:a href="#" class="menuup_activa">${i18n:_('Scheduling')}</n:a></n:td>
+        <n:td><n:a href="recurso.html" class="menuup">${i18n:_('Resources')}</n:a></n:td>
+        <n:td><n:a href="pedidos.html" class="menuup">${i18n:_('Orders')}</n:a></n:td>
+        <n:td><n:a href="#" class="menuup">${i18n:_('Work reports')}</n:a></n:td>
+        <n:td><n:a href="#" class="menuup">${i18n:_('Reports')}</n:a></n:td>
+      <n:td><n:a href="#" class="menuup">${i18n:_('Quality management')}</n:a></n:td>
       <n:td width="60" valign="bottom"><n:div align="center"><n:a href="#"><n:img src="/navalplanner-webapp/common/img/axuda.gif" alt="Axuda" width="23" height="24" border="0" /></n:a></n:div></n:td>
       </n:tr>
     </n:table></n:td>
   <n:td align="right"><n:table border="0" cellspacing="0" cellpadding="0">
     <n:tr>
-      <n:td class="usuario">usuario: admin</n:td>
-      <n:td><n:a href="#" class="cerrar_sesion">PECHAR SESIoN </n:a></n:td>
+      <n:td class="usuario">${i18n:_('usuario: admin')}</n:td>
+      <n:td><n:a href="#" class="cerrar_sesion">${i18n:_('SIGN OUT')}</n:a></n:td>
     </n:tr>
   </n:table></n:td>
   </n:tr>
@@ -45,11 +45,11 @@
     <n:td bgcolor="#2A83B4"><n:table border="0" cellspacing="0" cellpadding="0">
       <n:tr>
         <n:td width="26"></n:td>
-        <n:td><n:a href="#" class="sub_menu">Planificacion</n:a></n:td>
+        <n:td><n:a href="#" class="sub_menu">${i18n:_('Scheduling'})</n:a></n:td>
         <n:td width="14" background="/common/img/sub_separacion.gif"></n:td>
-        <n:td><n:a href="#" class="sub_menu">Vista de empresas </n:a></n:td>
+        <n:td><n:a href="#" class="sub_menu">${i18n:_('Company overview')}</n:a></n:td>
       <n:td width="14" background="/common/img/sub_separacion.gif"></n:td>
-        <n:td><n:a href="#" class="sub_menu">Listado de planificacion </n:a></n:td>
+        <n:td><n:a href="#" class="sub_menu">${i18n:_('Scheduling listing')}</n:a></n:td>
       </n:tr>
     </n:table></n:td>
   </n:tr>
diff --git a/navalplanner-webapp/src/main/webapp/common/layout/template_v02.zul b/navalplanner-webapp/src/main/webapp/common/layout/template_v02.zul
index 61683ab48..ff978bdb8 100644
--- a/navalplanner-webapp/src/main/webapp/common/layout/template_v02.zul
+++ b/navalplanner-webapp/src/main/webapp/common/layout/template_v02.zul
@@ -16,15 +16,15 @@
         <n:tr>
           <n:td height="20" align="right"><n:table border="0" cellspacing="0" cellpadding="0">
             <n:tr>
-              <n:td class="usuario">usuario: admin</n:td>
-              <n:td><n:a href="/navalplanner-webapp/common/layout/login_v01.zul" class="cerrar_sesion">PECHAR SESIÓN </n:a></n:td>
+              <n:td class="usuario">${i18n:_('user: admin')}</n:td>
+              <n:td><n:a href="/navalplanner-webapp/common/layout/login_v01.zul" class="cerrar_sesion">${i18n:_('SIGN OUT')}</n:a></n:td>
             <n:td><n:a href="#"><n:img src="/navalplanner-webapp/common/img/axuda.gif" alt="Axuda" width="23" height="24" border="0" /></n:a></n:td>
             </n:tr>
           </n:table></n:td>
         </n:tr>
       </n:table>
 
-        <customMenu top_id="customMenu" title="Main menu"/>
+        <customMenu top_id="customMenu" title="${i18n:_('Main menu')}"/>
 
           </n:td>
     </n:tr>
@@ -39,7 +39,7 @@
     <n:td class="migas_linea"><n:table border="0" cellspacing="0" cellpadding="0">
         <n:tr>
           <n:td width="10"></n:td>
-          <n:td><n:a href="/navalplanner-webapp/" class="ruta"><n:strong>INICIO</n:strong></n:a></n:td>
+          <n:td><n:a href="/navalplanner-webapp/" class="ruta"><n:strong>${i18n:_('START')}</n:strong></n:a></n:td>
           <n:td width="15"><n:div align="center"><n:img src="/navalplanner-webapp/common/img/migas_separacion.gif" width="10" height="15" /></n:div></n:td>
         </n:tr>
     </n:table></n:td>
diff --git a/navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul b/navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul
index b2d95c4e5..8bd6cbdd6 100644
--- a/navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul
@@ -1,9 +1,9 @@
 <?component name="listOrderElementHours" inline="true" macroURI="_listOrderElementHours.zul"?>
-<window visible="false" id="${arg.top_id}" title="Edit Order Element"  width="600px" left="100px" top="100px">
+<window visible="false" id="${arg.top_id}" title="${i18n:_('Edit order element')}"  width="600px" left="100px" top="100px">
  <tabbox>
         <tabs>
-            <tab label="Detalles"></tab>
-            <tab label="Horas Imputadas"></tab>
+            <tab label="${i18n:_('Details')}"></tab>
+            <tab label="${i18n:_('Assigned hours')}"></tab>
         </tabs>
         <tabpanels>
             <tabpanel>
@@ -12,13 +12,13 @@
         <label value="${arg.title}" />
 
         <hbox>
-            <label value="Order Element Name" />
+            <label value="${i18n:_('Order element name')}" />
             <textbox id="name"
                 value="@{orderElementController.orderElement.name,
                 save-when='backButton.onClick'}" />
 
 
-            <label value="Code " />
+            <label value="${i18n:_('Code ')}" />
             <textbox id="code"
                 value="@{orderElementController.orderElement.code,
                 save-when='backButton.onClick'}" />
@@ -27,29 +27,29 @@
 
 
         <hbox>
-            <label value="Init Date" />
+            <label value="${i18n:_('Starting date')}" />
             <datebox id="initDate"
                 value="@{orderElementController.orderElement.initDate,
                 save-when='backButton.onClick'}" />
             <checkbox id="mandatoryInit"
                 checked="@{orderElementController.orderElement.mandatoryInit},
                 save-when='backButton.onClick'" />
-            <label value="Mandatory" />
+            <label value="${i18n:_('Mandatory')}" />
         </hbox>
 
         <hbox>
-            <label value="End Date" />
+            <label value="${i18n:_('Ending date')}" />
             <datebox id="endDate"
                 value="@{orderElementController.orderElement.endDate,
                 save-when='backButton.onClick'}" />
             <checkbox id="mandatoryEnd"
                 checked="@{orderElementController.orderElement.mandatoryEnd,
                 save-when='backButton.onClick'}" />
-            <label value="Mandatory" />
+            <label value="${i18n:_('Mandatory')}" />
         </hbox>
 
         <hbox>
-            <label value="Total hours" />
+            <label value="${i18n:_('Total hours')}" />
             <intbox id="totalHours"
                 value="@{orderElementController.orderElement.workHours}" />
         </hbox>
@@ -58,23 +58,23 @@
             model="@{orderElementController.hoursGroups}"
             itemRenderer="@{orderElementController.renderer}">
              <listhead sizable="true">
-                 <listheader label="Hours" />
-                 <listheader label="%" />
+                 <listheader label="${i18n:_('Hours')}" />
+                 <listheader label="${i18n:_('%')}" />
              </listhead>
         </listbox>
 
         <hbox>
-            <button id="addHoursGroup" label="Add hours group"
+            <button id="addHoursGroup" label="${i18n:_('Add hours group')}"
                 onClick="orderElementController.addHoursGroup();" />
-            <button id="deleteHoursGroup" label="Delete hours group"
+            <button id="deleteHoursGroup" label="${i18n:_('Delete hours group')}"
                 onClick="orderElementController.deleteHoursGroups();" />
-            <button id="manageCriterions" label="Manage criterions"
+            <button id="manageCriterions" label="${i18n:_('Manage criterions')}"
                 onClick="orderElementController.manageCriterions();" />
         </hbox>
 
         <vbox id="selectCriterions">
 
-        <label value="Manage criterions" />
+        <label value="${i18n:_('Manage criterions')}" />
 
             <twowayselector
                 assignedObjects="@{orderElementController.selectedCriterionTypes,
diff --git a/navalplanner-webapp/src/main/webapp/orders/_edition.zul b/navalplanner-webapp/src/main/webapp/orders/_edition.zul
index c2b674f88..bb01df60a 100644
--- a/navalplanner-webapp/src/main/webapp/orders/_edition.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/_edition.zul
@@ -2,39 +2,39 @@
 <window id="${arg.top_id}" title="${arg.title}">
     <tabbox>
         <tabs>
-            <tab label="Edition"></tab>
-            <tab label="Order Elements"></tab>
+            <tab label="${i18n:_('Edit')}"></tab>
+            <tab label="${i18n:_('Order elements')}"></tab>
         </tabs>
         <tabpanels>
             <tabpanel>
                 <grid fixedLayout="false">
                     <rows>
                         <row>
-                            <label value="Name" />
+                            <label value="${i18n:_('Name')}" />
                             <textbox value="@{controller.order.name}" />
                         </row>
                         <row>
-                            <label value="Init date" />
+                            <label value="${i18n:_('Starting date')}" />
                             <datebox
                                 value="@{controller.order.initDate}" />
                         </row>
                         <row>
-                            <label value="End date" />
+                            <label value="${i18n:_('Ending date')}" />
                             <datebox
                                 value="@{controller.order.endDate}" />
                         </row>
                         <row>
-                            <label value="Responsible" />
+                            <label value="${i18n:_('Responsible')}" />
                             <textbox
                                 value="@{controller.order.responsible}" />
                         </row>
                         <row>
-                            <label value="Customer" />
+                            <label value="${i18n:_('Customer')}" />
                             <textbox
                                 value="@{controller.order.customer}" />
                         </row>
                         <row>
-                            <label value="Description" />
+                            <label value="${i18n:_('Description')}" />
                             <textbox
                                 value="@{controller.order.description}"
                                 rows="4" />
diff --git a/navalplanner-webapp/src/main/webapp/orders/_list.zul b/navalplanner-webapp/src/main/webapp/orders/_list.zul
index a14e5c298..0c14584f5 100644
--- a/navalplanner-webapp/src/main/webapp/orders/_list.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/_list.zul
@@ -1,26 +1,26 @@
-<window id="${arg.top_id}" title="Orders List">
+<window id="${arg.top_id}" title="${i18n:_('Orders list')}">
     <grid id="listing" model="@{controller.orders}" mold="paging"
         pageSize="5">
         <columns>
-            <column label="Operations" />
-            <column label="Name" sort="auto(name)" />
-            <column label="Init date" sort="auto(initDate)" />
-            <column label="End date" sort="auto(endDate)" />
-            <column label="Responsible" sort="auto(responsible)" />
-            <column label="Customer" sort="auto(customer)" />
-            <column label="Description" sort="auto(description)" />
+            <column label="${i18n:_('Operations')}" />
+            <column label="${i18n:_('Name')}" sort="auto(name)" />
+            <column label="${i18n:_('Starting date')}" sort="auto(initDate)" />
+            <column label="${i18n:_('Ending date')}" sort="auto(endDate)" />
+            <column label="${i18n:_('Responsible')}" sort="auto(responsible)" />
+            <column label="${i18n:_('Customer')}" sort="auto(customer)" />
+            <column label="${i18n:_('Description')}" sort="auto(description)" />
         </columns>
         <rows>
             <row self="@{each='order'}" value="@{order}">
                 <hbox>
-                    <button label="Edit"
+                    <button label="${i18n:_('Edit')}"
                         onClick="controller.goToEditForm(self.parent.parent.value);">
                     </button>
 
-                    <button label="Remove"
+                    <button label="${i18n:_('Delete')}"
                         onClick="controller.confirmRemove(self.parent.parent.value);">
                     </button>
-                    <button label="Schedule"
+                    <button label="${i18n:_('Schedule')}"
                         onClick="controller.confirmSchedule(self.parent.parent.value);">
                     </button>
                 </hbox>
@@ -34,6 +34,6 @@
         </rows>
     </grid>
     <button id="show_create_form" onClick="controller.goToCreateForm();"
-        label="Create">
+        label="${i18n:_('Create')}">
     </button>
-</window>
\ No newline at end of file
+</window>
diff --git a/navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul b/navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul
index 2d4f84b83..b8a6d6c81 100644
--- a/navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul
@@ -1,15 +1,15 @@
 <vbox id="listOrderElementHours">
 <vbox>
-    <label value="Imputacion directa" />
+    <label value="${i18n:_('Direct imputation')}" />
     <separator spacing="3px" orient="horizontal"/>
 </vbox>
 <vbox>
      <grid id="listingWRL" style="border:0px" height="100%" model="@{asignedHoursToOrderElementController.workReportLines}" mold="paging"
         pageSize="5">
         <columns>
-            <column label="Data" />
-            <column label="Recurso" />
-            <column label="Horas" />
+            <column label="${i18n:_('Date')}" />
+            <column label="${i18n:_('Resource')}" />
+            <column label="${i18n:_('Hours')}" />
         </columns>
         <rows>
             <row self="@{each='workReportLine'}">
@@ -22,7 +22,7 @@
     <grid id="total" style="border:0px">
         <rows>
             <row>
-                <label value="Total" />
+                <label value="${i18n:_('Total')}" />
                 <label id="totalID" value="@{asignedHoursToOrderElementController.totalAsignedDirectHours}" />
             </row>
         </rows>
@@ -31,7 +31,7 @@
 <vbox>
     <separator spacing="5px" orient="horizontal"/>
     <hbox>
-        <label value="Imputación lineas hijas: "/> <label id="totalIDC" value="@{asignedHoursToOrderElementController.hoursChildren}"/>
+        <label value="Order lines imputation: "/> <label id="totalIDC" value="@{asignedHoursToOrderElementController.hoursChildren}"/>
     </hbox>
     <hbox>
         <label value="Total:"/><label id="addtotal" value="@{asignedHoursToOrderElementController.totalAsignedHours}"/>
@@ -39,23 +39,23 @@
 </vbox>
 <separator bar="true" spacing="12px" orient="horizontal"/>
 <vbox>
-    <label value="Porcentaje de consumo horas presupuestadas/horas consumidas."/>
+    <label value="${i18n:_('Percentage of consumed budget hours / hours consumed.')}"/>
     <grid style="border:0px" height="100%">
         <rows>
             <row>
                 <vbox>
                      <hbox>
-                        <label value="Horas presupuestadas:"/>
+                        <label value="${i18n:_('Budget hours:')}"/>
                         <label id="estimatedHours" value="@{asignedHoursToOrderElementController.estimatedHours}"/>
                     </hbox>
                     <hbox>
-                        <label value="Horas imputadas:"/>
+                        <label value="${i18n:_('Imputed hours:')}"/>
                         <label id="addAsignedHours" value="@{asignedHoursToOrderElementController.totalAsignedHours}"/>
                     </hbox>
                 </vbox>
                 <hbox id = "Percentage">
                         <label value="@{asignedHoursToOrderElementController.progressWork}"/>
-                        <label value="%       "/>
+                        <label value="${i18n:_('%       ')}"/>
                         <progressmeter id="HoursProgressBar"/>
                         <progressmeter id="exceedHoursProgressBar"/>
                 </hbox>
@@ -63,7 +63,7 @@
         </rows>
     </grid>
     <hbox>
-       <button id="backButton2" onClick="asignedHoursToOrderElementController.back();" label="back" />
+       <button id="backButton2" onClick="asignedHoursToOrderElementController.back();" label="${i18n:_('Back')}" />
     </hbox>
 </vbox>
 </vbox>
diff --git a/navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul b/navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul
index 310fa9dd3..c8c5a2712 100644
--- a/navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul
@@ -1,18 +1,18 @@
 <vbox id="orderElementTree">
     <vbox>
         <hbox>
-            <button label="New order element"
+            <button label="${i18n:_('New order element')}"
                 onClick="orderElementTreeController.addOrderElement();">
             </button>
-            <button label="Remove order element"
+            <button label="${i18n:_('Delete order element')}"
                 onClick="orderElementTreeController.removeOrderElement();">
             </button>
-            <button label="Indent"
+            <button label="${i18n:_('Indent')}"
                 onClick="orderElementTreeController.indent();">
             </button>
-            <button label="Unindent" onClick="orderElementTreeController.unindent();" />
-            <button label="Down" onClick="orderElementTreeController.up();"></button>
-            <button label="Up" onClick="orderElementTreeController.down();"></button>
+            <button label="${i18n:_('Unindent')}" onClick="orderElementTreeController.unindent();" />
+            <button label="${i18n:_('Down')}" onClick="orderElementTreeController.up();"></button>
+            <button label="${i18n:_('Up')}" onClick="orderElementTreeController.down();"></button>
         </hbox>
     </vbox>
     <vbox>
@@ -22,11 +22,11 @@
             treeitemRenderer="@{orderElementTreeController.renderer}" pageSize="5"
             sclass="orderTree">
             <treecols sizable="true">
-                <treecol label="Name and description" />
-                <treecol label="Code" />
-                <treecol label="Estimated init" />
-                <treecol label="Estimated end" />
-                <treecol label="Hours" />
+                <treecol label="${i18n:_('Name and description')}" />
+                <treecol label="${i18n:_('Code')}" />
+                <treecol label="${i18n:_('Estimated init')}" />
+                <treecol label="${i18n:_('Estimated end')}" />
+                <treecol label="${i18n:_('Hours')}" />
             </treecols>
         </tree>
     </vbox>
diff --git a/navalplanner-webapp/src/main/webapp/orders/orders.zul b/navalplanner-webapp/src/main/webapp/orders/orders.zul
index af7c10891..343d27eae 100644
--- a/navalplanner-webapp/src/main/webapp/orders/orders.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/orders.zul
@@ -1,4 +1,4 @@
-<?page title="Navalpro: Orders"?>
+<?page title="${i18n:_('Navalpro: Orders')}"?>
 <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
 <?page  id="List"?>
 <?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template_v02.zul"?>
@@ -9,44 +9,46 @@
 <?component name="list" inline="true" macroURI="_list.zul"?>
 <?component name="edition" inline="true" macroURI="_edition.zul"?>
 <?component name="orderElement" inline="true" macroURI="_editOrderElement.zul"?>
+
 <zk>
     <window self="@{define(content)}"
         apply="org.navalplanner.web.orders.OrderCRUDController">
         <vbox id="messagesContainer"></vbox>
         <list top_id="listWindow" />
-        <edition top_id="createWindow" title="Create"
-            save_button_label="Save" cancel_button_label="Cancel" />
-        <edition top_id="editWindow" title="Edit Personal Data"
-            save_button_label="Save" cancel_button_label="Cancel" />
-        <orderElement top_id="editOrderElement" title="Edit Order Element"
-            back_button_label="Back" />
+        <edition top_id="createWindow" title="${i18n:_('Create')}"
+            save_button_label="${i18n:_('Save')}" cancel_button_label="${i18n:_('Cancel')}" />
+        <edition top_id="editWindow" title="${i18n:_('Edit personal data')}"
+            save_button_label="${i18n:_('Save')}" cancel_button_label="${i18n:_('Cancel')}" />
+        <orderElement top_id="editOrderElement" title="${i18n:_('Edit order element')}"
+            back_button_label="${i18n:_('Back')}" />
+
         <window visible="@{controller.confirmingRemove}"
-            id="confirmRemove" title="Confirmación" width="500px"
+            id="confirmRemove" title="${i18n:_('Confirm')}" width="500px"
             position="center">
             <vbox>
                 <hbox>
-                ¿Desexa borrar <label value="@{controller.order.name}"/> ?
+                    <i18n value="Confirm deleting {0} ?" arg1="@{controller.order.name}"/>
                 </hbox>
                 <hbox>
-                    <button label="Yes"
+                    <button label="${i18n:_('Yes')}"
                         onClick="controller.remove(controller.order);" />
-                    <button label="No"
+                    <button label="${i18n:_('No')}"
                         onClick="controller.cancelRemove();" />
                 </hbox>
             </vbox>
         </window>
 
         <window visible="@{controller.confirmingSchedule}"
-            id="confirmSchedule" title="Confirmación" width="500px"
+            id="confirmSchedule" title="${i18n:_('Confirm')}" width="500px"
             position="center">
             <vbox>
                 <hbox>
-                ¿Desexa planificar <label value="@{controller.order.name}"/> ?
+                    <i18n value="Confirm scheduling {0} ?" arg1="@{controller.order.name}"/>
                 </hbox>
                 <hbox>
-                    <button label="Yes"
+                    <button label="${i18n:_('Yes')}"
                         onClick="controller.schedule();" />
-                    <button label="No"
+                    <button label="${i18n:_('No')}"
                         onClick="controller.cancelSchedule();" />
                 </hbox>
             </vbox>
diff --git a/navalplanner-webapp/src/main/webapp/planner/main.zul b/navalplanner-webapp/src/main/webapp/planner/main.zul
index 8ca320a55..ec932de07 100644
--- a/navalplanner-webapp/src/main/webapp/planner/main.zul
+++ b/navalplanner-webapp/src/main/webapp/planner/main.zul
@@ -1,4 +1,4 @@
-<?page title="Navalpro: Scheduling"?>
+<?page title="${i18n:_('Navalpro: Scheduling')}"?>
 <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
 <?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template_v02.zul"?>
 <?taglib uri="/WEB-INF/tld/i18n.tld" prefix="i18n"?>
@@ -41,7 +41,7 @@
                 </row>
             </rows>
         </grid>
-        <button id="ok" label=" ${i18n:_('Accept')}" />
+        <button id="ok" label="${i18n:_('Accept')}" />
     </popup>
 
 </zk>
diff --git a/navalplanner-webapp/src/main/webapp/planner/order.zul b/navalplanner-webapp/src/main/webapp/planner/order.zul
index 06adad164..5f59d2911 100644
--- a/navalplanner-webapp/src/main/webapp/planner/order.zul
+++ b/navalplanner-webapp/src/main/webapp/planner/order.zul
@@ -1,4 +1,4 @@
-<?page title="Navalpro: Scheduling"?>
+<?page title="${i18n:_('Navalpro: Scheduling')}"?>
 <?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template_v02.zul"?>
 <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
 <?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
@@ -52,35 +52,35 @@
                 </row>
             </rows>
         </grid>
-        <button id="ok" label=" ${i18n:_('Accept')}" />
+        <button id="ok" label="${i18n:_('Accept')}" />
     </popup>
 
     <window id="resourceAllocationWindow" visible="false" apply="${allocationController}">
         <vbox>
-            <label value="Required criterions" />
+            <label value="${i18n:_('Required criterions')}" />
             <listbox id="requiredCriterions"
                 model="@{allocationController.criterions}">
                <listitem self="@{each='criterion'}">
                     <listcell label="@{criterion.name}"></listcell>
                 </listitem>
             </listbox>
-            <label id="requiredCriterionsEmpty" value="None" visible="false" />
+            <label id="requiredCriterionsEmpty" value="${i18n:_('None')}" visible="false" />
             <hbox>
-                <button id="addResourceAllocation" label="Add"
+                <button id="addResourceAllocation" label="${i18n:_('Add')}"
                     onClick="allocationController.addResourceAllocation();" />
-                <button id="removeResourceAllocation" label="Remove"
+                <button id="removeResourceAllocation" label="${i18n:_('Delete')}"
                     onClick="allocationController.removeResourceAllocation();" />
             </hbox>
             <listbox id="resourcesList"
                 model="@{allocationController.resourceAllocations}"
                 itemRenderer="@{allocationController.resourceAllocationRenderer}">
                 <listhead>
-                    <listheader label="Resource" />
-                    <listheader label="Percentage" />
-                    <listheader label="Message" />
+                    <listheader label="${i18n:_('Resource')}" />
+                    <listheader label="${i18n:_('Percentage')}" />
+                    <listheader label="${i18n:_('Message')}" />
                 </listhead>
             </listbox>
-            <button id="closeResourceAllocationWindow" label="Back"
+            <button id="closeResourceAllocationWindow" label="${i18n:_('Back')}"
                 onClick="allocationController.back();" />
         </vbox>
     </window>
@@ -88,12 +88,12 @@
     <window id="splittingWindow" visible="false" apply="${splittingTaskController}" minwidth="${400}" >
         <vbox>
             <hbox>
-            <label value="Total hours:" /> <label id="totalHoursLabel"/>
+            <label value="${i18n:_('Total hours:')}" /> <label id="totalHoursLabel"/>
             </hbox>
             <grid id="sharesListing" fixedLayout="true">
                 <columns sizable="true">
-                    <column label="Name" />
-                    <column label="Hours" />
+                    <column label="${i18n:_('Name')}" />
+                    <column label="${i18n:_('Hours')}" />
                 </columns>
                 <rows>
                     <row self="@{each='share'}">
@@ -103,8 +103,8 @@
                 </rows>
             </grid>
             <hbox>
-                <button label="Ok" id="splitOk" />
-                <button label="Cancel" id="splitCancel" />
+                <button label="${i18n:_('Accept')}" id="splitOk" />
+                <button label="${i18n:_('Cancel')}" id="splitCancel" />
             </hbox>
         </vbox>
     </window>
diff --git a/navalplanner-webapp/src/main/webapp/planner/resources_use.zul b/navalplanner-webapp/src/main/webapp/planner/resources_use.zul
index 6b8124aa4..0d1ea91bc 100644
--- a/navalplanner-webapp/src/main/webapp/planner/resources_use.zul
+++ b/navalplanner-webapp/src/main/webapp/planner/resources_use.zul
@@ -1,4 +1,4 @@
-<?page title="Navalpro: Scheduling"?>
+<?page title="${i18n:_('Navalpro: Scheduling')}"?>
 <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
 <?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template_v02.zul"?>
 <?link rel="stylesheet" type="text/css" href="/planner/css/ganttzk.css"?>
diff --git a/navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul b/navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul
index 956fa2369..6383266cf 100644
--- a/navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul
+++ b/navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul
@@ -1,6 +1,6 @@
 <vbox id="${arg.top_id}">
  <hbox>
-  <label value="name" />
+  <label value="${i18n:_('Name')}" />
   <textbox value="@{controller.edition.criterion.name}" />
   <checkbox checked="@{controller.edition.criterion.active}"
    visible="@{controller.edition.editing}">
diff --git a/navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul b/navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul
index bbc9417ac..d191b7c4e 100644
--- a/navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul
+++ b/navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul
@@ -1,7 +1,7 @@
 <grid id="listing" fixedLayout="true">
     <columns sizable="true">
-        <column label="Operacións" />
-        <column label="Nome" />
-        <column label="Activo" />
+        <column label="${i18n:_('Operations')}" />
+        <column label="${i18n:_('Name')}" />
+        <column label="${i18n:_('Enabled')}" />
     </columns>
 </grid>
diff --git a/navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul b/navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul
index 7cb7dc5e6..b7ae497ed 100644
--- a/navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul
+++ b/navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul
@@ -2,14 +2,14 @@
  <grid model="@{controller.workers.workersForCurrentCriterion}"
   mold="paging" pageSize="5" apply="${controller.workers}">
   <columns>
-   <column label="Operacións" />
-   <column label="Nome" sort="auto(firstName)" />
-   <column label="Apellidos" sort="auto(surname)" />
-   <column label="nif" sort="auto(nif)" />
+   <column label="${i18n:_('Operations')}" />
+   <column label="${i18n:_('Name')}" sort="auto(firstName)" />
+   <column label="${i18n:_('Surname')}" sort="auto(surname)" />
+   <column label="${i18n:_('NIF')}" sort="auto(nif)" />
   </columns>
   <rows>
    <row self="@{each='worker'}" value="@{worker}">
-    <button label="Edición" onClick="controller.workers.goToEditPage(self.getParent().getValue());"></button>
+    <button label="${i18n:_('Edit')}" onClick="controller.workers.goToEditPage(self.getParent().getValue());"></button>
     <label value="@{worker.firstName}" />
     <label value="@{worker.surname}" />
     <label value="@{worker.nif}" />
@@ -17,16 +17,16 @@
   </rows>
  </grid>
 
- <button id="adminButton" label="Administrar" disabled="@{controller.workers.changeAssignmentsDisabled}" onClick="controller.workers.showList(event);"></button>
+ <button id="adminButton" label="${i18n:_('Administration')}" disabled="@{controller.workers.changeAssignmentsDisabled}" onClick="controller.workers.showList(event);"></button>
  <window visible="false"  id="workersWindow">
     <listbox id="list" model="@{controller.workers.allWorkers}" mold="paging" multiple="true" checkmark="true">
         <listhead>
-            <listheader label="Name" sort="auto(surname)"></listheader>
+            <listheader label="${i18n:_('Name')}" sort="auto(surname)"></listheader>
         </listhead>
     </listbox>
-    <button label="Gardar" id="saveList"></button>
-    <button label="Cancelar" id="cancelList"></button>
+    <button label="${i18n:_('Save')}" id="saveList"></button>
+    <button label="${i18n:_('Cancel')}" id="cancelList"></button>
  </window>
  <button onClick="controller.cancel();"
   label="${arg.cancel_button_label}" />
-</vbox>
\ No newline at end of file
+</vbox>
diff --git a/navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul b/navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul
index f3ffd0fa2..218493d1e 100644
--- a/navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul
+++ b/navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul
@@ -14,10 +14,10 @@
   sclass="workerwindow">
   <vbox id="messagesContainer"></vbox>
   <list top_id="listWindow" />
-  <edition top_id="createComponent" title="Crear"
-   save_button_label="Save" cancel_button_label="Cancelar" />
-  <edition top_id="editComponent" title="Editar"
-   save_button_label="Save" cancel_button_label="Cancelar" />
-  <workers top_id="workersComponent" title="Workers" cancel_button_label="Volver"/>
+  <edition top_id="createComponent" title="${i18n:_('Create')}"
+   save_button_label="${i18n:_('Save')}" cancel_button_label="${i18n:_('Cancel')}" />
+  <edition top_id="editComponent" title="${i18n:_('Edit')}"
+   save_button_label="${i18n:_('Save')}" cancel_button_label="${i18n:_('Cancel')}" />
+  <workers top_id="workersComponent" title="${i18n:_('Workers')}" cancel_button_label="${i18n:_('Return')}"/>
  </window>
 </zk>
diff --git a/navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul b/navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul
index 38ec7c0ac..716520af7 100644
--- a/navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul
+++ b/navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul
@@ -1,9 +1,9 @@
 <window id="${arg.top_id}" title="${arg.title}">
     <grid id="edit">
         <columns>
-            <column label="Date start"/>
-            <column label="Date end"/>
-            <column label="Relationship"/>
+            <column label="${i18n:_('Starting date')}"/>
+            <column label="${i18n:_('Ending date')}"/>
+            <column label="${i18n:_('Relationship')}"/>
         </columns>
         <rows>
             <row>
@@ -21,7 +21,7 @@
         </rows>
       </grid>
     <button onClick="workRelationship.saveCriterionSatisfaction();"
-        label="Save Work Relationship" />
+        label="${i18n:_('Save')}" />
     <button onClick="controller.goToEditForm()"
-        label="Cancel and back to Work Relationships"/>
-</window>
\ No newline at end of file
+        label="${i18n:_('Cancel and return')}"/>
+</window>
diff --git a/navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul b/navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul
index 3e519a803..61f9bc6a7 100644
--- a/navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul
+++ b/navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul
@@ -3,34 +3,34 @@
 <window id="${arg.top_id}" title="${arg.title}">
     <tabbox>
         <tabs>
-            <tab label="Edición"></tab>
-            <tab label="Localizacións"></tab>
-            <tab label="Historial Laboral"></tab>
+            <tab label="${i18n:_('Edit')}"></tab>
+            <tab label="${i18n:_('Places')}"></tab>
+            <tab label="${i18n:_('Work record')}"></tab>
         </tabs>
         <tabpanels>
             <tabpanel>
                 <grid fixedLayout="false">
                     <columns>
-                        <column label="Type" />
-                        <column label="Content" />
+                        <column label="${i18n:_('Type')}" />
+                        <column label="${i18n:_('Content')}" />
                     </columns>
                     <rows>
                         <row>
-                            <label value="first_name" />
+                            <label value="${i18n:_('First name')}" />
                             <textbox
                                 value="@{controller.worker.firstName}" />
                         </row>
                         <row>
-                            <label value="last_name" />
+                            <label value="${i18n:_('Last name')}" />
                             <textbox
                                 value="@{controller.worker.surname}" />
                         </row>
                         <row>
-                            <label value="nif" />
+                            <label value="${i18n:_('NIF')}" />
                             <textbox value="@{controller.worker.nif}" />
                         </row>
                         <row>
-                            <label value="daily_hours" />
+                            <label value="${i18n:_('Daily hours')}" />
                             <textbox
                                 value="@{controller.worker.dailyHours}" />
                         </row>
@@ -42,8 +42,8 @@
             </tabpanel>
             <tabpanel>
                 <workRelationships top_id="workRelationshipsWindow"
-                    title="Work Relationships" save_button_label="Save"
-                    cancel_button_label="Cancel" />
+                    title="${i18n:_('Work relationships')}" save_button_label="${i18n:_('Save')}"
+                    cancel_button_label="${i18n:_('Cancel')}" />
             </tabpanel>
         </tabpanels>
     </tabbox>
diff --git a/navalplanner-webapp/src/main/webapp/resources/worker/_list.zul b/navalplanner-webapp/src/main/webapp/resources/worker/_list.zul
index 3d2d36e66..9aebb97d2 100644
--- a/navalplanner-webapp/src/main/webapp/resources/worker/_list.zul
+++ b/navalplanner-webapp/src/main/webapp/resources/worker/_list.zul
@@ -1,12 +1,12 @@
-<window id="${arg.top_id}" title="List">
+<window id="${arg.top_id}" title="${i18n:_('List')}">
     <grid id="listing" model="@{controller.workers}" mold="paging"
         pageSize="5">
         <columns>
-            <column label="First Name" sort="auto(firstName)" />
-            <column label="Surname" sort="auto(surname)" />
-            <column label="nif" sort="auto(nif)" />
-            <column label="daily_hours" sort="auto(dailyHours)" />
-            <column label="operations" />
+            <column label="${i18n:_('First name')}" sort="auto(firstName)" />
+            <column label="${i18n:_('Surname')}" sort="auto(surname)" />
+            <column label="${i18n:_('NIF')}" sort="auto(nif)" />
+            <column label="${i18n:_('Daily hours')}" sort="auto(dailyHours)" />
+            <column label="${i18n:_('Operations')}" />
         </columns>
         <rows>
             <row self="@{each='worker'}" value="@{worker}">
@@ -15,7 +15,7 @@
                 <label value="@{worker.nif}" />
                 <label value="@{worker.dailyHours}" />
                 <hbox>
-                    <button label="Edit"
+                    <button label="${i18n:_('Edit')}"
                         onClick="controller.goToEditForm(self.getParent().getParent().value);">
                     </button>
                 </hbox>
@@ -23,6 +23,6 @@
         </rows>
     </grid>
     <button id="show_create_form" onClick="controller.goToCreateForm();"
-        label="Create">
+        label="${i18n:_('Create')}">
     </button>
-</window>
\ No newline at end of file
+</window>
diff --git a/navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul b/navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul
index ae29dd48b..2d24f1d2a 100644
--- a/navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul
+++ b/navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul
@@ -2,12 +2,12 @@
 <vbox id="localizationsContainer">
  <hbox>
 
-  <label class="titulo" value="Localizacións asignadas" />
+  <label class="titulo" value="${i18n:_('Assigned locations')}" />
   <listbox id="activeSatisfactions" mold="paging" model="@{controller.localizations.activeSatisfactions}"
    pageSize="5" multiple="true" checkmark="true">
    <listhead>
-    <listheader label="Grupo" sort="auto(criterion.name)"></listheader>
-    <listheader label="Data Inicio" sort="auto(startDate)" />
+    <listheader label="${i18n:_('Grup')}" sort="auto(criterion.name)"></listheader>
+    <listheader label="${i18n:_('Starting date')}" sort="auto(startDate)" />
    </listhead>
    <listitem self="@{each='satisfaction'}" value="@{satisfaction}">
     <listcell label="@{satisfaction.criterion.name}"></listcell>
@@ -16,15 +16,15 @@
   </listbox>
 
   <vbox>
-   <button id="unassignButton" label="&gt;&gt;"></button>
-   <button id="assignButton" label="&lt;&lt;"></button>
+   <button id="unassignButton" label="${i18n:_('&gt;&gt;')}"></button>
+   <button id="assignButton" label="${i18n:_('&lt;&lt;')}"></button>
   </vbox>
 
-  <label class="titulo" value="Localizacións non asignadas" />
+  <label class="titulo" value="${i18n:_('Non-assigned locations')}" />
   <listbox id="criterionsNotAssigned" mold="paging" model="@{controller.localizations.criterionsNotAssigned}"
    pageSize="5" multiple="true" checkmark="true">
    <listhead>
-    <listheader label="Grupo" sort="auto(name)"></listheader>
+    <listheader label="${i18n:_('Group')}" sort="auto(name)"></listheader>
    </listhead>
    <listitem self="@{each='criterion'}" value="@{criterion}">
     <listcell label="@{criterion.name}"></listcell>
@@ -33,13 +33,13 @@
 
  </hbox>
 
- <label class="titulo" value="Histórico" />
+ <label class="titulo" value="${i18n:_('Log')}" />
  <grid id="listing" model="@{controller.localizations.localizationsHistory}"
   mold="paging" pageSize="5">
   <columns>
-   <column label="Grupo" sort="auto(criterion.name)" />
-   <column label="Data Inicio" sort="auto(startDate)" />
-   <column label="Data fin" sort="auto(endDate)" />
+   <column label="${i18n:_('Group')}" sort="auto(criterion.name)" />
+   <column label="${i18n:_('Starting date')}" sort="auto(startDate)" />
+   <column label="${i18n:_('Ending date')}" sort="auto(endDate)" />
   </columns>
   <rows>
    <row self="@{each='satisfaction'}">
@@ -49,4 +49,4 @@
    </row>
   </rows>
  </grid>
-</vbox>
\ No newline at end of file
+</vbox>
diff --git a/navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul b/navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul
index 15649bca2..3189331f3 100644
--- a/navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul
+++ b/navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul
@@ -4,10 +4,10 @@
         model="@{controller.workRelationship.criterionSatisfactions}"
         mold="paging" pageSize="5">
         <columns>
-            <column label="Date start" width="150px"/>
-            <column label="Date end" width="150px"/>
-            <column label="Relationship"/>
-            <column label="Operations"/>
+            <column label="${i18n:_('Starting date')}" width="150px"/>
+            <column label="${i18n:_('Ending date')}" width="150px"/>
+            <column label="${i18n:_('Relationship')}"/>
+            <column label="${i18n:_('Operations')}"/>
         </columns>
         <rows>
             <row self="@{each='criterionSatisfaction'}"
@@ -18,18 +18,18 @@
                     value="@{criterionSatisfaction.endDate}" width="150px" />
                 <label value="@{criterionSatisfaction.criterion.name}" />
                 <hbox>
-                    <button label="Editar"
+                    <button label="${i18n:_('Edit')}"
                         onClick="controller.goToEditWorkRelationshipForm(
                         self.getParent().getParent().value);">
                     </button>
-                    <button label="Borrar"
+                    <button label="${i18n:_('Delete')}"
                         onClick="controller.workRelationship.deleteCriterionSatisfaction(self.getParent().getParent().value);">
                     </button>
                 </hbox>
             </row>
         </rows>
       </grid>
-    <button label="New entry"
+    <button label="${i18n:_('New entry')}"
         onClick="controller.goToAddWorkRelationshipForm()">
     </button>
-</window>
\ No newline at end of file
+</window>
diff --git a/navalplanner-webapp/src/main/webapp/resources/worker/worker.zul b/navalplanner-webapp/src/main/webapp/resources/worker/worker.zul
index 54ffe0627..0e04ba1f0 100644
--- a/navalplanner-webapp/src/main/webapp/resources/worker/worker.zul
+++ b/navalplanner-webapp/src/main/webapp/resources/worker/worker.zul
@@ -1,4 +1,4 @@
-<?page title="Navalpro: Resources"?>
+<?page title="${i18n:_('Resources')}"?>
 <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
 <?page  id="Create"?>
 <?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template_v02.zul"?>
@@ -18,20 +18,20 @@
         <vbox id="messagesContainer">
         </vbox>
         <list top_id="listWindow" />
-        <edition top_id="createWindow" title="Create"
-            save_button_label="Save" cancel_button_label="Cancel" />
-        <edition top_id="editWindow" title="Edit Personal Data"
-            save_button_label="Save" cancel_button_label="Cancel" />
-        <workRelationships top_id="workRelationshipsWindow" title="Work Relationships"
-            save_button_label="Save" cancel_button_label="Cancel" />
-        <!--addWorkRelationship top_id="addWorkRelationshipWindow" title="Add Work Relationship"
-            save_button_label="Save" cancel_button_label="Cancel" /-->
-        <editWorkRelationship top_id="editWorkRelationshipWindow" title="Edit Work Relationship"
-            save_button_label="Save" cancel_button_label="Cancel"
-            add_button_label="Edit"/>
-        <editWorkRelationship top_id="addWorkRelationshipWindow" title="Add Work Relationship"
-            save_button_label="Save" cancel_button_label="Cancel"
-            add_button_label="Add"/>
+        <edition top_id="createWindow" title="${i18n:_('Create')}"
+            save_button_label="${i18n:_('Save')}" cancel_button_label="${i18n:_('Cancel')}" />
+        <edition top_id="editWindow" title="${i18n:_('Edit personal data')}"
+            save_button_label="${i18n:_('Save')}" cancel_button_label="${i18n:_('Cancel')}" />
+        <workRelationships top_id="workRelationshipsWindow" title="${i18n:_('Work relationships')}"
+            save_button_label="${i18n:_('Save')}" cancel_button_label="${i18n:_('Cancel')}" />
+        <!--addWorkRelationship top_id="addWorkRelationshipWindow" title="${i18n:_('Add work relationship')}"
+            save_button_label="${i18n:_('Save')}" cancel_button_label="${i18n:_('Cancel')}" /-->
+        <editWorkRelationship top_id="editWorkRelationshipWindow" title="${i18n:_('Edit work relationship')}"
+            save_button_label="${i18n:_('Save')}" cancel_button_label="${i18n:_('Cancel')}"
+            add_button_label="${i18n:_('Edit')}"/>
+        <editWorkRelationship top_id="addWorkRelationshipWindow" title="${i18n:_('Add work relationship')}"
+            save_button_label="${i18n:_('Save')}" cancel_button_label="${i18n:_('Cancel')}"
+            add_button_label="${i18n:_('Add')}"/>
 
     </window>
 </zk>
diff --git a/navalplanner-webapp/src/main/webapp/workreports/_editWorkReport.zul b/navalplanner-webapp/src/main/webapp/workreports/_editWorkReport.zul
index 3b0980eee..c88eb6aa4 100644
--- a/navalplanner-webapp/src/main/webapp/workreports/_editWorkReport.zul
+++ b/navalplanner-webapp/src/main/webapp/workreports/_editWorkReport.zul
@@ -8,17 +8,17 @@
             <grid fixedLayout="false">
                 <rows>
                     <row>
-                        <label value="Responsable:"
+                        <label value="${i18n:_('Responsible:')}"
                             style="font-weight:bold;" />
                         <textbox id="responsible"
                             value="@{controller.workReport.responsible}" />
                     </row>
                     <row>
-                        <label value="Lugar:" style="font-weight:bold;" />
+                        <label value="${i18n:_('Place:')}" style="font-weight:bold;" />
                         <textbox value="@{controller.workReport.place}" />
                     </row>
                     <row>
-                        <label value="Data:" style="font-weight:bold;" />
+                        <label value="${i18n:_('Date:')}" style="font-weight:bold;" />
                         <datebox id="date" value="@{controller.workReport.date}" />
                     </row>
                 </rows>
diff --git a/navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul b/navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul
index 245fe3536..f2832db88 100644
--- a/navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul
+++ b/navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul
@@ -3,12 +3,12 @@
     <vbox>
 
         <hbox>
-            <label value="Name" />
+            <label value="${i18n:_('Name')}" />
             <textbox
                 value="@{controller.workReportType.name}" />
         </hbox>
 
-        <label value="Criterion types" />
+        <label value="${i18n:_('Criterion types')}" />
 
         <twowayselector
             id="criterionTypesSelector"
diff --git a/navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul b/navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul
index 07fb8c61d..04b0d9a06 100644
--- a/navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul
+++ b/navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul
@@ -1,12 +1,12 @@
-<window id="${arg.top_id}" title="Listado de partes de traballo">
+<window id="${arg.top_id}" title="${i18n:_('Work report listing')}">
     <grid id="listing" model="@{controller.workReports}" mold="paging"
         pageSize="5">
         <columns sizable="true">
-            <column label="Data" sort="auto(date)" />
-            <column label="Responsable" sort="auto(responsible)" />
-            <column label="Lugar" sort="auto(place)" />
-            <column label="Tipo" sort="auto(workReportType.name)"/>
-            <column label="Accións" />
+            <column label="${i18n:_('Date')}" sort="auto(date)" />
+            <column label="${i18n:_('Responsible')}" sort="auto(responsible)" />
+            <column label="${i18n:_('Place')}" sort="auto(place)" />
+            <column label="${i18n:_('Type')}" sort="auto(workReportType.name)"/>
+            <column label="${i18n:_('Actions')}" />
         </columns>
         <rows>
             <row self="@{each='workReport'}" value="@{workReport}">
@@ -15,8 +15,8 @@
                 <label value="@{workReport.place}" />
                 <label value="@{workReport.workReportType.name}" />
                 <hbox>
-                    <button label="Editar" onClick="controller.goToEditForm(self.parent.parent.value);" />
-                    <button label="Eliminar"  onClick="controller.showConfirmDelete(self.parent.parent.value)" />
+                    <button label="${i18n:_('Edit')}" onClick="controller.goToEditForm(self.parent.parent.value);" />
+                    <button label="${i18n:_('Delete')}"  onClick="controller.showConfirmDelete(self.parent.parent.value)" />
                 </hbox>
             </row>
         </rows>
diff --git a/navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul b/navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul
index f4d7fb857..3dcd06f9e 100644
--- a/navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul
+++ b/navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul
@@ -1,22 +1,22 @@
-<window id="${arg.top_id}" title="List">
+<window id="${arg.top_id}" title="${i18n:_('List')}">
     <grid id="listing" model="@{controller.workReportTypes}" mold="paging"
         pageSize="5">
         <columns>
-            <column label="Name" sort="auto(name)" />
-            <column label="Operations" />
+            <column label="${i18n:_('Name')}" sort="auto(name)" />
+            <column label="${i18n:_('Operations')}" />
         </columns>
         <rows>
             <row self="@{each='workReportType'}" value="@{workReportType}">
                 <label value="@{workReportType.name}" />
                 <hbox>
-                    <button label="Edit"
+                    <button label="${i18n:_('Edit')}"
                         onClick="controller.goToEditForm(self.parent.parent.value);">
                     </button>
-                    <button label="Remove"
+                    <button label="${i18n:_('Delete')}"
                         onClick="controller.confirmRemove(self.parent.parent.value);">
                     </button>
 
-                    <button label="Alta parte"
+                    <button label="${i18n:_('New work report')}"
                         onClick="controller.goToEditNewWorkReportForm(self.parent.parent.value);">
                     </button>
 
@@ -25,6 +25,6 @@
         </rows>
     </grid>
     <button id="show_create_form" onClick="controller.goToCreateForm();"
-        label="Create">
+        label="${i18n:_('Create')}">
     </button>
 </window>
diff --git a/navalplanner-webapp/src/main/webapp/workreports/workReport.zul b/navalplanner-webapp/src/main/webapp/workreports/workReport.zul
index 047f0ec41..d576d042f 100644
--- a/navalplanner-webapp/src/main/webapp/workreports/workReport.zul
+++ b/navalplanner-webapp/src/main/webapp/workreports/workReport.zul
@@ -13,7 +13,7 @@
         <vbox id="messagesContainer"></vbox>
 
         <list top_id="listWindow" />
-        <edition top_id="createWindow" title="Create"
-            save_button_label="Save" cancel_button_label="Cancel" />
+        <edition top_id="createWindow" title="${i18n:_('Create')}"
+            save_button_label="${i18n:_('Save')}" cancel_button_label="${i18n:_('Cancel')}" />
     </window>
 </zk>
diff --git a/navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul b/navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul
index 82588c552..2178b433d 100644
--- a/navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul
+++ b/navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul
@@ -12,21 +12,21 @@
         apply="org.navalplanner.web.workreports.WorkReportTypeCRUDController">
         <vbox id="messagesContainer"></vbox>
         <list top_id="listWindow" />
-        <edition top_id="createWindow" title="Create"
-            save_button_label="Save" cancel_button_label="Cancel" />
-        <edition top_id="editWindow" title="Edit"
-            save_button_label="Save" cancel_button_label="Cancel" />
+        <edition top_id="createWindow" title="${i18n:_('Create')}"
+            save_button_label="${i18n:_('Save')}" cancel_button_label="${i18n:_('Cancel')}" />
+        <edition top_id="editWindow" title="${i18n:_('Edit')}"
+            save_button_label="${i18n:_('Save')}" cancel_button_label="${i18n:_('Cancel')}" />
         <window visible="@{controller.confirmingRemove}"
-            id="confirmRemove" title="Confirmación" width="500px"
+            id="confirmRemove" title="${i18n:_('Confirm')}" width="500px"
             position="center">
             <vbox>
                 <hbox>
                 ¿Do you want to delete <label value="@{controller.workReportType.name}"/>?
                 </hbox>
                 <hbox>
-                    <button label="Yes"
+                    <button label="${i18n:_('Yes')}"
                         onClick="controller.remove(controller.workReportType);" />
-                    <button label="No"
+                    <button label="${i18n:_('No')}"
                         onClick="controller.cancelRemove();" />
                 </hbox>
             </vbox>