Separate writing of "infobar", "titlebar", "statusbar", etc.

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

16 files changed, 47 insertions, 47 deletions

diff --git a/plugins/Clist_modern/res/resource.rc b/plugins/Clist_modern/res/resource.rc
index a954238ae7..0069988101 100644
--- a/plugins/Clist_modern/res/resource.rc
+++ b/plugins/Clist_modern/res/resource.rc
@@ -138,7 +138,7 @@ BEGIN
     CONTROL         "Tile vertically",IDC_TILEV,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,22,138,98,10

     CONTROL         "Scroll with text",IDC_SCROLL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,121,138,100,10

     CONTROL         "Stretch proportionally",IDC_PROPORTIONAL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,121,125,101,10

-    CONTROL         "Tile vertically according to Row Height",IDC_TILEVROWH,

+    CONTROL         "Tile vertically according to row height",IDC_TILEVROWH,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,22,153,205,10

     COMBOBOX        IDC_BKGRLIST,4,4,226,155,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP

     CONTROL         "Use Windows Colors",IDC_USEWINCOL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,33,213,10

@@ -309,7 +309,7 @@ BEGIN
     RTEXT           "Accounts per line",IDC_STATIC,15,150,73,10

     EDITTEXT        IDC_MULTI_COUNT,93,148,48,12,ES_NUMBER

     CONTROL         "",IDC_MULTI_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,129,148,11,12

-    LTEXT           "* To increase Status Bar height:\nSet in Main menu: Frames->Status Bar->Show TitleBar then pull appeared title of status bar up or down.",IDC_STATIC,27,163,123,42,WS_DISABLED

+    LTEXT           "* To increase Status Bar height:\nSet in Main menu: Frames->Status Bar->Show title then pull appeared title of status bar up or down.",IDC_STATIC,27,163,123,42,WS_DISABLED

     LTEXT           "Hold [Shift] to inverse [Right Click] behavior",IDC_STATIC,27,207,267,8,WS_DISABLED

     LTEXT           "[Ctrl]+[Left Click] to filter only protocol. Click on empty space to show all",IDC_STATIC,27,216,267,8,WS_DISABLED

     CONTROL         "Set options per account",IDC_STATUSBAR_PER_PROTO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,160,12,134,10

diff --git a/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp b/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp
index da132602d1..1fd4275f57 100644
--- a/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp
+++ b/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp
@@ -1748,13 +1748,13 @@ static int CLUIFramesLoadMainMenu()
 

 	// create "show all titlebars" menu

 	mi.position = separator++;

-	mi.pszName = LPGEN("Show All Titlebars");

+	mi.pszName = LPGEN("Show all title bars");

 	mi.pszService = MS_CLIST_FRAMES_SHOWALLFRAMESTB;

 	Menu_AddMainMenuItem(&mi);

 

 	// create "hide all titlebars" menu

 	mi.position = separator++;

-	mi.pszName = LPGEN("Hide All Titlebars");

+	mi.pszName = LPGEN("Hide all title bars");

 	mi.pszService = MS_CLIST_FRAMES_HIDEALLFRAMESTB;

 	Menu_AddMainMenuItem(&mi);

 	return 0;

