From 9be3dde7b1a85dcab0c1a6c70c13e2d79889a45f Mon Sep 17 00:00:00 2001
From: Sven Strickroth <email@cs-ware.de>
Date: Mon, 7 Jan 2013 06:08:53 +0100
Subject: [PATCH] Dropped useless keyboard indicators

Signed-off-by: Sven Strickroth <email@cs-ware.de>
---
 Languages/Tortoise.pot               | 20 --------------------
 src/Resources/TortoiseGitBlameENG.rc |  7 +------
 src/Resources/TortoiseMergeENG.rc    |  4 ----
 src/TortoiseGitBlame/MainFrm.cpp     |  2 --
 src/TortoiseMerge/MainFrm.cpp        |  1 -
 5 files changed, 1 insertion(+), 33 deletions(-)

diff --git a/Languages/Tortoise.pot b/Languages/Tortoise.pot
index c84b106d5..665a981a5 100644
--- a/Languages/Tortoise.pot
+++ b/Languages/Tortoise.pot
@@ -3433,10 +3433,6 @@ msgstr ""
 msgid "EUC-KR"
 msgstr ""
 
-#. Resource IDs: (3697)
-msgid "EXT"
-msgstr ""
-
 #. Resource IDs: (65535)
 msgid "Eastern European"
 msgstr ""
@@ -4021,10 +4017,6 @@ msgid "Font"
 msgstr ""
 
 #. Resource IDs: (3585)
-msgid "For Help, press F1"
-msgstr ""
-
-#. Resource IDs: (3585)
 msgid "For Help, press F1. Scroll horizontally with Ctrl-Scrollwheel"
 msgstr ""
 
@@ -5721,10 +5713,6 @@ msgstr ""
 msgid "OLE initialization failed.  Make sure that the OLE libraries are the correct version."
 msgstr ""
 
-#. Resource IDs: (3697)
-msgid "OVR"
-msgstr ""
-
 #. Resource IDs: (156, 626)
 msgid "Office 2003"
 msgstr ""
@@ -6287,10 +6275,6 @@ msgstr ""
 msgid "REBASE"
 msgstr ""
 
-#. Resource IDs: (3697)
-msgid "REC"
-msgstr ""
-
 #. Resource IDs: (1535)
 msgid "Range"
 msgstr ""
@@ -6863,10 +6847,6 @@ msgstr ""
 msgid "S&witch/Checkout..."
 msgstr ""
 
-#. Resource IDs: (3697)
-msgid "SCRL"
-msgstr ""
-
 #. Resource IDs: (604, 1251)
 msgid "SHA-1"
 msgstr ""
diff --git a/src/Resources/TortoiseGitBlameENG.rc b/src/Resources/TortoiseGitBlameENG.rc
index 215ec983b..f16cd46fe 100644
--- a/src/Resources/TortoiseGitBlameENG.rc
+++ b/src/Resources/TortoiseGitBlameENG.rc
@@ -412,18 +412,13 @@ END
 STRINGTABLE 
 BEGIN
     AFX_IDS_APP_TITLE       "TortoiseGitBlame"
-    AFX_IDS_IDLEMESSAGE     "For Help, press F1"
+    AFX_IDS_IDLEMESSAGE     " "
     AFX_IDS_HELPMODEMESSAGE "Select an object on which to get Help"
 END
 
 STRINGTABLE 
 BEGIN
-    ID_INDICATOR_EXT        "EXT"
-    ID_INDICATOR_CAPS       "CAP"
     ID_INDICATOR_NUM        "NUM"
-    ID_INDICATOR_SCRL       "SCRL"
-    ID_INDICATOR_OVR        "OVR"
-    ID_INDICATOR_REC        "REC"
 END
 
 STRINGTABLE 
diff --git a/src/Resources/TortoiseMergeENG.rc b/src/Resources/TortoiseMergeENG.rc
index df07842d7..1ff23f201 100644
--- a/src/Resources/TortoiseMergeENG.rc
+++ b/src/Resources/TortoiseMergeENG.rc
@@ -454,12 +454,8 @@ END
 
 STRINGTABLE
 BEGIN
-    ID_INDICATOR_EXT        "EXT"
     ID_INDICATOR_CAPS       "CAP"
     ID_INDICATOR_NUM        "NUM"
-    ID_INDICATOR_SCRL       "SCRL"
-    ID_INDICATOR_OVR        "OVR"
-    ID_INDICATOR_REC        "REC"
 END
 
 STRINGTABLE
diff --git a/src/TortoiseGitBlame/MainFrm.cpp b/src/TortoiseGitBlame/MainFrm.cpp
index 15e3dae8a..d90dcbff9 100644
--- a/src/TortoiseGitBlame/MainFrm.cpp
+++ b/src/TortoiseGitBlame/MainFrm.cpp
@@ -55,9 +55,7 @@ static UINT indicators[] =
 {
 	ID_SEPARATOR,           // status line indicator
 	ID_INDICATOR_ENCODING,
-	ID_INDICATOR_CAPS,
 	ID_INDICATOR_NUM,
-	ID_INDICATOR_SCRL,
 };
 
 // CMainFrame construction/destruction
diff --git a/src/TortoiseMerge/MainFrm.cpp b/src/TortoiseMerge/MainFrm.cpp
index 6e0114590..8a93ef88f 100644
--- a/src/TortoiseMerge/MainFrm.cpp
+++ b/src/TortoiseMerge/MainFrm.cpp
@@ -140,7 +140,6 @@ static UINT indicators[] =
 	ID_INDICATOR_BOTTOMVIEW,
 	ID_INDICATOR_CAPS,
 	ID_INDICATOR_NUM,
-	ID_INDICATOR_SCRL
 };
 
 
-- 
2.11.4.GIT