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

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

14 files changed, 25 insertions, 25 deletions

diff --git a/plugins/New_GPG/res/new_gpg.rc b/plugins/New_GPG/res/new_gpg.rc
index d4269e684a..cd0c06030f 100644
--- a/plugins/New_GPG/res/new_gpg.rc
+++ b/plugins/New_GPG/res/new_gpg.rc
@@ -218,7 +218,7 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
 FONT 8, "MS Shell Dlg", 400, 0, 0x0

 BEGIN

     CONTROL         "",IDC_USERLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,17,272,112

-    CTEXT           "Userlist:",IDC_STATIC,25,7,201,8

+    CTEXT           "User list:",IDC_STATIC,25,7,201,8

     PUSHBUTTON      "Export PubKey",IDC_SAVE_KEY_BUTTON,8,135,75,14

     PUSHBUTTON      "Delete key",IDC_DELETE_KEY_BUTTON,90,135,70,14

     CONTROL         "Turn on debug log",IDC_DEBUG_LOG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,181,159,89,10

diff --git a/plugins/Scriver/res/resource.rc b/plugins/Scriver/res/resource.rc
index 18dc369000..f7db02a804 100644
--- a/plugins/Scriver/res/resource.rc
+++ b/plugins/Scriver/res/resource.rc
@@ -323,7 +323,7 @@ BEGIN
     CONTROL         "&OK",IDOK,"MButtonClass",0x0,162,71,20,14,0x18000000L

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

     CONTROL         "&Room Settings",IDC_CHAT_CHANMGR,"MButtonClass",WS_DISABLED | WS_TABSTOP,204,108,15,13,0x18000000L

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

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

     CONTROL         "",IDC_CHAT_LOG,RICHEDIT_CLASS,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | WS_TABSTOP,8,23,164,73,WS_EX_STATICEDGE

     CONTROL         "",IDC_CHAT_SPLITTERX,"Static",SS_ENHMETAFILE,172,23,10,73

     CONTROL         "",IDC_CHAT_SPLITTERY,"Static",SS_ENHMETAFILE,0,102,251,6

@@ -360,7 +360,7 @@ BEGIN
     GROUPBOX        "Other",IDC_STATIC,0,184,304,47

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

     EDITTEXT        IDC_CHAT_GROUP,153,195,49,12,ES_AUTOHSCROLL

-    LTEXT           "User list row height",IDC_STATIC,8,213,132,8

+    LTEXT           "Nick list row height",IDC_STATIC,8,213,132,8

     EDITTEXT        IDC_CHAT_NICKROW,153,211,29,12,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER

     CONTROL         "Spin2",IDC_CHAT_SPIN2,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,181,211,11,12

     LTEXT           "pixels",IDC_CHAT_NICKROWTEXT2,185,213,90,8

