langpacks/english: update

13 files changed, 16 insertions, 20 deletions

diff --git a/langpacks/english/Plugins/Clist_nicer.txt b/langpacks/english/Plugins/Clist_nicer.txt
index 38225bf2bf..9423069226 100644
--- a/langpacks/english/Plugins/Clist_nicer.txt
+++ b/langpacks/english/Plugins/Clist_nicer.txt
@@ -142,7 +142,7 @@
 [Show bevels on panels]

 [Show resize grip indicator]

 [Draw background skin]

-[Show ICQ extended status icons]

+[Show MRA extended status icons]

 [Mark protocols locked from global status changes]

 [Available view modes]

 [Include protocols]

diff --git a/langpacks/english/Plugins/Fingerprint.txt b/langpacks/english/Plugins/Fingerprint.txt
index 28005331bc..d2ca103422 100644
--- a/langpacks/english/Plugins/Fingerprint.txt
+++ b/langpacks/english/Plugins/Fingerprint.txt
@@ -19,7 +19,6 @@
 [Select protocols]

 [Facebook clients]

 [Gadu-Gadu clients]

-[ICQ clients]

 [IRC clients]

 [Jabber clients]

 [RSS clients]

@@ -44,14 +43,12 @@
 [Client not found]

 [Unknown client]

 [Undetected client]

-[ICQ overlay]

 [IRC overlay]

 [JGmail overlay]

 [JGTalk overlay]

 [Jabber overlay]

 [VK overlay]

 [Skype overlay]

-[ICQ v8.x overlay]

 [Gadu-Gadu v11 client]

 [Gadu-Gadu v10 client]

 [Gadu-Gadu v9 client]

diff --git a/langpacks/english/Plugins/HistoryPP.txt b/langpacks/english/Plugins/HistoryPP.txt
index 20ad9a467c..97e81ce88b 100644
--- a/langpacks/english/Plugins/HistoryPP.txt
+++ b/langpacks/english/Plugins/HistoryPP.txt
@@ -231,7 +231,6 @@
 [&File Actions]

 [Unknown codepage %u]

 [History++ module could not be loaded, riched20.dll is missing. Press Yes to continue loading Miranda.]

-[User %s (%d) changed ICQ client: %s]

 [Status request by %s (%d):%s]

 [Ignored status request by %s (%d):%s]

 [Artist: %s\\r\\nTitle: %s\\r\\nAlbum: %s]

diff --git a/langpacks/english/Plugins/NewAwaySys.txt b/langpacks/english/Plugins/NewAwaySys.txt
index b81f7e4305..58981bba37 100644
--- a/langpacks/english/Plugins/NewAwaySys.txt
+++ b/langpacks/english/Plugins/NewAwaySys.txt
@@ -9,7 +9,7 @@
 ;file \plugins\NewAwaySysMod\res\NewAwaySys.rc

 [Enable autoreply]

 [On event...]

