From df7ced65192604ea21a331cfcafe642201e69861 Mon Sep 17 00:00:00 2001 From: Dart Raiden Date: Fri, 27 Dec 2013 21:39:34 +0000 Subject: clist -> contact list git-svn-id: http://svn.miranda-ng.org/main/trunk@7401 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Clist_modern/res/resource.rc | 6 +++--- plugins/Clist_modern/src/modern_toolbar.cpp | 2 +- plugins/Clist_nicer/src/Docking.cpp | 4 ++-- plugins/Non-IM Contact/res/resource.rc | 2 +- plugins/Non-IM Contact/src/dialog.cpp | 2 +- plugins/Nudge/res/resource.rc | 2 +- plugins/Nudge/src/Version.h | 2 +- plugins/TipperYM/src/options.h | 2 +- plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp | 2 +- plugins/ZeroNotification/res/ZeroNotify.rc | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) (limited to 'plugins') diff --git a/plugins/Clist_modern/res/resource.rc b/plugins/Clist_modern/res/resource.rc index bfd665895b..a954238ae7 100644 --- a/plugins/Clist_modern/res/resource.rc +++ b/plugins/Clist_modern/res/resource.rc @@ -693,7 +693,7 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN CONTROL "Right-To-Left reading mode (mirror template)",IDC_RTL, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,42,246,8 - CONTROL "Replace smileys in clist",IDC_REPLACE_SMILEYS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,81,246,8 + CONTROL "Replace smileys in contact list",IDC_REPLACE_SMILEYS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,81,246,8 CONTROL "Use protocol smileys",IDC_USE_PROTOCOL_SMILEYS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,21,94,232,8 CONTROL "Draw smileys on first line",IDC_DRAW_SMILEYS_ON_FIRST_LINE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,119,246,8 @@ -717,7 +717,7 @@ BEGIN LTEXT "Top space:",IDC_STATIC_TOP,7,37,40,8 EDITTEXT IDC_TOP_SPACE,50,35,35,12,ES_NUMBER CONTROL "",IDC_TOP_SPACE_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,84,35,11,12 - LTEXT "pixels",IDC_STATIC_PIXELS,96,37,18,8 + LTEXT "pixels",IDC_STATIC_PIXELS,96,37,30,8 CONTROL "Draw smileys on second line",IDC_DRAW_SMILEYS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,52,242,8 LTEXT "Text:",IDC_STATIC_TEXT,7,67,83,9 CONTROL "Status",IDC_STATUS,"Button",BS_AUTORADIOBUTTON,18,79,118,8 @@ -746,7 +746,7 @@ BEGIN LTEXT "Top space:",IDC_STATIC_TOP,7,37,40,8 EDITTEXT IDC_TOP_SPACE,50,35,35,12,ES_NUMBER CONTROL "",IDC_TOP_SPACE_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,84,35,11,12 - LTEXT "pixels",IDC_STATIC_PIXELS,96,37,18,8 + LTEXT "pixels",IDC_STATIC_PIXELS,96,37,30,8 CONTROL "Draw smileys on third line",IDC_DRAW_SMILEYS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,52,242,8 LTEXT "Text:",IDC_STATIC_TEXT,7,67,83,9 CONTROL "Status",IDC_STATUS,"Button",BS_AUTORADIOBUTTON,18,79,118,8 diff --git a/plugins/Clist_modern/src/modern_toolbar.cpp b/plugins/Clist_modern/src/modern_toolbar.cpp index 3379a3d3b3..bd31dc8d06 100644 --- a/plugins/Clist_modern/src/modern_toolbar.cpp +++ b/plugins/Clist_modern/src/modern_toolbar.cpp @@ -281,7 +281,7 @@ void CustomizeToolbar(HWND hwnd) static char szUrl[] = "http://miranda-ng.org/p/TopToolBar"; -static TCHAR szWarning[] = LPGENT("To view a toolbar in Clist Modern you need the TopToolBar plugin. Click Yes to download it or Cancel to continue"); +static TCHAR szWarning[] = LPGENT("To view a toolbar in Modern contact list you need the TopToolBar plugin. Click Yes to download it or Cancel to continue"); static void CopySettings(const char* to, const char* from, int defValue) { diff --git a/plugins/Clist_nicer/src/Docking.cpp b/plugins/Clist_nicer/src/Docking.cpp index 98afde8379..68bb5a2193 100644 --- a/plugins/Clist_nicer/src/Docking.cpp +++ b/plugins/Clist_nicer/src/Docking.cpp @@ -151,8 +151,8 @@ int Docking_ProcessWindowMessage(WPARAM wParam, LPARAM lParam) if ((ptCursor.x < rcMonitor.left + EDGESENSITIVITY) || (ptCursor.x >= rcMonitor.right - EDGESENSITIVITY)) { if ( !(GetWindowLongPtr(msg->hwnd, GWL_EXSTYLE) & WS_EX_TOOLWINDOW)) { SendMessage(msg->hwnd, CLUIINTM_REDRAW, 0, 0); - MessageBox(0, TranslateT("The clist cannot be docked when using the default title bar and border. Use a toolwindow or borderless style instead."), - TranslateT("Clist docking"), MB_OK); + MessageBox(0, TranslateT("The contact list cannot be docked when using the default title bar and border. Use a toolwindow or borderless style instead."), + TranslateT("Contact list docking"), MB_OK); return 0; } ZeroMemory(&abd, sizeof(abd)); diff --git a/plugins/Non-IM Contact/res/resource.rc b/plugins/Non-IM Contact/res/resource.rc index c1841d6777..34cff039db 100644 --- a/plugins/Non-IM Contact/res/resource.rc +++ b/plugins/Non-IM Contact/res/resource.rc @@ -67,7 +67,7 @@ BEGIN PUSHBUTTON "O&pen File",IDC_OPEN_FILE,149,47,56,14 PUSHBUTTON "O&pen Folder",IDC_OPEN_FOLDER,216,47,56,14 GROUPBOX "Link Settings",IDC_STATIC,7,4,269,60 - GROUPBOX "CList Settings",IDC_STATIC,7,68,269,64 + GROUPBOX "Contact list settings",IDC_STATIC,7,68,269,64 COMBOBOX IDC_GROUP,43,79,158,74,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP CONTROL "",CHK_ONLINE,"Button",BS_AUTORADIOBUTTON | BS_PUSHLIKE | WS_TABSTOP,71,95,16,16 CONTROL "",CHK_AWAY,"Button",BS_AUTORADIOBUTTON | BS_ICON | BS_PUSHLIKE | WS_TABSTOP,90,95,16,16 diff --git a/plugins/Non-IM Contact/src/dialog.cpp b/plugins/Non-IM Contact/src/dialog.cpp index fb0bf27788..99ad2e6122 100644 --- a/plugins/Non-IM Contact/src/dialog.cpp +++ b/plugins/Non-IM Contact/src/dialog.cpp @@ -262,7 +262,7 @@ void DoPropertySheet(HANDLE hContact, HINSTANCE hInst) psp[1].pszTemplate = MAKEINTRESOURCEA(IDD_OTHER_STUFF); psp[1].pszIcon = NULL; psp[1].pfnDlgProc = DlgProcOtherStuff; - psp[1].pszTitle = Translate("Link and CList Settings"); + psp[1].pszTitle = Translate("Link and Contact list Settings"); psp[1].lParam = (LPARAM)hContact; psp[1].pfnCallback = NULL; diff --git a/plugins/Nudge/res/resource.rc b/plugins/Nudge/res/resource.rc index ac8ac52923..b530012fe8 100644 --- a/plugins/Nudge/res/resource.rc +++ b/plugins/Nudge/res/resource.rc @@ -102,7 +102,7 @@ STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Shaking Clist Options",IDC_STATIC,7,10,296,77 + GROUPBOX "Shaking contact list options",IDC_STATIC,7,10,296,77 RTEXT "Number of moves",IDC_STATIC,13,127,70,9 CONTROL "Slider1",IDC_SNUMBER_CLIST,"msctls_trackbar32",TBS_AUTOTICKS | TBS_BOTH | WS_TABSTOP,90,25,179,21 RTEXT "Width of move",IDC_STATIC,13,156,70,9 diff --git a/plugins/Nudge/src/Version.h b/plugins/Nudge/src/Version.h index 1b7943e7db..479ea18b48 100644 --- a/plugins/Nudge/src/Version.h +++ b/plugins/Nudge/src/Version.h @@ -7,7 +7,7 @@ #define __PLUGIN_NAME "Nudge" #define __FILENAME "Nudge.dll" -#define __DESCRIPTION "Plugin to shake the clist and chat window." +#define __DESCRIPTION "Plugin to shake the contact list and chat window." #define __AUTHOR "Tweety/GouZ, FREAK_THEMIGHTY" #define __AUTHOREMAIL "francois.mean@skynet.be, Sylvain.gougouzian@gmail.com, wishmaster51@googlemail.com" #define __AUTHORWEB "http://miranda-ng.org/p/Nudge/" diff --git a/plugins/TipperYM/src/options.h b/plugins/TipperYM/src/options.h index c3c649ded5..98caec2063 100644 --- a/plugins/TipperYM/src/options.h +++ b/plugins/TipperYM/src/options.h @@ -100,7 +100,7 @@ static TCHAR* trayTipItems[TRAYTIP_ITEMS_COUNT] = LPGENT("Listening to"), LPGENT("Favorite contacts"), LPGENT("Miranda uptime"), - LPGENT("Clist event") + LPGENT("Contact list event") }; // extra icons diff --git a/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp b/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp index ba57af54d5..0906dacaae 100644 --- a/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp +++ b/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp @@ -506,7 +506,7 @@ BYTE CExImContactBase::isHandle(HANDLE hContact) LPTSTR ptszNick = mir_utf8decodeT(_pszNick); LPTSTR ptszProto = mir_a2t(_pszProto); int ans = MsgBox(NULL, MB_ICONQUESTION|MB_YESNO, LPGENT("Question"), LPGENT("contact identificaion"), - LPGENT("The contact %s(%s) has no unique ID in the vCard,\nbut there is a contact in your clist with the same nick and protocol.\nDo you wish to use this contact?"), + LPGENT("The contact %s(%s) has no unique ID in the vCard,\nbut there is a contact in your contact list with the same nick and protocol.\nDo you wish to use this contact?"), ptszNick, ptszProto); MIR_FREE(ptszNick); MIR_FREE(ptszProto); diff --git a/plugins/ZeroNotification/res/ZeroNotify.rc b/plugins/ZeroNotification/res/ZeroNotify.rc index 5c10f4fce9..03971b11b1 100644 --- a/plugins/ZeroNotification/res/ZeroNotify.rc +++ b/plugins/ZeroNotification/res/ZeroNotify.rc @@ -57,7 +57,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "No sounds when:",IDC_STATIC,4,4,77,16 CONTROL "Tree1",IDC_NOSOUND,"SysTreeView32",TVS_DISABLEDRAGDROP | TVS_NOTOOLTIPS | TVS_NONEVENHEIGHT | WS_BORDER | WS_HSCROLL | WS_TABSTOP,4,22,77,105 - LTEXT "No CLIST blink when:",IDC_STATIC,165,4,77,16 + LTEXT "No CList blink when:",IDC_STATIC,165,4,77,16 CONTROL "Tree1",IDC_NOBLINK,"SysTreeView32",TVS_DISABLEDRAGDROP | TVS_NOTOOLTIPS | TVS_NONEVENHEIGHT | WS_BORDER | WS_HSCROLL | WS_TABSTOP,87,22,73,105 LTEXT "No SysTray blink when:",IDC_STATIC,87,4,77,16 CONTROL "Tree1",IDC_NOCLCBLINK,"SysTreeView32",TVS_DISABLEDRAGDROP | TVS_NOTOOLTIPS | TVS_NONEVENHEIGHT | WS_BORDER | WS_HSCROLL | WS_TABSTOP,165,22,73,105 -- cgit v1.2.3