Bug 416213 - Need distinct strings for dialog titles vs. buttonsorigin/dialog_titles

Add separate "*Dialog" strings for dialog titles.

7 files changed, 14 insertions, 12 deletions

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 ce4824a..56e5b30 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
@@ -41,6 +41,7 @@ define({
 	"Diffs": "Changes",
 	"WorkingDirChanges": "Working Directory Changes",
 	"CommitChanges": "Commit Changes",
+	"CommitChangesDialog": "Commit Changes",
 	"more": "more ...",
 	"less": "less ...",
 	"More": "More",
@@ -210,14 +211,15 @@ define({
 	"Remote Name:": "Remote Name:",
 	"Remote URI:": "Remote URI:",
 	"Apply Patch": "Apply Patch",
+	"ApplyPatchDialog": "Apply Patch",
 	"Git Repository": "Git Repository",
 	"Go to the git repository": "Open the Git Repository page for this file or folder.",
 	"Clone Git Repository": "Clone Git Repository",
+	"CloneGitRepositoryDialog": "Clone Git Repository",
 	"Repository URL:": "Repository URL:",
 	"Existing directory:": "Existing directory:",
 	"New folder:": "New folder:",
-	"Choose a Folder": "Choose a Folder",
-	"Commit Changes": "Commit Changes",
+	"ChooseFolderDialog": "Choose a Folder",
 	"Message:": "Message:",
 	"Amend:": "Amend:",
 	"SmartAmend": "Amend Previous Commit",
@@ -240,7 +242,6 @@ define({
 	" authored by ${0} {${1}) on ${2}": " authored by ${0} (${1}) on ${2}",
 	"Content": "Content",
 	"Go to ${0} section": "Go to ${0} section",
-	"Find Commit": "Find Commit",
 	"Type the commit name (sha1):": "Type the commit name (sha1):",
 	"Search": "Search",
 	"Searching...": "Searching...",
@@ -330,7 +331,7 @@ define({
 	"Force Push Branch": "Force Push Branch",
 	"Push commits without tags from your local branch into the remote branch overriding its current content": "Push commits without tags from your local branch into the remote branch overriding its current content",
 	"Pushing remote: ": "Pushing remote: ",
-	"Choose Branch": "Choose Branch",
+	"ChooseBranchDialog": "Choose Branch",
 	"Choose the remote branch.": "Choose the remote branch.",
 	"Force Push All": "Force Push All",
 	"Push commits and tags from your local branch into the remote branch overriding its current content": "Push commits and tags from your local branch into the remote branch overriding its current content",
@@ -380,6 +381,7 @@ define({
 	"Show content": "Show content",
 	"Commit name:": "Commit name:",
 	"Open Commit": "Open Commit",
+	"OpenCommitDialog": "Open Commit",
 	"Open the commit with the given name": "Open the commit with the given name",
 	"No commits found": "No commits found",
 	"Staging changes": "Staging changes",
diff --git a/bundles/org.eclipse.orion.client.git/web/orion/git/logic/gitPush.js b/bundles/org.eclipse.orion.client.git/web/orion/git/logic/gitPush.js
index 5bf5063..8543193 100644
--- a/bundles/org.eclipse.orion.client.git/web/orion/git/logic/gitPush.js
+++ b/bundles/org.eclipse.orion.client.git/web/orion/git/logic/gitPush.js
@@ -55,7 +55,7 @@ define(['i18n!git/nls/gitmessages','orion/commandRegistry','orion/git/widgets/Co
 				};

 						

 				var dialog = new mRemotePrompter.RemotePrompterDialog({

-					title: messages["Choose Branch"],

+					title: messages["ChooseBranchDialog"],

 					serviceRegistry: serviceRegistry,

 					gitClient: gitService,

 					closeCallback: function() {

@@ -273,7 +273,7 @@ define(['i18n!git/nls/gitmessages','orion/commandRegistry','orion/git/widgets/Co
 									}

 

 									var dialog = new mConfirmPush.ConfirmPushDialog({

-										title: messages["Choose Branch"],

+										title: messages["ChooseBranchDialog"],

 										serviceRegistry: serviceRegistry,

 										gitClient: gitService,

 										moreCallback: function() {

diff --git a/bundles/org.eclipse.orion.client.git/web/orion/git/widgets/ApplyPatchDialog.js b/bundles/org.eclipse.orion.client.git/web/orion/git/widgets/ApplyPatchDialog.js
index 699a20b..5a4ff25 100644
--- a/bundles/org.eclipse.orion.client.git/web/orion/git/widgets/ApplyPatchDialog.js
+++ b/bundles/org.eclipse.orion.client.git/web/orion/git/widgets/ApplyPatchDialog.js
@@ -30,7 +30,7 @@ define([ 'i18n!git/nls/gitmessages', 'orion/webui/dialog' ], function(messages,
 	ApplyPatchDialog.prototype._init = function(options) {
 		var that = this;
 
-		this.title = messages["Apply Patch"];
+		this.title = messages["ApplyPatchDialog"];
 		this.modal = true;
 		this.messages = messages;
 		this.options = options;
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 04cdd78..63c2f00 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
@@ -41,7 +41,7 @@ define([ 'i18n!git/nls/gitmessages', 'orion/webui/dialogs/DirectoryPrompterDialo
 	CloneGitRepositoryDialog.prototype._init = function(options) {
 		var that = this;
 
-		this.title = options.title ? options.title : messages["Clone Git Repository"];
+		this.title = options.title ? options.title : messages["CloneGitRepositoryDialog"];
 		this.modal = true;
 		this.messages = messages;
 
@@ -174,7 +174,7 @@ define([ 'i18n!git/nls/gitmessages', 'orion/webui/dialogs/DirectoryPrompterDialo
 
 		this.$isExistingProject.checked = true;
 
-		var dialog = new DirPrompter.DirectoryPrompterDialog({ title : messages["Choose a Folder"],
+		var dialog = new DirPrompter.DirectoryPrompterDialog({ title : messages["ChooseFolderDialog"],
 		serviceRegistry : this.serviceRegistry,
 		fileClient : this.fileClient,
 		func : function(targetFolder) {
diff --git a/bundles/org.eclipse.orion.client.git/web/orion/git/widgets/CommitDialog.js b/bundles/org.eclipse.orion.client.git/web/orion/git/widgets/CommitDialog.js
index c02bc5c..38a31aa 100644
--- a/bundles/org.eclipse.orion.client.git/web/orion/git/widgets/CommitDialog.js
+++ b/bundles/org.eclipse.orion.client.git/web/orion/git/widgets/CommitDialog.js
@@ -35,7 +35,7 @@ define(
 			CommitDialog.prototype._init = function(options) {

 				var that = this;

 

-				this.title = messages["Commit Changes"];

+				this.title = messages["CommitChangesDialog"];

 				this.modal = true;

 				this.messages = messages;

 				this.options = options;

diff --git a/bundles/org.eclipse.orion.client.git/web/orion/git/widgets/OpenCommitDialog.js b/bundles/org.eclipse.orion.client.git/web/orion/git/widgets/OpenCommitDialog.js
index 76e245c..7a6ac92 100644
--- a/bundles/org.eclipse.orion.client.git/web/orion/git/widgets/OpenCommitDialog.js
+++ b/bundles/org.eclipse.orion.client.git/web/orion/git/widgets/OpenCommitDialog.js
@@ -32,7 +32,7 @@ define(['require', 'i18n!git/nls/gitmessages', 'orion/i18nUtil', 'orion/Deferred
 	OpenCommitDialog.prototype._init = function(options) {
 		var that = this;
 
-		this.title = options.title || messages["Find Commit"];
+		this.title = options.title || messages["OpenCommitDialog"];
 		this.modal = true;
 		this.messages = messages;
 
diff --git a/bundles/org.eclipse.orion.client.git/web/orion/git/widgets/RemotePrompterDialog.js b/bundles/org.eclipse.orion.client.git/web/orion/git/widgets/RemotePrompterDialog.js
index f69280b..2da4c81 100644
--- a/bundles/org.eclipse.orion.client.git/web/orion/git/widgets/RemotePrompterDialog.js
+++ b/bundles/org.eclipse.orion.client.git/web/orion/git/widgets/RemotePrompterDialog.js
@@ -139,7 +139,7 @@ define([ 'i18n!git/nls/gitmessages', 'orion/webui/dialog', 'orion/explorers/expl
 	RemotePrompterDialog.prototype._init = function(options) {
 		var that = this;
 
-		this.title = options.title || messages['Choose a Folder'];
+		this.title = options.title || messages["ChooseBranchDialog"];
 		this.modal = true;
 		this.messages = messages;
 		this.func = options.func;