From fb87cde37056856441803673a322785cc9c71684 Mon Sep 17 00:00:00 2001
From: Vadim Dashevskiy <watcherhd@gmail.com>
Date: Mon, 17 Jun 2013 10:00:55 +0000
Subject: - langpacks/english: updated

git-svn-id: http://svn.miranda-ng.org/main/trunk@4997 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 langpacks/english/Langpack_english.txt      | 144 +++++++++++++++++++++-------
 langpacks/english/Plugins/CryptoPP.txt      |   2 +-
 langpacks/english/Plugins/Facebook.txt      |   1 -
 langpacks/english/Plugins/Jabber.txt        |   2 +-
 langpacks/english/Plugins/PluginUpdater.txt |   2 +-
 langpacks/english/Plugins/Skype.txt         |  95 +++++++++++-------
 langpacks/english/Plugins/WhatsApp.txt      |  42 ++++++++
 7 files changed, 216 insertions(+), 72 deletions(-)
 create mode 100644 langpacks/english/Plugins/WhatsApp.txt

(limited to 'langpacks/english')

diff --git a/langpacks/english/Langpack_english.txt b/langpacks/english/Langpack_english.txt
index ecc4dd2921..a10315c9db 100644
--- a/langpacks/english/Langpack_english.txt
+++ b/langpacks/english/Langpack_english.txt
@@ -4978,7 +4978,7 @@
 ;============================================================
 ;  File: CryptoPP.dll
 ;  Plugin: Crypto++
-;  Version: 1.0.4.5
+;  Version: 1.0.4.6
 ;  Authors: Baloo
 ;============================================================
 [Crypto++ library for SecureIM plugin.]
@@ -5804,7 +5804,6 @@
 [Request friendship]
 [Approve friendship]
 [Mind...]
-[Visit Profile]
 [Services...]
 [Refresh Buddy List]
 [Services]
@@ -9722,7 +9721,7 @@
 [Affiliation changes]
 [Role changes]
 [Status changes]
