summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rw-r--r--plugins/AvatarHistory/res/AvatarHistory.rc2
-rw-r--r--plugins/Clist_modern/res/resource.rc8
-rw-r--r--plugins/Clist_modern/src/modern_clc.cpp22
-rw-r--r--plugins/Clist_mw/res/resource.rc4
-rw-r--r--plugins/Clist_mw/src/clcopts.cpp2
-rw-r--r--plugins/Clist_nicer/res/resource.rc2
-rw-r--r--plugins/HistoryStats/src/dlgoption_subglobal.cpp8
-rw-r--r--plugins/HistoryStats/src/dlgoption_subinput.cpp10
-rw-r--r--plugins/TabSRMM/src/generic_msghandlers.cpp2
-rw-r--r--plugins/TopToolBar/src/InternalButtons.cpp2
-rw-r--r--plugins/UserInfoEx/res/resource.rc4
-rw-r--r--plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp2
-rw-r--r--plugins/Variables/src/parse_metacontacts.cpp6
13 files changed, 37 insertions, 37 deletions
diff --git a/plugins/AvatarHistory/res/AvatarHistory.rc b/plugins/AvatarHistory/res/AvatarHistory.rc
index 6b7b47772e..0b94d45b32 100644
--- a/plugins/AvatarHistory/res/AvatarHistory.rc
+++ b/plugins/AvatarHistory/res/AvatarHistory.rc
@@ -67,7 +67,7 @@ BEGIN
GROUPBOX "Protocols",IDC_PROTOCOLS_G,3,3,308,157
LTEXT "Enable tracking for these protocols:",IDC_PROTOCOLS_L,13,17,157,11
CONTROL "List1",IDC_PROTOCOLS,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,12,31,158,119
- LTEXT "MetaContacts have special handling: the info is always copied from subcontacts (notifications from a meta are ignored)",IDC_STATIC,181,31,124,119
+ LTEXT "Metacontacts have special handling: the info is always copied from subcontacts (notifications from a meta are ignored)",IDC_STATIC,181,31,124,119
END
IDD_POPUPS DIALOGEX 0, 0, 314, 235
diff --git a/plugins/Clist_modern/res/resource.rc b/plugins/Clist_modern/res/resource.rc
index cdf7ceb50d..0273ecd38f 100644
--- a/plugins/Clist_modern/res/resource.rc
+++ b/plugins/Clist_modern/res/resource.rc
@@ -462,17 +462,17 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
CONTROL "Ignore empty extra icons places (arrange to right).",IDC_METASUBEXTRA_IGN,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,25,201,10
- CONTROL "Use 'Meta' protocol icons for MetaContacts",IDC_META,
+ CONTROL "Use 'Meta' protocol icons for metacontacts",IDC_META,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,95,201,10
- CONTROL "Expand MetaContacts",IDC_METAEXPAND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,107,201,16
+ CONTROL "Expand metacontacts",IDC_METAEXPAND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,107,201,16
CONTROL "Avoid double click expand",IDC_METADBLCLK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,124,196,10
CONTROL "Hide all extra icons for subcontacts",IDC_METASUBEXTRA,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,137,196,10
CONTROL "Hide offline subcontacts",IDC_METASUB_HIDEOFFLINE,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,151,196,10
- GROUPBOX "MetaContacts stuff",IDC_FRAME_META,2,81,218,101
+ GROUPBOX "Metacontacts stuff",IDC_FRAME_META,2,81,218,101
GROUPBOX "Additional stuff",IDC_FRAME_META2,2,12,218,65
- CTEXT "For other stuff MetaContacts plugin should be loaded.\n\nhttp://miranda-ng.org/p/MetaContacts/",IDC_FRAME_META_CAPT,11,94,201,26,NOT WS_VISIBLE
+ CTEXT "For other stuff metacontacts should be enabled.",IDC_FRAME_META_CAPT,11,94,201,26,NOT WS_VISIBLE
CONTROL "Allow internal requesting of status message text",IDC_DISCOVER_AWAYMSG,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,38,201,10
EDITTEXT IDC_SUBINDENT,154,163,35,12,ES_NUMBER
diff --git a/plugins/Clist_modern/src/modern_clc.cpp b/plugins/Clist_modern/src/modern_clc.cpp
index 75f6000129..bc3b73e6dc 100644
--- a/plugins/Clist_modern/src/modern_clc.cpp
+++ b/plugins/Clist_modern/src/modern_clc.cpp
@@ -1229,8 +1229,8 @@ static LRESULT clcOnLButtonUp(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam,
if (mir_strcmp(contSour->proto, META_PROTO)) {
if (!contSour->isSubcontact) {
MCONTACT hDest = contDest->hContact;
- mir_sntprintf(Wording, SIZEOF(Wording), TranslateT("Do you want contact '%s' to be converted to MetaContact and '%s' be added to it?"), contDest->szText, contSour->szText);
- res = MessageBox(hwnd, Wording, TranslateT("Converting to MetaContact"), MB_OKCANCEL | MB_ICONQUESTION);
+ mir_sntprintf(Wording, SIZEOF(Wording), TranslateT("Do you want contact '%s' to be converted to metacontact and '%s' be added to it?"), contDest->szText, contSour->szText);
+ res = MessageBox(hwnd, Wording, TranslateT("Converting to metacontact"), MB_OKCANCEL | MB_ICONQUESTION);
if (res == 1) {
handle = (MCONTACT)CallService(MS_MC_CONVERTTOMETA, (WPARAM)hDest, 0);
if (!handle) return 0;
@@ -1241,8 +1241,8 @@ static LRESULT clcOnLButtonUp(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam,
hcontact = contSour->hContact;
MCONTACT hfrom = contSour->subcontacts->hContact;
MCONTACT hdest = contDest->hContact;
- mir_sntprintf(Wording, SIZEOF(Wording), TranslateT("Do you want contact '%s' to be converted to MetaContact and '%s' be added to it (remove it from '%s')?"), contDest->szText, contSour->szText, contSour->subcontacts->szText);
- res = MessageBox(hwnd, Wording, TranslateT("Converting to MetaContact (Moving)"), MB_OKCANCEL | MB_ICONQUESTION);
+ mir_sntprintf(Wording, SIZEOF(Wording), TranslateT("Do you want contact '%s' to be converted to metacontact and '%s' be added to it (remove it from '%s')?"), contDest->szText, contSour->szText, contSour->subcontacts->szText);
+ res = MessageBox(hwnd, Wording, TranslateT("Converting to metacontact (moving)"), MB_OKCANCEL | MB_ICONQUESTION);
if (res == 1) {
MCONTACT handle = (MCONTACT)CallService(MS_MC_CONVERTTOMETA, (WPARAM)hdest, 0);
if (!handle)
@@ -1269,7 +1269,7 @@ static LRESULT clcOnLButtonUp(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam,
MCONTACT hcontact = contSour->hContact;
MCONTACT handle = contDest->hContact;
mir_sntprintf(Wording, SIZEOF(Wording), TranslateT("Do you want contact '%s' to be added to metacontact '%s'?"), contSour->szText, contDest->szText);
- int res = MessageBox(hwnd, Wording, TranslateT("Adding contact to MetaContact"), MB_OKCANCEL | MB_ICONQUESTION);
+ int res = MessageBox(hwnd, Wording, TranslateT("Adding contact to metacontact"), MB_OKCANCEL | MB_ICONQUESTION);
if (res == 1) {
if (!handle) return 0;
CallService(MS_MC_ADDTOMETA, (WPARAM)hcontact, (LPARAM)handle);
@@ -1287,8 +1287,8 @@ static LRESULT clcOnLButtonUp(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam,
MCONTACT hcontact = contSour->hContact;
MCONTACT hfrom = contSour->subcontacts->hContact;
MCONTACT handle = contDest->hContact;
- mir_sntprintf(Wording, SIZEOF(Wording), TranslateT("Do you want contact '%s' to be removed from MetaContact '%s' and added to '%s'?"), contSour->szText, contSour->subcontacts->szText, contDest->szText);
- int res = MessageBox(hwnd, Wording, TranslateT("Changing MetaContacts (Moving)"), MB_OKCANCEL | MB_ICONQUESTION);
+ mir_sntprintf(Wording, SIZEOF(Wording), TranslateT("Do you want contact '%s' to be removed from metacontact '%s' and added to '%s'?"), contSour->szText, contSour->subcontacts->szText, contDest->szText);
+ int res = MessageBox(hwnd, Wording, TranslateT("Changing metacontacts (moving)"), MB_OKCANCEL | MB_ICONQUESTION);
if (res == 1) {
if (!handle) return 0;
@@ -1312,8 +1312,8 @@ static LRESULT clcOnLButtonUp(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam,
if (!contSour->isSubcontact) {
MCONTACT hcontact = contSour->hContact;
MCONTACT handle = contDest->subcontacts->hContact;
- mir_sntprintf(Wording, SIZEOF(Wording), TranslateT("Do you want contact '%s' to be added to MetaContact '%s'?"), contSour->szText, contDest->subcontacts->szText);
- int res = MessageBox(hwnd, Wording, TranslateT("Changing MetaContacts (Moving)"), MB_OKCANCEL | MB_ICONQUESTION);
+ mir_sntprintf(Wording, SIZEOF(Wording), TranslateT("Do you want contact '%s' to be added to metacontact '%s'?"), contSour->szText, contDest->subcontacts->szText);
+ int res = MessageBox(hwnd, Wording, TranslateT("Changing metacontacts (moving)"), MB_OKCANCEL | MB_ICONQUESTION);
if (res == 1) {
if (!handle) return 0;
CallService(MS_MC_ADDTOMETA, (WPARAM)hcontact, (LPARAM)handle);
@@ -1323,8 +1323,8 @@ static LRESULT clcOnLButtonUp(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam,
MCONTACT hcontact = contSour->hContact;
MCONTACT hfrom = contSour->subcontacts->hContact;
MCONTACT handle = contDest->subcontacts->hContact;
- mir_sntprintf(Wording, SIZEOF(Wording), TranslateT("Do you want contact '%s' to be removed from MetaContact '%s' and added to '%s'?"), contSour->szText, contSour->subcontacts->szText, contDest->subcontacts->szText);
- int res = MessageBox(hwnd, Wording, TranslateT("Changing MetaContacts (Moving)"), MB_OKCANCEL | MB_ICONQUESTION);
+ mir_sntprintf(Wording, SIZEOF(Wording), TranslateT("Do you want contact '%s' to be removed from metacontact '%s' and added to '%s'?"), contSour->szText, contSour->subcontacts->szText, contDest->subcontacts->szText);
+ int res = MessageBox(hwnd, Wording, TranslateT("Changing metacontacts (moving)"), MB_OKCANCEL | MB_ICONQUESTION);
if (res == 1) {
if (!handle) return 0;
diff --git a/plugins/Clist_mw/res/resource.rc b/plugins/Clist_mw/res/resource.rc
index 95cfbbcb10..f3337f2f52 100644
--- a/plugins/Clist_mw/res/resource.rc
+++ b/plugins/Clist_mw/res/resource.rc
@@ -284,12 +284,12 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE
EXSTYLE WS_EX_CONTROLPARENT
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- CONTROL "Use 'Meta' protocol icons for MetaContacts",IDC_META,
+ CONTROL "Use 'Meta' protocol icons for metacontacts",IDC_META,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,13,233,10
CONTROL "Avoid double click expand",IDC_METADBLCLK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,29,233,10
CONTROL "Hide all extra icons for subcontacts",IDC_METASUBEXTRA,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,45,233,10
- GROUPBOX "MetaContacts supporting",-1,2,2,252,90
+ GROUPBOX "Metacontacts supporting",-1,2,2,252,90
CONTROL "Ignore empty extra icons places (arrange to right)",IDC_METASUBEXTRA_IGN,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,75,233,10
CONTROL "Hide offline subcontacts",IDC_METASUB_HIDEOFFLINE,
diff --git a/plugins/Clist_mw/src/clcopts.cpp b/plugins/Clist_mw/src/clcopts.cpp
index a859f095a1..2ce7736a7a 100644
--- a/plugins/Clist_mw/src/clcopts.cpp
+++ b/plugins/Clist_mw/src/clcopts.cpp
@@ -69,7 +69,7 @@ int ClcOptInit(WPARAM wParam, LPARAM lParam)
}
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_META_CLC);
- odp.pszTitle = LPGEN("List MetaContacts");
+ odp.pszTitle = LPGEN("List metacontacts");
odp.pfnDlgProc = DlgProcClcMetaOpts;
Options_AddPage(wParam, &odp);
diff --git a/plugins/Clist_nicer/res/resource.rc b/plugins/Clist_nicer/res/resource.rc
index 17242fdfef..ffc751c37e 100644
--- a/plugins/Clist_nicer/res/resource.rc
+++ b/plugins/Clist_nicer/res/resource.rc
@@ -625,7 +625,7 @@ BEGIN
POPUP "Appearance"
BEGIN
MENUITEM "Show status icons", POPUP_SHOWSTATUSICONS
- MENUITEM "Show MetaContact proto icons", POPUP_SHOWMETAICONS
+ MENUITEM "Show metacontact proto icons", POPUP_SHOWMETAICONS
MENUITEM SEPARATOR
MENUITEM "Show additional buttons", POPUP_BUTTONS
MENUITEM "Draw sunken frame", POPUP_FRAME
diff --git a/plugins/HistoryStats/src/dlgoption_subglobal.cpp b/plugins/HistoryStats/src/dlgoption_subglobal.cpp
index 056c13c72a..c46d819314 100644
--- a/plugins/HistoryStats/src/dlgoption_subglobal.cpp
+++ b/plugins/HistoryStats/src/dlgoption_subglobal.cpp
@@ -322,10 +322,10 @@ void DlgOption::SubGlobal::initSupportInfo()
{
static const SupportInfo Infos[] = {
{
- _T("MetaContacts"),
- LPGENT("Create statistics for meta-contacts and their subcontacts"),
- LPGENT("The following information are only relevant if your already use MetaContacts. In case you do please use version 0.9.10.6 or above.\r\n\r\nHistoryStats perfectly integrates with MetaContacts and is able to collect the data from the meta-contact as well as from the subcontacts. It is able to intelligently merge all subcontacts histories and more. You can configure MetContacts integration in the \"Input\" options."),
- LPGENT("MetaContacts Plugin"),
+ _T("Metacontacts"),
+ LPGENT("Create statistics for metacontacts and their subcontacts"),
+ LPGENT("The following information are only relevant if your already use metacontacts.\r\n\r\nHistoryStats perfectly integrates with metacontacts and is able to collect the data from the metacontact as well as from the subcontacts. It is able to intelligently merge all subcontacts histories and more. You can configure metacontacts integration in the \"Input\" options."),
+ LPGENT("Metacontacts plugin"),
_T("http://addons.miranda-im.org/details.php?action=viewfile&id=1595")
},
{
diff --git a/plugins/HistoryStats/src/dlgoption_subinput.cpp b/plugins/HistoryStats/src/dlgoption_subinput.cpp
index 351132100a..7d61c56b63 100644
--- a/plugins/HistoryStats/src/dlgoption_subinput.cpp
+++ b/plugins/HistoryStats/src/dlgoption_subinput.cpp
@@ -78,11 +78,11 @@ void DlgOption::SubInput::onWMInitDialog()
hTemp = m_Options.insertGroup(NULL, TranslateT("Contact filtering"), OptionsCtrl::OCF_ROOTGROUP | OptionsCtrl::OCF_NODISABLECHILDS);
m_hProtocols = m_Options.insertGroup(hTemp, TranslateT("Ignore all contacts with protocol..."));
- hTemp2 = m_Options.insertGroup(hTemp, TranslateT("History read mode for MetaContacts"), 0);
- m_hMetaContactsMode = m_Options.insertRadio(hTemp2, NULL, TranslateT("Use only meta-contact's history"));
- m_Options.insertRadio(hTemp2, m_hMetaContactsMode, TranslateT("Use only subcontacts' histories (for one meta-contact)"));
- m_Options.insertRadio(hTemp2, m_hMetaContactsMode, TranslateT("Use meta-contact's history and its subcontacts' histories"));
- m_Options.insertRadio(hTemp2, m_hMetaContactsMode, TranslateT("Treat meta-contacts and subcontacts as normal contacts"));
+ hTemp2 = m_Options.insertGroup(hTemp, TranslateT("History read mode for metacontacts"), 0);
+ m_hMetaContactsMode = m_Options.insertRadio(hTemp2, NULL, TranslateT("Use only metacontact's history"));
+ m_Options.insertRadio(hTemp2, m_hMetaContactsMode, TranslateT("Use only subcontacts' histories (for one metacontact)"));
+ m_Options.insertRadio(hTemp2, m_hMetaContactsMode, TranslateT("Use metacontact's history and its subcontacts' histories"));
+ m_Options.insertRadio(hTemp2, m_hMetaContactsMode, TranslateT("Treat metacontacts and subcontacts as normal contacts"));
m_hMergeContacts = m_Options.insertCheck(hTemp, TranslateT("Merge contacts with same name"), OptionsCtrl::OCF_DISABLECHILDSONUNCHECK);
m_hMergeContactsGroups = m_Options.insertCheck(m_hMergeContacts, TranslateT("Only merge if contacts are in the same group"));
diff --git a/plugins/TabSRMM/src/generic_msghandlers.cpp b/plugins/TabSRMM/src/generic_msghandlers.cpp
index a7465ba712..f73761a911 100644
--- a/plugins/TabSRMM/src/generic_msghandlers.cpp
+++ b/plugins/TabSRMM/src/generic_msghandlers.cpp
@@ -1825,7 +1825,7 @@ void TSAPI DM_UpdateTitle(TWindowData *dat, WPARAM wParam, LPARAM lParam)
TCHAR fulluin[256];
if (dat->bIsMeta)
mir_sntprintf(fulluin, SIZEOF(fulluin),
- TranslateT("UID: %s (SHIFT click -> copy to clipboard)\nClick for User's Details\nRight click for MetaContact control\nClick dropdown to add or remove user from your favorites."),
+ TranslateT("UID: %s (SHIFT click -> copy to clipboard)\nClick for User's Details\nRight click for metacontact control\nClick dropdown to add or remove user from your favorites."),
bHasName ? dat->cache->getUIN() : TranslateT("No UID"));
else
mir_sntprintf(fulluin, SIZEOF(fulluin),
diff --git a/plugins/TopToolBar/src/InternalButtons.cpp b/plugins/TopToolBar/src/InternalButtons.cpp
index 0869b5b7a8..8f49bae9f4 100644
--- a/plugins/TopToolBar/src/InternalButtons.cpp
+++ b/plugins/TopToolBar/src/InternalButtons.cpp
@@ -27,7 +27,7 @@ static stdButtons[] = {
{ LPGEN("Find/add contacts"), MS_FINDADD_FINDADD, SKINICON_OTHER_FINDUSER, 0, LPGEN("Find/add contacts"), NULL, 0, 1 },
{ LPGEN("Show status menu"), TTBI_STATUSMENUBUTT, SKINICON_OTHER_STATUS, 0, LPGEN("Show status menu"), NULL, 0, 0 },
{ LPGEN("Show/hide offline contacts"), MS_CLIST_SETHIDEOFFLINE, IDI_HIDEOFFLINE, IDI_SHOWOFFLINE, LPGEN("Hide offline contacts"), LPGEN("Show offline contacts"), 1, 1 },
- { LPGEN("Enable/disable MetaContacts"), "MetaContacts/OnOff", IDI_METAOFF, IDI_METAON, LPGEN("Disable MetaContacts"), LPGEN("Enable MetaContacts"), 1, 1 },
+ { LPGEN("Enable/disable metacontacts"), "MetaContacts/OnOff", IDI_METAOFF, IDI_METAON, LPGEN("Disable metacontacts"), LPGEN("Enable metacontacts"), 1, 1 },
{ LPGEN("Enable/disable groups"), TTBI_GROUPSHOWHIDE, IDI_GROUPSOFF, IDI_GROUPSON, LPGEN("Enable groups"), LPGEN("Disable groups"), 1, 1 },
{ LPGEN("Enable/disable sounds"), TTBI_SOUNDSONOFF, IDI_SOUNDSOFF, IDI_SOUNDSON, LPGEN("Disable sounds"), LPGEN("Enable sounds"), 1, 1 },
{ LPGEN("Minimize contact list"), MS_CLIST_SHOWHIDE, SKINICON_OTHER_SHOWHIDE, 0, LPGEN("Minimize contact list"), NULL, 0, 1 },
diff --git a/plugins/UserInfoEx/res/resource.rc b/plugins/UserInfoEx/res/resource.rc
index 94fb902685..9e52a49541 100644
--- a/plugins/UserInfoEx/res/resource.rc
+++ b/plugins/UserInfoEx/res/resource.rc
@@ -338,7 +338,7 @@ BEGIN
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,16,290,10
CONTROL "Display icons on each dialog button",CHECK_OPT_BUTTONICONS,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,30,290,10
- GROUPBOX "MetaContacts",STATIC_OPT_METAGROUP,3,52,303,32
+ GROUPBOX "Metacontacts",STATIC_OPT_METAGROUP,3,52,303,32
CONTROL "Scan subcontacts for missing information",CHECK_OPT_METASCAN,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,67,290,10
CONTROL "Enable extended 'send/receive e-mail' service (*)",CHECK_OPT_SREMAIL_ENABLED,
@@ -370,7 +370,7 @@ BEGIN
CONTROL "Sort all tree items alphabetically",CHECK_OPT_SORTTREE,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,165,271,10
CONTROL "",CLR_META,"ColourPicker",WS_TABSTOP,12,61,29,12
- LTEXT "Info of a MetaContact's subcontact",TXT_OPT_CLR_META,46,63,232,8
+ LTEXT "Info of a metacontact's subcontact",TXT_OPT_CLR_META,46,63,232,8
GROUPBOX "Colors",IDC_STATIC,3,4,303,74
GROUPBOX "Common",IDC_STATIC,3,79,303,53
CONTROL "Change my ICQ details with UserInfoEx (disabled if ICQ doesn't support it)",CHECK_OPT_CHANGEMYDETAILS,
diff --git a/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp b/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp
index 1cb964a2ac..0dcd377b73 100644
--- a/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp
+++ b/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp
@@ -745,7 +745,7 @@ int CExImContactXML::ImportMetaSubContact(CExImContactXML * pMetaContact)
int result = MsgBox(NULL, MB_YESNO|MB_ICONWARNING,
LPGENT("Question"),
LPGENT("Importing a new meta subcontact failed!"),
- LPGENT("The newly created MetaSubContact '%s'\ncould not be added to MetaContact '%s'!\n\nDo you want to delete this contact?"),
+ LPGENT("The newly created meta subcontact '%s'\ncould not be added to metacontact '%s'!\n\nDo you want to delete this contact?"),
ptszNick, ptszMetaNick);
MIR_FREE(ptszNick);
MIR_FREE(ptszMetaNick);
diff --git a/plugins/Variables/src/parse_metacontacts.cpp b/plugins/Variables/src/parse_metacontacts.cpp
index 9785b30420..9ba853fb70 100644
--- a/plugins/Variables/src/parse_metacontacts.cpp
+++ b/plugins/Variables/src/parse_metacontacts.cpp
@@ -173,7 +173,7 @@ static TCHAR *parseGetMostOnline(ARGUMENTSINFO *ai)
void registerMetaContactsTokens()
{
- registerIntToken(MC_GETPARENT, parseGetParent, TRF_FUNCTION, LPGEN("MetaContacts")"\t(x)\t"LPGEN("get parent metacontact of contact x"));
- registerIntToken(MC_GETDEFAULT, parseGetDefault, TRF_FUNCTION, LPGEN("MetaContacts")"\t(x)\t"LPGEN("get default subcontact x"));
- registerIntToken(MC_GETMOSTONLINE, parseGetMostOnline, TRF_FUNCTION, LPGEN("MetaContacts")"\t(x)\t"LPGEN("get the 'most online' subcontact x"));
+ registerIntToken(MC_GETPARENT, parseGetParent, TRF_FUNCTION, LPGEN("Metacontacts")"\t(x)\t"LPGEN("get parent metacontact of contact x"));
+ registerIntToken(MC_GETDEFAULT, parseGetDefault, TRF_FUNCTION, LPGEN("Metacontacts")"\t(x)\t"LPGEN("get default subcontact x"));
+ registerIntToken(MC_GETMOSTONLINE, parseGetMostOnline, TRF_FUNCTION, LPGEN("Metacontacts")"\t(x)\t"LPGEN("get the 'most online' subcontact x"));
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 04:23:51 +0000