english & russian langpack update

21 files changed, 124 insertions, 98 deletions

diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index 57f7f67ba2..96f3cd9314 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -996,6 +996,7 @@
 [Actively searching]

 [In love]

 [It\'s complicated]

+[In a civil union]

 [Summary]

 [Contact]

 [Location]

diff --git a/langpacks/english/Plugins/Alarms.txt b/langpacks/english/Plugins/Alarms.txt
index 168e2fa9b9..0ff576e127 100644
--- a/langpacks/english/Plugins/Alarms.txt
+++ b/langpacks/english/Plugins/Alarms.txt
@@ -45,7 +45,6 @@
 [Weekly]

 [Daily]

 [Weekdays]

-[Monthly]

 [Yearly]

 [i'm hiding]

 [Date and time]

@@ -53,6 +52,14 @@
 [Don't trigger on startup]

 [No reminder]

 [Selected days]

+[Mon]

+[Tue]

+[Wed]

+[Thu]

+[Fri]

+[Sat]

+[Sun]

+[Monthly]

 [Dismiss]

 [Snooze]

 [Static]

diff --git a/langpacks/english/Plugins/Discord.txt b/langpacks/english/Plugins/Discord.txt
index 1676bd1295..6efa5db3fb 100644
--- a/langpacks/english/Plugins/Discord.txt
+++ b/langpacks/english/Plugins/Discord.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: Discord.dll
 ;  Plugin: Discord protocol
-;  Version: 0.0.0.3
+;  Version: 0.2.0.1
 ;  Authors: George Hazan
 ;============================================================
 [Discord support for Miranda NG.]
@@ -13,9 +13,14 @@
 [Contacts]
 [Default group:]
 [Nick:]
+;file \protocols\Discord\src\dispatch.cpp
+[edited at]
+[User]
 ;file \protocols\Discord\src\options.cpp
 [Network]
 [Account]
 ;file \protocols\Discord\src\proto.cpp
 [%s server connection]
+[%s gateway connection]
 [User ID]
+[Protocol is offline or no JID]
diff --git a/langpacks/english/Plugins/Facebook.txt b/langpacks/english/Plugins/Facebook.txt
index 879556163d..cb207bf842 100644
--- a/langpacks/english/Plugins/Facebook.txt
+++ b/langpacks/english/Plugins/Facebook.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Facebook.dll

 ;  Plugin: Facebook RM

-;  Version: 0.3.0.3

+;  Version: 0.3.1.0

 ;  Authors: Michal Zelinka, Robert Pösel

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

 [Facebook protocol support for Miranda NG.]

@@ -26,7 +26,8 @@
 [Automatically set 'Ignore status change' flag]

 [Use bigger avatars]

 [Prefer real names instead of nicknames]

-[At login load also contacts you recently chat with]

+[Load also Messenger contacts at login (not only Facebook friends)]

+[Use invisible status for Facebook Pages (instead of offline)]

 [Popup notifications]

 [Show notifications]

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

diff --git a/langpacks/english/Plugins/SimpleStatusMsg.txt b/langpacks/english/Plugins/SimpleStatusMsg.txt
index f38d223800..f099dfaf45 100644
--- a/langpacks/english/Plugins/SimpleStatusMsg.txt
+++ b/langpacks/english/Plugins/SimpleStatusMsg.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: SimpleStatusMsg.dll

 ;  Plugin: Simple status message

-;  Version: 1.9.0.5

+;  Version: 1.9.0.6

 ;  Authors: Bartosz 'Dezeath' Bialek, Harven

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

 [Provides a simple way to set status and away messages.]

@@ -122,6 +122,7 @@
 [Are you sure you want to clear predefined status messages?]

 [Confirm clearing predefined]

 [<last status>]

+[Startup status]

 [Status]

 [General]

 [Advanced]

diff --git a/langpacks/english/Plugins/StatusManager.txt b/langpacks/english/Plugins/StatusManager.txt
index 7888f90a87..ccc10eabde 100644
--- a/langpacks/english/Plugins/StatusManager.txt
+++ b/langpacks/english/Plugins/StatusManager.txt
@@ -2,11 +2,19 @@
 ;============================================================
 ;  File: StatusManager.dll
 ;  Plugin: Status manager
-;  Version: 0.11.0.0
+;  Version: 0.11.2.0
 ;  Authors: P Boon
 ;============================================================
 [A connection checker and auto away module. Also allows you to define the status Miranda should set on startup, configurable per protocol.]
 ;file \plugins\StatusManager\res\resource.rc
+[Enable modules]
+[Keep status]
+[A connection checker. Automatically reconnects your accounts after protocol error or internet drop.]
+[Startup status]
+[Allows you to define the status Miranda should set on startup, configurable per account.]
+[Advanced auto away]
+[Improved Auto Away module with some more options than the built in, configurable per account.]
+[Note: Miranda NG will have to be restarted for changes to take effect.]
 [General]
 [Show popups]
 [Account connection]
@@ -133,28 +141,11 @@
 [Entering first auto-away status]
 [Entering second auto-away status]
 [Leaving first auto-away status]
-[Leaving second auto-away status]
-[Becoming active without status change]
 [Pre-conditions]
-[TriggerData]
 [Status: The status the account will change to\r\nAccount: The account changing state]
-;file \plugins\StatusManager\src\aaa_options.cpp
-[minutes of %s mode]
-[Rules]
-[Status messages]
-[Auto away]
-;file \plugins\StatusManager\src\commonstatus.cpp
-[I've been away since %time%.]
-[Give it up, I'm not in!]
-[Not right now.]
-[Give a guy some peace, would ya?]
-[I'm a chatbot!]
-[Yep, I'm here.]
-[Nope, not here.]
-[I'm hiding from the mafia.]
-[That'll be the phone.]
-[Mmm... food.]
-[idleeeeeeee]
+[TriggerData]
+[Becoming active without status change]
+[Leaving second auto-away status]
 ;file \plugins\StatusManager\src\confirmdialog.cpp
 [Set %s message for %s.]
 [<last>]
@@ -162,7 +153,14 @@
 [<n/a>]
 [Protocol]
 [Closing in %d]
-;file \plugins\StatusManager\src\keepstatus.cpp
+;file \plugins\StatusManager\src\options.cpp
+[Status manager]
+;file \plugins\StatusManager\src\AdvancedAutoAway\aaa_options.cpp
+[minutes of %s mode]
+[Rules]
+[Status messages]
+[Auto away]
+;file \plugins\StatusManager\src\KeepStatus\keepstatus.cpp
 [%s connected from another location]
 [%s login error, cancel reconnecting]
 [%s login error (next retry (%d) in %d s)]
@@ -175,13 +173,12 @@
 [No internet connection seems available... (next retry (%d) in %d s)]
 [Status was set ok]
 [Giving up]
-[Keep status]
-;file \plugins\StatusManager\src\ks_options.cpp
+;file \plugins\StatusManager\src\KeepStatus\ks_options.cpp
 [Basic]
 [Advanced]
 [You broke the Internet!]
 [Popups]
-;file \plugins\StatusManager\src\ss_options.cpp
+;file \plugins\StatusManager\src\StartupStatus\ss_options.cpp
 [<unknown>]
 [Right]
 [None]
@@ -194,10 +191,8 @@
 [default]
 [unknown]
 [At least one profile must exist]
-[Status manager]
 [Your default profile will be changed]
-[Startup status]
-;file \plugins\StatusManager\src\ss_profiles.cpp
-;file \plugins\StatusManager\src\ss_toolbars.cpp
+;file \plugins\StatusManager\src\StartupStatus\ss_profiles.cpp
+;file \plugins\StatusManager\src\StartupStatus\ss_toolbars.cpp
 [Pressed toolbar icon]
 [Released toolbar icon]
diff --git a/langpacks/english/Plugins/UInfoEx.txt b/langpacks/english/Plugins/UInfoEx.txt
index 6b525fbe77..e6549b16d4 100644
--- a/langpacks/english/Plugins/UInfoEx.txt
+++ b/langpacks/english/Plugins/UInfoEx.txt
@@ -552,6 +552,7 @@
 [Actively searching]

 [In love]

 [It\'s complicated]

+[In a civil union]

 [jun.]

 [sen.]

 ;file \plugins\UserInfoEx\src\svc_constants.h

diff --git a/langpacks/english/Plugins/VKontakte.txt b/langpacks/english/Plugins/VKontakte.txt
index 8d77086591..7ef75a1206 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.2.9

+;  Version: 0.1.2.12

 ;  Authors: Miranda NG Team

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

 [VKontakte protocol support for Miranda NG.]

@@ -84,11 +84,12 @@
 [Local settings]

 [Contact list group:]

 [Language for names and titles:]

-[Server-side delivery confirmation]

-[Use local time for received messages]

-[Automatically wipe local contacts missing in your friend list]

 [Mark message as read:]

 [Sync history on protocol online:]

+[Load last messages when message window open and  local history is empty]

+[Use local time for received messages]

+[Load only friends to local contact list]

+[Server-side delivery confirmation]

 [Bots challenge test]

 [Instruction:]

 [Submit]

diff --git a/langpacks/russian/Plugins/Alarms.txt b/langpacks/russian/Plugins/Alarms.txt
index a7b45d67e0..d0a10d3ce9 100644
--- a/langpacks/russian/Plugins/Alarms.txt
+++ b/langpacks/russian/Plugins/Alarms.txt
@@ -83,8 +83,6 @@
 Ежедневно

 [Weekdays]

 По будням

-[Monthly]

-Ежемесячно

 [Yearly]

 Ежегодно

 [i'm hiding]

@@ -99,6 +97,8 @@
 Не показывать в списке

 [Selected days]

 Выбранные дни

+[Monthly]

+Ежемесячно

 [Dismiss]

 Убрать

 [Snooze]

@@ -183,3 +183,17 @@
 Выбранное вами время - в прошлом.

 [Events]

 События

+[Mon]

+Пн

+[Tue]

+Вт

+[Wed]

+Ср

+[Thu]

+Чт

+[Fri]

+Пт

+[Sat]

+Сб

+[Sun]

+Вс
\ No newline at end of file
diff --git a/langpacks/russian/Plugins/Discord.txt b/langpacks/russian/Plugins/Discord.txt
index 5aad167e3c..6e603118ce 100644
--- a/langpacks/russian/Plugins/Discord.txt
+++ b/langpacks/russian/Plugins/Discord.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: Discord.dll
 ;  Plugin: Discord protocol
-;  Version: 0.0.0.3
+;  Version: 0.2.0.1
 ;  Authors: George Hazan
 ;============================================================
 [Discord support for Miranda NG.]
@@ -25,3 +25,7 @@
 Учётная запись
 [%s server connection]
 %s подключение к серверу
+[edited at]
+отредактировано в
+[User]
+Пользователь
diff --git a/langpacks/russian/Plugins/Facebook.txt b/langpacks/russian/Plugins/Facebook.txt
index 98ac1a77a6..4f39496795 100644
--- a/langpacks/russian/Plugins/Facebook.txt
+++ b/langpacks/russian/Plugins/Facebook.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Facebook.dll

 ;  Plugin: Facebook RM

-;  Version: 0.3.0.3

+;  Version: 0.3.1.0

 ;  Authors: Michal Zelinka, Robert Pösel

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

 [Facebook protocol support for Miranda NG.]

@@ -43,8 +43,6 @@
 Большие аватары

 [Prefer real names instead of nicknames]

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

-[At login load also contacts you recently chat with]

-При входе загружать также контакты, с которыми вы недавно общались

 [Popup notifications]

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

 [Show notifications]

diff --git a/langpacks/russian/Plugins/SimpleStatusMsg.txt b/langpacks/russian/Plugins/SimpleStatusMsg.txt
index 52afa9cf4e..6e480e8065 100644
--- a/langpacks/russian/Plugins/SimpleStatusMsg.txt
+++ b/langpacks/russian/Plugins/SimpleStatusMsg.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: SimpleStatusMsg.dll

 ;  Plugin: Simple status message

-;  Version: 1.9.0.5

+;  Version: 1.9.0.6

 ;  Authors: Bartosz 'Dezeath' Bialek, Harven

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

 [Provides a simple way to set status and away messages.]

diff --git a/langpacks/russian/Plugins/StatusManager.txt b/langpacks/russian/Plugins/StatusManager.txt
index 5f2142047b..ee0037a461 100644
--- a/langpacks/russian/Plugins/StatusManager.txt
+++ b/langpacks/russian/Plugins/StatusManager.txt
@@ -2,11 +2,17 @@
 ;============================================================
 ;  File: StatusManager.dll
 ;  Plugin: Status manager
-;  Version: 0.11.0.0
+;  Version: 0.11.2.0
 ;  Authors: P Boon
 ;============================================================
 [A connection checker and auto away module. Also allows you to define the status Miranda should set on startup, configurable per protocol.]
 Проверяет наличие подключения к сети и автоматически повторно подключает при разрывах. Предоставляет управление режимом ожидания с расширенным набором функций. Начальный статус, позволяет вам устанавливать, какой статус будет выставлен при запуске Miranda у каждого протокола.
+[Keep status]
+Повторное подключение
+[Startup status]
+Начальный статус
+[Note: Miranda NG will have to be restarted for changes to take effect.]
+Важно: Изменения вступят в силу после перезапуска программы.
 [General]
 Общее
 [Show popups]
@@ -255,36 +261,6 @@ Cтатус-профиль
 Интервал проверки (сек)
 [Pre-conditions]
 Предварительные условия
-[minutes of %s mode]
-минут режима "%s"
-[Rules]
-Правила
-[Status messages]
-Статусные сообщения
-[Auto away]
-Отсутствие
-[I've been away since %time%.]
-Отсутствую с %time%.
-[Give it up, I'm not in!]
-Ну нет меня сейчас, нет...
-[Not right now.]
-Не сейчас.
-[Give a guy some peace, would ya?]
-Прошу не тревожить...
-[I'm a chatbot!]
-Свободен.
-[Yep, I'm here.]
-Да, я здесь.
-[Nope, not here.]
-Нет, меня здесь нет.
-[I'm hiding from the mafia.]
-Я прячусь от мафии.
-[That'll be the phone.]
-Дайте же человеку поговорить по телефону.
-[Mmm... food.]
-Ммм... поесть бы.
-[idleeeeeeee]
-ожидание...
 [Set %s message for %s.]
 Установить %s сообщение для %s.
 [<last>]
@@ -297,6 +273,16 @@ Cтатус-профиль
 Протокол
 [Closing in %d]
 Закрыть (%d)
+[Status manager]
+Менеджер статусов
+[minutes of %s mode]
+минут режима "%s"
+[Rules]
+Правила
+[Status messages]
+Статусные сообщения
+[Auto away]
+Отсутствие
 [%s connected from another location]
 %s подключён из другого места
 [%s login error, cancel reconnecting]
@@ -321,8 +307,6 @@ Cтатус-профиль
 Статус установлен
 [Giving up]
 Прекращаю
-[Keep status]
-Повторное подключение
 [Basic]
 Основные
 [Advanced]
@@ -355,12 +339,8 @@ Cтатус-профиль
 неизвестно
 [At least one profile must exist]
 Минимум один профиль должен существовать
-[Status manager]
-Менеджер статусов
 [Your default profile will be changed]
 Профиль по умолчанию будет изменён
-[Startup status]
-Начальный статус
 [Pressed toolbar icon]
 Нажатый значок панели
 [Released toolbar icon]
diff --git a/langpacks/russian/Plugins/VKontakte.txt b/langpacks/russian/Plugins/VKontakte.txt
index 130a3de7ad..48527534fe 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.9

+;  Version: 0.1.2.12

 ;  Authors: Miranda NG Team

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

 [VKontakte protocol support for Miranda NG.]

@@ -161,16 +161,14 @@ E-mail или номер телефона:
 Группа в списке контактов:

 [Language for names and titles:]

 Язык для имён и названий:

-[Server-side delivery confirmation]

-Подтверждение доставки со стороны сервера

-[Use local time for received messages]

-Местное время для принятых сообщений

-[Automatically wipe local contacts missing in your friend list]

-Автоматически удалять контакты, отсутствующие в списке друзей

 [Mark message as read:]

 Помечать сообщения прочитанными:

 [Sync history on protocol online:]

 При входе синхронизировать историю:

+[Use local time for received messages]

+Местное время для принятых сообщений

+[Server-side delivery confirmation]

+Подтверждение доставки со стороны сервера

 [Bots challenge test]

 Защита от ботов

 [Instruction:]

@@ -581,3 +579,15 @@ ID получателя ошибочен или неизвестен
 \nЭто также

 [Are you sure to report abuse on %s?]

 Вы уверены, что хотите отправить жалобу на %s?

+[User restored control over own page]

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

+[User was deactivated (deleted)]

+Пользователь деактивирован (удалён)

+[User was deactivated (banned)]

+Пользователь деактивирован (забанен)

+[VK user activate/deactivate action]

+Действие активации/деактивации пользоватея ВК

+[Load last messages when message window open and  local history is empty]

+Загрузить последние сообщения если открыто окно, и локальная история пуста

+[Load only friends to local contact list]

+Добавлять в контакт лист только друзей

diff --git a/langpacks/russian/Untranslated/=CORE=.txt b/langpacks/russian/Untranslated/=CORE=.txt
index f01f2a3ed5..da523c94db 100644
--- a/langpacks/russian/Untranslated/=CORE=.txt
+++ b/langpacks/russian/Untranslated/=CORE=.txt
@@ -1,4 +1,5 @@
 [&E-mail]

+[In a civil union]

 [Browser: Back]

 [Browser: Forward]

 [Browser: Refresh]

diff --git a/langpacks/russian/Untranslated/Discord.txt b/langpacks/russian/Untranslated/Discord.txt
index c6893dbe2f..12a64af4bf 100644
--- a/langpacks/russian/Untranslated/Discord.txt
+++ b/langpacks/russian/Untranslated/Discord.txt
@@ -1 +1,3 @@
-[User ID]
+[%s gateway connection]
+[User ID]
+[Protocol is offline or no JID]
diff --git a/langpacks/russian/Untranslated/Facebook.txt b/langpacks/russian/Untranslated/Facebook.txt
index 4d2147c4cb..9976f6b177 100644
--- a/langpacks/russian/Untranslated/Facebook.txt
+++ b/langpacks/russian/Untranslated/Facebook.txt
@@ -1 +1,3 @@
 [URL:]

+[Load also Messenger contacts at login (not only Facebook friends)]

+[Use invisible status for Facebook Pages (instead of offline)]

diff --git a/langpacks/russian/Untranslated/SimpleStatusMsg.txt b/langpacks/russian/Untranslated/SimpleStatusMsg.txt
index 330caa1ae2..8602da011a 100644
--- a/langpacks/russian/Untranslated/SimpleStatusMsg.txt
+++ b/langpacks/russian/Untranslated/SimpleStatusMsg.txt
@@ -17,3 +17,4 @@
 [?upper(string)]

 [?scroll(string,numchars,numchars)]

 [<startup>]

+[Startup status]

diff --git a/langpacks/russian/Untranslated/StatusManager.txt b/langpacks/russian/Untranslated/StatusManager.txt
index b49e1f6c82..c6c4884f7e 100644
--- a/langpacks/russian/Untranslated/StatusManager.txt
+++ b/langpacks/russian/Untranslated/StatusManager.txt
@@ -1,7 +1,12 @@
-[Entering first auto-away status]
+[Enable modules]
+[A connection checker. Automatically reconnects your accounts after protocol error or internet drop.]
+[Allows you to define the status Miranda should set on startup, configurable per account.]
+[Advanced auto away]
+[Improved Auto Away module with some more options than the built in, configurable per account.]
+[Entering first auto-away status]
 [Entering second auto-away status]
 [Leaving first auto-away status]
-[Leaving second auto-away status]
-[Becoming active without status change]
-[TriggerData]
 [Status: The status the account will change to\r\nAccount: The account changing state]
+[TriggerData]
+[Becoming active without status change]
+[Leaving second auto-away status]
diff --git a/langpacks/russian/Untranslated/UInfoEx.txt b/langpacks/russian/Untranslated/UInfoEx.txt
index 4a0d059927..1d652182be 100644
--- a/langpacks/russian/Untranslated/UInfoEx.txt
+++ b/langpacks/russian/Untranslated/UInfoEx.txt
@@ -1,3 +1,4 @@
 [Enter a representative name for the e-mail address here:]

 [TmplPast Work Place]

 [TmplPast Organization]

+[In a civil union]

diff --git a/langpacks/russian/Untranslated/VKontakte.txt b/langpacks/russian/Untranslated/VKontakte.txt
index 98017f861c..4d2147c4cb 100644
--- a/langpacks/russian/Untranslated/VKontakte.txt
+++ b/langpacks/russian/Untranslated/VKontakte.txt
@@ -1,5 +1 @@
 [URL:]

-[User restored control over own page]

-[User was deactivated (deleted)]

-[User was deactivated (banned)]

-[VK user activate/deactivate action]