"toolbar" is more common

git-svn-id: http://svn.miranda-ng.org/main/trunk@7470 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

3 files changed, 6 insertions, 6 deletions

diff --git a/plugins/TabSRMM/res/resource.rc b/plugins/TabSRMM/res/resource.rc
index 2403f3ffd4..9485aa6b26 100644
--- a/plugins/TabSRMM/res/resource.rc
+++ b/plugins/TabSRMM/res/resource.rc
@@ -220,8 +220,8 @@ BEGIN
     CONTROL         "Hide the status bar",IDC_CNTNOSTATUSBAR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,105,44,310,10

     CONTROL         "Hide the menu bar",IDC_HIDEMENUBAR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,105,55,310,10

     CONTROL         "User ID in status bar",IDC_UIDSTATUSBAR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,105,66,310,10

-    CONTROL         "Hide the tool bar",IDC_HIDETOOLBAR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,105,77,310,10

-    CONTROL         "Place the tool bar at the bottom (*)",IDC_BOTTOMTOOLBAR,

+    CONTROL         "Hide the toolbar",IDC_HIDETOOLBAR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,105,77,310,10

+    CONTROL         "Place the toolbar at the bottom (*)",IDC_BOTTOMTOOLBAR,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,105,88,310,10

     CONTROL         "Show the info panel",IDC_INFOPANEL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,105,99,310,10

     CONTROL         "Hide title bar",IDC_O_HIDETITLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,105,44,310,10

@@ -905,9 +905,9 @@ BEGIN
         MENUITEM "Show Menu Bar",               ID_VIEW_SHOWMENUBAR

         MENUITEM "Show Status Bar",             ID_VIEW_SHOWSTATUSBAR

         MENUITEM "Info Panel...",               ID_VIEW_INFOPANEL

-        POPUP "Tool Bar"

+        POPUP "Toolbar"

         BEGIN

-            MENUITEM "Show Tool Bar",               ID_VIEW_SHOWTOOLBAR

+            MENUITEM "Show toolbar",               ID_VIEW_SHOWTOOLBAR

             MENUITEM "Place toolbar at bottom",     ID_VIEW_BOTTOMTOOLBAR

         END

         MENUITEM "Title Bar",                   ID_VIEW_SHOWTITLEBAR

diff --git a/plugins/TabSRMM/src/hotkeyhandler.cpp b/plugins/TabSRMM/src/hotkeyhandler.cpp
index 03e948a030..68ecab4cf4 100644
--- a/plugins/TabSRMM/src/hotkeyhandler.cpp
+++ b/plugins/TabSRMM/src/hotkeyhandler.cpp
@@ -57,7 +57,7 @@ static HOTKEYDESC _hotkeydescs[] = {
 	{ 0, "tabsrmm_hist", LPGEN("Show message history"), TABSRMM_HK_SECTION_GENERIC, 0, HOTKEYCODE(HOTKEYF_ALT, 'H'), TABSRMM_HK_HISTORY },

 	{ 0, "tabsrmm_umenu", LPGEN("Show user menu"), TABSRMM_HK_SECTION_IM, 0, HOTKEYCODE(HOTKEYF_ALT, 'D'), TABSRMM_HK_USERMENU },

 	{ 0, "tabsrmm_udet", LPGEN("Show user details"), TABSRMM_HK_SECTION_IM, 0, HOTKEYCODE(HOTKEYF_ALT, 'U'), TABSRMM_HK_USERDETAILS },

-	{ 0, "tabsrmm_tbar", LPGEN("Toggle tool bar"), TABSRMM_HK_SECTION_GENERIC, 0, HOTKEYCODE(HOTKEYF_ALT|HOTKEYF_SHIFT, 'T'), TABSRMM_HK_TOGGLETOOLBAR },

+	{ 0, "tabsrmm_tbar", LPGEN("Toggle toolbar"), TABSRMM_HK_SECTION_GENERIC, 0, HOTKEYCODE(HOTKEYF_ALT|HOTKEYF_SHIFT, 'T'), TABSRMM_HK_TOGGLETOOLBAR },

 	{ 0, "tabsrmm_ipanel", LPGEN("Toggle info panel"), TABSRMM_HK_SECTION_GENERIC, 0, HOTKEYCODE(HOTKEYF_ALT|HOTKEYF_CONTROL, 'I'), TABSRMM_HK_TOGGLEINFOPANEL },

 	{ 0, "tabsrmm_rtl", LPGEN("Toggle text direction"), TABSRMM_HK_SECTION_IM, 0, HOTKEYCODE(HOTKEYF_ALT|HOTKEYF_CONTROL, 'B'), TABSRMM_HK_TOGGLERTL },

 	{ 0, "tabsrmm_msend", LPGEN("Toggle multi send"), TABSRMM_HK_SECTION_IM, 0, HOTKEYCODE(HOTKEYF_ALT|HOTKEYF_CONTROL, 'M'), TABSRMM_HK_TOGGLEMULTISEND },

diff --git a/plugins/TabSRMM/src/msgoptions.cpp b/plugins/TabSRMM/src/msgoptions.cpp
index b20621c51a..2e97d7a33f 100644
--- a/plugins/TabSRMM/src/msgoptions.cpp
+++ b/plugins/TabSRMM/src/msgoptions.cpp
@@ -1282,7 +1282,7 @@ static int OptInitialise(WPARAM wParam, LPARAM lParam)
 	odp.pfnDlgProc  = DlgProcLogOptions;

 	Options_AddPage(wParam, &odp);

 

-	odp.pszTab      = LPGEN("Tool bar");

+	odp.pszTab      = LPGEN("Toolbar");

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_TOOLBAR);

 	odp.pfnDlgProc  = DlgProcToolBar;

 	Options_AddPage(wParam, &odp);