"userlist", "user list", "nicklist" -> "nick list"

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

5 files changed, 11 insertions, 11 deletions

diff --git a/src/core/stdchat/res/chat.rc b/src/core/stdchat/res/chat.rc
index 45063bf809..469fe8dc7e 100644
--- a/src/core/stdchat/res/chat.rc
+++ b/src/core/stdchat/res/chat.rc
@@ -47,7 +47,7 @@ BEGIN
     CONTROL         "&History",IDC_HISTORY,"MButtonClass",WS_TABSTOP,188,108,15,13,0x18000000L

     CONTROL         "&Filter",IDC_FILTER,"MButtonClass",WS_TABSTOP,220,108,15,13,0x18000000L

     CONTROL         "&Room settings",IDC_CHANMGR,"MButtonClass",WS_DISABLED | WS_TABSTOP,204,108,15,13,0x18000000L

-    CONTROL         "&Show/Hide nicklist",IDC_SHOWNICKLIST,"MButtonClass",WS_TABSTOP,236,108,15,13,0x18000000L

+    CONTROL         "&Show/Hide nick list",IDC_SHOWNICKLIST,"MButtonClass",WS_TABSTOP,236,108,15,13,0x18000000L

     CONTROL         "",IDC_LOG,RICHEDIT_CLASS,ES_MULTILINE | ES_AUTOVSCROLL | 

                     ES_READONLY | ES_NUMBER | WS_VSCROLL | WS_TABSTOP,8,23,

                     164,73,WS_EX_STATICEDGE

@@ -186,7 +186,7 @@ BEGIN
     GROUPBOX        "Other",IDC_STATIC,1,145,294,53

     LTEXT           "Add new rooms to group:",IDC_STATIC,11,159,132,8

     EDITTEXT        IDC_GROUP,158,158,49,14,ES_AUTOHSCROLL

-    LTEXT           "Userlist row distance (pixels):",IDC_STATIC,11,180,132,

+    LTEXT           "Nick list row distance (pixels):",IDC_STATIC,11,180,132,

 					8

     EDITTEXT        IDC_NICKROW2,158,178,29,14,ES_RIGHT | ES_AUTOHSCROLL | 

 					ES_NUMBER

diff --git a/src/core/stdchat/src/main.cpp b/src/core/stdchat/src/main.cpp
index fad58d97e2..aa0be90023 100644
--- a/src/core/stdchat/src/main.cpp
+++ b/src/core/stdchat/src/main.cpp
@@ -311,17 +311,17 @@ static void RegisterFonts()
 	ColourRegisterT(&colourid);

 

 	strncpy(colourid.setting, "ColorNicklistBG", SIZEOF(colourid.setting));

-	_tcsncpy(colourid.name, LPGENT("User list background"), SIZEOF(colourid.name));

+	_tcsncpy(colourid.name, LPGENT("Nick list background"), SIZEOF(colourid.name));

 	colourid.defcolour = GetSysColor(COLOR_WINDOW);

 	ColourRegisterT(&colourid);

 

 	strncpy(colourid.setting, "ColorNicklistLines", SIZEOF(colourid.setting));

-	_tcsncpy(colourid.name, LPGENT("User list lines"), SIZEOF(colourid.name));

+	_tcsncpy(colourid.name, LPGENT("Nick list lines"), SIZEOF(colourid.name));

 	colourid.defcolour = GetSysColor(COLOR_INACTIVEBORDER);

 	ColourRegisterT(&colourid);

 

 	strncpy(colourid.setting, "ColorNicklistSelectedBG", SIZEOF(colourid.setting));

-	_tcsncpy(colourid.name, LPGENT("User list background (selected)"), SIZEOF(colourid.name));

+	_tcsncpy(colourid.name, LPGENT("Nick list background (selected)"), SIZEOF(colourid.name));

 	colourid.defcolour = GetSysColor(COLOR_HIGHLIGHT);

 	ColourRegisterT(&colourid);

 }

diff --git a/src/core/stdchat/src/options.cpp b/src/core/stdchat/src/options.cpp
index e021db88c0..896d8fef13 100644
--- a/src/core/stdchat/src/options.cpp
+++ b/src/core/stdchat/src/options.cpp
@@ -270,8 +270,8 @@ static IconItem iconList[] =
 	{ LPGEN("Room settings"),         "chat_settings",         IDI_TOPICBUT,    0 },

 	{ LPGEN("Event filter disabled"), "chat_filter",           IDI_FILTER,      0 },

 	{ LPGEN("Event filter enabled"),  "chat_filter2",          IDI_FILTER2,     0 },

-	{ LPGEN("Hide userlist"),         "chat_nicklist",         IDI_NICKLIST,    0 },

