diff --git a/navalplanner-webapp/src/main/resources/i18n/es.po b/navalplanner-webapp/src/main/resources/i18n/es.po
index 511014f92..679032a8f 100644
--- a/navalplanner-webapp/src/main/resources/i18n/es.po
+++ b/navalplanner-webapp/src/main/resources/i18n/es.po
@@ -4469,7 +4469,7 @@ msgstr "debe ser mayor que la fecha de inicio"
 
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:84
 msgid "Create Company"
-msgstr "Crear copia"
+msgstr "Crear empresa"
 
 #: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:46
 msgid "Cancel and return"
diff --git a/navalplanner-webapp/src/main/resources/i18n/gl.po b/navalplanner-webapp/src/main/resources/i18n/gl.po
index 5fc48596e..5bf06908a 100644
--- a/navalplanner-webapp/src/main/resources/i18n/gl.po
+++ b/navalplanner-webapp/src/main/resources/i18n/gl.po
@@ -2322,7 +2322,7 @@ msgstr "Crear pedido a partir de modelo"
 
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:240
 msgid "Scenarios"
-msgstr "escenario"
+msgstr "Escenarios"
 
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:366
 msgid "Materials saved"
@@ -4456,7 +4456,7 @@ msgstr "debe ser maior que a data de inicio"
 
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:84
 msgid "Create Company"
-msgstr "Crear copia"
+msgstr "Crear Empresa"
 
 #: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:46
 msgid "Cancel and return"
diff --git a/navalplanner-webapp/src/main/webapp/common/concurrent_modification.zul b/navalplanner-webapp/src/main/webapp/common/concurrent_modification.zul
index eb096ed36..11cf41ad9 100644
--- a/navalplanner-webapp/src/main/webapp/common/concurrent_modification.zul
+++ b/navalplanner-webapp/src/main/webapp/common/concurrent_modification.zul
@@ -29,7 +29,7 @@
         </caption-->
         <vbox apply="org.navalplanner.web.common.concurrentdetection.ConcurrentModificationController"
             sclass="errorbox">
-            <label value="${i18n:_('Another user has modified the same data, so the operation can&#39;t be safely completed.')}" />
+            <label value="${i18n:_('Another user has modified the same data, so the operation can\'t be safely completed.')}" />
             <label value="${i18n:_('Please try it again.')}" />
             <hbox style="margin-left:auto; margin-right:auto">
                 <button id="continue" label="${i18n:_('Continue')}" />