remove AIM support completely

8 files changed, 26 insertions, 42 deletions

diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index 258883ff9d..cb81564614 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -706,7 +706,7 @@
 [Transfer and virus scan complete]

 ;file \src\core\stdfile\src\ftmanager.cpp

 [Outgoing]

-;file \src\core\stdidle\src\idle.cpp

+;file \src\core\stdidle\src\options.cpp

 [Idle]

 ;file \src\core\stdmsg\src\chat_manager.cpp

 [Chat module]

diff --git a/langpacks/english/Plugins/AssocMgr.txt b/langpacks/english/Plugins/AssocMgr.txt
index eeafaa842d..f80a6d08fa 100644
--- a/langpacks/english/Plugins/AssocMgr.txt
+++ b/langpacks/english/Plugins/AssocMgr.txt
@@ -5,7 +5,7 @@
 ;  Version: 0.2.1.0

 ;  Authors: H. Herkenrath

 ;============================================================

-[Handles file type associations and URLs like aim, gg, mirpu, wpmsg, xmpp, ymsgr.]

+[Handles file type associations and URLs like gg, mirpu, wpmsg, xmpp, ymsgr.]

 ;file \plugins\AssocMgr\res\resource.rc

 [Registered associations for Miranda NG:]

 [Miscellaneous]

@@ -36,7 +36,6 @@
 [Access failed:\n%.64hs(%.128s)\n%.250hs(%u)\n%.256hs (%u)]

 [Registry warning]

 ;file \plugins\AssocMgr\src\test.cpp

-[AIM link protocol]

 [ICQ link shortcut]

 [&Add to contact list...]

 [Yahoo link protocol]

diff --git a/langpacks/english/Plugins/BasicHistory.txt b/langpacks/english/Plugins/BasicHistory.txt
index 32bdaaa3e7..0f5c87b4bf 100644
--- a/langpacks/english/Plugins/BasicHistory.txt
+++ b/langpacks/english/Plugins/BasicHistory.txt
@@ -40,7 +40,7 @@
 [Only outgoing messages]

 [Only selected group]

 [All contacts]

-[Export to txt]

+[Export to text file]

 [File encoding*]

 [Export to plain HTML]

 [Export to rich HTML]

diff --git a/langpacks/english/Plugins/Fingerprint.txt b/langpacks/english/Plugins/Fingerprint.txt
index 1f0cdf4185..09701fd25e 100644
--- a/langpacks/english/Plugins/Fingerprint.txt
+++ b/langpacks/english/Plugins/Fingerprint.txt
@@ -17,7 +17,6 @@
 [Unicode overlay]

 [Secure overlays]

 [Select protocols]

-[AIM clients]

 [Gadu-Gadu clients]

 [ICQ clients]

 [IRC clients]

@@ -63,7 +62,6 @@
 [Client not found]

 [Unknown client]

 [Undetected client]

-[AIM overlay]

 [ICQJ Plus Mod overlay]

 [ICQJ overlay]

 [IRC overlay]

diff --git a/langpacks/english/Plugins/Quotes.txt b/langpacks/english/Plugins/Quotes.txt
index b625fe5723..dd31a4bb95 100644
--- a/langpacks/english/Plugins/Quotes.txt
+++ b/langpacks/english/Plugins/Quotes.txt
@@ -111,7 +111,7 @@
 [Miranda could not load Quotes plugin. Microsoft HTML parser is missing.]

 ;file \plugins\Quotes\src\QuoteInfoDlg.cpp

 ;file \plugins\Quotes\src\QuotesProviderGoogle.cpp

-[Error occurred during html parsing.]

+[Error occurred during HTML parsing.]

 [Error occurred during site access.]

 ;file \plugins\Quotes\src\QuotesProviderVisitorFormatSpecificator.cpp

 [Quote Symbol]

diff --git a/langpacks/english/Plugins/Tox.txt b/langpacks/english/Plugins/Tox.txt
index b205a5e32c..1f6d1cd4c6 100644
--- a/langpacks/english/Plugins/Tox.txt
+++ b/langpacks/english/Plugins/Tox.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Tox.dll

 ;  Plugin: Tox protocol

-;  Version: 0.11.1.26

+;  Version: 0.11.3.0

 ;  Authors: Miranda NG Team

 ;============================================================

 [Tox protocol support for Miranda NG.]

@@ -24,10 +24,14 @@
 [Enable IPv6]

 [Max connect retries:]

 [Max reconnect retries:]