-	{ LPGEN("Show userlist"),         "chat_nicklist2",        IDI_NICKLIST2,   0 },

+	{ LPGEN("Hide nick list"),         "chat_nicklist",         IDI_NICKLIST,    0 },

+	{ LPGEN("Show nick list"),         "chat_nicklist2",        IDI_NICKLIST2,   0 },

 	{ LPGEN("Icon overlay"),          "chat_overlay",          IDI_OVERLAY,     0 },

 	{ LPGEN("Close"),                 "chat_close",            IDI_CLOSE,       0 },

 

diff --git a/src/core/stdchat/src/window.cpp b/src/core/stdchat/src/window.cpp
index f4dae08481..7522e78831 100644
--- a/src/core/stdchat/src/window.cpp
+++ b/src/core/stdchat/src/window.cpp
@@ -97,7 +97,7 @@ static void InitButtons(HWND hwndDlg, SESSION_INFO *si)
 	SendMessage(GetDlgItem(hwndDlg, IDC_BKGCOLOR), BUTTONADDTOOLTIP, (WPARAM)LPGEN("Select a background color for the text (CTRL+L)"), 0);

 	SendMessage(GetDlgItem(hwndDlg, IDC_COLOR), BUTTONADDTOOLTIP, (WPARAM)LPGEN("Select a foreground color for the text (CTRL+K)"), 0);

 	SendMessage(GetDlgItem(hwndDlg, IDC_HISTORY), BUTTONADDTOOLTIP, (WPARAM)LPGEN("Show the history (CTRL+H)"), 0);

-	SendMessage(GetDlgItem(hwndDlg, IDC_SHOWNICKLIST), BUTTONADDTOOLTIP, (WPARAM)LPGEN("Show/hide the nicklist (CTRL+N)"), 0);

+	SendMessage(GetDlgItem(hwndDlg, IDC_SHOWNICKLIST), BUTTONADDTOOLTIP, (WPARAM)LPGEN("Show/hide the nick list (CTRL+N)"), 0);

 	SendMessage(GetDlgItem(hwndDlg, IDC_CHANMGR), BUTTONADDTOOLTIP, (WPARAM)LPGEN("Control this room (CTRL+O)"), 0);

 	SendMessage(GetDlgItem(hwndDlg, IDC_FILTER), BUTTONADDTOOLTIP, (WPARAM)LPGEN("Enable/disable the event filter (CTRL+F)"), 0);

 	SendMessage(GetDlgItem(hwndDlg, IDC_CLOSE), BUTTONADDTOOLTIP, (WPARAM)LPGEN("Close current tab (CTRL+F4)"), 0);

diff --git a/src/modules/chat/chat_opts.cpp b/src/modules/chat/chat_opts.cpp
index 54edca13f3..ffcd82d6d9 100644
--- a/src/modules/chat/chat_opts.cpp
+++ b/src/modules/chat/chat_opts.cpp
@@ -65,8 +65,8 @@ static FontOptionsList fontOptionsList[] =
 	{ LPGENT("Action message"),               RGB(160, 90, 160),  lfDefault.lfFaceName, DEFAULT_CHARSET, 0, -12 },

 	{ LPGENT("Highlighted message"),          RGB(180, 150, 80),  lfDefault.lfFaceName, DEFAULT_CHARSET, 0, -12 },

 	{ _T(""),                                 0,                  lfDefault.lfFaceName, DEFAULT_CHARSET, 0, -12 },

-	{ LPGENT("User list members (online)"),   RGB(0, 0, 0),       lfDefault.lfFaceName, DEFAULT_CHARSET, 0, -12 },

-	{ LPGENT("User list members (away)"),     RGB(170, 170, 170), lfDefault.lfFaceName, DEFAULT_CHARSET, 0, -12 }

+	{ LPGENT("Nick list members (online)"),   RGB(0, 0, 0),       lfDefault.lfFaceName, DEFAULT_CHARSET, 0, -12 },

+	{ LPGENT("Nick list members (away)"),     RGB(170, 170, 170), lfDefault.lfFaceName, DEFAULT_CHARSET, 0, -12 }

 };

 

 static void LoadColors()

@@ -152,7 +152,7 @@ void RegisterFonts(void)
 		switch (i) {

 		case 18:

 		case 19:

-			_tcsncpy_s(fontid.backgroundName, SIZEOF(fontid.backgroundName), LPGENT("User list background"), _TRUNCATE);

+			_tcsncpy_s(fontid.backgroundName, SIZEOF(fontid.backgroundName), LPGENT("Nick list background"), _TRUNCATE);

 			break;

 		case 17:

 			if (g_iFontMode == FONTMODE_SKIP)