From 1d562f91e8bfc5fadc75b0088a80eb97989ac76f Mon Sep 17 00:00:00 2001 From: RMN Date: Sun, 30 Aug 2015 13:34:06 +0000 Subject: - cosmetics and grammar correction; - Toaster translation template updated manually; - langpacks Russian and Ukrainian updated. git-svn-id: http://svn.miranda-ng.org/main/trunk@15116 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- langpacks/english/Plugins/Toaster.txt | 2 +- langpacks/russian/Plugins/FTPFile.txt | 2 +- langpacks/russian/Plugins/Jabber.txt | 4 ++-- langpacks/russian/Plugins/PluginUpdater.txt | 2 +- langpacks/russian/Plugins/SkypeWeb.txt | 4 +++- langpacks/russian/Plugins/Toaster.txt | 6 ++++++ langpacks/russian/Plugins/YAPP.txt | 2 +- langpacks/russian/Untranslated/SkypeWeb.txt | 1 - langpacks/russian/Untranslated/Toaster.txt | 3 --- langpacks/ukrainian/=CORE=.txt | 10 ++++++---- langpacks/ukrainian/Plugins/CmdLine.txt | 2 +- langpacks/ukrainian/Plugins/FTPFile.txt | 6 +++--- langpacks/ukrainian/Plugins/Facebook.txt | 2 +- langpacks/ukrainian/Plugins/IRC.txt | 2 +- langpacks/ukrainian/Plugins/Jabber.txt | 4 ++-- langpacks/ukrainian/Plugins/PluginUpdater.txt | 2 +- langpacks/ukrainian/Plugins/Quotes.txt | 2 +- langpacks/ukrainian/Plugins/SkypeWeb.txt | 4 +++- langpacks/ukrainian/Plugins/Toaster.txt | 13 +++++++++++++ langpacks/ukrainian/Plugins/VKontakte.txt | 2 +- langpacks/ukrainian/Plugins/_Various.txt | 19 +++++++++++++++++++ plugins/PluginUpdater/src/Options.cpp | 2 +- plugins/Toaster/src/main.cpp | 2 +- protocols/JabberG/src/jabber_opt.cpp | 2 +- protocols/SkypeWeb/src/skype_trouter.cpp | 14 +++++++------- 25 files changed, 77 insertions(+), 37 deletions(-) delete mode 100644 langpacks/russian/Untranslated/SkypeWeb.txt delete mode 100644 langpacks/russian/Untranslated/Toaster.txt create mode 100644 langpacks/ukrainian/Plugins/Toaster.txt diff --git a/langpacks/english/Plugins/Toaster.txt b/langpacks/english/Plugins/Toaster.txt index 31faf3bf03..ad810ffba1 100644 --- a/langpacks/english/Plugins/Toaster.txt +++ b/langpacks/english/Plugins/Toaster.txt @@ -8,4 +8,4 @@ [Provides popup services based on Windows toast notification for different plugins.] ;file \plugins\Toaster\src\main.cpp [This plugin requires Windows 8 or higher] -[Failed create shortcut] +[Failed to create shortcut] diff --git a/langpacks/russian/Plugins/FTPFile.txt b/langpacks/russian/Plugins/FTPFile.txt index 49a02b5be3..469281b762 100644 --- a/langpacks/russian/Plugins/FTPFile.txt +++ b/langpacks/russian/Plugins/FTPFile.txt @@ -204,7 +204,7 @@ FTP файл менеджер [Do you really want to cancel this upload?] Вы действительно хотите отменить эту загрузку? [Status: %s\r\nFile: %s\r\nServer: %S] -Состояние: %s\r\nФайл: %s\r\nСервер: %s +Состояние: %s\r\nФайл: %s\r\nСервер: %S [File exists - %s] Файл существует - %s [Error occurred when opening local file.\nAborting file upload...] diff --git a/langpacks/russian/Plugins/Jabber.txt b/langpacks/russian/Plugins/Jabber.txt index 4fe995eb52..2095c9285e 100644 --- a/langpacks/russian/Plugins/Jabber.txt +++ b/langpacks/russian/Plugins/Jabber.txt @@ -1397,8 +1397,8 @@ Jabber ошибка Исправлять время во входящих сообщениях [Disable frame] Выключить фрейм -[Enable XMPP link processing (requires Association Manager)] -Обрабатывать XMPP ссылки (требуется плагин Association Manager) +[Enable XMPP link processing (requires AssocMgr)] +Обрабатывать XMPP ссылки (требуется плагин AssocMgr) [Keep contacts assigned to local groups (ignore roster group)] Использовать локальные группы (игнорировать группы ростера) [Security] diff --git a/langpacks/russian/Plugins/PluginUpdater.txt b/langpacks/russian/Plugins/PluginUpdater.txt index 6e8913d67b..fce756ca21 100644 --- a/langpacks/russian/Plugins/PluginUpdater.txt +++ b/langpacks/russian/Plugins/PluginUpdater.txt @@ -155,7 +155,7 @@ Закрыть всплывающее окно [Do nothing] Ничего не делать -[Backup profile before update] +[Backup database before update] Резервировать профиль перед обновлением [Stable version (incompatible with current development version)] Стабильная версия (несовместима с версией в разработке) diff --git a/langpacks/russian/Plugins/SkypeWeb.txt b/langpacks/russian/Plugins/SkypeWeb.txt index 4a7046c557..8047c195a5 100644 --- a/langpacks/russian/Plugins/SkypeWeb.txt +++ b/langpacks/russian/Plugins/SkypeWeb.txt @@ -37,6 +37,8 @@ Использовать имя хоста [Use BBCode] Использовать BBCode +[Change password] +Изменить пароль [Enter password] Введите пароль [Save password] @@ -167,7 +169,7 @@ URI объект Звук входящего звонка [Incoming call canceled sound] Звук отмены входящего звонка -[Failed establish a TRouter connection.] +[Failed to establish a TRouter connection.] Невозможно установить соединение для TRouter. [Incoming call from %s] Входящий звонок от %s diff --git a/langpacks/russian/Plugins/Toaster.txt b/langpacks/russian/Plugins/Toaster.txt index 35460fcad6..fa7b916a77 100644 --- a/langpacks/russian/Plugins/Toaster.txt +++ b/langpacks/russian/Plugins/Toaster.txt @@ -5,3 +5,9 @@ ; Version: 0.11.1.0 ; Authors: Miranda NG team ;============================================================ +[Provides popup services based on Windows toast notification for different plugins.] +Предоставляет для различных плагинов сервис всплывающих окон на основе системной службы Toast Notification. +[This plugin requires Windows 8 or higher] +Для этого плагина требуется Windows 8 или новее. +[Failed to create shortcut] +Не удалось создать ярлык. diff --git a/langpacks/russian/Plugins/YAPP.txt b/langpacks/russian/Plugins/YAPP.txt index b7e84c9397..4d8b2a4cc9 100644 --- a/langpacks/russian/Plugins/YAPP.txt +++ b/langpacks/russian/Plugins/YAPP.txt @@ -6,7 +6,7 @@ ; Authors: Scott Ellis ;============================================================ [Yet Another Popup Plugin - Provides popup notification window services to other plugins.] -Предоставляет службу всплывающих сообщений другим плагинам. +Предоставляет сервис всплывающих окон для различных плагинов. [Popup history] История всплывающих окон [Close] diff --git a/langpacks/russian/Untranslated/SkypeWeb.txt b/langpacks/russian/Untranslated/SkypeWeb.txt deleted file mode 100644 index e18580fd6c..0000000000 --- a/langpacks/russian/Untranslated/SkypeWeb.txt +++ /dev/null @@ -1 +0,0 @@ -[Change password] diff --git a/langpacks/russian/Untranslated/Toaster.txt b/langpacks/russian/Untranslated/Toaster.txt deleted file mode 100644 index 79d0d9eb26..0000000000 --- a/langpacks/russian/Untranslated/Toaster.txt +++ /dev/null @@ -1,3 +0,0 @@ -[Provides popup services based on Windows toast notification for different plugins.] -[This plugin requires Windows 8 or higher] -[Failed create shortcut] diff --git a/langpacks/ukrainian/=CORE=.txt b/langpacks/ukrainian/=CORE=.txt index 13cca4b77f..92e569d8a7 100644 --- a/langpacks/ukrainian/=CORE=.txt +++ b/langpacks/ukrainian/=CORE=.txt @@ -2063,16 +2063,18 @@ Miranda намагається оновити вашу структуру збе Файл профілю не повинен знаходится в корневій папці Miranda. Перемістіть свій профіль на інше місце. [Miranda is unable to open '%s' because you do not have any profile plugins installed.\nYou need to install dbx_mmap.dll] Miranda не може відкрити "%s", оскільки не встановлено жодного драйвера бази.\nНеобхідно встановити dbx_mmap.dll або його аналог. -[No profile support installed!] -Відсутній драйвер бази [Miranda was unable to open '%s', it's in an unknown format.\nThis profile might also be damaged, please run DbChecker which should be installed.] Miranda не може відкрити "%s", формат профілю невідомий.\nМожливо, профіль пошкоджений, спробуйте полагодити його за допомогою DbChecker. -[Miranda can't understand that profile] -Miranda не може зрозуміти цей профіль [Miranda was unable to open '%s'\nIt's inaccessible or used by other application or Miranda instance] Miranda не може відкрити "%s".\nДо нього немає доступу або він використовується іншою програмою чи іншою копією Miranda NG. +[Miranda was unable to open '%s'\nThere is no suitable database driver installed] +Miranda не може відкрити '%s'.\nНе знайдено відповідного драйвера бази. +[No profile support installed!] +Відсутній драйвер бази! [Miranda can't open that profile] Miranda не може відкрити цей профіль +[Miranda can't understand that profile] +Miranda не може зрозуміти цей профіль [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.] diff --git a/langpacks/ukrainian/Plugins/CmdLine.txt b/langpacks/ukrainian/Plugins/CmdLine.txt index 98d9f97863..ee0e031f2e 100644 --- a/langpacks/ukrainian/Plugins/CmdLine.txt +++ b/langpacks/ukrainian/Plugins/CmdLine.txt @@ -2,7 +2,7 @@ ;============================================================ ; File: CmdLine.dll ; Plugin: Command line -; Version: 0.0.4.5 +; Version: 0.0.4.6 ; Authors: Cristian Libotean ;============================================================ [This plugin lets you control Miranda from the command line.] diff --git a/langpacks/ukrainian/Plugins/FTPFile.txt b/langpacks/ukrainian/Plugins/FTPFile.txt index 9dfdbecd80..05c3b8a1b2 100644 --- a/langpacks/ukrainian/Plugins/FTPFile.txt +++ b/langpacks/ukrainian/Plugins/FTPFile.txt @@ -2,7 +2,7 @@ ;============================================================ ; File: FTPFile.dll ; Plugin: FTP File YM -; Version: 0.6.0.1 +; Version: 0.6.0.2 ; Authors: yaho ;============================================================ [FTP a file to a server and send the URL to your friend. Supported automatic zipping before upload and encryption via SFTP and FTPS.] @@ -205,8 +205,8 @@ FTP-сервер 5 Помилка під час архівації файлів. [Do you really want to cancel this upload?] Ви дійсно хочете скасувати це завантаження? -[Status: %s\r\nFile: %s\r\nServer: %s] -Статус: %s\r\nФайл: %s\r\nСервер: %s +[Status: %s\r\nFile: %s\r\nServer: %S] +Статус: %s\r\nФайл: %s\r\nСервер: %S [File exists - %s] Файл уже існує - %s [Error occurred when opening local file.\nAborting file upload...] diff --git a/langpacks/ukrainian/Plugins/Facebook.txt b/langpacks/ukrainian/Plugins/Facebook.txt index c258e15d2d..f833646837 100644 --- a/langpacks/ukrainian/Plugins/Facebook.txt +++ b/langpacks/ukrainian/Plugins/Facebook.txt @@ -2,7 +2,7 @@ ;============================================================ ; File: Facebook.dll ; Plugin: Facebook RM -; Version: 0.2.11.3 +; Version: 0.2.11.4 ; Authors: Michal Zelinka, Robert Pösel ;============================================================ [Facebook protocol support for Miranda NG.] diff --git a/langpacks/ukrainian/Plugins/IRC.txt b/langpacks/ukrainian/Plugins/IRC.txt index 3fbb7a5f50..28be8b6a6a 100644 --- a/langpacks/ukrainian/Plugins/IRC.txt +++ b/langpacks/ukrainian/Plugins/IRC.txt @@ -182,7 +182,7 @@ Wildcard пошук по мережі [User limit:] Ліміт: [Private] -Конфіденційний +Приватний [Secret] Таємний [Topic] diff --git a/langpacks/ukrainian/Plugins/Jabber.txt b/langpacks/ukrainian/Plugins/Jabber.txt index bd1ff68233..aba367cc95 100644 --- a/langpacks/ukrainian/Plugins/Jabber.txt +++ b/langpacks/ukrainian/Plugins/Jabber.txt @@ -1401,8 +1401,8 @@ xHTML-формат повідомлень чату Виправляти час у вхідних повідомленнях [Disable frame] Вимкнути фрейм -[Enable XMPP link processing (requires Association Manager)] -Обробляти XMPP-посилання (потрібен плагін Association Manager) +[Enable XMPP link processing (requires AssocMgr)] +Обробляти XMPP-посилання (потрібен плагін AssocMgr) [Keep contacts assigned to local groups (ignore roster group)] Використовувати локальні групи (ігнорувати групи ростеру) [Security] diff --git a/langpacks/ukrainian/Plugins/PluginUpdater.txt b/langpacks/ukrainian/Plugins/PluginUpdater.txt index 9c70f4afd3..b4fd1ac506 100644 --- a/langpacks/ukrainian/Plugins/PluginUpdater.txt +++ b/langpacks/ukrainian/Plugins/PluginUpdater.txt @@ -155,7 +155,7 @@ Закрити вікно [Do nothing] Нічого не робити -[Backup profile before update] +[Backup database before update] Резервувати профіль перед оновленням [Stable version (incompatible with current development version)] Стабільна версія (несумісна з версією в розробці) diff --git a/langpacks/ukrainian/Plugins/Quotes.txt b/langpacks/ukrainian/Plugins/Quotes.txt index c0a4e6b11d..2a035cbe64 100644 --- a/langpacks/ukrainian/Plugins/Quotes.txt +++ b/langpacks/ukrainian/Plugins/Quotes.txt @@ -2,7 +2,7 @@ ;============================================================ ; File: Quotes.dll ; Plugin: Quotes -; Version: 0.0.26.0 +; Version: 0.1.0.1 ; Authors: Dioksin ;============================================================ [Shows currency rates and economic quotes.] diff --git a/langpacks/ukrainian/Plugins/SkypeWeb.txt b/langpacks/ukrainian/Plugins/SkypeWeb.txt index a788b86685..204c6efdd3 100644 --- a/langpacks/ukrainian/Plugins/SkypeWeb.txt +++ b/langpacks/ukrainian/Plugins/SkypeWeb.txt @@ -37,6 +37,8 @@ Використ. ім'я хоста [Use BBCode] Підтримка BBCode +[Change password] +Змінити пароль [Enter password] Введіть пароль [Save password] @@ -167,7 +169,7 @@ Вхідний дзвінок [Incoming call canceled sound] Вхідний дзвінок скасовано -[Failed establish a TRouter connection.] +[Failed to establish a TRouter connection.] Неможливо встановити з'єднання для TRouter. [Incoming call from %s] Вхідний дзвінок від %s diff --git a/langpacks/ukrainian/Plugins/Toaster.txt b/langpacks/ukrainian/Plugins/Toaster.txt new file mode 100644 index 0000000000..e0ab9bb838 --- /dev/null +++ b/langpacks/ukrainian/Plugins/Toaster.txt @@ -0,0 +1,13 @@ +#muuid {1fdbd8f0-3929-41bc-92d1-020779460769} +;============================================================ +; File: Toaster.dll +; Plugin: Toaster +; Version: 0.11.1.0 +; Authors: Miranda NG team +;============================================================ +[Provides popup services based on Windows toast notification for different plugins.] +Надає для інших плагінів службу спливаючих вікон на основі системної служби Toast Notification. +[This plugin requires Windows 8 or higher] +Для цього плагіна потрібна Windows 8 або новіша. +[Failed to create shortcut] +Не вдалося створити ярлик. diff --git a/langpacks/ukrainian/Plugins/VKontakte.txt b/langpacks/ukrainian/Plugins/VKontakte.txt index c8ea811462..08019990b9 100644 --- a/langpacks/ukrainian/Plugins/VKontakte.txt +++ b/langpacks/ukrainian/Plugins/VKontakte.txt @@ -2,7 +2,7 @@ ;============================================================ ; File: VKontakte.dll ; Plugin: VKontakte protocol -; Version: 0.1.1.12 +; Version: 0.1.1.13 ; Authors: Miranda NG Team ;============================================================ [VKontakte protocol support for Miranda NG.] diff --git a/langpacks/ukrainian/Plugins/_Various.txt b/langpacks/ukrainian/Plugins/_Various.txt index 4f4207c6f1..741bf97447 100644 --- a/langpacks/ukrainian/Plugins/_Various.txt +++ b/langpacks/ukrainian/Plugins/_Various.txt @@ -26,6 +26,25 @@ [Warning (colors only)] Попередження (тільки кольори) ;======================================================================= +; TabSRMM +;======================================================================= +[Message In] +Отримане повідомлення +[Message Out] +Надіслане повідомлення +[Group In (Start)] +Отримане (група, початок) +[Group Out (Start)] +Надіслане (група, початок) +[Group In (Inner)] +Отримане (група, середина) +[Group Out (Inner)] +Надіслане (група, середина) +[Status change] +Зміна статусу +[Error message] +Повідомлення про помилку +;======================================================================= ; Various actions and tipper items not included in source code ;======================================================================= [Last seen:] diff --git a/plugins/PluginUpdater/src/Options.cpp b/plugins/PluginUpdater/src/Options.cpp index 05ce2692b3..64b2a9b2eb 100644 --- a/plugins/PluginUpdater/src/Options.cpp +++ b/plugins/PluginUpdater/src/Options.cpp @@ -84,7 +84,7 @@ static INT_PTR CALLBACK UpdateNotifyOptsProc(HWND hwndDlg, UINT msg, WPARAM wPar if (ServiceExists(MS_AB_BACKUP)) { EnableWindow(GetDlgItem(hwndDlg, IDC_BACKUP), TRUE); - SetDlgItemText(hwndDlg, IDC_BACKUP, LPGENT("Backup profile before update")); + SetDlgItemText(hwndDlg, IDC_BACKUP, LPGENT("Backup database before update")); if(opts.bBackup) CheckDlgButton(hwndDlg, IDC_BACKUP, BST_CHECKED); } diff --git a/plugins/Toaster/src/main.cpp b/plugins/Toaster/src/main.cpp index 007391119b..72fe21d1fc 100644 --- a/plugins/Toaster/src/main.cpp +++ b/plugins/Toaster/src/main.cpp @@ -47,7 +47,7 @@ extern "C" int __declspec(dllexport) Load(void) { if (FAILED(TryCreateShortcut())) { - MessageBox(NULL, TranslateT("Failed create shortcut"), _T(MODULE), MB_OK | MB_ICONERROR); + MessageBox(NULL, TranslateT("Failed to create shortcut"), _T(MODULE), MB_OK | MB_ICONERROR); } } diff --git a/protocols/JabberG/src/jabber_opt.cpp b/protocols/JabberG/src/jabber_opt.cpp index e422eca806..30a1b3b212 100644 --- a/protocols/JabberG/src/jabber_opt.cpp +++ b/protocols/JabberG/src/jabber_opt.cpp @@ -801,7 +801,7 @@ public: m_otvOptions.AddOption(LPGENT("Other") _T("/") LPGENT("Automatically accept authorization requests"), m_proto->m_options.AutoAcceptAuthorization); m_otvOptions.AddOption(LPGENT("Other") _T("/") LPGENT("Fix incorrect timestamps in incoming messages"), m_proto->m_options.FixIncorrectTimestamps); m_otvOptions.AddOption(LPGENT("Other") _T("/") LPGENT("Disable frame"), m_proto->m_options.DisableFrame); - m_otvOptions.AddOption(LPGENT("Other") _T("/") LPGENT("Enable XMPP link processing (requires Association Manager)"), m_proto->m_options.ProcessXMPPLinks); + m_otvOptions.AddOption(LPGENT("Other") _T("/") LPGENT("Enable XMPP link processing (requires AssocMgr)"), m_proto->m_options.ProcessXMPPLinks); m_otvOptions.AddOption(LPGENT("Other") _T("/") LPGENT("Keep contacts assigned to local groups (ignore roster group)"), m_proto->m_options.IgnoreRosterGroups); m_otvOptions.AddOption(LPGENT("Security") _T("/") LPGENT("Allow servers to request version (XEP-0092)"), m_proto->m_options.AllowVersionRequests); diff --git a/protocols/SkypeWeb/src/skype_trouter.cpp b/protocols/SkypeWeb/src/skype_trouter.cpp index a5702b6b9c..d2bde973d0 100644 --- a/protocols/SkypeWeb/src/skype_trouter.cpp +++ b/protocols/SkypeWeb/src/skype_trouter.cpp @@ -21,13 +21,13 @@ void CSkypeProto::OnCreateTrouter(const NETLIBHTTPREQUEST *response) { if (response == NULL || response->pData == NULL) { - ShowNotification(m_tszUserName, TranslateT("Failed establish a TRouter connection."), NULL, 1); + ShowNotification(m_tszUserName, TranslateT("Failed to establish a TRouter connection."), NULL, 1); return; } JSONNode root = JSONNode::parse(response->pData); if (!root) { - ShowNotification(m_tszUserName, TranslateT("Failed establish a TRouter connection."), NULL, 1); + ShowNotification(m_tszUserName, TranslateT("Failed to establish a TRouter connection."), NULL, 1); return; } @@ -39,7 +39,7 @@ void CSkypeProto::OnCreateTrouter(const NETLIBHTTPREQUEST *response) if (!ccid || !connId || !instance || !socketio || !url) { - ShowNotification(m_tszUserName, TranslateT("Failed establish a TRouter connection."), NULL, 1); + ShowNotification(m_tszUserName, TranslateT("Failed to establish a TRouter connection."), NULL, 1); return; } @@ -56,14 +56,14 @@ void CSkypeProto::OnTrouterPoliciesCreated(const NETLIBHTTPREQUEST *response) { if (response == NULL || response->pData == NULL) { - ShowNotification(m_tszUserName, TranslateT("Failed establish a TRouter connection."), NULL, 1); + ShowNotification(m_tszUserName, TranslateT("Failed to establish a TRouter connection."), NULL, 1); return; } JSONNode root = JSONNode::parse(response->pData); if (!root) { - ShowNotification(m_tszUserName, TranslateT("Failed establish a TRouter connection."), NULL, 1); + ShowNotification(m_tszUserName, TranslateT("Failed to establish a TRouter connection."), NULL, 1); return; } @@ -73,7 +73,7 @@ void CSkypeProto::OnTrouterPoliciesCreated(const NETLIBHTTPREQUEST *response) if (!st || !se || !sig) { - ShowNotification(m_tszUserName, TranslateT("Failed establish a TRouter connection."), NULL, 1); + ShowNotification(m_tszUserName, TranslateT("Failed to establish a TRouter connection."), NULL, 1); return; } @@ -95,7 +95,7 @@ void CSkypeProto::OnGetTrouter(const NETLIBHTTPREQUEST *response) { if (response == NULL || response->pData == NULL) { - ShowNotification(m_tszUserName, TranslateT("Failed establish a TRouter connection."), NULL, 1); + ShowNotification(m_tszUserName, TranslateT("Failed to establish a TRouter connection."), NULL, 1); return; } -- cgit v1.2.3