Attachment #246979 for bug #390235

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

View | Details | Raw Unified | Return to bug 390235
Collapse All | Expand All




	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 i18nUtil.formatMessage("${0} is not supported in this file system", funcName);
		}
		return fileService[funcName].apply(fileService, funcArgs);
	}

	function _copy(sourceService, sourceLocation, targetService, targetLocation) {
		
		if (!sourceService.readBlob) {
			throw messages["SrcNotSupportBinRead"];
		}

		if (!targetService.writeBlob) {
			throw messages["TargetNotSupportBinWrite"];
		}
	
		if (sourceLocation[sourceLocation.length -1] !== "/") { //$NON-NLS-0$

Lines 26-32 Link Here

(-)a/bundles/org.eclipse.orion.client.core/web/orion/operationsClient.js (-1 / +1 lines)
26		26
27	function returnNoMatchingError() {	27	function returnNoMatchingError() {
28	var result = new Deferred();	28	var result = new Deferred();
29	result.reject(messages["No Matching OperationService for location:"] + this._location);	29	result.reject(messages["NoMatchingOpSrvLocation"] + this._location);
30	return result;	30	return result;
31	}	31	}
32		32




	"Branch name": "Branch name",
	"Delete": "Delete",
	"Delete the local branch from the repository": "Delete the local branch from the repository",
	"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.",

	"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 each": "Compare With Each Other",
	"Compare With Working Tree": "Compare With Working Tree",
	"Open": "Open",
	"OpenGitCommitTip": "View the tree for this commit",

	"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: ",




				if (error.status === 401) {
					display.HTML = true;
					display.Message = "<span>"; //$NON-NLS-0$
					display.Message += i18nUtil.formatMessage("Authentication required for: ${0}. <a target=\"_blank\" href=\"${1}\">${2}</a> and re-try the request. </span>", resp.label, resp.SignInLocation, messages["Login"]); //$NON-NLS-0$
					+ "\">" + messages["Login"] + "</a>") + "</span>"; //$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-0$
				} else {
					display.Message = resp.DetailedMessage ? resp.DetailedMessage : (resp.Message ? resp.Message : messages["Problem while performing the action"]);
				}

			callback: function(data) {
				var item = data.items;
				var progress = serviceRegistry.getService("orion.page.progress"); //$NON-NLS-0$
				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);

		commandService.addCommand(openCloneContent);

		var compareGitCommits = new mCommands.Command({
			name : messages["Compare each"],
			id : "eclipse.compareGitCommits", //$NON-NLS-0$
			hrefCallback : function(data) {
				var item = data.items;

Lines 96-103 Link Here

(-)a/bundles/org.eclipse.orion.client.git/web/orion/git/logic/gitCommit.js (-3 / +2 lines)
96	if (error.status === 401) {	96	if (error.status === 401) {
97	display.HTML = true;	97	display.HTML = true;
98	display.Message = "<span>"; //$NON-NLS-0$	98	display.Message = "<span>"; //$NON-NLS-0$
99	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$	99	display.Message += i18nUtil.formatMessage("Authentication required for: ${0}. <a target=\"_blank\" href=\"${1}\">${2}</a> and re-try the request. </span>", resp.label, resp.SignInLocation, messages["Login"]); //$NON-NLS-0$
100	+ "\">" + messages["Login"] + "</a>") + "</span>"; //$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-0$
101	} else {	100	} else {
102	display.Message = resp.DetailedMessage ? resp.DetailedMessage : (resp.Message ? resp.Message : messages["Problem while performing the action"]);	101	display.Message = resp.DetailedMessage ? resp.DetailedMessage : (resp.Message ? resp.Message : messages["Problem while performing the action"]);
103	}	102	}
Lines 165-168 Link Here
165	setGitCloneConfig: setGitCloneConfig	164	setGitCloneConfig: setGitCloneConfig
166	};	165	};
167	};	166	};
168	});	167	});




					// 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["ResrcOutOfSync"]);
						if (forceSave) {
							// repeat save operation, but without ETag 
							progressService.progress(fileClient.write(targetMetadata.Location, contents), "Saving file " + targetMetadata.Location).then(

				var parent = lib.node("delegatedContent"); //$NON-NLS-0$
				lib.empty(parent);
				var message = document.createElement("div"); //$NON-NLS-0$
				message.appendChild(document.createTextNode(messages["PluginContentNotFound"]));
				parent.appendChild(message);
			}
		}

					if (data.shellService) {
						if (data.sourceLocation) {
							saveFileContents(fileClient, fileMetadata, {sourceLocation: data.sourceLocation}, function() {
								if (window.confirm(messages["ContentSavedMsg"])) {
									// go to the navigator
									window.location.href = orionHome + "/edit/edit.html#" + fileMetadata.Parents[0].ChildrenLocation; //$NON-NLS-0$
								} else {




				return;
			}
			var copyToLeftCommand = new mCommands.Command({
				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$

					data.items.copyToLeft();
			}});
			var copyToRightCommand = new mCommands.Command({
				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$

Lines 235-241 Link Here

(-)a/bundles/org.eclipse.orion.client.ui/web/orion/compare/compareTreeExplorer.js (-1 / +1 lines)
235	if(this._compareResults.length > 0){	235	if(this._compareResults.length > 0){
236	this._loadOneFileMetaData(0,function(){that._renderUI(); that._addOptions();});	236	this._loadOneFileMetaData(0,function(){that._renderUI(); that._addOptions();});
237	} else {	237	} else {
238	var message = i18nUtil.formatMessage(messages["${0} files compared. The two folders are identical."], this._totalFiles);	238	var message = i18nUtil.formatMessage(messages["NoFoldersIdentical"], this._totalFiles);
239	var parentNode = lib.node(this.parentId);	239	var parentNode = lib.node(this.parentId);
240	parentNode.textContent = "";	240	parentNode.textContent = "";
241	var textBold = _createElement('b', null, null, parentNode); //$NON-NLS-1$ //$NON-NLS-0$	241	var textBold = _createElement('b', null, null, parentNode); //$NON-NLS-1$ //$NON-NLS-0$

Lines 70-76 Link Here

(-)a/bundles/org.eclipse.orion.client.ui/web/orion/compare/diffProvider.js (-1 / +1 lines)
70	return _services[i];	70	return _services[i];
71	}	71	}
72	}	72	}
73	throw messages["No Matching DiffService for location:"] + location;	73	throw messages["NoDiffServiceLocationMatched"] + location;
74	};	74	};
75	}	75	}
76		76




