From ca702593c60aa89c06633777feb7cf79ad8e751f Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Thu, 18 Jun 2015 18:56:37 +0000 Subject: - langpacks/english: update; - langpacks/russian: update; git-svn-id: http://svn.miranda-ng.org/main/trunk@14249 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- langpacks/english/=CORE=.txt | 8 +- langpacks/english/Plugins/DbEditorPP.txt | 126 +++++++----------- langpacks/english/Plugins/MirLua.txt | 2 + langpacks/english/Plugins/SkypeWeb.txt | 2 +- langpacks/english/Plugins/VKontakte.txt | 6 +- langpacks/russian/=CORE=.txt | 4 +- langpacks/russian/Plugins/DbEditorPP.txt | 184 +++++--------------------- langpacks/russian/Plugins/SkypeWeb.txt | 2 +- langpacks/russian/Plugins/VKontakte.txt | 6 +- langpacks/russian/Untranslated/DbEditorPP.txt | 30 ++++- langpacks/russian/Untranslated/MirLua.txt | 1 + langpacks/russian/Untranslated/VKontakte.txt | 4 +- 12 files changed, 132 insertions(+), 243 deletions(-) create mode 100644 langpacks/russian/Untranslated/MirLua.txt (limited to 'langpacks') diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt index f35f795ff5..ac60a2d7c0 100644 --- a/langpacks/english/=CORE=.txt +++ b/langpacks/english/=CORE=.txt @@ -1333,8 +1333,7 @@ [Modified] [My profiles] [New profile] -;file \src\mir_app\src\protocolorder.cpp -;file \src\mir_app\src\protoopts.cpp +;file \src\mir_app\src\proto_opts.cpp [WARNING! The account is going to be deleted. It means that all its settings, contacts and histories will be also erased.\n\nAre you absolutely sure?] [Your account was successfully upgraded. To activate it, restart of Miranda is needed.\n\nIf you want to restart Miranda now, press Yes, if you want to upgrade another account, press No] [This account uses legacy protocol plugin. Use Miranda NG options dialogs to change its preferences.] @@ -1360,6 +1359,9 @@ [Account %s is being deleted] [You need to disable plugin to delete this account] [&Accounts...] +;file \src\mir_app\src\proto_order.cpp +;file \src\mir_app\src\proto_ui.cpp +[Account] ;file \src\mir_app\src\searchresults.cpp [Could not start a search on '%s', there was a problem - is %s connected?] [Could not search on any of the protocols, are you online?] @@ -1673,5 +1675,3 @@ [JPEG bitmaps] [GIF bitmaps] [PNG bitmaps] -;file \src\mir_core\src\ui_utils.cpp -[Account] diff --git a/langpacks/english/Plugins/DbEditorPP.txt b/langpacks/english/Plugins/DbEditorPP.txt index ce0cce0816..cd4e25ae6c 100644 --- a/langpacks/english/Plugins/DbEditorPP.txt +++ b/langpacks/english/Plugins/DbEditorPP.txt @@ -2,26 +2,23 @@ ;============================================================ ; File: DbEditorPP.dll ; Plugin: Database editor++ -; Version: 3.2.0.2 +; Version: 4.0.0.0 ; Authors: Bio, Jonathan Gordon ;============================================================ [Advanced Database Editor.] ;file \plugins\DbEditorPP\res\resource.rc -[Database Editor++ search and replace] +[Search and replace] [Search for] -[Text:] -[In:] -[Case sensitive] -[Module name] [Exact match] +[&Search] +[Module name] [Setting name] [Setting value] -[&Search] +[Case sensitive] +[&Cancel] [Replace with] [Entirely] -[Found field] [&Replace] -[&Cancel] [Restore last opened position] [Automatically expand "Settings" when Database Editor++ starts] [Warn when deleting modules] @@ -33,8 +30,8 @@ [Add to all contacts (including Settings)] [Cancel] [Edit setting] -[Value name:] -[Value data:] +[Name] +[Value] [Base] [Hexadecimal] [Decimal] @@ -47,10 +44,8 @@ [Copy module to contact] [Contact to copy module and settings to] [Copy to all contacts (including Settings)] -[Import module/settings] -[Paste the settings to import here.] [Import] -[Insert &CR/LF] +[Paste the settings to import here:] [Database Editor++] [&Main] [&Refresh modules] @@ -58,6 +53,7 @@ [E&xit] [&Actions] [&Search and replace] +[&Fix resident settings] [&Delete module] [&Watches] [&View all] @@ -77,59 +73,41 @@ [Edit &Bytes in Hex] [Edit &Words in Hex] [Edit &Dwords in Hex] +[&Inline edit] [&Restore position] [&Open options] -[&Edit/rename] -[New] +[&Edit] +[&Copy] +[&Delete] +[Convert to] [&Byte] [&Word] [&Dword] [&String] [&Unicode] +[New] [BL&OB] -[&Convert to] -[Encyption] -[View decrypted string] -[View encrypted string] -[Decrypt string] -[Encrypt string] [&Watch] -[&Delete] +[&Refresh] [&Rename] [Copy to contact] [Export module] +[&Add module] [&Clone] [Export contact] [Import settings] [From a file] [From pasted text] -[&Add module] [Export settings] [Export contacts] [Import contacts] [Export module from all contacts] [Watch window] [Reload watch list] -;file \plugins\DbEditorPP\src\addeditsettingsdlg.cpp -[Cannot Convert!] -[New BYTE value] -[Edit BYTE value] -[New WORD value] -[Edit WORD value] -[New DWORD value] -[Edit DWORD value] -[New STRING value] -[Edit STRING value] -[New UNICODE value] -[Edit UNICODE value] -[New BLOB value] -[Edit BLOB value] -[Couldn't allocate enough memory!] ;file \plugins\DbEditorPP\src\copymodule.cpp -[Settings] +[Copy module "%s"] ;file \plugins\DbEditorPP\src\deletemodule.cpp [Are you sure you want to delete module "%s"?] -[Confirm module deletion] [Delete module from database] [Delete module from database... Loading] [Delete module from all contacts (including Setting)] @@ -137,32 +115,31 @@ [INI Files] [All Files] [Export to file] -[Error loading module list] [Couldn't open file for writing] +[Import to "%s"] [Import from files] ;file \plugins\DbEditorPP\src\findwindow.cpp +[Result] +[Contact] +[Module] +[Setting] [Enter a string to search the database for] [Stop] -[Replaced with] +[Replaced] [Deleted] [Found] -[%s Module "%s" in contact "%s"] -[%s Setting "%s" in module "%s" in contact "%s" - "%s"] -[%s Setting "%s" in module "%s" in contact "%s"] -[%s "%s" in Setting "%s" in module "%s" in contact "%s"] [Searching...] -[Error Loading Setting List] -[Finished. %d items were found, %d items were deleted.] -[Finished. %d items were found, %d items were replaced.] -[Finished. %d items were found.] +[Finished. Items found: %d / replaced: %d / deleted: %d] ;file \plugins\DbEditorPP\src\icons.cpp [Main icon] -[Closed known module] -[Open known module] +[Closed module] +[Open module] +[Settings] [Contacts group] [Unknown contact] [Known contact] [Open user tree] +[Empty setting] [BLOB setting] [Byte setting] [Word setting] @@ -173,41 +150,34 @@ ;file \plugins\DbEditorPP\src\main.cpp [Open Database Editor] [Open user tree in DBE++] +[] +[[UNLOADED]] ;file \plugins\DbEditorPP\src\main_window.cpp [Are you sure you want to delete contact "%s"?] -[Confirm contact delete] -;file \plugins\DbEditorPP\src\modules.cpp +[Fix resident setting deleting them from DB ?] +[Deleted orphaned items: %d] +;file \plugins\DbEditorPP\src\modsettingenum.cpp +[Error loading module list] +[Error loading setting list] ;file \plugins\DbEditorPP\src\moduletree.cpp [Loading contacts...] [Loading modules...] -[Module tree not found] [Contacts] -[HANDLE] -[Add module to contact "%s"] ;file \plugins\DbEditorPP\src\options.cpp [Database] +;file \plugins\DbEditorPP\src\renamemodule.cpp +[Add module to "%s"] ;file \plugins\DbEditorPP\src\settinglist.cpp -[Name] -[Data] [Type] [Size] +[Unable to store value in this data type!] +[Are you sure you want to delete setting(s): %d?] [*** encrypted ***] -[UNICODE] -[BLOB] -[BYTE] -[WORD] -[DWORD] -[STRING] -[] -[] -[Decoded string..] -[Encoded string..] +[*** buggy resident ***] +;file \plugins\DbEditorPP\src\settingsdlg.cpp +[Unknown DBVariant type!] +[Edit setting (%s)] +[New setting (%s)] ;file \plugins\DbEditorPP\src\watchedvars.cpp -[Contact] -[Module] -[Setting] -[Database Setting Changed: \nModule: "%s" , Setting: "%s"\nNew Value: (BYTE) %d] -[Database Setting Changed: \nModule: "%s" , Setting: "%s"\nNew Value: (WORD) %d] -[Database Setting Changed: \nModule: "%s" , Setting: "%s"\nNew Value: (DWORD) 0x%X] -[Database Setting Changed: \nModule: "%s" , Setting: "%s"\nNew Value: "%s"] -[Database Setting Changed: \nModule: "%s" , Setting: "%s"\nNew Value (UTF8): "%s"] +[*** resident ***] +[Database Setting Changed: \nModule: "%s", Setting: "%s"\nNew Value (%s): "%s"] diff --git a/langpacks/english/Plugins/MirLua.txt b/langpacks/english/Plugins/MirLua.txt index 56260f9cfb..1c7dc7b6bc 100644 --- a/langpacks/english/Plugins/MirLua.txt +++ b/langpacks/english/Plugins/MirLua.txt @@ -6,6 +6,8 @@ ; Authors: Miranda NG team ;============================================================ [Allow you to extend Miranda NG functionality with lua scripts.] +;file \plugins\MirLua\res\resource.rc +[Reload] ;file \plugins\MirLua\src\main.cpp [Customize] [Scripts] diff --git a/langpacks/english/Plugins/SkypeWeb.txt b/langpacks/english/Plugins/SkypeWeb.txt index 440f266ab3..1764a92cb2 100644 --- a/langpacks/english/Plugins/SkypeWeb.txt +++ b/langpacks/english/Plugins/SkypeWeb.txt @@ -2,7 +2,7 @@ ;============================================================ ; File: SkypeWeb.dll ; Plugin: Skype protocol (Web) -; Version: 0.12.1.1 +; Version: 0.12.1.2 ; Authors: Miranda NG Team ;============================================================ [Skype protocol support for Miranda NG. Based on new Skype for Web.] diff --git a/langpacks/english/Plugins/VKontakte.txt b/langpacks/english/Plugins/VKontakte.txt index 4e41ed99cb..891423e9a4 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.5 +; Version: 0.1.1.7 ; Authors: Miranda NG Team ;============================================================ [VKontakte protocol support for Miranda NG.] @@ -19,6 +19,7 @@ [Other] [BBCode support on attachments] [Process stickers as smileys] +[Shorten links for audio attachments] [News and event notifications] [WARNING: Causes excessive network traffic!!!] [Enable news feeds] @@ -156,6 +157,7 @@ [kick user] [left chat] [invite user] +[returned to chat] [change chat title to] [chat action not supported] [Unknown] @@ -169,6 +171,7 @@ [View/change &title] [&Destroy room] [&User details] +[Visit profile] [&Kick] ;file \protocols\VKontakte\src\vk_feed.cpp [User was tagged in these photos:] @@ -202,7 +205,6 @@ [Status message] [Send message to my wall] [Load news from VK] -[Visit profile] [Send message to user\'s wall] [Add as friend] [Delete from friend list] diff --git a/langpacks/russian/=CORE=.txt b/langpacks/russian/=CORE=.txt index b57592acd7..d1d0faa167 100644 --- a/langpacks/russian/=CORE=.txt +++ b/langpacks/russian/=CORE=.txt @@ -2477,6 +2477,8 @@ ID учётной записи Для удаления учётной записи необходимо отключить протокол [&Accounts...] &Учётные записи... +[Account] +Учётная запись [Could not start a search on '%s', there was a problem - is %s connected?] Не могу запустить поиск в сети %s. Пожалуйста, проверьте подключение к сети %s. [Could not search on any of the protocols, are you online?] @@ -3087,5 +3089,3 @@ ANSI плагин Изображения GIF [PNG bitmaps] Изображения PNG -[Account] -Учётная запись diff --git a/langpacks/russian/Plugins/DbEditorPP.txt b/langpacks/russian/Plugins/DbEditorPP.txt index 895f371b9e..6a93d22cc8 100644 --- a/langpacks/russian/Plugins/DbEditorPP.txt +++ b/langpacks/russian/Plugins/DbEditorPP.txt @@ -2,41 +2,33 @@ ;============================================================ ; File: DbEditorPP.dll ; Plugin: Database editor++ -; Version: 3.2.0.2 +; Version: 4.0.0.0 ; Authors: Bio, Jonathan Gordon ;============================================================ [Advanced Database Editor.] Расширенный редактор базы. -[Database Editor++ search and replace] -Найти и заменить [Search for] Искать -[Text:] -Текст: -[In:] -В: -[Case sensitive] -Учёт регистра -[Module name] -Модуль [Exact match] Точное соотв. +[&Search] +&Искать +[Module name] +Модуль [Setting name] Имя настройки [Setting value] Значение -[&Search] -&Искать +[Case sensitive] +Учёт регистра +[&Cancel] +О&тмена [Replace with] Заменить на [Entirely] Полностью -[Found field] -Найдено поле [&Replace] &Заменить -[&Cancel] -О&тмена [Restore last opened position] Восстановить последнее положение [Automatically expand "Settings" when Database Editor++ starts] @@ -59,10 +51,8 @@ Отмена [Edit setting] Редактировать настройку -[Value name:] -Имя: -[Value data:] -Значение: +[Name] +Имя [Base] Основание [Hexadecimal] @@ -87,14 +77,8 @@ Копировать модуль и настройки в [Copy to all contacts (including Settings)] Во все контакты (и общие настройки) -[Import module/settings] -Импортировать модуль/настройки -[Paste the settings to import here.] -Вставьте настройки сюда. [Import] Импорт -[Insert &CR/LF] -Вставить &CR/LF [Database Editor++] Редактор базы [&Main] @@ -151,10 +135,12 @@ В&осстанавливать положение [&Open options] &Открыть настройки -[&Edit/rename] -&Править/переименовать -[New] -Создать +[&Edit] +&Править +[&Copy] +&Копировать +[&Delete] +&Удалить [&Byte] &Байт [&Word] @@ -165,28 +151,18 @@ С&трока [&Unicode] &Юникод -[&Convert to] -&Перевести в -[Encyption] -&Шифрование -[View decrypted string] -Просмотреть расшифрованную строку -[View encrypted string] -Просмотреть зашифрованную строку -[Decrypt string] -Расшифровать строку -[Encrypt string] -Зашифровать строку +[New] +Создать [&Watch] &Наблюдать -[&Delete] -&Удалить [&Rename] &Переименовать [Copy to contact] Копировать в контакт [Export module] Экспортировать модуль +[&Add module] +&Добавить модуль [&Clone] &Клонировать [Export contact] @@ -197,8 +173,6 @@ Из файла [From pasted text] Из вставленного текста -[&Add module] -&Добавить модуль [Export settings] Экспортировать настройки [Export contacts] @@ -211,40 +185,8 @@ Окно наблюдений [Reload watch list] Обновить список наблюдений -[Cannot Convert!] -Не могу конвертировать! -[New BYTE value] -Создать байт -[Edit BYTE value] -Редактировать байт -[New WORD value] -Создать слово -[Edit WORD value] -Редактировать слово -[New DWORD value] -Создать двойное слово -[Edit DWORD value] -Редактировать двойное слово -[New STRING value] -Создать строку -[Edit STRING value] -Редактировать строку -[New UNICODE value] -Создать значение Unicode -[Edit UNICODE value] -Редактировать значение Unicode -[New BLOB value] -Создать BLOB -[Edit BLOB value] -Редактировать BLOB -[Couldn't allocate enough memory!] -Невозможно выделить память! -[Settings] -Настройки [Are you sure you want to delete module "%s"?] Удалить модуль "%s"? -[Confirm module deletion] -Удалить модуль? [Delete module from database] Удалить модуль из базы [Delete module from database... Loading] @@ -257,46 +199,30 @@ INI файлы Все файлы [Export to file] Экспорт -[Error loading module list] -Ошибка при загрузке списка модулей [Couldn't open file for writing] Не удается открыть файл на запись [Import from files] Импорт из файлов +[Contact] +Контакт +[Module] +Модуль +[Setting] +Параметр [Enter a string to search the database for] Введите строку поиска [Stop] Стоп -[Replaced with] -Заменено на [Deleted] Удалено [Found] Найдено -[%s Module "%s" in contact "%s"] -%s модуль "%s" в контакте "%s" -[%s Setting "%s" in module "%s" in contact "%s" - "%s"] -%s настройка "%s" в модуле "%s" контакта "%s" - "%s" -[%s Setting "%s" in module "%s" in contact "%s"] -%s настройка "%s" в модуле "%s" контакта "%s" -[%s "%s" in Setting "%s" in module "%s" in contact "%s"] -%s "%s" в настройке "%s" в модуле "%s" контакта "%s" [Searching...] Поиск... -[Error Loading Setting List] -Ошибка загрузки списка настроек -[Finished. %d items were found, %d items were deleted.] -Поиск завершен, найдено %d и удалено %d элемент(ов). -[Finished. %d items were found, %d items were replaced.] -Поиск завершен, найдено %d и заменено %d элемент(ов). -[Finished. %d items were found.] -Поиск завершен, найдено %d элемент(ов). [Main icon] Основной значок -[Closed known module] -Известный модуль (закрыт) -[Open known module] -Известный модуль (открыт) +[Settings] +Настройки [Contacts group] Группа контактов [Unknown contact] @@ -323,65 +249,25 @@ ID пользователя Открыть редактор базы [Open user tree in DBE++] Открыть в редакторе базы +[] +<неизвестно> [Are you sure you want to delete contact "%s"?] Вы уверены, что хотите удалить контакт "%s"? -[Confirm contact delete] -Подтверждение удаления контакта +[Error loading module list] +Ошибка при загрузке списка модулей +[Error loading setting list] +Ошибка загрузки списка настроек [Loading contacts...] Загрузка контактов... [Loading modules...] Загрузка модулей... -[Module tree not found] -Дерево модулей не найдено [Contacts] Контакты -[HANDLE] -ID пользователя -[Add module to contact "%s"] -Добавить модуль контакту "%s" [Database] Профиль -[Name] -Имя -[Data] -Данные [Type] Тип [Size] Размер [*** encrypted ***] *** зашифровано *** -[UNICODE] -юникод -[BYTE] -байт -[WORD] -слово -[DWORD] -дв. слово -[STRING] -строка -[] -<не поддерживается> -[] -<неизвестно> -[Decoded string..] -Расшифрованная строка -[Encoded string..] -Зашифрованная строка -[Contact] -Контакт -[Module] -Модуль -[Setting] -Параметр -[Database Setting Changed: \nModule: "%s" , Setting: "%s"\nNew Value: (BYTE) %d] -Изменена настройка базы: \nмодуль: "%s" , настройка: "%s"\nновое значение: (байт) %d -[Database Setting Changed: \nModule: "%s" , Setting: "%s"\nNew Value: (WORD) %d] -Изменена настройка базы: \nмодуль: "%s" , настройка: "%s"\nновое значение: (слово) %d -[Database Setting Changed: \nModule: "%s" , Setting: "%s"\nNew Value: (DWORD) 0x%X] -Изменена настройка базы: \nмодуль: "%s" , настройка: "%s"\nновое значение: (двойное слово) 0x%X -[Database Setting Changed: \nModule: "%s" , Setting: "%s"\nNew Value: "%s"] -Изменена настройка базы: \nмодуль: "%s" , настройка: "%s"\nновое значение: "%s" -[Database Setting Changed: \nModule: "%s" , Setting: "%s"\nNew Value (UTF8): "%s"] -Изменена настройка БД: \nМодуль: "%s" , Настройка: "%s"\nНовое значение: (UTF8) "%s" diff --git a/langpacks/russian/Plugins/SkypeWeb.txt b/langpacks/russian/Plugins/SkypeWeb.txt index 6d8b01ddbb..92f46e85ab 100644 --- a/langpacks/russian/Plugins/SkypeWeb.txt +++ b/langpacks/russian/Plugins/SkypeWeb.txt @@ -2,7 +2,7 @@ ;============================================================ ; File: SkypeWeb.dll ; Plugin: Skype protocol (Web) -; Version: 0.12.1.1 +; Version: 0.12.1.2 ; Authors: Miranda NG Team ;============================================================ [Skype protocol support for Miranda NG. Based on new Skype for Web.] diff --git a/langpacks/russian/Plugins/VKontakte.txt b/langpacks/russian/Plugins/VKontakte.txt index c5d1b4e8ce..104126d026 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.5 +; Version: 0.1.1.7 ; Authors: Miranda NG Team ;============================================================ [VKontakte protocol support for Miranda NG.] @@ -323,6 +323,8 @@ Cоздать комнату чата &Удалить комнату чата [&User details] Информация о &контакте +[Visit profile] +Профиль на сайте [&Kick] &Выкинуть [User was tagged in these photos:] @@ -379,8 +381,6 @@ Cоздать комнату чата Опубликовать на своей стене [Load news from VK] Загрузить новости с VK -[Visit profile] -Профиль на сайте [Send message to user\'s wall] Сообщение на стене [Add as friend] diff --git a/langpacks/russian/Untranslated/DbEditorPP.txt b/langpacks/russian/Untranslated/DbEditorPP.txt index b23b739868..134528f5bc 100644 --- a/langpacks/russian/Untranslated/DbEditorPP.txt +++ b/langpacks/russian/Untranslated/DbEditorPP.txt @@ -1,2 +1,28 @@ -[BL&OB] -[BLOB] +[Search and replace] +[Value] +[Paste the settings to import here:] +[&Fix resident settings] +[&Inline edit] +[Convert to] +[BL&OB] +[&Refresh] +[Copy module "%s"] +[Import to "%s"] +[Result] +[Replaced] +[Finished. Items found: %d / replaced: %d / deleted: %d] +[Closed module] +[Open module] +[Empty setting] +[[UNLOADED]] +[Fix resident setting deleting them from DB ?] +[Deleted orphaned items: %d] +[Add module to "%s"] +[Unable to store value in this data type!] +[Are you sure you want to delete setting(s): %d?] +[*** buggy resident ***] +[Unknown DBVariant type!] +[Edit setting (%s)] +[New setting (%s)] +[*** resident ***] +[Database Setting Changed: \nModule: "%s", Setting: "%s"\nNew Value (%s): "%s"] diff --git a/langpacks/russian/Untranslated/MirLua.txt b/langpacks/russian/Untranslated/MirLua.txt new file mode 100644 index 0000000000..72c27dfb20 --- /dev/null +++ b/langpacks/russian/Untranslated/MirLua.txt @@ -0,0 +1 @@ +[Reload] diff --git a/langpacks/russian/Untranslated/VKontakte.txt b/langpacks/russian/Untranslated/VKontakte.txt index 0f9449d34b..4bbae4de0f 100644 --- a/langpacks/russian/Untranslated/VKontakte.txt +++ b/langpacks/russian/Untranslated/VKontakte.txt @@ -1 +1,3 @@ -[Url:] +[Shorten links for audio attachments] +[Url:] +[returned to chat] -- cgit v1.2.3