From cc741d16eef3593c40693dbcdc4e2518d8f8a034 Mon Sep 17 00:00:00 2001
From: Sven Strickroth <email@cs-ware.de>
Date: Sun, 13 May 2012 21:21:24 +0200
Subject: [PATCH] hopefully moved last strings to resources

Signed-off-by: Sven Strickroth <email@cs-ware.de>
---
 Languages/Tortoise.pot           | 33 +++++++++++++++++++++++----------
 src/Resources/TortoiseProcENG.rc |  3 +++
 src/TortoiseProc/LogDlg.cpp      |  6 +++---
 src/TortoiseProc/resource.h      |  3 +++
 4 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/Languages/Tortoise.pot b/Languages/Tortoise.pot
index 9588dcc1c..b620ee258 100644
--- a/Languages/Tortoise.pot
+++ b/Languages/Tortoise.pot
@@ -1283,10 +1283,18 @@ msgstr ""
 msgid "<.....>"
 msgstr ""
 
+#. Resource IDs: (76)
+msgid "<All Branches>"
+msgstr ""
+
 #. Resource IDs: (65)
 msgid "<Auto Generated by Git>"
 msgstr ""
 
+#. Resource IDs: (76)
+msgid "<No branch>"
+msgstr ""
+
 #. Resource IDs: (1069)
 msgid "<Separator>"
 msgstr ""
@@ -2046,18 +2054,10 @@ msgstr ""
 msgid "Can't customize menues!"
 msgstr ""
 
-#. Resource IDs: (565)
-msgid "Can't find Super-project"
-msgstr ""
-
 #. Resource IDs: (1001)
 msgid "Can't paste bitmap image from the clipboard!"
 msgstr ""
 
-#. Resource IDs: (603)
-msgid "Can't start pageant program."
-msgstr ""
-
 #. Resource IDs: (2, 73, 99, 332, 563, 1069)
 msgid "Cancel"
 msgstr ""
@@ -2703,6 +2703,10 @@ msgstr ""
 msgid "Could not determine the last committed revision!"
 msgstr ""
 
+#. Resource IDs: (565)
+msgid "Could not find Super-project"
+msgstr ""
+
 #. Resource IDs: (81)
 msgid "Could not get the status!"
 msgstr ""
@@ -2783,6 +2787,10 @@ msgstr ""
 msgid "Could not start external merge program!\n<hr=100%%>\n%s"
 msgstr ""
 
+#. Resource IDs: (603)
+msgid "Could not start pageant program."
+msgstr ""
+
 #. Resource IDs: (3857)
 msgid "Could not start print job."
 msgstr ""
@@ -3397,7 +3405,7 @@ msgid "Email"
 msgstr ""
 
 #. Resource IDs: (602)
-msgid "Email Address To or CC can't empty"
+msgid "Email Address To and CC can't empty."
 msgstr ""
 
 #. Resource IDs: (65535)
@@ -5979,7 +5987,7 @@ msgid "Putty Key:"
 msgstr ""
 
 #. Resource IDs: (71)
-msgid "Putty Private Key (*.ppk)|*.ppk|All Files(*.*)|*.*||"
+msgid "Putty Private Key (*.ppk)|*.ppk|All Files (*.*)|*.*||"
 msgstr ""
 
 #. Resource IDs: (246)
@@ -7112,6 +7120,11 @@ msgstr ""
 msgid "Showing %ld revision(s), from revision %ld to revision %ld - %ld revision(s) selected."
 msgstr ""
 
+#. Resource IDs: (76)
+#, c-format
+msgid "Showing %ld revision(s), from revision %s to revision %s - %ld revision(s) selected\r\n"
+msgstr ""
+
 #. Resource IDs: (13)
 msgid "Shows all files which were changed since the last update, locally and in the repository"
 msgstr ""
diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc
index 529ab234b..638bcac01 100644
--- a/src/Resources/TortoiseProcENG.rc
+++ b/src/Resources/TortoiseProcENG.rc
@@ -2444,6 +2444,9 @@ END
 
 STRINGTABLE 
 BEGIN
+    IDS_PROC_LOG_STATS      "Showing %ld revision(s), from revision %s to revision %s - %ld revision(s) selected\r\n"
+    IDS_PROC_LOG_ALLBRANCHES "<All Branches>"
+    IDS_PROC_LOG_NOBRANCH   "<No branch>"
     IDS_IMPORT_DEFAULTMSG   "Initial import"
     IDS_PROC_SYNC_PUSHTAGS  "Push ta&gs"
     IDS_PROC_SYNC_PULL      "&Pull"
diff --git a/src/TortoiseProc/LogDlg.cpp b/src/TortoiseProc/LogDlg.cpp
index f25088a99..54931fa04 100644
--- a/src/TortoiseProc/LogDlg.cpp
+++ b/src/TortoiseProc/LogDlg.cpp
@@ -2560,7 +2560,7 @@ void CLogDlg::UpdateLogInfoLabel()
 		selectedrevs = m_LogList.GetSelectedCount();
 	}
 	CString sTemp;
-	sTemp.Format(_T("Showing %ld revision(s), from revision %s to revision %s - %ld revision(s) selected\r\n"),
+	sTemp.Format(IDS_PROC_LOG_STATS,
 		count - start,
 		rev2.ToString().Left(6), rev1.ToString().Left(6), selectedrevs);
 
@@ -3274,7 +3274,7 @@ void CLogDlg::ShowStartRef()
 		return;
 	if(m_bAllBranch)
 	{
-		m_staticRef.SetWindowText(L"<All Branches>");
+		m_staticRef.SetWindowText(CString(MAKEINTRESOURCE(IDS_PROC_LOG_ALLBRANCHES)));
 		m_staticRef.Invalidate(TRUE);
 		return;
 	}
@@ -3284,7 +3284,7 @@ void CLogDlg::ShowStartRef()
 	{
 		//Ref name is HEAD
 		if (g_Git.Run(L"git symbolic-ref HEAD", &showStartRef, NULL, CP_UTF8))
-			showStartRef = _T("<No branch>");
+			showStartRef = CString(MAKEINTRESOURCE(IDS_PROC_LOG_NOBRANCH));
 		showStartRef.Trim(L"\r\n\t ");
 	}
 
diff --git a/src/TortoiseProc/resource.h b/src/TortoiseProc/resource.h
index 62cfe50ce..2e91f5e77 100644
--- a/src/TortoiseProc/resource.h
+++ b/src/TortoiseProc/resource.h
@@ -529,7 +529,10 @@
 #define IDC_DATEFROM                    1199
 #define IDS_PROC_SYNC_PUSH              1199
 #define IDC_FROMLABEL                   1200
+#define IDS_PROC_LOG_STATS              1200
 #define IDC_TOLABEL                     1201
+#define IDS_PROC_LOG_ALLBRANCHES        1201
+#define IDS_PROC_LOG_NOBRANCH           1202
 #define IDC_WHOLE_PROJECT               1203
 #define IDS_IMPORT_DEFAULTMSG           1205
 #define IDC_CHECKBOX                    1207
-- 
2.11.4.GIT