langpack/english & langpack/russian update

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

18 files changed, 111 insertions, 96 deletions

diff --git a/langpacks/english/Plugins/Dummy.txt b/langpacks/english/Plugins/Dummy.txt
index 4d1e5aaa13..f0ba8f5909 100644
--- a/langpacks/english/Plugins/Dummy.txt
+++ b/langpacks/english/Plugins/Dummy.txt
@@ -16,10 +16,10 @@
 [Allow sending messages to contacts]

 ;file \protocols\Dummy\src\dummy.h

 [Custom]

-[Screen Name]

+[Screen name]

 [User name]

 [Facebook ID]

-[Gadu-Gadu Number]

+[Gadu-Gadu number]

 [User ID]

 [ICQ number]

 [Nickname]

@@ -31,7 +31,7 @@
 [Tlen login]

 [Tox ID]

 [Username]

-[VK ID]

+[VKontakte ID]

 [WhatsApp ID]

 ;file \protocols\Dummy\src\dummy_proto.cpp

 [This Dummy account has disabled sending messages. Enable it in account options.]

diff --git a/langpacks/english/Plugins/Facebook.txt b/langpacks/english/Plugins/Facebook.txt
index 486571df7f..4a9f4ad361 100644
--- a/langpacks/english/Plugins/Facebook.txt
+++ b/langpacks/english/Plugins/Facebook.txt
@@ -26,20 +26,19 @@
 [Automatically set 'Ignore status change' flag]

 [Use bigger avatars]

 [Prefer real names instead of nicknames]

-[Event notifications]

-[Notifications]

-[News feeds (WARNING: Causes excessive network traffic!)]

+[Popup notifications]

+[Show notifications]