+[Enable UDP hole-punching]

+[Enable local network peer discovery]

+[Remove password]

+[Change password]

+[Set password]

 [If this field contains Tox address (76 hex characters), you will be prompted to add it in your friend list. Otherwise, Miranda will search this query via Tox DNS discovery.]

 [DNS name:]

 [Enter password]

-[Save password]

 [Cancel]

 [Tox profile is encrypted. Enter the password to continue.]

 [Add]

@@ -36,48 +40,25 @@
 [IPv6 address (optional)]

 [Port]

 [Public key]

-[Multimedia]

-[Audio input device]

-[Audio output device]

-[Video input device]

-[Invite contacts to chat room]

-[&Invite]

-[&Cancel]

-[Call]

-[End]

-[Incoming call]

-[Answer]

-[Reject]

-[From:]

-[Date:]

-[&User menu]

-[User &details]

-[&History]

-[Outgoing call]

-[To:]

+[Old password:]

+[New password:]

+[Confirm password:]

 ;file \protocols\Tox\src\main.cpp

-[Current version of plugin is support Tox API version %i.%i.%i which is incompatible with %s]

-;file \protocols\Tox\src\tox_connection.cpp

-[Unable to initialize Tox core]

-;file \protocols\Tox\src\tox_events.cpp

 [Profiles folder]

 [Tox URI scheme]

-[Action]

+;file \protocols\Tox\src\tox_connection.cpp

+[Unable to initialize Tox core]

 ;file \protocols\Tox\src\tox_icons.cpp

 [Protocol icon]

-[Audio call]

-[Audio ring]

-[Audio start]

-[Audio end]

 [Protocols]

 ;file \protocols\Tox\src\tox_menus.cpp

 [Request authorization]

 [Grant authorization]

+[Password]

+[Create password]

 ;file \protocols\Tox\src\tox_messages.cpp

+[Action]

 [You cannot send when you are offline.]

-;file \protocols\Tox\src\tox_multimedia.cpp

-[Incoming call from %s]

-[Outgoing call to %s]

 ;file \protocols\Tox\src\tox_netlib.cpp

 [%s connection]

 ;file \protocols\Tox\src\tox_options.cpp

@@ -102,6 +83,10 @@
 [Unable to open Tox profile]

 [Unable to read Tox profile]

 [Unable to decrypt Tox profile]

+[Removing the password will lead to decryption of the profile.\r\nAre you sure to remove password?]

+[New password is empty]

+[New password is not equal to confirmation]

+[Old password is not valid]

 ;file \protocols\Tox\src\tox_proto.cpp

 [You cannot add yourself to your contact list]

 [Contact already in your contact list]

diff --git a/langpacks/english/Plugins/VKontakte.txt b/langpacks/english/Plugins/VKontakte.txt
index d6478f64f8..ce96b0c70b 100644
--- a/langpacks/english/Plugins/VKontakte.txt
+++ b/langpacks/english/Plugins/VKontakte.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: VKontakte.dll

 ;  Plugin: VKontakte protocol

-;  Version: 0.1.3.0

+;  Version: 0.1.4.0

 ;  Authors: Miranda NG Team

 ;============================================================

 [VKontakte protocol support for Miranda NG.]

@@ -129,6 +129,7 @@
 [Can't send messages for users from blacklist]

 [Can't send messages for users without dialogs]

 [Can't send messages to this user due to their privacy settings]

+[Message is too long]

 [Enter the missing digits between %s and %s of the phone number linked to your account]

 [Attention!]

 [Enter confirmation code]

@@ -244,6 +245,8 @@
 [Error loading message history for %s from server.]

 [Loading messages for %s is completed.]

 ;file \protocols\VKontakte\src\vk_messages.cpp

+[Edited message:\n]

+[\nOriginal message:\n]

 ;file \protocols\VKontakte\src\vk_options.cpp

 [Network]

 [Account]

diff --git a/langpacks/english/Plugins/YAMN.txt b/langpacks/english/Plugins/YAMN.txt
index eda60b3db0..3b444d853a 100644
--- a/langpacks/english/Plugins/YAMN.txt
+++ b/langpacks/english/Plugins/YAMN.txt
@@ -11,7 +11,6 @@
 [Version:]

 [Description:]

 [Copyright:]

-[E-mail:]

 [Homepage:]

 [Account]

 [Name:]