-[Don't reply to ICQ contacts]

+[Don't reply to MRA contacts]

 [Save autoreply to the history]

 [Reply only when Idle]

 [Reply only when contact's message window is closed]

@@ -54,7 +54,7 @@
 [Remember last message used for a contact...]

 [Store contact autoreply/ignore settings for each status separately]

 [Use protocol specific nick for %nas_mynick%]

-[Update status messages for non-ICQ protocols every]

+[Update status messages for non-MRA protocols every]

 [seconds]

 [Don't show the message dialog for]

 [%s message for %s]

diff --git a/langpacks/english/Plugins/New_GPG.txt b/langpacks/english/Plugins/New_GPG.txt
index 4e6f402d66..aeb16e96c5 100644
--- a/langpacks/english/Plugins/New_GPG.txt
+++ b/langpacks/english/Plugins/New_GPG.txt
@@ -198,7 +198,7 @@
 [Target file exists, do you want to replace it?]

 [Capability to decrypt file not found on other side.\nRecipient may be unable to decrypt file(s).\nDo you want to encrypt file(s) anyway?]

 [File transfer warning]

-[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?]

+[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?]

 [encrypting file for transfer]

 [Choose file to export keys]

 [We have successfully exported %d public keys and all private keys.]

diff --git a/langpacks/english/Plugins/Scriver.txt b/langpacks/english/Plugins/Scriver.txt
index 16c982078d..efd64205b5 100644
--- a/langpacks/english/Plugins/Scriver.txt
+++ b/langpacks/english/Plugins/Scriver.txt
@@ -160,7 +160,7 @@
 [nick of current contact (if defined)]

 [protocol name of current contact (if defined). Account name is used when protocol supports multiple accounts]

 [user-defined account name of current contact (if defined).]

-[user ID of current contact (if defined). It is like UIN for ICQ, JID for Jabber, etc.]

+[user ID of current contact (if defined). It is like JID for Jabber, etc.]

 [path to Miranda root folder]

 [path to folder containing Miranda profiles]

 [name of current Miranda profile (filename, without extension)]

diff --git a/langpacks/english/Plugins/SimpleStatusMsg.txt b/langpacks/english/Plugins/SimpleStatusMsg.txt
index 9c73277941..19e38af526 100644
--- a/langpacks/english/Plugins/SimpleStatusMsg.txt
+++ b/langpacks/english/Plugins/SimpleStatusMsg.txt
@@ -32,7 +32,7 @@
 [Update variables in status messages every]

 [seconds]

 [Do not update variables during idle]

-[Do not update variables on ICQ status message requests]

+[Do not update variables on MRA status message requests]

 [Leave last played track's title after exiting the player]

 [Enable status messages parsing by Variables plugin]

 [Exclude %date% token from parsing (restart required)]

diff --git a/langpacks/english/Plugins/StopSpamMod.txt b/langpacks/english/Plugins/StopSpamMod.txt
index eea20e2d20..da80f788c2 100644
--- a/langpacks/english/Plugins/StopSpamMod.txt
+++ b/langpacks/english/Plugins/StopSpamMod.txt
@@ -30,7 +30,7 @@
 [Add contacts to specified group:]

 [Ignore URL in messages and auth requests]

 [Add contact to server list]

-[After congratulation (ICQ only)]

+[After congratulation (MRA only)]

 [Automatically grant authorization]

 [Request authorization from contacts which pass StopSpam test]

 [Use regex for answers checking]

diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index aa9effa7ee..58db3b1eb1 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -493,7 +493,7 @@
 [nick of current contact (if defined)]

 [protocol name of current contact (if defined). Account name is used when protocol supports multiple accounts]

 [user-defined account name of current contact (if defined).]

-[user ID of current contact (if defined). It is like UIN for ICQ, JID for Jabber, etc.]

+[user ID of current contact (if defined). It is like JID for Jabber, etc.]

 [path to Miranda root folder]

 [path to folder containing Miranda profiles]

 [name of current Miranda profile (filename, without extension)]

diff --git a/langpacks/english/Plugins/Tipper.txt b/langpacks/english/Plugins/Tipper.txt
index fb38a00dc0..37d989292b 100644
--- a/langpacks/english/Plugins/Tipper.txt
+++ b/langpacks/english/Plugins/Tipper.txt
@@ -346,7 +346,7 @@
 [DWORD timestamp to time]

 [DWORD timestamp to time difference]

 [BYTE to Yes/No]

-[BYTE to Male/Female (ICQ)]

+[BYTE to Male/Female (MRA)]

 [WORD to country name]

 [DWORD to IP address]

 [<prefix>Day|Month|Year to date]

@@ -363,4 +363,4 @@
 [BYTE timezone to time]

 [WORD to name of a day (0..6, 0 is Sunday)]

 [WORD to name of a month (1..12, 1 is January)]

-[BYTE to language (ICQ)]

+[BYTE to language (MRA)]

diff --git a/langpacks/english/Plugins/UInfoEx.txt b/langpacks/english/Plugins/UInfoEx.txt
index 339e222b86..00fa3b23f4 100644
--- a/langpacks/english/Plugins/UInfoEx.txt
+++ b/langpacks/english/Plugins/UInfoEx.txt
@@ -219,7 +219,7 @@
 ;file \plugins\UserInfoEx\src\dlg_propsheet.cpp

 [Upload details]

 [Protocol '%s' is offline]

-[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.]

+[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.]

 [Creating the image list failed!]

 [Could not find contact's protocol. Maybe it is not active!]

 [No pages have been added. Canceling dialog creation!]

@@ -229,7 +229,7 @@
 [Owner]

 [edit contact information]

 [View personal user details and more]

-[Upload ICQ details]

+[Upload MRA details]

 [Upload failed]

 [Your details were not uploaded successfully.\nThey were written to database only.]

 [updating]

@@ -439,7 +439,7 @@
 [Government]

 [High School Student]

 [Home]

-[ICQ - Providing Help]

+[MRA - Providing Help]

 [Law]

 [Managerial]

 [Manufacturing]

diff --git a/langpacks/english/Plugins/Variables.txt b/langpacks/english/Plugins/Variables.txt
index a68078bfb1..30c12c994b 100644
--- a/langpacks/english/Plugins/Variables.txt
+++ b/langpacks/english/Plugins/Variables.txt
@@ -195,5 +195,5 @@
 [x, and stores y as variable named x]

 [only stores y as variables x]

 ;file \plugins\Variables\src\stdafx.h

-[--- Special characters ---\r\n\r\nThe following characters have a special meaning in a formatting string:\r\n\r\n?<function>(<arguments>)\r\nThis will parse the function given the arguments, the result will be parsed again. Example: Today is ?cdate(yyyy/MM/dd).\r\n\r\n!<function>(<arguments>)\r\nThis will parse the function given the arguments, the result will not be parsed again. Example: Message waiting: !message(,first,rcvd,unread).\r\n\r\n%<field>%\r\nThis will parse the given field. Example: I installed Miranda at: %mirandapath%.\r\n\r\n`<string>`\r\nThis will not parse the given string, any function, field or special character in the string will shown in the result without being translated. Example: Use `%mirandapath%` to show the installation path.\r\n\r\n#<comment>\r\nThis 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\nWhenever 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(2) Using the contact function:\r\n?contact(x,y)\r\nA contact will be searched which will have value x for its property y, y can be one of the following:\r\nfirst, last, nick, email, ID or display\r\n\r\nFor example: ?contact(miranda@example.com,email) or ?contact(Miranda,nick). The contact function will return either a unique contact according to the arguments or nothing if none or multiple contacts exists with the given property.]

+[--- Special characters ---\r\n\r\nThe following characters have a special meaning in a formatting string:\r\n\r\n?<function>(<arguments>)\r\nThis will parse the function given the arguments, the result will be parsed again. Example: Today is ?cdate(yyyy/MM/dd).\r\n\r\n!<function>(<arguments>)\r\nThis will parse the function given the arguments, the result will not be parsed again. Example: Message waiting: !message(,first,rcvd,unread).\r\n\r\n%<field>%\r\nThis will parse the given field. Example: I installed Miranda at: %mirandapath%.\r\n\r\n`<string>`\r\nThis will not parse the given string, any function, field or special character in the string will shown in the result without being translated. Example: Use `%mirandapath%` to show the installation path.\r\n\r\n#<comment>\r\nThis 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\nWhenever a functions requires a contact as an argument, you can specify it in two ways:\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\nA contact will be searched which will have value x for its property y, y can be one of the following:\r\nfirst, last, nick, email, ID or display\r\n\r\nFor example: ?contact(miranda@example.com,email) or ?contact(Miranda,nick). The contact function will return either a unique contact according to the arguments or nothing if none or multiple contacts exists with the given property.]

 ;file \plugins\Variables\src\variables.cpp

diff --git a/langpacks/english/Plugins/Watrack.txt b/langpacks/english/Plugins/Watrack.txt
index 0f358b762f..3a360d50a0 100644
--- a/langpacks/english/Plugins/Watrack.txt
+++ b/langpacks/english/Plugins/Watrack.txt
@@ -152,7 +152,7 @@
 [If this option is "ON", all plugin settings saved in ini-file. They deleted from Miranda DB. Else ini-file will be deleted.]

 [If this option is "ON", plugin will try to obtain unknown music format info from player (not all players works!)]

 [If this option is "ON", xStatus changes only if "Music" xStatus was set already.]

-[If this option is "ON", xStatus doesn't depend of ICQ's status.]

+[If this option is "ON", xStatus doesn't depend of MRA's status.]

 [If this option is "ON", xStatus won't be changed when player is shut down.]

 [If this option is "ON", xStatus will be changed to "Music" and status text will be replaced by music info.]

 [If this option is "ON", one template will be used with all protocols, protocol and player (media) statuses. Template option page will be changed next time.]

@@ -232,7 +232,7 @@
 [  Refresh time (sec) is time to refresh music info and status messages. If zero, automatic refresh is disabled.\n  Only if 'Music' status was set - change your status if Music xStatus sets already.\n  Keep 'Music' xStatus - if player stopped or shutdowned, save or not 'Music' xStatus (changes to empty).\n  If text after processing is empty, the status message does not changes.\n  If settings saved in ini-file, its will be deleted from Miranda DB. Else ini-file will be deleted.]

 ["Variables" module use]

 [Acoustic]

-[Use ICQ xStatus]

+[Use MRA xStatus]

 [Winamp Track]

 [Pause Pushed]

 [-default-]