HPCC-10863 Simplify Language Maintenance

Combine all separate language files into single ones.

Signed-off-by: Gordon Smith <gordon.smith@lexisnexis.com>

esp/files/scripts/ActivityWidget.js

@@ -17,8 +17,7 @@ define([
     "dojo/_base/declare",
     "dojo/_base/lang",
     "dojo/i18n",
-    "dojo/i18n!./nls/common",
-    "dojo/i18n!./nls/ActivityWidget",
+    "dojo/i18n!./nls/hpcc",
     "dojo/_base/array",
     "dojo/on",
 
@@ -40,14 +39,14 @@ define([
     "hpcc/DFUWUDetailsWidget",
     "hpcc/ESPUtil"
 
-], function (declare, lang, i18n, nlsCommon, nlsSpecific, arrayUtil, on,
+], function (declare, lang, i18n, nlsHPCC, arrayUtil, on,
                 registry, Button, ToolbarSeparator,
                 OnDemandGrid, Keyboard, Selection, selector, tree, ColumnResizer, DijitRegistry,
                 GridDetailsWidget, ESPActivity, WUDetailsWidget, DFUWUDetailsWidget, ESPUtil) {
     return declare("ActivityWidget", [GridDetailsWidget], {
 
-        i18n: lang.mixin(nlsCommon, nlsSpecific),
-        gridTitle: nlsSpecific.title,
+        i18n: nlsHPCC,
+        gridTitle: nlsHPCC.title_Activity,
         idProperty: "Wuid",
 
         _onPause: function (event, params) {

esp/files/scripts/DFUQueryWidget.js

@@ -17,8 +17,7 @@ define([
     "dojo/_base/declare",
     "dojo/_base/lang",
     "dojo/i18n",
-    "dojo/i18n!./nls/common",
-    "dojo/i18n!./nls/DFUQueryWidget",
+    "dojo/i18n!./nls/hpcc",
     "dojo/_base/array",
     "dojo/dom",
     "dojo/dom-attr",
@@ -75,7 +74,7 @@ define([
 
     "hpcc/TableContainer"
 
-], function (declare, lang, i18n, nlsCommon, nlsSpecific, arrayUtil, dom, domAttr, domConstruct, domClass, domForm, date, on,
+], function (declare, lang, i18n, nlsHPCC, arrayUtil, dom, domAttr, domConstruct, domClass, domForm, date, on,
                 registry, Dialog, Menu, MenuItem, MenuSeparator, PopupMenuItem, Textarea, ValidationTextBox,
                 Grid, Keyboard, Selection, editor, selector, ColumnResizer, DijitRegistry, Pagination,
                 _TabContainerWidget, WsDfu, FileSpray, ESPUtil, ESPLogicalFile, ESPDFUWorkunit, LFDetailsWidget, SFDetailsWidget, DFUWUDetailsWidget, TargetSelectWidget, FilterDropDownWidget, SelectionGridWidget,
@@ -83,7 +82,7 @@ define([
     return declare("DFUQueryWidget", [_TabContainerWidget, ESPUtil.FormHelper], {
         templateString: template,
         baseClass: "DFUQueryWidget",
-        i18n: lang.mixin(nlsCommon, nlsSpecific),
+        i18n: nlsHPCC,
 
         postCreate: function (args) {
             this.inherited(arguments);
@@ -111,7 +110,7 @@ define([
         },
 
         getTitle: function () {
-            return this.i18n.title;
+            return this.i18n.title_DFUQuery;
         },
 
         //  Hitched actions  ---

esp/files/scripts/DFUWUDetailsWidget.js

@@ -18,8 +18,7 @@ define([
     "dojo/_base/declare",
     "dojo/_base/lang",
     "dojo/i18n",
-    "dojo/i18n!./nls/common",
-    "dojo/i18n!./nls/DFUWUDetailsWidget",
+    "dojo/i18n!./nls/hpcc",
     "dojo/_base/array",
     "dojo/dom",
     "dojo/dom-attr",
@@ -44,14 +43,14 @@ define([
 
     "dojo/text!../templates/DFUWUDetailsWidget.html"
 
-], function (exports, declare, lang, i18n, nlsCommon, nlsSpecific, arrayUtil, dom, domAttr, domClass, domStyle, query,
+], function (exports, declare, lang, i18n, nlsHPCC, arrayUtil, dom, domAttr, domClass, domStyle, query,
                 BorderContainer, TabContainer, ContentPane, Toolbar, Textarea, TitlePane, registry, ProgressBar,
                 _TabContainerWidget, FileSpray, ESPDFUWorkunit, ECLSourceWidget, LFDetailsWidget,
                 template) {
     exports.fixCircularDependency = declare("DFUWUDetailsWidget", [_TabContainerWidget], {
         templateString: template,
         baseClass: "DFUWUDetailsWidget",
-        i18n: lang.mixin(nlsCommon, nlsSpecific),
+        i18n: nlsHPCC,
 
         summaryWidget: null,
         xmlWidget: null,
@@ -79,7 +78,7 @@ define([
         },
 
         getTitle: function () {
-            return this.i18n.title;
+            return this.i18n.title_DFUWUDetails;
         },
 
         //  Hitched actions  ---

esp/files/scripts/ECLPlaygroundWidget.js

@@ -17,8 +17,7 @@ define([
     "dojo/_base/declare",
     "dojo/_base/lang",
     "dojo/i18n",
-    "dojo/i18n!./nls/common",
-    "dojo/i18n!./nls/ECLPlaygroundWidget",
+    "dojo/i18n!./nls/hpcc",
     "dojo/_base/xhr",
     "dojo/dom",
     "dojo/query",
@@ -37,14 +36,14 @@ define([
     "hpcc/ESPQuery",
 
     "dojo/text!../templates/ECLPlaygroundWidget.html"
-], function (declare, lang, i18n, nlsCommon, nlsSpecific, xhr, dom, query,
+], function (declare, lang, i18n, nlsHPCC, xhr, dom, query,
                 BorderContainer, TabContainer, ContentPane, registry,
                 _Widget, EclSourceWidget, TargetSelectWidget, GraphWidget, ResultsWidget, ESPWorkunit, ESPQuery,
                 template) {
     return declare("ECLPlaygroundWidget", [_Widget], {
         templateString: template,
         baseClass: "ECLPlaygroundWidget",
-        i18n: lang.mixin(nlsCommon, nlsSpecific),
+        i18n: nlsHPCC,
 
         wu: null,
         editorControl: null,
@@ -77,7 +76,7 @@ define([
 
         //  Implementation  ---
         getTitle: function () {
-            return this.i18n.title;
+            return this.i18n.title_ECLPlayground;
         },
 
         _initControls: function () {

esp/files/scripts/ECLSourceWidget.js

@@ -17,8 +17,7 @@ define([
     "dojo/_base/declare",
     "dojo/_base/lang",
     "dojo/i18n",
-    "dojo/i18n!./nls/common",
-    "dojo/i18n!./nls/ECLSourceWidget",
+    "dojo/i18n!./nls/hpcc",
     "dojo/dom",
 
     "dijit/layout/BorderContainer",
@@ -32,14 +31,14 @@ define([
 
     "dijit/Toolbar", "dijit/ToolbarSeparator", "dijit/form/Button"
 ],
-    function (declare, lang, i18n, nlsCommon, nlsSpecific, dom,
+    function (declare, lang, i18n, nlsHPCC, dom,
             BorderContainer, ContentPane, registry,
             _Widget, ESPWorkunit,
             template) {
         return declare("ECLSourceWidget", [_Widget], {
             templateString: template,
             baseClass: "ECLSourceWidget",
-            i18n: lang.mixin(nlsCommon, nlsSpecific),
+            i18n: nlsHPCC,
 
             borderContainer: null,
             eclSourceContentPane: null,

esp/files/scripts/ESPDFUWorkunit.js

@@ -17,8 +17,7 @@ define([
     "dojo/_base/declare",
     "dojo/_base/lang",
     "dojo/i18n",
-    "dojo/i18n!./nls/common",
-    "dojo/i18n!./nls/GetDFUWorkunitsWidget",
+    "dojo/i18n!./nls/hpcc",
     "dojo/_base/array",
     "dojo/_base/Deferred",
     "dojo/store/Observable",
@@ -27,10 +26,10 @@ define([
     "hpcc/ESPUtil",
     "hpcc/ESPRequest",
     "hpcc/ESPResult"
-], function (declare, lang, i18n, nlsCommon, nlsSpecific, arrayUtil, Deferred, Observable,
+], function (declare, lang, i18n, nlsHPCC, arrayUtil, Deferred, Observable,
     FileSpray, ESPUtil, ESPRequest, ESPResult) {
 
-    var i18n = lang.mixin(nlsCommon, nlsSpecific);
+    var i18n = nlsHPCC;
 
     var Store = declare([ESPRequest.Store], {
         service: "FileSpray",

esp/files/scripts/EventScheduleWorkunitWidget.js

@@ -17,8 +17,7 @@ define([
     "dojo/_base/declare",
     "dojo/_base/lang",
     "dojo/i18n",
-    "dojo/i18n!./nls/common",
-    "dojo/i18n!./nls/EventScheduleWorkunitWidget",
+    "dojo/i18n!./nls/hpcc",
     "dojo/dom",
     "dojo/dom-form",
     "dojo/_base/array",
@@ -57,13 +56,13 @@ define([
     "dijit/TooltipDialog",
 
     "dojox/layout/TableContainer"
-], function (declare, lang, i18n, nlsCommon, nlsSpecific, dom, domForm, arrayUtil, on,
+], function (declare, lang, i18n, nlsHPCC, dom, domForm, arrayUtil, on,
                 registry, Menu, MenuItem,
                 Grid, Keyboard, Selection, selector, ColumnResizer, DijitRegistry, Pagination,
                 _TabContainerWidget, TargetSelectWidget, WUDetailsWidget, WsWorkunits, ESPUtil, FilterDropDownWidget,
                 template) {
     return declare("EventScheduleWorkunitWidget", [_TabContainerWidget], {
-        i18n: lang.mixin(nlsCommon, nlsSpecific),
+        i18n: nlsHPCC,
         templateString: template,
         baseClass: "EventScheduleWorkunitWidget",
 

esp/files/scripts/FilterDropDownWidget.js

@@ -17,8 +17,7 @@ define([
     "dojo/_base/declare",
     "dojo/_base/lang",
     "dojo/i18n",
-    "dojo/i18n!./nls/common",
-    "dojo/i18n!./nls/FilterDropDownWidget",
+    "dojo/i18n!./nls/hpcc",
     "dojo/_base/array",
     "dojo/dom",
     "dojo/dom-form",
@@ -38,14 +37,14 @@ define([
 
     "hpcc/TableContainer"
 
-], function (declare, lang, i18n, nlsCommon, nlsSpecific, arrayUtil, dom, domForm, on,
+], function (declare, lang, i18n, nlsHPCC, arrayUtil, dom, domForm, on,
                 registry, Select,
                 _Widget,
                 template) {
     return declare("FilterDropDownWidget", [_Widget], {
         templateString: template,
         baseClass: "FilterDropDownWidget",
-        i18n: lang.mixin(nlsCommon, nlsSpecific),
+        i18n: nlsHPCC,
 
         _width:"460px",
         iconFilter: null,

esp/files/scripts/FullResultWidget.js

@@ -17,8 +17,7 @@ define([
     "dojo/_base/declare",
     "dojo/_base/lang",
     "dojo/i18n",
-    "dojo/i18n!./nls/common",
-    "dojo/i18n!./nls/FullResultWidget",
+    "dojo/i18n!./nls/hpcc",
     "dojo/_base/array",
     "dojo/dom",
     "dojo/request/iframe",
@@ -47,7 +46,7 @@ define([
     "dijit/Toolbar",
     "dijit/form/Button",
     "dijit/ToolbarSeparator"
-], function (declare, lang, i18n, nlsCommon, nlsSpecific, arrayUtil, dom, iframe, Memory, Observable,
+], function (declare, lang, i18n, nlsHPCC, arrayUtil, dom, iframe, Memory, Observable,
                 registry,
                 OnDemandGrid, Keyboard, Selection, selector, ColumnResizer, DijitRegistry,
                 _Widget, ESPBase, ESPWorkunit, ESPLogicalFile, ESPUtil,
@@ -55,7 +54,7 @@ define([
     return declare("FullResultWidget", [_Widget], {
         templateString: template,
         baseClass: "FullResultWidget",
-        i18n: lang.mixin(nlsCommon, nlsSpecific),
+        i18n: nlsHPCC,
 
         borderContainer: null,
         grid: null,

esp/files/scripts/GetDFUWorkunitsWidget.js

@@ -17,8 +17,7 @@ define([
     "dojo/_base/declare",
     "dojo/_base/lang",
     "dojo/i18n",
-    "dojo/i18n!./nls/common",
-    "dojo/i18n!./nls/GetDFUWorkunitsWidget",
+    "dojo/i18n!./nls/hpcc",
     "dojo/_base/array",
     "dojo/dom",
     "dojo/dom-class",
@@ -61,7 +60,7 @@ define([
     "dijit/form/Select",
     "dijit/Toolbar",
     "dijit/TooltipDialog"
-], function (declare, lang, i18n, nlsCommon, nlsSpecific, arrayUtil,dom, domClass, domForm, date, on,
+], function (declare, lang, i18n, nlsHPCC, arrayUtil,dom, domClass, domForm, date, on,
                 registry, Dialog, Menu, MenuItem, MenuSeparator, PopupMenuItem,
                 Grid, Keyboard, Selection, selector, ColumnResizer, DijitRegistry, Pagination,
                 _TabContainerWidget, ESPUtil, ESPDFUWorkunit, FileSpray, DFUWUDetailsWidget, TargetSelectWidget, FilterDropDownWidget,
@@ -69,7 +68,7 @@ define([
     return declare("GetDFUWorkunitsWidget", [_TabContainerWidget], {
         templateString: template,
         baseClass: "GetDFUWorkunitsWidget",
-        i18n: lang.mixin(nlsCommon, nlsSpecific),
+        i18n: nlsHPCC,
 
         workunitsTab: null,
         workunitsGrid: null,
@@ -90,7 +89,7 @@ define([
         },
 
         getTitle: function () {
-            return this.i18n.title;
+            return this.i18n.title_GetDFUWorkunits;
         },
 
         //  Hitched actions  ---

esp/files/scripts/GraphPageWidget.js

@@ -17,8 +17,7 @@ define([
     "dojo/_base/declare",
     "dojo/_base/lang",
     "dojo/i18n",
-    "dojo/i18n!./nls/common",
-    "dojo/i18n!./nls/GraphPageWidget",
+    "dojo/i18n!./nls/hpcc",
     "dojo/_base/array",
     "dojo/_base/Deferred",
     "dojo/dom",
@@ -62,7 +61,7 @@ define([
     "dijit/form/SimpleTextarea",
     "dijit/form/NumberSpinner",
     "dijit/form/DropDownButton"
-], function (declare, lang, i18n, nlsCommon, nlsSpecific, arrayUtil, Deferred, dom, domConstruct, on, html, Memory, Observable,
+], function (declare, lang, i18n, nlsHPCC, arrayUtil, Deferred, dom, domConstruct, on, html, Memory, Observable,
             BorderContainer, TabContainer, ContentPane, registry, Dialog,
             entities,
             OnDemandGrid, Keyboard, Selection, selector, ColumnResizer, DijitRegistry,
@@ -71,7 +70,7 @@ define([
     return declare("GraphPageWidget", [_Widget], {
         templateString: template,
         baseClass: "GraphPageWidget",
-        i18n: lang.mixin(nlsCommon, nlsSpecific),
+        i18n: nlsHPCC,
 
         borderContainer: null,
         rightBorderContainer: null,

esp/files/scripts/GraphWidget.js

@@ -17,8 +17,7 @@ define([
     "dojo/_base/declare",
     "dojo/_base/lang",
     "dojo/i18n",
-    "dojo/i18n!./nls/common",
-    "dojo/i18n!./nls/GraphWidget",
+    "dojo/i18n!./nls/hpcc",
     "dojo/_base/array",
     "dojo/_base/Deferred",
     "dojo/aspect",
@@ -40,7 +39,7 @@ define([
     "dijit/ToolbarSeparator", 
     "dijit/form/Button"
     
-], function (declare, lang, i18n, nlsCommon, nlsSpecific, arrayUtil, Deferred, aspect, has, dom, domConstruct, domClass, domStyle,
+], function (declare, lang, i18n, nlsHPCC, arrayUtil, Deferred, aspect, has, dom, domConstruct, domClass, domStyle,
             registry, BorderContainer, ContentPane,
             _Widget,
             template) {
@@ -239,7 +238,7 @@ define([
     return declare("GraphWidget", [_Widget], {
             templateString: template,
             baseClass: "GraphWidget",
-            i18n: lang.mixin(nlsCommon, nlsSpecific),
+            i18n: nlsHPCC,
 
             borderContainer: null,
             graphContentPane: null,

esp/files/scripts/GraphsWidget.js

@@ -17,8 +17,7 @@ define([
     "dojo/_base/declare",
     "dojo/_base/lang",
     "dojo/i18n",
-    "dojo/i18n!./nls/common",
-    "dojo/i18n!./nls/GraphsWidget",
+    "dojo/i18n!./nls/hpcc",
     "dojo/_base/array",
     "dojo/on",
 
@@ -37,14 +36,14 @@ define([
     "hpcc/TimingTreeMapWidget",
     "hpcc/ESPUtil"
 
-], function (declare, lang, i18n, nlsCommon, nlsSpecific, arrayUtil, on,
+], function (declare, lang, i18n, nlsHPCC, arrayUtil, on,
                 Button,
                 OnDemandGrid, Keyboard, Selection, selector, ColumnResizer, DijitRegistry,
                 GridDetailsWidget, ESPWorkunit, GraphPageWidget, TimingTreeMapWidget, ESPUtil) {
     return declare("GraphsWidget", [GridDetailsWidget], {
-        i18n: lang.mixin(nlsCommon, nlsSpecific),
+        i18n: nlsHPCC,
 
-        gridTitle: nlsSpecific.title,
+        gridTitle: nlsHPCC.title_Graphs,
         idProperty: "Name",
 
         wu: null,

esp/files/scripts/GridDetailsWidget.js

@@ -17,8 +17,7 @@ define([
     "dojo/_base/declare",
     "dojo/_base/lang",
     "dojo/i18n",
-    "dojo/i18n!./nls/common",
-    "dojo/i18n!./nls/GridDetailsWidget",
+    "dojo/i18n!./nls/hpcc",
     "dojo/store/Memory",
     "dojo/store/Observable",
 
@@ -39,14 +38,14 @@ define([
     "dijit/ToolbarSeparator",
     "dijit/layout/ContentPane"
 
-], function (declare, lang, i18n, nlsCommon, nlsSpecific, Memory, Observable,
+], function (declare, lang, i18n, nlsHPCC, Memory, Observable,
                 registry, Menu, MenuItem, MenuSeparator, PopupMenuItem,
                 _TabContainerWidget,
                 template) {
     return declare("GridDetailsWidget", [_TabContainerWidget], {
         templateString: template,
         baseClass: "GridDetailsWidget",
-        i18n: lang.mixin(nlsCommon, nlsSpecific),
+        i18n: nlsHPCC,
 
         gridTitle: "Change Me",
         idProperty: "Change Me",

esp/files/scripts/GroupDetailsWidget.js

@@ -17,8 +17,7 @@ define([
     "dojo/_base/declare",
     "dojo/_base/lang",
     "dojo/i18n",
-    "dojo/i18n!./nls/common",
-    "dojo/i18n!./nls/UserQueryWidget",
+    "dojo/i18n!./nls/hpcc",
     "dojo/dom",
     "dojo/dom-attr",
 
@@ -46,7 +45,7 @@ define([
     "dijit/TitlePane",
     "dijit/Dialog"
 
-], function (declare, lang, i18n, nlsCommon, nlsSpecific, dom, domAttr,
+], function (declare, lang, i18n, nlsHPCC, dom, domAttr,
                 registry,
                 OnDemandGrid, Keyboard, Selection, selector, ColumnResizer, DijitRegistry,
                 _TabContainerWidget, WsAccess, MembersWidget, PermissionsWidget,
@@ -54,7 +53,7 @@ define([
     return declare("GroupDetailsWidget", [_TabContainerWidget], {
         templateString: template,
         baseClass: "GroupDetailsWidget",
-        i18n: lang.mixin(nlsCommon, nlsSpecific),
+        i18n: nlsHPCC,
 
         postCreate: function (args) {
             this.inherited(arguments);

esp/files/scripts/HPCCPlatformECLWidget.js

@@ -17,8 +17,7 @@ define([
     "dojo/_base/declare",
     "dojo/_base/lang",
     "dojo/i18n",
-    "dojo/i18n!./nls/common",
-    "dojo/i18n!./nls/HPCCPlatformECLWidget",
+    "dojo/i18n!./nls/hpcc",
 
     "dijit/registry",
 
@@ -32,14 +31,14 @@ define([
     "dijit/layout/TabContainer",
     "dijit/layout/ContentPane"
 
-], function (declare, lang, i18n, nlsCommon, nlsSpecific,
+], function (declare, lang, i18n, nlsHPCC,
                 registry,
                 _TabContainerWidget, WUQueryWidget, ECLPlaygroundWidget,
                 template) {
     return declare("HPCCPlatformECLWidget", [_TabContainerWidget], {
         templateString: template,
         baseClass: "HPCCPlatformECLWidget",
-        i18n: lang.mixin(nlsCommon, nlsSpecific),
+        i18n: nlsHPCC,
 
         postCreate: function (args) {
             this.inherited(arguments);

esp/files/scripts/HPCCPlatformFilesWidget.js

@@ -17,8 +17,7 @@ define([
     "dojo/_base/declare",
     "dojo/_base/lang",
     "dojo/i18n",
-    "dojo/i18n!./nls/common",
-    "dojo/i18n!./nls/HPCCPlatformFilesWidget",
+    "dojo/i18n!./nls/hpcc",
 
     "dijit/registry",
 
@@ -34,14 +33,14 @@ define([
     "dijit/layout/TabContainer",
     "dijit/layout/ContentPane"
 
-], function (declare, lang, i18n, nlsCommon, nlsSpecific,
+], function (declare, lang, i18n, nlsHPCC,
                 registry,
                 _TabContainerWidget, ESPRequest, GetDFUWorkunitsWidget, DFUQueryWidget, LZBrowseWidget,
                 template) {
     return declare("HPCCPlatformFilesWidget", [_TabContainerWidget], {
         templateString: template,
         baseClass: "HPCCPlatformFilesWidget",
-        i18n: lang.mixin(nlsCommon, nlsSpecific),
+        i18n: nlsHPCC,
 
         postCreate: function (args) {
             this.inherited(arguments);
@@ -52,7 +51,7 @@ define([
         },
 
         getTitle: function () {
-            return this.i18n.title;
+            return this.i18n.title_HPCCPlatformFiles;
         },
 
         //  Hitched actions  ---

esp/files/scripts/HPCCPlatformMainWidget.js

@@ -17,8 +17,7 @@ define([
     "dojo/_base/declare",
     "dojo/_base/lang",
     "dojo/i18n",
-    "dojo/i18n!./nls/common",
-    "dojo/i18n!./nls/HPCCPlatformMainWidget",
+    "dojo/i18n!./nls/hpcc",
 
     "hpcc/_TabContainerWidget",
 
@@ -32,13 +31,13 @@ define([
     "hpcc/SearchResultsWidget",
     "hpcc/EventScheduleWorkunitWidget"
 
-], function (declare, lang, i18n, nlsCommon, nlsSpecific,
+], function (declare, lang, i18n, nlsHPCC,
                 _TabContainerWidget,
                 template) {
     return declare("HPCCPlatformMainWidget", [_TabContainerWidget], {
         templateString: template,
         baseClass: "HPCCPlatformMainWidget",
-        i18n: lang.mixin(nlsCommon, nlsSpecific),
+        i18n: nlsHPCC,
 
         postCreate: function (args) {
             this.inherited(arguments);
@@ -49,7 +48,7 @@ define([
         },
 
         getTitle: function () {
-            return this.i18n.title;
+            return this.i18n.title_HPCCPlatformMain;
         },
 
         //  Hitched actions  ---

esp/files/scripts/HPCCPlatformOpsWidget.js

@@ -17,8 +17,7 @@ define([
     "dojo/_base/declare",
     "dojo/_base/lang",
     "dojo/i18n",
-    "dojo/i18n!./nls/common",
-    "dojo/i18n!./nls/HPCCPlatformOpsWidget",
+    "dojo/i18n!./nls/hpcc",
 
     "dijit/registry",
 
@@ -32,14 +31,14 @@ define([
     "dijit/layout/TabContainer",
     "dijit/layout/ContentPane"
 
-], function (declare, lang, i18n, nlsCommon, nlsSpecific,
+], function (declare, lang, i18n, nlsHPCC,
                 registry,
                 _TabContainerWidget, ESPRequest,
                 template) {
     return declare("HPCCPlatformOpsWidget", [_TabContainerWidget], {
         templateString: template,
         baseClass: "HPCCPlatformOpsWidget",
-        i18n: lang.mixin(nlsCommon, nlsSpecific),
+        i18n: nlsHPCC,
 
         postCreate: function (args) {
             this.inherited(arguments);
@@ -50,7 +49,7 @@ define([
         },
 
         getTitle: function () {
-            return this.i18n.title;
+            return this.i18n.title_HPCCPlatformOps;
         },
 
         //  Hitched actions  ---

esp/files/scripts/HPCCPlatformRoxieWidget.js

@@ -17,8 +17,7 @@ define([
     "dojo/_base/declare",
     "dojo/_base/lang",
     "dojo/i18n",
-    "dojo/i18n!./nls/common",
-    "dojo/i18n!./nls/HPCCPlatformRoxieWidget",
+    "dojo/i18n!./nls/hpcc",
 
     "dijit/registry",
 
@@ -32,14 +31,14 @@ define([
     "dijit/layout/TabContainer",
     "dijit/layout/ContentPane"
 
-], function (declare, lang, i18n, nlsCommon, nlsSpecific,
+], function (declare, lang, i18n, nlsHPCC,
                 registry,
                 _TabContainerWidget, QuerySetQueryWidget, /*PackageMapQueryWidget,*/
                 template) {
     return declare("HPCCPlatformRoxieWidget", [_TabContainerWidget], {
         templateString: template,
         baseClass: "HPCCPlatformRoxieWidget",
-        i18n: lang.mixin(nlsCommon, nlsSpecific),
+        i18n: nlsHPCC,
 
         postCreate: function (args) {
             this.inherited(arguments);
@@ -50,7 +49,7 @@ define([
         },
 
         getTitle: function () {
-            return this.i18n.title;
+            return this.i18n.title_HPCCPlatformRoxie;
         },
 
         //  Hitched actions  ---

esp/files/scripts/HPCCPlatformWidget.js

@@ -17,8 +17,7 @@ define([
     "dojo/_base/declare",
     "dojo/_base/lang",
     "dojo/i18n",
-    "dojo/i18n!./nls/common",
-    "dojo/i18n!./nls/HPCCPlatformWidget",
+    "dojo/i18n!./nls/hpcc",
     "dojo/_base/array",
     "dojo/dom",
     "dojo/dom-style",
@@ -56,7 +55,7 @@ define([
     "hpcc/TableContainer",
     "hpcc/InfoGridWidget"
 
-], function (declare, lang, i18n, nlsCommon, nlsSpecific, arrayUtil, dom, domStyle,
+], function (declare, lang, i18n, nlsHPCC, arrayUtil, dom, domStyle,
                 registry, Tooltip,
                 UpgradeBar,
                 _TabContainerWidget, ESPActivity, WsAccount, WsAccess, WsSMC, GraphWidget,
@@ -64,7 +63,7 @@ define([
     return declare("HPCCPlatformWidget", [_TabContainerWidget], {
         templateString: template,
         baseClass: "HPCCPlatformWidget",
-        i18n: lang.mixin(nlsCommon, nlsSpecific),
+        i18n: nlsHPCC,
 
         banner: "",
         upgradeBar: null,

esp/files/scripts/HexViewWidget.js

@@ -18,8 +18,7 @@ define([
     "dojo/_base/declare",
     "dojo/_base/lang",
     "dojo/i18n",
-    "dojo/i18n!./nls/common",
-    "dojo/i18n!./nls/HexViewWidget",
+    "dojo/i18n!./nls/hpcc",
     "dojo/_base/array",
     "dojo/store/Memory",
     "dojo/store/Observable",
@@ -36,14 +35,14 @@ define([
     "dijit/form/NumberSpinner",
     "dijit/form/CheckBox"
 ],
-    function (declare, lang, i18n, nlsCommon, nlsSpecific, arrayUtil, Memory, Observable, iframe,
+    function (declare, lang, i18n, nlsHPCC, arrayUtil, Memory, Observable, iframe,
             registry,
             _Widget, ESPWorkunit, ECLSourceWidget,
             template) {
         return declare("HexViewWidget", [_Widget], {
             templateString: template,
             baseClass: "HexViewWidget",
-            i18n: lang.mixin(nlsCommon, nlsSpecific),
+            i18n: nlsHPCC,
 
             borderContainer: null,
             widthField: null,

esp/files/scripts/IFrameWidget.js

@@ -17,8 +17,7 @@ define([
     "dojo/_base/declare",
     "dojo/_base/lang",
     "dojo/i18n",
-    "dojo/i18n!./nls/common",
-    "dojo/i18n!./nls/IFrameWidget",
+    "dojo/i18n!./nls/hpcc",
     "dojo/dom-construct",
 
     "dijit/registry",
@@ -32,14 +31,14 @@ define([
     "dijit/ToolbarSeparator",
     "dijit/form/Button",
     "dijit/layout/ContentPane"
-], function (declare, lang, i18n, nlsCommon, nlsSpecific, domConstruct,
+], function (declare, lang, i18n, nlsHPCC, domConstruct,
                 registry,
                 _Widget,
                 template) {
     return declare("IFrameWidget", [_Widget], {
         templateString: template,
         baseClass: "IFrameWidget",
-        i18n: lang.mixin(nlsCommon, nlsSpecific),
+        i18n: nlsHPCC,
 
         postCreate: function (args) {
             this.inherited(arguments);

esp/files/scripts/InfoGridWidget.js

@@ -18,8 +18,7 @@ define([
     "dojo/_base/declare",
     "dojo/_base/lang",
     "dojo/i18n",
-    "dojo/i18n!./nls/common",
-    "dojo/i18n!./nls/InfoGridWidget",
+    "dojo/i18n!./nls/hpcc",
     "dojo/_base/array",
     "dojo/dom",
     "dojo/dom-construct",
@@ -49,7 +48,7 @@ define([
     "dijit/layout/ContentPane",
     "dijit/form/CheckBox"
 ],
-    function (declare, lang, i18n, nlsCommon, nlsSpecific, arrayUtil, dom, domConstruct, domClass, Memory, Observable, topic,
+    function (declare, lang, i18n, nlsHPCC, arrayUtil, dom, domConstruct, domClass, Memory, Observable, topic,
             registry, 
             AndOrReadStore, entities,
             OnDemandGrid, Keyboard, Selection, ColumnResizer, DijitRegistry,
@@ -58,7 +57,7 @@ define([
         return declare("InfoGridWidget", [_Widget], {
             templateString: template,
             baseClass: "InfoGridWidget",
-            i18n: lang.mixin(nlsCommon, nlsSpecific),
+            i18n: nlsHPCC,
 
             borderContainer: null,
             infoGrid: null,

esp/files/scripts/LFDetailsWidget.js

@@ -18,8 +18,7 @@ define([
     "dojo/_base/declare",
     "dojo/_base/lang",
     "dojo/i18n",
-    "dojo/i18n!./nls/common",
-    "dojo/i18n!./nls/LFDetailsWidget",
+    "dojo/i18n!./nls/hpcc",
     "dojo/_base/array",
     "dojo/dom",
     "dojo/dom-attr",
@@ -53,14 +52,14 @@ define([
     "dojo/text!../templates/LFDetailsWidget.html",
 
     "dijit/TooltipDialog"
-], function (exports, declare, lang, i18n, nlsCommon, nlsSpecific, arrayUtil, dom, domAttr, domClass, domForm, query,
+], function (exports, declare, lang, i18n, nlsHPCC, arrayUtil, dom, domAttr, domClass, domForm, query,
                 BorderContainer, TabContainer, ContentPane, Toolbar, TooltipDialog, Form, SimpleTextarea, TextBox, Button, DropDownButton, TitlePane, registry,
                 _TabContainerWidget, ResultWidget, EclSourceWidget, FilePartsWidget, WUDetailsWidget, DFUWUDetailsWidget, TargetSelectWidget, ESPLogicalFile, ESPDFUWorkunit,
                 template) {
     exports.fixCircularDependency = declare("LFDetailsWidget", [_TabContainerWidget], {
         templateString: template,
         baseClass: "LFDetailsWidget",
-        i18n: lang.mixin(nlsCommon, nlsSpecific),
+        i18n: nlsHPCC,
 
         borderContainer: null,
 
@@ -112,7 +111,7 @@ define([
         },
 
         getTitle: function () {
-            return this.i18n.title;
+            return this.i18n.title_LFDetails;
         },
 
         _handleResponse: function (wuidQualifier, response) {

esp/files/scripts/LZBrowseWidget.js

@@ -17,8 +17,7 @@ define([
     "dojo/_base/declare",
     "dojo/_base/lang",
     "dojo/i18n",
-    "dojo/i18n!./nls/common",
-    "dojo/i18n!./nls/LZBrowseWidget",
+    "dojo/i18n!./nls/hpcc",
     "dojo/_base/array",
     "dojo/dom",
     "dojo/dom-attr",
@@ -77,7 +76,7 @@ define([
     "dojox/form/uploader/FileList",
 
     "hpcc/TableContainer"
-], function (declare, lang, i18n, nlsCommon, nlsSpecific, arrayUtil, dom, domAttr, domClass, domForm, iframe, date, on,
+], function (declare, lang, i18n, nlsHPCC, arrayUtil, dom, domAttr, domClass, domForm, iframe, date, on,
                 registry, Dialog, Menu, MenuItem, MenuSeparator, PopupMenuItem,
                 OnDemandGrid, tree, Keyboard, Selection, editor, selector, ColumnResizer, DijitRegistry, Pagination,
                 _TabContainerWidget, FileSpray, ESPUtil, ESPRequest, ESPDFUWorkunit, HexViewWidget, DFUWUDetailsWidget, TargetSelectWidget, SelectionGridWidget,
@@ -85,7 +84,7 @@ define([
     return declare("LZBrowseWidget", [_TabContainerWidget, ESPUtil.FormHelper], {
         templateString: template,
         baseClass: "LZBrowseWidget",
-        i18n: lang.mixin(nlsCommon, nlsSpecific),
+        i18n: nlsHPCC,
 
         postCreate: function (args) {
             this.inherited(arguments);
@@ -130,7 +129,7 @@ define([
         },
 
         getTitle: function () {
-            return this.i18n.title;
+            return this.i18n.title_LZBrowse;
         },
 
         _handleResponse: function (wuidQualifier, response) {

esp/files/scripts/LogsWidget.js

@@ -18,8 +18,7 @@ define([
     "dojo/_base/declare",
     "dojo/_base/lang",
     "dojo/i18n",
-    "dojo/i18n!./nls/common",
-    "dojo/i18n!./nls/LogsWidget",
+    "dojo/i18n!./nls/hpcc",
     "dojo/_base/array",
     "dojo/store/Memory",
     "dojo/store/Observable",
@@ -48,7 +47,7 @@ define([
     "dijit/form/Button",
     "dijit/layout/ContentPane"
 ],
-    function (declare, lang, i18n, nlsCommon, nlsSpecific, array, Memory, Observable, iframe,
+    function (declare, lang, i18n, nlsHPCC, array, Memory, Observable, iframe,
             registry,
             OnDemandGrid, Keyboard, Selection, selector, ColumnResizer, DijitRegistry,
             _Widget, ESPUtil, ESPRequest, ESPWorkunit,
@@ -56,7 +55,7 @@ define([
         return declare("LogsWidget", [_Widget], {
             templateString: template,
             baseClass: "LogsWidget",
-            i18n: lang.mixin(nlsCommon, nlsSpecific),
+            i18n: nlsHPCC,
 
             borderContainer: null,
             logsGrid: null,

esp/files/scripts/MemberOfWidget.js

@@ -17,8 +17,7 @@ define([
     "dojo/_base/declare",
     "dojo/_base/lang",
     "dojo/i18n",
-    "dojo/i18n!./nls/common",
-    "dojo/i18n!./nls/UserQueryWidget",
+    "dojo/i18n!./nls/hpcc",
 
     "dijit/registry",
 
@@ -33,14 +32,14 @@ define([
     "hpcc/ws_access",
     "hpcc/ESPUtil"
 
-], function (declare, lang, i18n, nlsCommon, nlsSpecific,
+], function (declare, lang, i18n, nlsHPCC,
                 registry,
                 OnDemandGrid, Keyboard, Selection, editor, ColumnResizer, DijitRegistry,
                 GridDetailsWidget, WsAccess, ESPUtil) {
     return declare("MemberOfWidget", [GridDetailsWidget], {
-        i18n: lang.mixin(nlsCommon, nlsSpecific),
+        i18n: nlsHPCC,
 
-        gridTitle: nlsSpecific.MemberOf,
+        gridTitle: nlsHPCC.title_MemberOf,
         idProperty: "__hpcc_id",
 
         //  Hitched Actions  ---

esp/files/scripts/MembersWidget.js

@@ -17,8 +17,7 @@ define([
     "dojo/_base/declare",
     "dojo/_base/lang",
     "dojo/i18n",
-    "dojo/i18n!./nls/common",
-    "dojo/i18n!./nls/UserQueryWidget",
+    "dojo/i18n!./nls/hpcc",
 
     "dijit/registry",
 
@@ -33,14 +32,14 @@ define([
     "hpcc/ws_access",
     "hpcc/ESPUtil"
 
-], function (declare, lang, i18n, nlsCommon, nlsSpecific,
+], function (declare, lang, i18n, nlsHPCC,
                 registry,
                 OnDemandGrid, Keyboard, Selection, editor, ColumnResizer, DijitRegistry,
                 GridDetailsWidget, WsAccess, ESPUtil) {
     return declare("MembersWidget", [GridDetailsWidget], {
-        i18n: lang.mixin(nlsCommon, nlsSpecific),
+        i18n: nlsHPCC,
 
-        gridTitle: nlsSpecific.Members,
+        gridTitle: nlsHPCC.title_Members,
         idProperty: "__hpcc_id",
 
         //  Hitched Actions  ---

esp/files/scripts/PackageMapDetailsWidget.js

@@ -17,8 +17,7 @@ define([
     "dojo/_base/declare",
     "dojo/_base/lang",
     "dojo/i18n",
-    "dojo/i18n!./nls/common",
-    "dojo/i18n!./nls/PackageMapDetailsWidget",
+    "dojo/i18n!./nls/hpcc",
     "dojo/dom",
     "dojo/dom-attr",
     "dojo/dom-class",
@@ -41,13 +40,13 @@ define([
     "dijit/Toolbar",
     "dijit/TooltipDialog",
     "dijit/TitlePane"
-], function (declare, lang, i18n, nlsCommon, nlsSpecific, dom, domAttr, domClass, topic,
+], function (declare, lang, i18n, nlsHPCC, dom, domAttr, domClass, topic,
     _LayoutWidget, _TemplatedMixin, _WidgetsInTemplateMixin, registry,
     WsPackageMaps, PackageSourceWidget, template) {
     return declare("PackageMapDetailsWidget", [_LayoutWidget, _TemplatedMixin, _WidgetsInTemplateMixin], {
         templateString: template,
         baseClass: "PackageMapDetailsWidget",
-        i18n: lang.mixin(nlsCommon, nlsSpecific),
+        i18n: nlsHPCC,
         borderContainer: null,
         tabContainer: null,
         validateWidget: null,

esp/files/scripts/PackageMapQueryWidget.js

@@ -17,8 +17,7 @@ define([
     "dojo/_base/declare",
     "dojo/_base/lang",
     "dojo/i18n",
-    "dojo/i18n!./nls/common",
-    "dojo/i18n!./nls/PackageMapQueryWidget",
+    "dojo/i18n!./nls/hpcc",
     "dojo/_base/array",
     "dojo/dom",
     "dojo/dom-construct",
@@ -54,7 +53,7 @@ define([
     "dijit/form/Select",
     "dijit/Toolbar",
     "dijit/TooltipDialog"
-], function (declare, lang, i18n, nlsCommon, nlsSpecific, arrayUtil, dom, domConstruct, domForm, ObjectStore, on, topic,
+], function (declare, lang, i18n, nlsHPCC, arrayUtil, dom, domConstruct, domForm, ObjectStore, on, topic,
     _LayoutWidget, _TemplatedMixin, _WidgetsInTemplateMixin, registry,
     Uploader, FileUploader, EnhancedGrid, Pagination, IndirectSelection, ItemFileWriteStore,
     PackageMapDetailsWidget, PackageMapValidateWidget,
@@ -63,7 +62,7 @@ define([
     return declare("PackageMapQueryWidget", [_LayoutWidget, _TemplatedMixin, _WidgetsInTemplateMixin], {
         templateString: template,
         baseClass: "PackageMapQueryWidget",
-        i18n: lang.mixin(nlsCommon, nlsSpecific),
+        i18n: nlsHPCC,
         packagesTab: null,
         packagesGrid: null,
         tabMap: [],

esp/files/scripts/PackageMapValidateWidget.js

@@ -17,8 +17,7 @@ define([
     "dojo/_base/declare",
     "dojo/_base/lang",
     "dojo/i18n",
-    "dojo/i18n!./nls/common",
-    "dojo/i18n!./nls/PackageMapValidateWidget",
+    "dojo/i18n!./nls/hpcc",
     "dojo/dom",
     "dojo/dom-attr",
     "dojo/dom-class",
@@ -38,13 +37,13 @@ define([
     "dijit/form/RadioButton",
     "dijit/form/Select",
     "dijit/form/SimpleTextarea"
-], function (declare, lang, i18n, nlsCommon, nlsSpecific, dom, domAttr, domClass, topic,
+], function (declare, lang, i18n, nlsHPCC, dom, domAttr, domClass, topic,
     _LayoutWidget, _TemplatedMixin, _WidgetsInTemplateMixin, registry,
     WsPackageMaps, template) {
     return declare("PackageMapValidateWidget", [_LayoutWidget, _TemplatedMixin, _WidgetsInTemplateMixin], {
         templateString: template,
         baseClass: "PackageMapValidateWidget",
-        i18n: lang.mixin(nlsCommon, nlsSpecific),
+        i18n: nlsHPCC,
         validateForm: null,
         targetSelect: null,
         packageContent: null,

esp/files/scripts/PackageSourceWidget.js

@@ -17,8 +17,7 @@ define([
     "dojo/_base/declare",
     "dojo/_base/lang",
     "dojo/i18n",
-    "dojo/i18n!./nls/common",
-    "dojo/i18n!./nls/PackageSourceWidget",
+    "dojo/i18n!./nls/hpcc",
     "dojo/dom",
 
     "dijit/layout/_LayoutWidget",
@@ -32,14 +31,14 @@ define([
 
     "dojo/text!../templates/PackageSourceWidget.html"
 ],
-    function (declare, lang, i18n, nlsCommon, nlsSpecific, dom,
+    function (declare, lang, i18n, nlsHPCC, dom,
             _LayoutWidget, _TemplatedMixin, _WidgetsInTemplateMixin,
             BorderContainer, ContentPane, registry,
             WsPackageMaps, template) {
         return declare("PackageSourceWidget", [_LayoutWidget, _TemplatedMixin, _WidgetsInTemplateMixin], {
             templateString: template,
             baseClass: "PackageSourceWidget",
-            i18n: lang.mixin(nlsCommon, nlsSpecific),
+            i18n: nlsHPCC,
             borderContainer: null,
 
             editor: null,

esp/files/scripts/PermissionsWidget.js

@@ -17,8 +17,7 @@ define([
     "dojo/_base/declare",
     "dojo/_base/lang",
     "dojo/i18n",
-    "dojo/i18n!./nls/common",
-    "dojo/i18n!./nls/UserQueryWidget",
+    "dojo/i18n!./nls/hpcc",
 
     "dijit/registry",
 
@@ -34,14 +33,14 @@ define([
     "hpcc/ws_access",
     "hpcc/ESPUtil"
 
-], function (declare, lang, i18n, nlsCommon, nlsSpecific,
+], function (declare, lang, i18n, nlsHPCC,
                 registry,
                 OnDemandGrid, Keyboard, Selection, tree, editor, ColumnResizer, DijitRegistry,
                 GridDetailsWidget, WsAccess, ESPUtil) {
     return declare("PermissionsWidget", [GridDetailsWidget], {
-        i18n: lang.mixin(nlsCommon, nlsSpecific),
+        i18n: nlsHPCC,
 
-        gridTitle: nlsSpecific.UserPermissions,
+        gridTitle: nlsHPCC.title_UserPermissions,
         idProperty: "__hpcc_id",
 
         //  Hitched Actions  ---

esp/files/scripts/QuerySetDetailsWidget.js

@@ -17,8 +17,7 @@ define([
     "dojo/_base/declare",
     "dojo/_base/lang",
     "dojo/i18n",
-    "dojo/i18n!./nls/common",
-    "dojo/i18n!./nls/QuerySetDetailsWidget",
+    "dojo/i18n!./nls/hpcc",
     "dojo/dom",
     "dojo/dom-attr",
     "dojo/dom-class",
@@ -60,7 +59,7 @@ define([
 
     "hpcc/WUDetailsWidget"
 
-], function (declare, lang, i18n, nlsCommon, nlsSpecific, dom, domAttr, domClass, query, Memory, Observable, all,
+], function (declare, lang, i18n, nlsHPCC, dom, domAttr, domClass, query, Memory, Observable, all,
                 registry,
                 OnDemandGrid, Keyboard, Selection, selector, ColumnResizer, DijitRegistry,
                 ESPWorkunit, ESPQuery, WsWorkunits, WsTopology, _TabContainerWidget, QuerySetLogicalFilesWidget, QuerySetErrorsWidget, QueryTestWidget,
@@ -68,7 +67,7 @@ define([
     return declare("QuerySetDetailsWidget", [_TabContainerWidget], {
         templateString: template,
         baseClass: "QuerySetDetailsWidget",
-        i18n: lang.mixin(nlsCommon, nlsSpecific),
+        i18n: nlsHPCC,
 
         query: null,
 

esp/files/scripts/QuerySetErrorsWidget.js

@@ -17,8 +17,7 @@ define([
     "dojo/_base/declare",
     "dojo/_base/lang",
     "dojo/i18n",
-    "dojo/i18n!./nls/common",
-    "dojo/i18n!./nls/QuerySetErrorsWidget",
+    "dojo/i18n!./nls/hpcc",
     "dojo/_base/array",
     "dojo/on",
 
@@ -32,13 +31,13 @@ define([
     "hpcc/GridDetailsWidget",
     "hpcc/WsWorkunits",
     "hpcc/ESPUtil"
-], function (declare, lang, i18n, nlsCommon, nlsSpecific, arrayUtil, on,
+], function (declare, lang, i18n, nlsHPCC, arrayUtil, on,
                 OnDemandGrid, Keyboard, Selection, selector, ColumnResizer, DijitRegistry,
                 GridDetailsWidget, WsWorkunits, ESPUtil) {
     return declare("QuerySetErrorsWidget", [GridDetailsWidget], {
-        i18n: lang.mixin(nlsCommon, nlsSpecific),
+        i18n: nlsHPCC,
 
-        gridTitle: nlsSpecific.title,
+        gridTitle: nlsHPCC.title_QuerySetErrors,
         idProperty: "Name",
 
         queryId: null,

esp/files/scripts/QuerySetLogicalFilesWidget.js

@@ -17,8 +17,7 @@ define([
     "dojo/_base/declare",
     "dojo/_base/lang",
     "dojo/i18n",
-    "dojo/i18n!./nls/common",
-    "dojo/i18n!./nls/QuerySetLogicalFilesWidget",
+    "dojo/i18n!./nls/hpcc",
     "dojo/_base/array",
     "dojo/on",
 
@@ -33,13 +32,13 @@ define([
     "hpcc/LFDetailsWidget",
     "hpcc/WsWorkunits",
     "hpcc/ESPUtil"
-], function (declare, lang, i18n, nlsCommon, nlsSpecific, arrayUtil, on,
+], function (declare, lang, i18n, nlsHPCC, arrayUtil, on,
                 OnDemandGrid, Keyboard, Selection, selector, ColumnResizer, DijitRegistry,
                 GridDetailsWidget, LFDetailsWidget, WsWorkunits, ESPUtil) {
     return declare("QuerySetLogicalFilesWidget", [GridDetailsWidget], {
-        i18n: lang.mixin(nlsCommon, nlsSpecific),
+        i18n: nlsHPCC,
 
-        gridTitle: nlsSpecific.title,
+        gridTitle: nlsHPCC.title_QuerySetLogicalFiles,
         idProperty: "Name",
 
         queryId: null,

esp/files/scripts/QuerySetQueryWidget.js

@@ -17,8 +17,7 @@ define([
     "dojo/_base/declare",
     "dojo/_base/lang",
     "dojo/i18n",
-    "dojo/i18n!./nls/common",
-    "dojo/i18n!./nls/QuerySetQueryWidget",
+    "dojo/i18n!./nls/hpcc",
     "dojo/dom",
     "dojo/dom-form",
     "dojo/request/iframe",
@@ -65,7 +64,7 @@ define([
     "dijit/TooltipDialog",
 
     "hpcc/TableContainer"
-], function (declare, lang, i18n, nlsCommon, nlsSpecific, dom, domForm, iframe, arrayUtil, on,
+], function (declare, lang, i18n, nlsHPCC, dom, domForm, iframe, arrayUtil, on,
                 registry, Menu, MenuItem, MenuSeparator, PopupMenuItem,
                 Grid, Keyboard, Selection, selector, ColumnResizer, DijitRegistry, Pagination,
                 _TabContainerWidget, ESPBase, ESPWorkunit, ESPLogicalFile, TargetSelectWidget, QuerySetDetailsWidget, WsWorkunits, ESPQuery, ESPUtil,
@@ -73,7 +72,7 @@ define([
     return declare("QuerySetQueryWidget", [_TabContainerWidget], {
         templateString: template,
         baseClass: "QuerySetQueryWidget",
-        i18n: lang.mixin(nlsCommon, nlsSpecific),
+        i18n: nlsHPCC,
 
         borderContainer: null,
         queriesTab: null,

esp/files/scripts/QuerySetSuperFilesWidget.js

@@ -17,8 +17,7 @@ define([
     "dojo/_base/declare",
     "dojo/_base/lang",
     "dojo/i18n",
-    "dojo/i18n!./nls/common",
-    "dojo/i18n!./nls/QuerySetSuperFilesWidget",
+    "dojo/i18n!./nls/hpcc",
     "dojo/_base/array",
     "dojo/on",
 
@@ -36,14 +35,14 @@ define([
     "hpcc/ESPQuery",
     "hpcc/ESPUtil"
 
-], function (declare, lang, i18n, nlsCommon, nlsSpecific, arrayUtil, on,
+], function (declare, lang, i18n, nlsHPCC, arrayUtil, on,
                 Button,
                 OnDemandGrid, Keyboard, Selection, selector, ColumnResizer, DijitRegistry,
                 GridDetailsWidget, ESPWorkunit, ESPQuery, ESPUtil) {
     return declare("QuerySetSuperFilesWidget", [GridDetailsWidget], {
-        i18n: lang.mixin(nlsCommon, nlsSpecific),
+        i18n: nlsHPCC,
 
-        gridTitle: nlsSpecific.title,
+        gridTitle: nlsHPCC.title_QuerySetLogicalFiles,
         idProperty: "Name",
 
         wu: null,

esp/files/scripts/QueryTestWidget.js

@@ -17,8 +17,7 @@ define([
     "dojo/_base/declare",
     "dojo/_base/lang",
     "dojo/i18n",
-    "dojo/i18n!./nls/common",
-    "dojo/i18n!./nls/QueryTestWidget",
+    "dojo/i18n!./nls/hpcc",
     "dojo/_base/array",
 
     "dijit/registry",
@@ -33,7 +32,7 @@ define([
 
     "dojo/text!../templates/QueryTestWidget.html"
 
-], function (declare, lang, i18n, nlsCommon, nlsSpecific, arrayUtil,
+], function (declare, lang, i18n, nlsHPCC, arrayUtil,
             registry,
             _TabContainerWidget, WsTopology, ESPQuery,
             BorderContainer, TabContainer, ContentPane,
@@ -41,7 +40,7 @@ define([
     return declare("QueryTestWidget", [_TabContainerWidget], {
         templateString: template,
         baseClass: "QueryTestWidget",
-        i18n: lang.mixin(nlsCommon, nlsSpecific),
+        i18n: nlsHPCC,
 
         initalized: false,
         soapTab: null,

esp/files/scripts/ResultWidget.js

@@ -17,8 +17,7 @@ define([
     "dojo/_base/declare",
     "dojo/_base/lang",
     "dojo/i18n",
-    "dojo/i18n!./nls/common",
-    "dojo/i18n!./nls/ResultWidget",
+    "dojo/i18n!./nls/hpcc",
     "dojo/dom",
     "dojo/request/iframe",
 
@@ -44,7 +43,7 @@ define([
     "dijit/Toolbar",
     "dijit/form/Button",
     "dijit/ToolbarSeparator"
-], function (declare, lang, i18n, nlsCommon, nlsSpecific, dom, iframe,
+], function (declare, lang, i18n, nlsHPCC, dom, iframe,
                 registry,
                 Grid, Keyboard, Selection, selector, ColumnResizer, DijitRegistry, Pagination,
                 _Widget, ESPBase, ESPWorkunit, ESPLogicalFile,
@@ -52,7 +51,7 @@ define([
     return declare("ResultWidget", [_Widget], {
         templateString: template,
         baseClass: "ResultWidget",
-        i18n: lang.mixin(nlsCommon, nlsSpecific),
+        i18n: nlsHPCC,
 
         borderContainer: null,
         grid: null,

esp/files/scripts/ResultsWidget.js

@@ -17,8 +17,7 @@ define([
     "dojo/_base/declare",
     "dojo/_base/lang",
     "dojo/i18n",
-    "dojo/i18n!./nls/common",
-    "dojo/i18n!./nls/ResultsWidget",
+    "dojo/i18n!./nls/hpcc",
     "dojo/_base/array",
     "dojo/on",
 
@@ -39,14 +38,14 @@ define([
     "hpcc/SFDetailsWidget",
     "hpcc/ESPUtil"
 
-], function (declare, lang, i18n, nlsCommon, nlsSpecific, arrayUtil, on,
+], function (declare, lang, i18n, nlsHPCC, arrayUtil, on,
                 ContentPane,
                 OnDemandGrid, Keyboard, Selection, selector, ColumnResizer, DijitRegistry,
                 GridDetailsWidget, ESPRequest, ESPWorkunit, ResultWidget, LFDetailsWidget, SFDetailsWidget, ESPUtil) {
     return declare("ResultsWidget", [GridDetailsWidget], {
-        i18n: lang.mixin(nlsCommon, nlsSpecific),
+        i18n: nlsHPCC,
 
-        gridTitle: nlsSpecific.title,
+        gridTitle: nlsHPCC.title_Results,
         idProperty: "Sequence",
 
         wu: null,

esp/files/scripts/SFDetailsWidget.js

@@ -18,8 +18,7 @@ define([
     "dojo/_base/declare",
     "dojo/_base/lang",
     "dojo/i18n",
-    "dojo/i18n!./nls/common",
-    "dojo/i18n!./nls/SFDetailsWidget",
+    "dojo/i18n!./nls/hpcc",
     "dojo/_base/array",
     "dojo/dom",
     "dojo/dom-attr",
@@ -62,7 +61,7 @@ define([
     "dojo/text!../templates/SFDetailsWidget.html",
 
     "dijit/TooltipDialog"
-], function (exports, declare, lang, i18n, nlsCommon, nlsSpecific, arrayUtil, dom, domAttr, domClass, domForm, query, Memory, Observable,
+], function (exports, declare, lang, i18n, nlsHPCC, arrayUtil, dom, domAttr, domClass, domForm, query, Memory, Observable,
                 BorderContainer, TabContainer, ContentPane, Toolbar, TooltipDialog, Form, SimpleTextarea, TextBox, Button, DropDownButton, TitlePane, registry,
                 OnDemandGrid, Keyboard, Selection, selector, ColumnResizer, DijitRegistry,
                 _TabContainerWidget, ResultWidget, EclSourceWidget, FilePartsWidget, WUDetailsWidget, DFUWUDetailsWidget, TargetSelectWidget,
@@ -71,7 +70,7 @@ define([
     exports.fixCircularDependency = declare("SFDetailsWidget", [_TabContainerWidget], {
         templateString: template,
         baseClass: "SFDetailsWidget",
-        i18n: lang.mixin(nlsCommon, nlsSpecific),
+        i18n: nlsHPCC,
 
         borderContainer: null,
         tabContainer: null,

esp/files/scripts/SearchResultsWidget.js

@@ -17,8 +17,7 @@ define([
     "dojo/_base/declare",
     "dojo/_base/lang",
     "dojo/i18n",
-    "dojo/i18n!./nls/common",
-    "dojo/i18n!./nls/SearchResultsWidget",
+    "dojo/i18n!./nls/hpcc",
     "dojo/_base/array",
     "dojo/on",
     "dojo/promise/all",
@@ -44,21 +43,21 @@ define([
     "hpcc/SFDetailsWidget",
     "hpcc/ESPUtil"
 
-], function (declare, lang, i18n, nlsCommon, nlsSpecific, arrayUtil, on, all,
+], function (declare, lang, i18n, nlsHPCC, arrayUtil, on, all,
                 Button,
                 Standby,
                 OnDemandGrid, Keyboard, Selection, selector, ColumnResizer, DijitRegistry,
                 GridDetailsWidget, WsWorkunits, FileSpray, WsDfu, WUDetailsWidget, DFUWUDetailsWidget, LFDetailsWidget, SFDetailsWidget, ESPUtil) {
     return declare("SearchResultsWidget", [GridDetailsWidget], {
+        i18n: nlsHPCC,
 
-        gridTitle: "Search Results",
+        gridTitle: nlsHPCC.title_SearchResults,
         idProperty: "id",
-        i18n: lang.mixin(nlsCommon, nlsSpecific),
 
         doSearch: function (searchText) {
-            this.params = {
+            lang.mixin(this.params, {
                 searchText: searchText
-            };
+            });
             this.searchText = searchText;
             this.selectChild(this.gridTab);
             this.refreshGrid();
@@ -88,10 +87,10 @@ define([
                 noDataMessage: "<span class='dojoxGridNoData'>" + this.i18n.noDataMessage + "</span>",
                 columns: {
                     col1: selector({ width: 27, selectorType: 'checkbox' }),
-                    Type: { label: "What", width: 108, sortable: true },
-                    Reason: { label: "Where", width: 108, sortable: true },
+                    Type: { label: this.i18n.What, width: 108, sortable: true },
+                    Reason: { label: this.i18n.Where, width: 108, sortable: true },
                     Summary: {
-                        label: "Who", sortable: true,
+                        label: this.i18n.Who, sortable: true,
                         formatter: function (summary, idx) {
                             return "<a href='#' rowIndex=" + idx + " class='" + context.id + "SearchResultClick'>" + summary + "</a>";
                         }
@@ -261,36 +260,36 @@ define([
                 //  ECL WU  ---
                 all([
                     WsWorkunits.WUQuery({ request: { Wuid: this.searchText }, suppressExceptionToaster: true }).then(function (response) {
-                        context.loadWUQueryResponse("Wuid", response);
+                        context.loadWUQueryResponse(context.i18n.WUID, response);
                     }),
                     WsWorkunits.WUQuery({ request: { Jobname: "*" + this.searchText + "*" } }).then(function (response) {
-                        context.loadWUQueryResponse("Job Name", response);
+                        context.loadWUQueryResponse(context.i18n.JobName, response);
                     }),
                     WsWorkunits.WUQuery({ request: { Owner: this.searchText } }).then(function (response) {
-                        context.loadWUQueryResponse("Owner", response);
+                        context.loadWUQueryResponse(context.i18n.Owner, response);
                     }),
                     WsWorkunits.WUQuery({ request: { ECL: this.searchText } }).then(function (response) {
-                        context.loadWUQueryResponse("ECL", response);
+                        context.loadWUQueryResponse(context.i18n.ECL, response);
                     }),
                     //  DFU WU  ---
                     FileSpray.GetDFUWorkunit({ request: { wuid: this.searchText }, suppressExceptionToaster: true }).then(function (response) {
-                        context.loadGetDFUWorkunitResponse("Wuid", response);
+                        context.loadGetDFUWorkunitResponse(context.i18n.WUID, response);
                     }),
                     FileSpray.GetDFUWorkunits({ request: { Jobname: "*" + this.searchText + "*" } }).then(function (response) {
-                        context.loadGetDFUWorkunitsResponse("Job Name", response);
+                        context.loadGetDFUWorkunitsResponse(context.i18n.JobName, response);
                     }),
                     FileSpray.GetDFUWorkunits({ request: { Owner: this.searchText } }).then(function (response) {
-                        context.loadGetDFUWorkunitsResponse("Owner", response);
+                        context.loadGetDFUWorkunitsResponse(context.i18n.Owner, response);
                     }),
                     //  Logical Files  ---
                     WsDfu.DFUQuery({ request: { LogicalName: "*" + this.searchText + "*" } }).then(function (response) {
-                        context.loadDFUQueryResponse("Logical Name", response);
+                        context.loadDFUQueryResponse(context.i18n.LogicalName, response);
                     }),
                     WsDfu.DFUQuery({ request: { Description: "*" + this.searchText + "*" } }).then(function (response) {
-                        context.loadDFUQueryResponse("Description", response);
+                        context.loadDFUQueryResponse(context.i18n.Description, response);
                     }),
                     WsDfu.DFUQuery({ request: { Owner: this.searchText } }).then(function (response) {
-                        context.loadDFUQueryResponse("Owner", response);
+                        context.loadDFUQueryResponse(context.i18n.Owner, response);
                     })
                 ]).then(function (results) {
                     context.standby.hide();

esp/files/scripts/SourceFilesWidget.js

@@ -17,8 +17,7 @@ define([
     "dojo/_base/declare",
     "dojo/_base/lang",
     "dojo/i18n",
-    "dojo/i18n!./nls/common",
-    "dojo/i18n!./nls/SourceFilesWidget",
+    "dojo/i18n!./nls/hpcc",
     "dojo/_base/array",
     "dojo/on",
 
@@ -36,13 +35,13 @@ define([
     "hpcc/SFDetailsWidget",
     "hpcc/ESPUtil"
 
-], function (declare, lang, i18n, nlsCommon, nlsSpecific, arrayUtil, on,
+], function (declare, lang, i18n, nlsHPCC, arrayUtil, on,
                 OnDemandGrid, Keyboard, Selection, selector, ColumnResizer, DijitRegistry,
                 GridDetailsWidget, ESPWorkunit, ResultWidget, LFDetailsWidget, SFDetailsWidget, ESPUtil) {
     return declare("SourceFilesWidget", [GridDetailsWidget], {
-        i18n: lang.mixin(nlsCommon, nlsSpecific),
+        i18n: nlsHPCC,
 
-        gridTitle: "Inputs",
+        gridTitle: nlsHPCC.title_Inputs,
         idProperty: "sequence",
 
         wu: null,

esp/files/scripts/TargetSelectWidget.js

@@ -17,8 +17,7 @@ define([
     "dojo/_base/declare",
     "dojo/_base/lang",
     "dojo/i18n",
-    "dojo/i18n!./nls/common",
-    "dojo/i18n!./nls/TargetSelectWidget",
+    "dojo/i18n!./nls/hpcc",
     "dojo/_base/array",
     "dojo/_base/xhr",
     "dojo/data/ItemFileReadStore",
@@ -30,11 +29,11 @@ define([
     "hpcc/WsTopology",
     "hpcc/WsWorkunits",
     "hpcc/FileSpray"
-], function (declare, lang, i18n, nlsCommon, nlsSpecific, arrayUtil, xhr, ItemFileReadStore, on,
+], function (declare, lang, i18n, nlsHPCC, arrayUtil, xhr, ItemFileReadStore, on,
     Select, registry,
     WsTopology, WsWorkunits, FileSpray) {
     return declare("TargetSelectWidget", [Select], {
-        i18n: lang.mixin(nlsCommon, nlsSpecific),
+        i18n: nlsHPCC,
 
         loading: false,
         defaultValue: "",

esp/files/scripts/TimingGridWidget.js

@@ -18,8 +18,7 @@ define([
     "dojo/_base/declare",
     "dojo/_base/lang",
     "dojo/i18n",
-    "dojo/i18n!./nls/common",
-    "dojo/i18n!./nls/TimingGridWidget",
+    "dojo/i18n!./nls/hpcc",
     "dojo/_base/array",
     "dojo/store/Memory",
     "dojo/store/Observable",
@@ -39,7 +38,7 @@ define([
 
     "dojo/text!../templates/TimingGridWidget.html"
 ],
-    function (declare, lang, i18n, nlsCommon, nlsSpecific, arrayUtil, Memory, Observable,
+    function (declare, lang, i18n, nlsHPCC, arrayUtil, Memory, Observable,
             registry,
             OnDemandGrid, Keyboard, Selection, selector, ColumnResizer, DijitRegistry,
             _Widget, ESPUtil, ESPWorkunit,
@@ -47,7 +46,7 @@ define([
         return declare("TimingGridWidget", [_Widget], {
             templateString: template,
             baseClass: "TimingGridWidget",
-            i18n: lang.mixin(nlsCommon, nlsSpecific),
+            i18n: nlsHPCC,
 
             timingGrid: null,
             dataStore: null,

esp/files/scripts/TimingTreeMapWidget.js

@@ -18,8 +18,7 @@ define([
     "dojo/_base/declare",
     "dojo/_base/lang",
     "dojo/i18n",
-    "dojo/i18n!./nls/common",
-    "dojo/i18n!./nls/TimingTreeMapWidget",
+    "dojo/i18n!./nls/hpcc",
     "dojo/_base/array",
     "dojo/store/Memory",
     "dojo/dom",
@@ -34,7 +33,7 @@ define([
 
     "dojo/text!../templates/TimingTreeMapWidget.html"
 ],
-    function (declare, lang, i18n, nlsCommon, nlsSpecific, arrayUtil, Memory, dom, domClass,
+    function (declare, lang, i18n, nlsHPCC, arrayUtil, Memory, dom, domClass,
             registry, 
             TreeMap,
             _Widget, ESPWorkunit,
@@ -42,7 +41,7 @@ define([
         return declare("TimingTreeMapWidget", [_Widget], {
             templateString: template,
             baseClass: "TimingTreeMapWidget",
-            i18n: lang.mixin(nlsCommon, nlsSpecific),
+            i18n: nlsHPCC,
 
             treeMap: null,
             store: null,

esp/files/scripts/UserDetailsWidget.js

@@ -17,8 +17,7 @@ define([
     "dojo/_base/declare",
     "dojo/_base/lang",
     "dojo/i18n",
-    "dojo/i18n!./nls/common",
-    "dojo/i18n!./nls/UserQueryWidget",
+    "dojo/i18n!./nls/hpcc",
     "dojo/dom",
     "dojo/dom-attr",
     "dojo/dom-form",
@@ -49,7 +48,7 @@ define([
 
     "dojox/form/PasswordValidator"
 
-], function (declare, lang, i18n, nlsCommon, nlsSpecific, dom, domAttr, domForm,
+], function (declare, lang, i18n, nlsHPCC, dom, domAttr, domForm,
                 registry,
                 OnDemandGrid, Keyboard, Selection, selector, ColumnResizer, DijitRegistry,
                 _TabContainerWidget, WsAccess, MemberOfWidget, PermissionsWidget,
@@ -57,7 +56,7 @@ define([
     return declare("UserDetailsWidget", [_TabContainerWidget], {
         templateString: template,
         baseClass: "UserDetailsWidget",
-        i18n: lang.mixin(nlsCommon, nlsSpecific),
+        i18n: nlsHPCC,
 
         summaryWidget: null,
         memberOfWidget: null,

esp/files/scripts/UserQueryWidget.js

@@ -17,8 +17,7 @@ define([
     "dojo/_base/declare",
     "dojo/_base/lang",
     "dojo/i18n",
-    "dojo/i18n!./nls/common",
-    "dojo/i18n!./nls/UserQueryWidget",
+    "dojo/i18n!./nls/hpcc",
     "dojo/_base/array",
     "dojo/dom",
     "dojo/dom-form",
@@ -60,7 +59,7 @@ define([
 
     "hpcc/TableContainer"
 
-], function (declare, lang, i18n, nlsCommon, nlsSpecific, arrayUtil, dom, domForm, on,
+], function (declare, lang, i18n, nlsHPCC, arrayUtil, dom, domForm, on,
                 registry, Menu, MenuItem, MenuSeparator,
                 OnDemandGrid, Keyboard, Selection, selector, ColumnResizer, DijitRegistry,
                 _TabContainerWidget, WsAccess, ESPUtil, UserDetailsWidget, GroupDetailsWidget,
@@ -68,7 +67,7 @@ define([
     return declare("UserQueryWidget", [_TabContainerWidget], {
         templateString: template,
         baseClass: "UserQueryWidget",
-        i18n: lang.mixin(nlsCommon, nlsSpecific),
+        i18n: nlsHPCC,
 
         usersTab: null,
         usersGrid: null,

esp/files/scripts/VizWidget.js

@@ -17,8 +17,7 @@ define([
     "dojo/_base/declare",
     "dojo/_base/lang",
     "dojo/i18n",
-    "dojo/i18n!./nls/common",
-    "dojo/i18n!./nls/VizWidget",
+    "dojo/i18n!./nls/hpcc",
     "dojo/_base/array",
     "dojo/_base/Deferred",
     "dojo/dom-construct",
@@ -47,14 +46,14 @@ define([
     "dijit/form/Button",
     "dijit/form/DropDownButton"
 
-], function (declare, lang, i18n, nlsCommon, nlsSpecific, arrayUtil, Deferred, domConstruct, domForm, ioQuery, all,
+], function (declare, lang, i18n, nlsHPCC, arrayUtil, Deferred, domConstruct, domForm, ioQuery, all,
                 registry, ContentPane, Select,
                 TableContainer,
                 _Widget, ESPWorkunit, WsWorkunits,
                 template) {
     return declare("VizWidget", [_Widget], {
         templateString: template,
-        i18n: lang.mixin(nlsCommon, nlsSpecific),
+        i18n: nlsHPCC,
 
         borderContainer: null,
         grid: null,

esp/files/scripts/WUDetailsWidget.js

@@ -17,8 +17,7 @@ define([
     "dojo/_base/declare",
     "dojo/_base/lang",
     "dojo/i18n",
-    "dojo/i18n!./nls/common",
-    "dojo/i18n!./nls/WUDetailsWidget",
+    "dojo/i18n!./nls/hpcc",
     "dojo/dom",
     "dojo/dom-form",
     "dojo/dom-attr",
@@ -68,7 +67,7 @@ define([
     "dijit/form/SimpleTextarea",
 
     "hpcc/TableContainer"
-], function (declare, lang, i18n, nlsCommon, nlsSpecific, dom, domForm, domAttr, iframe, domClass, query, Memory, Observable,
+], function (declare, lang, i18n, nlsHPCC, dom, domForm, domAttr, iframe, domClass, query, Memory, Observable,
                 registry,
                 OnDemandGrid, Keyboard, Selection, selector, ColumnResizer, DijitRegistry,
                 _TabContainerWidget, ESPWorkunit, ESPRequest, EclSourceWidget, TargetSelectWidget, GraphsWidget, ResultsWidget, SourceFilesWidget, InfoGridWidget, LogsWidget, TimingPageWidget, ECLPlaygroundWidget, VizWidget, WsWorkunits,
@@ -76,7 +75,7 @@ define([
     return declare("WUDetailsWidget", [_TabContainerWidget], {
         templateString: template,
         baseClass: "WUDetailsWidget",
-        i18n: lang.mixin(nlsCommon, nlsSpecific),
+        i18n: nlsHPCC,
 
         summaryWidget: null,
         resultsWidget: null,
@@ -156,7 +155,7 @@ define([
         },
 
         getTitle: function () {
-            return this.i18n.title;
+            return this.i18n.title_WUDetails;
         },
 
         _onCancelDialog: function (){

esp/files/scripts/WUQueryWidget.js

@@ -17,8 +17,7 @@ define([
     "dojo/_base/declare",
     "dojo/_base/lang",
     "dojo/i18n",
-    "dojo/i18n!./nls/common",
-    "dojo/i18n!./nls/WUQueryWidget",
+    "dojo/i18n!./nls/hpcc",
     "dojo/_base/array",
     "dojo/dom",
     "dojo/dom-class",
@@ -62,7 +61,7 @@ define([
     "dijit/Toolbar",
     "dijit/TooltipDialog"
 
-], function (declare, lang, i18n, nlsCommon, nlsSpecific, arrayUtil, dom, domClass, domForm, date, on,
+], function (declare, lang, i18n, nlsHPCC, arrayUtil, dom, domClass, domForm, date, on,
                 registry, Menu, MenuItem, MenuSeparator, PopupMenuItem,
                 Grid, Keyboard, Selection, selector, ColumnResizer, DijitRegistry, Pagination,
                 _TabContainerWidget, WsWorkunits, ESPUtil, ESPWorkunit, WUDetailsWidget, TargetSelectWidget, FilterDropDownWidget,
@@ -70,7 +69,7 @@ define([
     return declare("WUQueryWidget", [_TabContainerWidget, ESPUtil.FormHelper], {
         templateString: template,
         baseClass: "WUQueryWidget",
-        i18n: lang.mixin(nlsCommon, nlsSpecific),
+        i18n: nlsHPCC,
 
         workunitsTab: null,
         workunitsGrid: null,
@@ -93,7 +92,7 @@ define([
         },
 
         getTitle: function () {
-            return this.i18n.title;
+            return this.i18n.title_WUQuery;
         },
 
         //  Hitched actions  ---

esp/files/scripts/WsPackageMaps.js

@@ -17,16 +17,15 @@ define([
     "dojo/_base/declare",
     "dojo/_base/lang",
     "dojo/i18n",
-    "dojo/i18n!./nls/common",
-    "dojo/i18n!./nls/PackageMapQueryWidget",
+    "dojo/i18n!./nls/hpcc",
     "dojo/_base/Deferred",
     "dojo/_base/array",
     "dojo/store/util/QueryResults",
 
     "hpcc/ESPRequest"
-], function (declare, lang, i18n, nlsCommon, nlsSpecific, Deferred, arrayUtil, QueryResults,
+], function (declare, lang, i18n, nlsHPCC, Deferred, arrayUtil, QueryResults,
     ESPRequest) {
-    var i18n = lang.mixin(nlsCommon, nlsSpecific);
+    var i18n = nlsHPCC;
     return {
         PackageMapQuery: function (params) {
             return ESPRequest.send("WsPackageProcess", "ListPackages", params);

esp/files/scripts/_Widget.js

@@ -18,7 +18,8 @@ define([
         initalized: false,
 
         _onNewPage: function (event) {
-            var baseUrl = document.URL.split("?")[0];
+            var baseUrl = document.URL.split("#")[0];
+            baseUrl = baseUrl.split("?")[0];
             var paramsString = ioQuery.objectToQuery(this.params);
             var win = window.open(baseUrl + "?" + paramsString, "_blank");
             win.focus();

esp/files/scripts/nls/ActivityWidget.js

@@ -1,17 +0,0 @@
-define({ root:
-//begin v1.x content
-({
-    title: "Activity",
-    ActiveWorkunit: "Active Workunit",
-    TargetWuid: "Target/Wuid",
-    Size: "Size",
-    State: "State",
-    Owner: "Owner",
-    JobName: "Job Name"
-})
-//end v1.x content
-,
-"es": true,
-"zh": true,
-"hu": true
-});

esp/files/scripts/nls/DFUQueryWidget.js

@@ -1,89 +0,0 @@
-define({ root:
-//begin v1.x content
-({
-    title: "Logical Files",
-
-    Add: "Add",
-    AddToSuperfile: "Add To Superfile",
-    Append: "Append",
-    Cluster: "Cluster",
-    Compress: "Compress",
-    Copy: "Copy",
-    Dali: "Dali",
-    DeleteSelectedFiles: "Delete Selected Files?",
-    Delimited: "Delimited",
-    Description: "Description",
-    Despray: "Despray",
-    DropZone: "Drop Zone",
-    Escape: "Escape",
-    FileType: "File Type",
-    Fixed: "Fixed",
-    Format: "Format",
-    FromDate: "From Date",
-    FromSizes: "From Sizes",
-    Group: "Group",
-    Import: "Import",
-    IP: "IP",
-    IPAddress: "IP Address",
-    JSmith: "JSmit*",
-    Label: "Label",
-    Largest: "Largest",
-    LastNDays: "Last N Days",
-    LineTerminators: "Line Terminators",
-    LogicalFile: "Logical File",
-    LogicalFilesAndSuperfiles: "Logical Files and Superfiles",
-    LogicalFilesOnly: "Logical Files Only",
-    LogicalName: "Logical Name",
-    Mask: "Mask",
-    MaxRecordLength: "Max Record Length",
-    ModifiedUTCGMT: "Modified (UTC/GMT)",
-    NA: "N/A",
-    Name: "Name",
-    Newest: "Newest",
-    NoFilterCriteriaSpecified: "No filter criteria specified.",
-    NoSplit: "No Split",
-    NoSplit: "No Split",
-    NotInSuperfiles: "Not in Superfiles",
-    Oldest: "Oldest",
-    OmitSeparator: "Omit Separator",
-    Options: "Options",
-    Overwrite: "Overwrite",
-    Owner: "Owner",
-    Parts: "Parts",
-    Password: "Password",
-    Path: "Path",
-    Prefix: "Prefix",
-    Quote: "Quote",
-    RecordLength: "Record Length",
-    Records: "Records",
-    Rename: "Rename",
-    Replicate: "Replicate",
-    RetainSuperfileStructure: "Retain Superfile Structure",
-    RowTag: "Row Tag",
-    Seperators: "Seperators",
-    Size: "Size",
-    Smallest: "Smallest",
-    SomeDescription: "Some*Description",
-    somefile: "*::somefile*",
-    Source: "Source",
-    SplitPrefix: "Split Prefix",
-    Spray: "Spray",
-    SuperFile: "Super File",
-    SuperfilesOnly: "Superfiles Only",
-    tag: "tag",
-    Target: "Target",
-    TargetName: "Target Name",
-    ToDate: "To Date",
-    ToSizes: "To Sizes",
-    UserID: "User ID",
-    UseSingleConnection: "Use Single Connection",
-    Wrap: "Wrap",
-    XML: "XML",
-    ZeroLogicalFilesCheckFilter: "Zero Logical Files(check filter)"
-})
-//end v1.x content
-,
-"es": true,
-"zh": true,
-"hu": true
-});

esp/files/scripts/nls/DFUWUDetailsWidget.js

@@ -1,53 +0,0 @@
-define({ root:
-//begin v1.x content
-({
-    title: "DFU Workunit",
-
-    Abort: "Abort",
-    ClusterName: "Cluster Name",
-    Command: "Command",
-    Compress: "Compress",
-    Dali: "Dali",
-    DFUServerName: "DFU Server Name",
-    Directory: "Directory",
-    Escape: "Escape",
-    FilePath: "File Path",
-    Format: "Format",
-    GroupName: "Group Name",
-    ID: "ID",
-    IP: "IP",
-    JobName: "Job Name",
-    LogicalName: "Logical Name",
-    Modify: "Modify",
-    MonitorEventName: "Monitor Event Name",
-    MonitorShotLimit: "Monitor Shot Limit",
-    MonitorSub: "Monitor Sub",
-    NumberofParts: "Number of Parts",
-    Overwrite: "Overwrite",
-    PercentDone: "Percent Done",
-    ProgressMessage: "Progress Message",
-    Protected: "Protected",
-    Queue: "Queue",
-    Quote: "Quote",
-    RecordSize: "Record Size",
-    Replicate: "Replicate",
-    Resubmit: "Resubmit",
-    RowTag: "Row Tag",
-    SecondsRemaining: "Seconds Remaining",
-    Seperators: "Seperators",
-    Source: "Source",
-    State: "State",
-    Summary: "Summary",
-    SummaryMessage: "Summary Message",
-    Target: "Target",
-    Terminators: "Terminators",
-    TimeStarted: "Time Started",
-    TimeStopped: "Time Stopped",
-    User: "User"
-})
-//end v1.x content
-,
-"es": true,
-"zh": true,
-"hu": true
-});

esp/files/scripts/nls/ECLPlaygroundWidget.js

@@ -1,18 +0,0 @@
-define({ root:
-//begin v1.x content
-({
-    title: "ECL Playground",
-
-    ErrorWarnings: "Error/Warning(s)",
-    Results: "Result(s)",
-    Sample: "Sample",
-    Submit: "Submit",
-    Target: "Target",
-    Visualize: "Visualize"
-})
-//end v1.x content
-,
-"es": true,
-"zh": true,
-"hu": true
-});

esp/files/scripts/nls/ECLSourceWidget.js

@@ -1,10 +0,0 @@
-define({ root:
-//begin v1.x content
-({
-})
-//end v1.x content
-,
-"es": true,
-"zh": true,
-"hu": true
-});

esp/files/scripts/nls/ESPDFUWorkunit.js

@@ -1,12 +0,0 @@
-define({ root:
-//begin v1.x content
-({
-    Unknown: "Unknown",
-    Wuidcannotbeempty: "Wuid Cannot Be Empty."
-})
-//end v1.x content
-,
-"es": true,
-"zh": true,
-"hu": true
-});

esp/files/scripts/nls/EventScheduleWorkunitWidget.js

@@ -1,26 +0,0 @@
-define({ root:
-//begin v1.x content
-({
-    title: "Event Scheduler",
-    Apply: "Apply",
-    Clear: "Clear",
-    Cluster: "Cluster",
-    ClusterPH: "r?x*",
-    Deschedule: "Deschedule",
-    DescheduleSelectedWorkunits: "Deschedule Selected Workunits?",
-    EventName: "Event Name",
-    EventNamePH: "eventname",
-    EventText: "Event Text",
-    Filter: "Filter",
-    JobName: "Job Name",
-    NoScheduledEvents: "No Scheduled Events.",
-    Open: "Open",
-    OpenInNewPage: "Open In New Page",
-    Refresh: "Refresh",
-    Workunit: "Workunit"
-})
-//end v1.x content
-,
-"es": true,
-"zh": true
-});

esp/files/scripts/nls/FilterDropDownWidget.js

@@ -1,10 +0,0 @@
-define({ root:
-//begin v1.x content
-({
-})
-//end v1.x content
-,
-"es": true,
-"zh": true,
-"hu": true
-});

esp/files/scripts/nls/FullResultWidget.js

@@ -1,11 +0,0 @@
-define({ root:
-//begin v1.x content
-({
-    undefined: "undefined"
-})
-//end v1.x content
-,
-"es": true,
-"zh": true,
-"hu": true
-});

esp/files/scripts/nls/GetDFUWorkunitsWidget.js

@@ -1,30 +0,0 @@
-define({ root:
-//begin v1.x content
-({
-    title: "DFU Workunits",
-
-    ArchivedOnly: "Archived Only",
-    Cluster: "Cluster",
-    Created: "Created",
-    DeleteSelectedWorkunits: "Delete Selected Workunits?",
-    ID: "ID",
-    Jobname: "Jobname",
-    JobName: "Job Name",
-    JSmith: "JSmit*",
-    log_analysis_1: "log_analysis_1*",
-    NA: "N/A",
-    Owner: "Owner",
-    PctComplete: "% Complete",
-    Protect: "Protect",
-    roxie: "r?x*",
-    SetToFailed: "Set To Failed",
-    State: "State",
-    Type: "Type",
-    Unprotect: "Unprotect"
-})
-//end v1.x content
-,
-"es": true,
-"zh": true,
-"hu": true
-});

esp/files/scripts/nls/GraphPageWidget.js

@@ -1,47 +0,0 @@
-define({ root:
-//begin v1.x content
-({
-    title: "title",
-
-    AboutGraphControl: "About Graph Control",
-    AboutHPCCSystemsGraphControl: "About HPCC Systems Graph Control",
-    Activities: "Activities",
-    Advanced: "Advanced",
-    Depth: "Depth",
-    Distance: "Distance",
-    DOT: "DOT",
-    DOTAttributes: "DOT Attributes",
-    ECL: "ECL",
-    Edges: "Edges",
-    EditDOT: "Edit DOT",
-    EditGraphAttributes: "Edit Graph Attributes",
-    EditXGMML: "Edit XGMML",
-    FetchingData: "Fetching Data...",
-    Find: "Find",
-    FindNext: "Find Next",
-    FindPrevious: "Find Previous",
-    ID: "ID",
-    InfoDialog: "Info Dialog",
-    Label: "Label",
-    Local: "Local",
-    Overview: "Overview",
-    PerformingLayout: "Performing Layout...",
-    Properties: "Properties",
-    RenderedSVG: "Rendered SVG",
-    RenderSVG: "Render SVG",
-    ShowSVG: "Show SVG",
-    Subgraphs: "Subgraphs",
-    SVGSource: "SVG Source",
-    SyncSelection: "Sync To Selection",
-    Timings: "Timings",
-    TimingsMap: "Timings Map",
-    Version: "Version",
-    WarnOldGraphControl: "Warning:  Old Graph Control",
-    XGMML: "XGMML"
-})
-//end v1.x content
-,
-"es": true,
-"zh": true,
-"hu": true
-});

esp/files/scripts/nls/GraphWidget.js

@@ -1,38 +0,0 @@
-define({ root:
-//begin v1.x content
-({
-    title: "Graphs",
-
-    BinaryInstalls: "Binary Installs",
-    Count: "Count",
-    Depth: "Depth",
-    Distance: "Distance",
-    FetchingData: "Fetching Data...",
-    GraphView: "Graph View",
-    LoadingCachedLayout: "Loading Cached Layout...",
-    LoadingData: "Loading Data...",
-    Max: "Max",
-    Min: "Min",
-    Node: "Node",
-    NothingSelected: "Nothing Selected...",
-    PerformingLayout: "Performing Layout...",
-    Property: "Property",
-    Rows: "Rows",
-    Skew: "Skew",
-    Slaves: "Slaves",
-    SourceCode: "Source Code",
-    Started: "Started",
-    Stopped: "Stopped",
-    SyncSelection: "Sync To Selection",
-    Toenablegraphviews: "To enable graph views, please install the Graph View Control plugin",
-    Value: "Value",
-    Zoom100Pct: "Zoom 100%",
-    ZoomAll: "Zoom All",
-    ZoomWidth: "Zoom Width"
-})
-//end v1.x content
-,
-"es": true,
-"zh": true,
-"hu": true
-});

esp/files/scripts/nls/GraphsWidget.js

@@ -1,18 +0,0 @@
-define({ root:
-//begin v1.x content
-({
-    title: "Graphs",
-
-    Completed: "Completed",
-    Label: "Label",
-    Name: "Name",
-    OpenSafeMode: "Open (safe mode)",
-    Time: "Time",
-    Type: "Type"
-})
-//end v1.x content
-,
-"es": true,
-"zh": true,
-"hu": true
-});

esp/files/scripts/nls/GridDetailsWidget.js

@@ -1,11 +0,0 @@
-define({ root:
-//begin v1.x content
-({
-    title: "Change Me"
-})
-//end v1.x content
-,
-"es": true,
-"zh": true,
-"hu": true
-});

esp/files/scripts/nls/HPCCPlatformECLWidget.js

@@ -1,14 +0,0 @@
-define({ root:
-//begin v1.x content
-({
-    title: "HPCC Platform - Home",
-
-    Workunits: "Workunits",
-    Playground: "Playground"
-})
-//end v1.x content
-,
-"es": true,
-"zh": true,
-"hu": true
-});

esp/files/scripts/nls/HPCCPlatformFilesWidget.js

@@ -1,16 +0,0 @@
-define({ root:
-//begin v1.x content
-({
-    title: "HPCC Platform - Files",
-
-    LogicalFiles: "Logical Files",
-    LandingZones: "Landing Zones",
-    Workunits: "Workunits",
-    XRef: "XRef"
-})
-//end v1.x content
-,
-"es": true,
-"zh": true,
-"hu": true
-});

esp/files/scripts/nls/HPCCPlatformMainWidget.js

@@ -1,14 +0,0 @@
-define({ root:
-//begin v1.x content
-({
-    title: "HPCC Platform - Home",
-    Activity: "Activity",
-    EventScheduler: "Event Scheduler",
-    SearchResults: "Search Results"
-})
-//end v1.x content
-,
-"es": true,
-"zh": true,
-"hu": true
-});

esp/files/scripts/nls/HPCCPlatformOpsWidget.js

@@ -1,19 +0,0 @@
-define({ root:
-//begin v1.x content
-({
-    title: "HPCC Platform - Operations",
-
-    TargetClusters: "Target Clusters",
-    ClusterProcesses: "Cluster Processes",
-    SystemServers: "System Servers",
-    Users: "Users",
-    Groups: "Groups",
-    Permissions: "Permissions",
-    Resources: "Resources"
-})
-//end v1.x content
-,
-"es": true,
-"zh": true,
-"hu": true
-});

esp/files/scripts/nls/HPCCPlatformRoxieWidget.js

@@ -1,14 +0,0 @@
-define({ root:
-//begin v1.x content
-({
-    title: "HPCC Platform - Roxie",
-
-    Queries: "Queries",
-    PackageMaps: "Package Maps"
-})
-//end v1.x content
-,
-"es": true,
-"zh": true,
-"hu": true
-});

esp/files/scripts/nls/HPCCPlatformWidget.js

@@ -1,23 +0,0 @@
-define({ root:
-//begin v1.x content
-({
-    About: "About",
-    ECL: "ECL",
-    ErrorWarnings: "Error/Warnings",
-    Files: "Files",
-    Find: "Find",
-    LoggedInAs: "Logged in as",
-    OpenLegacyECLWatch: "Open Legacy ECL Watch",
-    Operations: "Operations",
-    Permissions: "Permissions",
-    PlaceholderFindText: "Wuid, User, More...",
-    PublishedQueries: "Published Queries",
-    ReleaseNotes: "Release Notes",
-    SetBanner: "Set Banner"
-})
-//end v1.x content
-,
-"es": true,
-"zh": true,
-"hu": true
-});

esp/files/scripts/nls/HexViewWidget.js

@@ -1,13 +0,0 @@
-define({ root:
-//begin v1.x content
-({
-    EBCDIC: "EBCDIC",
-    fetchingresults: "fetching results",
-    Width: "Width"
-})
-//end v1.x content
-,
-"es": true,
-"zh": true,
-"hu": true
-});

esp/files/scripts/nls/IFrameWidget.js

@@ -1,11 +0,0 @@
-define({ root:
-//begin v1.x content
-({
-    Reset: "Reset"
-})
-//end v1.x content
-,
-"es": true,
-"zh": true,
-"hu": true
-});

esp/files/scripts/nls/InfoGridWidget.js

@@ -1,21 +0,0 @@
-define({ root:
-//begin v1.x content
-({
-    Code: "Code",
-    Col: "Col",
-    Errors: "Errors",
-    ErrorWarnings: "Error/Warnings",
-    FileName: "File Name",
-    Info: "Info",
-    Line: "Line",
-    Message: "Message",
-    Reset: "Source",
-    Severity: "Severity",
-    Warnings: "Warnings"
-})
-//end v1.x content
-,
-"es": true,
-"zh": true,
-"hu": true
-});

esp/files/scripts/nls/LFDetailsWidget.js

@@ -1,48 +0,0 @@
-define({ root:
-//begin v1.x content
-({
-    title: "Logical File Details",
-
-    ActualSize: "Actual Size",
-    ClusterName: "Cluster Name",
-    Compress: "Compress",
-    Contents: "Contents",
-    Copy: "Copy",
-    DEF: "DEF",
-    Description: "Description",
-    Despray: "Despray",
-    Directory: "Directory",
-    DropZone: "Drop Zone",
-    ECL: "ECL",
-    FileParts: "File Parts",
-    FileSize: "File Size",
-    Group: "Group",
-    IPAddress: "IP Address",
-    JobName: "Job Name",
-    LogicalFile: "Logical File",
-    Modification: "Modification",
-    NoSplit: "No Split",
-    Overwrite: "Overwrite",
-    Owner: "Owner",
-    Path: "Path",
-    PathMask: "Path Mask",
-    RecordCount: "Record Count",
-    RecordSize: "Record Size",
-    Rename: "Rename",
-    RetainSuperfileStructure: "Retain Superfile Structure",
-    Source: "Source",
-    SplitPrefix: "Split Prefix",
-    Summary: "Summary",
-    Target: "Target",
-    TargetName: "Target Name",
-    UseSingleConnection: "Use Single Connection",
-    Workunit: "Workunit",
-    Wrap: "Wrap",
-    XML: "XML"
-})
-//end v1.x content
-,
-"es": true,
-"zh": true,
-"hu": true
-});

esp/files/scripts/nls/LZBrowseWidget.js

@@ -1,60 +0,0 @@
-define({ root:
-//begin v1.x content
-({
-    title: "Landing Zones",
-
-    Blob: "BLOB",
-    BlobPrefix: "BLOB Prefix",
-    Compress: "Compress",
-    Date: "Date",
-    DeleteSelectedFiles: "Delete Selected Files?",
-    Delimited: "Delimited",
-    Download: "Download",
-    Errorparsingserverresult: "Error parsing server result",
-    Escape: "Escape",
-    FileUploader: "File Uploader",
-    Fixed: "Fixed",
-    Format: "Format",
-    Group: "Group",
-    Hex: "Hex",
-    Variable: "Variable",
-    VariableSourceType: "Source Type",
-    Label: "Label",
-    LandingZone: "Landing Zone",
-    LineTerminators: "Line Terminators",
-    Mask: "Mask",
-    MaxRecordLength: "Max Record Length",
-    Name: "Name",
-    NamePrefix: "Name Prefix",
-    NamePrefixPlaceholder: "some::prefix",
-    NoSplit: "No Split",
-    OmitSeparator: "Omit Separator",
-    Options: "Options",
-    Overwrite: "Overwrite",
-    Prefix: "Prefix",
-    PrefixPlaceholder: "filename{:length}, filesize{:[B|L][1-8]}",
-    Preview: "Preview",
-    Quote: "Quote",
-    RecordLength: "Record Length",
-    RowTag: "Row Tag",
-    Seperators: "Seperators",
-    Size: "Size",
-    Source: "Source",
-    SourcePath: "Source Path (Wildcard Enabled)",
-    Spray: "Spray",
-    Start: "Start",
-    tag: "tag",
-    Target: "Target",
-    TargetName: "Target Name",
-    TargetNamePlaceholder: "some::logical::name",
-    Upload: "Upload",
-    Variable: "Variable",
-    VariableBigendian: "Variable Big-endian",
-    XML: "XML"
-})
-//end v1.x content
-,
-"es": true,
-"zh": true,
-"hu": true
-});

esp/files/scripts/nls/LogsWidget.js

@@ -1,16 +0,0 @@
-define({ root:
-//begin v1.x content
-({
-    Download: "Download",
-    Description: "Description",
-    File: "File",
-    GZip: "GZip",
-    Type: "Type",
-    Zip: "Zip"
-})
-//end v1.x content
-,
-"es": true,
-"zh": true,
-"hu": true
-});

esp/files/scripts/nls/PackageMapDetailsWidget.js

@@ -1,21 +0,0 @@
-define({ root:
-//begin v1.x content
-({
-    Activate: "Activate",
-    Active: "Active",
-    Deactivate: "Deactivate",
-    Delete: "Delete",
-    DeleteThisPackage: "Delete this package?",
-    Errors: "Error(s)",
-    NotActive: "Not active",
-    ProcessFilter: "Process Filter",
-    Summary: "Summary",
-    Target: "Target",
-    Validate: "Validate",
-    Warnings: "Warning(s)"
-})
-//end v1.x content
-,
-"es": true,
-"zh": true
-});

esp/files/scripts/nls/PackageMapQueryWidget.js

@@ -1,35 +0,0 @@
-define({ root:
-//begin v1.x content
-({
-    ANY: "ANY",
-    Activate: "Activate",
-    Active: "Active",
-    Add: "Add",
-    AddProcessMap: "Add Package Map",
-    Code: "Code",
-    Deactivate: "Deactivate",
-    Description: "Description",
-    Exception: "Exception",
-    ID: "ID",
-    InvalidResponse: "(Invalid response)",
-    Message: "Message",
-    NoContent: "(No content)",
-    Only1PackageFileAllowed: "Only one package file allowed",
-    Open: "Open",
-    OverWrite: "OverWrite",
-    PackageMap: "Package Map",
-    PackageMaps: "Package Maps",
-    Process: "Process",
-    ProcessFilter: "Process Filter",
-    Reload: "Reload",
-    RemoteDaliIP: "Remote Dali IP Address",
-    SelectPackageFile: "Select Package File",
-    Submit: "Submit",
-    Target: "Target",
-    ValidatePackageMap: "Validate Package Map"
-})
-//end v1.x content
-,
-"es": true,
-"zh": true
-});

esp/files/scripts/nls/PackageMapValidateWidget.js

@@ -1,25 +0,0 @@
-define({ root:
-//begin v1.x content
-({
-    ANY: "ANY",
-    ActivePackageMap: "Active Package Map",
-    Empty: "(Empty)",
-    Errors: "Error(s)",
-    FilesNoPackage: "Files without matching package definitions",
-    NoErrorFound: "No errors found\n",
-    NoWarningFound: "No warnings found\n",
-    PackageContent: "Package Content",
-    PackageContentNotSet: "Package content not set",
-    PackagesNoQuery: "Packages without matching queries",
-    Process: "Process",
-    QueriesNoPackage: "Queries without matching package",
-    Target: "Target",
-    Validate: "Validate",
-    ValidateResult: "=====Validate Result=====\n\n",
-    Warnings: "Warning(s)"
-})
-//end v1.x content
-,
-"es": true,
-"zh": true
-});

esp/files/scripts/nls/PackageSourceWidget.js

@@ -1,17 +0,0 @@
-define({ root:
-//begin v1.x content
-({
-    Errors: "Error(s)",
-    FilesNoPackage: "Files without matching package definitions",
-    Loading: "Loading...",
-    NoErrorFound: "No errors found\n",
-    NoWarningFound: "No warnings found\n",
-    PackagesNoQuery: "Packages without matching queries",
-    QueriesNoPackage: "Queries without matching package",
-    Warnings: "Warning(s)"
-})
-//end v1.x content
-,
-"es": true,
-"zh": true
-});

esp/files/scripts/nls/QuerySetDetailsWidget.js

@@ -1,36 +0,0 @@
-define({ root:
-//begin v1.x content
-({
-    title: "Query Details",
-
-    Activated: "Activated",
-    Comment: "Comment",
-    DeleteSelectedWorkunits: "Delete Selected Workunits?",
-    Dll: "Dll",
-    Errors: "Errors",
-    ErrorsStatus: "Errors/Status",
-    Graphs: "Graphs",
-    IsLibrary: "Is Library",
-    LibrariesUsed: "Libraries Used",
-    LogicalFiles: "Logical Files",
-    LogicalFiles: "Logical Files",
-    Name: "Name",
-    Priority: "Priority",
-    PublishedBy: "Published By",
-    QueryDetailsfor: "Query Details for",
-    QuerySet: "Query Set",
-    Summary: "Summary",
-    Suspended: "Suspended",
-    SuspendedBy: "Suspended By",
-    TestPages: "Test Pages",
-    Unsuspended: "Unsuspended",
-    Workunit: "Workunit",
-    WUID: "WUID",
-    WUSnapShot: "WU Snap Shot",
-})
-//end v1.x content
-,
-"es": true,
-"zh": true,
-"hu": true
-});

esp/files/scripts/nls/QuerySetErrorsWidget.js

@@ -1,15 +0,0 @@
-define({ root:
-//begin v1.x content
-({
-    title: "Errors",
-
-    Cluster: "Cluster",
-    Error: "Error",
-    State: "State"
-})
-//end v1.x content
-,
-"es": true,
-"zh": true,
-"hu": true
-});

esp/files/scripts/nls/QuerySetLogicalFilesWidget.js

@@ -1,13 +0,0 @@
-define({ root:
-//begin v1.x content
-({
-    title: "Logical Files",
-
-    LogicalFiles: "Logical Files"
-})
-//end v1.x content
-,
-"es": true,
-"zh": true,
-"hu": true
-});

esp/files/scripts/nls/QuerySetQueryWidget.js

@@ -1,30 +0,0 @@
-define({ root:
-//begin v1.x content
-({
-    title: "Queries",
-
-    Activate: "Activate",
-    Active: "Active",
-    Cluster: "Cluster",
-    Deactivate: "Deactivate",
-    DeleteSelectedQueries: "Delete Selected Queries?",
-    Dll: "Dll",
-    ID: "ID",
-    IsLibrary: "Is Library",
-    NA: "N/A",
-    Name: "Name",
-    Priority: "Priority",
-    PublishedBy: "Published By",
-    Queries: "Queries",
-    Suspend: "Suspend",
-    Suspended: "Suspended",
-    Target: "Target",
-    Unsuspend: "Unsuspend",
-    WUID: "WUID"
-})
-//end v1.x content
-,
-"es": true,
-"zh": true,
-"hu": true
-});

esp/files/scripts/nls/QuerySetSuperFilesWidget.js

@@ -1,13 +0,0 @@
-define({ root:
-//begin v1.x content
-({
-    title: "Super Files",
-
-    LogicalFiles: "Logical Files"
-})
-//end v1.x content
-,
-"es": true,
-"zh": true,
-"hu": true
-});

esp/files/scripts/nls/QueryTestWidget.js

@@ -1,22 +0,0 @@
-define({ root:
-//begin v1.x content
-({
-    title: "Super Files",
-
-    JSON: "JSON",
-    LegacyForm: "Legacy Form",
-    Links: "Links",
-    ParameterXML: "Parameter XML",
-    RequestSchema: "Request Schema",
-    ResponseSchema: "Response Schema",
-    SampleRequest: "Sample Request",
-    SampleResponse: "Sample Response",
-    SOAP: "SOAP",
-    WSDL: "WSDL"
-})
-//end v1.x content
-,
-"es": true,
-"zh": true,
-"hu": true
-});

esp/files/scripts/nls/ResultWidget.js

@@ -1,16 +0,0 @@
-define({ root:
-//begin v1.x content
-({
-    title: "Activity",
-
-    Download: "Download",
-    GZip: "GZip",
-    XLS: "XLS",
-    Zip: "Zip"
-})
-//end v1.x content
-,
-"es": true,
-"zh": true,
-"hu": true
-});

esp/files/scripts/nls/ResultsWidget.js

@@ -1,16 +0,0 @@
-define({ root:
-//begin v1.x content
-({
-    title: "Outputs",
-
-    FileName: "File Name",
-    Name: "Name",
-    Value: "Value",
-    Views: "Views"
-})
-//end v1.x content
-,
-"es": true,
-"zh": true,
-"hu": true
-});

esp/files/scripts/nls/SFDetailsWidget.js

@@ -1,23 +0,0 @@
-define({ root:
-//begin v1.x content
-({
-    Cluster: "Cluster",
-    DeleteSuperfile: "Delete Superfile?",
-    Description: "Description",
-    Description: "Description",
-    FileSize: "File Size",
-    LogicalName: "Logical Name",
-    ModifiedUTCGMT: "Modified (UTC/GMT)",
-    Owner: "Owner",
-    Parts: "Parts",
-    Records: "Records",
-    Remove: "Remove",
-    Size: "Size",
-    Summary: "Summary"
-})
-//end v1.x content
-,
-"es": true,
-"zh": true,
-"hu": true
-});

esp/files/scripts/nls/SearchResultsWidget.js

@@ -1,11 +0,0 @@
-define({ root:
-//begin v1.x content
-({
-    title: "",
-})
-//end v1.x content
-,
-"es": true,
-"zh": true,
-"hu": true
-});

esp/files/scripts/nls/SourceFilesWidget.js

@@ -1,11 +0,0 @@
-define({ root:
-//begin v1.x content
-({
-    title: ""
-})
-//end v1.x content
-,
-"es": true,
-"zh": true,
-"hu": true
-});

esp/files/scripts/nls/TargetSelectWidget.js

@@ -1,12 +0,0 @@
-define({ root:
-//begin v1.x content
-({
-    Created: "Created",
-    Used: "Used"
-})
-//end v1.x content
-,
-"es": true,
-"zh": true,
-"hu": true
-});

esp/files/scripts/nls/TimingGridWidget.js

@@ -1,12 +0,0 @@
-define({ root:
-//begin v1.x content
-({
-    Component: "Component",
-    TimeSeconds: "Time (Seconds)"
-})
-//end v1.x content
-,
-"es": true,
-"zh": true,
-"hu": true
-});

esp/files/scripts/nls/TimingTreeMapWidget.js

@@ -1,11 +0,0 @@
-define({ root:
-//begin v1.x content
-({
-    help: "This area displays the treemap for the graph(s) in this workunit. The size and hue indicate the duration of each graph (Larger and darker indicates a greater percentage of the time taken.)"
-})
-//end v1.x content
-,
-"es": true,
-"zh": true,
-"hu": true
-});