+[Show wall posts (news feed) (WARNING: Causes excessive network traffic!)]

 [News feed types to notify:]

 [Don't show advertising posts]

-[Other events]

-[Client notifications]

-[Friendship notifications]

-[Ticker feeds]

-[Show "On this day" posts at login]

-[Use this server for opening links:]

+[Show friendships changes (when someone remove/approve you)]

+[Show real-time friends activity (ticker feed)]

+[Show my "On this day" posts at login]

+[Chatroom logging]

+[Log notifications into special chatroom]

+[Extra]

 [Use balloon notifications in system tray instead of popups]

-[Use logging notifications into special chatroom]

-[Preview]

+[Use this server for opening links:]

 [Statuses]

 [Post Miranda statuses to Wall]

 [Turn off chat on Facebook when going to offline in Miranda]

@@ -71,6 +70,7 @@
 [&Leave chat session]

 [User &details]

 [User &history]

+[Notifications]

 ;file \protocols\FacebookRM\src\communication.cpp

 [Login error: %s]

 [Unknown error]

@@ -121,13 +121,6 @@
 [Default]

 [<< Contacts]

 [What's on your mind, %s?]

-[Sample event]

-[Sample request]

-[Sample newsfeed]

-[Sample notification]

-[Sample friendship]

-[Sample ticker]

-[Sample on this day]

 ;file \protocols\FacebookRM\src\json.cpp

 [a sticker]

 [a link]

@@ -135,6 +128,7 @@
 [a file]

 [photos]

 [a photo]

+[a GIF]

 [User sent %s:]

 [User sent an unsupported attachment. Open your browser to see it.]

 [This message is no longer available, because it was marked as abusive or spam.]

@@ -156,12 +150,17 @@
 [Messaging]

 [Share status...]

 [Own wall]

-[Loading newsfeeds...]

-[Checking friend requests...]

+[Loading wall posts...]

+[Loading friendship requests...]

+[Loading notifications...]

+[Loading what happened on this day...]

 [Do you want to cancel your friendship with '%s'?]

-[News feeds]

+[Client errors]

+[Wall posts]

+[Other events]

 [Friendship events]

-[On this day posts]

+[Real-time friends activity]

+["On this day" posts]

 [Visit profile]

 [Visit notifications]

 [Show 'Share status' window]

@@ -170,7 +169,7 @@
 [Other event]

 [Friendship event]

 [Ticker event]

-[On this day event]

+["On this day" event]

 [Message read: %s by %s]

 [Message read: %s]

 ;file \protocols\FacebookRM\src\theme.cpp

@@ -182,6 +181,12 @@
 [Conversation]

 [Message read]

 [Captcha form icon]

+[Angry]

+[Haha]

+[Like]

+[Love]

+[Sad]

+[Wow]

 [Visit friendship details]

 [Visit conversation]

 [Cancel friendship]

@@ -190,5 +195,7 @@
 [Approve friendship]

 [Deny friendship request]

 [Services...]

-[Check Friends Requests]

-[Check Newsfeeds]

+[Check friendship requests]

+[Check newsfeeds]

+[Check "On this day" posts]

+[Check notifications]

diff --git a/langpacks/english/Plugins/Steam.txt b/langpacks/english/Plugins/Steam.txt
index ea486e16b7..e5003234f6 100644
--- a/langpacks/english/Plugins/Steam.txt
+++ b/langpacks/english/Plugins/Steam.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Steam.dll

 ;  Plugin: Steam protocol

-;  Version: 0.11.5.1

+;  Version: 0.11.6.0

 ;  Authors: Miranda NG Team, Robert Pösel

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

 [Steam protocol support for Miranda NG.]

@@ -24,6 +24,7 @@
 [Enter password]

 [Save password]

 [Enter the password to continue.]

+[As an added account security measure, you'll need to grant access by entering the SMS code we've just sent to your mobile phone.]

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

 [Steam game]

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

diff --git a/langpacks/english/Plugins/VKontakte.txt b/langpacks/english/Plugins/VKontakte.txt
index b28c126bf9..1bb0dff29c 100644
--- a/langpacks/english/Plugins/VKontakte.txt
+++ b/langpacks/english/Plugins/VKontakte.txt
@@ -225,6 +225,7 @@
 [Error loading message history from server]

 [Loading messages for all contacts is completed]

 [Loading history]

+[for]

 [Loading messages for %s is completed]

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

 [Network]

diff --git a/langpacks/russian/Plugins/Dummy.txt b/langpacks/russian/Plugins/Dummy.txt
index d725e6c791..d24244b37c 100644
--- a/langpacks/russian/Plugins/Dummy.txt
+++ b/langpacks/russian/Plugins/Dummy.txt
@@ -23,11 +23,11 @@
 Разрешить отправку сообщений

 [Custom]

 Настроить

-[Screen Name]

+[Screen name]

 Ник

 [User name]

 Имя пользователя

-[Gadu-Gadu Number]

+[Gadu-Gadu number]

 Номер Gadu-Gadu

 [User ID]

 ID пользователя

diff --git a/langpacks/russian/Plugins/Facebook.txt b/langpacks/russian/Plugins/Facebook.txt
index ce81dbe2c1..c77ccbd741 100644
--- a/langpacks/russian/Plugins/Facebook.txt
+++ b/langpacks/russian/Plugins/Facebook.txt
@@ -43,34 +43,32 @@
 Большие аватары

 [Prefer real names instead of nicknames]

 Предпочитать реальные имена вместо ников

-[Event notifications]

-Уведомления

-[Notifications]

-Уведомления

-[News feeds (WARNING: Causes excessive network traffic!)]

-Новости (Предупреждение: высокое потребление сетевого трафика)

+[Popup notifications]

+Настройка уведомлений вспл. окнами

+[Show notifications]

+Показывать уведомления

+[Show wall posts (news feed) (WARNING: Causes excessive network traffic!)]

+Показывать сообщения со стены (новостная лента) (ВНИМАНИЕ: Большой расход трафика!)

 [News feed types to notify:]

 Уведомлять о типах новостей:

 [Don't show advertising posts]

 Не показывать рекламные публикации

-[Other events]

-Другие события

-[Client notifications]

-Уведомления клиента

-[Friendship notifications]

-Уведомления о дружбе

-[Ticker feeds]

-Тиккер

-[Show "On this day" posts at login]

-При входе показывать события "В этот день"

-[Use this server for opening links:]

-Тип сайта для открытия ссылок:

+[Show friendships changes (when someone remove/approve you)]

+Показывать изменения запросов дружбы (когда удалили/приняли ваш запрос)

+[Show real-time friends activity (ticker feed)]

+Показывать активность друзей в реальном времени

+[Show my "On this day" posts at login]

+Показывать сообщение "В этот день" при входе

+[Chatroom logging]

+Ведение журнала в чат-комнате

+[Log notifications into special chatroom]

+Вести журнал уведомлений в специальной чат-комнате

+[Extra]

+Дополнительно

 [Use balloon notifications in system tray instead of popups]

 Уведомлять подсказкой в трее вместо всплывающих окон

-[Use logging notifications into special chatroom]

-Запись уведомлений в специальную комнату чата

-[Preview]

-Тест

+[Use this server for opening links:]

+Тип сайта для открытия ссылок:

 [Statuses]

 Статусы

 [Post Miranda statuses to Wall]

@@ -129,6 +127,8 @@
 &Данные контакта

 [User &history]

 &История пользователя

+[Notifications]

+Уведомления

 [Login error: %s]

 Ошибка входа: %s

 [Unknown error]

@@ -219,20 +219,6 @@ SMS с кодом подтверждения отправлено на ваш м
 << Контакты

 [What's on your mind, %s?]

 О чём вы думаете, %s?

-[Sample event]

-Пример события

-[Sample request]

-Пример запроса

-[Sample newsfeed]

-Пример новости

-[Sample notification]

-Пример уведомления

-[Sample friendship]

-Пример уведомления о дружбе

-[Sample ticker]

-Пример тиккера

-[Sample on this day]

-Пример события "В этот день"

 [a sticker]

 стикер

 [a link]

@@ -281,18 +267,28 @@ SMS с кодом подтверждения отправлено на ваш м
 Статус...

 [Own wall]

 Своя стена

-[Loading newsfeeds...]

-Загрузка новостей...

-[Checking friend requests...]

-Проверка запросов дружбы...

+[Loading wall posts...]

+Загрузка записей со стены...

+[Loading friendship requests...]

+Загрузка запросов дружбы...

+[Loading notifications...]

+Загрузка уведомлений...

+[Loading what happened on this day...]

+Загрузка случившегося в этот день...

 [Do you want to cancel your friendship with '%s'?]

 Вы уверены, что хотите удалить '%s' из друзей?

-[News feeds]

-Новости

+[Client errors]

+Ошибка клиента

+[Wall posts]

+Сообщение на стене

+[Other events]

+Другие события

 [Friendship events]

 События дружбы

-[On this day posts]

-События "В этот день"

+[Real-time friends activity]

+Активность друзей в реальном времени

+["On this day" posts]

+Сообщения "В этот день"

 [Visit profile]

 Профиль на сайте

 [Visit notifications]

@@ -309,8 +305,8 @@ SMS с кодом подтверждения отправлено на ваш м
 Событие дружбы

 [Ticker event]

 Тиккер

-[On this day event]

-Событие "В этот день"

+["On this day" event]

+События "В этот день"

 [Message read: %s by %s]

 Сообщение прочтено в: %s пользователем %s

 [Message read: %s]

@@ -331,6 +327,18 @@ SMS с кодом подтверждения отправлено на ваш м
 Сообщение прочтено

 [Captcha form icon]

 Значок формы с капчей

+[Angry]

+Злой

+[Haha]

+Смешно!

+[Like]

+Нравится

+[Love]

+Любовь

+[Sad]

+Печально

+[Wow]

+Ого

 [Visit friendship details]

 Информация о дружбе

 [Visit conversation]

@@ -347,7 +355,11 @@ SMS с кодом подтверждения отправлено на ваш м
 Отклонить запрос дружбы

 [Services...]

 Службы...

-[Check Friends Requests]

+[Check friendship requests]

 Проверить запросы дружбы

-[Check Newsfeeds]

+[Check newsfeeds]

 Проверить новости

+[Check "On this day" posts]

+Проверить сообщения "В этот день"

+[Check notifications]

+Проверить уведомления

diff --git a/langpacks/russian/Plugins/MirOTR.txt b/langpacks/russian/Plugins/MirOTR.txt
index 7d4d06520c..71ea5a0a52 100644
--- a/langpacks/russian/Plugins/MirOTR.txt
+++ b/langpacks/russian/Plugins/MirOTR.txt
@@ -137,8 +137,6 @@ OTR завершён
 Частный OTR

 [OTR not secure]

 OTR не является безопасным

-[OTR]

-Шифрование

 [Refresh]

 Обновить

 [Generating new private key for protocol '%s'.\nPlease Wait...]

diff --git a/langpacks/russian/Plugins/Steam.txt b/langpacks/russian/Plugins/Steam.txt
index 6b39d7aea0..ab46538ade 100644
--- a/langpacks/russian/Plugins/Steam.txt
+++ b/langpacks/russian/Plugins/Steam.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Steam.dll

 ;  Plugin: Steam protocol

-;  Version: 0.11.5.1

+;  Version: 0.11.6.0

 ;  Authors: Miranda NG Team, Robert Pösel

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

 [Steam protocol support for Miranda NG.]

diff --git a/langpacks/russian/Plugins/VKontakte.txt b/langpacks/russian/Plugins/VKontakte.txt
index 0ffeeafc8e..2598848c58 100644
--- a/langpacks/russian/Plugins/VKontakte.txt
+++ b/langpacks/russian/Plugins/VKontakte.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: VKontakte.dll

 ;  Plugin: VKontakte protocol

-;  Version: 0.1.2.0

+;  Version: 0.1.2.1

 ;  Authors: Miranda NG Team

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

 [VKontakte protocol support for Miranda NG.]

@@ -103,6 +103,8 @@
 Репосты

 [Mentions in comments]

 Упоминания в комментариях

+[Accepted friend requests]

+Принятые запросы дружбы

 [E-mail or phone number:]

 E-mail или номер телефона:

 [Password:]

@@ -427,6 +429,8 @@ ID получателя ошибочен или неизвестен
 Загрузка сообщений для всех контактов завершена

 [Loading history]

 Загрузка истории

+[for]

+в течение

 [Loading messages for %s is completed]

 Загрузка сообщений для %s завершена

 [Network]

diff --git a/langpacks/russian/Untranslated/=CORE=.txt b/langpacks/russian/Untranslated/=CORE=.txt
index c81933486a..f01f2a3ed5 100644
--- a/langpacks/russian/Untranslated/=CORE=.txt
+++ b/langpacks/russian/Untranslated/=CORE=.txt
@@ -19,4 +19,3 @@
 [Alt + ]

 [Shift + ]

 [Win + ]

-[ID]

diff --git a/langpacks/russian/Untranslated/Dummy.txt b/langpacks/russian/Untranslated/Dummy.txt
index 8535723ba6..ca298753b6 100644
--- a/langpacks/russian/Untranslated/Dummy.txt
+++ b/langpacks/russian/Untranslated/Dummy.txt
@@ -1,9 +1,7 @@
 [Facebook ID]

-[JID]

 [Live ID]

-[ID]

 [Steam ID]

 [Tlen login]

 [Tox ID]

-[VK ID]

+[VKontakte ID]

 [WhatsApp ID]

diff --git a/langpacks/russian/Untranslated/Facebook.txt b/langpacks/russian/Untranslated/Facebook.txt
index 4d2147c4cb..f7434fbafc 100644
--- a/langpacks/russian/Untranslated/Facebook.txt
+++ b/langpacks/russian/Untranslated/Facebook.txt
@@ -1 +1,2 @@
 [URL:]

+[a GIF]

diff --git a/langpacks/russian/Untranslated/Jabber.txt b/langpacks/russian/Untranslated/Jabber.txt
index c16f2bc386..cd866cc241 100644
--- a/langpacks/russian/Untranslated/Jabber.txt
+++ b/langpacks/russian/Untranslated/Jabber.txt
@@ -3,7 +3,6 @@
 [ISDN]

 [PCS]

 [JID:]

-[JID]

 [Google Talk!]

 [League Of Legends (EU Nordic)]

 [League Of Legends (EU West)]

diff --git a/langpacks/russian/Untranslated/ListeningTo.txt b/langpacks/russian/Untranslated/ListeningTo.txt
index c2884f92e3..a5638b254e 100644
--- a/langpacks/russian/Untranslated/ListeningTo.txt
+++ b/langpacks/russian/Untranslated/ListeningTo.txt
@@ -1,5 +1,2 @@
-[Winamp (*)]

-[iTunes]

-[mRadio]

-[Miranda ListeningTo receiver]

+[Miranda ListeningTo receiver]

 [Miranda ListeningTo WMP receiver]

diff --git a/langpacks/russian/Untranslated/Sametime.txt b/langpacks/russian/Untranslated/Sametime.txt
index 06421b0e15..26a747689b 100644
--- a/langpacks/russian/Untranslated/Sametime.txt
+++ b/langpacks/russian/Untranslated/Sametime.txt
@@ -1,5 +1,4 @@
 [ID:]

-[ID]

 [Not logged in]

 [User is invalid or not trusted]

 [Already initialized]

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

+[As an added account security measure, you'll need to grant access by entering the SMS code we've just sent to your mobile phone.]

 [SteamID]

diff --git a/langpacks/russian/Untranslated/Weather.txt b/langpacks/russian/Untranslated/Weather.txt
index 309e36cc2b..22cb7d8ac1 100644
--- a/langpacks/russian/Untranslated/Weather.txt
+++ b/langpacks/russian/Untranslated/Weather.txt
@@ -1,2 +1 @@
-[ID]

-[%n   (%u)]

+[%n   (%u)]

diff --git a/langpacks/russian/Untranslated/Yahoo.txt b/langpacks/russian/Untranslated/Yahoo.txt
index bca384d102..a2b849bc3f 100644
--- a/langpacks/russian/Untranslated/Yahoo.txt
+++ b/langpacks/russian/Untranslated/Yahoo.txt
@@ -1,2 +1 @@
 [ID:]

-[ID]