diff --git a/www/plugins/es/i18n/locale-en-GB.json b/www/plugins/es/i18n/locale-en-GB.json
index fbb25b1d45382079e7dada3ec049d1cf9eb56337..8e9f7073cf1e1e86658aa4373f66c4338c9b4e73 100644
--- a/www/plugins/es/i18n/locale-en-GB.json
+++ b/www/plugins/es/i18n/locale-en-GB.json
@@ -14,10 +14,13 @@
       "TITLE": "Notifications",
       "MARK_ALL_AS_READ": "Mark all as read",
       "NO_RESULT": "No notification",
-      "SETTINGS": "Paramètres",
       "SHOW_ALL": "Show all",
       "LOAD_NOTIFICATIONS_FAILED": "Could not load notifications"
     },
+    "GEO": {
+      "DISTANCE": "Maximum distance around the city",
+      "DISTANCE_OPTION": "{{value}} km"
+    },
     "ERROR": {
       "REQUIRED_FOR_LOCATION": "Required field to appear on the map",
       "INVALID_FOR_LOCATION": "Unknown address"
@@ -60,9 +63,9 @@
       "DIVIDER_GROUP": "Groups"
     },
     "CONFIRM": {
-      "SUGGEST_CERTIFICATIONS": "Etes-vous sûr de vouloir <b>envoyer ces suggestions de certification</b> ?",
-      "ASK_CERTIFICATION": "Etes-vous sûr de vouloir <b>envoyer une demande de certification</b> ?",
-      "ASK_CERTIFICATIONS": "Etes-vous sûr de vouloir <b>envoyer une demande de certification</b> à ces personnes ?"
+      "SUGGEST_CERTIFICATIONS": "Are you sure you want <b>to send these certification suggestions</b>?",
+      "ASK_CERTIFICATION": "Are you sure you want to <b>send a certification request</b>?",
+      "ASK_CERTIFICATIONS": "Are you sure you want to <b>send a certification request</b> to these people?"
     }
   },
   "INVITATION": {
@@ -214,7 +217,13 @@
     "LOCATION_DIVIDER": "Address",
     "SOCIAL_NETWORKS_DIVIDER": "Social networks, web sites",
     "TECHNICAL_DIVIDER": "Technical data",
-    "BTN_NEW": "Add",
+    "BTN_SHOW_WOT": "People",
+    "BTN_SHOW_WOT_HELP": "Search for people",
+    "BTN_SHOW_PAGES": "Pages",
+    "BTN_SHOW_PAGES_HELP": "Search for pages",
+    "BTN_NEW": "New page",
+    "MY_PAGES": "My pages",
+    "NO_PAGE": "No page",
     "SEARCH": {
       "TITLE": "Professional Directory",
       "TITLE_SMALL_DEVICE": "Pro Directory",
@@ -273,7 +282,8 @@
       "SAVE_RECORD_FAILED": "Saving failed",
       "RECORD_NOT_EXISTS": "Record not found",
       "FAILED_SAVE_COMMENT": "Saving comment failed",
-      "FAILED_REMOVE_COMMENT": "Deleting comment failed"
+      "FAILED_REMOVE_COMMENT": "Deleting comment failed",
+      "GEO_LOCATION_NOT_FOUND": "City or zip code not found"
     },
     "INFO": {
       "RECORD_REMOVED" : "Page successfully deleted",
@@ -422,6 +432,12 @@
       "UPDATE_COMMENT": "<span ng-class=\"{'gray': !notification.uid, 'positive':notification.uid }\"><i class=\"icon\" ng-class=\"{'ion-person': notification.uid, 'ion-key': !notification.uid}\"></i>&thinsp;{{name||uid||params[1]}}</span> has modified his comment on your referencing: <b>{{params[2]}}</b>",
       "NEW_REPLY_COMMENT": "<span ng-class=\"{'gray': !notification.uid, 'positive':notification.uid }\"><i class=\"icon\" ng-class=\"{'ion-person': notification.uid, 'ion-key': !notification.uid}\"></i>&thinsp;{{name||uid||params[1]}}</span> has replied to your comment on the referencing: <b>{{params[2]}}</b>",
       "UPDATE_REPLY_COMMENT": "<span ng-class=\"{'gray': !notification.uid, 'positive':notification.uid }\"><i class=\"icon\" ng-class=\"{'ion-person': notification.uid, 'ion-key': !notification.uid}\"></i>&thinsp;{{name||uid||params[1]}}</span> has modified his answer to your comment, on the referencing: <b>{{params[2]}}</b>"
+    },
+    "CONFIRM": {
+      "ES_USE_FALLBACK_NODE": "Data node <b>{{old}}</b> unreachable or invalid address.<br/><br/>Do you want to temporarily use the data node <b>{{new}}</b>?"
+    },
+    "ERROR": {
+      "ES_CONNECTION_ERROR": "Data node <b>{{server}}</b> unreachable or invalid address.<br/><br/>Cesium will continue to work, <b>without the Cesium+</b> extension (user profiles, private messages, maps and graphics).<br/><br/>Check your Internet connection, or change data node in <a class=\"positive\" ng-click=\"doQuickFix('settings')\">extension settings</a>."
     }
   }
 }
