diff --git a/extensions/freebase/module/langs/translation-default.json b/extensions/freebase/module/langs/translation-default.json
index d9bc48d39..f40a6d384 100644
--- a/extensions/freebase/module/langs/translation-default.json
+++ b/extensions/freebase/module/langs/translation-default.json
@@ -96,8 +96,9 @@
 		"mql-constraints": "Enter MQL query constraints as JSON",
 		"warning-valid-json": "Please ensure that the JSON you enter is valid.",
 		"warning-json-obj": "The JSON you enter must be an object, that is, it is of this form { ... }.",
-		"app-property": "Add Property",
-		"suggested-properties": "Suggested Properties"		
+		"add-property": "Add Property",
+		"suggested-properties": "Suggested Properties",
+		"constraint": "Constraint"	
 	},
     "fb-buttons": {
         "save": "Save",
diff --git a/extensions/freebase/module/langs/translation-en.json b/extensions/freebase/module/langs/translation-en.json
index 8ca49291e..2c9584b83 100644
--- a/extensions/freebase/module/langs/translation-en.json
+++ b/extensions/freebase/module/langs/translation-en.json
@@ -96,8 +96,9 @@
 		"mql-constraints": "Enter MQL query constraints as JSON",
 		"warning-valid-json": "Please ensure that the JSON you enter is valid.",
 		"warning-json-obj": "The JSON you enter must be an object, that is, it is of this form { ... }.",
-		"app-property": "Add Property",
-		"suggested-properties": "Suggested Properties"		
+		"add-property": "Add Property",
+		"suggested-properties": "Suggested Properties",
+		"constraint": "Constraint"		
 	},
 	"fb-menu": {
 		"freebase": "Freebase",
diff --git a/extensions/freebase/module/langs/translation-it.json b/extensions/freebase/module/langs/translation-it.json
index 68c816add..dfc7aa1b3 100644
--- a/extensions/freebase/module/langs/translation-it.json
+++ b/extensions/freebase/module/langs/translation-it.json
@@ -51,8 +51,8 @@
         "body-text": "Lo scheletro per l'allineamento della schema specifica come i tuoi dati in formato tabellare saranno trasformati in un formato a grafo con lo schema di Freebase.",
         "find-more": "Per saperne di più ...",
         "skeleton": "Scheletro",
-        "mql-preview": "MQL-like Preview",
-        "tripleloader-preview": "TripleLoader Preview"
+        "mql-preview": "Anteprima MQL-like",
+        "tripleloader-preview": "Anteprima TripleLoader"
     },
     "fb-dialogs": {
         "sign-in": "Accedi a Freebase",
@@ -96,8 +96,9 @@
 		"mql-constraints": "Inserisci i vincoli per la query MQL come JSON",
 		"warning-valid-json": "Assicurati che l'oggetto JSON inserito sia valido.",
 		"warning-json-obj": "Il JSON che inserisci deve essere un oggetto, cioè in questa forma: { ... }.",
-		"app-property": "Aggiungi Proprietà",
-		"suggested-properties": "Proprietà suggerite"		
+		"add-property": "Aggiungi Proprietà",
+		"suggested-properties": "Proprietà suggerite",
+		"constraint": "Vincoli"		
 	},
 	"fb-menu": {
 		"freebase": "Freebase",
@@ -114,10 +115,10 @@
         "save-load": "Salva & Carica",
         "close": "Chiudi",
         "reset": "Reset",
-        "cancel": "cancella",
+        "cancel": "Cancella",
         "align-now": "Allinea adesso",
         "settings": "Settings",
-        "preview": "Preview",
+        "preview": "Anteprima",
 		"load-sandbox": "Carica nella Sandbox",
 		"ok": "Ok"
     }
diff --git a/extensions/freebase/module/scripts/dialogs/extend-data-preview-dialog.html b/extensions/freebase/module/scripts/dialogs/extend-data-preview-dialog.html
index 0c1a5bd62..6db8cb87c 100644
--- a/extensions/freebase/module/scripts/dialogs/extend-data-preview-dialog.html
+++ b/extensions/freebase/module/scripts/dialogs/extend-data-preview-dialog.html
@@ -3,7 +3,7 @@
   <div class="dialog-body" bind="dialogBody">
     <div class="grid-layout layout-normal layout-full"><table rows="4">
       <tr>
-        <td width="300" height="1" bind="add_property"></td>
+        <td width="300" height="1" ><span bind="fb_add_property"></span></td>
         <td height="1">Preview</td>
         <td height="1" width="1%"><button class="button" bind="resetButton"></button></td>
       </tr>
diff --git a/extensions/freebase/module/scripts/dialogs/extend-data-preview-dialog.js b/extensions/freebase/module/scripts/dialogs/extend-data-preview-dialog.js
index 894022b36..fafaca07c 100644
--- a/extensions/freebase/module/scripts/dialogs/extend-data-preview-dialog.js
+++ b/extensions/freebase/module/scripts/dialogs/extend-data-preview-dialog.js
@@ -43,11 +43,11 @@ function ExtendDataPreviewDialog(column, columnIndex, rowIndices, onDone) {
   this._elmts = DOM.bind(this._dialog);
   
   this._elmts.dialogHeader.text($.i18n._('fb-extend')["add-column"]);
-  this._elmts.add_property.text($.i18n._('fb-extend')["add-property"]);
+  this._elmts.fb_add_property.html($.i18n._('fb-extend')["add-property"]);
   this._elmts.suggested_properties.text($.i18n._('fb-extend')["suggested-properties"]);
   
   this._elmts.resetButton.text($.i18n._('fb-buttons')["reset"]);
-  this._elmts.okButton.text('&nbsp;&nbsp;'+$.i18n._('fb-buttons')["ok"]+'&nbsp;&nbsp;');
+  this._elmts.okButton.html('&nbsp;&nbsp;'+$.i18n._('fb-buttons')["ok"]+'&nbsp;&nbsp;');
   this._elmts.cancelButton.text($.i18n._('fb-buttons')["cancel"]);
   
   this._elmts.resetButton.click(function() {
@@ -337,7 +337,7 @@ ExtendDataPreviewDialog.prototype._constrainProperty = function(path) {
   var frame = DialogSystem.createDialog();
   frame.width("500px");
 
-  var header = $('<div></div>').addClass("dialog-header").text("Constrain " + path.join(" > ")).appendTo(frame);
+  var header = $('<div></div>').addClass("dialog-header").text(" " + path.join(" > ")).appendTo(frame);
   var body = $('<div></div>').addClass("dialog-body").appendTo(frame);
   var footer = $('<div></div>').addClass("dialog-footer").appendTo(frame);
 
@@ -360,7 +360,7 @@ ExtendDataPreviewDialog.prototype._constrainProperty = function(path) {
   }
 
   footer.html(
-    '<button class="button" bind="okButton">&nbsp;&nbsp;OK&nbsp;&nbsp;</button>' +
+    '<button class="button" bind="okButton">&nbsp;&nbsp;'+$.i18n._('fb-buttons')["ok"]+'&nbsp;&nbsp;</button>' +
     '<button class="button" bind="cancelButton">'+$.i18n._('fb-buttons')["cancel"]+'</button>'
   );
   var footerElmts = DOM.bind(footer);