From 476921e59a781e66f3043be0316c021a5290ef73 Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Tue, 16 Dec 2014 10:13:38 +0000 Subject: - langpacks/english: update; - langpacks/russian: update; git-svn-id: http://svn.miranda-ng.org/main/trunk@11448 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- langpacks/english/=CORE=.txt | 3 ++- langpacks/english/Plugins/Clist_blind.txt | 12 +++++------ langpacks/english/Plugins/Clist_modern.txt | 31 ++++++++++++++--------------- langpacks/english/Plugins/Clist_nicer.txt | 14 ++++++------- langpacks/english/Plugins/MRA.txt | 2 +- langpacks/english/Plugins/Scriver.txt | 5 ----- langpacks/english/Plugins/TabSRMM.txt | 14 ++++++------- langpacks/english/Plugins/VKontakte.txt | 18 +++++++++++++++-- langpacks/russian/Plugins/MRA.txt | 2 +- langpacks/russian/Plugins/Scriver.txt | 8 -------- langpacks/russian/Plugins/TabSRMM.txt | 24 ++++++++++------------ langpacks/russian/Plugins/VKontakte.txt | 32 +++++++++++++++++++++++++++--- langpacks/russian/Untranslated/=CORE=.txt | 1 + 13 files changed, 95 insertions(+), 71 deletions(-) diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt index c9fdb273be..97fde71e0f 100644 --- a/langpacks/english/=CORE=.txt +++ b/langpacks/english/=CORE=.txt @@ -677,7 +677,6 @@ [Mmm... food.] [idleeeeeeee] [Status] -;file \src\core\stdchat\src\colorchooser.cpp ;file \src\core\stdchat\src\main.cpp [Chat module] [Group chat log background] @@ -935,6 +934,7 @@ [Last message received on %s at %s.] [%s is typing a message...] ;file \src\core\stdmsg\src\msglog.cpp +[Me] [File sent] ;file \src\core\stdmsg\src\msgoptions.cpp [Outgoing messages] @@ -1046,6 +1046,7 @@ [&Leave chat] ;file \src\modules\chat\clist.cpp [&Open chat window] +;file \src\modules\chat\colorchooser.cpp ;file \src\modules\chat\log.cpp [%s has joined] [You have joined %s] diff --git a/langpacks/english/Plugins/Clist_blind.txt b/langpacks/english/Plugins/Clist_blind.txt index bb34c3cdd6..d3622a6810 100644 --- a/langpacks/english/Plugins/Clist_blind.txt +++ b/langpacks/english/Plugins/Clist_blind.txt @@ -7,7 +7,7 @@ ;============================================================ [A contact list for blind folks.] ;file \plugins\Clist_blind\res\resource.rc -[Delete Contact] +[Delete contact] [Are you sure you want to delete %s?] [This will erase all history and settings for this contact!] [Yes] @@ -16,11 +16,11 @@ [Use Options->Contacts->Ignore to unhide contacts.] [Hotkeys] [Show/Hide:] -[Read Message:] -[Web Search:] +[Read message:] +[Web search:] [URL:] [Open in new browser window] -[Show Options] +[Show options] [Hide offline users] [Hide empty groups] [Disable groups] @@ -70,7 +70,7 @@ [Show counts of number of contacts in a group] [Hide group counts when there are none online] [Sort groups alphabetically] -[Quicksearch in open groups only] +[Quick search in open groups only] [Templates] [Contact:] [Group:] @@ -133,6 +133,6 @@ [Global] ;file \plugins\Clist_blind\src\cluiopts.cpp ;file \plugins\Clist_blind\src\init.cpp -[Unknown Protocol] +[Unknown protocol] [Expanded] [Collapsed] diff --git a/langpacks/english/Plugins/Clist_modern.txt b/langpacks/english/Plugins/Clist_modern.txt index f55f8b0a47..de14140969 100644 --- a/langpacks/english/Plugins/Clist_modern.txt +++ b/langpacks/english/Plugins/Clist_modern.txt @@ -5,7 +5,7 @@ ; Version: 0.9.1.1 ; Authors: Artem Shpynov, Ricardo Pescuma Domenecci and Anton Senko based on clist_mw by Bethoven ;============================================================ -[Displays contacts, event notifications, protocol status with advantage visual modifications. Supported MW modifications, enhanced metacontact cooperation.] +[Displays contacts, event notifications, protocol status with advanced visual modifications. Supported multi-window modifications, enhanced metacontact cooperation.] ;file \plugins\Clist_modern\res\resource.rc [Transparency:] [Window behavior:] @@ -198,16 +198,15 @@ [Translucency options] [Enable drop shadow (restart required)] [Frames] -[Between frames:] -[After captions:] -[Gaps] +[Gaps between frames:] +[Gaps after captions:] [Use non-layered mode] [Round corners] [Non-layered mode] [Disable skin engine] [Enable Aero Glass (Vista+)] [Order of items:] -[Min row height:] +[Minimum row height:] [Row border:] [Variable row height] [Align left items to left] @@ -216,10 +215,10 @@ [Down] [Left margin:] [Right margin:] -[Compact mode\n(Show avatars and additional text on selected contacts only)] +[Compact mode (show avatars and additional text on selected contacts only)] [Draw border on avatar] [Draw overlay icons] -[Size:] +[Max size (pixels):] [Round corners of avatars] [Ignore size for row height calcs] [Border color:] @@ -228,7 +227,7 @@ [Protocol status icon] [Contact icon] [height] -[Max width] +[width] [Use old render method (fast, but has artifacts)] [Hide icon when showing avatar] [Draw icon in avatar space] @@ -267,11 +266,11 @@ [Align] [Options] [Visible] -[Show Title] +[Show title] [Locked] [Border] [Floating] -[Frames Order] +[Frames order] [UNDER CONSTRUCTION!!! IT DOES NOT WORK] [Row template] [Add container] @@ -393,7 +392,7 @@ [List] [Window] ;file \plugins\Clist_modern\src\modern_clistevents.cpp -[No Events] +[No events] [Event area background] [Event area] ;file \plugins\Clist_modern\src\modern_clistmenus.cpp @@ -412,14 +411,14 @@ [Icon] [Text] [Extra icons] -[Animate Avatars (GDI+ and Avatar Service module (avs.dll) are required)] +[Animate avatars (GDI+ and Avatar service module (avs.dll) are required)] [Left align group names] [Center group names] [Right align group names] [Row] [Row design] ;file \plugins\Clist_modern\src\modern_clistsettings.cpp -[(Unknown Contact)] +[(Unknown contact)] ;file \plugins\Clist_modern\src\modern_clisttray.cpp [Tray menu] [&Hide/show] @@ -437,7 +436,7 @@ [Close Miranda] [Main] [Restore last status] -[Show/Hide Offline Users] +[Show/Hide offline users] ;file \plugins\Clist_modern\src\modern_rowtemplateopt.cpp [Empty %s cell] [column] @@ -457,7 +456,7 @@ [This is second default Modern Contact list skin in Vista Aero style] [Angeli-Ka (graphics), FYR (template)] [Inside library] -[Skin Information] +[Skin information] [Preview is not available\n\n%s\n----------------------\n\n%s\n\nAUTHOR(S):\n%s\n\nCONTACT:\n%s\n\nHOMEPAGE:\n%s] [%s\n\n%s\n\nAUTHORS:\n%s\n\nCONTACT:\n%s\n\nWEB:\n%s\n\n\n] [graphics by Angeli-Ka\ntemplate by FYR] @@ -533,7 +532,7 @@ [Show all frames] [Show all title bars] [Hide all title bars] -[Lock Frame] +[Lock frame] ;file \plugins\Clist_modern\src\CLUIFrames\framesmenu.cpp [Frame menu] ;file \plugins\Clist_modern\src\CLUIFrames\groupmenu.cpp diff --git a/langpacks/english/Plugins/Clist_nicer.txt b/langpacks/english/Plugins/Clist_nicer.txt index 46f3808319..77070edc14 100644 --- a/langpacks/english/Plugins/Clist_nicer.txt +++ b/langpacks/english/Plugins/Clist_nicer.txt @@ -17,7 +17,7 @@ [Copyright © 2004-2010 by the Miranda IM project, 2012-2014 by the Miranda NG project. More detailed copyright information can be found in the included README file.] [Version] [Support and latest version information] -[Delete Contact] +[Delete contact] [No] [Yes] [Hide from list only, in order to keep their history and ignore/visibility settings] @@ -39,7 +39,7 @@ [Always show status in tooltip] [ms] [Event area] -[Set base visiblity on the frames menu] +[Set base visibility on the frames menu] [Auto mode] [System tray icon when using multiple protocols] [Show] @@ -54,9 +54,9 @@ [Show number of contacts in a group] [Hide numbers when all offline] [Sort groups alphabetically] -[Quicksearch in open groups only] +[Quick search in open groups only] [No expand/collapse icon] -[Center groupnames horizontally] +[Center group names horizontally] [Alignment] [Margins (left/right)] [Row gap] @@ -72,7 +72,7 @@ [Move events to the top of list or group] [Do not separate offline contacts] [Hide as offline] -[Tree Hide Offline] +[Tree hide offline] [Right align contacts] [Avatars] [Show avatars] @@ -137,7 +137,7 @@ [milliseconds] [Hide vertical scroll bar] [Gray out entire list when:] -[Tree Gray Out] +[Tree gray out] [Contact list background] [Use Windows colors] [Use background image] @@ -250,7 +250,7 @@ [&Delete group] [Move marked contacts to this group] [Appearance] -[Show metacontact proto icons] +[Show metacontact protocol icons] [Show additional buttons] [Draw sunken frame] ;file \plugins\Clist_nicer\skineditor\res\skinedit.rc diff --git a/langpacks/english/Plugins/MRA.txt b/langpacks/english/Plugins/MRA.txt index 1030b89f56..296c84f2bc 100644 --- a/langpacks/english/Plugins/MRA.txt +++ b/langpacks/english/Plugins/MRA.txt @@ -2,7 +2,7 @@ ;============================================================ ; File: MRA.dll ; Plugin: MRA protocol -; Version: 2.1.0.8 +; Version: 2.1.0.9 ; Authors: Rozhuk Ivan ;============================================================ [Miranda Mail.ru Agent protocol plugin.] diff --git a/langpacks/english/Plugins/Scriver.txt b/langpacks/english/Plugins/Scriver.txt index 9c9e4f0a3e..4ed28c8e30 100644 --- a/langpacks/english/Plugins/Scriver.txt +++ b/langpacks/english/Plugins/Scriver.txt @@ -334,12 +334,7 @@ [Always On Top] ;file \plugins\Scriver\src\sendqueue.cpp [The message send timed out.] -;file \plugins\Scriver\src\chat\colorchooser.cpp ;file \plugins\Scriver\src\chat\main.cpp -[Group chat log background] -[Nick list background] -[Nick list lines] -[Nick list background (selected)] ;file \plugins\Scriver\src\chat\options.cpp [Flash when someone speaks] [Flash when a word is highlighted] diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt index 1c1b53972f..de8c6d348f 100644 --- a/langpacks/english/Plugins/TabSRMM.txt +++ b/langpacks/english/Plugins/TabSRMM.txt @@ -2,7 +2,7 @@ ;============================================================ ; File: TabSRMM.dll ; Plugin: TabSRMM -; Version: 3.4.0.5 +; Version: 3.4.0.6 ; Authors: The Miranda developers team and contributors ;============================================================ [IM and group chat module for Miranda NG.] @@ -592,9 +592,9 @@ [Room Settings...] [Close Session] [Copy To Clipboard] -[\\tab \\ul\\b Status message:\\ul0\\b0 \\par %s] -[\\par\\par\\tab \\ul\\b Extended status information:\\ul0\\b0 \\par ] -[\\par\\par\\tab \\ul\\b Listening to:\\ul0\\b0 \\par %s] +[\\ul\\b Status message:\\ul0\\b0 \\par %s] +[\\par\\par\\ul\\b Extended status information:\\ul0\\b0 \\par ] +[\\par\\par\\ul\\b Listening to:\\ul0\\b0 \\par %s] [\\par\\par\\ul\\b Client:\\ul0\\b0 %s] [TabSRMM Information] [Set panel visibility for this %s] @@ -720,8 +720,6 @@ [Highlighting] [Choose status modes] ;file \plugins\TabSRMM\src\msgs.cpp -[The image service plugin (advaimg.dll) is not properly installed.\n\nTabSRMM is disabled.] -[TabSRMM fatal error] [Image tag] [Quote text] [Save and close] @@ -756,6 +754,8 @@ [Clock symbol (for the info panel clock)] [Feature disabled (used as overlay)] [Feature enabled (used as overlay)] +[The image service plugin (advaimg.dll) is not properly installed.\n\nTabSRMM is disabled.] +[TabSRMM fatal error] ;file \plugins\TabSRMM\src\msgs.h [Message windows - IM] [Message windows - all] @@ -923,8 +923,6 @@ [Closing Window|You are about to close a window with multiple tabs open.\n\nProceed?] [Closing options dialog|To reflect the changes done by importing a theme in the options dialog, the dialog must be closed after loading a theme \\b1 and unsaved changes might be lost\\b0 .\n\nDo you want to continue?] [Loading a theme|Loading a color and font theme can overwrite the settings defined by your skin.\n\nDo you want to continue?] -;file \plugins\TabSRMM\src\chat\colorchooser.cpp -[Text color] ;file \plugins\TabSRMM\src\chat\log.cpp [%s has joined] [You have joined %s] diff --git a/langpacks/english/Plugins/VKontakte.txt b/langpacks/english/Plugins/VKontakte.txt index c92bd47beb..8e7f391545 100644 --- a/langpacks/english/Plugins/VKontakte.txt +++ b/langpacks/english/Plugins/VKontakte.txt @@ -2,11 +2,17 @@ ;============================================================ ; File: VKontakte.dll ; Plugin: VKontakte protocol -; Version: 0.1.0.30 +; Version: 0.1.0.31 ; Authors: Miranda NG Team ;============================================================ [VKontakte protocol support for Miranda NG.] ;file \protocols\VKontakte\res\resource.rc +[News and event notifications] +[WARNING: Causes excessive network traffic!!!] +[Enable news feeds] +[Enable event notifications] +[BBCode support on news and event notifications] +[Interval for updates (min):] [E-mail or phone number:] [Password:] [Open VKontakte site] @@ -84,6 +90,12 @@ [&Destroy room] [&User details] [&Kick] +;file \protocols\VKontakte\src\vk_feed.cpp +[Photo] +[User was tagged in these photos:] +[News from %s%s%s (%s)\n%s] +[\tRepost from %s%s%s (%s)\n%s] +[\nNews link: %s] ;file \protocols\VKontakte\src\vk_files.cpp [Couldn't save file] [Invalid album id] @@ -101,6 +113,7 @@ ;file \protocols\VKontakte\src\vk_options.cpp [Network] [Account] +[News and notifications] ;file \protocols\VKontakte\src\vk_proto.cpp [%s server connection] [Create new chat] @@ -135,9 +148,10 @@ [\nIt will also] [Are you sure to report abuse on %s?] [Attachments:] -[Photo] [Audio] [Video] [Document] [Wall post] +[Link] +[Image] [Unsupported or unknown attachment type: %s] diff --git a/langpacks/russian/Plugins/MRA.txt b/langpacks/russian/Plugins/MRA.txt index 2ef07acf42..e405d19eb0 100644 --- a/langpacks/russian/Plugins/MRA.txt +++ b/langpacks/russian/Plugins/MRA.txt @@ -2,7 +2,7 @@ ;============================================================ ; File: MRA.dll ; Plugin: MRA protocol -; Version: 2.1.0.8 +; Version: 2.1.0.9 ; Authors: Rozhuk Ivan ;============================================================ [Miranda Mail.ru Agent protocol plugin.] diff --git a/langpacks/russian/Plugins/Scriver.txt b/langpacks/russian/Plugins/Scriver.txt index 97a0acf14c..90dc73a97a 100644 --- a/langpacks/russian/Plugins/Scriver.txt +++ b/langpacks/russian/Plugins/Scriver.txt @@ -623,14 +623,6 @@ Miranda не смогла загрузить встроенную систему Поверх всех окон [The message send timed out.] Таймаут отправки сообщения -[Group chat log background] -Фон журнала чата -[Nick list background] -Фон списка -[Nick list lines] -Линии списка -[Nick list background (selected)] -Фон списка (выбрано) [Flash when someone speaks] Мигать, когда кто-то говорит [Flash when a word is highlighted] diff --git a/langpacks/russian/Plugins/TabSRMM.txt b/langpacks/russian/Plugins/TabSRMM.txt index 2ec81c9cdb..f14a7facb4 100644 --- a/langpacks/russian/Plugins/TabSRMM.txt +++ b/langpacks/russian/Plugins/TabSRMM.txt @@ -2,7 +2,7 @@ ;============================================================ ; File: TabSRMM.dll ; Plugin: TabSRMM -; Version: 3.4.0.5 +; Version: 3.4.0.6 ; Authors: The Miranda developers team and contributors ;============================================================ [IM and group chat module for Miranda NG.] @@ -1155,12 +1155,12 @@ TabSRMM: Набирает Закрыть вкладку [Copy To Clipboard] Копировать в буфер -[\\tab \\ul\\b Status message:\\ul0\\b0 \\par %s] -\\tab \\ul\\b Сообщение статуса:\\ul0\\b0 \\par %s -[\\par\\par\\tab \\ul\\b Extended status information:\\ul0\\b0 \\par ] -\\par\\par\\tab \\ul\\b xСтатус:\\ul0\\b0 \\par\s -[\\par\\par\\tab \\ul\\b Listening to:\\ul0\\b0 \\par %s] -\\par\\par\\tab \\ul\\b Слушает:\\ul0\\b0 \\par %s +[\\ul\\b Status message:\\ul0\\b0 \\par %s] +\\ul\\b Сообщение статуса:\\ul0\\b0 \\par %s +[\\par\\par\\ul\\b Extended status information:\\ul0\\b0 \\par ] +\\par\\par\\ul\\b xСтатус:\\ul0\\b0 \\par\s +[\\par\\par\\ul\\b Listening to:\\ul0\\b0 \\par %s] +\\par\\par\\ul\\b Слушает:\\ul0\\b0 \\par %s [\\par\\par\\ul\\b Client:\\ul0\\b0 %s] \\par\\par\\ul\\b Клиент:\\ul0\\b0 %s [TabSRMM Information] @@ -1397,10 +1397,6 @@ TabSRMM: Набирает Подсветка [Choose status modes] Выбор режимов статуса -[The image service plugin (advaimg.dll) is not properly installed.\n\nTabSRMM is disabled.] -Не установлен плагин службы изображений (advaimg.dll)\n\nTabSRMM отключен. -[TabSRMM fatal error] -Критическая ошибка TabSRMM [Image tag] Изображение [Quote text] @@ -1469,6 +1465,10 @@ TabSRMM: Набирает Возможность выключена (используется как оверлей) [Feature enabled (used as overlay)] Возможность включена (используется как оверлей) +[The image service plugin (advaimg.dll) is not properly installed.\n\nTabSRMM is disabled.] +Не установлен плагин службы изображений (advaimg.dll)\n\nTabSRMM отключен. +[TabSRMM fatal error] +Критическая ошибка TabSRMM [Message windows - IM] Окна сообщений - IM [Message windows - all] @@ -1773,8 +1773,6 @@ TabSRMM: %s Закрытие настроек|Чтобы показать изменения, связанные с импортом схемы, в окне настроек, оно должно быть закрыто после загрузки схемы \\b1 и несохранённые изменения могут быть потеряны\\b0 .\n\nВы хотите продолжить? [Loading a theme|Loading a color and font theme can overwrite the settings defined by your skin.\n\nDo you want to continue?] Загрузка схемы|Загрузка цветов и шрифтов может изменить настройки, установленные вашим скином.\n\nВы хотите продолжить? -[Text color] -Цвет текста [%s has joined] %s вошёл [You have joined %s] diff --git a/langpacks/russian/Plugins/VKontakte.txt b/langpacks/russian/Plugins/VKontakte.txt index 426ad304e9..790b0470ca 100644 --- a/langpacks/russian/Plugins/VKontakte.txt +++ b/langpacks/russian/Plugins/VKontakte.txt @@ -2,11 +2,23 @@ ;============================================================ ; File: VKontakte.dll ; Plugin: VKontakte protocol -; Version: 0.1.0.30 +; Version: 0.1.0.31 ; Authors: Miranda NG Team ;============================================================ [VKontakte protocol support for Miranda NG.] Поддержка протокола ВКонтакте в Miranda NG. +[News and event notifications] +Новости и уведомления +[WARNING: Causes excessive network traffic!!!] +Предупреждение: высокое потребление сетевого трафика!!! +[Enable news feeds] +Включить ленту новостей +[Enable event notifications] +Включить уведомления +[BBCode support on news and event notifications] +Поддержка BB-кодов для новостей и уведомлений +[Interval for updates (min):] +Интервал обновлений (мин): [E-mail or phone number:] E-mail или номер телефона: [Password:] @@ -155,6 +167,16 @@ Cоздать комнату чата Информация о &контакте [&Kick] &Выкинуть +[Photo] +Фото +[User was tagged in these photos:] +Пользователь был отмечен на этих фотографиях +[News from %s%s%s (%s)\n%s] +Новость от %s%s%s (%s)\n%s +[\tRepost from %s%s%s (%s)\n%s] +\tРепост от %s%s%s (%s)\n%s +[\nNews link: %s] +\nСсылка на новость: %s [Couldn't save file] Невозможно сохранить файл [Invalid album id] @@ -183,6 +205,8 @@ Cоздать комнату чата Сеть [Account] Учётная запись +[News and notifications] +Новости и уведомления [%s server connection] Подключение к серверу %s [Create new chat] @@ -247,8 +271,6 @@ Cоздать комнату чата Вы уверены, что хотите отправить жалобу на %s? [Attachments:] Вложения: -[Photo] -Фото [Audio] Аудио [Video] @@ -257,5 +279,9 @@ Cоздать комнату чата Документ [Wall post] Запись на стене +[Link] +Ссылка +[Image] +Изображение [Unsupported or unknown attachment type: %s] Неподдерживаемый или неизвестный тип вложения: %s diff --git a/langpacks/russian/Untranslated/=CORE=.txt b/langpacks/russian/Untranslated/=CORE=.txt index 262a3a9f0a..c0266877de 100644 --- a/langpacks/russian/Untranslated/=CORE=.txt +++ b/langpacks/russian/Untranslated/=CORE=.txt @@ -1,5 +1,6 @@ [AaBbYyZz] [&E-mail] +[Me] [ID] [Ctrl + ] [Alt + ] -- cgit v1.2.3