diff --git a/www/plugins/es/i18n/locale-en.json b/www/plugins/es/i18n/locale-en.json
index fbb25b1d45382079e7dada3ec049d1cf9eb56337..8e9f7073cf1e1e86658aa4373f66c4338c9b4e73 100644
--- a/www/plugins/es/i18n/locale-en.json
+++ b/www/plugins/es/i18n/locale-en.json
@@ -14,10 +14,13 @@
       "TITLE": "Notifications",
       "MARK_ALL_AS_READ": "Mark all as read",
       "NO_RESULT": "No notification",
-      "SETTINGS": "Paramètres",
       "SHOW_ALL": "Show all",
       "LOAD_NOTIFICATIONS_FAILED": "Could not load notifications"
     },
+    "GEO": {
+      "DISTANCE": "Maximum distance around the city",
+      "DISTANCE_OPTION": "{{value}} km"
+    },
     "ERROR": {
       "REQUIRED_FOR_LOCATION": "Required field to appear on the map",
       "INVALID_FOR_LOCATION": "Unknown address"
@@ -60,9 +63,9 @@
       "DIVIDER_GROUP": "Groups"
     },
     "CONFIRM": {
-      "SUGGEST_CERTIFICATIONS": "Etes-vous sûr de vouloir <b>envoyer ces suggestions de certification</b> ?",
-      "ASK_CERTIFICATION": "Etes-vous sûr de vouloir <b>envoyer une demande de certification</b> ?",
-      "ASK_CERTIFICATIONS": "Etes-vous sûr de vouloir <b>envoyer une demande de certification</b> à ces personnes ?"
+      "SUGGEST_CERTIFICATIONS": "Are you sure you want <b>to send these certification suggestions</b>?",
+      "ASK_CERTIFICATION": "Are you sure you want to <b>send a certification request</b>?",
+      "ASK_CERTIFICATIONS": "Are you sure you want to <b>send a certification request</b> to these people?"
     }
   },
   "INVITATION": {
@@ -214,7 +217,13 @@
     "LOCATION_DIVIDER": "Address",
     "SOCIAL_NETWORKS_DIVIDER": "Social networks, web sites",
     "TECHNICAL_DIVIDER": "Technical data",
-    "BTN_NEW": "Add",
+    "BTN_SHOW_WOT": "People",
+    "BTN_SHOW_WOT_HELP": "Search for people",
+    "BTN_SHOW_PAGES": "Pages",
+    "BTN_SHOW_PAGES_HELP": "Search for pages",
+    "BTN_NEW": "New page",
+    "MY_PAGES": "My pages",
+    "NO_PAGE": "No page",
     "SEARCH": {
       "TITLE": "Professional Directory",
       "TITLE_SMALL_DEVICE": "Pro Directory",
@@ -273,7 +282,8 @@
       "SAVE_RECORD_FAILED": "Saving failed",
       "RECORD_NOT_EXISTS": "Record not found",
       "FAILED_SAVE_COMMENT": "Saving comment failed",
-      "FAILED_REMOVE_COMMENT": "Deleting comment failed"
+      "FAILED_REMOVE_COMMENT": "Deleting comment failed",
+      "GEO_LOCATION_NOT_FOUND": "City or zip code not found"
     },
     "INFO": {
       "RECORD_REMOVED" : "Page successfully deleted",
@@ -422,6 +432,12 @@
       "UPDATE_COMMENT": "<span ng-class=\"{'gray': !notification.uid, 'positive':notification.uid }\"><i class=\"icon\" ng-class=\"{'ion-person': notification.uid, 'ion-key': !notification.uid}\"></i>&thinsp;{{name||uid||params[1]}}</span> has modified his comment on your referencing: <b>{{params[2]}}</b>",
       "NEW_REPLY_COMMENT": "<span ng-class=\"{'gray': !notification.uid, 'positive':notification.uid }\"><i class=\"icon\" ng-class=\"{'ion-person': notification.uid, 'ion-key': !notification.uid}\"></i>&thinsp;{{name||uid||params[1]}}</span> has replied to your comment on the referencing: <b>{{params[2]}}</b>",
       "UPDATE_REPLY_COMMENT": "<span ng-class=\"{'gray': !notification.uid, 'positive':notification.uid }\"><i class=\"icon\" ng-class=\"{'ion-person': notification.uid, 'ion-key': !notification.uid}\"></i>&thinsp;{{name||uid||params[1]}}</span> has modified his answer to your comment, on the referencing: <b>{{params[2]}}</b>"
+    },
+    "CONFIRM": {
+      "ES_USE_FALLBACK_NODE": "Data node <b>{{old}}</b> unreachable or invalid address.<br/><br/>Do you want to temporarily use the data node <b>{{new}}</b>?"
+    },
+    "ERROR": {
+      "ES_CONNECTION_ERROR": "Data node <b>{{server}}</b> unreachable or invalid address.<br/><br/>Cesium will continue to work, <b>without the Cesium+</b> extension (user profiles, private messages, maps and graphics).<br/><br/>Check your Internet connection, or change data node in <a class=\"positive\" ng-click=\"doQuickFix('settings')\">extension settings</a>."
     }
   }
 }
