- langpacks/english: update;

- langpacks/russian: update; 



git-svn-id: http://svn.miranda-ng.org/main/trunk@13373 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

11 files changed, 20 insertions, 11 deletions

diff --git a/langpacks/english/Plugins/Exchange.txt b/langpacks/english/Plugins/Exchange.txt
index fe3a55bb2c..8a5a6cc797 100644
--- a/langpacks/english/Plugins/Exchange.txt
+++ b/langpacks/english/Plugins/Exchange.txt
@@ -29,11 +29,18 @@
 [Subject]

 [Sender]

 ;file \plugins\Exchange\src\emails.cpp

+[Maximum number of retries reached.\nPlugin will stop trying to connect automatically.]

+[Server not available]

+[Server is not configured...]

 [You have %d unread emails...]

 [You have one unread email...]

+[Cannot connect to Exchange server...]

 [Exchange email]

 [Do you want to see the email headers?]

 ;file \plugins\Exchange\src\hooked_events.cpp

 [Check exchange mailbox]

 [Exchange notify]

 [Plugins]

+[Forcefully reconnecting to Exchange server ...]

+;file \plugins\Exchange\src\MirandaExchange.cpp

+[Connecting to Exchange ...]

diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt
index 7fef740dcb..f50aa65f05 100644
--- a/langpacks/english/Plugins/Jabber.txt
+++ b/langpacks/english/Plugins/Jabber.txt
@@ -769,7 +769,6 @@
 [Secure XMPP Network (old style)]

 [Google Talk!]

 [LiveJournal Talk]

-[Facebook Chat]

 [Odnoklassniki]

 [Some changes will take effect the next time you connect to the Jabber network.]

 ;file \protocols\JabberG\src\jabber_password.cpp

diff --git a/langpacks/english/Plugins/SkypeWeb.txt b/langpacks/english/Plugins/SkypeWeb.txt
index b758a4b89e..30ec58ad35 100644
--- a/langpacks/english/Plugins/SkypeWeb.txt
+++ b/langpacks/english/Plugins/SkypeWeb.txt
@@ -74,7 +74,7 @@
 ;file \protocols\SkypeWeb\src\skype_proto.cpp

 [%s connection]

 [Action]

-[Incoming Call]

 [Incoming call sound]

+[Incoming call canceled sound]

 ;file \protocols\SkypeWeb\src\skype_trouter.cpp

 [Incoming call from %s]

diff --git a/langpacks/english/Plugins/Steam.txt b/langpacks/english/Plugins/Steam.txt
index 5f766ba4bd..7194042143 100644
--- a/langpacks/english/Plugins/Steam.txt
+++ b/langpacks/english/Plugins/Steam.txt
@@ -22,7 +22,7 @@
 [Enter password]

 [Save password]

 [Enter the password to continue.]

-;file \protocols\Steam\src\stdafx.cpp

+;file \protocols\Steam\src\main.cpp

 [Steam game]

 ;file \protocols\Steam\src\steam_contacts.cpp

 [Looking to play]

diff --git a/langpacks/english/Plugins/WhatsApp.txt b/langpacks/english/Plugins/WhatsApp.txt
index 0b486175f9..656ffb71e4 100644
--- a/langpacks/english/Plugins/WhatsApp.txt
+++ b/langpacks/english/Plugins/WhatsApp.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: WhatsApp.dll

 ;  Plugin: WhatsApp protocol

-;  Version: 0.1.2.13

+;  Version: 0.1.2.14

 ;  Authors: Uli Hecht

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

 [WhatsApp protocol support for Miranda NG.]

diff --git a/langpacks/russian/Plugins/Jabber.txt b/langpacks/russian/Plugins/Jabber.txt
index 0760aad408..7b0fb1ac28 100644
--- a/langpacks/russian/Plugins/Jabber.txt
+++ b/langpacks/russian/Plugins/Jabber.txt
@@ -1467,8 +1467,6 @@ XML для MS Excel (кодировка UTF-8)
 Защищённая сеть XMPP (старый стиль)

 [LiveJournal Talk]

 ЖЖ

-[Facebook Chat]

-Чат Facebook

 [Some changes will take effect the next time you connect to the Jabber network.]

 Некоторые изменения вступят в силу после следующего подключения к сети.

 [Set New Password for %s@%S]

diff --git a/langpacks/russian/Plugins/SkypeWeb.txt b/langpacks/russian/Plugins/SkypeWeb.txt
index bce6711f22..c81bee83a6 100644
--- a/langpacks/russian/Plugins/SkypeWeb.txt
+++ b/langpacks/russian/Plugins/SkypeWeb.txt
@@ -123,9 +123,9 @@
 %s подключение

 [Action]

 Действие

-[Incoming Call]

-Входящий звонок

 [Incoming call sound]

 Звук входящего звонка

+[Incoming call canceled sound]

+Звук отмены входящего звонка

 [Incoming call from %s]

 Входящий звонок от %s

diff --git a/langpacks/russian/Plugins/Steam.txt b/langpacks/russian/Plugins/Steam.txt
index 5b649ed0ad..6b867e0c22 100644
--- a/langpacks/russian/Plugins/Steam.txt
+++ b/langpacks/russian/Plugins/Steam.txt
@@ -35,8 +35,6 @@
 Сохранить пароль

 [Enter the password to continue.]

 Введите пароль, чтобы продолжить.

-[Steam game]

-Игра Steam

 [Looking to play]

 Хотите играть

 [Looking to trade]

diff --git a/langpacks/russian/Plugins/WhatsApp.txt b/langpacks/russian/Plugins/WhatsApp.txt
index 4dfe6e6732..923e204c30 100644
--- a/langpacks/russian/Plugins/WhatsApp.txt
+++ b/langpacks/russian/Plugins/WhatsApp.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: WhatsApp.dll

 ;  Plugin: WhatsApp protocol

-;  Version: 0.1.2.13

+;  Version: 0.1.2.14

 ;  Authors: Uli Hecht

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

 [WhatsApp protocol support for Miranda NG.]

diff --git a/langpacks/russian/Untranslated/Exchange.txt b/langpacks/russian/Untranslated/Exchange.txt
new file mode 100644
index 0000000000..2ccf45cdc7
--- /dev/null
+++ b/langpacks/russian/Untranslated/Exchange.txt
@@ -0,0 +1,6 @@
+[Maximum number of retries reached.\nPlugin will stop trying to connect automatically.]

+[Server not available]

+[Server is not configured...]

+[Cannot connect to Exchange server...]

+[Forcefully reconnecting to Exchange server ...]

+[Connecting to Exchange ...]

diff --git a/langpacks/russian/Untranslated/Steam.txt b/langpacks/russian/Untranslated/Steam.txt
index 38c4f20f70..0166788c6d 100644
--- a/langpacks/russian/Untranslated/Steam.txt
+++ b/langpacks/russian/Untranslated/Steam.txt
@@ -1,2 +1,3 @@
 [Steam Guard]

+[Steam game]

 [SteamID]