From 5452f92d9270cdbb23e9c28a9ea202d73d8d810c Mon Sep 17 00:00:00 2001 From: Konstantin Nikulin Date: Sat, 5 Mar 2016 10:40:19 +0000 Subject: langpack/english & langpacks/russian updated git-svn-id: http://svn.miranda-ng.org/main/trunk@16428 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- langpacks/english/Plugins/Db_autobackups.txt | 3 +- langpacks/english/Plugins/Dropbox.txt | 6 ++- langpacks/english/Plugins/Import.txt | 2 +- langpacks/english/Plugins/Jabber.txt | 1 + langpacks/english/Plugins/SmileyAdd.txt | 9 ++-- langpacks/english/Plugins/UInfoEx.txt | 12 ++--- langpacks/english/Plugins/VKontakte.txt | 8 ++- langpacks/russian/Plugins/Db_autobackups.txt | 4 +- langpacks/russian/Plugins/Dropbox.txt | 8 +-- langpacks/russian/Plugins/Import.txt | 2 +- langpacks/russian/Plugins/Jabber.txt | 60 +++++++++++++++++++++++ langpacks/russian/Plugins/SmileyAdd.txt | 16 +++--- langpacks/russian/Plugins/UInfoEx.txt | 12 ++--- langpacks/russian/Plugins/VKontakte.txt | 14 +++++- langpacks/russian/Untranslated/Db_autobackups.txt | 1 + langpacks/russian/Untranslated/Dropbox.txt | 1 + langpacks/russian/Untranslated/Jabber.txt | 29 ----------- 17 files changed, 121 insertions(+), 67 deletions(-) create mode 100644 langpacks/russian/Untranslated/Db_autobackups.txt create mode 100644 langpacks/russian/Untranslated/Dropbox.txt (limited to 'langpacks') diff --git a/langpacks/english/Plugins/Db_autobackups.txt b/langpacks/english/Plugins/Db_autobackups.txt index 9f3ec8082b..f771aa1595 100644 --- a/langpacks/english/Plugins/Db_autobackups.txt +++ b/langpacks/english/Plugins/Db_autobackups.txt @@ -29,9 +29,10 @@ [Created by:] [Backup in progress] [Copying database file...] +[Uploading to Dropbox failed] +[Error] [Database backed up] [Database back up in process...] -[Error] ;file \plugins\Db_autobackups\src\main.cpp [Miranda NG databases] [Compressed Miranda NG databases] diff --git a/langpacks/english/Plugins/Dropbox.txt b/langpacks/english/Plugins/Dropbox.txt index 7172f94363..ca09096b76 100644 --- a/langpacks/english/Plugins/Dropbox.txt +++ b/langpacks/english/Plugins/Dropbox.txt @@ -20,18 +20,20 @@ [Autosend download link to contact] [Paste download link into message input area] [Copy download link to clipboard] -[Here you can choose the protocols in which dropbox will be used instead of regular file transfers (sending), used by this protocol.] +[Here you can choose the protocols in which Dropbox will be used instead of regular file transfers (sending), used by this protocol.] ;file \plugins\Dropbox\src\dropbox.cpp [in process...] [server does not respond] [you have been authorized] ;file \plugins\Dropbox\src\dropbox_commands.cpp [Dropbox supports the following commands:] -[shows all files in folder "path" ("path" is relative from root folder)] +[shows all files in folder "path" ("path" is relative from root and can be omitted for root folder)] [returns download link for file or folder with specified path ("path" is relative from root folder)] +[searches for file or folder matched by query ("query" is split on spaces into multiple tokens)] [deletes file or folder with specified path ("path" is relative from root folder)] ["%s" command has invalid parameter.\nUse "/help" for more info.] [is empty] +[is not found] [is deleted] ;file \plugins\Dropbox\src\dropbox_events.cpp [Upload files to Dropbox] diff --git a/langpacks/english/Plugins/Import.txt b/langpacks/english/Plugins/Import.txt index d54760a520..15a75ecf61 100644 --- a/langpacks/english/Plugins/Import.txt +++ b/langpacks/english/Plugins/Import.txt @@ -2,7 +2,7 @@ ;============================================================ ; File: Import.dll ; Plugin: Import contacts and messages -; Version: 0.95.4.2 +; Version: 0.95.4.3 ; Authors: Miranda team ;============================================================ [Imports contacts and messages from another Miranda profile or from an external program.] diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt index 2268a2c59a..00c9eea452 100644 --- a/langpacks/english/Plugins/Jabber.txt +++ b/langpacks/english/Plugins/Jabber.txt @@ -768,6 +768,7 @@ [Google Talk!] [LiveJournal Talk] [Odnoklassniki] +[Yandex] [Some changes will take effect the next time you connect to the Jabber network.] ;file \protocols\JabberG\src\jabber_password.cpp [Set New Password for %s@%S] diff --git a/langpacks/english/Plugins/SmileyAdd.txt b/langpacks/english/Plugins/SmileyAdd.txt index 851457d6a6..0163759c89 100644 --- a/langpacks/english/Plugins/SmileyAdd.txt +++ b/langpacks/english/Plugins/SmileyAdd.txt @@ -2,7 +2,7 @@ ;============================================================ ; File: SmileyAdd.dll ; Plugin: SmileyAdd -; Version: 0.2.3.18 +; Version: 0.2.4.1 ; Authors: Peacow, nightwish, bid, borkra ;============================================================ [Smiley support for Miranda NG.] @@ -45,13 +45,12 @@ [Background color] [Only one instance of SmileyAdd could be executed.\nRemove duplicate instances from 'Plugins' directory] ;file \plugins\SmileyAdd\src\options.cpp -[Smileys] -[Customize] [Off] -[Top] -[Bottom] +[On] [Smiley packs] [All files] +[Smileys] +[Customize] ;file \plugins\SmileyAdd\src\services.cpp [Protocol specific] ;file \plugins\SmileyAdd\src\smileys.cpp diff --git a/langpacks/english/Plugins/UInfoEx.txt b/langpacks/english/Plugins/UInfoEx.txt index 35d0d05ad2..f4bdbd258c 100644 --- a/langpacks/english/Plugins/UInfoEx.txt +++ b/langpacks/english/Plugins/UInfoEx.txt @@ -555,16 +555,16 @@ ;file \plugins\UserInfoEx\src\svc_email.cpp [Send e-mail] [Memory allocation error!] -[E-mail (uinfoex)] +[E-mail (UInfoEx)] ;file \plugins\UserInfoEx\src\svc_gender.cpp -[Gender (uinfoex)] +[Gender (UInfoEx)] ;file \plugins\UserInfoEx\src\svc_homepage.cpp [User has no valid homepage] [View Homepage] [&Homepage] -[Homepage (uinfoex)] +[Homepage (UInfoEx)] ;file \plugins\UserInfoEx\src\svc_phone.cpp -[Phone (uinfoex)] +[Phone (UInfoEx)] ;file \plugins\UserInfoEx\src\svc_refreshci.cpp [[b]%s (%S)...[/b]\n%d Contacts remaining] [Abort Refreshing Contact Details] @@ -591,7 +591,7 @@ [Birthday reminder] [Birthday reminder: it's coming] [Anniversary Reminder] -[Reminder (uinfoex)] +[Reminder (UInfoEx)] ;file \plugins\UserInfoEx\src\ex_import\classExImContactBase.cpp [contact identification] [The contact %s(%s) has no unique ID in the vCard,\nbut there is a contact in your contact list with the same nick and protocol.\nDo you wish to use this contact?] @@ -639,5 +639,5 @@ [added contacts: %u / %u\nadded settings: %u / %u\nadded events %u / %u\nduplicated events: %u] [FATAL: An exception was thrown while importing contacts from xmlCard!] ;file \plugins\UserInfoEx\src\Flags\svc_flags.cpp -[Flags (uinfoex)] +[Flags (UInfoEx)] ;file \plugins\UserInfoEx\src\Flags\svc_flagsicons.cpp diff --git a/langpacks/english/Plugins/VKontakte.txt b/langpacks/english/Plugins/VKontakte.txt index 1a6a5acd8e..ac4fa6fdd3 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.1.22 +; Version: 0.1.1.23 ; Authors: Miranda NG Team ;============================================================ [VKontakte protocol support for Miranda NG.] @@ -214,6 +214,11 @@ ;file \protocols\VKontakte\src\vk_history.cpp [Are you sure to reload all messages from vk.com?\nLocal contact history will be deleted and reloaded from the server.\nIt may take a long time.\nDo you want to continue?] [Attention!] +[Are you sure you want to reload all messages for all contacts from vk.com?\nLocal contact history will be deleted and reloaded from the server.\nIt may take a very long time and/or corrupt Miranda database.\nWe recommend check your database before reloading messages and after it (Miranda32.exe /svc:dbchecker or Miranda64.exe /svc:dbchecker).\nDo you want to continue?] +[Error loading message history from server] +[Loading messages for all contacts is completed] +[Loading history] +[Loading messages for %s is completed] ;file \protocols\VKontakte\src\vk_options.cpp [I'm back] [Network] @@ -227,6 +232,7 @@ [Status message] [Send message to my wall] [Load news from VK] +[Load history for all contacts from VK] [Wipe contacts missing in friend list] [Mark messages as read] [Send message to user\'s wall] diff --git a/langpacks/russian/Plugins/Db_autobackups.txt b/langpacks/russian/Plugins/Db_autobackups.txt index 273a4994c1..3939dba2a6 100644 --- a/langpacks/russian/Plugins/Db_autobackups.txt +++ b/langpacks/russian/Plugins/Db_autobackups.txt @@ -49,12 +49,12 @@ Резервирование в процессе [Copying database file...] Копирование файла базы данных... +[Error] +Ошибка [Database backed up] База данных зарезервирована [Database back up in process...] Производится резервирование базы данных... -[Error] -Ошибка [Miranda NG databases] Базы данных Miranda NG [Compressed Miranda NG databases] diff --git a/langpacks/russian/Plugins/Dropbox.txt b/langpacks/russian/Plugins/Dropbox.txt index bee9f8d0aa..0ab3a9f3c5 100644 --- a/langpacks/russian/Plugins/Dropbox.txt +++ b/langpacks/russian/Plugins/Dropbox.txt @@ -33,7 +33,7 @@ Вставить сылку в поле ввода [Copy download link to clipboard] Копировать ссылку в буфер обмена -[Here you can choose the protocols in which dropbox will be used instead of regular file transfers (sending), used by this protocol.] +[Here you can choose the protocols in which Dropbox will be used instead of regular file transfers (sending), used by this protocol.] Здесь вы можете выбрать протоколы, в которых Dropbox будет использоваться вместо обычной передачи файлов (отправка), используемой этим протоколом. [in process...] в процессе... @@ -43,8 +43,8 @@ авторизация прошла успешно [Dropbox supports the following commands:] Доступны следующие команды: -[shows all files in folder "path" ("path" is relative from root folder)] -показывает все файлы в папке "path" ("path" относительно корневой папки) +[shows all files in folder "path" ("path" is relative from root and can be omitted for root folder)] +показывает все файлы в папке "path" ("path" относительно корневой папки и может быть опущен для корневой папки) [returns download link for file or folder with specified path ("path" is relative from root folder)] возвращает ссылку на файл или папку, расположенную по указанному пути (относительно корневой папки) [deletes file or folder with specified path ("path" is relative from root folder)] @@ -53,6 +53,8 @@ неверный параметр команды "%s".\nИспользуйте "/help" для получения справки. [is empty] пустая +[is not found] +не найдено [is deleted] удалён [Upload files to Dropbox] diff --git a/langpacks/russian/Plugins/Import.txt b/langpacks/russian/Plugins/Import.txt index b99ca85864..7fa46eae2d 100644 --- a/langpacks/russian/Plugins/Import.txt +++ b/langpacks/russian/Plugins/Import.txt @@ -2,7 +2,7 @@ ;============================================================ ; File: Import.dll ; Plugin: Import contacts and messages -; Version: 0.95.4.2 +; Version: 0.95.4.3 ; Authors: Miranda team ;============================================================ [Imports contacts and messages from another Miranda profile or from an external program.] diff --git a/langpacks/russian/Plugins/Jabber.txt b/langpacks/russian/Plugins/Jabber.txt index cd3d1373fc..6fd6a09456 100644 --- a/langpacks/russian/Plugins/Jabber.txt +++ b/langpacks/russian/Plugins/Jabber.txt @@ -433,6 +433,8 @@ Jabber Ad-Hoc команды на %s Комнаты чата [Links] Ссылки +[Bytestream Proxy not available] +Bytestream Proxy недоступно [Supports Service Discovery info] Информация о службах [Supports Service Discovery items list] @@ -1465,6 +1467,10 @@ XML для MS Excel (кодировка UTF-8) Защищённая сеть XMPP (старый стиль) [LiveJournal Talk] ЖЖ +[Odnoklassniki] +Одноклассники +[Yandex] +Яндекс [Some changes will take effect the next time you connect to the Jabber network.] Некоторые изменения вступят в силу после следующего подключения к сети. [Set New Password for %s@%S] @@ -1663,6 +1669,8 @@ XML для MS Excel (кодировка UTF-8) Подтвердите выключение программы [There is no group chats to leave] Нет чатов для отключения +[Choose the group chats you want to leave] +Выберите чаты которые желаете покинуть [Error %s %s\r\nPlease select other server] Ошибка %s %s\r\nПожалуйста, выберите другой сервер [Error: unknown reply received\r\nPlease select other server] @@ -1837,6 +1845,8 @@ Jabber vCard: редактирование телефона Заметка [%s connection] %s подключение +[] +<слот расширенного статуса> [Afraid] Испуганный [Amazed] @@ -2177,14 +2187,54 @@ Jabber vCard: редактирование телефона Я использую Miranda NG (http://miranda-ng.org/.) [/me slaps %s around a bit with a large trout] /me шарахнул %s веслом по голове +[A list of entities with administrative privileges] +Список пользователей с правами администратора +[A list of entities with whom communication is blocked] +Список пользователей чьи подключения блокируются [The number of seconds to delay before applying a change] Задержка (в секундах) перед применением изменений +[The number of disabled entities] +Количество отключённых пользователей +[The email address for a user] +Адрес электронной почты пользователя +[The last login time (per XEP-0082) of a user] +Время последнего входа пользователя (согласно XEP-0082) +[The number of logins per minute for an account] +Количество входов в минуту для учётной записи +[The text of a message of the day] +Текст сообщения дня +[The number of online entities] +Количество пользователей «В сети» [The password for an account] Пароль учётной записи +[Password verification] +Проверка пароля +[A list of registered entities] +Список зарегистрированных пользователей +[The number of registered entities] +Количество зарегистрированных пользователей +[Number of roster items for an account] +Количество объектов в ростере учётной записи +[The text of a welcome message] +Текст приветственного сообщения +[A list of entities with whom communication is allowed] +Список пользователей связь с которыми разрешена [First Name] Имя [Last Name] Фамилия +[Desired Nickname] +Желаемый ник +[Your URL] +Ваш сайт +[Email Address] +Адрес электронной почты +[FAQ Entry] +Часто задаваемые вопросы +[Natural language for room discussions] +Основной язык общения в комнате +[Maximum number of room occupants] +Максимальное количество учасников комнаты [Full list of room admins] Полный список администраторов комнаты чата [Short description of room] @@ -2195,6 +2245,16 @@ Jabber vCard: редактирование телефона Полный список владельцев комнаты чата [The room password] Пароль комнаты чата +[The date and time when the node was created] +Дата и время создания узла +[The JID of the node creator] +JID владельца узла +[A description of the node] +Описание узла +[The default language of the node] +Язык узла по умолчанию +[The name of the node] +Имя узла [A list of pending file transfers] Список отложенных передач файлов [The status message text] diff --git a/langpacks/russian/Plugins/SmileyAdd.txt b/langpacks/russian/Plugins/SmileyAdd.txt index d68dadd2f6..d30864a3cc 100644 --- a/langpacks/russian/Plugins/SmileyAdd.txt +++ b/langpacks/russian/Plugins/SmileyAdd.txt @@ -2,7 +2,7 @@ ;============================================================ ; File: SmileyAdd.dll ; Plugin: SmileyAdd -; Version: 0.2.3.18 +; Version: 0.2.4.1 ; Authors: Peacow, nightwish, bid, borkra ;============================================================ [Smiley support for Miranda NG.] @@ -75,20 +75,18 @@ HTTP-подключения SmileyAdd Цвет фона [Only one instance of SmileyAdd could be executed.\nRemove duplicate instances from 'Plugins' directory] Только одна копия SmileyAdd может быть запущена.\nУдалите дубликат из папки "Plugins" -[Smileys] -Смайлы -[Customize] -Тонкая настройка [Off] Отсутствует -[Top] -Вверху -[Bottom] -Внизу +[On] +Вкл. [Smiley packs] Наборы смайлов [All files] Все файлы +[Smileys] +Смайлы +[Customize] +Тонкая настройка [Protocol specific] В соответствии с протоколом [Smiley pack %s for category "%s" not found.\nSelect correct smiley pack in the Options -> Customize -> Smileys.] diff --git a/langpacks/russian/Plugins/UInfoEx.txt b/langpacks/russian/Plugins/UInfoEx.txt index 908801bdff..69f14a5b9f 100644 --- a/langpacks/russian/Plugins/UInfoEx.txt +++ b/langpacks/russian/Plugins/UInfoEx.txt @@ -1055,9 +1055,9 @@ Web Дизайн Отправить e-mail [Memory allocation error!] Ошибка выделения памяти! -[E-mail (uinfoex)] +[E-mail (UInfoEx)] Почта (uinfoex) -[Gender (uinfoex)] +[Gender (UInfoEx)] Пол (uinfoex) [User has no valid homepage] У пользователя нет правильной домашней страницы @@ -1065,9 +1065,9 @@ Web Дизайн Сайт [&Homepage] &Сайт -[Homepage (uinfoex)] +[Homepage (UInfoEx)] Сайт (uinfoex) -[Phone (uinfoex)] +[Phone (UInfoEx)] Телефон (uinfoex) [[b]%s (%S)...[/b]\n%d Contacts remaining] \[b]%s (%S)...[/b]\n%d контактов осталось @@ -1117,7 +1117,7 @@ Web Дизайн Напоминание о приближающемся дне рождения [Anniversary Reminder] Напоминание о празднике -[Reminder (uinfoex)] +[Reminder (UInfoEx)] Напоминание (uinfoex) [contact identification] идентификация контакта @@ -1197,5 +1197,5 @@ INI файл "%s"\nдля чтения контакта не может быть Добавлено контактов: %u / %u\nДобавлено настроек: %u / %u\nДобавлено событий: %u / %u\nДублирующих событий: %u [FATAL: An exception was thrown while importing contacts from xmlCard!] ФАТАЛЬНО: Ошибка при импортировании контактов из xml карточки! -[Flags (uinfoex)] +[Flags (UInfoEx)] Флаги (uinfoex) diff --git a/langpacks/russian/Plugins/VKontakte.txt b/langpacks/russian/Plugins/VKontakte.txt index 562b9db65a..8d6343337c 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.1.22 +; Version: 0.1.1.23 ; Authors: Miranda NG Team ;============================================================ [VKontakte protocol support for Miranda NG.] @@ -407,6 +407,16 @@ ID получателя ошибочен или неизвестен Вы уверены, что хотите загрузить все сообщения с сайта vk.com?\nЛокальная история контакта будет удалена и загружена с сервера.\nЭто может занять много времени.\nВы уверены, что хотите продолжить? [Attention!] Внимание! +[Are you sure you want to reload all messages for all contacts from vk.com?\nLocal contact history will be deleted and reloaded from the server.\nIt may take a very long time and/or corrupt Miranda database.\nWe recommend check your database before reloading messages and after it (Miranda32.exe /svc:dbchecker or Miranda64.exe /svc:dbchecker).\nDo you want to continue?] +Вы уверены, что хотите перезагрузить все сообщения для всех контактов из vk.com?\nЛокальная история контактов будет удалена и перезагружена с сервера.\nЭто может занять продолжительное время и/или повредить базу данных.\nРекомендуем проверить вашу базу данных (Miranda32.exe /svc:dbchecker или Miranda64.exe /svc:dbchecker) перед повторной загрузкой сообщений и после её.\nХотите продолжить? +[Error loading message history from server] +Ошибка загрузки истории сообщений с сервера +[Loading messages for all contacts is completed] +Загрузка сообщений для всех контактов завершена +[Loading history] +Загрузка истории +[Loading messages for %s is completed] +Загрузка сообщений для %s завершена [I'm back] Я вернулся [Network] @@ -429,6 +439,8 @@ ID получателя ошибочен или неизвестен Опубликовать на своей стене [Load news from VK] Загрузить новости с VK +[Load history for all contacts from VK] +Загрузить историю всех контактов из ВК [Wipe contacts missing in friend list] Удалить контакты, не являющиеся друзьями [Mark messages as read] diff --git a/langpacks/russian/Untranslated/Db_autobackups.txt b/langpacks/russian/Untranslated/Db_autobackups.txt new file mode 100644 index 0000000000..a380a08fd9 --- /dev/null +++ b/langpacks/russian/Untranslated/Db_autobackups.txt @@ -0,0 +1 @@ +[Uploading to Dropbox failed] diff --git a/langpacks/russian/Untranslated/Dropbox.txt b/langpacks/russian/Untranslated/Dropbox.txt new file mode 100644 index 0000000000..2f2d85a39f --- /dev/null +++ b/langpacks/russian/Untranslated/Dropbox.txt @@ -0,0 +1 @@ +[searches for file or folder matched by query ("query" is split on spaces into multiple tokens)] diff --git a/langpacks/russian/Untranslated/Jabber.txt b/langpacks/russian/Untranslated/Jabber.txt index 3d2f601b90..567931148f 100644 --- a/langpacks/russian/Untranslated/Jabber.txt +++ b/langpacks/russian/Untranslated/Jabber.txt @@ -3,14 +3,10 @@ [ISDN] [PCS] [JID:] -[Bytestream Proxy not available] [Please specify group chat directory first.] [JID] [Google Talk!] -[Odnoklassniki] -[Choose the group chats you want to leave] [Jabber vCard] -[] [One or more addresses for communication related to abusive traffic] [One or more addresses for customer feedback] [One or more addresses for communication related to sales and marketing] @@ -20,39 +16,19 @@ [The Jabber ID of one or more entities to which an operation applies] [The Jabber IDs associated with active sessions] [The number of online entities that are active] -[A list of entities with administrative privileges] [The text of an announcement to be sent to active users or all users] -[A list of entities with whom communication is blocked] [The Jabber IDs that have been disabled] -[The number of disabled entities] -[The email address for a user] [The given (first) name of a user] [The number of online entities that are idle] [The IP addresses of an account's online sessions] -[The last login time (per XEP-0082) of a user] -[The number of logins per minute for an account] [The maximum number of items associated with a search or list] -[The text of a message of the day] [The names of an account's online sessions] [The Jabber IDs associated with online users] -[The number of online entities] -[Password verification] -[A list of registered entities] -[The number of registered entities] -[Number of roster items for an account] [The number of stanzas being sent per second by an account] [The family (last) name of a user] -[The text of a welcome message] -[A list of entities with whom communication is allowed] -[Desired Nickname] -[Your URL] -[Email Address] -[FAQ Entry] [Whether to allow occupants to invite others] [Whether to allow occupants to change subject] [Whether to enable logging of room conversations] -[Natural language for room discussions] -[Maximum number of room occupants] [Whether to make room members-only] [Whether to make room moderated] [Whether a password is required to enter] @@ -98,14 +74,9 @@ [A friendly name for the node] [The type of node data, usually specified by the namespace of the payload (if any); MAY be list-single rather than text-single] [The JIDs of those to contact with questions] -[The date and time when the node was created] -[The JID of the node creator] -[A description of the node] -[The default language of the node] [The number of subscribers to the node] [The JIDs of those with an affiliation of owner] [The JIDs of those with an affiliation of publisher] -[The name of the node] [Payload type] [Whether to automatically authorize subscription requests] [Whether to automatically accept file transfers] -- cgit v1.2.3