-[Filter history messages]
+[Don't notify history messages]
 [JID]
 [Nick Name]
 [Group]
@@ -13146,7 +13145,7 @@
 ;============================================================
 ;  File: PluginUpdater.dll
 ;  Plugin: Plugin updater
-;  Version: 0.1.1.1
+;  Version: 0.1.1.2
 ;  Authors: Mataes, George Hazan
 ;============================================================
 [Plugin updater for Miranda NG.]
@@ -15197,22 +15196,37 @@
 ;============================================================
 ;  File: Skype.dll
 ;  Plugin: Skype Protocol
-;  Version: 0.0.0.1
-;  Authors: Unsane, Mataes
+;  Version: 0.11.0.1
+;  Authors: unsane, mataes, ghazan
 ;============================================================
 [Skype protocol support for Miranda NG.]
 ;file \protocols\Skype\res\Resource.rc
-[Invite Contact To Chat]
+[Invite contacts to conference]
 [sid]
 [&Invite]
 [&Cancel]
 [Add]
+[Create conference]
+[Skype name:]
+[&Create]
+[Topic:]
+[Guidline:]
+[Enable joining]
+[Users joining as:]
+[Create with password]
+[Password:]
+[Confirmation:]
+[Password hint:]
+[Configure conference]
+[&OK]
+[Join role:]
+[Set password]
+[Hint:]
 [Enter password]
 [Enter a password for skype name %d:]
 [Remember this session password]
 [OK]
 [Cancel]
-[Skype name:]
 [Status text:]
 [Online since:]
 [Last event date:]
@@ -15235,23 +15249,17 @@
 [Country:]
 [Timezone:]
 [Change password]
-[Old password]
-[New password]
-[Confirmation]
-[Password:]
+[Old password:]
+[New password:]
 [Register new account]
-[User Details]
-[Skype login:]
+[Account]
 [Connection]
 [Use port]
 [for incoming connections]
 [Use ports 80 and 443 as alternative incoming]
 [Default group:]
 ;file \protocols\Skype\src\skype.cpp
-[Proccess SkypeKit.exe did not start.]
-[Initialization key corrupted or not valid.]
-[SkypeKit did not initialize.]
-[SkypeKit did not start.]
+[Did not unpack SkypeKit.exe.]
 ;file \protocols\Skype\src\skype_account.cpp
 [LOGOUT_CALLED]
 [HTTPS_PROXY_AUTH_FAILED]
@@ -15286,44 +15294,67 @@
 [New password was exactly the same as old one]
 [The new password was unacceptable]
 [Account was currently not logged in]
-[You have not entered a Skype name.\n						Configure this in Options->Network->Skype and try again.]
+[You have not entered a Skype name.\nConfigure this in Options->Network->Skype and try again.]
 ;file \protocols\Skype\src\skype_chat.cpp
-[&Invite user...]
-[&Leave chat session]
-[User &details]
-[User &history]
+[&User details]
+[&Request auth]
+[Invite to conference]
+[Set &role]
+[&Master]
+[&Helper]
+[&User]
+[&Listener]
+[&Add]
+[&Kick]
+[Outlaw (&ban)]
+[Copy &skypename]
+[Copy room &uri]
+[me]
+[Incoming group call received]
+[Incoming group call finished]
+[You did not select any contact]
+[Hi! I'd like to add you to my contact list]
 ;file \protocols\Skype\src\skype_contacts.cpp
 [Contact already in your contact list]
+[Contacts received]
 ;file \protocols\Skype\src\skype_dialogs.cpp
 [Enter a password for Skype Name %s:]
+[Password can't be empty.]
+[Old password is not correct.]
+[New password is same as old password.]
+[New password and confirmation must be same.]
 [<not specified>]
 [Male]
 [Female]
 [You are not currently connected to the Skype network. You must be online in order to update your information on the server.]
+;file \protocols\Skype\src\skype_events.cpp
+[Spawn conference]
+[Network]
 [Contacts]
 [Home]
 [General]
-[You did not select any contact]
-;file \protocols\Skype\src\skype_events.cpp
-[Network]
-[Account]
-[Incoming call]
+[Incoming call received]
+[Incoming call from %s. Use offical skype for calling.]
 ;file \protocols\Skype\src\skype_icons.cpp
 [Protocol icon]
 [Call]
-[Invite to conference]
-[Revoke authorization]
-[Request authorization]
-[Grant authorization]
+[Send contact]
 [Protocols]
 ;file \protocols\Skype\src\skype_instances.cpp
-[SkypeKit will only permit you to login to one account at a time. 						  Adding multiple instances of SkypeKit is prohibited in the licence 						  agreement and standard distribution terms.]
+[SkypeKit will only permit you to login to one account at a time.\nAdding multiple instances of SkypeKit is prohibited in the licence agreement and standard distribution terms.]
+[Initialization key corrupted or not valid.]
+[SkypeKit did not initialize (%d).]
+[SkypeKit did not start.]
 ;file \protocols\Skype\src\skype_menus.cpp
-[Hi! I'd like to add you to my contact list]
+[Revoke authorization]
+[Request authorization]
+[Grant authorization]
+;file \protocols\Skype\src\skype_messages.cpp
+[Incoming call finished]
 ;file \protocols\Skype\src\skype_netlib.cpp
 [%s connection]
 ;file \protocols\Skype\src\skype_proto.cpp
-[g_skype Name]
+[Skype Name]
 ;file \protocols\Skype\src\skype_utils.cpp
 [NOT_VALIDATED]
 [Validation succeeded]
@@ -15337,7 +15368,6 @@
 [Password is too simple]
 [Value starts with an invalid character]
 [Avatars]
-[Skype Protocol]
 #muuid {2925520b-6677-4658-8bad-5661d13e4692}
 ;============================================================
 ;  File: SkypeStatusChange.dll
@@ -19643,6 +19673,48 @@
 [Retrieving new data, please wait...]
 [More Info]
 [No information available.\r\nPlease update weather condition first.]
+#muuid {4f1ff7fa-4d75-44b9-93b0-2ced2e4f9e3e}
+;============================================================
+;  File: WhatsApp.dll
+;  Plugin: WhatsApp
+;  Version: 0.0.2.0
+;  Authors: Uli Hecht
+;============================================================
+[WhatsApp protocol support for Miranda NG.]
+;file \protocols\WhatsApp\res\whatsapp.rc
+[Phone-Number]
+[Including country code, without '+' or '00']
+[Nickname]
+[Request Code]
+[Register Code]
+[SMS-Code:]
+[Will only be used for registration]
+[Use SSL connection (443 port)]
+[WhatsApp]
+[Cancel]
+[OK]
+;file \protocols\WhatsApp\src\connection.cpp
+[Please enter a country-code.]
+[Please enter a phone-number without country code.]
+[Please enter a nickname.]
+[Please enter a password.]
+;file \protocols\WhatsApp\src\dialogs.cpp
+[An SMS with registration-code will be sent to your mobile phone.\nNotice that you are not able to use the real WhatsApp and this plugin simultaneousley!\nContinue?]
+[Please correctly specify your registration code received by SMS]
+[Your password has been set automatically.\nIf you change your password manually you may lose it and need to request a new code!]
+;file \protocols\WhatsApp\src\proto.cpp
+[%s server connection]
+[Unable to get Netlib connection for WhatsApp]
+[Network-connection error.]
+;file \protocols\WhatsApp\src\theme.cpp
+[WhatsApp Icon]
+[Add To Group]
+[Create Chat Group]
+[Remove From Chat Group]
+[Leave And Delete Group]
+[Leave Group]
+[Change Group Subject]
+[Create Group]
 #muuid {2ff96c84-b0b5-470e-bbf9-907b9f3f5d2f}
 ;============================================================
 ;  File: WhenWasIt.dll
diff --git a/langpacks/english/Plugins/CryptoPP.txt b/langpacks/english/Plugins/CryptoPP.txt
index 8e929d4101..c5ca14baee 100644
--- a/langpacks/english/Plugins/CryptoPP.txt
+++ b/langpacks/english/Plugins/CryptoPP.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: CryptoPP.dll
 ;  Plugin: Crypto++
-;  Version: 1.0.4.5
+;  Version: 1.0.4.6
 ;  Authors: Baloo
 ;============================================================
 [Crypto++ library for SecureIM plugin.]
diff --git a/langpacks/english/Plugins/Facebook.txt b/langpacks/english/Plugins/Facebook.txt
index 9715a39b94..74ccd7fd1c 100644
--- a/langpacks/english/Plugins/Facebook.txt
+++ b/langpacks/english/Plugins/Facebook.txt
@@ -126,7 +126,6 @@
 [Request friendship]
 [Approve friendship]
 [Mind...]
-[Visit Profile]
 [Services...]
 [Refresh Buddy List]
 [Services]
diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt
index 8bfaa719e5..7773ec10d0 100644
--- a/langpacks/english/Plugins/Jabber.txt
+++ b/langpacks/english/Plugins/Jabber.txt
@@ -912,7 +912,7 @@
 [Affiliation changes]
 [Role changes]
 [Status changes]
-[Filter history messages]
+[Don't notify history messages]
 [JID]
 [Nick Name]
 [Group]
diff --git a/langpacks/english/Plugins/PluginUpdater.txt b/langpacks/english/Plugins/PluginUpdater.txt
index b7fe24b756..7434de1c5d 100644
--- a/langpacks/english/Plugins/PluginUpdater.txt
+++ b/langpacks/english/Plugins/PluginUpdater.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: PluginUpdater.dll
 ;  Plugin: Plugin updater
-;  Version: 0.1.1.1
+;  Version: 0.1.1.2
 ;  Authors: Mataes, George Hazan
 ;============================================================
 [Plugin updater for Miranda NG.]
diff --git a/langpacks/english/Plugins/Skype.txt b/langpacks/english/Plugins/Skype.txt
index 9ce08b7545..18869c4529 100644
--- a/langpacks/english/Plugins/Skype.txt
+++ b/langpacks/english/Plugins/Skype.txt
@@ -2,22 +2,37 @@
 ;============================================================
 ;  File: Skype.dll
 ;  Plugin: Skype Protocol
-;  Version: 0.0.0.1
-;  Authors: Unsane, Mataes
+;  Version: 0.11.0.1
+;  Authors: unsane, mataes, ghazan
 ;============================================================
 [Skype protocol support for Miranda NG.]
 ;file \protocols\Skype\res\Resource.rc
-[Invite Contact To Chat]
+[Invite contacts to conference]
 [sid]
 [&Invite]
 [&Cancel]
 [Add]
+[Create conference]
+[Skype name:]
+[&Create]
+[Topic:]
+[Guidline:]
+[Enable joining]
+[Users joining as:]
+[Create with password]
+[Password:]
+[Confirmation:]
+[Password hint:]
+[Configure conference]
+[&OK]
+[Join role:]
+[Set password]
+[Hint:]
 [Enter password]
 [Enter a password for skype name %d:]
 [Remember this session password]
 [OK]
 [Cancel]
-[Skype name:]
 [Status text:]
 [Online since:]
 [Last event date:]
@@ -40,23 +55,17 @@
 [Country:]
 [Timezone:]
 [Change password]
-[Old password]
-[New password]
-[Confirmation]
-[Password:]
+[Old password:]
+[New password:]
 [Register new account]
-[User Details]
-[Skype login:]
+[Account]
 [Connection]
 [Use port]
 [for incoming connections]
 [Use ports 80 and 443 as alternative incoming]
 [Default group:]
 ;file \protocols\Skype\src\skype.cpp
-[Proccess SkypeKit.exe did not start.]
-[Initialization key corrupted or not valid.]
-[SkypeKit did not initialize.]
-[SkypeKit did not start.]
+[Did not unpack SkypeKit.exe.]
 ;file \protocols\Skype\src\skype_account.cpp
 [LOGOUT_CALLED]
 [HTTPS_PROXY_AUTH_FAILED]
@@ -91,44 +100,67 @@
 [New password was exactly the same as old one]
 [The new password was unacceptable]
 [Account was currently not logged in]
-[You have not entered a Skype name.\n						Configure this in Options->Network->Skype and try again.]
+[You have not entered a Skype name.\nConfigure this in Options->Network->Skype and try again.]
 ;file \protocols\Skype\src\skype_chat.cpp
-[&Invite user...]
-[&Leave chat session]
-[User &details]
-[User &history]
+[&User details]
+[&Request auth]
+[Invite to conference]
+[Set &role]
+[&Master]
+[&Helper]
+[&User]
+[&Listener]
+[&Add]
+[&Kick]
+[Outlaw (&ban)]
+[Copy &skypename]
+[Copy room &uri]
+[me]
+[Incoming group call received]
+[Incoming group call finished]
+[You did not select any contact]
+[Hi! I'd like to add you to my contact list]
 ;file \protocols\Skype\src\skype_contacts.cpp
 [Contact already in your contact list]
+[Contacts received]
 ;file \protocols\Skype\src\skype_dialogs.cpp
 [Enter a password for Skype Name %s:]
+[Password can't be empty.]
+[Old password is not correct.]
+[New password is same as old password.]
+[New password and confirmation must be same.]
 [<not specified>]
 [Male]
 [Female]
 [You are not currently connected to the Skype network. You must be online in order to update your information on the server.]
+;file \protocols\Skype\src\skype_events.cpp
+[Spawn conference]
+[Network]
 [Contacts]
 [Home]
 [General]
-[You did not select any contact]
-;file \protocols\Skype\src\skype_events.cpp
-[Network]
-[Account]
-[Incoming call]
+[Incoming call received]
+[Incoming call from %s. Use offical skype for calling.]
 ;file \protocols\Skype\src\skype_icons.cpp
 [Protocol icon]
 [Call]
-[Invite to conference]
-[Revoke authorization]
-[Request authorization]
-[Grant authorization]
+[Send contact]
 [Protocols]
 ;file \protocols\Skype\src\skype_instances.cpp
-[SkypeKit will only permit you to login to one account at a time. 						  Adding multiple instances of SkypeKit is prohibited in the licence 						  agreement and standard distribution terms.]
+[SkypeKit will only permit you to login to one account at a time.\nAdding multiple instances of SkypeKit is prohibited in the licence agreement and standard distribution terms.]
+[Initialization key corrupted or not valid.]
+[SkypeKit did not initialize (%d).]
+[SkypeKit did not start.]
 ;file \protocols\Skype\src\skype_menus.cpp
-[Hi! I'd like to add you to my contact list]
+[Revoke authorization]
+[Request authorization]
+[Grant authorization]
+;file \protocols\Skype\src\skype_messages.cpp
+[Incoming call finished]
 ;file \protocols\Skype\src\skype_netlib.cpp
 [%s connection]
 ;file \protocols\Skype\src\skype_proto.cpp
-[g_skype Name]
+[Skype Name]
 ;file \protocols\Skype\src\skype_utils.cpp
 [NOT_VALIDATED]
 [Validation succeeded]
@@ -142,4 +174,3 @@
 [Password is too simple]
 [Value starts with an invalid character]
 [Avatars]
-[Skype Protocol]
diff --git a/langpacks/english/Plugins/WhatsApp.txt b/langpacks/english/Plugins/WhatsApp.txt
new file mode 100644
index 0000000000..b6047aa602
--- /dev/null
+++ b/langpacks/english/Plugins/WhatsApp.txt
@@ -0,0 +1,42 @@
+#muuid {4f1ff7fa-4d75-44b9-93b0-2ced2e4f9e3e}
+;============================================================
+;  File: WhatsApp.dll
+;  Plugin: WhatsApp
+;  Version: 0.0.2.0
+;  Authors: Uli Hecht
+;============================================================
+[WhatsApp protocol support for Miranda NG.]
+;file \protocols\WhatsApp\res\whatsapp.rc
+[Phone-Number]
+[Including country code, without '+' or '00']
+[Nickname]
+[Request Code]
+[Register Code]
+[SMS-Code:]
+[Will only be used for registration]
+[Use SSL connection (443 port)]
+[WhatsApp]
+[Cancel]
+[OK]
+;file \protocols\WhatsApp\src\connection.cpp
+[Please enter a country-code.]
+[Please enter a phone-number without country code.]
+[Please enter a nickname.]
+[Please enter a password.]
+;file \protocols\WhatsApp\src\dialogs.cpp
+[An SMS with registration-code will be sent to your mobile phone.\nNotice that you are not able to use the real WhatsApp and this plugin simultaneousley!\nContinue?]
+[Please correctly specify your registration code received by SMS]
+[Your password has been set automatically.\nIf you change your password manually you may lose it and need to request a new code!]
+;file \protocols\WhatsApp\src\proto.cpp
+[%s server connection]
+[Unable to get Netlib connection for WhatsApp]
+[Network-connection error.]
+;file \protocols\WhatsApp\src\theme.cpp
+[WhatsApp Icon]
+[Add To Group]
+[Create Chat Group]
+[Remove From Chat Group]
+[Leave And Delete Group]
+[Leave Group]
+[Change Group Subject]
+[Create Group]
-- 
cgit v1.2.3