From 0c4acc882c861d102fcf451dd608c8eec145164f Mon Sep 17 00:00:00 2001
From: Sven Strickroth <email@cs-ware.de>
Date: Wed, 28 Nov 2012 13:54:51 +0100
Subject: [PATCH] Cleanup

Signed-off-by: Sven Strickroth <email@cs-ware.de>
---
 src/Resources/TortoiseProcENG.rc                      | 7 ++++---
 src/TortoiseProc/Commands/CreateRepositoryCommand.cpp | 2 +-
 src/TortoiseProc/resource.h                           | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc
index 6f759b98b..d95e8565e 100644
--- a/src/Resources/TortoiseProcENG.rc
+++ b/src/Resources/TortoiseProcENG.rc
@@ -2752,7 +2752,8 @@ END
 STRINGTABLE 
 BEGIN
     IDS_WARN_FOLDERNOTEXIST "The folder \n%s\ndoes not exist.\nWould you like to create it first?"
-    IDS_WARN_FOLDERNOTEMPTY "The target folder \n%s\nis not empty!\nAre you sure you want to initialize a git repository inside that folder?"
+    IDS_WARN_GITINIT_FOLDERNOTEMPTY 
+                            "The target folder \n%s\nis not empty!\nAre you sure you want to initialize a git repository inside that folder?"
     IDS_WARN_WARNING        "Warning"
     IDS_WARN_NOTE           "Notice"
     IDS_WARN_NOVALIDPATH    "The path/URL you've entered seems to be illegal on Windows!\nYou can try it anyway, but you might get an error later.\n\nA valid path on windows must not contain '<<>|""?*:' or one of the following device names:\ncom1-com9, lpt1-lpt9, prn, aux, con, nul, clock$\n\nDo you want to proceed anyway?"
@@ -3531,6 +3532,8 @@ BEGIN
     IDS_SUBMODULEDIFF_NEWERTIME "Newer commit time"
     IDS_SUBMODULEDIFF_OLDERTIME "Older commit time"
     IDS_SUBMODULEDIFF_SAMETIME "Same commit time"
+    IDS_PROC_CREATINGPULLREUQEST "Creating pull-request..."
+    IDS_PROCEEDBUTTON       "&Proceed"
 END
 
 STRINGTABLE 
@@ -3559,7 +3562,6 @@ BEGIN
     IDS_DONE                "Done"
     IDS_PROC_SKIPPATCH      "Skip Patch: %s"
     IDS_ABORTBUTTON         "A&bort"
-	IDS_PROCEEDBUTTON       "&Proceed"
     IDS_OKBUTTON            "&OK"
     IDS_SKIPBUTTON          "&Skip"
     IDS_RESOLVEDBUTTON      "&Resolved"
@@ -3637,7 +3639,6 @@ BEGIN
     IDS_ERR_PAEGENTTIMEOUT  "Failed waiting for pageant to finish loading key."
     IDS_ERR_NOPATCHES       "Not patches generated."
     IDS_PROC_REQUESTPULL    "Create pull &request"
-    IDS_PROC_CREATINGPULLREUQEST "Creating pull-request..."
     IDS_ERR_PULLREUQESTFAILED "Failed to create pull-request."
 END
 
diff --git a/src/TortoiseProc/Commands/CreateRepositoryCommand.cpp b/src/TortoiseProc/Commands/CreateRepositoryCommand.cpp
index 194810a2b..0346ffe80 100644
--- a/src/TortoiseProc/Commands/CreateRepositoryCommand.cpp
+++ b/src/TortoiseProc/Commands/CreateRepositoryCommand.cpp
@@ -33,7 +33,7 @@ bool CreateRepositoryCommand::Execute()
 	if(dlg.DoModal() == IDOK)
 	{
 		CString message;
-		message.Format(IDS_WARN_FOLDERNOTEMPTY, folder);
+		message.Format(IDS_WARN_GITINIT_FOLDERNOTEMPTY, folder);
 		if (!PathIsDirectoryEmpty(folder) && CMessageBox::Show(hwndExplorer, message, _T("TortoiseGit"), 1, IDI_ERROR, CString(MAKEINTRESOURCE(IDS_ABORTBUTTON)), CString(MAKEINTRESOURCE(IDS_PROCEEDBUTTON))) == 1)
 		{
 			return false;
diff --git a/src/TortoiseProc/resource.h b/src/TortoiseProc/resource.h
index 5c4727a2e..cd2645383 100644
--- a/src/TortoiseProc/resource.h
+++ b/src/TortoiseProc/resource.h
@@ -847,7 +847,7 @@
 #define IDC_REVISIONGROUP               1393
 #define IDC_REPOLABEL                   1394
 #define IDS_WARN_FOLDERNOTEXIST         1400
-#define IDS_WARN_FOLDERNOTEMPTY         1404
+#define IDS_WARN_GITINIT_FOLDERNOTEMPTY 1404
 #define IDS_WARN_WARNING                1405
 #define IDC_SELECTFILESONCOMMIT         1405
 #define IDS_WARN_NOTE                   1406
-- 
2.11.4.GIT