diff --git a/www/plugins/es/i18n/locale-es-ES.json b/www/plugins/es/i18n/locale-es-ES.json
index 9b2a4ea4bc979f2b4c68db3ca84afea302ac97d2..7d076ba1499afac13ec4f01c191f75ad4f8a9056 100644
--- a/www/plugins/es/i18n/locale-es-ES.json
+++ b/www/plugins/es/i18n/locale-es-ES.json
@@ -14,7 +14,6 @@
       "TITLE": "Notificaciónes",
       "MARK_ALL_AS_READ": "Marcar todo como leído",
       "NO_RESULT": "Ningúna notificación",
-      "SETTINGS": "configuraciónes",
       "SHOW_ALL": "Ver todo",
       "LOAD_NOTIFICATIONS_FAILED": "Fracaso en la carga de las notificaciónes"
     },
diff --git a/www/plugins/es/i18n/locale-fr-FR.json b/www/plugins/es/i18n/locale-fr-FR.json
index a66559945bf36360ed3a14754eb3435fa607621e..478731dcfa8e66ac63473d249f4a9f4fae3059d0 100644
--- a/www/plugins/es/i18n/locale-fr-FR.json
+++ b/www/plugins/es/i18n/locale-fr-FR.json
@@ -14,7 +14,6 @@
       "TITLE": "Notifications",
       "MARK_ALL_AS_READ": "Tout marquer comme lu",
       "NO_RESULT": "Aucune notification",
-      "SETTINGS": "Paramètres",
       "SHOW_ALL": "Voir tout",
       "LOAD_NOTIFICATIONS_FAILED": "Erreur de chargement des notifications"
     },
diff --git a/www/plugins/es/i18n/locale-nl-NL.json b/www/plugins/es/i18n/locale-nl-NL.json
index 9a1cdeb7295aa44f9052f521b60ca48f0b3ee73a..b4119cd5a90e716d50ff215769b06f76f89de10d 100644
--- a/www/plugins/es/i18n/locale-nl-NL.json
+++ b/www/plugins/es/i18n/locale-nl-NL.json
@@ -13,7 +13,6 @@
       "TITLE": "Notificaties",
       "MARK_ALL_AS_READ": "Markeer alles als gelezen",
       "NO_RESULT": "Geen berichten",
-      "SETTINGS": "Instellingen",
       "SHOW_ALL": "Toon alles",
       "LOAD_NOTIFICATIONS_FAILED": "Kan berichten niet laden"
     }
diff --git a/www/plugins/es/templates/notification/popover_notification.html b/www/plugins/es/templates/notification/popover_notification.html
index ade09be5e6dc8d0abaec0352b4db10b423d75fd5..ceb393c6dfd3aa47267d73cb1eb6725060f91ac8 100644
--- a/www/plugins/es/templates/notification/popover_notification.html
+++ b/www/plugins/es/templates/notification/popover_notification.html
@@ -27,7 +27,7 @@
       <a class="positive"
          ui-sref="app.es_settings"
          ng-click="closePopover()"
-         translate>COMMON.NOTIFICATIONS.SETTINGS</a>
+         translate>MENU.SETTINGS</a>
     </div>
 
     <!-- show all -->