summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--plugins/Clist_nicer/res/resource.rc2
-rw-r--r--plugins/NewAwaySysMod/res/NewAwaySys.rc4
-rw-r--r--plugins/New_GPG/src/utilities.cpp2
-rw-r--r--plugins/Scriver/src/chat_options.cpp2
-rw-r--r--plugins/SimpleStatusMsg/res/resource.rc2
-rw-r--r--plugins/StopSpamMod/res/stopspam.rc2
-rw-r--r--plugins/TabSRMM/src/chat_options.cpp2
-rw-r--r--plugins/TipperYM/docs/autoexec_tipper_items_cz.ini2
-rw-r--r--plugins/TipperYM/docs/autoexec_tipper_items_eng.ini2
-rw-r--r--plugins/TipperYM/src/translations.cpp4
-rw-r--r--plugins/UserInfoEx/src/dlg_propsheet.cpp4
-rw-r--r--plugins/UserInfoEx/src/svc_constants.cpp4
-rw-r--r--plugins/Variables/src/stdafx.h2
13 files changed, 17 insertions, 17 deletions
diff --git a/plugins/Clist_nicer/res/resource.rc b/plugins/Clist_nicer/res/resource.rc
index 3efc8e09d8..46a4662171 100644
--- a/plugins/Clist_nicer/res/resource.rc
+++ b/plugins/Clist_nicer/res/resource.rc
@@ -326,7 +326,7 @@ BEGIN
CONTROL "Show bevels on panels",IDC_SBPANELBEVEL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,93,265,10
CONTROL "Show resize grip indicator",IDC_SHOWGRIP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,108,265,10
CONTROL "Draw background skin",IDC_SKINBACKGROUND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,123,265,10
- CONTROL "Show ICQ extended status icons",IDC_SHOWXSTATUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,186,275,9
+ CONTROL "Show MRA extended status icons",IDC_SHOWXSTATUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,186,275,9
CONTROL "Mark protocols locked from global status changes",IDC_MARKLOCKED,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,200,275,9
END
diff --git a/plugins/NewAwaySysMod/res/NewAwaySys.rc b/plugins/NewAwaySysMod/res/NewAwaySys.rc
index 1623cb3944..983542e604 100644
--- a/plugins/NewAwaySysMod/res/NewAwaySys.rc
+++ b/plugins/NewAwaySysMod/res/NewAwaySys.rc
@@ -79,7 +79,7 @@ BEGIN
RTEXT "On event...",IDC_REPLYDLG_STATIC_ONEVENT,43,19,59,8
CONTROL "",IDC_REPLYDLG_EVENTMSG,"Button",BS_AUTOCHECKBOX | BS_ICON | WS_TABSTOP,110,17,29,12
CONTROL "",IDC_REPLYDLG_EVENTFILE,"Button",BS_AUTOCHECKBOX | BS_ICON | WS_TABSTOP,145,17,29,12
- CONTROL "Don't reply to ICQ contacts",IDC_REPLYDLG_DONTSENDTOICQ,
+ CONTROL "Don't reply to MRA contacts",IDC_REPLYDLG_DONTSENDTOICQ,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,21,119,275,10
CONTROL "Save autoreply to the history",IDC_REPLYDLG_LOGREPLY,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,21,34,275,10
@@ -185,7 +185,7 @@ BEGIN
"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,15,157,294,16
CONTROL "Use protocol specific nick for %nas_mynick%",IDC_MOREOPTDLG_MYNICKPERPROTO,
"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,6,175,294,8
- CONTROL "Update status messages for non-ICQ protocols every",IDC_MOREOPTDLG_UPDATEMSGS,
+ CONTROL "Update status messages for non-MRA protocols every",IDC_MOREOPTDLG_UPDATEMSGS,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,187,199,10
EDITTEXT IDC_MOREOPTDLG_UPDATEMSGSPERIOD,207,186,38,12,ES_AUTOHSCROLL | ES_NUMBER
CONTROL "",IDC_MOREOPTDLG_UPDATEMSGSPERIOD_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,230,186,12,12
diff --git a/plugins/New_GPG/src/utilities.cpp b/plugins/New_GPG/src/utilities.cpp
index f466a76ee1..b5fb7a4372 100644
--- a/plugins/New_GPG/src/utilities.cpp
+++ b/plugins/New_GPG/src/utilities.cpp
@@ -431,7 +431,7 @@ INT_PTR onSendFile(WPARAM w, LPARAM l)
return Proto_ChainSend(w, ccs);
}
if (!supported_proto) {
- if (MessageBox(nullptr, TranslateT("Unable to check encryption support on other side.\nRecipient may be unable to decrypt file(s).\nCurrently capability check supported only for ICQ and Jabber protocols.\nIt will work for any other proto if Miranda with New_GPG is used on other side.\nDo you want to encrypt file(s) anyway?"), TranslateT("File transfer warning"), MB_YESNO) == IDNO)
+ if (MessageBox(nullptr, TranslateT("Unable to check encryption support on other side.\nRecipient may be unable to decrypt file(s).\nCurrently capability check supported only for Jabber and MRA protocols.\nIt will work for any other proto if Miranda with New_GPG is used on other side.\nDo you want to encrypt file(s) anyway?"), TranslateT("File transfer warning"), MB_YESNO) == IDNO)
return Proto_ChainSend(w, ccs);
}
HistoryLog(ccs->hContact, TranslateU("encrypting file for transfer"), DBEF_SENT);
diff --git a/plugins/Scriver/src/chat_options.cpp b/plugins/Scriver/src/chat_options.cpp
index 8785129a98..d1fb83a817 100644
--- a/plugins/Scriver/src/chat_options.cpp
+++ b/plugins/Scriver/src/chat_options.cpp
@@ -179,7 +179,7 @@ public:
L"%nick%", TranslateT("nick of current contact (if defined)"),
L"%proto%", TranslateT("protocol name of current contact (if defined). Account name is used when protocol supports multiple accounts"),
L"%accountname%", TranslateT("user-defined account name of current contact (if defined)."),
- L"%userid%", TranslateT("user ID of current contact (if defined). It is like UIN for ICQ, JID for Jabber, etc."),
+ L"%userid%", TranslateT("user ID of current contact (if defined). It is like JID for Jabber, etc."),
// global vars
L"%miranda_path%", TranslateT("path to Miranda root folder"),
L"%miranda_profilesdir%", TranslateT("path to folder containing Miranda profiles"),
diff --git a/plugins/SimpleStatusMsg/res/resource.rc b/plugins/SimpleStatusMsg/res/resource.rc
index d83ddc2565..4f1924389b 100644
--- a/plugins/SimpleStatusMsg/res/resource.rc
+++ b/plugins/SimpleStatusMsg/res/resource.rc
@@ -132,7 +132,7 @@ BEGIN
CONTROL "Spin2",IDC_SSECUPDTMSG,"msctls_updown32",UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,188,14,11,14
LTEXT "seconds",IDC_STATIC,202,16,32,8
CONTROL "Do not update variables during idle",IDC_CNOIDLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,30,274,8
- CONTROL "Do not update variables on ICQ status message requests",IDC_CNOICQREQ,
+ CONTROL "Do not update variables on MRA status message requests",IDC_CNOICQREQ,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,44,274,8
CONTROL "Leave last played track's title after exiting the player",IDC_CLEAVEWINAMP,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,58,274,8
diff --git a/plugins/StopSpamMod/res/stopspam.rc b/plugins/StopSpamMod/res/stopspam.rc
index 37c856e0a2..0698781aca 100644
--- a/plugins/StopSpamMod/res/stopspam.rc
+++ b/plugins/StopSpamMod/res/stopspam.rc
@@ -92,7 +92,7 @@ BEGIN
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,77,287,10
CONTROL "Add contact to server list",IDC_ADDTOSRVLST,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,22,124,187,10
EDITTEXT IDC_AUTOADDGROUP,210,122,76,14,ES_AUTOHSCROLL
- GROUPBOX "After congratulation (ICQ only)",IDC_STATIC,15,113,278,51
+ GROUPBOX "After congratulation (MRA only)",IDC_STATIC,15,113,278,51
CONTROL "Automatically grant authorization",IDC_AUTOAUTH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,22,136,263,10
CONTROL "Request authorization from contacts which pass StopSpam test",IDC_REQAUTH,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,22,148,267,10
diff --git a/plugins/TabSRMM/src/chat_options.cpp b/plugins/TabSRMM/src/chat_options.cpp
index 4ceec3b968..bc19086e3e 100644
--- a/plugins/TabSRMM/src/chat_options.cpp
+++ b/plugins/TabSRMM/src/chat_options.cpp
@@ -616,7 +616,7 @@ public:
L"%nick%", TranslateT("nick of current contact (if defined)"),
L"%proto%", TranslateT("protocol name of current contact (if defined). Account name is used when protocol supports multiple accounts"),
L"%accountname%", TranslateT("user-defined account name of current contact (if defined)."),
- L"%userid%", TranslateT("user ID of current contact (if defined). It is like UIN for ICQ, JID for Jabber, etc."),
+ L"%userid%", TranslateT("user ID of current contact (if defined). It is like JID for Jabber, etc."),
// global vars
L"%miranda_path%", TranslateT("path to Miranda root folder"),
L"%miranda_profilesdir%", TranslateT("path to folder containing Miranda profiles"),
diff --git a/plugins/TipperYM/docs/autoexec_tipper_items_cz.ini b/plugins/TipperYM/docs/autoexec_tipper_items_cz.ini
index 7cbd7c9ffc..d4ba6492d5 100644
--- a/plugins/TipperYM/docs/autoexec_tipper_items_cz.ini
+++ b/plugins/TipperYM/docs/autoexec_tipper_items_cz.ini
@@ -6,7 +6,7 @@ NextFuncId=d22
Trans_DWORD timestamp to time=d2
Trans_DWORD timestamp to time difference=d3
Trans_BYTE to Yes/No=d4
-Trans_BYTE to Male/Female (ICQ)=d5
+Trans_BYTE to Male/Female (MRA)=d5
Trans_WORD to country name=d6
Trans_DWORD to ip address=d7
Trans_<prefix>Day|Month|Year to date=d8
diff --git a/plugins/TipperYM/docs/autoexec_tipper_items_eng.ini b/plugins/TipperYM/docs/autoexec_tipper_items_eng.ini
index 6d344f2405..7cbc3b9d94 100644
--- a/plugins/TipperYM/docs/autoexec_tipper_items_eng.ini
+++ b/plugins/TipperYM/docs/autoexec_tipper_items_eng.ini
@@ -6,7 +6,7 @@ NextFuncId=d22
Trans_DWORD timestamp to time=d2
Trans_DWORD timestamp to time difference=d3
Trans_BYTE to Yes/No=d4
-Trans_BYTE to Male/Female (ICQ)=d5
+Trans_BYTE to Male/Female (MRA)=d5
Trans_WORD to country name=d6
Trans_DWORD to ip address=d7
Trans_<prefix>Day|Month|Year to date=d8
diff --git a/plugins/TipperYM/src/translations.cpp b/plugins/TipperYM/src/translations.cpp
index aeba35e523..1d2e59b5c5 100644
--- a/plugins/TipperYM/src/translations.cpp
+++ b/plugins/TipperYM/src/translations.cpp
@@ -721,7 +721,7 @@ static DBVTranslation internalTranslations[] =
{ TimestampToTime, LPGENW("DWORD timestamp to time") },
{ TimestampToTimeDifference, LPGENW("DWORD timestamp to time difference") },
{ ByteToYesNo, LPGENW("BYTE to Yes/No") },
- { ByteToGender, LPGENW("BYTE to Male/Female (ICQ)") },
+ { ByteToGender, LPGENW("BYTE to Male/Female (MRA)") },
{ WordToCountry, LPGENW("WORD to country name") },
{ DwordToIp, LPGENW("DWORD to IP address") },
{ DayMonthYearToDate, LPGENW("<prefix>Day|Month|Year to date") },
@@ -738,7 +738,7 @@ static DBVTranslation internalTranslations[] =
{ TimezoneToTime, LPGENW("BYTE timezone to time") },
{ ByteToDay, LPGENW("WORD to name of a day (0..6, 0 is Sunday)") },
{ ByteToMonth, LPGENW("WORD to name of a month (1..12, 1 is January)") },
- { ByteToLanguage, LPGENW("BYTE to language (ICQ)") },
+ { ByteToLanguage, LPGENW("BYTE to language (MRA)") },
};
void InitTranslations()
diff --git a/plugins/UserInfoEx/src/dlg_propsheet.cpp b/plugins/UserInfoEx/src/dlg_propsheet.cpp
index 8003bc4733..4d1805c6d8 100644
--- a/plugins/UserInfoEx/src/dlg_propsheet.cpp
+++ b/plugins/UserInfoEx/src/dlg_propsheet.cpp
@@ -114,7 +114,7 @@ private:
if (!IsProtoOnline((*_pPd)->szModuleName))
MsgBox(_pPs->hDlg, MB_ICON_WARNING, TranslateT("Upload details"),
CMStringW(FORMAT, TranslateT("Protocol '%s' is offline"), _A2T((*_pPd)->szModuleName).get()),
- TranslateT("You are not currently connected to the ICQ network.\nYou must be online in order to update your information on the server.\n\nYour changes will be saved to database only."));
+ TranslateT("You are not currently connected to the MRA network.\nYou must be online in order to update your information on the server.\n\nYour changes will be saved to database only."));
// start uploading process
else _hUploading = 0;
@@ -920,7 +920,7 @@ static INT_PTR CALLBACK DlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
}
else if (ack->result == ACKRESULT_FAILED) {
MsgBox(hDlg, MB_ICON_WARNING,
- LPGENW("Upload ICQ details"),
+ LPGENW("Upload MRA details"),
LPGENW("Upload failed"),
LPGENW("Your details were not uploaded successfully.\nThey were written to database only."));
KillTimer(hDlg, TIMERID_UPDATING);
diff --git a/plugins/UserInfoEx/src/svc_constants.cpp b/plugins/UserInfoEx/src/svc_constants.cpp
index 02136c9fde..c1483c1a3c 100644
--- a/plugins/UserInfoEx/src/svc_constants.cpp
+++ b/plugins/UserInfoEx/src/svc_constants.cpp
@@ -111,7 +111,7 @@ static IDSTRLIST TmplOccupations[] = {
{10, LPGENW("Government"), nullptr},
{11, LPGENW("High School Student"), nullptr},
{12, LPGENW("Home"), nullptr},
- {13, LPGENW("ICQ - Providing Help"), nullptr},
+ {13, LPGENW("MRA - Providing Help"), nullptr},
{14, LPGENW("Law"), nullptr},
{15, LPGENW("Managerial"), nullptr},
{16, LPGENW("Manufacturing"), nullptr},
@@ -140,7 +140,7 @@ static IDSTRLIST TmplInterests[] = {
{106, LPGENW("Fitness"), nullptr},
{107, LPGENW("Games"), nullptr},
{108, LPGENW("Hobbies"), nullptr},
- {109, LPGENW("ICQ - Providing Help"), nullptr},
+ {109, LPGENW("MRA - Providing Help"), nullptr},
{110, LPGENW("Internet"), nullptr},
{111, LPGENW("Lifestyle"), nullptr},
{112, LPGENW("Movies/TV"), nullptr},
diff --git a/plugins/Variables/src/stdafx.h b/plugins/Variables/src/stdafx.h
index d0c550ccfc..4b6f511c49 100644
--- a/plugins/Variables/src/stdafx.h
+++ b/plugins/Variables/src/stdafx.h
@@ -109,7 +109,7 @@ This will not parse the given string, any function, field or special character i
This will add a comment in the formatting string. Everything from the # character to the end of the line will be removed. Example: %dbprofile% #this is a useless comment.\r\n\r\n\r\n\
--- Contacts ---\r\n\r\n\
Whenever a functions requires a contact as an argument, you can specify it in two ways:\r\n\r\n\
-(1) Using a unique ID (UIN for ICQ, JID for Jabber) or, a protocol ID followed by a unique ID in the form <PROTOID:UNIQUEID>, for example <JABBER:miranda@example.com> or <ICQ:123456789>.\r\n\r\n\
+(1) Using a unique ID (for example JID for Jabber) or, a protocol ID followed by a unique ID in the form <PROTOID:UNIQUEID>, for example <JABBER:miranda@example.com>.\r\n\r\n\
(2) Using the contact function:\r\n\
?contact(x,y)\r\n\
A contact will be searched which will have value x for its property y, y can be one of the following:\r\n\
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-22 03:10:55 +0000