//NLS_CHARSET=UTF-8
/*eslint-env browser, amd*/
define({
	"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",
	"GenerateCurDiffLink": "Generate link of the current diff",
	"Generate Link": "Generate Link",
	"Next diff block": "Next diff block",
	"Previous diff block": "Previous diff block",

	"Options": "Options",
	"Sort by folders": "Sort by folders",
	"Line 0 : Col 0": "Line 0 : Col 0",
	"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$

Lines 334-340 Link Here

(-)a/bundles/org.eclipse.orion.client.ui/web/orion/compare/resourceComparer.js (-1 / +1 lines)
334	if(cmdProvider && cmdProvider.getOptions().commandSpanId) {	334	if(cmdProvider && cmdProvider.getOptions().commandSpanId) {
335	var commandSpanId = cmdProvider.getOptions().commandSpanId;	335	var commandSpanId = cmdProvider.getOptions().commandSpanId;
336	var generateLinkCommand = new mCommands.Command({	336	var generateLinkCommand = new mCommands.Command({
337	tooltip : messages["Generate link of the current diff"],	337	tooltip : messages["GenerateCurDiffLink"],
338	name: messages["Generate Link"],	338	name: messages["Generate Link"],
339	//imageClass : "core-sprite-link", //$NON-NLS-0$	339	//imageClass : "core-sprite-link", //$NON-NLS-0$
340	id: "orion.compare.generateLink", //$NON-NLS-0$	340	id: "orion.compare.generateLink", //$NON-NLS-0$

Lines 11-19 Link Here

(-)a/bundles/org.eclipse.orion.client.ui/web/orion/content/nls/root/messages.js (-4 / +4 lines)
11	//NLS_CHARSET=UTF-8	11	//NLS_CHARSET=UTF-8
12	/eslint-env browser, amd/	12	/eslint-env browser, amd/
13	define({	13	define({
14	"Plugin content could not be found": "Plugin content could not be found",	14	"PluginContentNotFound": "Plugin content could not be found",
15	"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.",	15	"ContentSavedMsg": "Content has been saved. Click OK to go to the navigator, Cancel to keep editing.",
16	"Content plugin ${0} has saved data.": "Content plugin ${0} has saved data.",	16	"ContentSavedData": "Content plugin ${0} has saved data.",
17	"Save": "Save",	17	"Save": "Save",
18	"Click ${0} to store this file into Orion.": "Click ${0} to store this file into Orion."	18	"StoreFileMsg": "Click ${0} to store this file into Orion."
19	});	19	});




 ******************************************************************************/

//NLS_CHARSET=UTF-8
/*eslint-env browser, amd*/
define({
	"filesFound": "${0} files found out of ${1}",
	"searchCancelled": "Search cancelled by user",
	"${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",
	"Cancel": "Cancel"
});




	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["searchCancelled"], Severity: "Warning"}); //$NON-NLS-0$
		}
	};
		

		if(this.searchHelper.params.keyword === ""){
			this._reportSingleHit(fileObj);
			if(this._statusService) {
				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$

						self._reportSingleHit(fileObj);
					}
					if(self._statusService) {
						self._statusService.setProgressResult({Message: i18nUtil.formatMessage(messages["filesFound"], self._hitCounter, self._totalCounter)}, messages["Cancel"]);
					}
				},
				function(error) {




/*eslint-env browser, amd*/
define([
	"orion/objects",
	"orion/serviceTracker",
	"orion/i18nUtil"
], function(objects, ServiceTracker, i18nUtil) {

	function err(msg, serviceRef) {
		throw new Error(i18nUtil.formatMessage("${0} [service id: ${1}]", msg, serviceRef.getProperty("service.id"))); //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-0$ 
	}

	/**




					if (entry.isFile) {
						// can't drop files directly into workspace.
						if (targetIsRoot){ //$NON-NLS-0$
							internalErrorHandler(messages["Create folder first err"]); //$NON-NLS-0$
						} else {
							entry.file(function(file) {
								if (deferredWrapper) {

									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 file err"] + file.name;
											if (statusService) {
												statusService.setProgressResult({Severity: "Error", Message: errorMessage}); //$NON-NLS-0$ 
											} else {

							// 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["Folder drop not supported"], file.name)); //$NON-NLS-0$
							} else if (mFileUtils.isAtRoot(item.Location)){ //$NON-NLS-0$
								errorHandler(messages["Create folder first err"]); //$NON-NLS-0$ 
							} else {
								explorer._uploadFile(item, file, true);
							}

							this.changedItem(targetItem);
						}.bind(this),
						error: function(event) {
							var errorMessage = messages["Uploading file err"] + file.name; //$NON-NLS-0$
							if (statusService) {
								statusService.setProgressResult({Severity: "Error", Message: errorMessage});	//$NON-NLS-0$ 
							} else {




								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 name"], item.Name), i18nUtil.formatMessage(messages["Copy of ${0}"], item.Name));
									// user cancelled?  don't copy this one
									if (!newName) {
										location = null;

			if (proposedPaths.length > 0) {
				choices.push({});  //separator
			}
			choices.push({name: messages["Choose folder"], callback: prompt});
			return choices;
		}



		var renameCommand = new mCommands.Command({
				name: messages["Rename"],
				tooltip: messages["Rename files or folders"],
				imageClass: "core-sprite-rename", //$NON-NLS-0$
				id: "eclipse.renameResource", //$NON-NLS-0$
				visibleWhen: function(item) {

		
		var contentTypeService = new mContentTypes.ContentTypeRegistry(serviceRegistry);
		var compareWithEachOtherCommand = new mCommands.Command({
				name: messages["Compare each"],
				tooltip: messages["Compare 2 files"],
				id: "eclipse.compareWithEachOther", //$NON-NLS-0$
				visibleWhen: function(item) {
					if (!explorer || !explorer.isCommandsVisible()) {

		
		var compareWithCommand = new mCommands.Command({
			name : messages["Compare with..."],
			tooltip: messages["Compare folders"], 
			id: "eclipse.compareWith", //$NON-NLS-0$
			visibleWhen: function(item) {
				if (!explorer || !explorer.isCommandsVisible()) {

			visibleWhen: oneOrMoreFilesOrFolders,
			callback: function(data) {
				var items = Array.isArray(data.items) ? data.items : [data.items];
				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) {

		commandService.addCommand(deleteCommand);
	
		var downloadCommand = new mCommands.Command({
			name: messages["Zip"],
			tooltip: messages["Zip Download"],
			imageClass: "core-sprite-exportzip", //$NON-NLS-0$
			id: "eclipse.downloadFile", //$NON-NLS-0$
			visibleWhen: function(item) {


		var importZipURLCommand = new mCommands.Command({
			name: messages["Import from HTTP..."],
			tooltip: messages["import frm url"],
			id: "orion.importZipURL", //$NON-NLS-0$
			parameters: zipURLParameters,
			callback: function(data) {

			name: messages["New Folder"],
			imageClass: "core-sprite-new_folder", //$NON-NLS-0$
			tooltip: messages["Create an empty folder"],
			description: messages["Create empty folder msg"],
			id: "orion.new.project", //$NON-NLS-0$
			callback: function(data) {
				var item;

		
		var linkProjectCommand = new mCommands.Command({
			name: messages["Link to 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$

				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["name location not clear"]);
				}
			},
			visibleWhen: canCreateProject

		
		var goUpCommand = new mCommands.Command({
			name: messages["Go Up"],
			tooltip: messages["cd parent"],
			imageClass: "core-sprite-go-up", //$NON-NLS-0$
//			addImageClassToElement: true,
			id: "eclipse.upFolder", //$NON-NLS-0$


		var goIntoCommand = new mCommands.Command({
			name: messages["Go Into"],
			tooltip: messages["cd selected"],
			imageClass: "core-sprite-go-down", //$NON-NLS-0$
			id: "eclipse.downFolder", //$NON-NLS-0$
			callback: function(data) {

					
		var importCommand = new mCommands.Command({
			name : messages["File or zip archive"],
			tooltip: messages["import local file"],
			imageClass: "core-sprite-importzip", //$NON-NLS-0$
			id: "orion.import", //$NON-NLS-0$
			callback : function(data) {

	
		var importSFTPCommand = new mCommands.Command({
			name : messages["SFTP from..."],
			tooltip: messages["cpy from SFTP"],
			imageClass: "core-sprite-transferin", //$NON-NLS-0$
			id: "orion.importSFTP", //$NON-NLS-0$
			callback : function(data) {

	
		var exportSFTPCommand = new mCommands.Command({
			name : messages["SFTP to..."],
			tooltip: messages["cpy to SFTP"],
			imageClass: "core-sprite-transferout", //$NON-NLS-0$
			id: "eclipse.exportSFTPCommand", //$NON-NLS-0$
			callback : function(data) {

		
		var moveCommand = new mCommands.Command({
			name : messages["Move to"],
			tooltip: messages["mv to new dir"],
			id: "eclipse.moveFile", //$NON-NLS-0$
			choiceCallback: function(items, userData) {
				return makeMoveCopyTargetChoices(items, userData, false);




/*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/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'
	],
	function (messages, require, commonHTML, KeyBinding, EventTarget, mCommands, mParameterCollectors, mExtensionCommands, 
		mBreadcrumbs, lib, i18nUtil, mSplitter, mDropdown, mTooltip, mContentTypes, mKeyAssist, mThemePreferences, mThemeData, Deferred,
		mUserMenu, PageLinks, openResource, BannerTemplate, FooterTemplate, ToolbarTemplate, util, mCustomGlobalCommands, mFileClient, SideMenu, objects) {
		SideMenu, objects, i18nUtil) {
	/**
	 * This class contains static utility methods. It is not intended to be instantiated.
	 *


	function startProgressService(serviceRegistry) {
		var progressPane = lib.node("progressPane"); //$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$

		var parent = lib.node(parentId);

		if (!parent) {
			throw i18nUtil.formatMessage("could not find banner parent, id was ${0}", parentId);
		}
		// place the HTML fragment for the header.
		var range = document.createRange();

		};

		var openResourceCommand = new mCommands.Command({
			name: messages["FindFile"],
			tooltip: messages["ChooseFileOpenEditor"],
			id: "orion.openResource", //$NON-NLS-0$
			callback: function (data) {
				openResourceDialog(searcher, serviceRegistry);

			// Toggle trim command
			var toggleBanner = new mCommands.Command({
				name: messages["Toggle banner and footer"],
				tooltip: messages["HideShowBannerFooter"],
				id: "orion.toggleTrim", //$NON-NLS-0$
				callback: toggleBannerFunc
			});

			});
			var keyAssistCommand = new mCommands.Command({
				name: messages["Show Keys"],
				tooltip: messages["ShowAllKeyBindings"],
				id: "orion.keyAssist", //$NON-NLS-0$
				callback: function () {
					if (keyAssist.isVisible()) {

Lines 592-598 Link Here

(-)a/bundles/org.eclipse.orion.client.ui/web/orion/inlineSearchResultExplorer.js (-2 / +2 lines)
592	statusMessage = item.message;	592	statusMessage = item.message;
593	break;	593	break;
594	case "pass": //$NON-NLS-0$	594	case "pass": //$NON-NLS-0$
595	statusMessage = item.model.totalMatches ? i18nUtil.formatMessage(messages["${0} out of ${1} matches replaced."], item.matchesReplaced, item.model.totalMatches) : item.message; //$NON-NLS-0$	595	statusMessage = item.model.totalMatches ? i18nUtil.formatMessage(messages["matchesReplacedMsg"], item.matchesReplaced, item.model.totalMatches) : item.message; //$NON-NLS-0$
596	break;	596	break;
597	}	597	}
598	td.appendChild(document.createTextNode(statusMessage));	598	td.appendChild(document.createTextNode(statusMessage));
Lines 1235-1241 Link Here
1235	if (pagingParams.numberOnPage === 0) {	1235	if (pagingParams.numberOnPage === 0) {
1236	var message = messages["No matches"];	1236	var message = messages["No matches"];
1237	if(this.model._provideSearchHelper){	1237	if(this.model._provideSearchHelper){
1238	message = i18nUtil.formatMessage(messages["No matches found for ${0}"], this.model._provideSearchHelper().displayedSearchTerm);	1238	message = i18nUtil.formatMessage(messages["NoMatchFound"], this.model._provideSearchHelper().displayedSearchTerm);
1239	}	1239	}
1240	this.parentNode.textContent = "";	1240	this.parentNode.textContent = "";
1241	var textBold = _createElement('b', null, null, this.parentNode); //$NON-NLS-1$ //$NON-NLS-0$	1241	var textBold = _createElement('b', null, null, this.parentNode); //$NON-NLS-1$ //$NON-NLS-0$




//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": "Externalize strings from JavaScript files in this folder.",
	"Choose a Folder": "Choose a Folder",
	"Copy of ${0}": "Copy of ${0}",
	"Enter name": "Enter a new name for '${0}'",
	"Choose folder": "Choose folder...",
	"Rename": "Rename",
	"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 folders": "Compare the selected folder with a specified folder",
	"Delete": "Delete",
	"Unknown item": "Unknown item",
	"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:",

	"Creating folder": "Creating folder",
	"Folder": "Folder",
	"Create an empty folder": "Create an empty folder",
	"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 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:",
	"name location not clear": "The name and server location were not specified.",
	"Go Up": "Go Up",
	"cd parent": "Move up to the parent folder",
	"Go Into": "Go Into",
	"cd selected": "Move into the selected folder",
	"File or zip archive": "File or zip archive",
	"import local file": "Import a file or zip archive from your local file system",
	"SFTP from...": "SFTP",
	"cpy from SFTP": "Copy files and folders from a specified SFTP connection",
	"Importing from ${0}": "Importing from ${0}",
	"SFTP to...": "SFTP",
	"cpy to SFTP": "Copy files and folders to a specified SFTP location",
	"Exporting": "Exporting to ${0}",
	"Pasting ${0}": "Pasting ${0}",
	"Copy to": "Copy to",

	"Deleting ${0}": "Deleting ${0}",
	"Creating ${0}": "Creating ${0}",
	"Linking to ${0}": "Linking to ${0}",
	"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 frm url": "Import a file from a URL and optionally unzip it",
	"Unzip *.zip files:": "Unzip *.zip files:",
	"Extracted from:": "Extracted from:",
	"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 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.",




	"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.",
	"ShowAllKeyBindings": "Show a list of all the keybindings on this page",
	"Show Keys": "Show Keys",
	"HideShowBannerFooter": "Hide or show the page banner and footer",
	"Toggle banner and footer": "Toggle banner and footer",
	"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",
	"NoSearchAvailableErr": "Can't search: no search service is available",
	"could not find banner parent, id was ": "could not find banner parent, id was ",
	"Related": "Related",
	"Options": "Options",
	"FAQ": "FAQ",

	"no tree model": "no tree model",
	"no renderer": "no renderer",
	"could not find table row ": "could not find table row ",
	"ResrcOutOfSync": "Resource is out of sync with the server. Do you want to save it anyway?",
	"Operations": "Operations",
	"Operations running": "Operations running",
	"SomeOpWarning": "Some operations finished with warning",
	"SomeOpErr": "Some operations finished with error",
	"no service registry": "no service registry",
	"Tasks": "Tasks",
	"Close": "Close",

	"Global search" : "Global search",
	"Orion Home" : "Orion Home",
	"Close notification" : "Close notification",
	"OpPressSpaceMsg" : "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",
	"Toggle side panel" : "Toggle side panel",
	"Open or close the side panel": "Open or close the side panel",
	"Projects" : "Projects",

	"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}",




/*eslint-env browser, amd*/
define({
	"More": "More",
	"NoMatchingOpSrvLocation": "No Matching OperationService for location:",
	"No operations services registered.": "No operations services registered.",
	"could not find toolbar ": "could not find toolbar ",
	"Remove Completed": "Remove Completed",
	"rmCompleted": "Remove all completed operations",
	"Remove": "Remove",
	"rmFromOpList": "Remove operations from the operations list.",
	"Cancel": "Cancel",
	"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",




		
			var removeCompletedOperationsCommand = new mCommands.Command({
				name : messages["Remove Completed"],
				tooltip : messages["rmCompleted"],
				id : "eclipse.removeCompletedOperations", //$NON-NLS-0$
				callback : function(data) {
					operationsClient.removeCompletedOperations().then(function(item){

			
			var removeOperationCommand = new mCommands.Command({
				name : messages["Remove"],
				tooltip : messages["rmFromOpList"],
				imageClass: "core-sprite-delete", //$NON-NLS-0$
				id : "eclipse.removeOperation", //$NON-NLS-0$
				callback : function(data) {

			
			var cancelOperationCommand = new mCommands.Command({
				name : messages["Cancel"],
				tooltip : messages["CancelOp"],
				imageClass: "core-sprite-stop", //$NON-NLS-0$
				id : "eclipse.cancelOperation", //$NON-NLS-0$
				callback : function(data) {




					this._switchIconTo("running"); //$NON-NLS-0$
					break;
				case "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["SomeOpErr"];
					this._progressPane.alt = messages['SomeOpErr'];
					this._progressPane.setAttribute("aria-valuetext", messages['SomeOpErr']); //$NON-NLS-0$
					this._switchIconTo("error"); //$NON-NLS-0$
					break;
				default:




	"Show Replace": "Switch to Replace Mode",
	"Hide Replace": "Switch to Search Mode",
	"Search ${0}": "Search ${0}",
	"TypeKeyOrWildCard": "Type a keyword or wild card to search in ",
	"Search failed.": "Search failed.",
	"NoMatchFound": "No matches found for ${0}",
	"Searching...": "Searching...",
	"ResourceChanged.": "Resource has been changed by others.",
	"Failed to write file.": "Failed to write file.",
	"Results": "Results",
	"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",
	"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",

	"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",

	"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.",
	"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",

Lines 277-283 Link Here

(-)a/bundles/org.eclipse.orion.client.ui/web/orion/searchAndReplace/textSearcher.js (-1 / +1 lines)
277	onDelete: function(item, evtTarget) {	277	onDelete: function(item, evtTarget) {
278	this._removeRecentSearch(item, evtTarget);	278	this._removeRecentSearch(item, evtTarget);
279	}.bind(this),	279	}.bind(this),
280	deleteToolTips: messages['Click or use delete key to delete the search term']	280	deleteToolTips: messages['DeleteSearchTrmMsg']
281	});	281	});
282	}	282	}
283	},	283	},

Lines 158-164 Link Here

(-)a/bundles/org.eclipse.orion.client.ui/web/orion/searchClient.js (-2 / +2 lines)
158	if (!foundValidHit) {	158	if (!foundValidHit) {
159	// only display no matches found if we have a proper name	159	// only display no matches found if we have a proper name
160	if (queryName) {	160	if (queryName) {
161	var errorStr = i18nUtil.formatMessage(messages["No matches found for ${0}"], queryName);	161	var errorStr = i18nUtil.formatMessage(messages["NoMatchFound"], queryName);
162	lib.empty(resultsNode);	162	lib.empty(resultsNode);
163	resultsNode.appendChild(document.createTextNode(errorStr));	163	resultsNode.appendChild(document.createTextNode(errorStr));
164	if (typeof(onResultReady) === "function") { //$NON-NLS-0$	164	if (typeof(onResultReady) === "function") { //$NON-NLS-0$
Lines 295-301 Link Here
295	}	295	}
296	}	296	}
297	if(searchInputDom && searchInputDom.title){	297	if(searchInputDom && searchInputDom.title){
298	searchInputDom.title = messages["Type a keyword or wild card to search in "] + locationName;	298	searchInputDom.title = messages["TypeKeyOrWildCard"] + locationName;
299	}	299	}
300	},	300	},
301	setLocationbyURL: function(locationURL){	301	setLocationbyURL: function(locationURL){

Lines 587-593 Link Here

(-)a/bundles/org.eclipse.orion.client.ui/web/orion/searchExplorer.js (-2 / +2 lines)
587	statusMessage = item.message;	587	statusMessage = item.message;
588	break;	588	break;
589	case "pass": //$NON-NLS-0$	589	case "pass": //$NON-NLS-0$
590	statusMessage = item.model.totalMatches ? i18nUtil.formatMessage(messages["${0} out of ${1} matches replaced."], item.matchesReplaced, item.model.totalMatches) : item.message;	590	statusMessage = item.model.totalMatches ? i18nUtil.formatMessage(messages["matchesReplacedMsg"], item.matchesReplaced, item.model.totalMatches) : item.message;
591	break;	591	break;
592	}	592	}
593	var td = _createElement('td', "search_report", null, null); //$NON-NLS-1$ //$NON-NLS-0$	593	var td = _createElement('td', "search_report", null, null); //$NON-NLS-1$ //$NON-NLS-0$
Lines 1347-1353 Link Here
1347	}	1347	}
1348	var message = messages["No matches"];	1348	var message = messages["No matches"];
1349	if(this.model._provideSearchHelper){	1349	if(this.model._provideSearchHelper){
1350	message = i18nUtil.formatMessage(messages["No matches found for ${0}"], this.model._provideSearchHelper().displayedSearchTerm);	1350	message = i18nUtil.formatMessage(messages["NoMatchFound"], this.model._provideSearchHelper().displayedSearchTerm);
1351	}	1351	}
1352	this.parentNode.textContent = "";	1352	this.parentNode.textContent = "";
1353	var textBold = _createElement('b', null, null, this.parentNode); //$NON-NLS-1$ //$NON-NLS-0$	1353	var textBold = _createElement('b', null, null, this.parentNode); //$NON-NLS-1$ //$NON-NLS-0$




                var endNumber = startNumber + pagingParams.numberOnPage - 1;
                headerStr = "";
                if (!this.replaceMode()) {
                    headerStr = i18nUtil.formatMessage(messages["FilesAofBmatchingC"],
                    startNumber + "-" + endNumber, pagingParams.totalNumber, this._searchHelper.displayedSearchTerm); //$NON-NLS-0$
                } else {
                    headerStr = i18nUtil.formatMessage(messages["ReplaceAwithBforCofD"],
                    this._searchHelper.displayedSearchTerm,
                    this._searchHelper.params.replace,
                    startNumber + "-" + endNumber, //$NON-NLS-0$

                   if (error.status === 412) {
                       reportList.push({
                           model: fileItem,
                           message: messages["ResourceChanged."],
                           matchesReplaced: matchesReplaced,
                           status: "failed" //$NON-NLS-0$
                       });

Lines 62-68 Link Here

(-)a/bundles/org.eclipse.orion.client.ui/web/orion/searchUtils.js (-1 / +1 lines)
62	return searchParams;	62	return searchParams;
63	}	63	}
64	} else {	64	} else {
65	window.alert(messages["Can't search: no search service is available"]);	65	window.alert(messages["NoSearchAvailableErr"]);
66	}	66	}
67		67
68	return null;	68	return null;




	"Update Profile Settings": "Update Profile Settings",
	"Update Git User Settings": "Update Git User Settings",
	"Update Git Credentials": "Update Git Credentials",
	"UsrProfileUpdateSuccess": "User profile data successfully updated.",
	"GitUsrUpdateSuccess": "Git user data successfully updated.",
	"GitCredsUpdateSuccess": "Git Credentials successfully updated.",
	"Edit Plugin JavaScript": "Edit Plugin JavaScript",
	"Install Plugin": "Install Plugin",
	"Plugin Name:": "Plugin Name:",
	"Author Name:": "Author Name:",
	"Licence:": "Licence:",
	"Description:": "Description:",
	"OrionPlugin": "A plugin for Orion",
	"Plugin Link": "Plugin Link",
	"Install": "Install",
	"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",
	"ReloadAllPlugs": "Reload all installed plugins",
	"CreatePlug": "Create a new Orion Plugin",
	"FindMorePlugs": "Find More Orion Plugins",
	"Get Plugins": "Get Plugins",
	"Reload": "Reload",
	"ReloadPlug": "Reload the plugin",
	"Delete": "Delete",
	"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!",
	"TypePlugURL": "Type a plugin url here ...",
	"Installed ": "Installed ",
	"Installing ": "Installing ",
	"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",
	"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:",
	"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",
	"DeletedGitMsg": "Deleted git credentials for ${0}",
	"Editor": "Editor",
	"editorSettings": "Settings",
	"EditorThemes": "Themes",

    '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$
    "SettingUpdateSuccess": "${0} settings successfully updated."
});

Lines 143-149 Link Here

(-)a/bundles/org.eclipse.orion.client.ui/web/orion/settings/ui/PluginSettings.js (-1 / +1 lines)
143	this.node = parentNode;	143	this.node = parentNode;
144	this.config = this.defaultConfig = null;	144	this.config = this.defaultConfig = null;
145	this.messageService = this.serviceRegistry.getService("orion.page.message"); //$NON-NLS-0$	145	this.messageService = this.serviceRegistry.getService("orion.page.message"); //$NON-NLS-0$
146	this.updateMessage = i18nUtil.formatMessage(messages["${0} settings successfully updated."], this.categoryTitle);	146	this.updateMessage = i18nUtil.formatMessage(messages["SettingUpdateSuccess"], this.categoryTitle);
147	};	147	};
148	objects.mixin(PropertiesWidget.prototype, { //$NON-NLS-0$	148	objects.mixin(PropertiesWidget.prototype, { //$NON-NLS-0$
149	createElements: function() {	149	createElements: function() {

Lines 66-72 Link Here

(-)a/bundles/org.eclipse.orion.client.ui/web/orion/shell/Shell.js (-2 / +2 lines)
66	while (outputDiv.hasChildNodes()) {	66	while (outputDiv.hasChildNodes()) {
67	outputDiv.removeChild(outputDiv.lastChild);	67	outputDiv.removeChild(outputDiv.lastChild);
68	}	68	}
69	this.output(i18nUtil.formatMessage(messages["For a list of available commands type '${0}'."], "<b>help</b>")); //$NON-NLS-0$	69	this.output(i18nUtil.formatMessage(messages["AvailableCmdsType"], "<b>help</b>")); //$NON-NLS-0$
70	},	70	},
71	/**	71	/**
72	* Renders HTML content in the Shell's output area.	72	* Renders HTML content in the Shell's output area.
Lines 264-270 Link Here
264	setTimeout(function() {	264	setTimeout(function() {
265	this.commandOutputManager = new mCanon.CommandOutputManager();	265	this.commandOutputManager = new mCanon.CommandOutputManager();
266	mGCLI.createDisplay({commandOutputManager: this.commandOutputManager});	266	mGCLI.createDisplay({commandOutputManager: this.commandOutputManager});
267	this.output(i18nUtil.formatMessage(messages["For a list of available commands type '${0}'."], "<b>help</b>")); //$NON-NLS-0$	267	this.output(i18nUtil.formatMessage(messages["AvailableCmdsType"], "<b>help</b>")); //$NON-NLS-0$
268	}.bind(this), 1);	268	}.bind(this), 1);
269	mHelp.startup();	269	mHelp.startup();
270	mHelp.helpListHtml = mHelp.helpListHtml.replace("\"${includeIntro}\"","${false}"); //$NON-NLS-1$ //$NON-NLS-0$	270	mHelp.helpListHtml = mHelp.helpListHtml.replace("\"${includeIntro}\"","${false}"); //$NON-NLS-1$ //$NON-NLS-0$




	"Shell": "Shell",
	"Changed to: ": "Changed to: ",
	"Initial directory: ": "Initial directory: ",
	"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}",
	"'${0}' is not valid": "'${0}' is not valid",
	"Error: ${0}": "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",
	"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",
	"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",
	"InstallPlugFrmURL": "Installs a plug-in from a URL",
	"The plug-in URL": "The plug-in URL",
	"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.",
	"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"
	"The file or directory to re-direct output to": "The file or directory to re-direct output to"
});

Lines 311-317 Link Here

(-)a/bundles/org.eclipse.orion.client.ui/web/orion/sites/SiteEditor.js (-1 / +1 lines)
311	choices.push({}); // Separator	311	choices.push({}); // Separator
312	}	312	}
313	choices.push({	313	choices.push({
314	name: messages["Choose folder..."],	314	name: messages["Choose folder"],
315	imageClass: "core-sprite-folder", //$NON-NLS-0$	315	imageClass: "core-sprite-folder", //$NON-NLS-0$
316	callback: function() {	316	callback: function() {
317	var dialog = new DirPrompter.DirectoryPrompterDialog({	317	var dialog = new DirPrompter.DirectoryPrompterDialog({

Lines 24-30 Link Here

(-)a/bundles/org.eclipse.orion.client.ui/web/orion/sites/nls/root/messages.js (-2 / +2 lines)
24	"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",	24	"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",
25	"Save": "Save",	25	"Save": "Save",
26	"Save the site configuration": "Save the site configuration",	26	"Save the site configuration": "Save the site configuration",
27	"Choose folder...": "Choose folder\u2026",	27	"Choose folder": "Choose folder\u2026",
28	"ConvertToSelfHostingTitle": "Locate Required Folders",	28	"ConvertToSelfHostingTitle": "Locate Required Folders",
29	"SelectRequiredFoldersSingle": "Locate the following required folder in your workspace.",	29	"SelectRequiredFoldersSingle": "Locate the following required folder in your workspace.",
30	"SelectRequiredFolders": "Locate the following required folders in your workspace.",	30	"SelectRequiredFolders": "Locate the following required folders in your workspace.",
Lines 75-78 Link Here
75	"Mappings": "Mappings",	75	"Mappings": "Mappings",
76	"SitesExplorer.NoSitesText" : "You have no sites. Click ${0} to create a site.", // ${0} is replaced by create button.	76	"SitesExplorer.NoSitesText" : "You have no sites. Click ${0} to create a site.", // ${0} is replaced by create button.
77	"Edit Site": "Edit Site"	77	"Edit Site": "Edit Site"
78	});	78	});




/*eslint-env browser, amd*/
define({
	"Change Directory": "Change Directory",
	"Change msg dir": "Change messages directory",
	"ExternalizeStrConfig": "Externalize Strings Configuration",
	"Messages directory:": "Messages directory:",
	"Messages file name:": "Messages file name:",
	"Messages module:": "Messages module:",
	"MarkNotNON-NLS": "Mark not exported as NON-NLS:",
	"Writing files ${0} of ${1}": "Writing files ${0} of ${1}",
	"Files to externalize": "Files to externalize",
	"ExternalizeStrMsg": "Externalize string from ${0} only",
	"Writing files...": "Writing files...",
	"Passed": "Passed",
	"Failed": "Failed",
	"ResourceChanged": "Resource has been changed by others"
});

Lines 66-72 Link Here

(-)a/bundles/org.eclipse.orion.client.ui/web/orion/webui/dialogs/OpenResourceDialog.js (-2 / +2 lines)
66	}	66	}
67	this._searchRenderer = options.searchRenderer;	67	this._searchRenderer = options.searchRenderer;
68	if (!this._searchRenderer \|\| typeof(this._searchRenderer.makeRenderFunction) !== "function") { //$NON-NLS-0$	68	if (!this._searchRenderer \|\| typeof(this._searchRenderer.makeRenderFunction) !== "function") { //$NON-NLS-0$
69	throw new Error(messages['Missing required argument: searchRenderer']);	69	throw new Error(messages['MissingSearchRenderer']);
70	}	70	}
71	this._initialize();	71	this._initialize();
72	};	72	};
Lines 224-230 Link Here
224	var renderFunction = this._searchRenderer.makeRenderFunction(this._contentTypeService, this.$results, false, this.decorateResult.bind(this));	224	var renderFunction = this._searchRenderer.makeRenderFunction(this._contentTypeService, this.$results, false, this.decorateResult.bind(this));
225	this.currentSearch = renderFunction;	225	this.currentSearch = renderFunction;
226	var div = document.createElement("div"); //$NON-NLS-0$	226	var div = document.createElement("div"); //$NON-NLS-0$
227	div.appendChild(document.createTextNode(this._nameSearch ? messages['Searching...'] : util.formatMessage(messages["Searching for occurrences of"], text)));	227	div.appendChild(document.createTextNode(this._nameSearch ? messages['Searching...'] : util.formatMessage(messages["SearchOccurences"], text)));
228	lib.empty(this.$results);	228	lib.empty(this.$results);
229	this.$results.appendChild(div);	229	this.$results.appendChild(div);
230	this._searcher.search(searchParams, keyword.folderKeyword, function() {	230	this._searcher.search(searchParams, keyword.folderKeyword, function() {




			switch (operation.type) {
				case "Warning": //$NON-NLS-0$
					operationIcon.classList.add("core-sprite-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["OpErr"]); //$NON-NLS-0$
					break;
				case "loadstart":
				case "progress":
					operationIcon.classList.add("core-sprite-start"); //$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["OpCancelled"]); //$NON-NLS-0$
					break;
				case "load":
				case "loadend":

Lines 107-113 Link Here

(-)a/bundles/org.eclipse.orion.client.ui/web/orion/widgets/browse/readonlyFileClient.js (-1 / +1 lines)
107	function _doServiceCall(fileService, funcName, funcArgs) {	107	function _doServiceCall(fileService, funcName, funcArgs) {
108	//if the function is not implemented in the file service, we throw an exception to the caller	108	//if the function is not implemented in the file service, we throw an exception to the caller
109	if(!fileService[funcName]){	109	if(!fileService[funcName]){
110	throw funcName + messages[" is not supported in this file system"];	110	throw i18nUtil("${0} is not supported in this file system", funcName);
111	}	111	}
112	return fileService[funcName].apply(fileService, funcArgs);	112	return fileService[funcName].apply(fileService, funcArgs);
113	}	113	}

Lines 157-163 Link Here

(-)a/bundles/org.eclipse.orion.client.ui/web/orion/widgets/input/ComboTextInput.js (-1 / +1 lines)
157	group: this._domNodeId + "InputCompletion", //$NON-NLS-0$	157	group: this._domNodeId + "InputCompletion", //$NON-NLS-0$
158	extendedProvider: this._extendedRecentEntryProposalProvider,	158	extendedProvider: this._extendedRecentEntryProposalProvider,
159	onDelete: this._onRecentEntryDelete,	159	onDelete: this._onRecentEntryDelete,
160	deleteToolTips: messages["Click or use delete key to delete the search term"] //$NON-NLS-0$	160	deleteToolTips: messages["DeleteSearchTrmMsg"] //$NON-NLS-0$
161	});	161	});
162		162
163	this._recentEntryButton.addEventListener("click", function(event){	163	this._recentEntryButton.addEventListener("click", function(event){




//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",

	"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:",

	"Upload" : "Upload",
	"Browse...": "Browse...",
	"Import a file or zip": "Import a file or zip",
	"MissingSearchRenderer": "Missing required argument: searchRenderer",
	"Missing required argument: favService": "Missing required argument: favService",
	"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...",
	"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",

	"Building file skeleton..." : "Building file skeleton...",
	"Add" : "Add",
	"Upload..." : "Upload...",
	"AvailableCmdsType": "For a list of available commands type '${0}'.",
	"Main Pages": "Main Pages",
	"Related Links": "Related Links",
	"Yes": "Yes",
	"No": "No",
	"DeleteSearchTrmMsg": "Click or use delete key to delete the search term"
});

Lines 171-177 Link Here

(-)a/bundles/org.eclipse.orion.client.ui/web/orion/widgets/plugin/PluginEntry.js (-1 / +1 lines)
171	}	171	}
172	}	172	}
173		173
174	this.pluginDescription.textContent = headers.description \|\| messages['A plugin for Orion'];	174	this.pluginDescription.textContent = headers.description \|\| messages['OrionPlugin'];
175		175
176	// Additional Links	176	// Additional Links
177	if (headers.website) {	177	if (headers.website) {




   provides JavaScript functions for user management of Orion plugins. It is designed
   to contain PluginEntry widgets */

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, i18nUtil, require, Deferred, mCommands, mCommandRegistry, mHTMLFragments, objects, lib, PluginEntry, mExplorer) {

	var Explorer = mExplorer.Explorer;
	var SelectionRenderer = mExplorer.SelectionRenderer;

			
			var findMorePluginsCommand = new mCommands.Command({
				name: messages['Get Plugins'],
				tooltip: messages["FindMorePlugs"],
				id: "orion.findMorePluginsCommand", //$NON-NLS-0$
				hrefCallback: function(data){
					return this.getPluginsLink(data.items);

			// set up the toolbar level commands	
			var installPluginCommand = new mCommands.Command({
				name: messages["Install"],
				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) {

			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["ReloadAllPlugs"],
				id: "orion.reloadAllPlugins", //$NON-NLS-0$
				callback: this.reloadPlugins.bind(this)
			});


			var createPluginCommand = new mCommands.Command({
				name: messages['Create'],
				tooltip: messages["CreatePlug"],
				id: "orion.createPlugin", //$NON-NLS-0$
				callback: function(data){
					this.createPlugin(data.items);

			// Declare row-level commands so they will be rendered when the rows are added.
			var reloadPluginCommand = new mCommands.Command({
				name: messages["Reload"],
				tooltip: messages["ReloadPlug"],
				id: "orion.reloadPlugin", //$NON-NLS-0$
				imageClass: "core-sprite-refresh", //$NON-NLS-0$
				visibleWhen: function(items) {  // we expect a URL


			var uninstallPluginCommand = new mCommands.Command({
				name: messages["Delete"],
				tooltip: messages["DeletePlugFromConfig"],
				imageClass: "core-sprite-delete", //$NON-NLS-0$
				id: "orion.uninstallPlugin", //$NON-NLS-0$
				visibleWhen: function(url) {  // we expect a URL

		
		pluginURLBlur: function(){
			if( this.pluginUrlEntry.value === '' ){
				this.pluginUrlEntry.value = messages['TypePlugURL'];
				this.pluginUrlEntry.style.color = "#AAA" ; //$NON-NLS-0$
			}
		},

		},
		
		addPlugin: function( pluginUrl ){
			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

		
		installHandler: function(newPluginUrl){
			if (/^\S+$/.test(newPluginUrl.trim())) {
				this.statusService.setMessage(i18nUtil.formatMessage("Installing ${0}...", newPluginUrl), null, true);
				if( this.settings.pluginRegistry.getPlugin(newPluginUrl) ){
					this.statusService.setErrorMessage(messages["Already installed"]);
				} else {

		
		reloaded: function(){
			var settingsPluginList = this.settings.pluginRegistry.getPlugins();
			this.statusService.setMessage( ( settingsPluginList.length===1 ? i18nUtil.formatMessage("Reloaded ${0} plugin.", settingsPluginList.length): i18nUtil.formatMessage("Reloaded ${0} plugins.", settingsPluginList.length)), 5000, true );
			this.render();
		},
		

			var plugin = this.settings.pluginRegistry.getPlugin(url);
			if (plugin) {
				plugin.update().then(this.render.bind(this));
				this.statusService.setMessage( i18nUtil.formatMessage("Reloaded ${0}", url), 5000, true);
			}
		},
		

			var plugin = this.settings.pluginRegistry.getPlugin(url);
			if (plugin) {
				plugin.stop();
				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);

			var plugin = this.settings.pluginRegistry.getPlugin(url);
			if (plugin) {
				plugin.start({lazy: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);

			var plugin = this.settings.pluginRegistry.getPlugin(url);
			if (plugin) {
				plugin.uninstall().then(function() {
					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)) {

				
			// TODO: Should be internationalized
				
			var confirmMessage = i18nUtil.formatMessage("Are you sure you want to uninstall '${0}'?",url); //$NON-NLS-1$
			if (window.confirm(confirmMessage)) {
				this.forceRemove(url);
			}

Lines 243-249 Link Here

(-)a/bundles/org.eclipse.orion.client.ui/web/orion/widgets/plugin/ServiceCarousel.js (-1 / +1 lines)
243		243
244	var span = document.createElement("span"); //$NON-NLS-0$	244	var span = document.createElement("span"); //$NON-NLS-0$
245	span.classList.add("objectLink"); //$NON-NLS-0$	245	span.classList.add("objectLink"); //$NON-NLS-0$
246	span.title = messages['click here, then check javascript console to drill down'];	246	span.title = messages['CheckJsConsoleDrillDown'];
247	span.addEventListener("click", this.consoleOutput.bind(this, debugData)); //$NON-NLS-0$	247	span.addEventListener("click", this.consoleOutput.bind(this, debugData)); //$NON-NLS-0$
248	span.textContent = messages['JavaScript Object'];	248	span.textContent = messages['JavaScript Object'];
249	cell.appendChild(span);	249	cell.appendChild(span);




					var gitPreferenceStorage = new GitPreferenceStorage(that.registry);
					gitPreferenceStorage.remove(repository).then(
						function(){
							messageService.setProgressResult(i18nUtil.formatMessage(messages["DeletedGitMsg"], [repository]));
							that.gitCredentialsFields[keyIndex+1].destroy();
						}
					);

			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['GitUsrUpdateSuccess'] );
				}
			);
		},

			// git authentication update
			var gitPreferenceStorage = new GitPreferenceStorage(this.registry);
			if( this.gitCredentialsFields[0].isChecked() ){
				var confirmMessage = messages["BrowserCredStoreMsg"] + '\n' + messages["AskEnableKeyStorage"];
				if(window.confirm(confirmMessage)){
					gitPreferenceStorage.enable().then(
						function(){
							messageService.setProgressResult( messages['GitCredsUpdateSuccess'] );
						}
					);
				} else {

			} else {
				gitPreferenceStorage.disable().then(
					function(){
						messageService.setProgressResult( messages['GitCredsUpdateSuccess'] );
					}
				);
			}

Lines 175-181 Link Here

(-)a/bundles/org.eclipse.orion.client.ui/web/orion/widgets/settings/UserSettings.js (-1 / +1 lines)
175	if(args){	175	if(args){
176	messageService.setProgressResult(args);	176	messageService.setProgressResult(args);
177	}else{	177	}else{
178	messageService.setProgressResult( messages['User profile data successfully updated.'] );	178	messageService.setProgressResult( messages['UsrProfileUpdateSuccess'] );
179	}	179	}
180	}, function(error){	180	}, function(error){
181	messageService.setProgressResult(error);	181	messageService.setProgressResult(error);

Lines 666-672 Link Here

(-)a/bundles/org.eclipse.orion.client.ui/web/orion/widgets/themes/ThemeBuilder.js (-2 / +2 lines)
666		666
667	ThemeBuilder.prototype.drawOutlineData = drawOutlineData;	667	ThemeBuilder.prototype.drawOutlineData = drawOutlineData;
668		668
669	var successMessage = i18nUtil.formatMessage(messages["${0} settings successfully updated."], messages["Theme"]); //$NON-NLS-1$ //$NON-NLS-0$	669	var successMessage = i18nUtil.formatMessage(messages["SettingUpdateSuccess"], messages["Theme"]); //$NON-NLS-1$ //$NON-NLS-0$
670		670
671	function apply(data) {	671	function apply(data) {
672		672
Lines 1052-1055 Link Here
1052	ThemeBuilder.prototype.exportTheme = exportTheme;	1052	ThemeBuilder.prototype.exportTheme = exportTheme;
1053		1053
1054	return ThemeBuilder;	1054	return ThemeBuilder;
1055	});	1055	});

Lines 83-89 Link Here

(-)a/bundles/org.eclipse.orion.client.ui/web/plugins/nonnlsPlugin.js (-1 / +1 lines)
83	provider.registerService('orion.navigate.command', null, {	83	provider.registerService('orion.navigate.command', null, {
84	id: 'orion.nonnls.externalize',	84	id: 'orion.nonnls.externalize',
85	nameKey: 'Strings Xtrnalizr',	85	nameKey: 'Strings Xtrnalizr',
86	tooltipKey: 'Externalize Strings from JavaScript files in this folder',	86	tooltipKey: 'Externalize strings',
87	nls: 'orion/navigate/nls/messages',	87	nls: 'orion/navigate/nls/messages',
88	forceSingleItem: true,	88	forceSingleItem: true,
89	validationProperties:	89	validationProperties:




				var successFn = function(file) {
					this.callback = function() {
						var string = i18nUtil.formatMessage(
							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$

				var errorFn = function(file) {
					this.callback = function(error) {
						var string = i18nUtil.formatMessage(
							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);

								} else if (segment === "..") { //$NON-NLS-0$
									if (index === 0) {
										/* invalid, destination must be a descendent of the cwd */
										errorFn(i18nUtil.formatMessage(messages["WriteFailNotDescendentOfOutputDir"], file.path));
										return;
									}
									pathSegments.splice(index-- - 1, 2);

					return {
						value: undefined,
						status: mShell.CompletionStatus.ERROR,
						message: i18nUtil.formatMessage(messages["notValid"], string),
						predictions: null
					};
				}

					}
					if (exactMatch) {
						status = mShell.CompletionStatus.ERROR;
						message = i18nUtil.formatMessage(messages["AlreadyExist"], string);
					} else {
						// TODO validate filename?
						status = mShell.CompletionStatus.MATCH;

							status = mShell.CompletionStatus.PARTIAL;
						} else {
							status = mShell.CompletionStatus.ERROR;
							message = i18nUtil.formatMessage(messages["notValid"], string);
						}
					} else { /* exist is undefined */
						// TODO validate filename?

Lines 172-178 Link Here

(-)a/bundles/org.eclipse.orion.client.ui/web/shell/paramType-plugin.js (-1 / +1 lines)
172	status = mShell.CompletionStatus.PARTIAL;	172	status = mShell.CompletionStatus.PARTIAL;
173	} else {	173	} else {
174	status = mShell.CompletionStatus.ERROR;	174	status = mShell.CompletionStatus.ERROR;
175	message = i18nUtil.formatMessage(messages["'${0}' is not valid"], string);	175	message = i18nUtil.formatMessage(messages["notValid"], string);
176	}	176	}
177	return {	177	return {
178	value: exactMatch ? exactMatch.value : undefined,	178	value: exactMatch ? exactMatch.value : undefined,

Lines 79-85 Link Here

(-)a/bundles/org.eclipse.orion.client.ui/web/shell/paramType-service.js (-1 / +1 lines)
79	status = mShell.CompletionStatus.PARTIAL;	79	status = mShell.CompletionStatus.PARTIAL;
80	} else {	80	} else {
81	status = mShell.CompletionStatus.ERROR;	81	status = mShell.CompletionStatus.ERROR;
82	message = i18nUtil.formatMessage(messages["'${0}' is not valid"], string);	82	message = i18nUtil.formatMessage(messages["notValid"], string);
83	}	83	}
84	return {	84	return {
85	value: exactMatch ? exactMatch.value : undefined,	85	value: exactMatch ? exactMatch.value : undefined,




			error = JSON.parse(xhrResult.responseText);
		} catch (e) {}
		if (error && error.DetailedMessage) {
			error = i18nUtil.formatMessage(messages["Err"], error.DetailedMessage);
		} else if (error && 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);

		var url = args.url.trim();
		if (/^\S+$/.test(url)) {
			if (pluginRegistry.getPlugin(url)){
				return messages["PlugAlreadyInstalled"];
			}
			var result = context.createPromise();
			pluginRegistry.installPlugin(url).then(

	function pluginsUninstallExec(args, context) {
		var result = context.createPromise();
		if (args.plugin.isAllPlugin) {
			var msg = messages["UninstallAllPlugsMsg"];
			if (!window.confirm(msg)) {
				return messages.Aborted;
			}

		/* add the locally-defined commands */
		shell.registerCommand({
			name: "cd", //$NON-NLS-0$
			description: messages["ChangeCurrDir"],
			callback: cdExec,
			parameters: [{
				name: "directory", //$NON-NLS-0$
				type: {name: "file", directory: true, exist: true}, //$NON-NLS-0$
				description: messages["DirName"]
			}],
			returnType: "html" //$NON-NLS-0$
		});
		shell.registerCommand({
			name: "edit", //$NON-NLS-0$
			description: messages["EditFile"],
			callback: editExec,
			parameters: [{
				name: "file", //$NON-NLS-0$
				type: {name: "file", file: true, exist: true}, //$NON-NLS-0$
				description: messages["FileName"]
			}]
		});
		shell.registerCommand({
			name: "ls", //$NON-NLS-0$
			description: messages["CurDirFileList"],
			callback: lsExec,
			returnType: "html" //$NON-NLS-0$
		});
		shell.registerCommand({
			name: "pwd", //$NON-NLS-0$
			description: messages["CurDirLocation"],
			callback: pwdExec,
			returnType: "html" //$NON-NLS-0$
		});
		shell.registerCommand({
			name: "clear", //$NON-NLS-0$
			description: messages["ClearShellScreen"],
			callback: function(args, context) {
				shell.clear();
			}

		/* plug-in management commands */
		shell.registerCommand({
			name: "plugins", //$NON-NLS-0$
			description: messages["CmdForPlugs"]
		});
		shell.registerCommand({
			name: "plugins list", //$NON-NLS-0$
			description: messages["RegisteredPlugsList"],
			callback: pluginsListExec,
			returnType: "html" //$NON-NLS-0$
		});
		shell.registerCommand({
			name: "plugins install", //$NON-NLS-0$
			description: messages["InstallPlugFrmURL"],
			callback: pluginsInstallExec,
			parameters: [{
				name: "url", //$NON-NLS-0$

		});
		shell.registerCommand({
			name: "plugins uninstall", //$NON-NLS-0$
			description: messages["UninstallContributedPlugFrmConfig"],
			callback: pluginsUninstallExec,
			parameters: [{
				name: "plugin", //$NON-NLS-0$
				type: {name: "plugin", multiple: true, excludeDefaultPlugins: true}, //$NON-NLS-0$
				description: messages["ContributedPludName"]
			}],
			returnType: "string" //$NON-NLS-0$
		});

			parameters: [{
				name: "plugin", //$NON-NLS-0$
				type: {name: "plugin", multiple: true, excludeDefaultPlugins: false}, //$NON-NLS-0$
				description: messages["PlugName"]
			}],
			returnType: "string" //$NON-NLS-0$
		});
		shell.registerCommand({
			name: "plugins enable", //$NON-NLS-0$
			description: messages["EnableContributedPlug"],
			callback: pluginsEnableExec,
			parameters: [{
				name: "plugin", //$NON-NLS-0$
				type: {name: "plugin", multiple: true, excludeDefaultPlugins: true}, //$NON-NLS-0$
				description: messages["ContributedPludName"]
			}],
			returnType: "string" //$NON-NLS-0$
		});
		shell.registerCommand({
			name: "plugins disable", //$NON-NLS-0$
			description: messages["DisableContributedPlug"],
			callback: pluginsDisableExec,
			parameters: [{
				name: "plugin", //$NON-NLS-0$
				type: {name: "plugin", multiple: true, excludeDefaultPlugins: true}, //$NON-NLS-0$
				description: messages["ContributedPludName"]
			}],
			returnType: "string" //$NON-NLS-0$
		});
		shell.registerCommand({
			name: "plugins services", //$NON-NLS-0$
			description: messages["DisplayPlugServices"],
			callback: pluginServicesExec,
			parameters: [{
				name: "plugin", //$NON-NLS-0$
				type: {name: "plugin", multiple: false, excludeDefaultPlugins: false}, //$NON-NLS-0$
				description: messages["PlugName"]
			}],
			returnType: "html" //$NON-NLS-0$
		});

		/* service management commands */
		shell.registerCommand({
			name: "service", //$NON-NLS-0$
			description: messages["CmdsForService"]
		});

		shell.registerCommand({
			name: "service contributors", //$NON-NLS-0$
			description: messages["DisplayPlugsForService"],
			callback: serviceContributorsExec,
			parameters: [{
				name: "id", //$NON-NLS-0$

					parameters.push({
						name: "output", //$NON-NLS-0$
	                    type: {name: "file", file: true, directory: true}, //$NON-NLS-0$
	                    description: messages["FileOrDirRedirectOutput"], //$NON-NLS-0$
	                    defaultValue: null
					});
				}




					if (directory.Directory) {
						result.resolve(directory);
					} else {
						result.reject(messages["AlreadyExistsInDirErr"]);
					}
				} else {
					parentNode = parentNode || this.getCurrentDirectory();

											/* directory already exists, so nothing to do */
											result.resolve(children[i]);
										} else {
											result.reject(messages["AlreadyExistsInDirErr"]);
										}
										return;
									}

					if (!file.Directory) {
						result.resolve(file);
					} else {
						result.reject(messages["AlreadyExistsInDirErr"]);
					}
				} else {
					parentNode = parentNode || this.getCurrentDirectory();

											/* file already exists, so nothing to do */
											result.resolve(children[i]);
										} else {
											result.reject(messages["AlreadyExistsInDirErr"]);
										}
										return;
									}

				var sourceService = fileClient._getService(node.Location);
				if (!sourceService.readBlob) {
					var promise = new Deferred();
					promise.reject(messages["SrcNotSupportBinRead"]);
					return promise;
				}
				return sourceService.readBlob(node.Location);

				var targetService = fileClient._getService(node.Location);
				if (!targetService.writeBlob) {
					var promise = new Deferred();
					promise.reject(messages["TargetNotSupportBinWrite"]);
					return promise;
				}
				return targetService.writeBlob(node.Location, content);

Lines 162-168 Link Here

(-)a/bundles/org.eclipse.orion.client.ui/web/stringexternalizer/strExternalizerModel.js (-2 / +2 lines)
162	return {	162	return {
163	name: modelItem.fullPathName,	163	name: modelItem.fullPathName,
164	href: require.toUrl("stringexternalizer/strExternalizer.html") + "#" + modelItem.parentLocation, //$NON-NLS-1$ //$NON-NLS-0$,	164	href: require.toUrl("stringexternalizer/strExternalizer.html") + "#" + modelItem.parentLocation, //$NON-NLS-1$ //$NON-NLS-0$,
165	tooltip: i18nUtil.formatMessage(messages["Externalize string from ${0} only"], modelItem.fullPathName)	165	tooltip: i18nUtil.formatMessage(messages["ExternalizeStrMsg"], modelItem.fullPathName)
166	};	166	};
167	};	167	};
168		168
Lines 313-319 Link Here
313	return this.registry.getService("orion.page.progress").progress(this.fileClient.read(fileItem.Location, true), "Reading file metadata " + fileItem.Location).then(function(metadata) {	313	return this.registry.getService("orion.page.progress").progress(this.fileClient.read(fileItem.Location, true), "Reading file metadata " + fileItem.Location).then(function(metadata) {
314	//If the file has been modified by others when trying to write it, we should report this status in the report list	314	//If the file has been modified by others when trying to write it, we should report this status in the report list
315	if (fileItem.LocalTimeStamp !== metadata.LocalTimeStamp) {	315	if (fileItem.LocalTimeStamp !== metadata.LocalTimeStamp) {
316	_writeReport(reportList, fileItem, false, messages["Resource has been changed by others"]);	316	_writeReport(reportList, fileItem, false, messages["ResourceChanged"]);
317	} else if (!fileItem.contents) {//If fiel item does not have contents yet, we should get the contents first	317	} else if (!fileItem.contents) {//If fiel item does not have contents yet, we should get the contents first
318	return that.registry.getService("orion.page.progress").progress(that.fileClient.read(fileItem.Location), "Reading file " + fileItem.Location).then(function(contents) {	318	return that.registry.getService("orion.page.progress").progress(that.fileClient.read(fileItem.Location), "Reading file " + fileItem.Location).then(function(contents) {
319	fileItem.contents = contents;	319	fileItem.contents = contents;




		createCommands: function() {
			var changeMessagesDirectory = new mCommands.Command({
				name: messages["Change Directory"],
				tooltip: messages["Change msg dir"],
				id: "eclipse.changeMessagesDirectory", //$NON-NLS-0$
				callback: function(data) {
					var dialog = new DirPrompter.DirectoryPrompterDialog({

			}
			var section = new mSection.Section(this.parent, {
				id: "stringexternalizerConfigSection", //$NON-NLS-0$
				title: messages["ExternalizeStrConfig"],
				content: '<div id="stringexternalizerConfigContent"></div>', //$NON-NLS-0$
				preferenceService: this.serviceRegistry.getService("orion.core.preference"), //$NON-NLS-0$
				canHide: false,

			sectionContent.appendChild(p);
			b = document.createElement("b"); //$NON-NLS-0$
			p.appendChild(b);
			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$

Lines 174-180 Link Here

(-)a/bundles/org.eclipse.orion.client.users/web/orion/profile/UsersList.js (-1 / +1 lines)
174	var diskUsageTextContent = '\u00a0'; //$NON-NLS-0$	174	var diskUsageTextContent = '\u00a0'; //$NON-NLS-0$
175	if (diskUsage !== " ") {	175	if (diskUsage !== " ") {
176	var diskUsageTimestamp = item.diskUsageTimestamp ? new Date(parseInt(item.diskUsageTimestamp, 10)).toLocaleString() : '\u00a0'; //$NON-NLS-0$	176	var diskUsageTimestamp = item.diskUsageTimestamp ? new Date(parseInt(item.diskUsageTimestamp, 10)).toLocaleString() : '\u00a0'; //$NON-NLS-0$
177	diskUsageTextContent = i18nUtil.formatMessage(messages["${0} ( last calculated ${1} )"], diskUsage, diskUsageTimestamp); //$NON-NLS-1$ //$NON-NLS-0$	177	diskUsageTextContent = i18nUtil.formatMessage(messages["A(lastCalculated B)"], diskUsage, diskUsageTimestamp); //$NON-NLS-1$ //$NON-NLS-0$
178	};	178	};
179	td.textContent = diskUsageTextContent;	179	td.textContent = diskUsageTextContent;
180	return td;	180	return td;

Lines 53-57 Link Here

(-)a/bundles/org.eclipse.orion.client.users/web/profile/nls/root/messages.js (-1 / +1 lines)
53	"Create" : "Create",	53	"Create" : "Create",
54	"Set Password" : "Set Password",	54	"Set Password" : "Set Password",
55	"Permission to view user list denied." : "Permission to view user list denied.",	55	"Permission to view user list denied." : "Permission to view user list denied.",
56	"${0} ( last calculated ${1} )" : "${0} ( last calculated ${1} )"	56	"A(lastCalculated B)" : "${0} ( last calculated ${1} )"
57	});	57	});

Return to bug 390235

Lines 491-498 Link Here

(-)a/bundles/org.eclipse.orion.client.git/web/orion/git/gitCommands.js (-4 / +3 lines)
491	if (error.status === 401) {	491	if (error.status === 401) {
492	display.HTML = true;	492	display.HTML = true;
493	display.Message = "<span>"; //$NON-NLS-0$	493	display.Message = "<span>"; //$NON-NLS-0$
494	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$	494	display.Message += i18nUtil.formatMessage("Authentication required for: ${0}. <a target=\"_blank\" href=\"${1}\">${2}</a> and re-try the request. </span>", resp.label, resp.SignInLocation, messages["Login"]); //$NON-NLS-0$
495	+ "\">" + messages["Login"] + "</a>") + "</span>"; //$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-0$
496	} else {	495	} else {
497	display.Message = resp.DetailedMessage ? resp.DetailedMessage : (resp.Message ? resp.Message : messages["Problem while performing the action"]);	496	display.Message = resp.DetailedMessage ? resp.DetailedMessage : (resp.Message ? resp.Message : messages["Problem while performing the action"]);
498	}	497	}
Lines 648-654 Link Here
648	callback: function(data) {	647	callback: function(data) {
649	var item = data.items;	648	var item = data.items;
650	var progress = serviceRegistry.getService("orion.page.progress"); //$NON-NLS-0$	649	var progress = serviceRegistry.getService("orion.page.progress"); //$NON-NLS-0$
651	if (confirm(i18nUtil.formatMessage(messages["Are you sure you want to delete branch ${0}?"], item.Name))) {	650	if (confirm(i18nUtil.formatMessage(messages["delete branch msg"], item.Name))) {
652	progress.progress(serviceRegistry.getService("orion.git.provider").removeBranch(item.Location), "Removing branch " + item.Name).then(function() { //$NON-NLS-0$	651	progress.progress(serviceRegistry.getService("orion.git.provider").removeBranch(item.Location), "Removing branch " + item.Name).then(function() { //$NON-NLS-0$
653	refresh(data);	652	refresh(data);
654	}, displayErrorOnStatus);	653	}, displayErrorOnStatus);
Lines 812-818 Link Here
812	commandService.addCommand(openCloneContent);	811	commandService.addCommand(openCloneContent);
813		812
814	var compareGitCommits = new mCommands.Command({	813	var compareGitCommits = new mCommands.Command({
815	name : messages["Compare With Each Other"],	814	name : messages["Compare each"],
816	id : "eclipse.compareGitCommits", //$NON-NLS-0$	815	id : "eclipse.compareGitCommits", //$NON-NLS-0$
817	hrefCallback : function(data) {	816	hrefCallback : function(data) {
818	var item = data.items;	817	var item = data.items;

Lines 574-580 Link Here

(-)a/bundles/org.eclipse.orion.client.ui/web/orion/explorers/explorer-table.js (-5 / +5 lines)
574	if (entry.isFile) {	574	if (entry.isFile) {
575	// can't drop files directly into workspace.	575	// can't drop files directly into workspace.
576	if (targetIsRoot){ //$NON-NLS-0$	576	if (targetIsRoot){ //$NON-NLS-0$
577	internalErrorHandler(messages["You cannot copy files directly into the workspace. Create a folder first."]); //$NON-NLS-0$	577	internalErrorHandler(messages["Create folder first err"]); //$NON-NLS-0$
578	} else {	578	} else {
579	entry.file(function(file) {	579	entry.file(function(file) {
580	if (deferredWrapper) {	580	if (deferredWrapper) {
Lines 583-589 Link Here
583	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$	583	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$
584	var handlers = {	584	var handlers = {
585	error: function(event) {	585	error: function(event) {
586	var errorMessage = messages["Uploading the following file failed: "] + file.name;	586	var errorMessage = messages["Uploading file err"] + file.name;
587	if (statusService) {	587	if (statusService) {
588	statusService.setProgressResult({Severity: "Error", Message: errorMessage}); //$NON-NLS-0$	588	statusService.setProgressResult({Severity: "Error", Message: errorMessage}); //$NON-NLS-0$
589	} else {	589	} else {
Lines 682-690 Link Here
682	// The File API in HTML5 doesn't specify a way to check explicitly (when this code was written).	682	// The File API in HTML5 doesn't specify a way to check explicitly (when this code was written).
683	// see http://www.w3.org/TR/FileAPI/#file	683	// see http://www.w3.org/TR/FileAPI/#file
684	if (!file.size && !file.type) {	684	if (!file.size && !file.type) {
685	errorHandler(i18nUtil.formatMessage(messages["Did not drop ${0}. Folder drop is not supported in this browser."], file.name)); //$NON-NLS-0$	685	errorHandler(i18nUtil.formatMessage(messages["Folder drop not supported"], file.name)); //$NON-NLS-0$
686	} else if (mFileUtils.isAtRoot(item.Location)){ //$NON-NLS-0$	686	} else if (mFileUtils.isAtRoot(item.Location)){ //$NON-NLS-0$
687	errorHandler(messages["You cannot copy files directly into the workspace. Create a folder first."]); //$NON-NLS-0$	687	errorHandler(messages["Create folder first err"]); //$NON-NLS-0$
688	} else {	688	} else {
689	explorer._uploadFile(item, file, true);	689	explorer._uploadFile(item, file, true);
690	}	690	}
Lines 741-747 Link Here
741	this.changedItem(targetItem);	741	this.changedItem(targetItem);
742	}.bind(this),	742	}.bind(this),
743	error: function(event) {	743	error: function(event) {
744	var errorMessage = messages["Uploading the following file failed: "] + file.name; //$NON-NLS-0$	744	var errorMessage = messages["Uploading file err"] + file.name; //$NON-NLS-0$
745	if (statusService) {	745	if (statusService) {
746	statusService.setProgressResult({Severity: "Error", Message: errorMessage}); //$NON-NLS-0$	746	statusService.setProgressResult({Severity: "Error", Message: errorMessage}); //$NON-NLS-0$
747	} else {	747	} else {

Lines 426-432 Link Here

(-)a/bundles/org.eclipse.orion.client.ui/web/orion/fileCommands.js (-20 / +20 lines)
426	var func = isCopy ? fileClient.copyFile : fileClient.moveFile;	426	var func = isCopy ? fileClient.copyFile : fileClient.moveFile;
427	var message = i18nUtil.formatMessage(isCopy ? messages["Copying ${0}"] : messages["Moving ${0}"], item.Location);	427	var message = i18nUtil.formatMessage(isCopy ? messages["Copying ${0}"] : messages["Moving ${0}"], item.Location);
428	if (isCopy && item.parent && item.parent.Location === location) {	428	if (isCopy && item.parent && item.parent.Location === location) {
429	newName = window.prompt(i18nUtil.formatMessage(messages["Enter a new name for '${0}'"], item.Name), i18nUtil.formatMessage(messages["Copy of ${0}"], item.Name));	429	newName = window.prompt(i18nUtil.formatMessage(messages["Enter name"], item.Name), i18nUtil.formatMessage(messages["Copy of ${0}"], item.Name));
430	// user cancelled? don't copy this one	430	// user cancelled? don't copy this one
431	if (!newName) {	431	if (!newName) {
432	location = null;	432	location = null;
Lines 513-519 Link Here
513	if (proposedPaths.length > 0) {	513	if (proposedPaths.length > 0) {
514	choices.push({}); //separator	514	choices.push({}); //separator
515	}	515	}
516	choices.push({name: messages["Choose folder..."], callback: prompt});	516	choices.push({name: messages["Choose folder"], callback: prompt});
517	return choices;	517	return choices;
518	}	518	}
519		519
Lines 659-665 Link Here
659		659
660	var renameCommand = new mCommands.Command({	660	var renameCommand = new mCommands.Command({
661	name: messages["Rename"],	661	name: messages["Rename"],
662	tooltip: messages["Rename the selected files or folders"],	662	tooltip: messages["Rename files or folders"],
663	imageClass: "core-sprite-rename", //$NON-NLS-0$	663	imageClass: "core-sprite-rename", //$NON-NLS-0$
664	id: "eclipse.renameResource", //$NON-NLS-0$	664	id: "eclipse.renameResource", //$NON-NLS-0$
665	visibleWhen: function(item) {	665	visibleWhen: function(item) {
Lines 698-705 Link Here
698		698
699	var contentTypeService = new mContentTypes.ContentTypeRegistry(serviceRegistry);	699	var contentTypeService = new mContentTypes.ContentTypeRegistry(serviceRegistry);
700	var compareWithEachOtherCommand = new mCommands.Command({	700	var compareWithEachOtherCommand = new mCommands.Command({
701	name: messages["Compare with each other"],	701	name: messages["Compare each"],
702	tooltip: messages["Compare the selected 2 files with each other"],	702	tooltip: messages["Compare 2 files"],
703	id: "eclipse.compareWithEachOther", //$NON-NLS-0$	703	id: "eclipse.compareWithEachOther", //$NON-NLS-0$
704	visibleWhen: function(item) {	704	visibleWhen: function(item) {
705	if (!explorer \|\| !explorer.isCommandsVisible()) {	705	if (!explorer \|\| !explorer.isCommandsVisible()) {
Lines 730-736 Link Here
730		730
731	var compareWithCommand = new mCommands.Command({	731	var compareWithCommand = new mCommands.Command({
732	name : messages["Compare with..."],	732	name : messages["Compare with..."],
733	tooltip: messages["Compare the selected folder with a specified folder"],	733	tooltip: messages["Compare folders"],
734	id: "eclipse.compareWith", //$NON-NLS-0$	734	id: "eclipse.compareWith", //$NON-NLS-0$
735	visibleWhen: function(item) {	735	visibleWhen: function(item) {
736	if (!explorer \|\| !explorer.isCommandsVisible()) {	736	if (!explorer \|\| !explorer.isCommandsVisible()) {
Lines 792-798 Link Here
792	visibleWhen: oneOrMoreFilesOrFolders,	792	visibleWhen: oneOrMoreFilesOrFolders,
793	callback: function(data) {	793	callback: function(data) {
794	var items = Array.isArray(data.items) ? data.items : [data.items];	794	var items = Array.isArray(data.items) ? data.items : [data.items];
795	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);	795	var confirmMessage = items.length === 1 ? i18nUtil.formatMessage(messages["delete target msg"], items[0].Name) : i18nUtil.formatMessage(messages["delete item msg"], items.length);
796	serviceRegistry.getService("orion.page.dialog").confirm(confirmMessage, //$NON-NLS-0$	796	serviceRegistry.getService("orion.page.dialog").confirm(confirmMessage, //$NON-NLS-0$
797	function(doit) {	797	function(doit) {
798	if (!doit) {	798	if (!doit) {
Lines 848-855 Link Here
848	commandService.addCommand(deleteCommand);	848	commandService.addCommand(deleteCommand);
849		849
850	var downloadCommand = new mCommands.Command({	850	var downloadCommand = new mCommands.Command({
851	name: messages["Export as zip"],	851	name: messages["Zip"],
852	tooltip: messages["Create a zip file of the folder contents and download it"],	852	tooltip: messages["Zip Download"],
853	imageClass: "core-sprite-exportzip", //$NON-NLS-0$	853	imageClass: "core-sprite-exportzip", //$NON-NLS-0$
854	id: "eclipse.downloadFile", //$NON-NLS-0$	854	id: "eclipse.downloadFile", //$NON-NLS-0$
855	visibleWhen: function(item) {	855	visibleWhen: function(item) {
Lines 970-976 Link Here
970		970
971	var importZipURLCommand = new mCommands.Command({	971	var importZipURLCommand = new mCommands.Command({
972	name: messages["Import from HTTP..."],	972	name: messages["Import from HTTP..."],
973	tooltip: messages["Import a file from a URL and optionally unzip it"],	973	tooltip: messages["import frm url"],
974	id: "orion.importZipURL", //$NON-NLS-0$	974	id: "orion.importZipURL", //$NON-NLS-0$
975	parameters: zipURLParameters,	975	parameters: zipURLParameters,
976	callback: function(data) {	976	callback: function(data) {
Lines 996-1002 Link Here
996	name: messages["New Folder"],	996	name: messages["New Folder"],
997	imageClass: "core-sprite-new_folder", //$NON-NLS-0$	997	imageClass: "core-sprite-new_folder", //$NON-NLS-0$
998	tooltip: messages["Create an empty folder"],	998	tooltip: messages["Create an empty folder"],
999	description: messages["Create an empty folder on the Orion server. You can import, upload, or create content in the editor."],	999	description: messages["Create empty folder msg"],
1000	id: "orion.new.project", //$NON-NLS-0$	1000	id: "orion.new.project", //$NON-NLS-0$
1001	callback: function(data) {	1001	callback: function(data) {
1002	var item;	1002	var item;
Lines 1018-1025 Link Here
1018		1018
1019	var linkProjectCommand = new mCommands.Command({	1019	var linkProjectCommand = new mCommands.Command({
1020	name: messages["Link to Server"],	1020	name: messages["Link to Server"],
1021	tooltip: messages["Link to existing content on the server"],	1021	tooltip: messages["Link content msg"],
1022	description: messages["Create a folder that links to an existing folder on the server."],	1022	description: messages["Create linked folder"],
1023	imageClass: "core-sprite-link", //$NON-NLS-0$	1023	imageClass: "core-sprite-link", //$NON-NLS-0$
1024	id: "orion.new.linkProject", //$NON-NLS-0$	1024	id: "orion.new.linkProject", //$NON-NLS-0$
1025	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$	1025	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$
Lines 1035-1041 Link Here
1035	if (data.parameters && data.parameters.valueFor('name') && data.parameters.valueFor('url')) { //$NON-NLS-1$ //$NON-NLS-0$	1035	if (data.parameters && data.parameters.valueFor('name') && data.parameters.valueFor('url')) { //$NON-NLS-1$ //$NON-NLS-0$
1036	createFunction(data.parameters.valueFor('name'), data.parameters.valueFor('url')); //$NON-NLS-1$ //$NON-NLS-0$	1036	createFunction(data.parameters.valueFor('name'), data.parameters.valueFor('url')); //$NON-NLS-1$ //$NON-NLS-0$
1037	} else {	1037	} else {
1038	errorHandler(messages["The name and server location were not specified."]);	1038	errorHandler(messages["name location not clear"]);
1039	}	1039	}
1040	},	1040	},
1041	visibleWhen: canCreateProject	1041	visibleWhen: canCreateProject
Lines 1044-1050 Link Here
1044		1044
1045	var goUpCommand = new mCommands.Command({	1045	var goUpCommand = new mCommands.Command({
1046	name: messages["Go Up"],	1046	name: messages["Go Up"],
1047	tooltip: messages["Move up to the parent folder"],	1047	tooltip: messages["cd parent"],
1048	imageClass: "core-sprite-go-up", //$NON-NLS-0$	1048	imageClass: "core-sprite-go-up", //$NON-NLS-0$
1049	// addImageClassToElement: true,	1049	// addImageClassToElement: true,
1050	id: "eclipse.upFolder", //$NON-NLS-0$	1050	id: "eclipse.upFolder", //$NON-NLS-0$
Lines 1065-1071 Link Here
1065		1065
1066	var goIntoCommand = new mCommands.Command({	1066	var goIntoCommand = new mCommands.Command({
1067	name: messages["Go Into"],	1067	name: messages["Go Into"],
1068	tooltip: messages["Move into the selected folder"],	1068	tooltip: messages["cd selected"],
1069	imageClass: "core-sprite-go-down", //$NON-NLS-0$	1069	imageClass: "core-sprite-go-down", //$NON-NLS-0$
1070	id: "eclipse.downFolder", //$NON-NLS-0$	1070	id: "eclipse.downFolder", //$NON-NLS-0$
1071	callback: function(data) {	1071	callback: function(data) {
Lines 1088-1094 Link Here
1088		1088
1089	var importCommand = new mCommands.Command({	1089	var importCommand = new mCommands.Command({
1090	name : messages["File or zip archive"],	1090	name : messages["File or zip archive"],
1091	tooltip: messages["Import a file or zip archive from your local file system"],	1091	tooltip: messages["import local file"],
1092	imageClass: "core-sprite-importzip", //$NON-NLS-0$	1092	imageClass: "core-sprite-importzip", //$NON-NLS-0$
1093	id: "orion.import", //$NON-NLS-0$	1093	id: "orion.import", //$NON-NLS-0$
1094	callback : function(data) {	1094	callback : function(data) {
Lines 1119-1125 Link Here
1119		1119
1120	var importSFTPCommand = new mCommands.Command({	1120	var importSFTPCommand = new mCommands.Command({
1121	name : messages["SFTP from..."],	1121	name : messages["SFTP from..."],
1122	tooltip: messages["Copy files and folders from a specified SFTP connection"],	1122	tooltip: messages["cpy from SFTP"],
1123	imageClass: "core-sprite-transferin", //$NON-NLS-0$	1123	imageClass: "core-sprite-transferin", //$NON-NLS-0$
1124	id: "orion.importSFTP", //$NON-NLS-0$	1124	id: "orion.importSFTP", //$NON-NLS-0$
1125	callback : function(data) {	1125	callback : function(data) {
Lines 1146-1152 Link Here
1146		1146
1147	var exportSFTPCommand = new mCommands.Command({	1147	var exportSFTPCommand = new mCommands.Command({
1148	name : messages["SFTP to..."],	1148	name : messages["SFTP to..."],
1149	tooltip: messages["Copy files and folders to a specified SFTP location"],	1149	tooltip: messages["cpy to SFTP"],
1150	imageClass: "core-sprite-transferout", //$NON-NLS-0$	1150	imageClass: "core-sprite-transferout", //$NON-NLS-0$
1151	id: "eclipse.exportSFTPCommand", //$NON-NLS-0$	1151	id: "eclipse.exportSFTPCommand", //$NON-NLS-0$
1152	callback : function(data) {	1152	callback : function(data) {
Lines 1192-1198 Link Here
1192		1192
1193	var moveCommand = new mCommands.Command({	1193	var moveCommand = new mCommands.Command({
1194	name : messages["Move to"],	1194	name : messages["Move to"],
1195	tooltip: messages["Move files and folders to a new location"],	1195	tooltip: messages["mv to new dir"],
1196	id: "eclipse.moveFile", //$NON-NLS-0$	1196	id: "eclipse.moveFile", //$NON-NLS-0$
1197	choiceCallback: function(items, userData) {	1197	choiceCallback: function(items, userData) {
1198	return makeMoveCopyTargetChoices(items, userData, false);	1198	return makeMoveCopyTargetChoices(items, userData, false);

Lines 13-21 Link Here

(-)a/bundles/org.eclipse.orion.client.ui/web/orion/widgets/plugin/PluginList.js (-17 / +17 lines)
13	provides JavaScript functions for user management of Orion plugins. It is designed	13	provides JavaScript functions for user management of Orion plugins. It is designed
14	to contain PluginEntry widgets */	14	to contain PluginEntry widgets */
15		15
16	define(['i18n!orion/settings/nls/messages', 'require', 'orion/Deferred', 'orion/commands', 'orion/commandRegistry', 'orion/commonHTMLFragments', 'orion/objects', 'orion/webui/littlelib',	16	define(['i18n!orion/settings/nls/messages', 'orion/i18nUtil', 'require', 'orion/Deferred', 'orion/commands', 'orion/commandRegistry', 'orion/commonHTMLFragments', 'orion/objects', 'orion/webui/littlelib',
17	'orion/widgets/plugin/PluginEntry', 'orion/explorers/explorer'	17	'orion/widgets/plugin/PluginEntry', 'orion/explorers/explorer'
18	], function(messages, require, Deferred, mCommands, mCommandRegistry, mHTMLFragments, objects, lib, PluginEntry, mExplorer) {	18	], function(messages, i18nUtil, require, Deferred, mCommands, mCommandRegistry, mHTMLFragments, objects, lib, PluginEntry, mExplorer) {
19		19
20	var Explorer = mExplorer.Explorer;	20	var Explorer = mExplorer.Explorer;
21	var SelectionRenderer = mExplorer.SelectionRenderer;	21	var SelectionRenderer = mExplorer.SelectionRenderer;
Lines 149-155 Link Here
149		149
150	var findMorePluginsCommand = new mCommands.Command({	150	var findMorePluginsCommand = new mCommands.Command({
151	name: messages['Get Plugins'],	151	name: messages['Get Plugins'],
152	tooltip: messages["Find More Orion Plugins"],	152	tooltip: messages["FindMorePlugs"],
153	id: "orion.findMorePluginsCommand", //$NON-NLS-0$	153	id: "orion.findMorePluginsCommand", //$NON-NLS-0$
154	hrefCallback: function(data){	154	hrefCallback: function(data){
155	return this.getPluginsLink(data.items);	155	return this.getPluginsLink(data.items);
Lines 164-170 Link Here
164	// set up the toolbar level commands	164	// set up the toolbar level commands
165	var installPluginCommand = new mCommands.Command({	165	var installPluginCommand = new mCommands.Command({
166	name: messages["Install"],	166	name: messages["Install"],
167	tooltip: messages["Install a plugin by specifying its URL"],	167	tooltip: messages["PlugInstallByURL"],
168	id: "orion.installPlugin", //$NON-NLS-0$	168	id: "orion.installPlugin", //$NON-NLS-0$
169	parameters: new mCommandRegistry.ParametersDescription([new mCommandRegistry.CommandParameter('url', 'url', messages['Plugin URL:'], '')]), //$NON-NLS-1$ //$NON-NLS-0$	169	parameters: new mCommandRegistry.ParametersDescription([new mCommandRegistry.CommandParameter('url', 'url', messages['Plugin URL:'], '')]), //$NON-NLS-1$ //$NON-NLS-0$
170	callback: function(data) {	170	callback: function(data) {
Lines 182-188 Link Here
182	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$	182	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$
183	var reloadAllPluginsCommand = new mCommands.Command({	183	var reloadAllPluginsCommand = new mCommands.Command({
184	name: messages["Reload all"],	184	name: messages["Reload all"],
185	tooltip: messages["Reload all installed plugins"],	185	tooltip: messages["ReloadAllPlugs"],
186	id: "orion.reloadAllPlugins", //$NON-NLS-0$	186	id: "orion.reloadAllPlugins", //$NON-NLS-0$
187	callback: this.reloadPlugins.bind(this)	187	callback: this.reloadPlugins.bind(this)
188	});	188	});
Lines 192-198 Link Here
192		192
193	var createPluginCommand = new mCommands.Command({	193	var createPluginCommand = new mCommands.Command({
194	name: messages['Create'],	194	name: messages['Create'],
195	tooltip: messages["Create a new Orion Plugin"],	195	tooltip: messages["CreatePlug"],
196	id: "orion.createPlugin", //$NON-NLS-0$	196	id: "orion.createPlugin", //$NON-NLS-0$
197	callback: function(data){	197	callback: function(data){
198	this.createPlugin(data.items);	198	this.createPlugin(data.items);
Lines 214-220 Link Here
214	// Declare row-level commands so they will be rendered when the rows are added.	214	// Declare row-level commands so they will be rendered when the rows are added.
215	var reloadPluginCommand = new mCommands.Command({	215	var reloadPluginCommand = new mCommands.Command({
216	name: messages["Reload"],	216	name: messages["Reload"],
217	tooltip: messages["Reload the plugin"],	217	tooltip: messages["ReloadPlug"],
218	id: "orion.reloadPlugin", //$NON-NLS-0$	218	id: "orion.reloadPlugin", //$NON-NLS-0$
219	imageClass: "core-sprite-refresh", //$NON-NLS-0$	219	imageClass: "core-sprite-refresh", //$NON-NLS-0$
220	visibleWhen: function(items) { // we expect a URL	220	visibleWhen: function(items) { // we expect a URL
Lines 229-235 Link Here
229		229
230	var uninstallPluginCommand = new mCommands.Command({	230	var uninstallPluginCommand = new mCommands.Command({
231	name: messages["Delete"],	231	name: messages["Delete"],
232	tooltip: messages["Delete this plugin from the configuration"],	232	tooltip: messages["DeletePlugFromConfig"],
233	imageClass: "core-sprite-delete", //$NON-NLS-0$	233	imageClass: "core-sprite-delete", //$NON-NLS-0$
234	id: "orion.uninstallPlugin", //$NON-NLS-0$	234	id: "orion.uninstallPlugin", //$NON-NLS-0$
235	visibleWhen: function(url) { // we expect a URL	235	visibleWhen: function(url) { // we expect a URL
Lines 364-370 Link Here
364		364
365	pluginURLBlur: function(){	365	pluginURLBlur: function(){
366	if( this.pluginUrlEntry.value === '' ){	366	if( this.pluginUrlEntry.value === '' ){
367	this.pluginUrlEntry.value = messages['Type a plugin url here ...'];	367	this.pluginUrlEntry.value = messages['TypePlugURL'];
368	this.pluginUrlEntry.style.color = "#AAA" ; //$NON-NLS-0$	368	this.pluginUrlEntry.style.color = "#AAA" ; //$NON-NLS-0$
369	}	369	}
370	},	370	},
Lines 375-381 Link Here
375	},	375	},
376		376
377	addPlugin: function( pluginUrl ){	377	addPlugin: function( pluginUrl ){
378	this.statusService.setMessage(messages["Installed "] + pluginUrl, 5000, true);	378	this.statusService.setMessage(i18nUtil.formatMessage("Installed ${0}", pluginUrl), 5000, true);
379	this.settings.preferences.getPreferences("/plugins").then(function(plugins) { //$NON-NLS-0$	379	this.settings.preferences.getPreferences("/plugins").then(function(plugins) { //$NON-NLS-0$
380	plugins.put(pluginUrl, true);	380	plugins.put(pluginUrl, true);
381	}); // this will force a sync	381	}); // this will force a sync
Lines 393-399 Link Here
393		393
394	installHandler: function(newPluginUrl){	394	installHandler: function(newPluginUrl){
395	if (/^\S+$/.test(newPluginUrl.trim())) {	395	if (/^\S+$/.test(newPluginUrl.trim())) {
396	this.statusService.setMessage(messages["Installing "] + newPluginUrl + "...", null, true);	396	this.statusService.setMessage(i18nUtil.formatMessage("Installing ${0}...", newPluginUrl), null, true);
397	if( this.settings.pluginRegistry.getPlugin(newPluginUrl) ){	397	if( this.settings.pluginRegistry.getPlugin(newPluginUrl) ){
398	this.statusService.setErrorMessage(messages["Already installed"]);	398	this.statusService.setErrorMessage(messages["Already installed"]);
399	} else {	399	} else {
Lines 406-412 Link Here
406		406
407	reloaded: function(){	407	reloaded: function(){
408	var settingsPluginList = this.settings.pluginRegistry.getPlugins();	408	var settingsPluginList = this.settings.pluginRegistry.getPlugins();
409	this.statusService.setMessage( messages["Reloaded "] + settingsPluginList.length + messages[" plugin"] + ( settingsPluginList.length===1 ? "": "s") + ".", 5000, true );	409	this.statusService.setMessage( ( settingsPluginList.length===1 ? i18nUtil.formatMessage("Reloaded ${0} plugin.", settingsPluginList.length): i18nUtil.formatMessage("Reloaded ${0} plugins.", settingsPluginList.length)), 5000, true );
410	this.render();	410	this.render();
411	},	411	},
412		412
Lines 415-421 Link Here
415	var plugin = this.settings.pluginRegistry.getPlugin(url);	415	var plugin = this.settings.pluginRegistry.getPlugin(url);
416	if (plugin) {	416	if (plugin) {
417	plugin.update().then(this.render.bind(this));	417	plugin.update().then(this.render.bind(this));
418	this.statusService.setMessage(messages['Reloaded '] + url, 5000, true);	418	this.statusService.setMessage( i18nUtil.formatMessage("Reloaded ${0}", url), 5000, true);
419	}	419	}
420	},	420	},
421		421
Lines 423-429 Link Here
423	var plugin = this.settings.pluginRegistry.getPlugin(url);	423	var plugin = this.settings.pluginRegistry.getPlugin(url);
424	if (plugin) {	424	if (plugin) {
425	plugin.stop();	425	plugin.stop();
426	this.statusService.setMessage("Disabled " + url, 5000, true);	426	this.statusService.setMessage(i18nUtil.formatMessage("Disabled ${0}", url), 5000, true);
427	this.settings.preferences.getPreferences("/plugins").then(function(plugins) { //$NON-NLS-0$	427	this.settings.preferences.getPreferences("/plugins").then(function(plugins) { //$NON-NLS-0$
428	plugins.put(url, false);	428	plugins.put(url, false);
429	this.render(this);	429	this.render(this);
Lines 436-442 Link Here
436	var plugin = this.settings.pluginRegistry.getPlugin(url);	436	var plugin = this.settings.pluginRegistry.getPlugin(url);
437	if (plugin) {	437	if (plugin) {
438	plugin.start({lazy:true});	438	plugin.start({lazy:true});
439	this.statusService.setMessage("Enabled " + url, 5000, true);	439	this.statusService.setMessage(i18nUtil.formatMessage("Enabled ${0}", url), 5000, true);
440	this.settings.preferences.getPreferences("/plugins").then(function(plugins) { //$NON-NLS-0$	440	this.settings.preferences.getPreferences("/plugins").then(function(plugins) { //$NON-NLS-0$
441	plugins.put(url, false);	441	plugins.put(url, false);
442	this.render(this);	442	this.render(this);
Lines 464-470 Link Here
464	var plugin = this.settings.pluginRegistry.getPlugin(url);	464	var plugin = this.settings.pluginRegistry.getPlugin(url);
465	if (plugin) {	465	if (plugin) {
466	plugin.uninstall().then(function() {	466	plugin.uninstall().then(function() {
467	this.statusService.setMessage(messages["Uninstalled "] + url, 5000, true);	467	this.statusService.setMessage(i18nUtil.formatMessage("Uninstalled ${0}", url), 5000, true);
468	this.settings.preferences.getPreferences("/plugins").then(function(plugins) { //$NON-NLS-0$	468	this.settings.preferences.getPreferences("/plugins").then(function(plugins) { //$NON-NLS-0$
469	plugins.keys().some(function(key) {	469	plugins.keys().some(function(key) {
470	if (_normalizeURL(require.toUrl(key)) === _normalizeURL(url)) {	470	if (_normalizeURL(require.toUrl(key)) === _normalizeURL(url)) {
Lines 487-493 Link Here
487		487
488	// TODO: Should be internationalized	488	// TODO: Should be internationalized
489		489
490	var confirmMessage = messages["Are you sure you want to uninstall '"] + url + "'?"; //$NON-NLS-1$	490	var confirmMessage = i18nUtil.formatMessage("Are you sure you want to uninstall '${0}'?",url); //$NON-NLS-1$
491	if (window.confirm(confirmMessage)) {	491	if (window.confirm(confirmMessage)) {
492	this.forceRemove(url);	492	this.forceRemove(url);
493	}	493	}

Lines 276-282 Link Here

(-)a/bundles/org.eclipse.orion.client.git/web/git/nls/root/gitmessages.js (-2 / +3 lines)
276	"Branch name": "Branch name",	276	"Branch name": "Branch name",
277	"Delete": "Delete",	277	"Delete": "Delete",
278	"Delete the local branch from the repository": "Delete the local branch from the repository",	278	"Delete the local branch from the repository": "Delete the local branch from the repository",
279	"Are you sure you want to delete branch ${0}?": "Are you sure you want to delete branch ${0}?",	279	"delete branch msg": "Are you sure you want to delete branch ${0}?",
280	"Delete the remote tracking branch from the repository": "Delete the remote tracking branch from the repository",	280	"Delete the remote tracking branch from the repository": "Delete the remote tracking branch from the repository",
281	"Are you sure?": "Are you sure?",	281	"Are you sure?": "Are you sure?",
282	"You're going to delete remote branch ${0} and push the change.": "You're going to delete remote branch ${0} and push the change.",	282	"You're going to delete remote branch ${0} and push the change.": "You're going to delete remote branch ${0} and push the change.",
Lines 299-305 Link Here
299	"Open the status for the repository": "Open the status for the repository",	299	"Open the status for the repository": "Open the status for the repository",
300	"ShowInEditor": "Show in Editor",	300	"ShowInEditor": "Show in Editor",
301	"ShowInEditorTooltip": "Show the repository folder in the editor",	301	"ShowInEditorTooltip": "Show the repository folder in the editor",
302	"Compare With Each Other": "Compare With Each Other",	302	"Compare each": "Compare With Each Other",
303	"Compare With Working Tree": "Compare With Working Tree",	303	"Compare With Working Tree": "Compare With Working Tree",
304	"Open": "Open",	304	"Open": "Open",
305	"OpenGitCommitTip": "View the tree for this commit",	305	"OpenGitCommitTip": "View the tree for this commit",
Lines 477-482 Link Here
477	"Login": "Login",	477	"Login": "Login",
478	"Authentication required for: ${0}. ${1} and re-try the request.": "Authentication required for: ${0}. ${1} and re-try the request.",	478	"Authentication required for: ${0}. ${1} and re-try the request.": "Authentication required for: ${0}. ${1} and re-try the request.",
479	"Save":"Save",	479	"Save":"Save",
		480	"Remember my committer name and email:":"Remember my committer name and email:",
480	"Successfully edited ${0} to have value ${1}":"Successfully edited ${0} to have value ${1}",	481	"Successfully edited ${0} to have value ${1}":"Successfully edited ${0} to have value ${1}",
481	"Successfully added ${0} with value ${1}":"Successfully added ${0} with value ${1}",	482	"Successfully added ${0} with value ${1}":"Successfully added ${0} with value ${1}",
482	"Signed-off-by: ":"Signed-off-by: ",	483	"Signed-off-by: ":"Signed-off-by: ",

Lines 61-67 Link Here

(-)a/bundles/org.eclipse.orion.client.ui/web/content/content.js (-3 / +3 lines)
61	// expected error - HTTP 412 Precondition Failed	61	// expected error - HTTP 412 Precondition Failed
62	// occurs when file is out of sync with the server	62	// occurs when file is out of sync with the server
63	if (error.status === 412) {	63	if (error.status === 412) {
64	var forceSave = window.confirm(messages["Resource is out of sync with the server. Do you want to save it anyway?"]);	64	var forceSave = window.confirm(messages["ResrcOutOfSync"]);
65	if (forceSave) {	65	if (forceSave) {
66	// repeat save operation, but without ETag	66	// repeat save operation, but without ETag
67	progressService.progress(fileClient.write(targetMetadata.Location, contents), "Saving file " + targetMetadata.Location).then(	67	progressService.progress(fileClient.write(targetMetadata.Location, contents), "Saving file " + targetMetadata.Location).then(
Lines 166-172 Link Here
166	var parent = lib.node("delegatedContent"); //$NON-NLS-0$	166	var parent = lib.node("delegatedContent"); //$NON-NLS-0$
167	lib.empty(parent);	167	lib.empty(parent);
168	var message = document.createElement("div"); //$NON-NLS-0$	168	var message = document.createElement("div"); //$NON-NLS-0$
169	message.appendChild(document.createTextNode(messages["Plugin content could not be found"]));	169	message.appendChild(document.createTextNode(messages["PluginContentNotFound"]));
170	parent.appendChild(message);	170	parent.appendChild(message);
171	}	171	}
172	}	172	}
Lines 182-188 Link Here
182	if (data.shellService) {	182	if (data.shellService) {
183	if (data.sourceLocation) {	183	if (data.sourceLocation) {
184	saveFileContents(fileClient, fileMetadata, {sourceLocation: data.sourceLocation}, function() {	184	saveFileContents(fileClient, fileMetadata, {sourceLocation: data.sourceLocation}, function() {
185	if (window.confirm(messages["Content has been saved. Click OK to go to the navigator, Cancel to keep editing."])) {	185	if (window.confirm(messages["ContentSavedMsg"])) {
186	// go to the navigator	186	// go to the navigator
187	window.location.href = orionHome + "/edit/edit.html#" + fileMetadata.Parents[0].ChildrenLocation; //$NON-NLS-0$	187	window.location.href = orionHome + "/edit/edit.html#" + fileMetadata.Parents[0].ChildrenLocation; //$NON-NLS-0$
188	} else {	188	} else {

Lines 62-68 Link Here

(-)a/bundles/org.eclipse.orion.client.ui/web/content/saveHook.js (-2 / +2 lines)
62	if (contentURL && contentURL.length > 0) {	62	if (contentURL && contentURL.length > 0) {
63	var parent = lib.node("orion.saveRequest"); //$NON-NLS-0$	63	var parent = lib.node("orion.saveRequest"); //$NON-NLS-0$
64	var p = document.createElement("p"); //$NON-NLS-0$	64	var p = document.createElement("p"); //$NON-NLS-0$
65	p.appendChild(document.createTextNode(i18nUtil.formatMessage(messages["Content plugin ${0} has saved data."], info.name))); //$NON-NLS-0$	65	p.appendChild(document.createTextNode(i18nUtil.formatMessage(messages["ContentSavedData"], info.name))); //$NON-NLS-0$
66	p.appendChild(document.createElement("br")); //$NON-NLS-0$	66	p.appendChild(document.createElement("br")); //$NON-NLS-0$
67	var a = document.createElement("a"); //$NON-NLS-0$	67	var a = document.createElement("a"); //$NON-NLS-0$
68	a.href = contentURL;	68	a.href = contentURL;
Lines 70-76 Link Here
70	p.appendChild(a);	70	p.appendChild(a);
71	parent.appendChild(p);	71	parent.appendChild(p);
72	p = document.createElement("p"); //$NON-NLS-0$	72	p = document.createElement("p"); //$NON-NLS-0$
73	p.appendChild(document.createTextNode(i18nUtil.formatMessage(messages["Click ${0} to store this file into Orion."], messages["Save"]))); //$NON-NLS-0$	73	p.appendChild(document.createTextNode(i18nUtil.formatMessage(messages["StoreFileMsg"], messages["Save"]))); //$NON-NLS-0$
74	parent.appendChild(p);	74	parent.appendChild(p);
75	var button = document.createElement("button"); //$NON-NLS-0$	75	var button = document.createElement("button"); //$NON-NLS-0$
76	button.appendChild(document.createTextNode(messages['Save']));	76	button.appendChild(document.createTextNode(messages['Save']));

Lines 49-56 Link Here

(-)a/bundles/org.eclipse.orion.client.ui/web/orion/compare/compareCommands.js (-4 / +4 lines)
49	return;	49	return;
50	}	50	}
51	var copyToLeftCommand = new mCommands.Command({	51	var copyToLeftCommand = new mCommands.Command({
52	name : messages["Copy current change from right to left"],	52	name : messages["CpCurChangeRightToLeft"],
53	tooltip : messages["Copy current change from right to left"],	53	tooltip : messages["CpCurChangeRightToLeft"],
54	imageClass : "core-sprite-leftarrow", //$NON-NLS-0$	54	imageClass : "core-sprite-leftarrow", //$NON-NLS-0$
55	id: "orion.compare.copyToLeft", //$NON-NLS-0$	55	id: "orion.compare.copyToLeft", //$NON-NLS-0$
56	groupId: "orion.compareGroup", //$NON-NLS-0$	56	groupId: "orion.compareGroup", //$NON-NLS-0$
Lines 61-68 Link Here
61	data.items.copyToLeft();	61	data.items.copyToLeft();
62	}});	62	}});
63	var copyToRightCommand = new mCommands.Command({	63	var copyToRightCommand = new mCommands.Command({
64	name : messages["Copy current change from left to right"],	64	name : messages["CpCurChangeLeftToRight"],
65	tooltip : messages["Copy current change from left to right"],	65	tooltip : messages["CpCurChangeLeftToRight"],
66	imageClass : "core-sprite-rightarrow", //$NON-NLS-0$	66	imageClass : "core-sprite-rightarrow", //$NON-NLS-0$
67	id: "orion.compare.copyToRight", //$NON-NLS-0$	67	id: "orion.compare.copyToRight", //$NON-NLS-0$
68	groupId: "orion.compareGroup", //$NON-NLS-0$	68	groupId: "orion.compareGroup", //$NON-NLS-0$

Lines 9-21 Link Here

(-)a/bundles/org.eclipse.orion.client.ui/web/orion/crawler/nls/root/messages.js (-7 / +3 lines)
9	******************************************************************************/	9	******************************************************************************/
10		10
11	//NLS_CHARSET=UTF-8	11	//NLS_CHARSET=UTF-8
12		12	/eslint-env browser, amd/
13	define({	13	define({
14	"Searching file:": "Searching file:",	14	"filesFound": "${0} files found out of ${1}",
15	"is not supported in this file system": "is not supported in this file system",	15	"searchCancelled": "Search cancelled by user",
16	"${0} files found out of ${1}": "${0} files found out of ${1}",
17	"The search term on this location will not use indexed files." : "The search term on this location will not use indexed files.",
18	"It will take longer time. Do you want to proceed?" : "It will take longer time. Do you want to proceed?",
19	"Search cancelled by user": "Search cancelled by user",
20	"Cancel": "Cancel"	16	"Cancel": "Cancel"
21	});	17	});

Lines 166-172 Link Here

(-)a/bundles/org.eclipse.orion.client.ui/web/orion/crawler/searchCrawler.js (-3 / +3 lines)
166	SearchCrawler.prototype._HandleStatus = function(error){	166	SearchCrawler.prototype._HandleStatus = function(error){
167	if(this._statusService && error.name === "Cancel") { //$NON-NLS-0$	167	if(this._statusService && error.name === "Cancel") { //$NON-NLS-0$
168	console.log("Crawling search cancelled. Deferred array length : " + this._deferredArray.length); //$NON-NLS-0$	168	console.log("Crawling search cancelled. Deferred array length : " + this._deferredArray.length); //$NON-NLS-0$
169	this._statusService.setProgressResult({Message: messages["Search cancelled by user"], Severity: "Warning"}); //$NON-NLS-0$	169	this._statusService.setProgressResult({Message: messages["searchCancelled"], Severity: "Warning"}); //$NON-NLS-0$
170	}	170	}
171	};	171	};
172		172
Lines 274-280 Link Here
274	if(this.searchHelper.params.keyword === ""){	274	if(this.searchHelper.params.keyword === ""){
275	this._reportSingleHit(fileObj);	275	this._reportSingleHit(fileObj);
276	if(this._statusService) {	276	if(this._statusService) {
277	this._statusService.setProgressResult({Message: i18nUtil.formatMessage(messages["${0} files found out of ${1}"], this._hitCounter, this._totalCounter)});	277	this._statusService.setProgressResult({Message: i18nUtil.formatMessage(messages["filesFound"], this._hitCounter, this._totalCounter)});
278	}	278	}
279	} else {	279	} else {
280	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$	280	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$
Lines 282-288 Link Here
282	self._reportSingleHit(fileObj);	282	self._reportSingleHit(fileObj);
283	}	283	}
284	if(self._statusService) {	284	if(self._statusService) {
285	self._statusService.setProgressResult({Message: i18nUtil.formatMessage(messages["${0} files found out of ${1}"], self._hitCounter, self._totalCounter)}, messages["Cancel"]);	285	self._statusService.setProgressResult({Message: i18nUtil.formatMessage(messages["filesFound"], self._hitCounter, self._totalCounter)}, messages["Cancel"]);
286	}	286	}
287	},	287	},
288	function(error) {	288	function(error) {

Lines 30-49 Link Here

(-)a/bundles/org.eclipse.orion.client.ui/web/orion/nls/root/messages.js (-12 / +9 lines)
30	"Orion JSON Editor": "Orion JSON Editor",	30	"Orion JSON Editor": "Orion JSON Editor",
31	"View on Site": "View on Site",	31	"View on Site": "View on Site",
32	"View this file or folder on a web site hosted by Orion": "View this file or folder on a web site hosted by Orion.",	32	"View this file or folder on a web site hosted by Orion": "View this file or folder on a web site hosted by Orion.",
33	"Show a list of all the keybindings on this page": "Show a list of all the keybindings on this page",	33	"ShowAllKeyBindings": "Show a list of all the keybindings on this page",
34	"Show Keys": "Show Keys",	34	"Show Keys": "Show Keys",
35	"Hide or show the page banner and footer": "Hide or show the page banner and footer",	35	"HideShowBannerFooter": "Hide or show the page banner and footer",
36	"Toggle banner and footer": "Toggle banner and footer",	36	"Toggle banner and footer": "Toggle banner and footer",
37	"Choose a file by name and open an editor on it": "Choose a file by name and open an editor on it",	37	"ChooseFileOpenEditor": "Choose a file by name and open an editor on it",
38	"Find File Named...": "Find File Named...",	38	"FindFile": "Find File Named...",
39	"System Configuration Details": "System Configuration Details",	39	"System Configuration Details": "System Configuration Details",
40	"System Config Tooltip": "Go to the System Configuration Details page",	40	"System Config Tooltip": "Go to the System Configuration Details page",
41	"Background Operations": "Background Operations",	41	"Background Operations": "Background Operations",
42	"Background Operations Tooltip": "Go to the Background Operations page",	42	"Background Operations Tooltip": "Go to the Background Operations page",
43	"Operation status is unknown": "Operation status is unknown",	43	"Operation status is unknown": "Operation status is unknown",
44	"Unknown item": "Unknown item",	44	"Unknown item": "Unknown item",
45	"Can't search: no search service is available": "Can't search: no search service is available",	45	"NoSearchAvailableErr": "Can't search: no search service is available",
46	"could not find banner parent, id was ": "could not find banner parent, id was ",
47	"Related": "Related",	46	"Related": "Related",
48	"Options": "Options",	47	"Options": "Options",
49	"FAQ": "FAQ",	48	"FAQ": "FAQ",
Lines 59-69 Link Here
59	"no tree model": "no tree model",	58	"no tree model": "no tree model",
60	"no renderer": "no renderer",	59	"no renderer": "no renderer",
61	"could not find table row ": "could not find table row ",	60	"could not find table row ": "could not find table row ",
62	"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?",	61	"ResrcOutOfSync": "Resource is out of sync with the server. Do you want to save it anyway?",
63	"Operations": "Operations",	62	"Operations": "Operations",
64	"Operations running": "Operations running",	63	"Operations running": "Operations running",
65	"Some operations finished with warning": "Some operations finished with warning",	64	"SomeOpWarning": "Some operations finished with warning",
66	"Some operations finished with error": "Some operations finished with error",	65	"SomeOpErr": "Some operations finished with error",
67	"no service registry": "no service registry",	66	"no service registry": "no service registry",
68	"Tasks": "Tasks",	67	"Tasks": "Tasks",
69	"Close": "Close",	68	"Close": "Close",
Lines 79-86 Link Here
79	"Global search" : "Global search",	78	"Global search" : "Global search",
80	"Orion Home" : "Orion Home",	79	"Orion Home" : "Orion Home",
81	"Close notification" : "Close notification",	80	"Close notification" : "Close notification",
82	"Operations - Press spacebar to show current operations" : "Operations - Press spacebar to show current operations",	81	"OpPressSpaceMsg" : "Operations - Press spacebar to show current operations",
83	"Type a keyword or wild card to search in root" : "Type a keyword or wild card to search in root",
84	"Toggle side panel" : "Toggle side panel",	82	"Toggle side panel" : "Toggle side panel",
85	"Open or close the side panel": "Open or close the side panel",	83	"Open or close the side panel": "Open or close the side panel",
86	"Projects" : "Projects",	84	"Projects" : "Projects",
Lines 96-102 Link Here
96	"Filter": "Filter (* = any string, ? = any character)",	94	"Filter": "Filter (* = any string, ? = any character)",
97	"TemplateExplorerLabel": "Templates",	95	"TemplateExplorerLabel": "Templates",
98	"OpenTemplateExplorer": "Open Template Explorer",	96	"OpenTemplateExplorer": "Open Template Explorer",
99	"To view the browser's context menu, trigger the context menu again.": "To view the browser's context menu, trigger the context menu again.",
100	"Edit": "Edit",	97	"Edit": "Edit",
101	"CentralNavTooltip": "Toggle Navigation Menu",	98	"CentralNavTooltip": "Toggle Navigation Menu",
102	"Wrote: ${0}": "Wrote: ${0}",	99	"Wrote: ${0}": "Wrote: ${0}",

Lines 68-74 Link Here

(-)a/bundles/org.eclipse.orion.client.ui/web/orion/operationsCommands.js (-3 / +3 lines)
68		68
69	var removeCompletedOperationsCommand = new mCommands.Command({	69	var removeCompletedOperationsCommand = new mCommands.Command({
70	name : messages["Remove Completed"],	70	name : messages["Remove Completed"],
71	tooltip : messages["Remove all completed operations"],	71	tooltip : messages["rmCompleted"],
72	id : "eclipse.removeCompletedOperations", //$NON-NLS-0$	72	id : "eclipse.removeCompletedOperations", //$NON-NLS-0$
73	callback : function(data) {	73	callback : function(data) {
74	operationsClient.removeCompletedOperations().then(function(item){	74	operationsClient.removeCompletedOperations().then(function(item){
Lines 83-89 Link Here
83		83
84	var removeOperationCommand = new mCommands.Command({	84	var removeOperationCommand = new mCommands.Command({
85	name : messages["Remove"],	85	name : messages["Remove"],
86	tooltip : messages["Remove operations from the operations list."],	86	tooltip : messages["rmFromOpList"],
87	imageClass: "core-sprite-delete", //$NON-NLS-0$	87	imageClass: "core-sprite-delete", //$NON-NLS-0$
88	id : "eclipse.removeOperation", //$NON-NLS-0$	88	id : "eclipse.removeOperation", //$NON-NLS-0$
89	callback : function(data) {	89	callback : function(data) {
Lines 108-114 Link Here
108		108
109	var cancelOperationCommand = new mCommands.Command({	109	var cancelOperationCommand = new mCommands.Command({
110	name : messages["Cancel"],	110	name : messages["Cancel"],
111	tooltip : messages["Cancel operations from the operations list."],	111	tooltip : messages["CancelOp"],
112	imageClass: "core-sprite-stop", //$NON-NLS-0$	112	imageClass: "core-sprite-stop", //$NON-NLS-0$
113	id : "eclipse.cancelOperation", //$NON-NLS-0$	113	id : "eclipse.cancelOperation", //$NON-NLS-0$
114	callback : function(data) {	114	callback : function(data) {

Lines 83-97 Link Here

(-)a/bundles/org.eclipse.orion.client.ui/web/orion/progress.js (-6 / +6 lines)
83	this._switchIconTo("running"); //$NON-NLS-0$	83	this._switchIconTo("running"); //$NON-NLS-0$
84	break;	84	break;
85	case "warning": //$NON-NLS-0$	85	case "warning": //$NON-NLS-0$
86	this._progressPane.title = messages["Some operations finished with warning"];	86	this._progressPane.title = messages["SomeOpWarning"];
87	this._progressPane.alt = messages['Some operations finished with warning'];	87	this._progressPane.alt = messages['SomeOpWarning'];
88	this._progressPane.setAttribute("aria-valuetext", messages['Some operations finished with warning']); //$NON-NLS-0$	88	this._progressPane.setAttribute("aria-valuetext", messages['SomeOpWarning']); //$NON-NLS-0$
89	this._switchIconTo("warning"); //$NON-NLS-0$	89	this._switchIconTo("warning"); //$NON-NLS-0$
90	break;	90	break;
91	case "error": //$NON-NLS-0$	91	case "error": //$NON-NLS-0$
92	this._progressPane.title = messages["Some operations finished with error"];	92	this._progressPane.title = messages["SomeOpErr"];
93	this._progressPane.alt = messages['Some operations finished with error'];	93	this._progressPane.alt = messages['SomeOpErr'];
94	this._progressPane.setAttribute("aria-valuetext", messages['Some operations finished with error']); //$NON-NLS-0$	94	this._progressPane.setAttribute("aria-valuetext", messages['SomeOpErr']); //$NON-NLS-0$
95	this._switchIconTo("error"); //$NON-NLS-0$	95	this._switchIconTo("error"); //$NON-NLS-0$
96	break;	96	break;
97	default:	97	default:

Lines 32-52 Link Here

(-)a/bundles/org.eclipse.orion.client.ui/web/orion/search/nls/root/messages.js (-8 / +7 lines)
32	"Show Replace": "Switch to Replace Mode",	32	"Show Replace": "Switch to Replace Mode",
33	"Hide Replace": "Switch to Search Mode",	33	"Hide Replace": "Switch to Search Mode",
34	"Search ${0}": "Search ${0}",	34	"Search ${0}": "Search ${0}",
35	"Type a keyword or wild card to search in ": "Type a keyword or wild card to search in ",	35	"TypeKeyOrWildCard": "Type a keyword or wild card to search in ",
36	"Search failed.": "Search failed.",	36	"Search failed.": "Search failed.",
37	"No matches found for ${0}": "No matches found for ${0}",	37	"NoMatchFound": "No matches found for ${0}",
38	"Searching...": "Searching...",	38	"Searching...": "Searching...",
39	"Resource has been changed by others.": "Resource has been changed by others.",	39	"ResourceChanged.": "Resource has been changed by others.",
40	"Failed to write file.": "Failed to write file.",	40	"Failed to write file.": "Failed to write file.",
41	"Results": "Results",	41	"Results": "Results",
42	"Files ${0} of ${1} matching ${2}": "Files ${0} of ${1} matching \"${2}\"",	42	"FilesAofBmatchingC": "Files ${0} of ${1} matching \"${2}\"",
43	"Replace ${0} with ${1} for files ${2} of ${3}": "Replace \"${0}\" with \"${1}\" for files ${2} of ${3}",	43	"ReplaceAwithBforCofD": "Replace \"${0}\" with \"${1}\" for files ${2} of ${3}",
44	"Location": "Location",	44	"Location": "Location",
45	"Click to compare": "Click to compare",	45	"Click to compare": "Click to compare",
46	"Search again in this folder with \"${0}\"": "Search again in this folder with \"${0}\"",	46	"Search again in this folder with \"${0}\"": "Search again in this folder with \"${0}\"",
47	"Files replaced": "Files replaced",	47	"Files replaced": "Files replaced",
48	"Status": "Status",	48	"Status": "Status",
49	"${0} out of ${1} matches replaced.": "${0} out of ${1} matches replaced.",	49	"matchesReplacedMsg": "${0} out of ${1} matches replaced.",
50	"Replace all matches with...": "Replace all matches with...",	50	"Replace all matches with...": "Replace all matches with...",
51	"Apply Changes": "Replace Selected",	51	"Apply Changes": "Replace Selected",
52	"Replace all selected matches": "Replace all selected matches",	52	"Replace all selected matches": "Replace all selected matches",
Lines 74-80 Link Here
74	"Replace All Matches": "Replace All Matches",	74	"Replace All Matches": "Replace All Matches",
75	"No matches": "No matches",	75	"No matches": "No matches",
76	"Rename": "Rename",	76	"Rename": "Rename",
77	"Save frequently used searches by clicking on the ${0} button above.": "Save frequently used searches by clicking on the ${0} button above.",
78	"Search": "Search",	77	"Search": "Search",
79	"All types": "All types",	78	"All types": "All types",
80	"File type": "File type",	79	"File type": "File type",
Lines 90-96 Link Here
90	"Scope Search": "Scoped Search",	89	"Scope Search": "Scoped Search",
91	"Open in Search page for this directory": "Open the Search page for this folder.",	90	"Open in Search page for this directory": "Open the Search page for this folder.",
92	"${0}. Try your search again.": "${0}. Try your search again.",	91	"${0}. Try your search again.": "${0}. Try your search again.",
93	"Click or use delete key to delete the search term": "Click or use delete key to delete the search term",	92	"DeleteSearchTrmMsg": "Click or use delete key to delete the search term",
94	"${0} matches": "${0} matches",	93	"${0} matches": "${0} matches",
95	"regexOptionOff" : "Regular expressions are off. Click here or use the options to turn them on for replacement",	94	"regexOptionOff" : "Regular expressions are off. Click here or use the options to turn them on for replacement",
96	"regexOptionOn" : "Regular expressions are on. Click here or use the options to turn them off",	95	"regexOptionOn" : "Regular expressions are on. Click here or use the options to turn them off",

Lines 297-306 Link Here

(-)a/bundles/org.eclipse.orion.client.ui/web/orion/searchModel.js (-3 / +3 lines)
297	var endNumber = startNumber + pagingParams.numberOnPage - 1;	297	var endNumber = startNumber + pagingParams.numberOnPage - 1;
298	headerStr = "";	298	headerStr = "";
299	if (!this.replaceMode()) {	299	if (!this.replaceMode()) {
300	headerStr = i18nUtil.formatMessage(messages["Files ${0} of ${1} matching ${2}"],	300	headerStr = i18nUtil.formatMessage(messages["FilesAofBmatchingC"],
301	startNumber + "-" + endNumber, pagingParams.totalNumber, this._searchHelper.displayedSearchTerm); //$NON-NLS-0$	301	startNumber + "-" + endNumber, pagingParams.totalNumber, this._searchHelper.displayedSearchTerm); //$NON-NLS-0$
302	} else {	302	} else {
303	headerStr = i18nUtil.formatMessage(messages["Replace ${0} with ${1} for files ${2} of ${3}"],	303	headerStr = i18nUtil.formatMessage(messages["ReplaceAwithBforCofD"],
304	this._searchHelper.displayedSearchTerm,	304	this._searchHelper.displayedSearchTerm,
305	this._searchHelper.params.replace,	305	this._searchHelper.params.replace,
306	startNumber + "-" + endNumber, //$NON-NLS-0$	306	startNumber + "-" + endNumber, //$NON-NLS-0$
Lines 503-509 Link Here
503	if (error.status === 412) {	503	if (error.status === 412) {
504	reportList.push({	504	reportList.push({
505	model: fileItem,	505	model: fileItem,
506	message: messages["Resource has been changed by others."],	506	message: messages["ResourceChanged."],
507	matchesReplaced: matchesReplaced,	507	matchesReplaced: matchesReplaced,
508	status: "failed" //$NON-NLS-0$	508	status: "failed" //$NON-NLS-0$
509	});	509	});

Lines 76-131 Link Here

(-)a/bundles/org.eclipse.orion.client.ui/web/orion/settings/nls/root/messages.js (-23 / +16 lines)
76	"Update Profile Settings": "Update Profile Settings",	76	"Update Profile Settings": "Update Profile Settings",
77	"Update Git User Settings": "Update Git User Settings",	77	"Update Git User Settings": "Update Git User Settings",
78	"Update Git Credentials": "Update Git Credentials",	78	"Update Git Credentials": "Update Git Credentials",
79	"User profile data successfully updated.": "User profile data successfully updated.",	79	"UsrProfileUpdateSuccess": "User profile data successfully updated.",
80	"Git user data successfully updated.": "Git user data successfully updated.",	80	"GitUsrUpdateSuccess": "Git user data successfully updated.",
81	"Git Credentials successfully updated.": "Git Credentials successfully updated.",	81	"GitCredsUpdateSuccess": "Git Credentials successfully updated.",
82	"Edit Plugin JavaScript": "Edit Plugin JavaScript",
83	"Install Plugin": "Install Plugin",	82	"Install Plugin": "Install Plugin",
84	"Plugin Name:": "Plugin Name:",	83	"Plugin Name:": "Plugin Name:",
85	"Author Name:": "Author Name:",	84	"Author Name:": "Author Name:",
86	"Licence:": "Licence:",	85	"Licence:": "Licence:",
87	"Description:": "Description:",	86	"Description:": "Description:",
88	"A plugin for Orion": "A plugin for Orion",	87	"OrionPlugin": "A plugin for Orion",
89	"Plugin Link": "Plugin Link",	88	"Plugin Link": "Plugin Link",
90	"Install": "Install",	89	"Install": "Install",
91	"Install a plugin by specifying its URL": "Install a plugin by specifying its URL",	90	"PlugInstallByURL": "Install a plugin by specifying its URL",
92	"Plugin URL:": "Plugin URL:",	91	"Plugin URL:": "Plugin URL:",
93	"Disable": "Disable",	92	"Disable": "Disable",
94	"DisableTooltip": "Disable the plugin",	93	"DisableTooltip": "Disable the plugin",
95	"Enable": "Enable",	94	"Enable": "Enable",
96	"EnableTooltip": "Enable the plugin",	95	"EnableTooltip": "Enable the plugin",
97	"Reload all": "Reload all",	96	"Reload all": "Reload all",
98	"Reload all installed plugins": "Reload all installed plugins",	97	"ReloadAllPlugs": "Reload all installed plugins",
99	"Create a new Orion Plugin": "Create a new Orion Plugin",	98	"CreatePlug": "Create a new Orion Plugin",
100	"Find More Orion Plugins": "Find More Orion Plugins",	99	"FindMorePlugs": "Find More Orion Plugins",
101	"Get Plugins": "Get Plugins",	100	"Get Plugins": "Get Plugins",
102	"Reload": "Reload",	101	"Reload": "Reload",
103	"Reload the plugin": "Reload the plugin",	102	"ReloadPlug": "Reload the plugin",
104	"Delete": "Delete",	103	"Delete": "Delete",
105	"Delete this plugin from the configuration": "Delete this plugin from the configuration",	104	"DeletePlugFromConfig": "Delete this plugin from the configuration",
106	"DeleteUser" : "Delete User Profile as well as workspaces and projects",	105	"DeleteUser" : "Delete User Profile as well as workspaces and projects",
107	"DeleteUserComfirmation" : "WARNING: This will permanently delete your user profile as well as all of your work!",	106	"DeleteUserComfirmation" : "WARNING: This will permanently delete your user profile as well as all of your work!",
108	"Type a plugin url here ...": "Type a plugin url here ...",	107	"TypePlugURL": "Type a plugin url here ...",
109	"Installed ": "Installed ",
110	"Installing ": "Installing ",
111	"Already installed": "Already installed",	108	"Already installed": "Already installed",
112	" plugin": " plugin",
113	"Reloaded ": "Reloaded ",
114	"Uninstalled ": "Uninstalled ",
115	"Are you sure you want to uninstall '": "Are you sure you want to uninstall '",
116	"Services": "Services",	109	"Services": "Services",
117	"Value": "Value",	110	"Value": "Value",
118	"JavaScript Object": "JavaScript Object",	111	"JavaScript Object": "JavaScript Object",
119	"click here, then check javascript console to drill down": "click here, then check javascript console to drill down",	112	"CheckJsConsoleDrillDown": "click here, then check javascript console to drill down",
120	"Item": "Item",	113	"Item": "Item",
121	"Git Config": "Git Config",	114	"Git Config": "Git Config",
122	"Clear Git Credentials": "Clear Git Credentials",	115	"Clear Git Credentials": "Clear Git Credentials",
123	"Enable Storage": "Enable Storage:",	116	"Enable Storage": "Enable Storage:",
124	"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.",	117	"BrowserCredStoreMsg" : "Please be aware that your credentials will be stored persistently in the browser.",
125	"Do you wish to enable the Key Storage?" : "Do you wish to enable the Key Storage?",	118	"AskEnableKeyStorage" : "Do you wish to enable the Key Storage?",
126	"general": "General",	119	"general": "General",
127	"validation": "Validation",	120	"validation": "Validation",
128	"Deleted git credentials for ${0}": "Deleted git credentials for ${0}",	121	"DeletedGitMsg": "Deleted git credentials for ${0}",
129	"Editor": "Editor",	122	"Editor": "Editor",
130	"editorSettings": "Settings",	123	"editorSettings": "Settings",
131	"EditorThemes": "Themes",	124	"EditorThemes": "Themes",
Lines 252-256 Link Here
252	'vanillaSkiesThemeName': 'Vanilla Skies', //$NON-NLS-0$ //$NON-NLS-1$	245	'vanillaSkiesThemeName': 'Vanilla Skies', //$NON-NLS-0$ //$NON-NLS-1$
253	'beetlejuiceThemeName': 'Beetlejuice', //$NON-NLS-0$ //$NON-NLS-1$	246	'beetlejuiceThemeName': 'Beetlejuice', //$NON-NLS-0$ //$NON-NLS-1$
254	'redThemeName': 'Red', //$NON-NLS-0$ //$NON-NLS-1$	247	'redThemeName': 'Red', //$NON-NLS-0$ //$NON-NLS-1$
255	"${0} settings successfully updated.": "${0} settings successfully updated."	248	"SettingUpdateSuccess": "${0} settings successfully updated."
256	});	249	});

Lines 14-61 Link Here

(-)a/bundles/org.eclipse.orion.client.ui/web/orion/shell/nls/root/messages.js (-33 / +30 lines)
14	"Shell": "Shell",	14	"Shell": "Shell",
15	"Changed to: ": "Changed to: ",	15	"Changed to: ": "Changed to: ",
16	"Initial directory: ": "Initial directory: ",	16	"Initial directory: ": "Initial directory: ",
17	"${0} is not a directory": "${0} is not a directory",	17	"ChangeCurrDir": "Changes the current directory",
18	"${0} was not found": "${0} was not found",	18	"DirName": "The name of the directory",
19	"Changes the current directory": "Changes the current directory",	19	"EditFile": "Edits a file",
20	"The name of the directory": "The name of the directory",	20	"FileName": "The name of the file",
21	"Edits a file": "Edits a file",	21	"CurDirFileList": "Lists the files in the current directory",
22	"The name of the file": "The name of the file",	22	"CurDirLocation": "Prints the current directory location",
23	"Lists the files in the current directory": "Lists the files in the current directory",	23	"ClearShellScreen": "Clears the shell screen",
24	"Prints the current directory location": "Prints the current directory location",	24	"notValid": "'${0}' is not valid",
25	"Clears the shell screen": "Clears the shell screen",	25	"Err": "Error: ${0}",
26	"'${0}' is not valid": "'${0}' is not valid",
27	"Error: ${0}": "Error: ${0}",
28	"NoResponseFromServer": "No response from server for ${0}. Check your internet connection and try again.",	26	"NoResponseFromServer": "No response from server for ${0}. Check your internet connection and try again.",
29	"ServerError": "Server error: ${0} returned ${1} ${2}",	27	"ServerError": "Server error: ${0} returned ${1} ${2}",
30	"Succeeded": "Succeeded",	28	"Succeeded": "Succeeded",
31	"Aborted": "Aborted",	29	"Aborted": "Aborted",
32	"The name of the plug-in": "The name of the plug-in",	30	"PlugName": "The name of the plug-in",
33	"The name of the contributed plug-in": "The name of the contributed plug-in",	31	"ContributedPludName": "The name of the contributed plug-in",
34	"Lists all registered plug-ins": "Lists all registered plug-ins",	32	"RegisteredPlugsList": "Lists all registered plug-ins",
35	"Reloads a plug-in": "Reloads a plug-in",	33	"Reloads a plug-in": "Reloads a plug-in",
36	"Disables a contributed plug-in": "Disables a contributed plug-in",	34	"DisableContributedPlug": "Disables a contributed plug-in",
37	"Enables a contributed plug-in": "Enables a contributed plug-in",	35	"EnableContributedPlug": "Enables a contributed plug-in",
38	"Uninstalls a contributed plug-in from the configuration": "Uninstalls a contributed plug-in from the configuration",	36	"UninstallContributedPlugFrmConfig": "Uninstalls a contributed plug-in from the configuration",
39	"Plug-in is already installed": "Plug-in is already installed",	37	"PlugAlreadyInstalled": "Plug-in is already installed",
40	"Invalid plug-in URL": "Invalid plug-in URL",	38	"Invalid plug-in URL": "Invalid plug-in URL",
41	"Installs a plug-in from a URL": "Installs a plug-in from a URL",	39	"InstallPlugFrmURL": "Installs a plug-in from a URL",
42	"The plug-in URL": "The plug-in URL",	40	"The plug-in URL": "The plug-in URL",
43	"Commands for working with plug-ins": "Commands for working with plug-ins",	41	"CmdForPlugs": "Commands for working with plug-ins",
44	"Are you sure you want to uninstall all contributed plug-ins?": "Are you sure you want to uninstall all contributed plug-ins?",	42	"UninstallAllPlugsMsg": "Are you sure you want to uninstall all contributed plug-ins?",
45	"Displays a plug-in's services": "Displays a plug-in's services",	43	"DisplayPlugServices": "Displays a plug-in's services",
46	"Commands for working with a service": "Commands for working with a service",	44	"CmdsForService": "Commands for working with a service",
47	"Displays all plug-in contributions for a service": "Displays all plug-in contributions for a service",	45	"DisplayPlugsForService": "Displays all plug-in contributions for a service",
48	"The service identifier": "The service identifier",	46	"The service identifier": "The service identifier",
49	"disabled": "disabled",	47	"disabled": "disabled",
50	"Open Shell": "Open Shell",	48	"Open Shell": "Open Shell",
51	"Open Shell page": "Open the Shell page with this folder as the current directory.",	49	"Open Shell page": "Open the Shell page with this folder as the current directory.",
52	"'${0}' already exists": "'${0}' already exists",	50	"AlreadyExist": "'${0}' already exists",
53	"Source file service does not support binary read": "Source file service does not support binary read",	51	"SrcNotSupportBinRead": "Source file service does not support binary read",
54	"Target file service does not support binary write": "Target file service does not support binary write",	52	"TargetNotSupportBinWrite": "Target file service does not support binary write",
55	"Cannot create file, it already exists as a directory": "Cannot create file, it already exists as a directory",	53	"AlreadyExistsInDirErr": "Cannot create file, it already exists as a directory",
56	"Cannot create directory, it already exists as a file": "Cannot create directory, it already exists as a file",	54	"WroteMsg": "Wrote ${0}",
57	"Wrote ${0}": "Wrote ${0}",	55	"WriteFailMsg": "Failed to write ${0}",
58	"Failed to write ${0}": "Failed to write ${0}",	56	"WriteFailNotDescendentOfOutputDir": "Cannot write ${0}, it is not a descendent of the output directory",
59	"Cannot write ${0}, it is not a descendent of the output directory": "Cannot write ${0}, it is not a descendent of the output directory",	57	"FileOrDirRedirectOutput": "The file or directory to re-direct output to"
60	"The file or directory to re-direct output to": "The file or directory to re-direct output to"
61	});	58	});

Lines 110-129 Link Here

(-)a/bundles/org.eclipse.orion.client.ui/web/orion/webui/dialogs/OperationsDialog.js (-4 / +4 lines)
110	switch (operation.type) {	110	switch (operation.type) {
111	case "Warning": //$NON-NLS-0$	111	case "Warning": //$NON-NLS-0$
112	operationIcon.classList.add("core-sprite-warning"); //$NON-NLS-0$	112	operationIcon.classList.add("core-sprite-warning"); //$NON-NLS-0$
113	operationIcon.setAttribute("aria-label", messages["Operation resulted in a warning."]); //$NON-NLS-0$	113	operationIcon.setAttribute("aria-label", messages["OpWarning"]); //$NON-NLS-0$
114	break;	114	break;
115	case "error": //$NON-NLS-0$	115	case "error": //$NON-NLS-0$
116	operationIcon.classList.add("core-sprite-error"); //$NON-NLS-0$	116	operationIcon.classList.add("core-sprite-error"); //$NON-NLS-0$
117	operationIcon.setAttribute("aria-label", messages["Operation resulted in an error."]); //$NON-NLS-0$	117	operationIcon.setAttribute("aria-label", messages["OpErr"]); //$NON-NLS-0$
118	break;	118	break;
119	case "loadstart":	119	case "loadstart":
120	case "progress":	120	case "progress":
121	operationIcon.classList.add("core-sprite-start"); //$NON-NLS-0$	121	operationIcon.classList.add("core-sprite-start"); //$NON-NLS-0$
122	operationIcon.setAttribute("aria-label", messages["Operation is running."]); //$NON-NLS-0$	122	operationIcon.setAttribute("aria-label", messages["OpRunning"]); //$NON-NLS-0$
123	break;	123	break;
124	case "abort":	124	case "abort":
125	operationIcon.classList.add("core-sprite-stop"); //$NON-NLS-0$	125	operationIcon.classList.add("core-sprite-stop"); //$NON-NLS-0$
126	operationIcon.setAttribute("aria-label", messages["Operation is canceled."]); //$NON-NLS-0$	126	operationIcon.setAttribute("aria-label", messages["OpCancelled"]); //$NON-NLS-0$
127	break;	127	break;
128	case "load":	128	case "load":
129	case "loadend":	129	case "loadend":

Lines 106-112 Link Here

(-)a/bundles/org.eclipse.orion.client.ui/web/orion/widgets/settings/GitSettings.js (-5 / +5 lines)
106	var gitPreferenceStorage = new GitPreferenceStorage(that.registry);	106	var gitPreferenceStorage = new GitPreferenceStorage(that.registry);
107	gitPreferenceStorage.remove(repository).then(	107	gitPreferenceStorage.remove(repository).then(
108	function(){	108	function(){
109	messageService.setProgressResult(i18nUtil.formatMessage(messages["Deleted git credentials for ${0}"], [repository]));	109	messageService.setProgressResult(i18nUtil.formatMessage(messages["DeletedGitMsg"], [repository]));
110	that.gitCredentialsFields[keyIndex+1].destroy();	110	that.gitCredentialsFields[keyIndex+1].destroy();
111	}	111	}
112	);	112	);
Lines 138-144 Link Here
138	var messageService = this.registry.getService("orion.page.message"); //$NON-NLS-0$	138	var messageService = this.registry.getService("orion.page.message"); //$NON-NLS-0$
139	gitConfigPreference.setConfig({GitMail: this.gitFields[0].getValue(), GitName: this.gitFields[1].getValue()}).then(	139	gitConfigPreference.setConfig({GitMail: this.gitFields[0].getValue(), GitName: this.gitFields[1].getValue()}).then(
140	function(){	140	function(){
141	messageService.setProgressResult( messages['Git user data successfully updated.'] );	141	messageService.setProgressResult( messages['GitUsrUpdateSuccess'] );
142	}	142	}
143	);	143	);
144	},	144	},
Lines 149-159 Link Here
149	// git authentication update	149	// git authentication update
150	var gitPreferenceStorage = new GitPreferenceStorage(this.registry);	150	var gitPreferenceStorage = new GitPreferenceStorage(this.registry);
151	if( this.gitCredentialsFields[0].isChecked() ){	151	if( this.gitCredentialsFields[0].isChecked() ){
152	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?"];	152	var confirmMessage = messages["BrowserCredStoreMsg"] + '\n' + messages["AskEnableKeyStorage"];
153	if(window.confirm(confirmMessage)){	153	if(window.confirm(confirmMessage)){
154	gitPreferenceStorage.enable().then(	154	gitPreferenceStorage.enable().then(
155	function(){	155	function(){
156	messageService.setProgressResult( messages['Git Credentials successfully updated.'] );	156	messageService.setProgressResult( messages['GitCredsUpdateSuccess'] );
157	}	157	}
158	);	158	);
159	} else {	159	} else {
Lines 163-169 Link Here
163	} else {	163	} else {
164	gitPreferenceStorage.disable().then(	164	gitPreferenceStorage.disable().then(
165	function(){	165	function(){
166	messageService.setProgressResult( messages['Git Credentials successfully updated.'] );	166	messageService.setProgressResult( messages['GitCredsUpdateSuccess'] );
167	}	167	}
168	);	168	);
169	}	169	}

Lines 236-242 Link Here

(-)a/bundles/org.eclipse.orion.client.ui/web/shell/paramType-file.js (-6 / +6 lines)
236	var successFn = function(file) {	236	var successFn = function(file) {
237	this.callback = function() {	237	this.callback = function() {
238	var string = i18nUtil.formatMessage(	238	var string = i18nUtil.formatMessage(
239	messages["Wrote ${0}"],	239	messages["WroteMsg"],
240	typeof(file) === "string" ? file : this.shellPageFileService.computePathString(file)); //$NON-NLS-0$	240	typeof(file) === "string" ? file : this.shellPageFileService.computePathString(file)); //$NON-NLS-0$
241	var writer = new mResultWriters.ShellStringWriter(element);	241	var writer = new mResultWriters.ShellStringWriter(element);
242	writer.write(string + "\n"); //$NON-NLS-0$	242	writer.write(string + "\n"); //$NON-NLS-0$
Lines 251-257 Link Here
251	var errorFn = function(file) {	251	var errorFn = function(file) {
252	this.callback = function(error) {	252	this.callback = function(error) {
253	var string = i18nUtil.formatMessage(	253	var string = i18nUtil.formatMessage(
254	messages["Failed to write ${0}"],	254	messages["WriteFailMsg"],
255	typeof(file) === "string" ? file : this.shellPageFileService.computePathString(file)); //$NON-NLS-0$	255	typeof(file) === "string" ? file : this.shellPageFileService.computePathString(file)); //$NON-NLS-0$
256	string += " [" + error + "]"; //$NON-NLS-1$ //$NON-NLS-0$	256	string += " [" + error + "]"; //$NON-NLS-1$ //$NON-NLS-0$
257	var writer = new mResultWriters.ShellStringWriter(element);	257	var writer = new mResultWriters.ShellStringWriter(element);
Lines 288-294 Link Here
288	} else if (segment === "..") { //$NON-NLS-0$	288	} else if (segment === "..") { //$NON-NLS-0$
289	if (index === 0) {	289	if (index === 0) {
290	/* invalid, destination must be a descendent of the cwd */	290	/* invalid, destination must be a descendent of the cwd */
291	errorFn(i18nUtil.formatMessage(messages["Cannot write ${0}, it is not a descendent of the output directory"], file.path));	291	errorFn(i18nUtil.formatMessage(messages["WriteFailNotDescendentOfOutputDir"], file.path));
292	return;	292	return;
293	}	293	}
294	pathSegments.splice(index-- - 1, 2);	294	pathSegments.splice(index-- - 1, 2);
Lines 351-357 Link Here
351	return {	351	return {
352	value: undefined,	352	value: undefined,
353	status: mShell.CompletionStatus.ERROR,	353	status: mShell.CompletionStatus.ERROR,
354	message: i18nUtil.formatMessage(messages["'${0}' is not valid"], string),	354	message: i18nUtil.formatMessage(messages["notValid"], string),
355	predictions: null	355	predictions: null
356	};	356	};
357	}	357	}
Lines 368-374 Link Here
368	}	368	}
369	if (exactMatch) {	369	if (exactMatch) {
370	status = mShell.CompletionStatus.ERROR;	370	status = mShell.CompletionStatus.ERROR;
371	message = i18nUtil.formatMessage(messages["'${0}' already exists"], string);	371	message = i18nUtil.formatMessage(messages["AlreadyExist"], string);
372	} else {	372	} else {
373	// TODO validate filename?	373	// TODO validate filename?
374	status = mShell.CompletionStatus.MATCH;	374	status = mShell.CompletionStatus.MATCH;
Lines 403-409 Link Here
403	status = mShell.CompletionStatus.PARTIAL;	403	status = mShell.CompletionStatus.PARTIAL;
404	} else {	404	} else {
405	status = mShell.CompletionStatus.ERROR;	405	status = mShell.CompletionStatus.ERROR;
406	message = i18nUtil.formatMessage(messages["'${0}' is not valid"], string);	406	message = i18nUtil.formatMessage(messages["notValid"], string);
407	}	407	}
408	} else { /* exist is undefined */	408	} else { /* exist is undefined */
409	// TODO validate filename?	409	// TODO validate filename?

Lines 228-236 Link Here

(-)a/bundles/org.eclipse.orion.client.ui/web/shell/shellPage.js (-26 / +26 lines)
228	error = JSON.parse(xhrResult.responseText);	228	error = JSON.parse(xhrResult.responseText);
229	} catch (e) {}	229	} catch (e) {}
230	if (error && error.DetailedMessage) {	230	if (error && error.DetailedMessage) {
231	error = i18nUtil.formatMessage(messages["Error: ${0}"], error.DetailedMessage);	231	error = i18nUtil.formatMessage(messages["Err"], error.DetailedMessage);
232	} else if (error && error.Message) {	232	} else if (error && error.Message) {
233	error = i18nUtil.formatMessage(messages["Error: ${0}"], error.Message);	233	error = i18nUtil.formatMessage(messages["Err"], error.Message);
234	} else if (typeof xhrResult.url === "string") {	234	} else if (typeof xhrResult.url === "string") {
235	if (xhrResult.status === 0) {	235	if (xhrResult.status === 0) {
236	error = i18nUtil.formatMessage(messages["NoResponseFromServer"], xhrResult.url);	236	error = i18nUtil.formatMessage(messages["NoResponseFromServer"], xhrResult.url);
Lines 442-448 Link Here
442	var url = args.url.trim();	442	var url = args.url.trim();
443	if (/^\S+$/.test(url)) {	443	if (/^\S+$/.test(url)) {
444	if (pluginRegistry.getPlugin(url)){	444	if (pluginRegistry.getPlugin(url)){
445	return messages["Plug-in is already installed"];	445	return messages["PlugAlreadyInstalled"];
446	}	446	}
447	var result = context.createPromise();	447	var result = context.createPromise();
448	pluginRegistry.installPlugin(url).then(	448	pluginRegistry.installPlugin(url).then(
Lines 484-490 Link Here
484	function pluginsUninstallExec(args, context) {	484	function pluginsUninstallExec(args, context) {
485	var result = context.createPromise();	485	var result = context.createPromise();
486	if (args.plugin.isAllPlugin) {	486	if (args.plugin.isAllPlugin) {
487	var msg = messages["Are you sure you want to uninstall all contributed plug-ins?"];	487	var msg = messages["UninstallAllPlugsMsg"];
488	if (!window.confirm(msg)) {	488	if (!window.confirm(msg)) {
489	return messages.Aborted;	489	return messages.Aborted;
490	}	490	}
Lines 917-956 Link Here
917	/* add the locally-defined commands */	917	/* add the locally-defined commands */
918	shell.registerCommand({	918	shell.registerCommand({
919	name: "cd", //$NON-NLS-0$	919	name: "cd", //$NON-NLS-0$
920	description: messages["Changes the current directory"],	920	description: messages["ChangeCurrDir"],
921	callback: cdExec,	921	callback: cdExec,
922	parameters: [{	922	parameters: [{
923	name: "directory", //$NON-NLS-0$	923	name: "directory", //$NON-NLS-0$
924	type: {name: "file", directory: true, exist: true}, //$NON-NLS-0$	924	type: {name: "file", directory: true, exist: true}, //$NON-NLS-0$
925	description: messages["The name of the directory"]	925	description: messages["DirName"]
926	}],	926	}],
927	returnType: "html" //$NON-NLS-0$	927	returnType: "html" //$NON-NLS-0$
928	});	928	});
929	shell.registerCommand({	929	shell.registerCommand({
930	name: "edit", //$NON-NLS-0$	930	name: "edit", //$NON-NLS-0$
931	description: messages["Edits a file"],	931	description: messages["EditFile"],
932	callback: editExec,	932	callback: editExec,
933	parameters: [{	933	parameters: [{
934	name: "file", //$NON-NLS-0$	934	name: "file", //$NON-NLS-0$
935	type: {name: "file", file: true, exist: true}, //$NON-NLS-0$	935	type: {name: "file", file: true, exist: true}, //$NON-NLS-0$
936	description: messages["The name of the file"]	936	description: messages["FileName"]
937	}]	937	}]
938	});	938	});
939	shell.registerCommand({	939	shell.registerCommand({
940	name: "ls", //$NON-NLS-0$	940	name: "ls", //$NON-NLS-0$
941	description: messages["Lists the files in the current directory"],	941	description: messages["CurDirFileList"],
942	callback: lsExec,	942	callback: lsExec,
943	returnType: "html" //$NON-NLS-0$	943	returnType: "html" //$NON-NLS-0$
944	});	944	});
945	shell.registerCommand({	945	shell.registerCommand({
946	name: "pwd", //$NON-NLS-0$	946	name: "pwd", //$NON-NLS-0$
947	description: messages["Prints the current directory location"],	947	description: messages["CurDirLocation"],
948	callback: pwdExec,	948	callback: pwdExec,
949	returnType: "html" //$NON-NLS-0$	949	returnType: "html" //$NON-NLS-0$
950	});	950	});
951	shell.registerCommand({	951	shell.registerCommand({
952	name: "clear", //$NON-NLS-0$	952	name: "clear", //$NON-NLS-0$
953	description: messages["Clears the shell screen"],	953	description: messages["ClearShellScreen"],
954	callback: function(args, context) {	954	callback: function(args, context) {
955	shell.clear();	955	shell.clear();
956	}	956	}
Lines 959-975 Link Here
959	/* plug-in management commands */	959	/* plug-in management commands */
960	shell.registerCommand({	960	shell.registerCommand({
961	name: "plugins", //$NON-NLS-0$	961	name: "plugins", //$NON-NLS-0$
962	description: messages["Commands for working with plug-ins"]	962	description: messages["CmdForPlugs"]
963	});	963	});
964	shell.registerCommand({	964	shell.registerCommand({
965	name: "plugins list", //$NON-NLS-0$	965	name: "plugins list", //$NON-NLS-0$
966	description: messages["Lists all registered plug-ins"],	966	description: messages["RegisteredPlugsList"],
967	callback: pluginsListExec,	967	callback: pluginsListExec,
968	returnType: "html" //$NON-NLS-0$	968	returnType: "html" //$NON-NLS-0$
969	});	969	});
970	shell.registerCommand({	970	shell.registerCommand({
971	name: "plugins install", //$NON-NLS-0$	971	name: "plugins install", //$NON-NLS-0$
972	description: messages["Installs a plug-in from a URL"],	972	description: messages["InstallPlugFrmURL"],
973	callback: pluginsInstallExec,	973	callback: pluginsInstallExec,
974	parameters: [{	974	parameters: [{
975	name: "url", //$NON-NLS-0$	975	name: "url", //$NON-NLS-0$
Lines 980-991 Link Here
980	});	980	});
981	shell.registerCommand({	981	shell.registerCommand({
982	name: "plugins uninstall", //$NON-NLS-0$	982	name: "plugins uninstall", //$NON-NLS-0$
983	description: messages["Uninstalls a contributed plug-in from the configuration"],	983	description: messages["UninstallContributedPlugFrmConfig"],
984	callback: pluginsUninstallExec,	984	callback: pluginsUninstallExec,
985	parameters: [{	985	parameters: [{
986	name: "plugin", //$NON-NLS-0$	986	name: "plugin", //$NON-NLS-0$
987	type: {name: "plugin", multiple: true, excludeDefaultPlugins: true}, //$NON-NLS-0$	987	type: {name: "plugin", multiple: true, excludeDefaultPlugins: true}, //$NON-NLS-0$
988	description: messages["The name of the contributed plug-in"]	988	description: messages["ContributedPludName"]
989	}],	989	}],
990	returnType: "string" //$NON-NLS-0$	990	returnType: "string" //$NON-NLS-0$
991	});	991	});
Lines 996-1035 Link Here
996	parameters: [{	996	parameters: [{
997	name: "plugin", //$NON-NLS-0$	997	name: "plugin", //$NON-NLS-0$
998	type: {name: "plugin", multiple: true, excludeDefaultPlugins: false}, //$NON-NLS-0$	998	type: {name: "plugin", multiple: true, excludeDefaultPlugins: false}, //$NON-NLS-0$
999	description: messages["The name of the plug-in"]	999	description: messages["PlugName"]
1000	}],	1000	}],
1001	returnType: "string" //$NON-NLS-0$	1001	returnType: "string" //$NON-NLS-0$
1002	});	1002	});
1003	shell.registerCommand({	1003	shell.registerCommand({
1004	name: "plugins enable", //$NON-NLS-0$	1004	name: "plugins enable", //$NON-NLS-0$
1005	description: messages["Enables a contributed plug-in"],	1005	description: messages["EnableContributedPlug"],
1006	callback: pluginsEnableExec,	1006	callback: pluginsEnableExec,
1007	parameters: [{	1007	parameters: [{
1008	name: "plugin", //$NON-NLS-0$	1008	name: "plugin", //$NON-NLS-0$
1009	type: {name: "plugin", multiple: true, excludeDefaultPlugins: true}, //$NON-NLS-0$	1009	type: {name: "plugin", multiple: true, excludeDefaultPlugins: true}, //$NON-NLS-0$
1010	description: messages["The name of the contributed plug-in"]	1010	description: messages["ContributedPludName"]
1011	}],	1011	}],
1012	returnType: "string" //$NON-NLS-0$	1012	returnType: "string" //$NON-NLS-0$
1013	});	1013	});
1014	shell.registerCommand({	1014	shell.registerCommand({
1015	name: "plugins disable", //$NON-NLS-0$	1015	name: "plugins disable", //$NON-NLS-0$
1016	description: messages["Disables a contributed plug-in"],	1016	description: messages["DisableContributedPlug"],
1017	callback: pluginsDisableExec,	1017	callback: pluginsDisableExec,
1018	parameters: [{	1018	parameters: [{
1019	name: "plugin", //$NON-NLS-0$	1019	name: "plugin", //$NON-NLS-0$
1020	type: {name: "plugin", multiple: true, excludeDefaultPlugins: true}, //$NON-NLS-0$	1020	type: {name: "plugin", multiple: true, excludeDefaultPlugins: true}, //$NON-NLS-0$
1021	description: messages["The name of the contributed plug-in"]	1021	description: messages["ContributedPludName"]
1022	}],	1022	}],
1023	returnType: "string" //$NON-NLS-0$	1023	returnType: "string" //$NON-NLS-0$
1024	});	1024	});
1025	shell.registerCommand({	1025	shell.registerCommand({
1026	name: "plugins services", //$NON-NLS-0$	1026	name: "plugins services", //$NON-NLS-0$
1027	description: messages["Displays a plug-in's services"],	1027	description: messages["DisplayPlugServices"],
1028	callback: pluginServicesExec,	1028	callback: pluginServicesExec,
1029	parameters: [{	1029	parameters: [{
1030	name: "plugin", //$NON-NLS-0$	1030	name: "plugin", //$NON-NLS-0$
1031	type: {name: "plugin", multiple: false, excludeDefaultPlugins: false}, //$NON-NLS-0$	1031	type: {name: "plugin", multiple: false, excludeDefaultPlugins: false}, //$NON-NLS-0$
1032	description: messages["The name of the plug-in"]	1032	description: messages["PlugName"]
1033	}],	1033	}],
1034	returnType: "html" //$NON-NLS-0$	1034	returnType: "html" //$NON-NLS-0$
1035	});	1035	});
Lines 1037-1048 Link Here
1037	/* service management commands */	1037	/* service management commands */
1038	shell.registerCommand({	1038	shell.registerCommand({
1039	name: "service", //$NON-NLS-0$	1039	name: "service", //$NON-NLS-0$
1040	description: messages["Commands for working with a service"]	1040	description: messages["CmdsForService"]
1041	});	1041	});
1042		1042
1043	shell.registerCommand({	1043	shell.registerCommand({
1044	name: "service contributors", //$NON-NLS-0$	1044	name: "service contributors", //$NON-NLS-0$
1045	description: messages["Displays all plug-in contributions for a service"],	1045	description: messages["DisplayPlugsForService"],
1046	callback: serviceContributorsExec,	1046	callback: serviceContributorsExec,
1047	parameters: [{	1047	parameters: [{
1048	name: "id", //$NON-NLS-0$	1048	name: "id", //$NON-NLS-0$
Lines 1087-1093 Link Here
1087	parameters.push({	1087	parameters.push({
1088	name: "output", //$NON-NLS-0$	1088	name: "output", //$NON-NLS-0$
1089	type: {name: "file", file: true, directory: true}, //$NON-NLS-0$	1089	type: {name: "file", file: true, directory: true}, //$NON-NLS-0$
1090	description: messages["The file or directory to re-direct output to"], //$NON-NLS-0$	1090	description: messages["FileOrDirRedirectOutput"], //$NON-NLS-0$
1091	defaultValue: null	1091	defaultValue: null
1092	});	1092	});
1093	}	1093	}

Lines 72-78 Link Here

(-)a/bundles/org.eclipse.orion.client.ui/web/shell/shellPageFileService.js (-6 / +6 lines)
72	if (directory.Directory) {	72	if (directory.Directory) {
73	result.resolve(directory);	73	result.resolve(directory);
74	} else {	74	} else {
75	result.reject(messages["Cannot create directory, it already exists as a file"]);	75	result.reject(messages["AlreadyExistsInDirErr"]);
76	}	76	}
77	} else {	77	} else {
78	parentNode = parentNode \|\| this.getCurrentDirectory();	78	parentNode = parentNode \|\| this.getCurrentDirectory();
Lines 86-92 Link Here
86	/* directory already exists, so nothing to do */	86	/* directory already exists, so nothing to do */
87	result.resolve(children[i]);	87	result.resolve(children[i]);
88	} else {	88	} else {
89	result.reject(messages["Cannot create directory, it already exists as a file"]);	89	result.reject(messages["AlreadyExistsInDirErr"]);
90	}	90	}
91	return;	91	return;
92	}	92	}
Lines 115-121 Link Here
115	if (!file.Directory) {	115	if (!file.Directory) {
116	result.resolve(file);	116	result.resolve(file);
117	} else {	117	} else {
118	result.reject(messages["Cannot create file, it already exists as a directory"]);	118	result.reject(messages["AlreadyExistsInDirErr"]);
119	}	119	}
120	} else {	120	} else {
121	parentNode = parentNode \|\| this.getCurrentDirectory();	121	parentNode = parentNode \|\| this.getCurrentDirectory();
Lines 129-135 Link Here
129	/* file already exists, so nothing to do */	129	/* file already exists, so nothing to do */
130	result.resolve(children[i]);	130	result.resolve(children[i]);
131	} else {	131	} else {
132	result.reject(messages["Cannot create file, it already exists as a directory"]);	132	result.reject(messages["AlreadyExistsInDirErr"]);
133	}	133	}
134	return;	134	return;
135	}	135	}
Lines 236-242 Link Here
236	var sourceService = fileClient._getService(node.Location);	236	var sourceService = fileClient._getService(node.Location);
237	if (!sourceService.readBlob) {	237	if (!sourceService.readBlob) {
238	var promise = new Deferred();	238	var promise = new Deferred();
239	promise.reject(messages["Source file service does not support binary read"]);	239	promise.reject(messages["SrcNotSupportBinRead"]);
240	return promise;	240	return promise;
241	}	241	}
242	return sourceService.readBlob(node.Location);	242	return sourceService.readBlob(node.Location);
Lines 299-305 Link Here
299	var targetService = fileClient._getService(node.Location);	299	var targetService = fileClient._getService(node.Location);
300	if (!targetService.writeBlob) {	300	if (!targetService.writeBlob) {
301	var promise = new Deferred();	301	var promise = new Deferred();
302	promise.reject(messages["Target file service does not support binary write"]);	302	promise.reject(messages["TargetNotSupportBinWrite"]);
303	return promise;	303	return promise;
304	}	304	}
305	return targetService.writeBlob(node.Location, content);	305	return targetService.writeBlob(node.Location, content);

Lines 24-30 Link Here

(-)a/bundles/org.eclipse.orion.client.ui/web/stringexternalizer/stringexternalizerconfig.js (-3 / +3 lines)
24	createCommands: function() {	24	createCommands: function() {
25	var changeMessagesDirectory = new mCommands.Command({	25	var changeMessagesDirectory = new mCommands.Command({
26	name: messages["Change Directory"],	26	name: messages["Change Directory"],
27	tooltip: messages["Change messages directory"],	27	tooltip: messages["Change msg dir"],
28	id: "eclipse.changeMessagesDirectory", //$NON-NLS-0$	28	id: "eclipse.changeMessagesDirectory", //$NON-NLS-0$
29	callback: function(data) {	29	callback: function(data) {
30	var dialog = new DirPrompter.DirectoryPrompterDialog({	30	var dialog = new DirPrompter.DirectoryPrompterDialog({
Lines 77-83 Link Here
77	}	77	}
78	var section = new mSection.Section(this.parent, {	78	var section = new mSection.Section(this.parent, {
79	id: "stringexternalizerConfigSection", //$NON-NLS-0$	79	id: "stringexternalizerConfigSection", //$NON-NLS-0$
80	title: messages["Externalize Strings Configuration"],	80	title: messages["ExternalizeStrConfig"],
81	content: '<div id="stringexternalizerConfigContent"></div>', //$NON-NLS-0$	81	content: '<div id="stringexternalizerConfigContent"></div>', //$NON-NLS-0$
82	preferenceService: this.serviceRegistry.getService("orion.core.preference"), //$NON-NLS-0$	82	preferenceService: this.serviceRegistry.getService("orion.core.preference"), //$NON-NLS-0$
83	canHide: false,	83	canHide: false,
Lines 149-155 Link Here
149	sectionContent.appendChild(p);	149	sectionContent.appendChild(p);
150	b = document.createElement("b"); //$NON-NLS-0$	150	b = document.createElement("b"); //$NON-NLS-0$
151	p.appendChild(b);	151	p.appendChild(b);
152	b.appendChild(document.createTextNode(messages["Mark not exported as NON-NLS:"]));	152	b.appendChild(document.createTextNode(messages["MarkNotNON-NLS"]));
153	p.appendChild(document.createElement("br")); //$NON-NLS-0$	153	p.appendChild(document.createElement("br")); //$NON-NLS-0$
154	var markNls = document.createElement("input"); //$NON-NLS-0$	154	var markNls = document.createElement("input"); //$NON-NLS-0$
155	markNls.type = "checkbox"; //$NON-NLS-0$	155	markNls.type = "checkbox"; //$NON-NLS-0$