From a9ec56a9a7d7a62d28d63c91088be9dfc66002d0 Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Thu, 26 Mar 2015 23:05:14 +0000 Subject: - langpacks/english: update; - langpacks/russian: update; git-svn-id: http://svn.miranda-ng.org/main/trunk@12517 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- langpacks/russian/Plugins/Import.txt | 8 -------- langpacks/russian/Plugins/Jabber.txt | 4 ++-- langpacks/russian/Plugins/MirOTR.txt | 8 ++------ langpacks/russian/Plugins/NewXstatusNotify.txt | 2 +- langpacks/russian/Plugins/VKontakte.txt | 2 +- langpacks/russian/Untranslated/=CORE=.txt | 19 +++++++++++++++++++ langpacks/russian/Untranslated/MirOTR.txt | 20 +++++++++++++++++--- 7 files changed, 42 insertions(+), 21 deletions(-) (limited to 'langpacks/russian') diff --git a/langpacks/russian/Plugins/Import.txt b/langpacks/russian/Plugins/Import.txt index 983d2b2563..79b6513b4d 100644 --- a/langpacks/russian/Plugins/Import.txt +++ b/langpacks/russian/Plugins/Import.txt @@ -45,20 +45,12 @@ Miranda нашла следующие профили. Выберите проф < &Назад [Import all settings, contacts and all messages] Импортировать все настройки, контакты и сообщения -[Makes precise copy of the original profile] -Создаёт точную копию оригинального профиля [Import all contacts and all messages] Импортировать все контакты и сообщения -[Select this if you want to import as much data as possible. This is the recommended option.] -Выберите эту опцию, чтобы импортировать как можно больше данных (рекомендуется). [Only import contacts] Импортировать только контакты -[Select this if you want to import contacts but don't want to import any message history.] -Выберите эту опцию, чтобы импортировать только контакты (без истории сообщений). [Custom import] Импорт вручную -[Select this if you want to customize what to import.] -Выберите эту опцию, чтобы указать, что именно импортировать [New contacts && groups] Новые контакты и группы [System history] diff --git a/langpacks/russian/Plugins/Jabber.txt b/langpacks/russian/Plugins/Jabber.txt index e9610acfd6..9525e744b1 100644 --- a/langpacks/russian/Plugins/Jabber.txt +++ b/langpacks/russian/Plugins/Jabber.txt @@ -759,6 +759,8 @@ Jabber ошибка Ошибка запроса информации [Items request error] Ошибка запроса значений +[Set filter...] +Фильтр... [First Name] Имя [Last Name] @@ -2193,5 +2195,3 @@ Jabber vCard: редактирование телефона Настроения [Activities] Занятия -[Set filter...] -Фильтр... diff --git a/langpacks/russian/Plugins/MirOTR.txt b/langpacks/russian/Plugins/MirOTR.txt index 135e2f0bfe..d6c8fe9196 100644 --- a/langpacks/russian/Plugins/MirOTR.txt +++ b/langpacks/russian/Plugins/MirOTR.txt @@ -123,12 +123,6 @@ OTR-шифрование: завершено OTR не может шифровать во время отправки сообщения [OTR Information] Информация OTR -[Authentication from %s] -Идентификация от %s -[Authenticate %s] -Идентификация %s -[Unknown] -Неизвестно [OTR encrypted session with '%s' is now using a VERIFIED fingerprint] Шифрованная сессия с '%s' теперь использует ПРОВЕРЕННЫЙ отпечаток. [OTR encrypted session with '%s' is now using a NOT VERIFIED fingerprint] @@ -243,3 +237,5 @@ OTR: установлен SecureIM Личные данные [Services] Службы +['(Unknown contact)'] +'(Неизвестный контакт)' diff --git a/langpacks/russian/Plugins/NewXstatusNotify.txt b/langpacks/russian/Plugins/NewXstatusNotify.txt index 130fcac85a..f31426d335 100644 --- a/langpacks/russian/Plugins/NewXstatusNotify.txt +++ b/langpacks/russian/Plugins/NewXstatusNotify.txt @@ -2,7 +2,7 @@ ;============================================================ ; File: NewXstatusNotify.dll ; Plugin: xStatus notify -; Version: 1.4.0.10 +; Version: 1.4.0.11 ; Authors: Luca Santarelli, Vasilich, yaho ;============================================================ [Notifies you when a contact changes his/her (X)status or status message.] diff --git a/langpacks/russian/Plugins/VKontakte.txt b/langpacks/russian/Plugins/VKontakte.txt index 0d7c38dc3c..2d32400bdf 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.0.51 +; Version: 0.1.0.52 ; Authors: Miranda NG Team ;============================================================ [VKontakte protocol support for Miranda NG.] diff --git a/langpacks/russian/Untranslated/=CORE=.txt b/langpacks/russian/Untranslated/=CORE=.txt index 849b5f2cff..082a9a2b1c 100644 --- a/langpacks/russian/Untranslated/=CORE=.txt +++ b/langpacks/russian/Untranslated/=CORE=.txt @@ -1,5 +1,24 @@ [&E-mail] +[Account] [ID] +[Browser: Back] +[Browser: Forward] +[Browser: Refresh] +[Browser: Stop] +[Browser: Search] +[Browser: Fav] +[Browser: Home] +[Mute] +[Vol-] +[Vol+] +[Media: Next Track] +[Media: Prev. Track] +[Media: Stop] +[Media: Play/Pause] +[Mail] +[Media: Select] +[App 1] +[App 2] [Ctrl + ] [Alt + ] [Shift + ] diff --git a/langpacks/russian/Untranslated/MirOTR.txt b/langpacks/russian/Untranslated/MirOTR.txt index 028aa4e888..a504b8a7b8 100644 --- a/langpacks/russian/Untranslated/MirOTR.txt +++ b/langpacks/russian/Untranslated/MirOTR.txt @@ -1,3 +1,17 @@ -[[OTR INFO] ] -[OTR: %s (%s)] -[OTR %s (%s)] +[don't rely on the prefix, always check the OTR status icon] +[[OTR INFO] ] +[ [v%i]] +[\nusing older protocol version %i] +[Attempting to start a private conversation...] +[An error occurred when encrypting your message.\nThe message was not sent] +['%s' has already closed his/her private connection to you; you should do the same] +[Error setting up private conversation: %s] +[Malformed message received] +[We are receiving our own OTR messages.\nYou are either trying to talk to yourself, or someone is reflecting your messages back at you] +[The last message to '%s' was resent] +[The encrypted message received from '%s' is unreadable, as you are not currently communicating privately] +[We received an unreadable encrypted message from '%s'] +[We received a malformed data message from '%s'] +[The following message received from '%s' was NOT encrypted: [%s]] +['%s' has sent a message intended for a different session. If you are logged in multiple times, another session may have received the message.] +[unknown OTR message received, please report that to Miranda NG] -- cgit v1.2.3