Bug 381933 - Unexternalized strings on "Init Git Repository" dialogv20120709-1449

Conflicts:
	bundles/org.eclipse.orion.client.core/web/orion/nls/root/messages.js

5 files changed, 18 insertions, 8 deletions

diff --git a/bundles/org.eclipse.orion.client.core/web/orion/nls/root/messages.js b/bundles/org.eclipse.orion.client.core/web/orion/nls/root/messages.js
index 8282654..2140476 100644
--- a/bundles/org.eclipse.orion.client.core/web/orion/nls/root/messages.js
+++ b/bundles/org.eclipse.orion.client.core/web/orion/nls/root/messages.js
@@ -72,5 +72,8 @@ define({
 	"Tasks": "Tasks",
 	"Close": "Close",
 	"Expand all": "Expand all",
-	"Collapse all": "Collapse all" 
-});
\ No newline at end of file
+	"Collapse all": "Collapse all",
+	"Search": "Search",
+	"Submit" : "Submit",
+	"More" : "More"
+});
diff --git a/bundles/org.eclipse.orion.client.core/web/orion/parameterCollectors.js b/bundles/org.eclipse.orion.client.core/web/orion/parameterCollectors.js
index 41c245e..5a9e2e0 100644
--- a/bundles/org.eclipse.orion.client.core/web/orion/parameterCollectors.js
+++ b/bundles/org.eclipse.orion.client.core/web/orion/parameterCollectors.js
@@ -253,7 +253,7 @@ define(['i18n!orion/nls/messages', 'require', 'dojo', 'dijit', 'orion/commands',
 					commandInvocation.parameters.optionsRequested = false;
 					
 					var options = dojo.create("span", {role: "button", tabindex: "0"}, parentDismiss, "last"); //$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-0$
-					dojo.place(window.document.createTextNode("More"), options, "last"); //$NON-NLS-1$ //$NON-NLS-0$
+					dojo.place(window.document.createTextNode(messages["More"]), options, "last"); //$NON-NLS-1$ //$NON-NLS-0$
 					dojo.addClass(options, "dismiss"); //$NON-NLS-0$
 					dojo.connect(options, "onclick", dojo.hitch(this, function() { //$NON-NLS-0$
 						commandInvocation.parameters.optionsRequested = true;
@@ -269,7 +269,7 @@ define(['i18n!orion/nls/messages', 'require', 'dojo', 'dijit', 'orion/commands',
 				}
 				// OK and cancel buttons
 				var ok = dojo.create("span", {role: "button", tabindex: "0"}, parentDismiss, "last"); //$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-0$
-				dojo.place(window.document.createTextNode("Submit"), ok, "last"); //$NON-NLS-1$ //$NON-NLS-0$
+				dojo.place(window.document.createTextNode(messages["Submit"]), ok, "last"); //$NON-NLS-1$ //$NON-NLS-0$
 				dojo.addClass(ok, "dismiss"); //$NON-NLS-0$
 				dojo.connect(ok, "onclick", dojo.hitch(this, function() { //$NON-NLS-0$
 					finish(this);
diff --git a/bundles/org.eclipse.orion.client.git/web/git/nls/root/gitmessages.js b/bundles/org.eclipse.orion.client.git/web/git/nls/root/gitmessages.js
index 8c8d374..a84c2c4 100644
--- a/bundles/org.eclipse.orion.client.git/web/git/nls/root/gitmessages.js
+++ b/bundles/org.eclipse.orion.client.git/web/git/nls/root/gitmessages.js
@@ -340,5 +340,8 @@ define({
 	"Remote Branch Log": "Git Log (Remote Branch)",

 	"Show the log for the corresponding remote tracking branch": "Show the log for the corresponding remote tracking branch",

 	"See Full Status" : "See Full Status",

-	"See the status" : "See the status"
+	"See the status" : "See the status",

+	"Choose target location" : "Choose target location",

+	"Default target location" : "Default target location",

+	"Change..." : "Change..."
 });
\ No newline at end of file
diff --git a/bundles/org.eclipse.orion.client.git/web/orion/git/widgets/CloneGitRepositoryDialog.js b/bundles/org.eclipse.orion.client.git/web/orion/git/widgets/CloneGitRepositoryDialog.js
index ea8a606..08ae0fe 100644
--- a/bundles/org.eclipse.orion.client.git/web/orion/git/widgets/CloneGitRepositoryDialog.js
+++ b/bundles/org.eclipse.orion.client.git/web/orion/git/widgets/CloneGitRepositoryDialog.js
@@ -33,6 +33,10 @@ dojo.declare("orion.git.widgets.CloneGitRepositoryDialog", [dijit.Dialog, orion.
 		this.gitPathLabelText = messages["Existing directory:"];
 		this.gitNameLabelText = messages["New folder:"];
 		this.advancedShown = false;
+		
+		this.gitTargetLocationText = messages["Choose target location"];
+		this.gitDefaultTargetLocationText = messages["Default target location"];
+		this.gitChangeGitPathText = messages["Change..."];
 	},
 	postCreate : function(){
 		var that = this;
diff --git a/bundles/org.eclipse.orion.client.git/web/orion/git/widgets/templates/CloneGitRepositoryDialog.html b/bundles/org.eclipse.orion.client.git/web/orion/git/widgets/templates/CloneGitRepositoryDialog.html
index 9b9a48d..cc19319 100644
--- a/bundles/org.eclipse.orion.client.git/web/orion/git/widgets/templates/CloneGitRepositoryDialog.html
+++ b/bundles/org.eclipse.orion.client.git/web/orion/git/widgets/templates/CloneGitRepositoryDialog.html
@@ -15,8 +15,8 @@
 						<input dojoAttachPoint="gitUrl" id="${id}_gitUrl" style="display: inline-block; width: 100%;" value="">
 					</div>
 					<div style="display: block; padding: 5; clear: both; text-align: right;">
-						<a dojoAttachPoint="advancedLink" href="javascript:">Choose target location</a>
-						<a dojoAttachPoint="advancedLinkHide" href="javascript:" style="display: none">Default target location</a>
+						<a dojoAttachPoint="advancedLink" href="javascript:">${gitTargetLocationText}</a>
+						<a dojoAttachPoint="advancedLinkHide" href="javascript:" style="display: none">${gitDefaultTargetLocationText}</a>
 					</div>
 				</span>
 				<span dojoAttachPoint="Advanced" style="display: none;">
@@ -35,7 +35,7 @@
 					<div style="display: block; padding: 5; width: 40em; text-align: left; float: right;">
 							<input dojoAttachPoint="gitPath" id="${id}_gitPath" type="hidden" value="">
 							<div style="width: 30em; float: left" float="left" dojoAttachPoint="shownGitPath"></div>
-							<div style="width: 10em; float: right; text-align: right"><a dojoAttachPoint="changeGitPath" href="javascript:">Change...</a></div>
+							<div style="width: 10em; float: right; text-align: right"><a dojoAttachPoint="changeGitPath" href="javascript:">${gitChangeGitPathText}</a></div>
 					</div>
 				</span>
 				<div style="display: block; padding: 5; clear: both; text-align: right">