diff --git a/main/webapp/modules/core/scripts/dialogs/clustering-dialog.js b/main/webapp/modules/core/scripts/dialogs/clustering-dialog.js
index 2c26a85ac..0a2795c51 100644
--- a/main/webapp/modules/core/scripts/dialogs/clustering-dialog.js
+++ b/main/webapp/modules/core/scripts/dialogs/clustering-dialog.js
@@ -239,7 +239,7 @@ ClusteringDialog.prototype._renderTable = function(clusters) {
this._elmts.resultSummary.html(
(clusters.length === this._clusters.length) ?
- ("" + this._clusters.length + " cluster" + ((this._clusters.length != 1) ? "s" : "") + " found") :
+ ("" + this._clusters.length + " cluster" + ((this._clusters.length != 1) ? "s" : "") + " "+$.i18n._('core-dialogs')["found"]) :
("" + clusters.length + " cluster" + ((clusters.length != 1) ? "s" : "") + " "+$.i18n._('core-dialogs')["filtered-from"]+ this._clusters.length +$.i18n._('core-dialogs')["from-total"] )
);
diff --git a/main/webapp/modules/core/scripts/dialogs/custom-tabular-exporter-dialog.html b/main/webapp/modules/core/scripts/dialogs/custom-tabular-exporter-dialog.html
index 74c6f3d47..b476d8e67 100644
--- a/main/webapp/modules/core/scripts/dialogs/custom-tabular-exporter-dialog.html
+++ b/main/webapp/modules/core/scripts/dialogs/custom-tabular-exporter-dialog.html
@@ -143,7 +143,7 @@
- |
+ |
|
diff --git a/main/webapp/modules/core/scripts/dialogs/custom-tabular-exporter-dialog.js b/main/webapp/modules/core/scripts/dialogs/custom-tabular-exporter-dialog.js
index d1bc451c9..8bef753dc 100644
--- a/main/webapp/modules/core/scripts/dialogs/custom-tabular-exporter-dialog.js
+++ b/main/webapp/modules/core/scripts/dialogs/custom-tabular-exporter-dialog.js
@@ -121,7 +121,7 @@ CustomTabularExporterDialog.prototype._createDialog = function(options) {
this._elmts.or_dialog_charEnc.html($.i18n._('core-dialogs')["char-enc"]);
this._elmts.downloadPreviewButton.html($.i18n._('core-buttons')["preview"]);
this._elmts.downloadButton.html($.i18n._('core-buttons')["download"]);
- this._elmts.downloadButton.html($.i18n._('core-dialog')["upload-to"]);
+ this._elmts.or_dialog_uploadTo.html($.i18n._('core-dialogs')["upload-to"]);
this._elmts.uploadButton.html($.i18n._('core-buttons')["upload"]);
this._elmts.or_dialog_jsonText.html($.i18n._('core-dialogs')["json-text"]);
this._elmts.applyOptionCodeButton.html($.i18n._('core-buttons')["apply"]);
diff --git a/main/webapp/modules/core/scripts/index.js b/main/webapp/modules/core/scripts/index.js
index 6a5b2975d..aff6cd59c 100644
--- a/main/webapp/modules/core/scripts/index.js
+++ b/main/webapp/modules/core/scripts/index.js
@@ -45,8 +45,7 @@ $.ajax({
type : "POST",
async : false,
data : {
- //lng : lang
- lng: 'en'
+ lng : lang
},
success : function(data) {
dictionary = data;
diff --git a/main/webapp/modules/core/scripts/index/default-importing-controller/parsing-panel.js b/main/webapp/modules/core/scripts/index/default-importing-controller/parsing-panel.js
index 9cbc7c970..b3a4bfb5e 100644
--- a/main/webapp/modules/core/scripts/index/default-importing-controller/parsing-panel.js
+++ b/main/webapp/modules/core/scripts/index/default-importing-controller/parsing-panel.js
@@ -95,7 +95,7 @@ Refine.DefaultImportingController.prototype._prepareParsingPanel = function() {
this._parsingPanelElmts.startOverButton.html($.i18n._('core-buttons')["startover"]);
this._parsingPanelElmts.nextButton.html($.i18n._('core-buttons')["create-project"]);
$('#or-import-parsopt').text($.i18n._('core-index-import')["parsing-options"]);
- $('#or-import-projname').text($.i18n._('core-index-import')["project-name"]);
+ $('#or-import-projname').html($.i18n._('core-index-import')["project-name"]);
$('#or-import-updating').text($.i18n._('core-index-import')["updating-preview"]);
$('#or-import-parseas').text($.i18n._('core-index-import')["parse-as"]);
diff --git a/main/webapp/modules/core/scripts/index/parser-interfaces/json-parser-ui.js b/main/webapp/modules/core/scripts/index/parser-interfaces/json-parser-ui.js
index 638b709f3..030f48858 100644
--- a/main/webapp/modules/core/scripts/index/parser-interfaces/json-parser-ui.js
+++ b/main/webapp/modules/core/scripts/index/parser-interfaces/json-parser-ui.js
@@ -107,7 +107,7 @@ Refine.JsonParserUI.prototype._initialize = function() {
this._optionContainerElmts.pickRecordElementsButton.text($.i18n._('core-index-import')["warning-record-path"]);
this._optionContainerElmts.previewButton.text($.i18n._('core-buttons')["update-preview"]);
$('#or-import-load').text($.i18n._('core-index-parser')["load-at-most"]);
- $('#or-import-rows2').text($.i18n._('core-index-parser')["rows-data"]);
+ $('#or-import-rows').text($.i18n._('core-index-parser')["rows-data"]);
$('#or-import-preserve').text($.i18n._('core-index-parser')["preserve-empty"]);
$('#or-import-trim').html($.i18n._('core-index-parser')["trim"]);
$('#or-import-parseCell').html($.i18n._('core-index-parser')["parse-cell"]);
diff --git a/main/webapp/modules/core/scripts/project.js b/main/webapp/modules/core/scripts/project.js
index 1fa66cb40..2f28fa0f5 100644
--- a/main/webapp/modules/core/scripts/project.js
+++ b/main/webapp/modules/core/scripts/project.js
@@ -42,8 +42,7 @@ $.ajax({
type : "POST",
async : false,
data : {
- // lng : lang
- lng : 'en'
+ lng : lang
},
success : function(data) {
dictionary = data;
diff --git a/main/webapp/modules/core/scripts/reconciliation/freebase-query-panel.html b/main/webapp/modules/core/scripts/reconciliation/freebase-query-panel.html
index 0803edbe2..99b9213bb 100644
--- a/main/webapp/modules/core/scripts/reconciliation/freebase-query-panel.html
+++ b/main/webapp/modules/core/scripts/reconciliation/freebase-query-panel.html
@@ -14,7 +14,7 @@
|
- |
+ |
diff --git a/main/webapp/modules/core/scripts/views/data-table/menu-facets.js b/main/webapp/modules/core/scripts/views/data-table/menu-facets.js
index 1f6b33488..f70585402 100644
--- a/main/webapp/modules/core/scripts/views/data-table/menu-facets.js
+++ b/main/webapp/modules/core/scripts/views/data-table/menu-facets.js
@@ -35,7 +35,7 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
var doFilterByExpressionPrompt = function(expression, type) {
DataTableView.promptExpressionOnVisibleRows(
column,
- (type == "list" ? $.i18n._('core-views')["custom-facet"] : $.i18n._('core-views')["custom-numeric"]) + column.name,
+ (type == "list" ? $.i18n._('core-views')["custom-facet"] : $.i18n._('core-views')["custom-numeric-label"]) +" "+ column.name,
expression,
function(expression) {
var config = {
@@ -107,7 +107,7 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
{},
{
id: "core/custom-text-facet",
- label: $.i18n._('core-views')["custom-facet"]+'...',
+ label: $.i18n._('core-views')["custom-text-facet"]+'...',
click: function() {
doFilterByExpressionPrompt(null, "list");
}
diff --git a/main/webapp/modules/langs/translation-en.json b/main/webapp/modules/langs/translation-en.json
index f6e1919e1..6a9b0c808 100644
--- a/main/webapp/modules/langs/translation-en.json
+++ b/main/webapp/modules/langs/translation-en.json
@@ -131,6 +131,7 @@
"rows-in-cluster": "# Rows in Cluster",
"choice-avg-length": "Average Length of Choices",
"choice-var-length": "Length Variance of Choices",
+ "found": "found",
"filtered-from": "filtered from
",
"from-total": " total",
"cluster-descr": "This feature helps you find groups of different cell values that might be alternative representations of the same thing. For example, the two strings \"New York\" and \"new york\" are very likely to refer to the same concept and just have capitalization differences, and \"Gödel\" and \"Godel\" probably refer to the same person.",
@@ -372,7 +373,6 @@
"search-match": "Search for match",
"not-valid-number": "Not a valid number.",
"not-valid-date": "Not a valid date.",
- "search-match": "Search for Match",
"match-this": "Match this cell only",
"match-other": "Match other cells with same content",
"search-for": "Search for",
@@ -405,7 +405,6 @@
"booleans": "booleans",
"drag-drop": "Drag and drop to re-order",
"forward": "forward",
- "reverse": "reverse",
"sort-by-col": "sort by this column alone",
"smallest-first": "smallest first",
"largest-first": "largest first",
@@ -464,13 +463,13 @@
"copy-recon": "Copy reconciliation data...",
"copy-recon2": "Copy this column's reconciliation data to other columns",
"custom-facet": "Custom Facet on column",
- "custom-numeric": "Custom Numeric Facet on column",
+ "custom-numeric-label": "Custom Numeric Facet on column",
+ "custom-numeric": "Custom Numeric Facet",
"text-facet": "Text facet",
"numeric-facet": "Numeric facet",
"timeline-facet": "Timeline facet",
"scatterplot-facet": "Scatterplot facet",
- "custom-facet": "Custom text facet",
- "custom-numeric": "Custom numeric facet",
+ "custom-text-facet": "Custom text facet",
"custom-facets": "Customized facets",
"word-facet": "Word facet",
"duplicates-facet": "Duplicates facet",