diff --git a/mindplot/src/main/javascript/widget/LinkEditor.js b/mindplot/src/main/javascript/widget/LinkEditor.js
index 0f1c9bb7..52bf24b4 100644
--- a/mindplot/src/main/javascript/widget/LinkEditor.js
+++ b/mindplot/src/main/javascript/widget/LinkEditor.js
@@ -24,7 +24,7 @@ mindplot.widget.LinkEditor = new Class({
         this.parent({
             closeButton:true,
             destroyOnClose:true,
-            title:'Link',
+            title:$msg('LINK'),
             onInitialize:function (wrapper) {
                 wrapper.setStyle('opacity', 0);
                 this.fx = new Fx.Morph(wrapper, {
@@ -102,13 +102,13 @@ mindplot.widget.LinkEditor = new Class({
         var buttonContainer = new Element('div').setStyles({paddingTop:5, textAlign:'center'});
 
         // Create accept button ...
-        var okButton = new Element('input', {type:'submit', value:'Accept', 'class':'btn-primary'});
+        var okButton = new Element('input', {type:'submit', value:$msg('ACCEPT'), 'class':'btn-primary'});
         okButton.addClass('button');
         okButton.inject(buttonContainer);
 
         // Create remove button ...
         if ($defined(model.getValue())) {
-            var rmButton = new Element('input', {type:'button', value:'Remove', 'class':'btn-primary'});
+            var rmButton = new Element('input', {type:'button', value:$msg('REMOVE'), 'class':'btn-primary'});
             rmButton.setStyle('margin', '5px');
             rmButton.addClass('button');
             rmButton.inject(buttonContainer);
@@ -121,7 +121,7 @@ mindplot.widget.LinkEditor = new Class({
         }
 
         // Create cancel button ...
-        var cButton = new Element('input', {type:'button', value:'Cancel', 'class':'btn-secondary'});
+        var cButton = new Element('input', {type:'button', value:$msg('CANCEL'), 'class':'btn-secondary'});
         cButton.setStyle('margin', '5px');
         cButton.addClass('button');
         cButton.inject(buttonContainer);
diff --git a/mindplot/src/main/javascript/widget/NoteEditor.js b/mindplot/src/main/javascript/widget/NoteEditor.js
index ec43f49f..8caea4bb 100644
--- a/mindplot/src/main/javascript/widget/NoteEditor.js
+++ b/mindplot/src/main/javascript/widget/NoteEditor.js
@@ -24,7 +24,7 @@ mindplot.widget.NoteEditor = new Class({
         this.parent({
             closeButton:true,
             destroyOnClose:true,
-            title:'Note',
+            title:$msg('NOTE'),
             onInitialize:function (wrapper) {
                 wrapper.setStyle('opacity', 0);
                 this.fx = new Fx.Morph(wrapper, {
@@ -68,7 +68,7 @@ mindplot.widget.NoteEditor = new Class({
 
         // Add textarea ...
         var textArea = new Element('textarea',
-            {placeholder:'Write your note here ...',
+            {placeholder:$msg('WRITE_YOUR_TEXT_HERE'),
                 required:true,
                 autofocus:'autofocus'
             });
@@ -85,7 +85,7 @@ mindplot.widget.NoteEditor = new Class({
         form.addEvent('submit', function (event) {
             event.preventDefault();
             event.stopPropagation();
-            if (textArea.value ) {
+            if (textArea.value) {
                 model.setValue(textArea.value);
             }
             this.close();
@@ -96,13 +96,13 @@ mindplot.widget.NoteEditor = new Class({
         var buttonContainer = new Element('div').setStyles({paddingTop:5, textAlign:'right'});
 
         // Create accept button ...
-        var okButton = new Element('input', {type:'submit', value:'Accept', 'class':'btn-primary'});
+        var okButton = new Element('input', {type:'submit', value:$msg('ACCEPT'), 'class':'btn-primary'});
         okButton.addClass('button');
         okButton.inject(buttonContainer);
 
         // Create remove button ...
         if ($defined(model.getValue())) {
-            var rmButton = new Element('input', {type:'button', value:'Remove', 'class':'btn-primary'});
+            var rmButton = new Element('input', {type:'button', value:$msg('REMOVE'), 'class':'btn-primary'});
             rmButton.setStyle('margin', '5px');
             rmButton.addClass('button');
             rmButton.inject(buttonContainer);
@@ -114,7 +114,7 @@ mindplot.widget.NoteEditor = new Class({
         }
 
         // Create cancel button ...
-        var cButton = new Element('input', {type:'button', value:'Cancel', 'class':'btn-secondary'});
+        var cButton = new Element('input', {type:'button', value:$msg('CANCEL'), 'class':'btn-secondary'});
         cButton.setStyle('margin', '5px');
         cButton.addClass('button');
         cButton.inject(buttonContainer);
diff --git a/mindplot/src/main/resources/messages_en.properties b/mindplot/src/main/resources/messages_en.properties
index c93f211f..15538fe6 100644
--- a/mindplot/src/main/resources/messages_en.properties
+++ b/mindplot/src/main/resources/messages_en.properties
@@ -49,4 +49,9 @@ AT_LEAST_ONE_TOPIC_MUST_BE_SELECTED=At least one topic must be selected.
 CLIPBOARD_IS_EMPTY=Nothing to copy. Clipboard is empty.
 CENTRAL_TOPIC_CAN_NOT_BE_DELETED=Central topic can not be deleted.
 RELATIONSHIP_COULD_NOT_BE_CREATED=Relationship could not be created. A parent relationship topic must be selected first.
-SELECTION_COPIED_TO_CLIPBOARD=Topics copied to the clipboard
\ No newline at end of file
+SELECTION_COPIED_TO_CLIPBOARD=Topics copied to the clipboard
+WRITE_YOUR_TEXT_HERE=Write your note here ...
+REMOVE=Remove
+ACCEPT=Accept
+CANCEL=Cancel
+
diff --git a/mindplot/src/main/resources/messages_es.properties b/mindplot/src/main/resources/messages_es.properties
index 20e277c8..0132ff78 100644
--- a/mindplot/src/main/resources/messages_es.properties
+++ b/mindplot/src/main/resources/messages_es.properties
@@ -50,3 +50,8 @@ CLIPBOARD_IS_EMPTY=Nada que copiar. Clipboard está vacio.
 CENTRAL_TOPIC_CAN_NOT_BE_DELETED=El tópico central no puede ser borrado.
 RELATIONSHIP_COULD_NOT_BE_CREATED=La relación no pudo ser creada. Una relación padre debe ser seleccionada primero.
 SELECTION_COPIED_TO_CLIPBOARD=Tópicos copiados al clipboard
+
+WRITE_YOUR_TEXT_HERE=Escribe tu nota aquí ...
+REMOVE=Borrar
+ACCEPT=Aceptar
+CANCEL=Cancelar
\ No newline at end of file
diff --git a/mindplot/src/main/resources/messages_fr.properties b/mindplot/src/main/resources/messages_fr.properties
index c7984748..806202e4 100644
--- a/mindplot/src/main/resources/messages_fr.properties
+++ b/mindplot/src/main/resources/messages_fr.properties
@@ -53,4 +53,7 @@ AT_LEAST_ONE_TOPIC_MUST_BE_SELECTED=Au moins un objet de la carte doit être sé
 CLIPBOARD_IS_EMPTY=Rien à copier. Presse-papier vide.
 CENTRAL_TOPIC_CAN_NOT_BE_DELETED=Le noeud racine ne peut pas être effacé.
 RELATIONSHIP_COULD_NOT_BE_CREATED=Impossible de créer relation. Un noeud parent doit être sélectionné au préalable.
-SELECTION_COPIED_TO_CLIPBOARD=Noeuds sélectionnés copiés dans le presse-papiers.
\ No newline at end of file
+SELECTION_COPIED_TO_CLIPBOARD=Noeuds sélectionnés copiés dans le presse-papiers.
+ACCEPT=Accepter
+CANCEL=Annuler
+
diff --git a/wise-webapp/src/main/resources/messages_fr.properties b/wise-webapp/src/main/resources/messages_fr.properties
index 68895c8a..da8758d7 100644
--- a/wise-webapp/src/main/resources/messages_fr.properties
+++ b/wise-webapp/src/main/resources/messages_fr.properties
@@ -23,8 +23,7 @@ NEW_PASSWORD=Nouveau mot de passe
 CONFIRM_NEW_PASSWORD=Confirmer nouveau mot de passe
 MY_WISEMAPS=Mes Wisemaps
 RETYPE_PASSWORD=Répéter mot de passe
-REGISTER=M'enregistrer
-REMEMBER_ME=Se souvenir de moi
+REGISTER=M'enregistreREMEMBER_ME=Se souvenir de moi
 SIGN_IN=Se connecter
 SIGN_UP=S'inscrire
 ACCOUNT=Compte