diff --git a/plugins/Scriver/src/chat/main.cpp b/plugins/Scriver/src/chat/main.cpp
index bb86a5013c..5ccd29dd3a 100644
--- a/plugins/Scriver/src/chat/main.cpp
+++ b/plugins/Scriver/src/chat/main.cpp
@@ -169,17 +169,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/plugins/Scriver/src/chat/options.cpp b/plugins/Scriver/src/chat/options.cpp
index 95a0642937..c074451433 100644
--- a/plugins/Scriver/src/chat/options.cpp
+++ b/plugins/Scriver/src/chat/options.cpp
@@ -37,7 +37,7 @@ struct branch_t
 static struct branch_t branch1[] = {

 	{ LPGENT("Flash when someone speaks"), "FlashWindow", 0, 0, NULL },

 	{ LPGENT("Flash when a word is highlighted"), "FlashWindowHighlight", 0, 1, NULL },

-	{ LPGENT("Show chat user list"), "ShowNicklist", 0, 1, NULL },

+	{ LPGENT("Show chat nick list"), "ShowNicklist", 0, 1, NULL },

 	{ LPGENT("Enable button context menus"), "RightClickFilter", 0, 0, NULL },

 	{ LPGENT("Show topic on your contact list (if supported)"), "TopicOnClist", 0, 0, NULL },

 	{ LPGENT("Do not play sounds when focused"), "SoundsFocus", 0, 0, NULL },

diff --git a/plugins/Scriver/src/chat/window.cpp b/plugins/Scriver/src/chat/window.cpp
index 5b742b847a..336bd4d679 100644
--- a/plugins/Scriver/src/chat/window.cpp
+++ b/plugins/Scriver/src/chat/window.cpp
@@ -111,7 +111,7 @@ static void InitButtons(HWND hwndDlg, SESSION_INFO *si)
 	SendDlgItemMessage(hwndDlg, IDC_CHAT_BKGCOLOR, BUTTONADDTOOLTIP, (WPARAM)LPGEN("Select a background color for the text (CTRL+L)"), 0);

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

 	SendDlgItemMessage(hwndDlg, IDC_CHAT_HISTORY, BUTTONADDTOOLTIP, (WPARAM)LPGEN("Show the history (CTRL+H)"), 0);

-	SendDlgItemMessage(hwndDlg, IDC_CHAT_SHOWNICKLIST, BUTTONADDTOOLTIP, (WPARAM)LPGEN("Show/hide the nicklist (CTRL+N)"), 0);

+	SendDlgItemMessage(hwndDlg, IDC_CHAT_SHOWNICKLIST, BUTTONADDTOOLTIP, (WPARAM)LPGEN("Show/hide the nick list (CTRL+N)"), 0);

 	SendDlgItemMessage(hwndDlg, IDC_CHAT_CHANMGR, BUTTONADDTOOLTIP, (WPARAM)LPGEN("Control this room (CTRL+O)"), 0);

 	SendDlgItemMessage(hwndDlg, IDC_CHAT_FILTER, BUTTONADDTOOLTIP, (WPARAM)LPGEN("Enable/disable the event filter (CTRL+F)"), 0);

 	SendDlgItemMessage(hwndDlg, IDOK, BUTTONADDTOOLTIP, (WPARAM)LPGEN("Send Message"), 0);

diff --git a/plugins/Scriver/src/globals.cpp b/plugins/Scriver/src/globals.cpp
index 65a04c3f12..a090f90916 100644
--- a/plugins/Scriver/src/globals.cpp
+++ b/plugins/Scriver/src/globals.cpp
@@ -69,8 +69,8 @@ static IconItem iconList[] =
 	{ LPGEN("Room settings"),          "chat_settings",        IDI_TOPICBUT    }, //  9

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

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

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

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

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

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

 	{ LPGEN("Icon overlay"),           "chat_overlay",         IDI_OVERLAY     }, // 14

 	{ LPGEN("Status 1 (10x10)"),       "chat_status0",         IDI_STATUS0,  10}, // 15

 	{ LPGEN("Status 2 (10x10)"),       "chat_status1",         IDI_STATUS1,  10}, // 16

diff --git a/plugins/TabSRMM/res/chat.rc b/plugins/TabSRMM/res/chat.rc
index 98bfd23542..ae0e1e9258 100644
--- a/plugins/TabSRMM/res/chat.rc
+++ b/plugins/TabSRMM/res/chat.rc
@@ -129,7 +129,7 @@ BEGIN
     LTEXT           "Maximum number of events in the message window",IDC_STATIC,10,142,225,11

     EDITTEXT        IDC_LOGLIMIT,248,139,38,14,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER

     CONTROL         "Spin1",IDC_CHAT_SPIN2,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,281,138,11,14

-    LTEXT           "Group chat userlist row height (pixels)",IDC_STATIC_ULIST,10,167,221,8

+    LTEXT           "Group chat nick list row height (pixels)",IDC_STATIC_ULIST,10,167,221,8

     EDITTEXT        IDC_NICKROW2,247,164,29,14,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER

     CONTROL         "",IDC_CHAT_SPIN3,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,275,167,11,14

     PUSHBUTTON      "Open log file base folder",IDC_MUC_OPENLOGBASEDIR,16,76,155,14

diff --git a/plugins/TabSRMM/src/chat/options.cpp b/plugins/TabSRMM/src/chat/options.cpp
index 538f15ae9f..ba995964ef 100644
--- a/plugins/TabSRMM/src/chat/options.cpp
+++ b/plugins/TabSRMM/src/chat/options.cpp
@@ -154,7 +154,7 @@ static branch_t branch1[] = {
 	{ LPGENT("Sync splitter position with standard IM sessions"), "SyncSplitter", 0, 0, NULL },

 	{ LPGENT("Show contact's status modes if supported by the protocol"), "ShowContactStatus", 0, 1, NULL },

 	{ LPGENT("Display contact's status icon before user role icon"), "ContactStatusFirst", 0, 0, NULL },

-	{ LPGENT("Use IRC style status indicators in the user list"), "ClassicIndicators", 0, 0, NULL },

+	{ LPGENT("Use IRC style status indicators in the nick list"), "ClassicIndicators", 0, 0, NULL },

 	{ LPGENT("Use alternative sorting method in member list"), "AlternativeSorting", 0, 1, NULL },

 

 };

@@ -691,7 +691,7 @@ void RegisterFontServiceFonts() {
 		ColourRegisterT(&cid);

 	}

 	cid.order++;

-	_tcsncpy_s(cid.name, SIZEOF(cid.name), LPGENT("Userlist background"), _TRUNCATE);

+	_tcsncpy_s(cid.name, SIZEOF(cid.name), LPGENT("Nick list background"), _TRUNCATE);

 	strncpy_s(cid.setting, SIZEOF(cid.setting), "ColorNicklistBG", _TRUNCATE);

 	cid.defcolour = SRMSGDEFSET_BKGCOLOUR;

 	ColourRegisterT(&cid);

diff --git a/protocols/IRCG/res/IRC.rc b/protocols/IRCG/res/IRC.rc
index 8a8efad8eb..ae6ed5cae7 100644
--- a/protocols/IRCG/res/IRC.rc
+++ b/protocols/IRCG/res/IRC.rc
@@ -83,7 +83,7 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,144,178,132,10

     EDITTEXT        IDC_ONLINETIMER,267,188,29,12,ES_AUTOHSCROLL | ES_NUMBER,WS_EX_RIGHT

     CONTROL         "Spin1",IDC_SPIN1,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,284,188,12,14

-    CONTROL         "Update statuses in channel nicklist",IDC_CHANNELAWAY,

+    CONTROL         "Update statuses in channel nick list",IDC_CHANNELAWAY,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,144,200,131,10

     EDITTEXT        IDC_LIMIT,267,210,29,12,ES_AUTOHSCROLL | ES_NUMBER,WS_EX_RIGHT

     CONTROL         "Spin2",IDC_SPIN2,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,284,209,11,14

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)