@@ -3012,8 +3012,8 @@ static LRESULT CALLBACK CLUIFrameTitleBarProc(HWND hwnd, UINT msg, WPARAM wParam
 				else{AppendMenu(hmenu,MF_STRING,frame_menu_visible,TranslateT("Visible"));};

 

 				if (g_pfwFrames[framepos].TitleBar.ShowTitleBar)

-				{AppendMenu(hmenu,MF_STRING|MF_CHECKED,frame_menu_showtitlebar,TranslateT("Show TitleBar"));}

-				else{AppendMenu(hmenu,MF_STRING,frame_menu_showtitlebar,TranslateT("Show TitleBar"));};

+				{AppendMenu(hmenu,MF_STRING|MF_CHECKED,frame_menu_showtitlebar,TranslateT("Show title bar"));}

+				else{AppendMenu(hmenu,MF_STRING,frame_menu_showtitlebar,TranslateT("Show title bar"));};

 

 				if (g_pfwFrames[framepos].floating)

 				{AppendMenu(hmenu,MF_STRING|MF_CHECKED,frame_menu_floating,TranslateT("Floating"));}

diff --git a/plugins/Clist_modern/src/modern_clc.cpp b/plugins/Clist_modern/src/modern_clc.cpp
index 8778863d15..7737335a23 100644
--- a/plugins/Clist_modern/src/modern_clc.cpp
+++ b/plugins/Clist_modern/src/modern_clc.cpp
@@ -138,10 +138,10 @@ static int clcHookModulesLoaded(WPARAM wParam, LPARAM lParam)
 		hSmileyAddOptionsChangedHook = HookEvent(ME_SMILEYADD_OPTIONSCHANGED,clcHookSmileyAddOptionsChanged);

 	}

 

-	CallService(MS_BACKGROUNDCONFIG_REGISTER,(WPARAM)(LPGEN("List Background")"/CLC"),0);

-	CallService(MS_BACKGROUNDCONFIG_REGISTER,(WPARAM)(LPGEN("Menu Background")"/Menu"),0);

-	CallService(MS_BACKGROUNDCONFIG_REGISTER,(WPARAM)(LPGEN("StatusBar Background")"/StatusBar"),0);

-	CallService(MS_BACKGROUNDCONFIG_REGISTER,(WPARAM)(LPGEN("Frames TitleBar BackGround")"/FrameTitleBar"),0);

+	CallService(MS_BACKGROUNDCONFIG_REGISTER,(WPARAM)(LPGEN("List background")"/CLC"),0);

+	CallService(MS_BACKGROUNDCONFIG_REGISTER,(WPARAM)(LPGEN("Menu background")"/Menu"),0);

+	CallService(MS_BACKGROUNDCONFIG_REGISTER,(WPARAM)(LPGEN("Status bar background")"/StatusBar"),0);

+	CallService(MS_BACKGROUNDCONFIG_REGISTER,(WPARAM)(LPGEN("Frames title bar background")"/FrameTitleBar"),0);

 

 	HookEvent(ME_BACKGROUNDCONFIG_CHANGED,clcHookBkgndConfigChanged);

 	HookEvent(ME_BACKGROUNDCONFIG_CHANGED,BgStatusBarChange);

diff --git a/plugins/Clist_modern/src/modern_clcopts.cpp b/plugins/Clist_modern/src/modern_clcopts.cpp
index 05dfb26625..0a8519eefd 100644
--- a/plugins/Clist_modern/src/modern_clcopts.cpp
+++ b/plugins/Clist_modern/src/modern_clcopts.cpp
@@ -122,7 +122,7 @@ static struct ColourOptionsList colourOptionsList[] =
 	{ "Menu",           "TextColour",        CLCCOLOURSGROUP,  LPGENT("Menu text"),                               CLCDEFAULT_TEXTCOLOUR },

 	{ "Menu",           "SelTextColour",     CLCCOLOURSGROUP,  LPGENT("Selected menu text"),                      CLCDEFAULT_MODERN_SELTEXTCOLOUR },

 	{ "FrameTitleBar",  "TextColour",        CLCCOLOURSGROUP,  LPGENT("Frame title text"),                        CLCDEFAULT_TEXTCOLOUR },

-	{ "StatusBar",      "TextColour",        CLCCOLOURSGROUP,  LPGENT("Statusbar text"),                          CLCDEFAULT_TEXTCOLOUR },

+	{ "StatusBar",      "TextColour",        CLCCOLOURSGROUP,  LPGENT("Status bar text"),                          CLCDEFAULT_TEXTCOLOUR },

 	{ "ModernSettings", "KeyColor",          CLCCOLOURSGROUP,  LPGENT("3rd party frames transparent back color"), SETTING_KEYCOLOR_DEFAULT }

 };

 

