langpacks/english: update; langpacks/russian: update

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

22 files changed, 64 insertions, 32 deletions

diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index 0f06fb08ee..d71c22fa0a 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -1118,7 +1118,11 @@
 [No profile support installed!]

 [Miranda can't open that profile]

 [Miranda can't understand that profile]

-;file \src\mir_app\src\dbini.cpp

+;file \src\mir_app\src\db_events.cpp

+[Authorization request from %s%s: %s]

+[You were added by %s%s]

+[Contacts: ]

+;file \src\mir_app\src\db_ini.cpp

 [Security systems to prevent malicious changes are in place and you will be warned before every change that is made.]

 [Security systems to prevent malicious changes are in place and you will be warned before changes that are known to be unsafe.]

 [Security systems to prevent malicious changes have been disabled. You will receive no further warnings.]

@@ -1126,10 +1130,6 @@
 [This change is known to be potentially hazardous.]

 [This change is not known to be safe.]

 [Invalid setting type for '%s'. The first character of every value must be b, w, d, l, s, e, u, g, h or n.]

-;file \src\mir_app\src\dbutils.cpp

-[Authorization request from %s%s: %s]

-[You were added by %s%s]

-[Contacts: ]

 ;file \src\mir_app\src\DefaultExtraIcons.cpp

 [Chat activity]

 ;file \src\mir_app\src\extraicons.cpp

diff --git a/langpacks/english/Plugins/AvatarHistory.txt b/langpacks/english/Plugins/AvatarHistory.txt
index f8828dd406..e341d52003 100644
--- a/langpacks/english/Plugins/AvatarHistory.txt
+++ b/langpacks/english/Plugins/AvatarHistory.txt
@@ -64,11 +64,7 @@
 [Save Avatar for %s]

 [Save Avatar]

 ;file \plugins\AvatarHistory\src\AvatarHistory.cpp

-[AVH Debug]

-[Removed avatar, no avatar before... skipping]

-[Hashes are the same... skipping]

 [Avatar History: Unable to save avatar]

-[AVH Debug: File copied successfully]

 [Avatars]

 [Contact changed avatar]

 [Contact removed avatar]

@@ -91,6 +87,4 @@
 ;file \plugins\AvatarHistory\src\utils.cpp

 [Unknown Protocol]

 [Unknown UIN]

-[AVH Debug: GetOldStyleAvatarName]

 [Avatar History: Unable to create shortcut]

-[AVH Debug: Shortcut created successfully]

diff --git a/langpacks/english/Plugins/IRC.txt b/langpacks/english/Plugins/IRC.txt
index 2714d4e29c..58ed55a2ef 100644
--- a/langpacks/english/Plugins/IRC.txt
+++ b/langpacks/english/Plugins/IRC.txt
@@ -159,6 +159,11 @@
 [%u seconds]

 [CTCP PING reply from %s: %u sec(s)]

 [CTCP %s reply from %s: %s]

+[Owner]

+[Admin]

+[Op]

+[Halfop]

+[Voice]

 [Downloading list (%u%%) - %u channels]

 [Downloading list - %u channels]

 [Done: %u channels]

diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt
index c0124840ef..3d6f5810da 100644
--- a/langpacks/english/Plugins/Jabber.txt
+++ b/langpacks/english/Plugins/Jabber.txt
@@ -272,6 +272,7 @@
 [Supports Jingle]

 [Supports Roster Exchange]

 [Supports direct chat invitations (XEP-0249)]

+[Receives information about OMEMO devices]

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

 [Enter the text you see]

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

@@ -735,6 +736,7 @@
 [Show information about operating system in version replies]

 [Accept only in band incoming filetransfers (don't disclose own IP)]

 [Accept HTTP Authentication requests (XEP-0070)]

+[Use OMEMO encryption for messages if possible (placeholder)]

 [General]

 [Autoaccept multiuser chat invitations]

 [Automatically join bookmarks on login]

diff --git a/langpacks/english/Plugins/MRA.txt b/langpacks/english/Plugins/MRA.txt
index eb62be6e32..6a712bd48a 100644
--- a/langpacks/english/Plugins/MRA.txt
+++ b/langpacks/english/Plugins/MRA.txt
@@ -114,6 +114,9 @@
 [Avatars: server return HTTP code: %lu]

 [Avatars: can't open file %s, error]

 ;file \protocols\MRA\src\MraChat.cpp

+[Owners]

+[Inviter]

+[Visitors]

 [Chat plugin is required for conferences. Install it before chatting]

 [invite sender]

 [invite new members]

diff --git a/langpacks/english/Plugins/MSN.txt b/langpacks/english/Plugins/MSN.txt
index 1d6a4d69c2..bfbfb7330b 100644
--- a/langpacks/english/Plugins/MSN.txt
+++ b/langpacks/english/Plugins/MSN.txt
@@ -59,6 +59,8 @@
 [&Cancel]

 [Add]

 ;file \protocols\MSN\src\msn_chat.cpp

+[Admin]

+[User]

 [Chat #]

 [&Invite user...]

 [&Leave chat session]

diff --git a/langpacks/english/Plugins/MinecraftDynmap.txt b/langpacks/english/Plugins/MinecraftDynmap.txt
index 885466b586..bfef73338d 100644
--- a/langpacks/english/Plugins/MinecraftDynmap.txt
+++ b/langpacks/english/Plugins/MinecraftDynmap.txt
@@ -11,6 +11,8 @@
 [Visible name:]

 ;file \protocols\MinecraftDynmap\src\chat.cpp

 [Server]

+[Admin]

+[Normal]

 [You]

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

 [Message was not sent. Probably you are sending them too fast or chat is disabled completely.]

diff --git a/langpacks/english/Plugins/New_GPG.txt b/langpacks/english/Plugins/New_GPG.txt
index b0678803a7..7dac2d69a6 100644
--- a/langpacks/english/Plugins/New_GPG.txt
+++ b/langpacks/english/Plugins/New_GPG.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: New_GPG.dll

 ;  Plugin: GPG

-;  Version: 0.0.0.13

+;  Version: 0.0.0.14

 ;  Authors: sss

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

 [New GPG encryption support plugin, based on code from old GPG plugin and SecureIM.]

diff --git a/langpacks/english/Plugins/Omegle.txt b/langpacks/english/Plugins/Omegle.txt
index 0e3a4cc1b2..274c114f3a 100644
--- a/langpacks/english/Plugins/Omegle.txt
+++ b/langpacks/english/Plugins/Omegle.txt
@@ -31,6 +31,8 @@
 [Unknown command. Send '/commands' for list.]

 [You aren't connected to any stranger. Send '/help' or '/commands' for help.]

 [You can't send messages in question mode.]

+[Admin]

+[Normal]

 [Omegle is a great way of meeting new friends!]

 [You]

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

diff --git a/langpacks/english/Plugins/Twitter.txt b/langpacks/english/Plugins/Twitter.txt
index d8771ebd08..85ddf7bf65 100644
--- a/langpacks/english/Plugins/Twitter.txt
+++ b/langpacks/english/Plugins/Twitter.txt
@@ -38,6 +38,8 @@
 [But not during sign-on]

 [Enter Twitter PIN]

 [Enter the PIN provided by Twitter to complete your sign in. This is a one time process until you recreate your Miranda Twitter account.]

+;file \protocols\Twitter\src\chat.cpp

+[Normal]

 ;file \protocols\Twitter\src\connection.cpp

 [OAuth variables are out of sequence, they have been reset. Please reconnect and reauthorize Miranda to Twitter.com (do the PIN stuff again)]

 [Failed to get Twitter Access Tokens, please go offline and try again. If this keeps happening, check your internet connection.]

diff --git a/langpacks/russian/=CORE=.txt b/langpacks/russian/=CORE=.txt
index 8ac27eecfe..db060b198a 100644
--- a/langpacks/russian/=CORE=.txt
+++ b/langpacks/russian/=CORE=.txt
@@ -2107,6 +2107,12 @@ Miranda NG не может открыть '%s'\nНе установлен под
 Miranda NG не может открыть этот профиль

 [Miranda can't understand that profile]

 Miranda не может распознать этот профиль

+[Authorization request from %s%s: %s]

+Запрос авторизации от %s%s: %s

+[You were added by %s%s]

+Вас добавил %s%s

+[Contacts: ]

+Контакты:\s

 [Security systems to prevent malicious changes are in place and you will be warned before every change that is made.]

 Система безопасности для предотвращения нежелательных изменений активна и вы будете предупреждены перед каждым произведённым изменением.

 [Security systems to prevent malicious changes are in place and you will be warned before changes that are known to be unsafe.]

@@ -2121,12 +2127,6 @@ Miranda не может распознать этот профиль
 Неизвестно, будет ли изменение безопасным.

 [Invalid setting type for '%s'. The first character of every value must be b, w, d, l, s, e, u, g, h or n.]

 Неверный тип настройки для '%s'. Первая буква любого значения должна быть b, w, d, l, s, e, u, g, h или n.

-[Authorization request from %s%s: %s]

-Запрос авторизации от %s%s: %s

-[You were added by %s%s]

-Вас добавил %s%s

-[Contacts: ]

-Контакты:\s

 [Chat activity]

 Активность в чате

 [You haven't filled in the search field. Please enter a search term and try again.]

diff --git a/langpacks/russian/Plugins/AvatarHistory.txt b/langpacks/russian/Plugins/AvatarHistory.txt
index 63888f5224..8bd117126a 100644
--- a/langpacks/russian/Plugins/AvatarHistory.txt
+++ b/langpacks/russian/Plugins/AvatarHistory.txt
@@ -117,16 +117,8 @@
 Сохранить аватар для %s

 [Save Avatar]

 Сохранить аватар

-[AVH Debug]

-Отладка AVH

-[Removed avatar, no avatar before... skipping]

-Аватар удалён, нет более ранних аватаров... пропускаем

-[Hashes are the same... skipping]

-Хэши аватаров совпадают... пропускаем

 [Avatar History: Unable to save avatar]

 История аватаров: невозможно сохранить аватар

-[AVH Debug: File copied successfully]

-Отладка AVH: файл успешно скопирован

 [Avatars]

 Аватары

 [Contact changed avatar]

@@ -163,9 +155,5 @@
 Неизвестный протокол

 [Unknown UIN]

 Неизвестный номер

-[AVH Debug: GetOldStyleAvatarName]

-Отладка AVH: GetOldStyleAvatarName

 [Avatar History: Unable to create shortcut]

 История аватаров: невозможно создать ярлык

-[AVH Debug: Shortcut created successfully]

-Отладка AVH: ярлык успешно создан

diff --git a/langpacks/russian/Plugins/IRC.txt b/langpacks/russian/Plugins/IRC.txt
index 43d7e6e752..ec4da54a64 100644
--- a/langpacks/russian/Plugins/IRC.txt
+++ b/langpacks/russian/Plugins/IRC.txt
@@ -307,6 +307,16 @@ DCC: Запрос на продолжение закачки файла от %s
 СТСP PING ответ от %s: %u сек (с)

 [CTCP %s reply from %s: %s]

 СТСР %s ответ от %s: %s

+[Owner]

+Владелец

+[Admin]

+Админ

+[Op]

+Оп

+[Halfop]

+Полуоп

+[Voice]

+Войс

 [Downloading list (%u%%) - %u channels]

 Загружается список (%u%%) - %u% комнат чата

 [Downloading list - %u channels]

diff --git a/langpacks/russian/Plugins/Jabber.txt b/langpacks/russian/Plugins/Jabber.txt
index 926d9157df..0608c6a4c4 100644
--- a/langpacks/russian/Plugins/Jabber.txt
+++ b/langpacks/russian/Plugins/Jabber.txt
@@ -523,6 +523,8 @@ xHTML формат чат сообщений
 Поддержка обмена ростера

 [Supports direct chat invitations (XEP-0249)]

 Поддержка прямых приглашений в чат (XEP-0249)

+[Receives information about OMEMO devices]

+Получение сведений об устройствах OMEMO

 [Enter the text you see]

 Введите текст, который видите

 [None]

@@ -1417,6 +1419,8 @@ Jabber ошибка
 Разрешать передачу файлов только внутри потока (не раскрывать свой IP)

 [Accept HTTP Authentication requests (XEP-0070)]

 Принимать запросы аутентификации HTTP (XEP-0070)

+[Use OMEMO encryption for messages if possible (placeholder)]

+Шифровать сообщения с помощью OMEMO (если возможно) (НЕ РАБОТАЕТ!)

 [General]

 Общее

 [Autoaccept multiuser chat invitations]

diff --git a/langpacks/russian/Plugins/MRA.txt b/langpacks/russian/Plugins/MRA.txt
index de5498367d..7006ac9631 100644
--- a/langpacks/russian/Plugins/MRA.txt
+++ b/langpacks/russian/Plugins/MRA.txt
@@ -215,6 +215,10 @@ xСтатус "%s"
 Аватары: сервер вернул HTTP код: %lu

 [Avatars: can't open file %s, error]

 Аватары: невозможно открыть %s, ошибка

+[Owners]

+Владельцы

+[Visitors]

+Посетители

 [Chat plugin is required for conferences. Install it before chatting]

 Для конференций требуется плагин чата (StdChat, TabSRMM или Scriver).

 [invite sender]

diff --git a/langpacks/russian/Plugins/MSN.txt b/langpacks/russian/Plugins/MSN.txt
index bc6ee25105..a4fddac864 100644
--- a/langpacks/russian/Plugins/MSN.txt
+++ b/langpacks/russian/Plugins/MSN.txt
@@ -105,6 +105,10 @@
 О&тмена

 [Add]

 Добавить

+[Admin]

+Админ

+[User]

+Пользователь

 [Chat #]

 Чат #

 [&Invite user...]

diff --git a/langpacks/russian/Plugins/MinecraftDynmap.txt b/langpacks/russian/Plugins/MinecraftDynmap.txt
index 4ece866aea..ee5be2f035 100644
--- a/langpacks/russian/Plugins/MinecraftDynmap.txt
+++ b/langpacks/russian/Plugins/MinecraftDynmap.txt
@@ -13,6 +13,10 @@
 Видимое имя:

 [Server]

 Сервер

+[Admin]

+Админ

+[Normal]

+Нормальный

 [You]

 Вы

 [Message was not sent. Probably you are sending them too fast or chat is disabled completely.]

diff --git a/langpacks/russian/Plugins/New_GPG.txt b/langpacks/russian/Plugins/New_GPG.txt
index bbe2c5ffa4..93e3e60586 100644
--- a/langpacks/russian/Plugins/New_GPG.txt
+++ b/langpacks/russian/Plugins/New_GPG.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: New_GPG.dll

 ;  Plugin: GPG

-;  Version: 0.0.0.13

+;  Version: 0.0.0.14

 ;  Authors: sss

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

 [New GPG encryption support plugin, based on code from old GPG plugin and SecureIM.]

diff --git a/langpacks/russian/Plugins/Omegle.txt b/langpacks/russian/Plugins/Omegle.txt
index 6e35dab8f7..8138055e35 100644
--- a/langpacks/russian/Plugins/Omegle.txt
+++ b/langpacks/russian/Plugins/Omegle.txt
@@ -53,6 +53,10 @@
 Вы не подключены к незнакомцу. Наберите '/help' или '/commands' для справки.

 [You can't send messages in question mode.]

 Вы не можете отправлять сообщения в режиме вопросов.

+[Admin]

+Админ

+[Normal]

+Нормальный

 [Omegle is a great way of meeting new friends!]

 Omegle - отличный способ найти новых друзей!

 [You]

diff --git a/langpacks/russian/Plugins/Twitter.txt b/langpacks/russian/Plugins/Twitter.txt
index f7071f25fb..66e8524ad3 100644
--- a/langpacks/russian/Plugins/Twitter.txt
+++ b/langpacks/russian/Plugins/Twitter.txt
@@ -69,6 +69,8 @@ URL:
 Введите PIN-код из Twitter-а

 [Enter the PIN provided by Twitter to complete your sign in. This is a one time process until you recreate your Miranda Twitter account.]

 Введите PIN-код, предоставленный Twitter-ом, чтобы завершить процесс входа. Это нужно сделать один раз, пока вы не пересоздадите свою учётную запись в Miranda NG.

+[Normal]

+Обычный

 [OAuth variables are out of sequence, they have been reset. Please reconnect and reauthorize Miranda to Twitter.com (do the PIN stuff again)]

 Переменные OAuth потеряли последовательность и были обнулены. Пожалуйста, подсоединитесь снова и авторизуйте Miranda на Twitter.com (ещё раз с PIN-кодом)

 [Failed to get Twitter Access Tokens, please go offline and try again. If this keeps happening, check your internet connection.]

diff --git a/langpacks/russian/Untranslated/MRA.txt b/langpacks/russian/Untranslated/MRA.txt
new file mode 100644
index 0000000000..16b8a4b6c3
--- /dev/null
+++ b/langpacks/russian/Untranslated/MRA.txt
@@ -0,0 +1 @@
+[Inviter]

diff --git a/langpacks/russian/Untranslated/NotesReminders.txt b/langpacks/russian/Untranslated/NotesReminders.txt
index 737cc7c298..d5aebb26aa 100644
--- a/langpacks/russian/Untranslated/NotesReminders.txt
+++ b/langpacks/russian/Untranslated/NotesReminders.txt
@@ -1,3 +1,2 @@
 [reftime]

 [Context Menu Note Popup]

-[bVisible]