Attachment 246979 Details for Bug 390235 – messages patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] messages patch

messagePatch (text/plain), 116.50 KB, created by Insoo Choo

on 2014-09-11 13:52:54 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Insoo Choo

Created: 2014-09-11 13:52:54 EDT

Size: 116.50 KB

patch

obsolete

>diff --git a/bundles/org.eclipse.orion.client.core/web/orion/fileClient.js b/bundles/org.eclipse.orion.client.core/web/orion/fileClient.js
>index 79e79f5..6165b2b 100644
>--- a/bundles/org.eclipse.orion.client.core/web/orion/fileClient.js
>+++ b/bundles/org.eclipse.orion.client.core/web/orion/fileClient.js
>@@ -21,7 +21,7 @@
> 	function _doServiceCall(fileService, funcName, funcArgs) {
> 		//if the function is not implemented in the file service, we throw an exception to the caller
> 		if(!fileService[funcName]){
>-			throw funcName + messages[" is not supported in this file system"];
>+			throw i18nUtil.formatMessage("${0} is not supported in this file system", funcName);
> 		}
> 		return fileService[funcName].apply(fileService, funcArgs);
> 	}
>@@ -29,11 +29,11 @@
> 	function _copy(sourceService, sourceLocation, targetService, targetLocation) {
> 		
> 		if (!sourceService.readBlob) {
>-			throw messages["source file service does not support binary read"];
>+			throw messages["SrcNotSupportBinRead"];
> 		}
> 
> 		if (!targetService.writeBlob) {
>-			throw messages["target file service does not support binary write"];
>+			throw messages["TargetNotSupportBinWrite"];
> 		}
> 	
> 		if (sourceLocation[sourceLocation.length -1] !== "/") { //$NON-NLS-0$
>diff --git a/bundles/org.eclipse.orion.client.core/web/orion/operationsClient.js b/bundles/org.eclipse.orion.client.core/web/orion/operationsClient.js
>index 20f618c..0aa85cd 100644
>--- a/bundles/org.eclipse.orion.client.core/web/orion/operationsClient.js
>+++ b/bundles/org.eclipse.orion.client.core/web/orion/operationsClient.js
>@@ -26,7 +26,7 @@
> 
> function returnNoMatchingError() {
> var result = new Deferred();
>- result.reject(messages["No Matching OperationService for location:"] + this._location);
>+ result.reject(messages["NoMatchingOpSrvLocation"] + this._location);
> return result;
> }
> 
>diff --git a/bundles/org.eclipse.orion.client.git/web/git/nls/root/gitmessages.js b/bundles/org.eclipse.orion.client.git/web/git/nls/root/gitmessages.js
>index 1fd2db3..10cab30 100644
>--- a/bundles/org.eclipse.orion.client.git/web/git/nls/root/gitmessages.js
>+++ b/bundles/org.eclipse.orion.client.git/web/git/nls/root/gitmessages.js
>@@ -276,7 +276,7 @@
> 	"Branch name": "Branch name",
> 	"Delete": "Delete",
> 	"Delete the local branch from the repository": "Delete the local branch from the repository",
>-	"Are you sure you want to delete branch ${0}?": "Are you sure you want to delete branch ${0}?",
>+	"delete branch msg": "Are you sure you want to delete branch ${0}?",
> 	"Delete the remote tracking branch from the repository": "Delete the remote tracking branch from the repository",
> 	"Are you sure?": "Are you sure?",
> 	"You're going to delete remote branch ${0} and push the change.": "You're going to delete remote branch ${0} and push the change.",
>@@ -299,7 +299,7 @@
> 	"Open the status for the repository": "Open the status for the repository",
> 	"ShowInEditor": "Show in Editor",
> 	"ShowInEditorTooltip": "Show the repository folder in the editor",
>-	"Compare With Each Other": "Compare With Each Other",
>+	"Compare each": "Compare With Each Other",
> 	"Compare With Working Tree": "Compare With Working Tree",
> 	"Open": "Open",
> 	"OpenGitCommitTip": "View the tree for this commit",
>@@ -477,6 +477,7 @@
> 	"Login": "Login",
> 	"Authentication required for: ${0}. ${1} and re-try the request.": "Authentication required for: ${0}. ${1} and re-try the request.",
> 	"Save":"Save",
>+	"Remember my committer name and email:":"Remember my committer name and email:",
> 	"Successfully edited ${0} to have value ${1}":"Successfully edited ${0} to have value ${1}",
> 	"Successfully added ${0} with value ${1}":"Successfully added ${0} with value ${1}",
> 	"Signed-off-by: ":"Signed-off-by: ",
>diff --git a/bundles/org.eclipse.orion.client.git/web/orion/git/gitCommands.js b/bundles/org.eclipse.orion.client.git/web/orion/git/gitCommands.js
>index 862a43b..3ec3a22 100644
>--- a/bundles/org.eclipse.orion.client.git/web/orion/git/gitCommands.js
>+++ b/bundles/org.eclipse.orion.client.git/web/orion/git/gitCommands.js
>@@ -491,8 +491,7 @@
> 				if (error.status === 401) {
> 					display.HTML = true;
> 					display.Message = ""; //$NON-NLS-0$
>-					display.Message += i18nUtil.formatMessage(messages["Authentication required for: ${0}. ${1} and re-try the request."], resp.label, "<a target=\"_blank\" href=\"" + resp.SignInLocation //$NON-NLS-1$ //$NON-NLS-0$
>-					+ "\">" + messages["Login"] + "</a>") + ""; //$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-0$
>+					display.Message += i18nUtil.formatMessage("Authentication required for: ${0}. <a target=\"_blank\" href=\"${1}\">${2}</a> and re-try the request. ", resp.label, resp.SignInLocation, messages["Login"]); //$NON-NLS-0$
> 				} else {
> 					display.Message = resp.DetailedMessage ? resp.DetailedMessage : (resp.Message ? resp.Message : messages["Problem while performing the action"]);
> 				}
>@@ -648,7 +647,7 @@
> 			callback: function(data) {
> 				var item = data.items;
> 				var progress = serviceRegistry.getService("orion.page.progress"); //$NON-NLS-0$
>-				if (confirm(i18nUtil.formatMessage(messages["Are you sure you want to delete branch ${0}?"], item.Name))) {
>+				if (confirm(i18nUtil.formatMessage(messages["delete branch msg"], item.Name))) {
> 					progress.progress(serviceRegistry.getService("orion.git.provider").removeBranch(item.Location), "Removing branch " + item.Name).then(function() { //$NON-NLS-0$
> 						refresh(data);
> 					}, displayErrorOnStatus);
>@@ -812,7 +811,7 @@
> 		commandService.addCommand(openCloneContent);
> 
> 		var compareGitCommits = new mCommands.Command({
>-			name : messages["Compare With Each Other"],
>+			name : messages["Compare each"],
> 			id : "eclipse.compareGitCommits", //$NON-NLS-0$
> 			hrefCallback : function(data) {
> 				var item = data.items;
>diff --git a/bundles/org.eclipse.orion.client.git/web/orion/git/logic/gitCommit.js b/bundles/org.eclipse.orion.client.git/web/orion/git/logic/gitCommit.js
>index 8e008f6..d5c706a 100644
>--- a/bundles/org.eclipse.orion.client.git/web/orion/git/logic/gitCommit.js
>+++ b/bundles/org.eclipse.orion.client.git/web/orion/git/logic/gitCommit.js
>@@ -96,8 +96,7 @@
> 				if (error.status === 401) {
> 					display.HTML = true;
> 					display.Message = ""; //$NON-NLS-0$
>-					display.Message += i18nUtil.formatMessage(messages["Authentication required for: ${0}. ${1} and re-try the request."], resp.label, "<a target=\"_blank\" href=\"" + resp.SignInLocation //$NON-NLS-1$ //$NON-NLS-0$
>-					+ "\">" + messages["Login"] + "</a>") + ""; //$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-0$
>+					display.Message += i18nUtil.formatMessage("Authentication required for: ${0}. <a target=\"_blank\" href=\"${1}\">${2}</a> and re-try the request. ", resp.label, resp.SignInLocation, messages["Login"]); //$NON-NLS-0$
> 				} else {
> 					display.Message = resp.DetailedMessage ? resp.DetailedMessage : (resp.Message ? resp.Message : messages["Problem while performing the action"]);
> 				}
>@@ -165,4 +164,4 @@
> 			setGitCloneConfig: setGitCloneConfig
> 		};
> 	};
>-});
>\ No newline at end of file
>+});
>diff --git a/bundles/org.eclipse.orion.client.ui/web/content/content.js b/bundles/org.eclipse.orion.client.ui/web/content/content.js
>index 9e371f4..340317c 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/content/content.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/content/content.js
>@@ -61,7 +61,7 @@
> 					// expected error - HTTP 412 Precondition Failed 
> 					// occurs when file is out of sync with the server
> 					if (error.status === 412) {
>-						var forceSave = window.confirm(messages["Resource is out of sync with the server. Do you want to save it anyway?"]);
>+						var forceSave = window.confirm(messages["ResrcOutOfSync"]);
> 						if (forceSave) {
> 							// repeat save operation, but without ETag 
> 							progressService.progress(fileClient.write(targetMetadata.Location, contents), "Saving file " + targetMetadata.Location).then(
>@@ -166,7 +166,7 @@
> 				var parent = lib.node("delegatedContent"); //$NON-NLS-0$
> 				lib.empty(parent);
> 				var message = document.createElement("div"); //$NON-NLS-0$
>-				message.appendChild(document.createTextNode(messages["Plugin content could not be found"]));
>+				message.appendChild(document.createTextNode(messages["PluginContentNotFound"]));
> 				parent.appendChild(message);
> 			}
> 		}
>@@ -182,7 +182,7 @@
> 					if (data.shellService) {
> 						if (data.sourceLocation) {
> 							saveFileContents(fileClient, fileMetadata, {sourceLocation: data.sourceLocation}, function() {
>-								if (window.confirm(messages["Content has been saved. Click OK to go to the navigator, Cancel to keep editing."])) {
>+								if (window.confirm(messages["ContentSavedMsg"])) {
> 									// go to the navigator
> 									window.location.href = orionHome + "/edit/edit.html#" + fileMetadata.Parents[0].ChildrenLocation; //$NON-NLS-0$
> 								} else {
>diff --git a/bundles/org.eclipse.orion.client.ui/web/content/saveHook.js b/bundles/org.eclipse.orion.client.ui/web/content/saveHook.js
>index 9c94e85..1e6af39 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/content/saveHook.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/content/saveHook.js
>@@ -62,7 +62,7 @@
> 									if (contentURL && contentURL.length > 0) {
> 										var parent = lib.node("orion.saveRequest"); //$NON-NLS-0$
> 										var p = document.createElement("p"); //$NON-NLS-0$
>-										p.appendChild(document.createTextNode(i18nUtil.formatMessage(messages["Content plugin ${0} has saved data."], info.name))); //$NON-NLS-0$
>+										p.appendChild(document.createTextNode(i18nUtil.formatMessage(messages["ContentSavedData"], info.name))); //$NON-NLS-0$
> 										p.appendChild(document.createElement("br")); //$NON-NLS-0$
> 										var a = document.createElement("a"); //$NON-NLS-0$
> 										a.href = contentURL;
>@@ -70,7 +70,7 @@
> 										p.appendChild(a);
> 										parent.appendChild(p);
> 										p = document.createElement("p"); //$NON-NLS-0$
>-										p.appendChild(document.createTextNode(i18nUtil.formatMessage(messages["Click ${0} to store this file into Orion."], messages["Save"]))); //$NON-NLS-0$
>+										p.appendChild(document.createTextNode(i18nUtil.formatMessage(messages["StoreFileMsg"], messages["Save"]))); //$NON-NLS-0$
> 										parent.appendChild(p);
> 										var button = document.createElement("button");	 //$NON-NLS-0$
> 										button.appendChild(document.createTextNode(messages['Save']));
>diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/compare/compareCommands.js b/bundles/org.eclipse.orion.client.ui/web/orion/compare/compareCommands.js
>index 75f13a4..db62bed 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/orion/compare/compareCommands.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/orion/compare/compareCommands.js
>@@ -49,8 +49,8 @@
> 				return;
> 			}
> 			var copyToLeftCommand = new mCommands.Command({
>-				name : messages["Copy current change from right to left"],
>-				tooltip : messages["Copy current change from right to left"],
>+				name : messages["CpCurChangeRightToLeft"],
>+				tooltip : messages["CpCurChangeRightToLeft"],
> 				imageClass : "core-sprite-leftarrow", //$NON-NLS-0$
> 				id: "orion.compare.copyToLeft", //$NON-NLS-0$
> 				groupId: "orion.compareGroup", //$NON-NLS-0$
>@@ -61,8 +61,8 @@
> 					data.items.copyToLeft();
> 			}});
> 			var copyToRightCommand = new mCommands.Command({
>-				name : messages["Copy current change from left to right"],
>-				tooltip : messages["Copy current change from left to right"],
>+				name : messages["CpCurChangeLeftToRight"],
>+				tooltip : messages["CpCurChangeLeftToRight"],
> 				imageClass : "core-sprite-rightarrow", //$NON-NLS-0$
> 				id: "orion.compare.copyToRight", //$NON-NLS-0$
> 				groupId: "orion.compareGroup", //$NON-NLS-0$
>diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/compare/compareTreeExplorer.js b/bundles/org.eclipse.orion.client.ui/web/orion/compare/compareTreeExplorer.js
>index d3cdcd8..00d2bd0 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/orion/compare/compareTreeExplorer.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/orion/compare/compareTreeExplorer.js
>@@ -235,7 +235,7 @@
> 			if(this._compareResults.length > 0){
> 				this._loadOneFileMetaData(0,function(){that._renderUI(); that._addOptions();});
> 			} else {
>-				var message = i18nUtil.formatMessage(messages["${0} files compared. The two folders are identical."], this._totalFiles);
>+				var message = i18nUtil.formatMessage(messages["NoFoldersIdentical"], this._totalFiles);
> 			 var parentNode = lib.node(this.parentId);
> 			 parentNode.textContent = "";
> 			 var textBold = _createElement('b', null, null, parentNode); //$NON-NLS-1$ //$NON-NLS-0$
>diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/compare/diffProvider.js b/bundles/org.eclipse.orion.client.ui/web/orion/compare/diffProvider.js
>index 5a5d735..55ffd34 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/orion/compare/diffProvider.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/orion/compare/diffProvider.js
>@@ -70,7 +70,7 @@
> 					return _services[i];
> 				}
> 			}
>-			throw messages["No Matching DiffService for location:"] + location;
>+			throw messages["NoDiffServiceLocationMatched"] + location;
> 		};
> 	}
> 
>diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/compare/nls/root/messages.js b/bundles/org.eclipse.orion.client.ui/web/orion/compare/nls/root/messages.js
>index 9a51f7a..d00eb4b 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/orion/compare/nls/root/messages.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/orion/compare/nls/root/messages.js
>@@ -11,13 +11,13 @@
> //NLS_CHARSET=UTF-8
> /*eslint-env browser, amd*/
> define({
>-	"Copy current change from right to left": "Copy current change from right to left",
>-	"Copy current change from left to right": "Copy current change from left to right",
>+	"CpCurChangeRightToLeft": "Copy current change from right to left",
>+	"CpCurChangeLeftToRight": "Copy current change from left to right",
> 	"Switch to unified diff": "Switch to unified diff",
> 	"Unified": "Unified",
> 	"Switch to side by side diff": "Switch to side by side diff",
> 	"Side by side": "Side by side",
>-	"Generate link of the current diff": "Generate link of the current diff",
>+	"GenerateCurDiffLink": "Generate link of the current diff",
> 	"Generate Link": "Generate Link",
> 	"Next diff block": "Next diff block",
> 	"Previous diff block": "Previous diff block",
>@@ -35,8 +35,8 @@
> 	"Options": "Options",
> 	"Sort by folders": "Sort by folders",
> 	"Line 0 : Col 0": "Line 0 : Col 0",
>-	"No Matching DiffService for location:": "No Matching DiffService for location:",
>-	"${0} files compared. The two folders are identical.": "${0} files compared. The two folders are identical.",
>+	"NoDiffServiceLocationMatched": "No Matching DiffService for location:",
>+	"NoFoldersIdentical": "${0} files compared. The two folders are identical.",
> 	'generatingTreeResult': 'Generating compare result...', //$NON-NLS-0$ //$NON-NLS-1$
> 	'fetchingFolder': 'Fetching folder: ${0}...', //$NON-NLS-0$ //$NON-NLS-1$
> 	'readingFile': 'Reading file: ${0}...', //$NON-NLS-0$ //$NON-NLS-1$
>diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/compare/resourceComparer.js b/bundles/org.eclipse.orion.client.ui/web/orion/compare/resourceComparer.js
>index 8d9e7bd..585d1f1 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/orion/compare/resourceComparer.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/orion/compare/resourceComparer.js
>@@ -334,7 +334,7 @@
> 			if(cmdProvider && cmdProvider.getOptions().commandSpanId) {
> 				var commandSpanId = cmdProvider.getOptions().commandSpanId;
> 				var generateLinkCommand = new mCommands.Command({
>-					tooltip : messages["Generate link of the current diff"],
>+					tooltip : messages["GenerateCurDiffLink"],
> 					name: messages["Generate Link"],
> 					//imageClass : "core-sprite-link", //$NON-NLS-0$
> 					id: "orion.compare.generateLink", //$NON-NLS-0$
>diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/content/nls/root/messages.js b/bundles/org.eclipse.orion.client.ui/web/orion/content/nls/root/messages.js
>index bc2dbb9..d5d6ae2 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/orion/content/nls/root/messages.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/orion/content/nls/root/messages.js
>@@ -11,9 +11,9 @@
> //NLS_CHARSET=UTF-8
> /*eslint-env browser, amd*/
> define({
>-	"Plugin content could not be found": "Plugin content could not be found",
>-	"Content has been saved. Click OK to go to the navigator, Cancel to keep editing.": "Content has been saved. Click OK to go to the navigator, Cancel to keep editing.",
>-	"Content plugin ${0} has saved data.": "Content plugin ${0} has saved data.",
>+	"PluginContentNotFound": "Plugin content could not be found",
>+	"ContentSavedMsg": "Content has been saved. Click OK to go to the navigator, Cancel to keep editing.",
>+	"ContentSavedData": "Content plugin ${0} has saved data.",
> 	"Save": "Save",
>-	"Click ${0} to store this file into Orion.": "Click ${0} to store this file into Orion."
>+	"StoreFileMsg": "Click ${0} to store this file into Orion."
> });
>\ No newline at end of file
>diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/crawler/nls/root/messages.js b/bundles/org.eclipse.orion.client.ui/web/orion/crawler/nls/root/messages.js
>index 3c5dfcb..5b93707 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/orion/crawler/nls/root/messages.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/orion/crawler/nls/root/messages.js
>@@ -9,13 +9,9 @@
> ******************************************************************************/
> 
> //NLS_CHARSET=UTF-8
>-
>+/*eslint-env browser, amd*/
> define({
>-	"Searching file:": "Searching file:",
>-	"is not supported in this file system": "is not supported in this file system",
>-	"${0} files found out of ${1}": "${0} files found out of ${1}",
>-	"The search term on this location will not use indexed files." : "The search term on this location will not use indexed files.",
>-	"It will take longer time. Do you want to proceed?" : "It will take longer time. Do you want to proceed?",
>-	"Search cancelled by user": "Search cancelled by user",
>+	"filesFound": "${0} files found out of ${1}",
>+	"searchCancelled": "Search cancelled by user",
> 	"Cancel": "Cancel"
> });
>\ No newline at end of file
>diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/crawler/searchCrawler.js b/bundles/org.eclipse.orion.client.ui/web/orion/crawler/searchCrawler.js
>index bff5d85..aff1124 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/orion/crawler/searchCrawler.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/orion/crawler/searchCrawler.js
>@@ -166,7 +166,7 @@
> 	SearchCrawler.prototype._HandleStatus = function(error){
> 		if(this._statusService && error.name === "Cancel") { //$NON-NLS-0$
> 			console.log("Crawling search cancelled. Deferred array length : " + this._deferredArray.length); //$NON-NLS-0$
>-			this._statusService.setProgressResult({Message: messages["Search cancelled by user"], Severity: "Warning"}); //$NON-NLS-0$
>+			this._statusService.setProgressResult({Message: messages["searchCancelled"], Severity: "Warning"}); //$NON-NLS-0$
> 		}
> 	};
> 		
>@@ -274,7 +274,7 @@
> 		if(this.searchHelper.params.keyword === ""){
> 			this._reportSingleHit(fileObj);
> 			if(this._statusService) {
>-				this._statusService.setProgressResult({Message: i18nUtil.formatMessage(messages["${0} files found out of ${1}"], this._hitCounter, this._totalCounter)});
>+				this._statusService.setProgressResult({Message: i18nUtil.formatMessage(messages["filesFound"], this._hitCounter, this._totalCounter)});
> 			}
> 		} else {
> 			return (self._progressService ? self._progressService.progress(self.fileClient.read(fileObj.Location), "Reading file " + fileObj.Location) : self.fileClient.read(fileObj.Location)).then(function(jsonData) { //$NON-NLS-0$
>@@ -282,7 +282,7 @@
> 						self._reportSingleHit(fileObj);
> 					}
> 					if(self._statusService) {
>-						self._statusService.setProgressResult({Message: i18nUtil.formatMessage(messages["${0} files found out of ${1}"], self._hitCounter, self._totalCounter)}, messages["Cancel"]);
>+						self._statusService.setProgressResult({Message: i18nUtil.formatMessage(messages["filesFound"], self._hitCounter, self._totalCounter)}, messages["Cancel"]);
> 					}
> 				},
> 				function(error) {
>diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/edit/typedefs.js b/bundles/org.eclipse.orion.client.ui/web/orion/edit/typedefs.js
>index 910c22e..139b4a1 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/orion/edit/typedefs.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/orion/edit/typedefs.js
>@@ -11,11 +11,12 @@
> /*eslint-env browser, amd*/
> define([
> 	"orion/objects",
>-	"orion/serviceTracker"
>-], function(objects, ServiceTracker) {
>+	"orion/serviceTracker",
>+	"orion/i18nUtil"
>+], function(objects, ServiceTracker, i18nUtil) {
> 
> 	function err(msg, serviceRef) {
>-		throw new Error(msg + " [service id: " + serviceRef.getProperty("service.id") + "]"); //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-0$ 
>+		throw new Error(i18nUtil.formatMessage("${0} [service id: ${1}]", msg, serviceRef.getProperty("service.id"))); //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-0$ 
> 	}
> 
> 	/**
>diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/explorers/explorer-table.js b/bundles/org.eclipse.orion.client.ui/web/orion/explorers/explorer-table.js
>index 595e14d..33c3e72 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/orion/explorers/explorer-table.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/orion/explorers/explorer-table.js
>@@ -574,7 +574,7 @@
> 					if (entry.isFile) {
> 						// can't drop files directly into workspace.
> 						if (targetIsRoot){ //$NON-NLS-0$
>-							internalErrorHandler(messages["You cannot copy files directly into the workspace. Create a folder first."]); //$NON-NLS-0$
>+							internalErrorHandler(messages["Create folder first err"]); //$NON-NLS-0$
> 						} else {
> 							entry.file(function(file) {
> 								if (deferredWrapper) {
>@@ -583,7 +583,7 @@
> 									var unzip = file.name.indexOf(".zip") === file.name.length-4 && window.confirm(i18nUtil.formatMessage(messages["Unzip ${0}?"], file.name)); //$NON-NLS-1$ //$NON-NLS-0$
> 									var handlers = {
> 										error: function(event) {
>-											var errorMessage = messages["Uploading the following file failed: "] + file.name;
>+											var errorMessage = messages["Uploading file err"] + file.name;
> 											if (statusService) {
> 												statusService.setProgressResult({Severity: "Error", Message: errorMessage}); //$NON-NLS-0$ 
> 											} else {
>@@ -682,9 +682,9 @@
> 							// The File API in HTML5 doesn't specify a way to check explicitly (when this code was written).
> 							// see http://www.w3.org/TR/FileAPI/#file
> 							if (!file.size && !file.type) {
>-								errorHandler(i18nUtil.formatMessage(messages["Did not drop ${0}. Folder drop is not supported in this browser."], file.name)); //$NON-NLS-0$
>+								errorHandler(i18nUtil.formatMessage(messages["Folder drop not supported"], file.name)); //$NON-NLS-0$
> 							} else if (mFileUtils.isAtRoot(item.Location)){ //$NON-NLS-0$
>-								errorHandler(messages["You cannot copy files directly into the workspace. Create a folder first."]); //$NON-NLS-0$ 
>+								errorHandler(messages["Create folder first err"]); //$NON-NLS-0$ 
> 							} else {
> 								explorer._uploadFile(item, file, true);
> 							}
>@@ -741,7 +741,7 @@
> 							this.changedItem(targetItem);
> 						}.bind(this),
> 						error: function(event) {
>-							var errorMessage = messages["Uploading the following file failed: "] + file.name; //$NON-NLS-0$
>+							var errorMessage = messages["Uploading file err"] + file.name; //$NON-NLS-0$
> 							if (statusService) {
> 								statusService.setProgressResult({Severity: "Error", Message: errorMessage});	//$NON-NLS-0$ 
> 							} else {
>diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/fileCommands.js b/bundles/org.eclipse.orion.client.ui/web/orion/fileCommands.js
>index 0f410e1..7a4950c 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/orion/fileCommands.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/orion/fileCommands.js
>@@ -426,7 +426,7 @@
> 								var func = isCopy ? fileClient.copyFile : fileClient.moveFile;
> 								var message = i18nUtil.formatMessage(isCopy ? messages["Copying ${0}"] : messages["Moving ${0}"], item.Location);
> 								if (isCopy && item.parent && item.parent.Location === location) {
>-									newName = window.prompt(i18nUtil.formatMessage(messages["Enter a new name for '${0}'"], item.Name), i18nUtil.formatMessage(messages["Copy of ${0}"], item.Name));
>+									newName = window.prompt(i18nUtil.formatMessage(messages["Enter name"], item.Name), i18nUtil.formatMessage(messages["Copy of ${0}"], item.Name));
> 									// user cancelled? don't copy this one
> 									if (!newName) {
> 										location = null;
>@@ -513,7 +513,7 @@
> 			if (proposedPaths.length > 0) {
> 				choices.push({}); //separator
> 			}
>-			choices.push({name: messages["Choose folder..."], callback: prompt});
>+			choices.push({name: messages["Choose folder"], callback: prompt});
> 			return choices;
> 		}
> 
>@@ -659,7 +659,7 @@
> 
> 		var renameCommand = new mCommands.Command({
> 				name: messages["Rename"],
>-				tooltip: messages["Rename the selected files or folders"],
>+				tooltip: messages["Rename files or folders"],
> 				imageClass: "core-sprite-rename", //$NON-NLS-0$
> 				id: "eclipse.renameResource", //$NON-NLS-0$
> 				visibleWhen: function(item) {
>@@ -698,8 +698,8 @@
> 		
> 		var contentTypeService = new mContentTypes.ContentTypeRegistry(serviceRegistry);
> 		var compareWithEachOtherCommand = new mCommands.Command({
>-				name: messages["Compare with each other"],
>-				tooltip: messages["Compare the selected 2 files with each other"],
>+				name: messages["Compare each"],
>+				tooltip: messages["Compare 2 files"],
> 				id: "eclipse.compareWithEachOther", //$NON-NLS-0$
> 				visibleWhen: function(item) {
> 					if (!explorer || !explorer.isCommandsVisible()) {
>@@ -730,7 +730,7 @@
> 		
> 		var compareWithCommand = new mCommands.Command({
> 			name : messages["Compare with..."],
>-			tooltip: messages["Compare the selected folder with a specified folder"], 
>+			tooltip: messages["Compare folders"], 
> 			id: "eclipse.compareWith", //$NON-NLS-0$
> 			visibleWhen: function(item) {
> 				if (!explorer || !explorer.isCommandsVisible()) {
>@@ -792,7 +792,7 @@
> 			visibleWhen: oneOrMoreFilesOrFolders,
> 			callback: function(data) {
> 				var items = Array.isArray(data.items) ? data.items : [data.items];
>-				var confirmMessage = items.length === 1 ? i18nUtil.formatMessage(messages["Are you sure you want to delete '${0}'?"], items[0].Name) : i18nUtil.formatMessage(messages["Are you sure you want to delete these ${0} items?"], items.length);
>+				var confirmMessage = items.length === 1 ? i18nUtil.formatMessage(messages["delete target msg"], items[0].Name) : i18nUtil.formatMessage(messages["delete item msg"], items.length);
> 				serviceRegistry.getService("orion.page.dialog").confirm(confirmMessage, //$NON-NLS-0$
> 					function(doit) {
> 						if (!doit) {
>@@ -848,8 +848,8 @@
> 		commandService.addCommand(deleteCommand);
> 	
> 		var downloadCommand = new mCommands.Command({
>-			name: messages["Export as zip"],
>-			tooltip: messages["Create a zip file of the folder contents and download it"],
>+			name: messages["Zip"],
>+			tooltip: messages["Zip Download"],
> 			imageClass: "core-sprite-exportzip", //$NON-NLS-0$
> 			id: "eclipse.downloadFile", //$NON-NLS-0$
> 			visibleWhen: function(item) {
>@@ -970,7 +970,7 @@
> 
> 		var importZipURLCommand = new mCommands.Command({
> 			name: messages["Import from HTTP..."],
>-			tooltip: messages["Import a file from a URL and optionally unzip it"],
>+			tooltip: messages["import frm url"],
> 			id: "orion.importZipURL", //$NON-NLS-0$
> 			parameters: zipURLParameters,
> 			callback: function(data) {
>@@ -996,7 +996,7 @@
> 			name: messages["New Folder"],
> 			imageClass: "core-sprite-new_folder", //$NON-NLS-0$
> 			tooltip: messages["Create an empty folder"],
>-			description: messages["Create an empty folder on the Orion server. You can import, upload, or create content in the editor."],
>+			description: messages["Create empty folder msg"],
> 			id: "orion.new.project", //$NON-NLS-0$
> 			callback: function(data) {
> 				var item;
>@@ -1018,8 +1018,8 @@
> 		
> 		var linkProjectCommand = new mCommands.Command({
> 			name: messages["Link to Server"],
>-			tooltip: messages["Link to existing content on the server"],
>-			description: messages["Create a folder that links to an existing folder on the server."],
>+			tooltip: messages["Link content msg"],
>+			description: messages["Create linked folder"],
> 			imageClass: "core-sprite-link", //$NON-NLS-0$
> 			id: "orion.new.linkProject", //$NON-NLS-0$
> 			parameters: new mCommandRegistry.ParametersDescription([new mCommandRegistry.CommandParameter('name', 'text', messages['Name:'], messages['New Folder']), new mCommandRegistry.CommandParameter('url', 'url', messages['Server path:'], '')]), //$NON-NLS-5$ //$NON-NLS-4$ //$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-0$
>@@ -1035,7 +1035,7 @@
> 				if (data.parameters && data.parameters.valueFor('name') && data.parameters.valueFor('url')) { //$NON-NLS-1$ //$NON-NLS-0$
> 					createFunction(data.parameters.valueFor('name'), data.parameters.valueFor('url')); //$NON-NLS-1$ //$NON-NLS-0$
> 				} else {
>-					errorHandler(messages["The name and server location were not specified."]);
>+					errorHandler(messages["name location not clear"]);
> 				}
> 			},
> 			visibleWhen: canCreateProject
>@@ -1044,7 +1044,7 @@
> 		
> 		var goUpCommand = new mCommands.Command({
> 			name: messages["Go Up"],
>-			tooltip: messages["Move up to the parent folder"],
>+			tooltip: messages["cd parent"],
> 			imageClass: "core-sprite-go-up", //$NON-NLS-0$
> //			addImageClassToElement: true,
> 			id: "eclipse.upFolder", //$NON-NLS-0$
>@@ -1065,7 +1065,7 @@
> 
> 		var goIntoCommand = new mCommands.Command({
> 			name: messages["Go Into"],
>-			tooltip: messages["Move into the selected folder"],
>+			tooltip: messages["cd selected"],
> 			imageClass: "core-sprite-go-down", //$NON-NLS-0$
> 			id: "eclipse.downFolder", //$NON-NLS-0$
> 			callback: function(data) {
>@@ -1088,7 +1088,7 @@
> 					
> 		var importCommand = new mCommands.Command({
> 			name : messages["File or zip archive"],
>-			tooltip: messages["Import a file or zip archive from your local file system"],
>+			tooltip: messages["import local file"],
> 			imageClass: "core-sprite-importzip", //$NON-NLS-0$
> 			id: "orion.import", //$NON-NLS-0$
> 			callback : function(data) {
>@@ -1119,7 +1119,7 @@
> 	
> 		var importSFTPCommand = new mCommands.Command({
> 			name : messages["SFTP from..."],
>-			tooltip: messages["Copy files and folders from a specified SFTP connection"],
>+			tooltip: messages["cpy from SFTP"],
> 			imageClass: "core-sprite-transferin", //$NON-NLS-0$
> 			id: "orion.importSFTP", //$NON-NLS-0$
> 			callback : function(data) {
>@@ -1146,7 +1146,7 @@
> 	
> 		var exportSFTPCommand = new mCommands.Command({
> 			name : messages["SFTP to..."],
>-			tooltip: messages["Copy files and folders to a specified SFTP location"],
>+			tooltip: messages["cpy to SFTP"],
> 			imageClass: "core-sprite-transferout", //$NON-NLS-0$
> 			id: "eclipse.exportSFTPCommand", //$NON-NLS-0$
> 			callback : function(data) {
>@@ -1192,7 +1192,7 @@
> 		
> 		var moveCommand = new mCommands.Command({
> 			name : messages["Move to"],
>-			tooltip: messages["Move files and folders to a new location"],
>+			tooltip: messages["mv to new dir"],
> 			id: "eclipse.moveFile", //$NON-NLS-0$
> 			choiceCallback: function(items, userData) {
> 				return makeMoveCopyTargetChoices(items, userData, false);
>diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/globalCommands.js b/bundles/org.eclipse.orion.client.ui/web/orion/globalCommands.js
>index 699aad2..80ff7ab 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/orion/globalCommands.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/orion/globalCommands.js
>@@ -12,17 +12,16 @@
> /*eslint-env browser, amd*/
> define([
> 		'i18n!orion/nls/messages', 'require', 'orion/commonHTMLFragments', 'orion/keyBinding', 'orion/EventTarget', 'orion/commands',
>-		'orion/parameterCollectors', 'orion/extensionCommands', 'orion/breadcrumbs', 'orion/webui/littlelib',
>+		'orion/parameterCollectors', 'orion/extensionCommands', 'orion/breadcrumbs', 'orion/webui/littlelib', 'orion/i18nUtil',
> 		'orion/webui/splitter', 'orion/webui/dropdown', 'orion/webui/tooltip', 'orion/contentTypes', 'orion/keyAssist',
> 		'orion/widgets/themes/ThemePreferences', 'orion/widgets/themes/container/ThemeData', 'orion/Deferred',
> 		'orion/widgets/UserMenu', 'orion/PageLinks', 'orion/webui/dialogs/OpenResourceDialog', 'text!orion/banner/banner.html',
> 		'text!orion/banner/footer.html', 'text!orion/banner/toolbar.html',
>-		'orion/util', 'orion/customGlobalCommands', 'orion/fileClient', 'orion/webui/SideMenu', 'orion/objects', 'orion/i18nUtil',
>+		'orion/util', 'orion/customGlobalCommands', 'orion/fileClient', 'orion/webui/SideMenu', 'orion/objects'
> 	],
> 	function (messages, require, commonHTML, KeyBinding, EventTarget, mCommands, mParameterCollectors, mExtensionCommands, 
>-		mBreadcrumbs, lib, mSplitter, mDropdown, mTooltip, mContentTypes, mKeyAssist, mThemePreferences, mThemeData, Deferred,
>-		mUserMenu, PageLinks, openResource, BannerTemplate, FooterTemplate, ToolbarTemplate, util, mCustomGlobalCommands, mFileClient,
>-		SideMenu, objects, i18nUtil) {
>+		mBreadcrumbs, lib, i18nUtil, mSplitter, mDropdown, mTooltip, mContentTypes, mKeyAssist, mThemePreferences, mThemeData, Deferred,
>+		mUserMenu, PageLinks, openResource, BannerTemplate, FooterTemplate, ToolbarTemplate, util, mCustomGlobalCommands, mFileClient, SideMenu, objects) {
> 	/**
> 	 * This class contains static utility methods. It is not intended to be instantiated.
> 	 *
>@@ -110,7 +109,7 @@
> 
> 	function startProgressService(serviceRegistry) {
> 		var progressPane = lib.node("progressPane"); //$NON-NLS-0$
>-		progressPane.setAttribute("aria-label", messages['Operations - Press spacebar to show current operations']); //$NON-NLS-1$ //$NON-NLS-0$
>+		progressPane.setAttribute("aria-label", messages['OpPressSpaceMsg']); //$NON-NLS-1$ //$NON-NLS-0$
> 		var progressService = serviceRegistry.getService("orion.page.progress"); //$NON-NLS-0$
> 		if (progressService) {
> 			progressService.init.bind(progressService)("progressPane"); //$NON-NLS-0$
>@@ -562,7 +561,7 @@
> 		var parent = lib.node(parentId);
> 
> 		if (!parent) {
>-			throw messages["could not find banner parent, id was "] + parentId;
>+			throw i18nUtil.formatMessage("could not find banner parent, id was ${0}", parentId);
> 		}
> 		// place the HTML fragment for the header.
> 		var range = document.createRange();
>@@ -693,8 +692,8 @@
> 		};
> 
> 		var openResourceCommand = new mCommands.Command({
>-			name: messages["Find File Named..."],
>-			tooltip: messages["Choose a file by name and open an editor on it"],
>+			name: messages["FindFile"],
>+			tooltip: messages["ChooseFileOpenEditor"],
> 			id: "orion.openResource", //$NON-NLS-0$
> 			callback: function (data) {
> 				openResourceDialog(searcher, serviceRegistry);
>@@ -742,7 +741,7 @@
> 			// Toggle trim command
> 			var toggleBanner = new mCommands.Command({
> 				name: messages["Toggle banner and footer"],
>-				tooltip: messages["Hide or show the page banner and footer"],
>+				tooltip: messages["HideShowBannerFooter"],
> 				id: "orion.toggleTrim", //$NON-NLS-0$
> 				callback: toggleBannerFunc
> 			});
>@@ -781,7 +780,7 @@
> 			});
> 			var keyAssistCommand = new mCommands.Command({
> 				name: messages["Show Keys"],
>-				tooltip: messages["Show a list of all the keybindings on this page"],
>+				tooltip: messages["ShowAllKeyBindings"],
> 				id: "orion.keyAssist", //$NON-NLS-0$
> 				callback: function () {
> 					if (keyAssist.isVisible()) {
>diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/inlineSearchResultExplorer.js b/bundles/org.eclipse.orion.client.ui/web/orion/inlineSearchResultExplorer.js
>index ea285b6..b06ea42 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/orion/inlineSearchResultExplorer.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/orion/inlineSearchResultExplorer.js
>@@ -592,7 +592,7 @@
> statusMessage = item.message;
> break;
> case "pass": //$NON-NLS-0$
>- statusMessage = item.model.totalMatches ? i18nUtil.formatMessage(messages["${0} out of ${1} matches replaced."], item.matchesReplaced, item.model.totalMatches) : item.message; //$NON-NLS-0$
>+ statusMessage = item.model.totalMatches ? i18nUtil.formatMessage(messages["matchesReplacedMsg"], item.matchesReplaced, item.model.totalMatches) : item.message; //$NON-NLS-0$
> break;
> }
> td.appendChild(document.createTextNode(statusMessage));
>@@ -1235,7 +1235,7 @@
> 		if (pagingParams.numberOnPage === 0) {
> 			var message = messages["No matches"];
> 			if(this.model._provideSearchHelper){
>-				message = i18nUtil.formatMessage(messages["No matches found for ${0}"], this.model._provideSearchHelper().displayedSearchTerm);
>+				message = i18nUtil.formatMessage(messages["NoMatchFound"], this.model._provideSearchHelper().displayedSearchTerm);
> 			}
> 		 this.parentNode.textContent = "";
> 		 var textBold = _createElement('b', null, null, this.parentNode); //$NON-NLS-1$ //$NON-NLS-0$
>diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/navigate/nls/root/messages.js b/bundles/org.eclipse.orion.client.ui/web/orion/navigate/nls/root/messages.js
>index 2edffe5..c448b8c 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/orion/navigate/nls/root/messages.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/orion/navigate/nls/root/messages.js
>@@ -11,28 +11,25 @@
> //NLS_CHARSET=UTF-8
> /*eslint-env browser, amd*/
> define({
>-	"Click one of the tasks below to create an Orion folder. You can upload, import, or generate files.": "Click one of the tasks below to create an Orion folder. You can upload, import, or generate files.",
>-	"Toggle Left Pane": "Toggle Left Pane",
>-	"Open or close the left pane": "Open or close the left pane",
> 	"Navigator": "Navigator",
> 	"Strings Xtrnalizr": "Strings Xtrnalizr",
>-	"Externalize Strings from JavaScript files in this folder": "Externalize strings from JavaScript files in this folder.",
>+	"Externalize strings": "Externalize strings from JavaScript files in this folder.",
> 	"Choose a Folder": "Choose a Folder",
> 	"Copy of ${0}": "Copy of ${0}",
>-	"Enter a new name for '${0}'": "Enter a new name for '${0}'",
>-	"Choose folder...": "Choose folder...",
>+	"Enter name": "Enter a new name for '${0}'",
>+	"Choose folder": "Choose folder...",
> 	"Rename": "Rename",
>-	"Rename the selected files or folders": "Rename the selected files or folders",
>-	"Compare with each other": "Compare with each other",
>-	"Compare the selected 2 files with each other": "Compare the selected 2 files with each other",
>+	"Rename files or folders": "Rename the selected files or folders",
>+	"Compare each": "Compare with each other",
>+	"Compare 2 files": "Compare the selected 2 files with each other",
> 	"Compare with...": "Compare with...",
>-	"Compare the selected folder with a specified folder": "Compare the selected folder with a specified folder",
>+	"Compare folders": "Compare the selected folder with a specified folder",
> 	"Delete": "Delete",
> 	"Unknown item": "Unknown item",
>-	"Are you sure you want to delete these ${0} items?": "Are you sure you want to delete these ${0} items?",
>-	"Are you sure you want to delete '${0}'?": "Are you sure you want to delete '${0}'?",
>-	"Export as zip": "Zip",
>-	"Create a zip file of the folder contents and download it": "Create a zip file of the folder contents and download it",
>+	"delete item msg": "Are you sure you want to delete these ${0} items?",
>+	"delete target msg": "Are you sure you want to delete '${0}'?",
>+	"Zip": "Zip",
>+	"Zip Download": "Create a zip file of the folder contents and download it",
> 	"New File": "File",
> 	"Create a new file": "Create a new file",
> 	"Name:": "Name:",
>@@ -42,39 +39,35 @@
> 	"Creating folder": "Creating folder",
> 	"Folder": "Folder",
> 	"Create an empty folder": "Create an empty folder",
>-	"Create an empty folder on the Orion server. You can import, upload, or create content in the editor.": "Create an empty folder on the Orion server. You can import, upload, or create content in the editor.",
>+	"Create empty folder msg": "Create an empty folder on the Orion server. You can import, upload, or create content in the editor.",
> 	"Sample HTML5 Site": "Sample HTML5 Site",
> 	"Generate a sample": "Generate a sample",
> 	"Generate an HTML5 \"Hello World\" website, including JavaScript, HTML, and CSS files.": "Generate an HTML5 \"Hello World\" website, including JavaScript, HTML, and CSS files.",
> 	"Creating a folder for ${0}": "Creating a folder for ${0}",
> 	"SFTP Import": "SFTP Import",
> 	"Import content from SFTP": "Import content from SFTP",
>-	"Import content from an SFTP location into an Orion folder. You will be prompted for the SFTP location and credentials.": "Import content from an SFTP location into an Orion folder. You will be prompted for the SFTP location and credentials.",
> 	"Imported Content": "Imported Content",
> 	"Upload a Zip": "Upload a Zip",
> 	"Upload content from a local zip file": "Upload content from a local zip file",
>-	"Upload content from a local zip file into an Orion folder. You will be prompted for the local zip file.": "Upload content from a local zip file into an Orion folder. You will be prompted for the local zip file.",
> 	"Uploaded Content": "Uploaded Content",
>-	"Creating an upload folder for ": "Creating an upload folder for ",
> 	"Clone Git Repository": "Clone Git Repository",
> 	"Clone a git repository": "Clone a git repository",
>-	"Go to the Orion repositories page to provide a git repository URL. Once the repository is created, it will appear in the Navigator.": "Go to the Orion repositories page to provide a git repository URL. Once the repository is created, it will appear in the Navigator.",
> 	"Link to Server": "Link to Server",
>-	"Link to existing content on the server": "Link to existing content on the server",
>-	"Create a folder that links to an existing folder on the server.": "Create a folder that links to an existing folder on the server.",
>+	"Link content msg": "Link to existing content on the server",
>+	"Create linked folder": "Create a folder that links to an existing folder on the server.",
> 	"Server path:": "Server path:",
>-	"The name and server location were not specified.": "The name and server location were not specified.",
>+	"name location not clear": "The name and server location were not specified.",
> 	"Go Up": "Go Up",
>-	"Move up to the parent folder": "Move up to the parent folder",
>+	"cd parent": "Move up to the parent folder",
> 	"Go Into": "Go Into",
>-	"Move into the selected folder": "Move into the selected folder",
>+	"cd selected": "Move into the selected folder",
> 	"File or zip archive": "File or zip archive",
>-	"Import a file or zip archive from your local file system": "Import a file or zip archive from your local file system",
>+	"import local file": "Import a file or zip archive from your local file system",
> 	"SFTP from...": "SFTP",
>-	"Copy files and folders from a specified SFTP connection": "Copy files and folders from a specified SFTP connection",
>+	"cpy from SFTP": "Copy files and folders from a specified SFTP connection",
> 	"Importing from ${0}": "Importing from ${0}",
> 	"SFTP to...": "SFTP",
>-	"Copy files and folders to a specified SFTP location": "Copy files and folders to a specified SFTP location",
>+	"cpy to SFTP": "Copy files and folders to a specified SFTP location",
> 	"Exporting": "Exporting to ${0}",
> 	"Pasting ${0}": "Pasting ${0}",
> 	"Copy to": "Copy to",
>@@ -85,32 +78,30 @@
> 	"Deleting ${0}": "Deleting ${0}",
> 	"Creating ${0}": "Creating ${0}",
> 	"Linking to ${0}": "Linking to ${0}",
>-	"Move files and folders to a new location": "Move files and folders to a new location",
>+	"mv to new dir": "Move files and folders to a new location",
> 	"Cut": "Cut",
> 	"Copy": "Copy",
> 	"Fetching children of ": "Fetching children of ",
> 	"Paste": "Paste",
>-	"Cannot paste into the Workspace root": "Cannot paste into the Workspace root",
> 	"Open With": "Open With",
> 	"Loading ": "Loading ",
> 	"New": "New",
> 	"File": "File",
> 	"Actions": "Actions",
> 	"Orion Content": "Orion Content",
>-	" is not supported in this file system": " is not supported in this file system",
> 	"Create new content": "Create new content",
> 	"Import from HTTP...": "HTTP",
> 	"File URL:": "File URL:",
>-	"Import a file from a URL and optionally unzip it": "Import a file from a URL and optionally unzip it",
>+	"import frm url": "Import a file from a URL and optionally unzip it",
> 	"Unzip *.zip files:": "Unzip *.zip files:",
> 	"Extracted from:": "Extracted from:",
>-	"Did not drop ${0}. Folder drop is not supported in this browser.": "Did not drop ${0}. Folder drop is not supported in this browser.",
>-	"You cannot copy files directly into the workspace. Create a folder first.": "You cannot copy files directly into the workspace. Create a folder first.",
>+	"Folder drop not supported": "Did not drop ${0}. Folder drop is not supported in this browser.",
>+	"Create folder first err": "You cannot copy files directly into the workspace. Create a folder first.",
> 	"Unzip ${0}?": "Unzip ${0}?",
> 	"Upload progress: ": "Upload progress: ",
> 	"Uploading ": "Uploading ",
> 	"Cancel upload": "Cancel upload",
>-	"Uploading the following file failed: ": "Uploading the following file failed: ",
>+	"Uploading file err": "Uploading the following file failed: ",
> 	"Enter project name:": "Enter project name:",
> 	"Creating project ": "Creating project ",
> 	"NoFile": "Use the ${0} menu to create new files and folders. Click a file to start coding.",
>diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/nls/root/messages.js b/bundles/org.eclipse.orion.client.ui/web/orion/nls/root/messages.js
>index d3d882c..750f706 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/orion/nls/root/messages.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/orion/nls/root/messages.js
>@@ -30,20 +30,19 @@
> 	"Orion JSON Editor": "Orion JSON Editor",
> 	"View on Site": "View on Site",
> 	"View this file or folder on a web site hosted by Orion": "View this file or folder on a web site hosted by Orion.",
>-	"Show a list of all the keybindings on this page": "Show a list of all the keybindings on this page",
>+	"ShowAllKeyBindings": "Show a list of all the keybindings on this page",
> 	"Show Keys": "Show Keys",
>-	"Hide or show the page banner and footer": "Hide or show the page banner and footer",
>+	"HideShowBannerFooter": "Hide or show the page banner and footer",
> 	"Toggle banner and footer": "Toggle banner and footer",
>-	"Choose a file by name and open an editor on it": "Choose a file by name and open an editor on it",
>-	"Find File Named...": "Find File Named...",
>+	"ChooseFileOpenEditor": "Choose a file by name and open an editor on it",
>+	"FindFile": "Find File Named...",
> 	"System Configuration Details": "System Configuration Details",
> 	"System Config Tooltip": "Go to the System Configuration Details page",
> 	"Background Operations": "Background Operations",
> 	"Background Operations Tooltip": "Go to the Background Operations page",
> 	"Operation status is unknown": "Operation status is unknown",
> 	"Unknown item": "Unknown item",
>-	"Can't search: no search service is available": "Can't search: no search service is available",
>-	"could not find banner parent, id was ": "could not find banner parent, id was ",
>+	"NoSearchAvailableErr": "Can't search: no search service is available",
> 	"Related": "Related",
> 	"Options": "Options",
> 	"FAQ": "FAQ",
>@@ -59,11 +58,11 @@
> 	"no tree model": "no tree model",
> 	"no renderer": "no renderer",
> 	"could not find table row ": "could not find table row ",
>-	"Resource is out of sync with the server. Do you want to save it anyway?": "Resource is out of sync with the server. Do you want to save it anyway?",
>+	"ResrcOutOfSync": "Resource is out of sync with the server. Do you want to save it anyway?",
> 	"Operations": "Operations",
> 	"Operations running": "Operations running",
>-	"Some operations finished with warning": "Some operations finished with warning",
>-	"Some operations finished with error": "Some operations finished with error",
>+	"SomeOpWarning": "Some operations finished with warning",
>+	"SomeOpErr": "Some operations finished with error",
> 	"no service registry": "no service registry",
> 	"Tasks": "Tasks",
> 	"Close": "Close",
>@@ -79,8 +78,7 @@
> 	"Global search" : "Global search",
> 	"Orion Home" : "Orion Home",
> 	"Close notification" : "Close notification",
>-	"Operations - Press spacebar to show current operations" : "Operations - Press spacebar to show current operations",
>-	"Type a keyword or wild card to search in root" : "Type a keyword or wild card to search in root",
>+	"OpPressSpaceMsg" : "Operations - Press spacebar to show current operations",
> 	"Toggle side panel" : "Toggle side panel",
> 	"Open or close the side panel": "Open or close the side panel",
> 	"Projects" : "Projects",
>@@ -96,7 +94,6 @@
> 	"Filter": "Filter (* = any string, ? = any character)",
> 	"TemplateExplorerLabel": "Templates",
> 	"OpenTemplateExplorer": "Open Template Explorer",
>-	"To view the browser's context menu, trigger the context menu again.": "To view the browser's context menu, trigger the context menu again.",
> 	"Edit": "Edit",
> 	"CentralNavTooltip": "Toggle Navigation Menu",
> 	"Wrote: ${0}": "Wrote: ${0}",
>diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/operations/nls/root/messages.js b/bundles/org.eclipse.orion.client.ui/web/orion/operations/nls/root/messages.js
>index 2c68dfb..72c3a40 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/orion/operations/nls/root/messages.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/orion/operations/nls/root/messages.js
>@@ -12,19 +12,18 @@
> /*eslint-env browser, amd*/
> define({
> 	"More": "More",
>-	"No Matching OperationService for location:": "No Matching OperationService for location:",
>-	"No operations services registered.": "No operations services registered.",
>+	"NoMatchingOpSrvLocation": "No Matching OperationService for location:",
> 	"could not find toolbar ": "could not find toolbar ",
> 	"Remove Completed": "Remove Completed",
>-	"Remove all completed operations": "Remove all completed operations",
>+	"rmCompleted": "Remove all completed operations",
> 	"Remove": "Remove",
>-	"Remove operations from the operations list.": "Remove operations from the operations list.",
>+	"rmFromOpList": "Remove operations from the operations list.",
> 	"Cancel": "Cancel",
>-	"Cancel operations from the operations list.": "Cancel operations from the operations list.",
>-	"Operation resulted in a warning.": "Operation resulted in a warning.",
>-	"Operation resulted in an error.": "Operation resulted in an error.",
>-	"Operation is running.": "Operation is running.",
>-	"Operation is canceled.": "Operation is canceled.",
>+	"CancelOp": "Cancel operations from the operations list.",
>+	"OpWarning": "Operation resulted in a warning.",
>+	"OpErr": "Operation resulted in an error.",
>+	"OpRunning": "Operation is running.",
>+	"OpCancelled": "Operation is canceled.",
> 	"Operation failed.": "Operation failed.",
> 	"Name": "Name",
> 	"Actions": "Actions",
>diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/operationsCommands.js b/bundles/org.eclipse.orion.client.ui/web/orion/operationsCommands.js
>index e56c1ff..c9fdddd 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/orion/operationsCommands.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/orion/operationsCommands.js
>@@ -68,7 +68,7 @@
> 		
> 			var removeCompletedOperationsCommand = new mCommands.Command({
> 				name : messages["Remove Completed"],
>-				tooltip : messages["Remove all completed operations"],
>+				tooltip : messages["rmCompleted"],
> 				id : "eclipse.removeCompletedOperations", //$NON-NLS-0$
> 				callback : function(data) {
> 					operationsClient.removeCompletedOperations().then(function(item){
>@@ -83,7 +83,7 @@
> 			
> 			var removeOperationCommand = new mCommands.Command({
> 				name : messages["Remove"],
>-				tooltip : messages["Remove operations from the operations list."],
>+				tooltip : messages["rmFromOpList"],
> 				imageClass: "core-sprite-delete", //$NON-NLS-0$
> 				id : "eclipse.removeOperation", //$NON-NLS-0$
> 				callback : function(data) {
>@@ -108,7 +108,7 @@
> 			
> 			var cancelOperationCommand = new mCommands.Command({
> 				name : messages["Cancel"],
>-				tooltip : messages["Cancel operations from the operations list."],
>+				tooltip : messages["CancelOp"],
> 				imageClass: "core-sprite-stop", //$NON-NLS-0$
> 				id : "eclipse.cancelOperation", //$NON-NLS-0$
> 				callback : function(data) {
>diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/progress.js b/bundles/org.eclipse.orion.client.ui/web/orion/progress.js
>index 652eedf..79062af 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/orion/progress.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/orion/progress.js
>@@ -83,15 +83,15 @@
> 					this._switchIconTo("running"); //$NON-NLS-0$
> 					break;
> 				case "warning": //$NON-NLS-0$
>-					this._progressPane.title = messages["Some operations finished with warning"];
>-					this._progressPane.alt = messages['Some operations finished with warning'];
>-					this._progressPane.setAttribute("aria-valuetext", messages['Some operations finished with warning']); //$NON-NLS-0$
>+					this._progressPane.title = messages["SomeOpWarning"];
>+					this._progressPane.alt = messages['SomeOpWarning'];
>+					this._progressPane.setAttribute("aria-valuetext", messages['SomeOpWarning']); //$NON-NLS-0$
> 					this._switchIconTo("warning"); //$NON-NLS-0$
> 					break;
> 				case "error": //$NON-NLS-0$
>-					this._progressPane.title = messages["Some operations finished with error"];
>-					this._progressPane.alt = messages['Some operations finished with error'];
>-					this._progressPane.setAttribute("aria-valuetext", messages['Some operations finished with error']); //$NON-NLS-0$
>+					this._progressPane.title = messages["SomeOpErr"];
>+					this._progressPane.alt = messages['SomeOpErr'];
>+					this._progressPane.setAttribute("aria-valuetext", messages['SomeOpErr']); //$NON-NLS-0$
> 					this._switchIconTo("error"); //$NON-NLS-0$
> 					break;
> 				default:
>diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/search/nls/root/messages.js b/bundles/org.eclipse.orion.client.ui/web/orion/search/nls/root/messages.js
>index 2459a0c..67b588b 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/orion/search/nls/root/messages.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/orion/search/nls/root/messages.js
>@@ -32,21 +32,21 @@
> 	"Show Replace": "Switch to Replace Mode",
> 	"Hide Replace": "Switch to Search Mode",
> 	"Search ${0}": "Search ${0}",
>-	"Type a keyword or wild card to search in ": "Type a keyword or wild card to search in ",
>+	"TypeKeyOrWildCard": "Type a keyword or wild card to search in ",
> 	"Search failed.": "Search failed.",
>-	"No matches found for ${0}": "No matches found for ${0}",
>+	"NoMatchFound": "No matches found for ${0}",
> 	"Searching...": "Searching...",
>-	"Resource has been changed by others.": "Resource has been changed by others.",
>+	"ResourceChanged.": "Resource has been changed by others.",
> 	"Failed to write file.": "Failed to write file.",
> 	"Results": "Results",
>-	"Files ${0} of ${1} matching ${2}": "Files ${0} of ${1} matching \"${2}\"",
>-	"Replace ${0} with ${1} for files ${2} of ${3}": "Replace \"${0}\" with \"${1}\" for files ${2} of ${3}",
>+	"FilesAofBmatchingC": "Files ${0} of ${1} matching \"${2}\"",
>+	"ReplaceAwithBforCofD": "Replace \"${0}\" with \"${1}\" for files ${2} of ${3}",
> 	"Location": "Location",
> 	"Click to compare": "Click to compare",
> 	"Search again in this folder with \"${0}\"": "Search again in this folder with \"${0}\"",
> 	"Files replaced": "Files replaced",
> 	"Status": "Status",
>-	"${0} out of ${1} matches replaced.": "${0} out of ${1} matches replaced.",
>+	"matchesReplacedMsg": "${0} out of ${1} matches replaced.",
> 	"Replace all matches with...": "Replace all matches with...",
> 	"Apply Changes": "Replace Selected",
> 	"Replace all selected matches": "Replace all selected matches",
>@@ -74,7 +74,6 @@
> 	"Replace All Matches": "Replace All Matches",
> 	"No matches": "No matches",
> 	"Rename": "Rename",
>-	"Save frequently used searches by clicking on the ${0} button above.": "Save frequently used searches by clicking on the ${0} button above.",
> 	"Search": "Search",
> 	"All types": "All types",
> 	"File type": "File type",
>@@ -90,7 +89,7 @@
> 	"Scope Search": "Scoped Search",
> 	"Open in Search page for this directory": "Open the Search page for this folder.",
> 	"${0}. Try your search again.": "${0}. Try your search again.",
>-	"Click or use delete key to delete the search term": "Click or use delete key to delete the search term",
>+	"DeleteSearchTrmMsg": "Click or use delete key to delete the search term",
> 	"${0} matches": "${0} matches",
> 	"regexOptionOff" : "Regular expressions are off. Click here or use the options to turn them on for replacement",
> 	"regexOptionOn" : "Regular expressions are on. Click here or use the options to turn them off",
>diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/searchAndReplace/textSearcher.js b/bundles/org.eclipse.orion.client.ui/web/orion/searchAndReplace/textSearcher.js
>index dc6e689..fb3c8a7 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/orion/searchAndReplace/textSearcher.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/orion/searchAndReplace/textSearcher.js
>@@ -277,7 +277,7 @@
> 					onDelete: function(item, evtTarget) {
> 						this._removeRecentSearch(item, evtTarget);
> 					}.bind(this),
>-					deleteToolTips: messages['Click or use delete key to delete the search term']
>+					deleteToolTips: messages['DeleteSearchTrmMsg']
> 				});
> 	 	}
> 	 },
>diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/searchClient.js b/bundles/org.eclipse.orion.client.ui/web/orion/searchClient.js
>index dbdafb9..fe2c57d 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/orion/searchClient.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/orion/searchClient.js
>@@ -158,7 +158,7 @@
> 				if (!foundValidHit) {
> 					// only display no matches found if we have a proper name
> 					if (queryName) {
>-						var errorStr = i18nUtil.formatMessage(messages["No matches found for ${0}"], queryName); 
>+						var errorStr = i18nUtil.formatMessage(messages["NoMatchFound"], queryName); 
> 						lib.empty(resultsNode);
> 						resultsNode.appendChild(document.createTextNode(errorStr)); 
> 						if (typeof(onResultReady) === "function") { //$NON-NLS-0$
>@@ -295,7 +295,7 @@
> 				}
> 			}
> 			if(searchInputDom && searchInputDom.title){
>-				searchInputDom.title = messages["Type a keyword or wild card to search in "] + locationName;
>+				searchInputDom.title = messages["TypeKeyOrWildCard"] + locationName;
> 			}
> 		},
> 		setLocationbyURL: function(locationURL){
>diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/searchExplorer.js b/bundles/org.eclipse.orion.client.ui/web/orion/searchExplorer.js
>index f0dafff..7d752f4 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/orion/searchExplorer.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/orion/searchExplorer.js
>@@ -587,7 +587,7 @@
> statusMessage = item.message;
> break;
> case "pass": //$NON-NLS-0$
>- statusMessage = item.model.totalMatches ? i18nUtil.formatMessage(messages["${0} out of ${1} matches replaced."], item.matchesReplaced, item.model.totalMatches) : item.message;
>+ statusMessage = item.model.totalMatches ? i18nUtil.formatMessage(messages["matchesReplacedMsg"], item.matchesReplaced, item.model.totalMatches) : item.message;
> break;
> }
> var td = _createElement('td', "search_report", null, null); //$NON-NLS-1$ //$NON-NLS-0$
>@@ -1347,7 +1347,7 @@
> 	 }
> 			var message = messages["No matches"];
> 			if(this.model._provideSearchHelper){
>-				message = i18nUtil.formatMessage(messages["No matches found for ${0}"], this.model._provideSearchHelper().displayedSearchTerm);
>+				message = i18nUtil.formatMessage(messages["NoMatchFound"], this.model._provideSearchHelper().displayedSearchTerm);
> 			}
> 		 this.parentNode.textContent = "";
> 		 var textBold = _createElement('b', null, null, this.parentNode); //$NON-NLS-1$ //$NON-NLS-0$
>diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/searchModel.js b/bundles/org.eclipse.orion.client.ui/web/orion/searchModel.js
>index f188791..57f676e 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/orion/searchModel.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/orion/searchModel.js
>@@ -297,10 +297,10 @@
> var endNumber = startNumber + pagingParams.numberOnPage - 1;
> headerStr = "";
> if (!this.replaceMode()) {
>- headerStr = i18nUtil.formatMessage(messages["Files ${0} of ${1} matching ${2}"],
>+ headerStr = i18nUtil.formatMessage(messages["FilesAofBmatchingC"],
> startNumber + "-" + endNumber, pagingParams.totalNumber, this._searchHelper.displayedSearchTerm); //$NON-NLS-0$
> } else {
>- headerStr = i18nUtil.formatMessage(messages["Replace ${0} with ${1} for files ${2} of ${3}"],
>+ headerStr = i18nUtil.formatMessage(messages["ReplaceAwithBforCofD"],
> this._searchHelper.displayedSearchTerm,
> this._searchHelper.params.replace,
> startNumber + "-" + endNumber, //$NON-NLS-0$
>@@ -503,7 +503,7 @@
> if (error.status === 412) {
> reportList.push({
> model: fileItem,
>- message: messages["Resource has been changed by others."],
>+ message: messages["ResourceChanged."],
> matchesReplaced: matchesReplaced,
> status: "failed" //$NON-NLS-0$
> });
>diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/searchUtils.js b/bundles/org.eclipse.orion.client.ui/web/orion/searchUtils.js
>index b0c103a..f9d3080 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/orion/searchUtils.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/orion/searchUtils.js
>@@ -62,7 +62,7 @@
> 			return searchParams;
> 		}
> 	} else {
>-		window.alert(messages["Can't search: no search service is available"]);
>+		window.alert(messages["NoSearchAvailableErr"]);
> 	}
> 	
> 	return null;
>diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/settings/nls/root/messages.js b/bundles/org.eclipse.orion.client.ui/web/orion/settings/nls/root/messages.js
>index 1ccc733..c4d6124 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/orion/settings/nls/root/messages.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/orion/settings/nls/root/messages.js
>@@ -76,56 +76,49 @@
> 	"Update Profile Settings": "Update Profile Settings",
> 	"Update Git User Settings": "Update Git User Settings",
> 	"Update Git Credentials": "Update Git Credentials",
>-	"User profile data successfully updated.": "User profile data successfully updated.",
>-	"Git user data successfully updated.": "Git user data successfully updated.",
>-	"Git Credentials successfully updated.": "Git Credentials successfully updated.",
>-	"Edit Plugin JavaScript": "Edit Plugin JavaScript",
>+	"UsrProfileUpdateSuccess": "User profile data successfully updated.",
>+	"GitUsrUpdateSuccess": "Git user data successfully updated.",
>+	"GitCredsUpdateSuccess": "Git Credentials successfully updated.",
> 	"Install Plugin": "Install Plugin",
> 	"Plugin Name:": "Plugin Name:",
> 	"Author Name:": "Author Name:",
> 	"Licence:": "Licence:",
> 	"Description:": "Description:",
>-	"A plugin for Orion": "A plugin for Orion",
>+	"OrionPlugin": "A plugin for Orion",
> 	"Plugin Link": "Plugin Link",
> 	"Install": "Install",
>-	"Install a plugin by specifying its URL": "Install a plugin by specifying its URL",
>+	"PlugInstallByURL": "Install a plugin by specifying its URL",
> 	"Plugin URL:": "Plugin URL:",
> 	"Disable": "Disable",
> 	"DisableTooltip": "Disable the plugin",
> 	"Enable": "Enable",
> 	"EnableTooltip": "Enable the plugin",
> 	"Reload all": "Reload all",
>-	"Reload all installed plugins": "Reload all installed plugins",
>-	"Create a new Orion Plugin": "Create a new Orion Plugin",
>-	"Find More Orion Plugins": "Find More Orion Plugins",
>+	"ReloadAllPlugs": "Reload all installed plugins",
>+	"CreatePlug": "Create a new Orion Plugin",
>+	"FindMorePlugs": "Find More Orion Plugins",
> 	"Get Plugins": "Get Plugins",
> 	"Reload": "Reload",
>-	"Reload the plugin": "Reload the plugin",
>+	"ReloadPlug": "Reload the plugin",
> 	"Delete": "Delete",
>-	"Delete this plugin from the configuration": "Delete this plugin from the configuration",
>+	"DeletePlugFromConfig": "Delete this plugin from the configuration",
> 	"DeleteUser" : "Delete User Profile as well as workspaces and projects",
> 	"DeleteUserComfirmation" : "WARNING: This will permanently delete your user profile as well as all of your work!",
>-	"Type a plugin url here ...": "Type a plugin url here ...",
>-	"Installed ": "Installed ",
>-	"Installing ": "Installing ",
>+	"TypePlugURL": "Type a plugin url here ...",
> 	"Already installed": "Already installed",
>-	" plugin": " plugin",
>-	"Reloaded ": "Reloaded ",
>-	"Uninstalled ": "Uninstalled ",
>-	"Are you sure you want to uninstall '": "Are you sure you want to uninstall '",
> 	"Services": "Services",
> 	"Value": "Value",
> 	"JavaScript Object": "JavaScript Object",
>-	"click here, then check javascript console to drill down": "click here, then check javascript console to drill down",
>+	"CheckJsConsoleDrillDown": "click here, then check javascript console to drill down",
> 	"Item": "Item",
> 	"Git Config": "Git Config",
> 	"Clear Git Credentials": "Clear Git Credentials",
> 	"Enable Storage": "Enable Storage:",
>-	"Please be aware that your credentials will be stored persistently in the browser." : "Please be aware that your credentials will be stored persistently in the browser.",
>-	"Do you wish to enable the Key Storage?" : "Do you wish to enable the Key Storage?",
>+	"BrowserCredStoreMsg" : "Please be aware that your credentials will be stored persistently in the browser.",
>+	"AskEnableKeyStorage" : "Do you wish to enable the Key Storage?",
> 	"general": "General",
> 	"validation": "Validation",
>-	"Deleted git credentials for ${0}": "Deleted git credentials for ${0}",
>+	"DeletedGitMsg": "Deleted git credentials for ${0}",
> 	"Editor": "Editor",
> 	"editorSettings": "Settings",
> 	"EditorThemes": "Themes",
>@@ -252,5 +245,5 @@
> 'vanillaSkiesThemeName': 'Vanilla Skies', //$NON-NLS-0$ //$NON-NLS-1$
> 'beetlejuiceThemeName': 'Beetlejuice', //$NON-NLS-0$ //$NON-NLS-1$
> 'redThemeName': 'Red', //$NON-NLS-0$ //$NON-NLS-1$
>- "${0} settings successfully updated.": "${0} settings successfully updated."
>+ "SettingUpdateSuccess": "${0} settings successfully updated."
> });
>diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/settings/ui/PluginSettings.js b/bundles/org.eclipse.orion.client.ui/web/orion/settings/ui/PluginSettings.js
>index b041949..26964bf 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/orion/settings/ui/PluginSettings.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/orion/settings/ui/PluginSettings.js
>@@ -143,7 +143,7 @@
> 		this.node = parentNode;
> 		this.config = this.defaultConfig = null;
> 		this.messageService = this.serviceRegistry.getService("orion.page.message"); //$NON-NLS-0$
>-		this.updateMessage = i18nUtil.formatMessage(messages["${0} settings successfully updated."], this.categoryTitle);
>+		this.updateMessage = i18nUtil.formatMessage(messages["SettingUpdateSuccess"], this.categoryTitle);
> 	};
> 	objects.mixin(PropertiesWidget.prototype, { //$NON-NLS-0$
> 		createElements: function() {
>diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/shell/Shell.js b/bundles/org.eclipse.orion.client.ui/web/orion/shell/Shell.js
>index 1e7afe9..d571b6c 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/orion/shell/Shell.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/orion/shell/Shell.js
>@@ -66,7 +66,7 @@
> 				while (outputDiv.hasChildNodes()) {
> 					outputDiv.removeChild(outputDiv.lastChild);
> 				}				
>-				this.output(i18nUtil.formatMessage(messages["For a list of available commands type '${0}'."], "help")); //$NON-NLS-0$
>+				this.output(i18nUtil.formatMessage(messages["AvailableCmdsType"], "help")); //$NON-NLS-0$
> 			},
> 			/**
> 			 * Renders HTML content in the Shell's output area.
>@@ -264,7 +264,7 @@
> 				setTimeout(function() {
> 					this.commandOutputManager = new mCanon.CommandOutputManager();
> 					mGCLI.createDisplay({commandOutputManager: this.commandOutputManager});
>-					this.output(i18nUtil.formatMessage(messages["For a list of available commands type '${0}'."], "help")); //$NON-NLS-0$
>+					this.output(i18nUtil.formatMessage(messages["AvailableCmdsType"], "help")); //$NON-NLS-0$
> 				}.bind(this), 1);
> 				mHelp.startup();
> 				mHelp.helpListHtml = mHelp.helpListHtml.replace("\"${includeIntro}\"","${false}"); //$NON-NLS-1$ //$NON-NLS-0$
>diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/shell/nls/root/messages.js b/bundles/org.eclipse.orion.client.ui/web/orion/shell/nls/root/messages.js
>index afbea40..445ec77 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/orion/shell/nls/root/messages.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/orion/shell/nls/root/messages.js
>@@ -14,48 +14,45 @@
> 	"Shell": "Shell",
> 	"Changed to: ": "Changed to: ",
> 	"Initial directory: ": "Initial directory: ",
>-	"${0} is not a directory": "${0} is not a directory",
>-	"${0} was not found": "${0} was not found",
>-	"Changes the current directory": "Changes the current directory",
>-	"The name of the directory": "The name of the directory",
>-	"Edits a file": "Edits a file",
>-	"The name of the file": "The name of the file",
>-	"Lists the files in the current directory": "Lists the files in the current directory",
>-	"Prints the current directory location": "Prints the current directory location",
>-	"Clears the shell screen": "Clears the shell screen",
>-	"'${0}' is not valid": "'${0}' is not valid",
>-	"Error: ${0}": "Error: ${0}",
>+	"ChangeCurrDir": "Changes the current directory",
>+	"DirName": "The name of the directory",
>+	"EditFile": "Edits a file",
>+	"FileName": "The name of the file",
>+	"CurDirFileList": "Lists the files in the current directory",
>+	"CurDirLocation": "Prints the current directory location",
>+	"ClearShellScreen": "Clears the shell screen",
>+	"notValid": "'${0}' is not valid",
>+	"Err": "Error: ${0}",
> 	"NoResponseFromServer": "No response from server for ${0}. Check your internet connection and try again.",
> 	"ServerError": "Server error: ${0} returned ${1} ${2}",
> 	"Succeeded": "Succeeded",
> 	"Aborted": "Aborted",
>-	"The name of the plug-in": "The name of the plug-in",
>-	"The name of the contributed plug-in": "The name of the contributed plug-in",
>-	"Lists all registered plug-ins": "Lists all registered plug-ins",
>+	"PlugName": "The name of the plug-in",
>+	"ContributedPludName": "The name of the contributed plug-in",
>+	"RegisteredPlugsList": "Lists all registered plug-ins",
> 	"Reloads a plug-in": "Reloads a plug-in",
>-	"Disables a contributed plug-in": "Disables a contributed plug-in",
>-	"Enables a contributed plug-in": "Enables a contributed plug-in",
>-	"Uninstalls a contributed plug-in from the configuration": "Uninstalls a contributed plug-in from the configuration",
>-	"Plug-in is already installed": "Plug-in is already installed",
>+	"DisableContributedPlug": "Disables a contributed plug-in",
>+	"EnableContributedPlug": "Enables a contributed plug-in",
>+	"UninstallContributedPlugFrmConfig": "Uninstalls a contributed plug-in from the configuration",
>+	"PlugAlreadyInstalled": "Plug-in is already installed",
> 	"Invalid plug-in URL": "Invalid plug-in URL",
>-	"Installs a plug-in from a URL": "Installs a plug-in from a URL",
>+	"InstallPlugFrmURL": "Installs a plug-in from a URL",
> 	"The plug-in URL": "The plug-in URL",
>-	"Commands for working with plug-ins": "Commands for working with plug-ins",
>-	"Are you sure you want to uninstall all contributed plug-ins?": "Are you sure you want to uninstall all contributed plug-ins?",
>-	"Displays a plug-in's services": "Displays a plug-in's services",
>-	"Commands for working with a service": "Commands for working with a service",
>-	"Displays all plug-in contributions for a service": "Displays all plug-in contributions for a service",
>+	"CmdForPlugs": "Commands for working with plug-ins",
>+	"UninstallAllPlugsMsg": "Are you sure you want to uninstall all contributed plug-ins?",
>+	"DisplayPlugServices": "Displays a plug-in's services",
>+	"CmdsForService": "Commands for working with a service",
>+	"DisplayPlugsForService": "Displays all plug-in contributions for a service",
> 	"The service identifier": "The service identifier",
> 	"disabled": "disabled",
> 	"Open Shell": "Open Shell",
> 	"Open Shell page": "Open the Shell page with this folder as the current directory.",
>-	"'${0}' already exists": "'${0}' already exists",
>-	"Source file service does not support binary read": "Source file service does not support binary read",
>-	"Target file service does not support binary write": "Target file service does not support binary write",
>-	"Cannot create file, it already exists as a directory": "Cannot create file, it already exists as a directory",
>-	"Cannot create directory, it already exists as a file": "Cannot create directory, it already exists as a file",
>-	"Wrote ${0}": "Wrote ${0}",
>-	"Failed to write ${0}": "Failed to write ${0}",
>-	"Cannot write ${0}, it is not a descendent of the output directory": "Cannot write ${0}, it is not a descendent of the output directory",
>-	"The file or directory to re-direct output to": "The file or directory to re-direct output to"
>+	"AlreadyExist": "'${0}' already exists",
>+	"SrcNotSupportBinRead": "Source file service does not support binary read",
>+	"TargetNotSupportBinWrite": "Target file service does not support binary write",
>+	"AlreadyExistsInDirErr": "Cannot create file, it already exists as a directory",
>+	"WroteMsg": "Wrote ${0}",
>+	"WriteFailMsg": "Failed to write ${0}",
>+	"WriteFailNotDescendentOfOutputDir": "Cannot write ${0}, it is not a descendent of the output directory",
>+	"FileOrDirRedirectOutput": "The file or directory to re-direct output to"
> });
>diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/sites/SiteEditor.js b/bundles/org.eclipse.orion.client.ui/web/orion/sites/SiteEditor.js
>index 9e48bd4..5ce2c26 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/orion/sites/SiteEditor.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/orion/sites/SiteEditor.js
>@@ -311,7 +311,7 @@
> 			choices.push({}); // Separator
> 		}
> 		choices.push({
>-			name: messages["Choose folder..."],
>+			name: messages["Choose folder"],
> 			imageClass: "core-sprite-folder", //$NON-NLS-0$
> 			callback: function() {
> 				var dialog = new DirPrompter.DirectoryPrompterDialog({
>diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/sites/nls/root/messages.js b/bundles/org.eclipse.orion.client.ui/web/orion/sites/nls/root/messages.js
>index 0e5a12c..9dced4a 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/orion/sites/nls/root/messages.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/orion/sites/nls/root/messages.js
>@@ -24,7 +24,7 @@
> 	"Enable the site configuration to launch an Orion server running your local client code": "Enable the site configuration to launch an Orion server running your local client code",
> 	"Save": "Save",
> 	"Save the site configuration": "Save the site configuration",
>-	"Choose folder...": "Choose folder\u2026",
>+	"Choose folder": "Choose folder\u2026",
> 	"ConvertToSelfHostingTitle": "Locate Required Folders",
> 	"SelectRequiredFoldersSingle": "Locate the following required folder in your workspace.",
> 	"SelectRequiredFolders": "Locate the following required folders in your workspace.",
>@@ -75,4 +75,4 @@
> 	"Mappings": "Mappings",
> 	"SitesExplorer.NoSitesText" : "You have no sites. Click ${0} to create a site.", // ${0} is replaced by create button.
> 	"Edit Site": "Edit Site"
>-});
>\ No newline at end of file
>+});
>diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/stringexternalizer/nls/root/messages.js b/bundles/org.eclipse.orion.client.ui/web/orion/stringexternalizer/nls/root/messages.js
>index 1dd46e4..b525a30 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/orion/stringexternalizer/nls/root/messages.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/orion/stringexternalizer/nls/root/messages.js
>@@ -11,17 +11,16 @@
> /*eslint-env browser, amd*/
> define({
> 	"Change Directory": "Change Directory",
>-	"Change messages directory": "Change messages directory",
>-	"Externalize Strings Configuration": "Externalize Strings Configuration",
>+	"Change msg dir": "Change messages directory",
>+	"ExternalizeStrConfig": "Externalize Strings Configuration",
> 	"Messages directory:": "Messages directory:",
> 	"Messages file name:": "Messages file name:",
> 	"Messages module:": "Messages module:",
>-	"Mark not exported as NON-NLS:": "Mark not exported as NON-NLS:",
>-	"Writing files ${0} of ${1}": "Writing files ${0} of ${1}",
>+	"MarkNotNON-NLS": "Mark not exported as NON-NLS:",
> 	"Files to externalize": "Files to externalize",
>-	"Externalize string from ${0} only": "Externalize string from ${0} only",
>+	"ExternalizeStrMsg": "Externalize string from ${0} only",
> 	"Writing files...": "Writing files...",
> 	"Passed": "Passed",
> 	"Failed": "Failed",
>-	"Resource has been changed by others": "Resource has been changed by others"
>+	"ResourceChanged": "Resource has been changed by others"
> });
>\ No newline at end of file
>diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/webui/dialogs/OpenResourceDialog.js b/bundles/org.eclipse.orion.client.ui/web/orion/webui/dialogs/OpenResourceDialog.js
>index 19b4ef7..ad233f6 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/orion/webui/dialogs/OpenResourceDialog.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/orion/webui/dialogs/OpenResourceDialog.js
>@@ -66,7 +66,7 @@
> 		}
> 		this._searchRenderer = options.searchRenderer;
> 		if (!this._searchRenderer || typeof(this._searchRenderer.makeRenderFunction) !== "function") { //$NON-NLS-0$
>-			throw new Error(messages['Missing required argument: searchRenderer']);
>+			throw new Error(messages['MissingSearchRenderer']);
> 		}
> 		this._initialize();
> 	};
>@@ -224,7 +224,7 @@
> 			var renderFunction = this._searchRenderer.makeRenderFunction(this._contentTypeService, this.$results, false, this.decorateResult.bind(this));
> 			this.currentSearch = renderFunction;
> 			var div = document.createElement("div"); //$NON-NLS-0$
>-			div.appendChild(document.createTextNode(this._nameSearch ? messages['Searching...'] : util.formatMessage(messages["Searching for occurrences of"], text)));
>+			div.appendChild(document.createTextNode(this._nameSearch ? messages['Searching...'] : util.formatMessage(messages["SearchOccurences"], text)));
> 			lib.empty(this.$results);
> 			this.$results.appendChild(div);
> 			this._searcher.search(searchParams, keyword.folderKeyword, function() {
>diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/webui/dialogs/OperationsDialog.js b/bundles/org.eclipse.orion.client.ui/web/orion/webui/dialogs/OperationsDialog.js
>index 0b22a9c..c2c2a4c 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/orion/webui/dialogs/OperationsDialog.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/orion/webui/dialogs/OperationsDialog.js
>@@ -110,20 +110,20 @@
> 			switch (operation.type) {
> 				case "Warning": //$NON-NLS-0$
> 					operationIcon.classList.add("core-sprite-warning"); //$NON-NLS-0$
>-					operationIcon.setAttribute("aria-label", messages["Operation resulted in a warning."]); //$NON-NLS-0$
>+					operationIcon.setAttribute("aria-label", messages["OpWarning"]); //$NON-NLS-0$
> 					break;
> 				case "error": //$NON-NLS-0$
> 					operationIcon.classList.add("core-sprite-error"); //$NON-NLS-0$
>-					operationIcon.setAttribute("aria-label", messages["Operation resulted in an error."]); //$NON-NLS-0$
>+					operationIcon.setAttribute("aria-label", messages["OpErr"]); //$NON-NLS-0$
> 					break;
> 				case "loadstart":
> 				case "progress":
> 					operationIcon.classList.add("core-sprite-start"); //$NON-NLS-0$
>-					operationIcon.setAttribute("aria-label", messages["Operation is running."]); //$NON-NLS-0$
>+					operationIcon.setAttribute("aria-label", messages["OpRunning"]); //$NON-NLS-0$
> 					break;
> 				case "abort":
> 					operationIcon.classList.add("core-sprite-stop"); //$NON-NLS-0$
>-					operationIcon.setAttribute("aria-label", messages["Operation is canceled."]); //$NON-NLS-0$
>+					operationIcon.setAttribute("aria-label", messages["OpCancelled"]); //$NON-NLS-0$
> 					break;
> 				case "load":
> 				case "loadend":
>diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/widgets/browse/readonlyFileClient.js b/bundles/org.eclipse.orion.client.ui/web/orion/widgets/browse/readonlyFileClient.js
>index 0957318..3eeccf5 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/orion/widgets/browse/readonlyFileClient.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/orion/widgets/browse/readonlyFileClient.js
>@@ -107,7 +107,7 @@
> 	function _doServiceCall(fileService, funcName, funcArgs) {
> 		//if the function is not implemented in the file service, we throw an exception to the caller
> 		if(!fileService[funcName]){
>-			throw funcName + messages[" is not supported in this file system"];
>+			throw i18nUtil("${0} is not supported in this file system", funcName);
> 		}
> 		return fileService[funcName].apply(fileService, funcArgs);
> 	}
>diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/widgets/input/ComboTextInput.js b/bundles/org.eclipse.orion.client.ui/web/orion/widgets/input/ComboTextInput.js
>index 9862c03..79ace9a 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/orion/widgets/input/ComboTextInput.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/orion/widgets/input/ComboTextInput.js
>@@ -157,7 +157,7 @@
> 				group: this._domNodeId + "InputCompletion", //$NON-NLS-0$
> 				extendedProvider: this._extendedRecentEntryProposalProvider, 
> 				onDelete: this._onRecentEntryDelete,
>-				deleteToolTips: messages["Click or use delete key to delete the search term"] //$NON-NLS-0$
>+				deleteToolTips: messages["DeleteSearchTrmMsg"] //$NON-NLS-0$
> 			});
> 			
> 			this._recentEntryButton.addEventListener("click", function(event){ 
>diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/widgets/nls/root/messages.js b/bundles/org.eclipse.orion.client.ui/web/orion/widgets/nls/root/messages.js
>index f22b22f..f27ee51 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/orion/widgets/nls/root/messages.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/orion/widgets/nls/root/messages.js
>@@ -11,8 +11,6 @@
> //NLS_CHARSET=UTF-8
> /*eslint-env browser, amd*/
> define({
>-	"no input": "no input",
>-	"no output": "no output",
> 	"Choose a Folder": "Choose a Folder",
> 	"OK": "OK",
> 	"Profile": "Profile",
>@@ -23,9 +21,7 @@
> 	"Authentication required!": "Authentication required!",
> 	"Name:": "Name:",
> 	"Plug-ins": "Plug-ins",
>-	" <No available services or timed out, check URL and try reloading>": " <No available services or timed out, check URL and try reloading>",
> 	"Properties": "Properties",
>-	" (Service Id: ": " (Service Id: ",
> 	"Services": "Services",
> 	"SFTP Transfer": "SFTP Transfer",
> 	"Remote host:": "Remote host:",
>@@ -42,22 +38,16 @@
> 	"Upload" : "Upload",
> 	"Browse...": "Browse...",
> 	"Import a file or zip": "Import a file or zip",
>-	"Missing required argument: searchRenderer": "Missing required argument: searchRenderer",
>-	"Missing required argument: favService": "Missing required argument: favService",
>+	"MissingSearchRenderer": "Missing required argument: searchRenderer",
> 	"Find File Named": "Find File Named",
>-	"Type the name of a file to open (? = any character, * = any string):": "Type the name of a file to open (? = any character, * = any string):",
> 	"Search": "Search",
> 	"FileName FolderName": "FileName FolderName(Optional)",
> 	"Searching...": "Searching...",
>-	"Searching for occurrences of": "Searching for occurrences of: \"${0}\"",
>+	"SearchOccurences": "Searching for occurrences of: \"${0}\"",
> 	"name": "name",
>-	"orion.widgets.UserMenu": "orion.widgets.UserMenu",
> 	"test": "test",
>+	"Type the name of a file to open (? = any character, * = any string):": "Type the name of a file to open (? = any character, * = any string):",
> 	"Sign Out": "Sign Out",
>-	"Sign Out ": "Sign Out ",
>-	"</a>": "</a>",
>-	">": ">",
>-	"Sign In To ": "Sign In To ",
> 	"Sign In": "Sign In",
> 	"Help": "Help",
> 	"Report a Bug": "Report a Bug",
>@@ -75,10 +65,10 @@
> 	"Building file skeleton..." : "Building file skeleton...",
> 	"Add" : "Add",
> 	"Upload..." : "Upload...",
>-	"For a list of available commands type '${0}'.": "For a list of available commands type '${0}'.",
>+	"AvailableCmdsType": "For a list of available commands type '${0}'.",
> 	"Main Pages": "Main Pages",
> 	"Related Links": "Related Links",
> 	"Yes": "Yes",
> 	"No": "No",
>-	"Click or use delete key to delete the search term": "Click or use delete key to delete the search term"
>+	"DeleteSearchTrmMsg": "Click or use delete key to delete the search term"
> });
>diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/widgets/plugin/PluginEntry.js b/bundles/org.eclipse.orion.client.ui/web/orion/widgets/plugin/PluginEntry.js
>index 15d290d..f75e24f 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/orion/widgets/plugin/PluginEntry.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/orion/widgets/plugin/PluginEntry.js
>@@ -171,7 +171,7 @@
> 				}
> 			}
> 			
>-			this.pluginDescription.textContent = headers.description || messages['A plugin for Orion'];
>+			this.pluginDescription.textContent = headers.description || messages['OrionPlugin'];
> 
> 			// Additional Links
> 			if (headers.website) {
>diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/widgets/plugin/PluginList.js b/bundles/org.eclipse.orion.client.ui/web/orion/widgets/plugin/PluginList.js
>index 649a1fd..a59351c 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/orion/widgets/plugin/PluginList.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/orion/widgets/plugin/PluginList.js
>@@ -13,9 +13,9 @@
> provides JavaScript functions for user management of Orion plugins. It is designed
> to contain PluginEntry widgets */
> 
>-define(['i18n!orion/settings/nls/messages', 'require', 'orion/Deferred', 'orion/commands', 'orion/commandRegistry', 'orion/commonHTMLFragments', 'orion/objects', 'orion/webui/littlelib',
>+define(['i18n!orion/settings/nls/messages', 'orion/i18nUtil', 'require', 'orion/Deferred', 'orion/commands', 'orion/commandRegistry', 'orion/commonHTMLFragments', 'orion/objects', 'orion/webui/littlelib',
> 		'orion/widgets/plugin/PluginEntry', 'orion/explorers/explorer'
>-		], function(messages, require, Deferred, mCommands, mCommandRegistry, mHTMLFragments, objects, lib, PluginEntry, mExplorer) {
>+		], function(messages, i18nUtil, require, Deferred, mCommands, mCommandRegistry, mHTMLFragments, objects, lib, PluginEntry, mExplorer) {
> 
> 	var Explorer = mExplorer.Explorer;
> 	var SelectionRenderer = mExplorer.SelectionRenderer;
>@@ -149,7 +149,7 @@
> 			
> 			var findMorePluginsCommand = new mCommands.Command({
> 				name: messages['Get Plugins'],
>-				tooltip: messages["Find More Orion Plugins"],
>+				tooltip: messages["FindMorePlugs"],
> 				id: "orion.findMorePluginsCommand", //$NON-NLS-0$
> 				hrefCallback: function(data){
> 					return this.getPluginsLink(data.items);
>@@ -164,7 +164,7 @@
> 			// set up the toolbar level commands	
> 			var installPluginCommand = new mCommands.Command({
> 				name: messages["Install"],
>-				tooltip: messages["Install a plugin by specifying its URL"],
>+				tooltip: messages["PlugInstallByURL"],
> 				id: "orion.installPlugin", //$NON-NLS-0$
> 				parameters: new mCommandRegistry.ParametersDescription([new mCommandRegistry.CommandParameter('url', 'url', messages['Plugin URL:'], '')]), //$NON-NLS-1$ //$NON-NLS-0$
> 				callback: function(data) {
>@@ -182,7 +182,7 @@
> 			this.commandService.registerCommandContribution("pluginCommands", "orion.installPlugin", 2, /* not grouped */ null, false, /* no key binding yet */ null, new mCommandRegistry.URLBinding("installPlugin", "url")); //$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-0$
> 			var reloadAllPluginsCommand = new mCommands.Command({
> 				name: messages["Reload all"],
>-				tooltip: messages["Reload all installed plugins"],
>+				tooltip: messages["ReloadAllPlugs"],
> 				id: "orion.reloadAllPlugins", //$NON-NLS-0$
> 				callback: this.reloadPlugins.bind(this)
> 			});
>@@ -192,7 +192,7 @@
> 
> 			var createPluginCommand = new mCommands.Command({
> 				name: messages['Create'],
>-				tooltip: messages["Create a new Orion Plugin"],
>+				tooltip: messages["CreatePlug"],
> 				id: "orion.createPlugin", //$NON-NLS-0$
> 				callback: function(data){
> 					this.createPlugin(data.items);
>@@ -214,7 +214,7 @@
> 			// Declare row-level commands so they will be rendered when the rows are added.
> 			var reloadPluginCommand = new mCommands.Command({
> 				name: messages["Reload"],
>-				tooltip: messages["Reload the plugin"],
>+				tooltip: messages["ReloadPlug"],
> 				id: "orion.reloadPlugin", //$NON-NLS-0$
> 				imageClass: "core-sprite-refresh", //$NON-NLS-0$
> 				visibleWhen: function(items) { // we expect a URL
>@@ -229,7 +229,7 @@
> 
> 			var uninstallPluginCommand = new mCommands.Command({
> 				name: messages["Delete"],
>-				tooltip: messages["Delete this plugin from the configuration"],
>+				tooltip: messages["DeletePlugFromConfig"],
> 				imageClass: "core-sprite-delete", //$NON-NLS-0$
> 				id: "orion.uninstallPlugin", //$NON-NLS-0$
> 				visibleWhen: function(url) { // we expect a URL
>@@ -364,7 +364,7 @@
> 		
> 		pluginURLBlur: function(){
> 			if( this.pluginUrlEntry.value === '' ){
>-				this.pluginUrlEntry.value = messages['Type a plugin url here ...'];
>+				this.pluginUrlEntry.value = messages['TypePlugURL'];
> 				this.pluginUrlEntry.style.color = "#AAA" ; //$NON-NLS-0$
> 			}
> 		},
>@@ -375,7 +375,7 @@
> 		},
> 		
> 		addPlugin: function( pluginUrl ){
>-			this.statusService.setMessage(messages["Installed "] + pluginUrl, 5000, true);
>+			this.statusService.setMessage(i18nUtil.formatMessage("Installed ${0}", pluginUrl), 5000, true);
> 			this.settings.preferences.getPreferences("/plugins").then(function(plugins) { //$NON-NLS-0$
> 				plugins.put(pluginUrl, true);
> 			}); // this will force a sync
>@@ -393,7 +393,7 @@
> 		
> 		installHandler: function(newPluginUrl){
> 			if (/^\S+$/.test(newPluginUrl.trim())) {
>-				this.statusService.setMessage(messages["Installing "] + newPluginUrl + "...", null, true);
>+				this.statusService.setMessage(i18nUtil.formatMessage("Installing ${0}...", newPluginUrl), null, true);
> 				if( this.settings.pluginRegistry.getPlugin(newPluginUrl) ){
> 					this.statusService.setErrorMessage(messages["Already installed"]);
> 				} else {
>@@ -406,7 +406,7 @@
> 		
> 		reloaded: function(){
> 			var settingsPluginList = this.settings.pluginRegistry.getPlugins();
>-			this.statusService.setMessage( messages["Reloaded "] + settingsPluginList.length + messages[" plugin"] + ( settingsPluginList.length===1 ? "": "s") + ".", 5000, true );
>+			this.statusService.setMessage( ( settingsPluginList.length===1 ? i18nUtil.formatMessage("Reloaded ${0} plugin.", settingsPluginList.length): i18nUtil.formatMessage("Reloaded ${0} plugins.", settingsPluginList.length)), 5000, true );
> 			this.render();
> 		},
> 		
>@@ -415,7 +415,7 @@
> 			var plugin = this.settings.pluginRegistry.getPlugin(url);
> 			if (plugin) {
> 				plugin.update().then(this.render.bind(this));
>-				this.statusService.setMessage(messages['Reloaded '] + url, 5000, true);
>+				this.statusService.setMessage( i18nUtil.formatMessage("Reloaded ${0}", url), 5000, true);
> 			}
> 		},
> 		
>@@ -423,7 +423,7 @@
> 			var plugin = this.settings.pluginRegistry.getPlugin(url);
> 			if (plugin) {
> 				plugin.stop();
>-				this.statusService.setMessage("Disabled " + url, 5000, true);
>+				this.statusService.setMessage(i18nUtil.formatMessage("Disabled ${0}", url), 5000, true);
> 				this.settings.preferences.getPreferences("/plugins").then(function(plugins) { //$NON-NLS-0$
> 					plugins.put(url, false);
> 					this.render(this);
>@@ -436,7 +436,7 @@
> 			var plugin = this.settings.pluginRegistry.getPlugin(url);
> 			if (plugin) {
> 				plugin.start({lazy:true});
>-				this.statusService.setMessage("Enabled " + url, 5000, true);
>+				this.statusService.setMessage(i18nUtil.formatMessage("Enabled ${0}", url), 5000, true);
> 				this.settings.preferences.getPreferences("/plugins").then(function(plugins) { //$NON-NLS-0$
> 					plugins.put(url, false);
> 					this.render(this);
>@@ -464,7 +464,7 @@
> 			var plugin = this.settings.pluginRegistry.getPlugin(url);
> 			if (plugin) {
> 				plugin.uninstall().then(function() {
>-					this.statusService.setMessage(messages["Uninstalled "] + url, 5000, true);
>+					this.statusService.setMessage(i18nUtil.formatMessage("Uninstalled ${0}", url), 5000, true);
> 					this.settings.preferences.getPreferences("/plugins").then(function(plugins) { //$NON-NLS-0$
> 						plugins.keys().some(function(key) {
> 							if (_normalizeURL(require.toUrl(key)) === _normalizeURL(url)) {
>@@ -487,7 +487,7 @@
> 				
> 			// TODO: Should be internationalized
> 				
>-			var confirmMessage = messages["Are you sure you want to uninstall '"] + url + "'?"; //$NON-NLS-1$
>+			var confirmMessage = i18nUtil.formatMessage("Are you sure you want to uninstall '${0}'?",url); //$NON-NLS-1$
> 			if (window.confirm(confirmMessage)) {
> 				this.forceRemove(url);
> 			}
>diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/widgets/plugin/ServiceCarousel.js b/bundles/org.eclipse.orion.client.ui/web/orion/widgets/plugin/ServiceCarousel.js
>index f953077..454aaf0 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/orion/widgets/plugin/ServiceCarousel.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/orion/widgets/plugin/ServiceCarousel.js
>@@ -243,7 +243,7 @@
> 
> 					var span = document.createElement("span"); //$NON-NLS-0$
> 					span.classList.add("objectLink"); //$NON-NLS-0$
>-					span.title = messages['click here, then check javascript console to drill down'];
>+					span.title = messages['CheckJsConsoleDrillDown'];
> 					span.addEventListener("click", this.consoleOutput.bind(this, debugData)); //$NON-NLS-0$
> 					span.textContent = messages['JavaScript Object'];
> 					cell.appendChild(span);
>diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/widgets/settings/GitSettings.js b/bundles/org.eclipse.orion.client.ui/web/orion/widgets/settings/GitSettings.js
>index 9d46b02..e53e249 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/orion/widgets/settings/GitSettings.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/orion/widgets/settings/GitSettings.js
>@@ -106,7 +106,7 @@
> 					var gitPreferenceStorage = new GitPreferenceStorage(that.registry);
> 					gitPreferenceStorage.remove(repository).then(
> 						function(){
>-							messageService.setProgressResult(i18nUtil.formatMessage(messages["Deleted git credentials for ${0}"], [repository]));
>+							messageService.setProgressResult(i18nUtil.formatMessage(messages["DeletedGitMsg"], [repository]));
> 							that.gitCredentialsFields[keyIndex+1].destroy();
> 						}
> 					);
>@@ -138,7 +138,7 @@
> 			var messageService = this.registry.getService("orion.page.message"); //$NON-NLS-0$
> 			gitConfigPreference.setConfig({GitMail: this.gitFields[0].getValue(),	GitName: this.gitFields[1].getValue()}).then(
> 				function(){
>-					messageService.setProgressResult( messages['Git user data successfully updated.'] );
>+					messageService.setProgressResult( messages['GitUsrUpdateSuccess'] );
> 				}
> 			);
> 		},
>@@ -149,11 +149,11 @@
> 			// git authentication update
> 			var gitPreferenceStorage = new GitPreferenceStorage(this.registry);
> 			if( this.gitCredentialsFields[0].isChecked() ){
>-				var confirmMessage = messages["Please be aware that your credentials will be stored persistently in the browser."] + '\n' + messages["Do you wish to enable the Key Storage?"];
>+				var confirmMessage = messages["BrowserCredStoreMsg"] + '\n' + messages["AskEnableKeyStorage"];
> 				if(window.confirm(confirmMessage)){
> 					gitPreferenceStorage.enable().then(
> 						function(){
>-							messageService.setProgressResult( messages['Git Credentials successfully updated.'] );
>+							messageService.setProgressResult( messages['GitCredsUpdateSuccess'] );
> 						}
> 					);
> 				} else {
>@@ -163,7 +163,7 @@
> 			} else {
> 				gitPreferenceStorage.disable().then(
> 					function(){
>-						messageService.setProgressResult( messages['Git Credentials successfully updated.'] );
>+						messageService.setProgressResult( messages['GitCredsUpdateSuccess'] );
> 					}
> 				);
> 			}
>diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/widgets/settings/UserSettings.js b/bundles/org.eclipse.orion.client.ui/web/orion/widgets/settings/UserSettings.js
>index d696eb1..687ced3 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/orion/widgets/settings/UserSettings.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/orion/widgets/settings/UserSettings.js
>@@ -175,7 +175,7 @@
> 								if(args){
> 									messageService.setProgressResult(args);
> 								}else{
>-									messageService.setProgressResult( messages['User profile data successfully updated.'] );
>+									messageService.setProgressResult( messages['UsrProfileUpdateSuccess'] );
> 								}
> 							}, function(error){
> 								messageService.setProgressResult(error);
>diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/widgets/themes/ThemeBuilder.js b/bundles/org.eclipse.orion.client.ui/web/orion/widgets/themes/ThemeBuilder.js
>index 9650b68..3c5fdbf 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/orion/widgets/themes/ThemeBuilder.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/orion/widgets/themes/ThemeBuilder.js
>@@ -666,7 +666,7 @@
> 
> ThemeBuilder.prototype.drawOutlineData = drawOutlineData;
> 	
>-	var successMessage = i18nUtil.formatMessage(messages["${0} settings successfully updated."], messages["Theme"]); //$NON-NLS-1$ //$NON-NLS-0$
>+	var successMessage = i18nUtil.formatMessage(messages["SettingUpdateSuccess"], messages["Theme"]); //$NON-NLS-1$ //$NON-NLS-0$
> 	
> function apply(data) {
> 
>@@ -1052,4 +1052,4 @@
> ThemeBuilder.prototype.exportTheme = exportTheme;
> 
> return ThemeBuilder;
>-});
>\ No newline at end of file
>+});
>diff --git a/bundles/org.eclipse.orion.client.ui/web/plugins/nonnlsPlugin.js b/bundles/org.eclipse.orion.client.ui/web/plugins/nonnlsPlugin.js
>index 5192fc0..3063f6f 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/plugins/nonnlsPlugin.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/plugins/nonnlsPlugin.js
>@@ -83,7 +83,7 @@
> 	provider.registerService('orion.navigate.command', null, {
> 		id: 'orion.nonnls.externalize',
> 		nameKey: 'Strings Xtrnalizr',
>-		tooltipKey: 'Externalize Strings from JavaScript files in this folder',
>+		tooltipKey: 'Externalize strings',
> 		nls: 'orion/navigate/nls/messages',
> 		forceSingleItem: true,
> 		validationProperties:
>diff --git a/bundles/org.eclipse.orion.client.ui/web/shell/paramType-file.js b/bundles/org.eclipse.orion.client.ui/web/shell/paramType-file.js
>index 0ffc575..7f68097 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/shell/paramType-file.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/shell/paramType-file.js
>@@ -236,7 +236,7 @@
> 				var successFn = function(file) {
> 					this.callback = function() {
> 						var string = i18nUtil.formatMessage(
>-							messages["Wrote ${0}"],
>+							messages["WroteMsg"],
> 							typeof(file) === "string" ? file : this.shellPageFileService.computePathString(file)); //$NON-NLS-0$
> 						var writer = new mResultWriters.ShellStringWriter(element);
> 						writer.write(string + "\n"); //$NON-NLS-0$
>@@ -251,7 +251,7 @@
> 				var errorFn = function(file) {
> 					this.callback = function(error) {
> 						var string = i18nUtil.formatMessage(
>-							messages["Failed to write ${0}"],
>+							messages["WriteFailMsg"],
> 							typeof(file) === "string" ? file : this.shellPageFileService.computePathString(file)); //$NON-NLS-0$
> 						string += " [" + error + "]"; //$NON-NLS-1$ //$NON-NLS-0$
> 						var writer = new mResultWriters.ShellStringWriter(element);
>@@ -288,7 +288,7 @@
> 								} else if (segment === "..") { //$NON-NLS-0$
> 									if (index === 0) {
> 										/* invalid, destination must be a descendent of the cwd */
>-										errorFn(i18nUtil.formatMessage(messages["Cannot write ${0}, it is not a descendent of the output directory"], file.path));
>+										errorFn(i18nUtil.formatMessage(messages["WriteFailNotDescendentOfOutputDir"], file.path));
> 										return;
> 									}
> 									pathSegments.splice(index-- - 1, 2);
>@@ -351,7 +351,7 @@
> 					return {
> 						value: undefined,
> 						status: mShell.CompletionStatus.ERROR,
>-						message: i18nUtil.formatMessage(messages["'${0}' is not valid"], string),
>+						message: i18nUtil.formatMessage(messages["notValid"], string),
> 						predictions: null
> 					};
> 				}
>@@ -368,7 +368,7 @@
> 					}
> 					if (exactMatch) {
> 						status = mShell.CompletionStatus.ERROR;
>-						message = i18nUtil.formatMessage(messages["'${0}' already exists"], string);
>+						message = i18nUtil.formatMessage(messages["AlreadyExist"], string);
> 					} else {
> 						// TODO validate filename?
> 						status = mShell.CompletionStatus.MATCH;
>@@ -403,7 +403,7 @@
> 							status = mShell.CompletionStatus.PARTIAL;
> 						} else {
> 							status = mShell.CompletionStatus.ERROR;
>-							message = i18nUtil.formatMessage(messages["'${0}' is not valid"], string);
>+							message = i18nUtil.formatMessage(messages["notValid"], string);
> 						}
> 					} else { /* exist is undefined */
> 						// TODO validate filename?
>diff --git a/bundles/org.eclipse.orion.client.ui/web/shell/paramType-plugin.js b/bundles/org.eclipse.orion.client.ui/web/shell/paramType-plugin.js
>index 8b31c91..9cd6732 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/shell/paramType-plugin.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/shell/paramType-plugin.js
>@@ -172,7 +172,7 @@
> 					status = mShell.CompletionStatus.PARTIAL;
> 				} else {
> 					status = mShell.CompletionStatus.ERROR;
>-					message = i18nUtil.formatMessage(messages["'${0}' is not valid"], string);
>+					message = i18nUtil.formatMessage(messages["notValid"], string);
> 				}
> 				return {
> 					value: exactMatch ? exactMatch.value : undefined,
>diff --git a/bundles/org.eclipse.orion.client.ui/web/shell/paramType-service.js b/bundles/org.eclipse.orion.client.ui/web/shell/paramType-service.js
>index 87733d3..537f0f0 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/shell/paramType-service.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/shell/paramType-service.js
>@@ -79,7 +79,7 @@
> 					status = mShell.CompletionStatus.PARTIAL;
> 				} else {
> 					status = mShell.CompletionStatus.ERROR;
>-					message = i18nUtil.formatMessage(messages["'${0}' is not valid"], string);
>+					message = i18nUtil.formatMessage(messages["notValid"], string);
> 				}
> 				return {
> 					value: exactMatch ? exactMatch.value : undefined,
>diff --git a/bundles/org.eclipse.orion.client.ui/web/shell/shellPage.js b/bundles/org.eclipse.orion.client.ui/web/shell/shellPage.js
>index 7da2d6a..082a4c3 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/shell/shellPage.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/shell/shellPage.js
>@@ -228,9 +228,9 @@
> 			error = JSON.parse(xhrResult.responseText);
> 		} catch (e) {}
> 		if (error && error.DetailedMessage) {
>-			error = i18nUtil.formatMessage(messages["Error: ${0}"], error.DetailedMessage);
>+			error = i18nUtil.formatMessage(messages["Err"], error.DetailedMessage);
> 		} else if (error && error.Message) {
>-			error = i18nUtil.formatMessage(messages["Error: ${0}"], error.Message);
>+			error = i18nUtil.formatMessage(messages["Err"], error.Message);
> 		} else if (typeof xhrResult.url === "string") {
> 			if (xhrResult.status === 0) {
> 				error = i18nUtil.formatMessage(messages["NoResponseFromServer"], xhrResult.url);
>@@ -442,7 +442,7 @@
> 		var url = args.url.trim();
> 		if (/^\S+$/.test(url)) {
> 			if (pluginRegistry.getPlugin(url)){
>-				return messages["Plug-in is already installed"];
>+				return messages["PlugAlreadyInstalled"];
> 			}
> 			var result = context.createPromise();
> 			pluginRegistry.installPlugin(url).then(
>@@ -484,7 +484,7 @@
> 	function pluginsUninstallExec(args, context) {
> 		var result = context.createPromise();
> 		if (args.plugin.isAllPlugin) {
>-			var msg = messages["Are you sure you want to uninstall all contributed plug-ins?"];
>+			var msg = messages["UninstallAllPlugsMsg"];
> 			if (!window.confirm(msg)) {
> 				return messages.Aborted;
> 			}
>@@ -917,40 +917,40 @@
> 		/* add the locally-defined commands */
> 		shell.registerCommand({
> 			name: "cd", //$NON-NLS-0$
>-			description: messages["Changes the current directory"],
>+			description: messages["ChangeCurrDir"],
> 			callback: cdExec,
> 			parameters: [{
> 				name: "directory", //$NON-NLS-0$
> 				type: {name: "file", directory: true, exist: true}, //$NON-NLS-0$
>-				description: messages["The name of the directory"]
>+				description: messages["DirName"]
> 			}],
> 			returnType: "html" //$NON-NLS-0$
> 		});
> 		shell.registerCommand({
> 			name: "edit", //$NON-NLS-0$
>-			description: messages["Edits a file"],
>+			description: messages["EditFile"],
> 			callback: editExec,
> 			parameters: [{
> 				name: "file", //$NON-NLS-0$
> 				type: {name: "file", file: true, exist: true}, //$NON-NLS-0$
>-				description: messages["The name of the file"]
>+				description: messages["FileName"]
> 			}]
> 		});
> 		shell.registerCommand({
> 			name: "ls", //$NON-NLS-0$
>-			description: messages["Lists the files in the current directory"],
>+			description: messages["CurDirFileList"],
> 			callback: lsExec,
> 			returnType: "html" //$NON-NLS-0$
> 		});
> 		shell.registerCommand({
> 			name: "pwd", //$NON-NLS-0$
>-			description: messages["Prints the current directory location"],
>+			description: messages["CurDirLocation"],
> 			callback: pwdExec,
> 			returnType: "html" //$NON-NLS-0$
> 		});
> 		shell.registerCommand({
> 			name: "clear", //$NON-NLS-0$
>-			description: messages["Clears the shell screen"],
>+			description: messages["ClearShellScreen"],
> 			callback: function(args, context) {
> 				shell.clear();
> 			}
>@@ -959,17 +959,17 @@
> 		/* plug-in management commands */
> 		shell.registerCommand({
> 			name: "plugins", //$NON-NLS-0$
>-			description: messages["Commands for working with plug-ins"]
>+			description: messages["CmdForPlugs"]
> 		});
> 		shell.registerCommand({
> 			name: "plugins list", //$NON-NLS-0$
>-			description: messages["Lists all registered plug-ins"],
>+			description: messages["RegisteredPlugsList"],
> 			callback: pluginsListExec,
> 			returnType: "html" //$NON-NLS-0$
> 		});
> 		shell.registerCommand({
> 			name: "plugins install", //$NON-NLS-0$
>-			description: messages["Installs a plug-in from a URL"],
>+			description: messages["InstallPlugFrmURL"],
> 			callback: pluginsInstallExec,
> 			parameters: [{
> 				name: "url", //$NON-NLS-0$
>@@ -980,12 +980,12 @@
> 		});
> 		shell.registerCommand({
> 			name: "plugins uninstall", //$NON-NLS-0$
>-			description: messages["Uninstalls a contributed plug-in from the configuration"],
>+			description: messages["UninstallContributedPlugFrmConfig"],
> 			callback: pluginsUninstallExec,
> 			parameters: [{
> 				name: "plugin", //$NON-NLS-0$
> 				type: {name: "plugin", multiple: true, excludeDefaultPlugins: true}, //$NON-NLS-0$
>-				description: messages["The name of the contributed plug-in"]
>+				description: messages["ContributedPludName"]
> 			}],
> 			returnType: "string" //$NON-NLS-0$
> 		});
>@@ -996,40 +996,40 @@
> 			parameters: [{
> 				name: "plugin", //$NON-NLS-0$
> 				type: {name: "plugin", multiple: true, excludeDefaultPlugins: false}, //$NON-NLS-0$
>-				description: messages["The name of the plug-in"]
>+				description: messages["PlugName"]
> 			}],
> 			returnType: "string" //$NON-NLS-0$
> 		});
> 		shell.registerCommand({
> 			name: "plugins enable", //$NON-NLS-0$
>-			description: messages["Enables a contributed plug-in"],
>+			description: messages["EnableContributedPlug"],
> 			callback: pluginsEnableExec,
> 			parameters: [{
> 				name: "plugin", //$NON-NLS-0$
> 				type: {name: "plugin", multiple: true, excludeDefaultPlugins: true}, //$NON-NLS-0$
>-				description: messages["The name of the contributed plug-in"]
>+				description: messages["ContributedPludName"]
> 			}],
> 			returnType: "string" //$NON-NLS-0$
> 		});
> 		shell.registerCommand({
> 			name: "plugins disable", //$NON-NLS-0$
>-			description: messages["Disables a contributed plug-in"],
>+			description: messages["DisableContributedPlug"],
> 			callback: pluginsDisableExec,
> 			parameters: [{
> 				name: "plugin", //$NON-NLS-0$
> 				type: {name: "plugin", multiple: true, excludeDefaultPlugins: true}, //$NON-NLS-0$
>-				description: messages["The name of the contributed plug-in"]
>+				description: messages["ContributedPludName"]
> 			}],
> 			returnType: "string" //$NON-NLS-0$
> 		});
> 		shell.registerCommand({
> 			name: "plugins services", //$NON-NLS-0$
>-			description: messages["Displays a plug-in's services"],
>+			description: messages["DisplayPlugServices"],
> 			callback: pluginServicesExec,
> 			parameters: [{
> 				name: "plugin", //$NON-NLS-0$
> 				type: {name: "plugin", multiple: false, excludeDefaultPlugins: false}, //$NON-NLS-0$
>-				description: messages["The name of the plug-in"]
>+				description: messages["PlugName"]
> 			}],
> 			returnType: "html" //$NON-NLS-0$
> 		});
>@@ -1037,12 +1037,12 @@
> 		/* service management commands */
> 		shell.registerCommand({
> 			name: "service", //$NON-NLS-0$
>-			description: messages["Commands for working with a service"]
>+			description: messages["CmdsForService"]
> 		});
> 
> 		shell.registerCommand({
> 			name: "service contributors", //$NON-NLS-0$
>-			description: messages["Displays all plug-in contributions for a service"],
>+			description: messages["DisplayPlugsForService"],
> 			callback: serviceContributorsExec,
> 			parameters: [{
> 				name: "id", //$NON-NLS-0$
>@@ -1087,7 +1087,7 @@
> 					parameters.push({
> 						name: "output", //$NON-NLS-0$
> 	 type: {name: "file", file: true, directory: true}, //$NON-NLS-0$
>-	 description: messages["The file or directory to re-direct output to"], //$NON-NLS-0$
>+	 description: messages["FileOrDirRedirectOutput"], //$NON-NLS-0$
> 	 defaultValue: null
> 					});
> 				}
>diff --git a/bundles/org.eclipse.orion.client.ui/web/shell/shellPageFileService.js b/bundles/org.eclipse.orion.client.ui/web/shell/shellPageFileService.js
>index c57e71e..27c0495 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/shell/shellPageFileService.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/shell/shellPageFileService.js
>@@ -72,7 +72,7 @@
> 					if (directory.Directory) {
> 						result.resolve(directory);
> 					} else {
>-						result.reject(messages["Cannot create directory, it already exists as a file"]);
>+						result.reject(messages["AlreadyExistsInDirErr"]);
> 					}
> 				} else {
> 					parentNode = parentNode || this.getCurrentDirectory();
>@@ -86,7 +86,7 @@
> 											/* directory already exists, so nothing to do */
> 											result.resolve(children[i]);
> 										} else {
>-											result.reject(messages["Cannot create directory, it already exists as a file"]);
>+											result.reject(messages["AlreadyExistsInDirErr"]);
> 										}
> 										return;
> 									}
>@@ -115,7 +115,7 @@
> 					if (!file.Directory) {
> 						result.resolve(file);
> 					} else {
>-						result.reject(messages["Cannot create file, it already exists as a directory"]);
>+						result.reject(messages["AlreadyExistsInDirErr"]);
> 					}
> 				} else {
> 					parentNode = parentNode || this.getCurrentDirectory();
>@@ -129,7 +129,7 @@
> 											/* file already exists, so nothing to do */
> 											result.resolve(children[i]);
> 										} else {
>-											result.reject(messages["Cannot create file, it already exists as a directory"]);
>+											result.reject(messages["AlreadyExistsInDirErr"]);
> 										}
> 										return;
> 									}
>@@ -236,7 +236,7 @@
> 				var sourceService = fileClient._getService(node.Location);
> 				if (!sourceService.readBlob) {
> 					var promise = new Deferred();
>-					promise.reject(messages["Source file service does not support binary read"]);
>+					promise.reject(messages["SrcNotSupportBinRead"]);
> 					return promise;
> 				}
> 				return sourceService.readBlob(node.Location);
>@@ -299,7 +299,7 @@
> 				var targetService = fileClient._getService(node.Location);
> 				if (!targetService.writeBlob) {
> 					var promise = new Deferred();
>-					promise.reject(messages["Target file service does not support binary write"]);
>+					promise.reject(messages["TargetNotSupportBinWrite"]);
> 					return promise;
> 				}
> 				return targetService.writeBlob(node.Location, content);
>diff --git a/bundles/org.eclipse.orion.client.ui/web/stringexternalizer/strExternalizerModel.js b/bundles/org.eclipse.orion.client.ui/web/stringexternalizer/strExternalizerModel.js
>index 3b140b5..9d3ca75 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/stringexternalizer/strExternalizerModel.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/stringexternalizer/strExternalizerModel.js
>@@ -162,7 +162,7 @@
> return {
> name: modelItem.fullPathName,
> href: require.toUrl("stringexternalizer/strExternalizer.html") + "#" + modelItem.parentLocation, //$NON-NLS-1$ //$NON-NLS-0$,
>- tooltip: i18nUtil.formatMessage(messages["Externalize string from ${0} only"], modelItem.fullPathName)
>+ tooltip: i18nUtil.formatMessage(messages["ExternalizeStrMsg"], modelItem.fullPathName)
> };
> };
> 
>@@ -313,7 +313,7 @@
> return this.registry.getService("orion.page.progress").progress(this.fileClient.read(fileItem.Location, true), "Reading file metadata " + fileItem.Location).then(function(metadata) {
> //If the file has been modified by others when trying to write it, we should report this status in the report list
> if (fileItem.LocalTimeStamp !== metadata.LocalTimeStamp) {
>- _writeReport(reportList, fileItem, false, messages["Resource has been changed by others"]);
>+ _writeReport(reportList, fileItem, false, messages["ResourceChanged"]);
> } else if (!fileItem.contents) {//If fiel item does not have contents yet, we should get the contents first
> return that.registry.getService("orion.page.progress").progress(that.fileClient.read(fileItem.Location), "Reading file " + fileItem.Location).then(function(contents) {
> fileItem.contents = contents;
>diff --git a/bundles/org.eclipse.orion.client.ui/web/stringexternalizer/stringexternalizerconfig.js b/bundles/org.eclipse.orion.client.ui/web/stringexternalizer/stringexternalizerconfig.js
>index dfc3f3a..5e2a968 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/stringexternalizer/stringexternalizerconfig.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/stringexternalizer/stringexternalizerconfig.js
>@@ -24,7 +24,7 @@
> 		createCommands: function() {
> 			var changeMessagesDirectory = new mCommands.Command({
> 				name: messages["Change Directory"],
>-				tooltip: messages["Change messages directory"],
>+				tooltip: messages["Change msg dir"],
> 				id: "eclipse.changeMessagesDirectory", //$NON-NLS-0$
> 				callback: function(data) {
> 					var dialog = new DirPrompter.DirectoryPrompterDialog({
>@@ -77,7 +77,7 @@
> 			}
> 			var section = new mSection.Section(this.parent, {
> 				id: "stringexternalizerConfigSection", //$NON-NLS-0$
>-				title: messages["Externalize Strings Configuration"],
>+				title: messages["ExternalizeStrConfig"],
> 				content: '<div id="stringexternalizerConfigContent"></div>', //$NON-NLS-0$
> 				preferenceService: this.serviceRegistry.getService("orion.core.preference"), //$NON-NLS-0$
> 				canHide: false,
>@@ -149,7 +149,7 @@
> 			sectionContent.appendChild(p);
> 			b = document.createElement("b"); //$NON-NLS-0$
> 			p.appendChild(b);
>-			b.appendChild(document.createTextNode(messages["Mark not exported as NON-NLS:"]));
>+			b.appendChild(document.createTextNode(messages["MarkNotNON-NLS"]));
> 			p.appendChild(document.createElement("br")); //$NON-NLS-0$
> 			var markNls = document.createElement("input"); //$NON-NLS-0$
> 			markNls.type = "checkbox"; //$NON-NLS-0$
>diff --git a/bundles/org.eclipse.orion.client.users/web/orion/profile/UsersList.js b/bundles/org.eclipse.orion.client.users/web/orion/profile/UsersList.js
>index c7359f9..5a22690 100644
>--- a/bundles/org.eclipse.orion.client.users/web/orion/profile/UsersList.js
>+++ b/bundles/org.eclipse.orion.client.users/web/orion/profile/UsersList.js
>@@ -174,7 +174,7 @@
> 			var diskUsageTextContent = '\u00a0'; //$NON-NLS-0$
> 			if (diskUsage !== " ") {
> 				var diskUsageTimestamp = item.diskUsageTimestamp ? new Date(parseInt(item.diskUsageTimestamp, 10)).toLocaleString() : '\u00a0'; //$NON-NLS-0$
>-				diskUsageTextContent = i18nUtil.formatMessage(messages["${0} ( last calculated ${1} )"], diskUsage, diskUsageTimestamp); //$NON-NLS-1$ //$NON-NLS-0$
>+				diskUsageTextContent = i18nUtil.formatMessage(messages["A(lastCalculated B)"], diskUsage, diskUsageTimestamp); //$NON-NLS-1$ //$NON-NLS-0$
> 			};
> 			td.textContent = diskUsageTextContent;
> 			return td;
>diff --git a/bundles/org.eclipse.orion.client.users/web/profile/nls/root/messages.js b/bundles/org.eclipse.orion.client.users/web/profile/nls/root/messages.js
>index c2f25df..4c39397 100644
>--- a/bundles/org.eclipse.orion.client.users/web/profile/nls/root/messages.js
>+++ b/bundles/org.eclipse.orion.client.users/web/profile/nls/root/messages.js
>@@ -53,5 +53,5 @@
> 	"Create" : "Create",
> 	"Set Password" : "Set Password",
> 	"Permission to view user list denied." : "Permission to view user list denied.",
>-	"${0} ( last calculated ${1} )" : "${0} ( last calculated ${1} )"
>+	"A(lastCalculated B)" : "${0} ( last calculated ${1} )"
> });
>\ No newline at end of file

Actions: View | Diff

Attachments on bug 390235: 246979