diff --git a/plugins/Clist_modern/src/modern_clistevents.cpp b/plugins/Clist_modern/src/modern_clistevents.cpp
index 511efe34aa..a4a0e10380 100644
--- a/plugins/Clist_modern/src/modern_clistevents.cpp
+++ b/plugins/Clist_modern/src/modern_clistevents.cpp
@@ -403,7 +403,7 @@ static void EventArea_HideShowNotifyFrame()
 int EventArea_Create(HWND hCluiWnd)

 {

 

-	CallService(MS_BACKGROUNDCONFIG_REGISTER,(WPARAM)(LPGEN("Event Area Background")"/EventArea"),0);

+	CallService(MS_BACKGROUNDCONFIG_REGISTER,(WPARAM)(LPGEN("Event area background")"/EventArea"),0);

 	HookEvent(ME_BACKGROUNDCONFIG_CHANGED,ehhEventAreaBackgroundSettingsChanged);

 	ehhEventAreaBackgroundSettingsChanged(0, 0);

 

diff --git a/plugins/Clist_modern/src/modern_toolbar.cpp b/plugins/Clist_modern/src/modern_toolbar.cpp
index 8541674d50..6d500bc172 100644
--- a/plugins/Clist_modern/src/modern_toolbar.cpp
+++ b/plugins/Clist_modern/src/modern_toolbar.cpp
@@ -304,7 +304,7 @@ static int Toolbar_ModuleReloaded(WPARAM wParam, LPARAM lParam)
 

 static int Toolbar_ModulesLoaded(WPARAM, LPARAM)

 {

-	CallService(MS_BACKGROUNDCONFIG_REGISTER, (WPARAM)(LPGEN("ToolBar Background")"/ToolBar"),0);

+	CallService(MS_BACKGROUNDCONFIG_REGISTER, (WPARAM)(LPGEN("Toolbar background")"/ToolBar"),0);

 

 	HookEvent(ME_DB_CONTACT_SETTINGCHANGED, ehhToolBarSettingsChanged);

 

diff --git a/plugins/Clist_mw/res/resource.rc b/plugins/Clist_mw/res/resource.rc
index 7bd366fcf7..6784482626 100644
--- a/plugins/Clist_mw/res/resource.rc
+++ b/plugins/Clist_mw/res/resource.rc
@@ -261,7 +261,7 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE
 EXSTYLE WS_EX_CONTROLPARENT

 FONT 8, "MS Shell Dlg", 0, 0, 0x1

 BEGIN

-    GROUPBOX        "Contact List Background",IDC_STATIC,4,4,227,141

+    GROUPBOX        "Contact list background",IDC_STATIC,4,4,227,141

     LTEXT           "Background color:",IDC_STATIC,12,20,72,8,NOT WS_GROUP

     CONTROL         "",IDC_BKGCOLOUR,"ColourPicker",WS_TABSTOP,84,19,32,10

     LTEXT           "Selection color:",IDC_STATIC,12,36,72,8

@@ -315,7 +315,7 @@ BEGIN
     CONTROL         "Show size grip",IDC_SHOWSIZEGRIP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,72,142,10

     CONTROL         "Show bevel effect on panels",IDC_SBPANELBEVEL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,86,107,10

     CONTROL         "Use connecting Icon",IDC_USECONNECTINGICON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,97,82,10

-    CONTROL         "Use New Drawer for StatusBar",IDC_USEOWNERDRAW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,160,142,10

+    CONTROL         "Use new drawer for status bar",IDC_USEOWNERDRAW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,160,142,10

 END

 

 

diff --git a/plugins/Clist_mw/src/CLUIFrames/cluiframes.cpp b/plugins/Clist_mw/src/CLUIFrames/cluiframes.cpp
index fbd643a2c4..e1844edc2c 100644
--- a/plugins/Clist_mw/src/CLUIFrames/cluiframes.cpp
+++ b/plugins/Clist_mw/src/CLUIFrames/cluiframes.cpp
@@ -585,7 +585,7 @@ HMENU CLUIFramesCreateMenuForFrame(int frameid,int root,int popuppos,HGENMENU (*
 	mi.pszPopupName = (char *)root;

 	mi.popupPosition = frameid;

 	mi.position = popuppos++;

-	mi.pszName = LPGEN("&Show TitleBar");

+	mi.pszName = LPGEN("&Show title bar");

 	mi.flags = CMIF_CHILDPOPUP | CMIF_CHECKED;

 	mi.pszService = MS_CLIST_FRAMES_SHFRAMETITLEBAR;

 	mi.pszContactOwner = (char *)0;

@@ -1375,7 +1375,7 @@ static int CLUIFramesLoadMainMenu()
 	mi.position = separator++;

 	mi.hParentMenu = MainMIRoot;

 	mi.flags = CMIF_CHILDPOPUP;

-	mi.pszName = LPGEN("Show All Titlebars");

+	mi.pszName = LPGEN("Show all title bars");

 	mi.pszService = MS_CLIST_FRAMES_SHOWALLFRAMESTB;

 	Menu_AddMainMenuItem(&mi);

 

@@ -1384,7 +1384,7 @@ static int CLUIFramesLoadMainMenu()
 	mi.position = separator++;

 	mi.hParentMenu = MainMIRoot;

 	mi.flags = CMIF_CHILDPOPUP;

-	mi.pszName = LPGEN("Hide All Titlebars");

+	mi.pszName = LPGEN("Hide all title bars");

 	mi.pszService = MS_CLIST_FRAMES_HIDEALLFRAMESTB;

 	Menu_AddMainMenuItem(&mi);

 	return 0;

@@ -2146,8 +2146,8 @@ LRESULT CALLBACK CLUIFrameTitleBarProc(HWND hwnd, UINT msg, WPARAM wParam, LPARA
 				else{AppendMenu(hmenu,MF_STRING,frame_menu_visible,TranslateT("Visible"));}

 

 				if (Frames[framepos].TitleBar.ShowTitleBar)

-				{AppendMenu(hmenu,MF_STRING|MF_CHECKED,frame_menu_showtitlebar,TranslateT("Show TitleBar"));}

-				else{AppendMenu(hmenu,MF_STRING,frame_menu_showtitlebar,TranslateT("Show TitleBar"));}

+				{AppendMenu(hmenu,MF_STRING|MF_CHECKED,frame_menu_showtitlebar,TranslateT("Show title bar"));}

+				else{AppendMenu(hmenu,MF_STRING,frame_menu_showtitlebar,TranslateT("Show title bar"));}

 

 				if (Frames[framepos].floating)

 				{AppendMenu(hmenu,MF_STRING|MF_CHECKED,frame_menu_floating,TranslateT("Floating"));}

diff --git a/plugins/Clist_mw/src/clcopts.cpp b/plugins/Clist_mw/src/clcopts.cpp
index 33e6d67d1f..2b6c874d20 100644
--- a/plugins/Clist_mw/src/clcopts.cpp
+++ b/plugins/Clist_mw/src/clcopts.cpp
@@ -53,7 +53,7 @@ int ClcOptInit(WPARAM wParam,LPARAM lParam)
 {

 	OPTIONSDIALOGPAGE odp = { sizeof(odp) };

 	odp.hInstance = g_hInst;

-	odp.pszGroup = LPGEN("Contact List");

+	odp.pszGroup = LPGEN("Contact list");

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CLC);

 	odp.pszTitle = LPGEN("List");

 	odp.pfnDlgProc = DlgProcClcMainOpts;

@@ -62,7 +62,7 @@ int ClcOptInit(WPARAM wParam,LPARAM lParam)
 

 	if ( !ServiceExists(MS_BACKGROUNDCONFIG_REGISTER)) {

 		odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CLCBKG);

-		odp.pszTitle = LPGEN("List Background");

+		odp.pszTitle = LPGEN("List background");

 		odp.pfnDlgProc = DlgProcClcBkgOpts;

 		odp.flags = ODPF_BOLDGROUPS;

 		Options_AddPage(wParam, &odp);

@@ -75,7 +75,7 @@ int ClcOptInit(WPARAM wParam,LPARAM lParam)
 

 	if ( !ServiceExists(MS_BACKGROUNDCONFIG_REGISTER)) {

 		odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CLCBKG);

-		odp.pszTitle = LPGEN("StatusBar Background");

+		odp.pszTitle = LPGEN("Status bar background");

 		odp.pfnDlgProc = DlgProcStatusBarBkgOpts;

 		odp.flags = ODPF_BOLDGROUPS;

 		Options_AddPage(wParam, &odp);

diff --git a/plugins/Clist_nicer/res/resource.rc b/plugins/Clist_nicer/res/resource.rc
index ab6a9792ac..fdf491e534 100644
--- a/plugins/Clist_nicer/res/resource.rc
+++ b/plugins/Clist_nicer/res/resource.rc
@@ -447,7 +447,7 @@ BEGIN
     LTEXT           "Group top padding",IDC_STATIC,7,164,68,10

     EDITTEXT        IDC_LASTITEMPADDING,258,163,29,12,ES_AUTOHSCROLL

     CONTROL         "",IDC_LASTITEMPADDINGSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,274,164,11,13

-    LTEXT           "Frame titlebar height",IDC_STATIC,149,164,85,10

+    LTEXT           "Frame title bar height",IDC_STATIC,149,164,85,10

     CONTROL         "Ignore selection for groups",IDC_IGNORESELFORGROUPS,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,152,286,10

 END

diff --git a/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp b/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp
index 521dcb6e80..df69b45e45 100644
--- a/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp
+++ b/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp
@@ -626,7 +626,7 @@ HMENU CLUIFramesCreateMenuForFrame(int frameid, int root, int popuppos, HGENMENU
 	mi.pszPopupName = (char *)root;

 	mi.popupPosition = frameid;

 	mi.position = popuppos++;

-	mi.pszName = LPGEN("&Show TitleBar");

+	mi.pszName = LPGEN("&Show title bar");

 	mi.flags = CMIF_CHILDPOPUP | CMIF_CHECKED;

 	mi.pszService = MS_CLIST_FRAMES_SHFRAMETITLEBAR;

 	mi.pszContactOwner = 0;

@@ -1591,7 +1591,7 @@ static int CLUIFramesLoadMainMenu()
 	mi.position = separator++;

 	mi.hParentMenu = MainMIRoot;

 	mi.flags = CMIF_CHILDPOPUP;

-	mi.pszName = LPGEN("Show All Titlebars");

+	mi.pszName = LPGEN("Show all title bars");

 	mi.pszService = MS_CLIST_FRAMES_SHOWALLFRAMESTB;

 	Menu_AddMainMenuItem(&mi);

 

@@ -1600,7 +1600,7 @@ static int CLUIFramesLoadMainMenu()
 	mi.position = separator++;

 	mi.hParentMenu = MainMIRoot;

 	mi.flags = CMIF_CHILDPOPUP;

-	mi.pszName = LPGEN("Hide All Titlebars");

+	mi.pszName = LPGEN("Hide all title bars");

 	mi.pszService = MS_CLIST_FRAMES_HIDEALLFRAMESTB;

 	Menu_AddMainMenuItem(&mi);

 

@@ -2608,9 +2608,9 @@ LRESULT CALLBACK CLUIFrameTitleBarProc(HWND hwnd, UINT msg, WPARAM wParam, LPARA
 					AppendMenu(hmenu, MF_STRING, frame_menu_visible, TranslateT("Visible"));

 

 				if (Frames[framepos].TitleBar.ShowTitleBar)

-					AppendMenu(hmenu, MF_STRING | MF_CHECKED, frame_menu_showtitlebar, TranslateT("Show TitleBar"));

+					AppendMenu(hmenu, MF_STRING | MF_CHECKED, frame_menu_showtitlebar, TranslateT("Show title bar"));

 				else

-					AppendMenu(hmenu, MF_STRING, frame_menu_showtitlebar, TranslateT("Show TitleBar"));

+					AppendMenu(hmenu, MF_STRING, frame_menu_showtitlebar, TranslateT("Show title bar"));

 

 				if (Frames[framepos].Skinned)

 					AppendMenu(hmenu, MF_STRING | MF_CHECKED, frame_menu_skinned, TranslateT("Skinned frame"));

diff --git a/plugins/Scriver/res/resource.rc b/plugins/Scriver/res/resource.rc
index ce5af4cd93..18dc369000 100644
--- a/plugins/Scriver/res/resource.rc
+++ b/plugins/Scriver/res/resource.rc
@@ -92,13 +92,13 @@ EXSTYLE WS_EX_CONTROLPARENT
 FONT 8, "MS Shell Dlg", 0, 0, 0x1

 BEGIN

     GROUPBOX        "Layout",IDC_STATIC,0,0,304,138

-    CONTROL         "Show titlebar",IDC_SHOWTITLEBAR,"Button",

+    CONTROL         "Show title bar",IDC_SHOWTITLEBAR,"Button",

 					BS_AUTOCHECKBOX | WS_TABSTOP,8,12,180,10

     CONTROL         "Show status bar",IDC_SHOWSTATUSBAR,"Button",

 					BS_AUTOCHECKBOX | WS_TABSTOP,8,23,180,10

     CONTROL         "Show toolbar",IDC_SHOWTOOLBAR,"Button",

 					BS_AUTOCHECKBOX | WS_TABSTOP,8,34,180,10

-    CONTROL         "Show infobar",IDC_SHOWINFOBAR,"Button",

+    CONTROL         "Show info bar",IDC_SHOWINFOBAR,"Button",

 					BS_AUTOCHECKBOX | WS_TABSTOP,8,45,180,10

     CONTROL         "Show avatars", IDC_AVATARSUPPORT,"Button",

 					BS_AUTOCHECKBOX | WS_TABSTOP,8,56,180,10

diff --git a/plugins/Scriver/src/input.cpp b/plugins/Scriver/src/input.cpp
index 20042befcd..994fc37e71 100644
--- a/plugins/Scriver/src/input.cpp
+++ b/plugins/Scriver/src/input.cpp
@@ -315,31 +315,31 @@ void RegisterKeyBindings() {
 	}

 

 	desc.pszName = "Scriver/Wnd/Toggle Statusbar";

-	desc.pszDescription = LPGEN("Window: Toggle Statusbar");

+	desc.pszDescription = LPGEN("Window: Toggle status bar");

 	desc.lParam = KB_SWITCHSTATUSBAR;

 	desc.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL|HOTKEYF_SHIFT, 'S');

 	Hotkey_Register(&desc);

 

 	desc.pszName = "Scriver/Wnd/Toggle Titlebar";

-	desc.pszDescription = LPGEN("Window: Toggle Titlebar");

+	desc.pszDescription = LPGEN("Window: Toggle title bar");

 	desc.lParam = KB_SWITCHTITLEBAR;

 	desc.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL|HOTKEYF_SHIFT, 'M');

 	Hotkey_Register(&desc);

 

 	desc.pszName = "Scriver/Wnd/Toggle Toolbar";

-	desc.pszDescription = LPGEN("Window: Toggle Toolbar");

+	desc.pszDescription = LPGEN("Window: Toggle toolbar");

 	desc.lParam = KB_SWITCHTOOLBAR;

 	desc.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL|HOTKEYF_SHIFT, 'T');

 	Hotkey_Register(&desc);

 

 	desc.pszName = "Scriver/Wnd/Toggle Infobar";

-	desc.pszDescription = LPGEN("Window: Toggle Infobar");

+	desc.pszDescription = LPGEN("Window: Toggle info bar");

 	desc.lParam = KB_SWITCHINFOBAR;

 	desc.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL|HOTKEYF_SHIFT, 'N');

 	Hotkey_Register(&desc);

 

 	desc.pszName = "Scriver/Wnd/Clear Log";

-	desc.pszDescription = LPGEN("Window: Clear Log");

+	desc.pszDescription = LPGEN("Window: Clear log");

 	desc.lParam = KB_CLEAR_LOG;

 	desc.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL, 'L');

 	Hotkey_Register(&desc);

@@ -351,7 +351,7 @@ void RegisterKeyBindings() {
 	Hotkey_Register(&desc);

 

 	desc.pszName = "Scriver/Wnd/Close Tab";

-	desc.pszDescription = LPGEN("Window: Close Tab");

+	desc.pszDescription = LPGEN("Window: Close tab");

 	desc.lParam = KB_CLOSE;

 	desc.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL, VK_F4);

 	Hotkey_Register(&desc);

@@ -365,13 +365,13 @@ void RegisterKeyBindings() {
 	Hotkey_Register(&desc);

 

 	desc.pszName = "Scriver/Action/Send All";

-	desc.pszDescription = LPGEN("Action: Send to All");

+	desc.pszDescription = LPGEN("Action: Send to all");

 	desc.lParam = KB_SEND_ALL;

 	desc.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL | HOTKEYF_SHIFT, VK_RETURN);

 	Hotkey_Register(&desc);

 

 	desc.pszName = "Scriver/Action/PasteSend";

-	desc.pszDescription = LPGEN("Action: Paste & Send");

+	desc.pszDescription = LPGEN("Action: Paste and send");

 	desc.lParam = KB_PASTESEND;

 	desc.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL | HOTKEYF_SHIFT, VK_INSERT);

 	Hotkey_Register(&desc);

diff --git a/plugins/Scriver/src/msgoptions.cpp b/plugins/Scriver/src/msgoptions.cpp
index b5413480ce..28be26a9dd 100644
--- a/plugins/Scriver/src/msgoptions.cpp
+++ b/plugins/Scriver/src/msgoptions.cpp
@@ -71,8 +71,8 @@ static const FontOptionsList fontOptionsList[] = {
 	{ LPGENT("Notices"), RGB(90, 90, 160), _T("Arial"), 0, -12, LPGENT("Incoming background")},

 	{ LPGENT("Outgoing URL"), RGB(0, 0, 255), _T("Arial"), 0, -12, LPGENT("Outgoing background")},

 	{ LPGENT("Incoming URL"), RGB(0, 0, 255), _T("Arial"), 0, -12, LPGENT("Incoming background")},

-	{ LPGENT("Infobar contact name"), RGB(0, 0, 0), _T("Arial"), FONTF_BOLD, -19, LPGENT("Infobar background")},

-	{ LPGENT("Infobar status message"), RGB(50, 50, 50), _T("Arial"), FONTF_ITALIC, -11, LPGENT("Infobar background")}

+	{ LPGENT("Info bar contact name"), RGB(0, 0, 0), _T("Arial"), FONTF_BOLD, -19, LPGENT("Info bar background")},

+	{ LPGENT("Info bar status message"), RGB(50, 50, 50), _T("Arial"), FONTF_ITALIC, -11, LPGENT("Info bar background")}

 };

 

 int fontOptionsListSize = SIZEOF(fontOptionsList);

@@ -114,7 +114,7 @@ static const colourOptionsList[] = {
 	{ LPGENT("Input area background"), SRMSGSET_INPUTBKGCOLOUR, 0, COLOR_WINDOW},

 	{ LPGENT("Incoming background"), SRMSGSET_INCOMINGBKGCOLOUR, 0, COLOR_WINDOW},

 	{ LPGENT("Outgoing background"), SRMSGSET_OUTGOINGBKGCOLOUR, 0, COLOR_WINDOW},

-	{ LPGENT("Infobar background"), SRMSGSET_INFOBARBKGCOLOUR, 0, COLOR_3DLIGHT},

+	{ LPGENT("Info bar background"), SRMSGSET_INFOBARBKGCOLOUR, 0, COLOR_3DLIGHT},

 };

 

 

diff --git a/plugins/TabSRMM/src/container.cpp b/plugins/TabSRMM/src/container.cpp
index 1d824cedf2..56d8aa2fde 100644
--- a/plugins/TabSRMM/src/container.cpp
+++ b/plugins/TabSRMM/src/container.cpp
@@ -637,7 +637,7 @@ static INT_PTR CALLBACK DlgProcContainer(HWND hwndDlg, UINT msg, WPARAM wParam,
 			InsertMenu(hSysmenu, iMenuItems++ - 2, MF_BYPOSITION | MF_SEPARATOR, 0, _T(""));

 			InsertMenu(hSysmenu, iMenuItems++ - 2, MF_BYPOSITION | MF_STRING, IDM_STAYONTOP, TranslateT("Stay on Top"));

 			if (!CSkin::m_frameSkins)

-				InsertMenu(hSysmenu, iMenuItems++ - 2, MF_BYPOSITION | MF_STRING, IDM_NOTITLE, TranslateT("Hide titlebar"));

+				InsertMenu(hSysmenu, iMenuItems++ - 2, MF_BYPOSITION | MF_STRING, IDM_NOTITLE, TranslateT("Hide title bar"));

 			InsertMenu(hSysmenu, iMenuItems++ - 2, MF_BYPOSITION | MF_SEPARATOR, 0, _T(""));

 			InsertMenu(hSysmenu, iMenuItems++ - 2, MF_BYPOSITION | MF_STRING, IDM_MOREOPTIONS, TranslateT("Container options..."));

 			SetWindowText(hwndDlg, TranslateT("Message Session..."));

diff --git a/plugins/UserInfoEx/src/mir_icolib.cpp b/plugins/UserInfoEx/src/mir_icolib.cpp
index ab1f1bedd9..dcc2c3ffc6 100644
--- a/plugins/UserInfoEx/src/mir_icolib.cpp
+++ b/plugins/UserInfoEx/src/mir_icolib.cpp
@@ -65,12 +65,12 @@ static ICODESC icoDesc[] =
 	{ ICO_TREE_DEFAULT,      LPGEN("Default"),               SECT_TREE,    IDI_LST_FOLDER,          0 },

 																			   

 	// dialogs															   

-	{ ICO_DLG_DETAILS,       LPGEN("Details Infobar"),       SECT_DLG,     IDI_DLG_DETAILS,        48 },

-	{ ICO_DLG_PHONE,         LPGEN("Phone Infobar"),         SECT_DLG,     IDI_DLG_PHONE,           1 },

-	{ ICO_DLG_EMAIL,         LPGEN("E-Mail Infobar"),        SECT_DLG,     IDI_DLG_EMAIL,           1 },

+	{ ICO_DLG_DETAILS,       LPGEN("Details info bar"),       SECT_DLG,     IDI_DLG_DETAILS,        48 },

+	{ ICO_DLG_PHONE,         LPGEN("Phone info bar"),         SECT_DLG,     IDI_DLG_PHONE,           1 },

+	{ ICO_DLG_EMAIL,         LPGEN("E-Mail info bar"),        SECT_DLG,     IDI_DLG_EMAIL,           1 },

 	{ ICO_DLG_EXPORT,        LPGEN("Export VCard"),          SECT_DLG,     IDI_EXPORT,              1 },

 	{ ICO_DLG_IMPORT,        LPGEN("Import VCard"),          SECT_DLG,     IDI_IMPORT,              1 },

-	{ ICO_DLG_ANNIVERSARY,   LPGEN("Anniversary Infobar"),   SECT_DLG,     IDI_ANNIVERSARY,         1 },

+	{ ICO_DLG_ANNIVERSARY,   LPGEN("Anniversary info bar"),   SECT_DLG,     IDI_ANNIVERSARY,         1 },

 																			   

 	// button icons													   

 	{ ICO_BTN_UPDATE,        LPGEN("Update"),                SECT_BUTTONS, IDI_BTN_UPDATE,          0 },