diff options
23 files changed, 514 insertions, 568 deletions
diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt index eb1cae303d..1d9b6e8ad3 100644 --- a/langpacks/english/=CORE=.txt +++ b/langpacks/english/=CORE=.txt @@ -28,76 +28,6 @@ [Status messages:]
[Change %s message]
[Closing in %d]
-;file \src\core\stdchat\res\chat.rc
-[&Send]
-[&Emoticons]
-[&Bold]
-[&Italic]
-[&Underline]
-[&Color]
-[&Background color]
-[&History]
-[&Filter]
-[&Room settings]
-[&Show/Hide nick list]
-[Show these events only:]
-[Actions]
-[Messages]
-[Nick changes]
-[Users joining]
-[Users leaving]
-[Topic changes]
-[Status changes]
-[Information]
-[Disconnects]
-[User kicks]
-[Notices]
-[Options]
-[Log options]
-[Log timestamp]
-[Timestamp]
-[Other name]
-[Your name]
-[Enable highlighting]
-[Limit log text to (events):]
-[Trim to (KB)]
-[Words to highlight (wildcards allowed)]
-[Enable logging to disk]
-[Log directory]
-[Other]
-[Add new rooms to group:]
-[Nick list row distance (pixels):]
-[Use same style as in the message log]
-[Use default colors]
-[Use custom colors]
-[Popups for the Chat plugin]
-[Timeout (s)]
-[Text]
-[Background]
-[(Setting timeout to 0 means default setting and -1 means indefinite time)]
-[List]
-[&Message]
-[Log]
-[Clear lo&g]
-[Co&py all]
-[Word lookup]
-[Wikipedia]
-[Link]
-[Open a &new browser window]
-[&Open in current browser window]
-[&Copy link]
-[Message]
-[Undo]
-[Redo]
-[Copy]
-[Cut]
-[Paste]
-[Select all]
-[Clear]
-[Tabs]
-[&Close tab]
-[C&lose other tabs]
-[&Open at this position]
;file \src\core\stdclist\res\resource.rc
[Delete contact]
[No]
@@ -217,6 +147,7 @@ [Out to &lunch\tCtrl+9]
;file \src\core\stdfile\res\resource.rc
[Send file(s)]
+[&Send]
[Cancel]
[To:]
[File(s):]
@@ -224,6 +155,7 @@ [Total size:]
[Description:]
[&User menu]
+[&History]
[Incoming file transfer]
[A&ccept]
[&Decline]
@@ -339,6 +271,73 @@ [Save the window position for each contact]
[Message window behavior:]
[Messaging:]
+[&Emoticons]
+[&Bold]
+[&Italic]
+[&Underline]
+[&Color]
+[&Background color]
+[&Filter]
+[&Room settings]
+[&Show/Hide nick list]
+[Show these events only:]
+[Actions]
+[Messages]
+[Nick changes]
+[Users joining]
+[Users leaving]
+[Topic changes]
+[Status changes]
+[Information]
+[Disconnects]
+[User kicks]
+[Notices]
+[Options]
+[Log options]
+[Log timestamp]
+[Timestamp]
+[Other name]
+[Your name]
+[Enable highlighting]
+[Limit log text to (events):]
+[Trim to (KB)]
+[Words to highlight (wildcards allowed)]
+[Enable logging to disk]
+[Log directory]
+[Other]
+[Add new rooms to group:]
+[Nick list row distance (pixels):]
+[Use same style as in the message log]
+[Use default colors]
+[Use custom colors]
+[Popups for the Chat plugin]
+[Timeout (s)]
+[Text]
+[Background]
+[(Setting timeout to 0 means default setting and -1 means indefinite time)]
+[List]
+[&Message]
+[Log]
+[Clear lo&g]
+[Co&py all]
+[Word lookup]
+[Wikipedia]
+[Link]
+[Open a &new browser window]
+[&Open in current browser window]
+[&Copy link]
+[Message]
+[Undo]
+[Redo]
+[Copy]
+[Cut]
+[Paste]
+[Select all]
+[Clear]
+[Tabs]
+[&Close tab]
+[C&lose other tabs]
+[&Open at this position]
[C&lear log]
[&Copy]
[Select &all]
@@ -667,14 +666,110 @@ [Mmm... food.]
[idleeeeeeee]
[Status]
-;file \src\core\stdchat\src\main.cpp
+;file \src\core\stdclist\src\clcfonts.cpp
+[Standard contacts]
+[Online contacts to whom you have a different visibility]
+[Offline contacts]
+[Contacts which are 'not on list']
+[Group member counts]
+[Dividers]
+[Offline contacts to whom you have a different visibility]
+[Selected text]
+[Hottrack text]
+[Quicksearch text]
+;file \src\core\stdclist\src\clcopts.cpp
+[Not focused]
+[Offline]
+[Online]
+[Away]
+[Not available]
+[Occupied]
+[Do not disturb]
+[Free for chat]
+[Invisible]
+[Out to lunch]
+[On the phone]
+[List background]
+;file \src\core\stdclist\src\clistopts.cpp
+[Global]
+;file \src\core\stdclist\src\cluiopts.cpp
+;file \src\core\stdcrypt\src\encrypt.cpp
+[Standard crypto provider]
+;file \src\core\stdemail\src\email.cpp
+[User has not registered an e-mail address]
+[Send e-mail]
+[&E-mail]
+;file \src\core\stdfile\src\file.cpp
+[File from %s]
+[bytes]
+[&File]
+[File &transfers...]
+[Incoming]
+[Complete]
+[Error]
+[Denied]
+;file \src\core\stdfile\src\fileexistsdlg.cpp
+[%s file]
+[All files]
+;file \src\core\stdfile\src\fileopts.cpp
+[Executable files]
+[Events]
+;file \src\core\stdfile\src\filerecvdlg.cpp
+[Select folder]
+[My received files]
+[View user's history]
+[User menu]
+[Canceled]
+[This file transfer has been canceled by the other side]
+;file \src\core\stdfile\src\filesenddlg.cpp
+[%d files]
+[%d directories]
+;file \src\core\stdfile\src\filexferdlg.cpp
+[This file has not yet been scanned for viruses. Are you certain you want to open it?]
+[File received]
+[of]
+[Request sent, waiting for acceptance...]
+[Waiting for connection...]
+[Unable to initiate transfer.]
+[Contact menu]
+[Open...]
+[sec]
+[remaining]
+[Decision sent]
+[Connecting...]
+[Connecting to proxy...]
+[Connected]
+[Initializing...]
+[Moving to next file...]
+[Sending...]
+[Receiving...]
+[File transfer denied]
+[File transfer failed]
+[Transfer completed.]
+[Transfer completed, open file.]
+[Transfer completed, open folder.]
+[Scanning for viruses...]
+[Transfer and virus scan complete]
+;file \src\core\stdfile\src\ftmanager.cpp
+[Outgoing]
+;file \src\core\stdhelp\src\about.cpp
+[< Copyright]
+;file \src\core\stdhelp\src\help.cpp
+[&Help]
+[&About...]
+[&Support]
+[&Miranda NG homepage]
+[&Report bug]
+;file \src\core\stdidle\src\idle.cpp
+[Idle]
+;file \src\core\stdmsg\src\chat_manager.cpp
[Chat module]
[Group chat log background]
[Message background]
[Nick list background]
[Nick list lines]
[Nick list background (selected)]
-;file \src\core\stdchat\src\options.cpp
+;file \src\core\stdmsg\src\chat_options.cpp
[Use a tabbed interface]
[Close tab on double click]
[Restore previously open tabs when showing the window]
@@ -795,16 +890,15 @@ [Icons to display in the message log]
[Icons to display in the tray]
[Popups to display]
-[Select folder]
[Message sessions]
[General]
[Chat log]
[Popups]
-;file \src\core\stdchat\src\tools.cpp
+;file \src\core\stdmsg\src\chat_util.cpp
[Look up '%s':]
[No word to look up]
[&Message %s]
-;file \src\core\stdchat\src\window.cpp
+;file \src\core\stdmsg\src\chat_window.cpp
[Insert a smiley]
[Make the text bold (CTRL+B)]
[Make the text italicized (CTRL+I)]
@@ -816,107 +910,12 @@ [Control this room (CTRL+O)]
[Enable/disable the event filter (CTRL+F)]
[Close current tab (CTRL+F4)]
-[Nickname]
-[Unique ID]
[%s: chat room (%u user)]
[%s: chat room (%u users)]
[%s: message session]
[%s: message session (%u users)]
-;file \src\core\stdclist\src\clcfonts.cpp
-[Standard contacts]
-[Online contacts to whom you have a different visibility]
-[Offline contacts]
-[Contacts which are 'not on list']
-[Group member counts]
-[Dividers]
-[Offline contacts to whom you have a different visibility]
-[Selected text]
-[Hottrack text]
-[Quicksearch text]
-;file \src\core\stdclist\src\clcopts.cpp
-[Not focused]
-[Offline]
-[Online]
-[Away]
-[Not available]
-[Occupied]
-[Do not disturb]
-[Free for chat]
-[Invisible]
-[Out to lunch]
-[On the phone]
-[List background]
-;file \src\core\stdclist\src\clistopts.cpp
-[Global]
-;file \src\core\stdclist\src\cluiopts.cpp
-;file \src\core\stdcrypt\src\encrypt.cpp
-[Standard crypto provider]
-;file \src\core\stdemail\src\email.cpp
-[User has not registered an e-mail address]
-[Send e-mail]
-[&E-mail]
-;file \src\core\stdfile\src\file.cpp
-[File from %s]
-[bytes]
-[&File]
-[File &transfers...]
-[Incoming]
-[Complete]
-[Error]
-[Denied]
-;file \src\core\stdfile\src\fileexistsdlg.cpp
-[%s file]
-[All files]
-;file \src\core\stdfile\src\fileopts.cpp
-[Executable files]
-[Events]
-;file \src\core\stdfile\src\filerecvdlg.cpp
-[My received files]
-[View user's history]
-[User menu]
-[Canceled]
-[This file transfer has been canceled by the other side]
-;file \src\core\stdfile\src\filesenddlg.cpp
-[%d files]
-[%d directories]
-;file \src\core\stdfile\src\filexferdlg.cpp
-[This file has not yet been scanned for viruses. Are you certain you want to open it?]
-[File received]
-[of]
-[Request sent, waiting for acceptance...]
-[Waiting for connection...]
-[Unable to initiate transfer.]
-[Contact menu]
-[Open...]
-[sec]
-[remaining]
-[Decision sent]
-[Connecting...]
-[Connecting to proxy...]
-[Connected]
-[Initializing...]
-[Moving to next file...]
-[Sending...]
-[Receiving...]
-[File transfer denied]
-[File transfer failed]
-[Transfer completed.]
-[Transfer completed, open file.]
-[Transfer completed, open folder.]
-[Scanning for viruses...]
-[Transfer and virus scan complete]
-;file \src\core\stdfile\src\ftmanager.cpp
-[Outgoing]
-;file \src\core\stdhelp\src\about.cpp
-[< Copyright]
-;file \src\core\stdhelp\src\help.cpp
-[&Help]
-[&About...]
-[&Support]
-[&Miranda NG homepage]
-[&Report bug]
-;file \src\core\stdidle\src\idle.cpp
-[Idle]
+[Nickname]
+[Unique ID]
;file \src\core\stdmsg\src\cmdlist.cpp
[The message send timed out.]
;file \src\core\stdmsg\src\globals.cpp
@@ -1076,6 +1075,7 @@ [Notice from %s: %s]
[The topic is '%s']
[The topic is '%s' (set by %s)]
+[Nick]
;file \src\mir_app\src\clcitems.cpp
;file \src\mir_app\src\clistgroups.cpp
[New group]
@@ -1097,7 +1097,6 @@ ;file \src\mir_app\src\colorchooser.cpp
;file \src\mir_app\src\contacts.cpp
[My custom name (not movable)]
-[Nick]
[FirstName]
[E-mail]
[LastName]
diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt index 474d38f5f8..6eb3d6c701 100644 --- a/langpacks/english/Plugins/Jabber.txt +++ b/langpacks/english/Plugins/Jabber.txt @@ -502,7 +502,6 @@ [Status Message]
;file \protocols\JabberG\src\jabber_message_handlers.cpp
;file \protocols\JabberG\src\jabber_misc.cpp
-[Chat plugin is required for conferences. Install it before chatting]
[To]
[From]
[Both]
diff --git a/langpacks/english/Plugins/MRA.txt b/langpacks/english/Plugins/MRA.txt index 6a712bd48a..79c3b39821 100644 --- a/langpacks/english/Plugins/MRA.txt +++ b/langpacks/english/Plugins/MRA.txt @@ -117,7 +117,6 @@ [Owners]
[Inviter]
[Visitors]
-[Chat plugin is required for conferences. Install it before chatting]
[invite sender]
[invite new members]
;file \protocols\MRA\src\MraConstans.h
diff --git a/langpacks/english/Plugins/Quotes.txt b/langpacks/english/Plugins/Quotes.txt index 1c671fd602..e89565f368 100644 --- a/langpacks/english/Plugins/Quotes.txt +++ b/langpacks/english/Plugins/Quotes.txt @@ -2,7 +2,7 @@ ;============================================================
; File: Quotes.dll
; Plugin: Quotes
-; Version: 0.1.0.1
+; Version: 0.1.0.101
; Authors: Dioksin
;============================================================
[Shows currency rates and economic quotes.]
@@ -32,10 +32,6 @@ [Convert]
[Info provided by <a href="http://www.google.com">Google</a>]
[Close]
-[Chart]
-[Info provided by <a href="http://www.dukascopy.com">Dukascopy Swiss Forex Group</a>]
-[Get data from:]
-[Filter:]
[Popup Window Settings]
[Colors]
[Use default colors]
@@ -113,15 +109,6 @@ ;file \plugins\Quotes\src\ModuleInfo.cpp
[Miranda could not load Quotes plugin. XML parser is missing.]
[Miranda could not load Quotes plugin. Microsoft HTML parser is missing.]
-;file \plugins\Quotes\src\QuoteChart.cpp
-[Log File]
-[Miranda's History]
-[All]
-[Last Day]
-[Last Week]
-[Last Month]
-[Last Year]
-[User-Defined]
;file \plugins\Quotes\src\QuoteInfoDlg.cpp
;file \plugins\Quotes\src\QuotesProviderGoogle.cpp
[Error occurred during html parsing.]
diff --git a/langpacks/english/Plugins/Scriver.txt b/langpacks/english/Plugins/Scriver.txt index 150302508a..5fa7520b58 100644 --- a/langpacks/english/Plugins/Scriver.txt +++ b/langpacks/english/Plugins/Scriver.txt @@ -426,10 +426,10 @@ [Show/hide the nick list (CTRL+N)]
[Control this room (CTRL+O)]
[Enable/disable the event filter (CTRL+F)]
-[Nickname]
-[Unique ID]
-[Status]
[%s: chat room (%u user)]
[%s: chat room (%u users)]
[%s: message session]
[%s: message session (%u users)]
+[Nickname]
+[Unique ID]
+[Status]
diff --git a/langpacks/english/Plugins/SkypeWeb.txt b/langpacks/english/Plugins/SkypeWeb.txt index 21f5e65c55..b844253694 100644 --- a/langpacks/english/Plugins/SkypeWeb.txt +++ b/langpacks/english/Plugins/SkypeWeb.txt @@ -108,5 +108,4 @@ [Incoming call canceled sound]
[Skypename]
;file \protocols\SkypeWeb\src\skype_trouter.cpp
-[Failed to establish a TRouter connection.]
[Incoming call from %s]
diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt index b929b413d4..09de71311c 100644 --- a/langpacks/english/Plugins/TabSRMM.txt +++ b/langpacks/english/Plugins/TabSRMM.txt @@ -1098,8 +1098,6 @@ [Highlight user...]
[Edit highlight list...]
;file \plugins\TabSRMM\src\chat\window.cpp
-[Unique ID]
-[Nick]
[%s: chat room (%u user%s)]
[%s: chat room (%u users%s)]
[, event filter active]
diff --git a/langpacks/english/Plugins/VKontakte.txt b/langpacks/english/Plugins/VKontakte.txt index 33a96d5888..71b59dd405 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.2.7
+; Version: 0.1.2.8
; Authors: Miranda NG Team
;============================================================
[VKontakte protocol support for Miranda NG.]
@@ -163,6 +163,9 @@ [(Unknown contact)]
[Message from]
[at]
+[User restored control over own page]
+[User was deactivated (deleted)]
+[User was deactivated (banned)]
;file \protocols\VKontakte\src\vk_chats.cpp
[Participants]
[Owners]
@@ -271,6 +274,7 @@ [for all time]
[Errors]
[Notification]
+[VK user activate/deactivate action]
[User %s added as friend]
[You cannot add yourself as friend]
[Cannot add this user to friends as they have put you on their blacklist]
diff --git a/langpacks/english_gb/=CORE=.txt b/langpacks/english_gb/=CORE=.txt index 8a5271357f..9c19999b92 100644 --- a/langpacks/english_gb/=CORE=.txt +++ b/langpacks/english_gb/=CORE=.txt @@ -9,14 +9,6 @@ Authorisation request &Authorise
[Add to contact list if authorized]
Add to contact list if authorised
-[&Color]
-&Colour
-[&Background color]
-&Background colour
-[Use default colors]
-Use default colours
-[Use custom colors]
-Use custom colours
[Minimize to tray]
Minimise to tray
[Gray out entire list when:]
@@ -33,6 +25,14 @@ Minimise the file transfer window Minimise the message window on send
[Message window behavior:]
Message window behaviour:
+[&Color]
+&Colour
+[&Background color]
+&Background colour
+[Use default colors]
+Use default colours
+[Use custom colors]
+Use custom colours
[Send authorization request]
Send authorisation request
[Run program when Miranda NG starts (e.g., tail -f, dbgview, etc.):]
@@ -61,6 +61,12 @@ Secondary colour: %s requested authorisation\n%u on %s
[%s requested authorization\n%s on %s]
%s requested authorisation\n%s on %s
+[Canceled]
+Cancelled
+[This file transfer has been canceled by the other side]
+This file transfer has been cancelled by the other side
+[Initializing...]
+Initialising...
[Timestamp has same color as the event]
Timestamp has same colour as the event
[Strip colors from messages in the log]
@@ -71,12 +77,6 @@ Make the text italicised (CTRL+I) Select a background colour for the text (CTRL+L)
[Select a foreground color for the text (CTRL+K)]
Select a foreground colour for the text (CTRL+K)
-[Canceled]
-Cancelled
-[This file transfer has been canceled by the other side]
-This file transfer has been cancelled by the other side
-[Initializing...]
-Initialising...
[Please authorize my request and add me to your contact list.]
Please authorise my request and add me to your contact list.
[Authorization request from %s%s: %s]
diff --git a/langpacks/english_gb/Plugins/Quotes.txt b/langpacks/english_gb/Plugins/Quotes.txt index 9204f0d119..ed82275c30 100644 --- a/langpacks/english_gb/Plugins/Quotes.txt +++ b/langpacks/english_gb/Plugins/Quotes.txt @@ -2,7 +2,7 @@ ;============================================================
; File: Quotes.dll
; Plugin: Quotes
-; Version: 0.1.0.1
+; Version: 0.1.0.101
; Authors: Dioksin
;============================================================
[Colors]
diff --git a/langpacks/english_gb/Plugins/VKontakte.txt b/langpacks/english_gb/Plugins/VKontakte.txt index 1501e5e5bd..6777a1e8c4 100644 --- a/langpacks/english_gb/Plugins/VKontakte.txt +++ b/langpacks/english_gb/Plugins/VKontakte.txt @@ -2,7 +2,7 @@ ;============================================================
; File: VKontakte.dll
; Plugin: VKontakte protocol
-; Version: 0.1.2.7
+; Version: 0.1.2.8
; Authors: Miranda NG Team
;============================================================
[Please authorize me to add you to my friend list.]
diff --git a/langpacks/russian/=CORE=.txt b/langpacks/russian/=CORE=.txt index e73be21f85..3908990b58 100644 --- a/langpacks/russian/=CORE=.txt +++ b/langpacks/russian/=CORE=.txt @@ -49,144 +49,6 @@ Изменить сообщение "%s"
[Closing in %d]
Закрыть (%d)
-[&Send]
-&Отправить
-[&Emoticons]
-&Смайлы
-[&Bold]
-&Жирный
-[&Italic]
-&Курсив
-[&Underline]
-&Подчёркнутый
-[&Color]
-&Цвет
-[&Background color]
-Цвет &фона
-[&History]
-&История
-[&Filter]
-&Фильтр
-[&Room settings]
-&Настройки
-[&Show/Hide nick list]
-&Показать/Скрыть список пользователей
-[Show these events only:]
-Показывать только:
-[Actions]
-Действия
-[Messages]
-Сообщения
-[Nick changes]
-Смена ника
-[Users joining]
-Входы в чат
-[Users leaving]
-Выходы из чата
-[Topic changes]
-Смены темы
-[Status changes]
-Смены статуса
-[Information]
-Информация
-[Disconnects]
-Отключения
-[User kicks]
-Пинки
-[Notices]
-Уведомления
-[Options]
-Настройки
-[Log options]
-Настройки журнала
-[Log timestamp]
-Записывать время
-[Timestamp]
-Время
-[Other name]
-Имена других
-[Your name]
-Ваше имя
-[Enable highlighting]
-Включить выделение
-[Limit log text to (events):]
-Ограничить журнал до (событий):
-[Trim to (KB)]
-Лимит (КБ)
-[Words to highlight (wildcards allowed)]
-Слова для подсветки (разрешены маски)
-[Enable logging to disk]
-Запись журнала на диск
-[Log directory]
-Папка журнала
-[Other]
-Другое
-[Add new rooms to group:]
-Добавлять комнаты чата в группу:
-[Nick list row distance (pixels):]
-Расстояние между строками (пикс.):
-[Use same style as in the message log]
-Тот же стиль, что и в журнале
-[Use default colors]
-Цвета по умолчанию
-[Use custom colors]
-Задать цвета
-[Popups for the Chat plugin]
-Всплывающие окна чата
-[Timeout (s)]
-Длительность (с)
-[Text]
-Текст
-[Background]
-Фон
-[(Setting timeout to 0 means default setting and -1 means indefinite time)]
-(Установка таймаута в 0 = значение по умолчанию, -1 = бесконечно)
-[List]
-Список
-[&Message]
-&Сообщение
-[Log]
-Журнал
-[Clear lo&g]
-Очистить ча&т
-[Co&py all]
-Ко&пировать всё
-[Word lookup]
-Найти слово
-[Wikipedia]
-Википедия
-[Link]
-Ссылка
-[Open a &new browser window]
-Открыть в &новом окне
-[&Open in current browser window]
-&Открыть в текущем окне
-[&Copy link]
-&Копировать ссылку
-[Message]
-Сообщение
-[Undo]
-Откат
-[Redo]
-Вернуть
-[Copy]
-Копировать
-[Cut]
-Вырезать
-[Paste]
-Вставить
-[Select all]
-Выделить всё
-[Clear]
-Очистить
-[Tabs]
-Вкладки
-[&Close tab]
-&Закрыть вкладку
-[C&lose other tabs]
-За&крыть остальные вкладки
-[&Open at this position]
-&Открыть в этом месте
[Delete contact]
Удалить контакт
[No]
@@ -421,6 +283,8 @@ Обед&аю\tCtrl+9
[Send file(s)]
Отправить файл(ы)
+[&Send]
+&Отправить
[Cancel]
Отмена
[To:]
@@ -435,6 +299,8 @@ Описание:
[&User menu]
Меню &пользователя
+[&History]
+&История
[Incoming file transfer]
Входящий файл
[A&ccept]
@@ -659,6 +525,140 @@ Поведение окна сообщений:
[Messaging:]
Сообщения:
+[&Emoticons]
+&Смайлы
+[&Bold]
+&Жирный
+[&Italic]
+&Курсив
+[&Underline]
+&Подчёркнутый
+[&Color]
+&Цвет
+[&Background color]
+Цвет &фона
+[&Filter]
+&Фильтр
+[&Room settings]
+&Настройки
+[&Show/Hide nick list]
+&Показать/Скрыть список пользователей
+[Show these events only:]
+Показывать только:
+[Actions]
+Действия
+[Messages]
+Сообщения
+[Nick changes]
+Смена ника
+[Users joining]
+Входы в чат
+[Users leaving]
+Выходы из чата
+[Topic changes]
+Смены темы
+[Status changes]
+Смены статуса
+[Information]
+Информация
+[Disconnects]
+Отключения
+[User kicks]
+Пинки
+[Notices]
+Уведомления
+[Options]
+Настройки
+[Log options]
+Настройки журнала
+[Log timestamp]
+Записывать время
+[Timestamp]
+Время
+[Other name]
+Имена других
+[Your name]
+Ваше имя
+[Enable highlighting]
+Включить выделение
+[Limit log text to (events):]
+Ограничить журнал до (событий):
+[Trim to (KB)]
+Лимит (КБ)
+[Words to highlight (wildcards allowed)]
+Слова для подсветки (разрешены маски)
+[Enable logging to disk]
+Запись журнала на диск
+[Log directory]
+Папка журнала
+[Other]
+Другое
+[Add new rooms to group:]
+Добавлять комнаты чата в группу:
+[Nick list row distance (pixels):]
+Расстояние между строками (пикс.):
+[Use same style as in the message log]
+Тот же стиль, что и в журнале
+[Use default colors]
+Цвета по умолчанию
+[Use custom colors]
+Задать цвета
+[Popups for the Chat plugin]
+Всплывающие окна чата
+[Timeout (s)]
+Длительность (с)
+[Text]
+Текст
+[Background]
+Фон
+[(Setting timeout to 0 means default setting and -1 means indefinite time)]
+(Установка таймаута в 0 = значение по умолчанию, -1 = бесконечно)
+[List]
+Список
+[&Message]
+&Сообщение
+[Log]
+Журнал
+[Clear lo&g]
+Очистить ча&т
+[Co&py all]
+Ко&пировать всё
+[Word lookup]
+Найти слово
+[Wikipedia]
+Википедия
+[Link]
+Ссылка
+[Open a &new browser window]
+Открыть в &новом окне
+[&Open in current browser window]
+&Открыть в текущем окне
+[&Copy link]
+&Копировать ссылку
+[Message]
+Сообщение
+[Undo]
+Откат
+[Redo]
+Вернуть
+[Copy]
+Копировать
+[Cut]
+Вырезать
+[Paste]
+Вставить
+[Select all]
+Выделить всё
+[Clear]
+Очистить
+[Tabs]
+Вкладки
+[&Close tab]
+&Закрыть вкладку
+[C&lose other tabs]
+За&крыть остальные вкладки
+[&Open at this position]
+&Открыть в этом месте
[C&lear log]
Оч&истить журнал
[&Copy]
@@ -1301,6 +1301,164 @@ UIN, E-mail и т.д. ожидание...
[Status]
Статус
+[Standard contacts]
+Стандартные контакты
+[Online contacts to whom you have a different visibility]
+Контакты с изменённой видимостью (в сети)
+[Offline contacts]
+Отключённые контакты
+[Contacts which are 'not on list']
+Контакты 'не в списке'
+[Group member counts]
+Счётчики групп
+[Dividers]
+Разделители
+[Offline contacts to whom you have a different visibility]
+Контакты с изменённой видимостью (отключённые)
+[Selected text]
+Выделенный текст
+[Hottrack text]
+Под курсором
+[Quicksearch text]
+Быстрый поиск
+[Not focused]
+Не в фокусе
+[Offline]
+Не в сети
+[Online]
+В сети
+[Away]
+Отсутствую
+[Not available]
+Недоступен
+[Occupied]
+Занят
+[Do not disturb]
+Не беспокоить
+[Free for chat]
+Готов болтать
+[Invisible]
+Невидимый
+[Out to lunch]
+Обедаю
+[On the phone]
+На телефоне
+[List background]
+Фон списка
+[Global]
+Глобальные
+[Standard crypto provider]
+Поставщик шифрования по умолчанию
+[User has not registered an e-mail address]
+Пользователь не зарегистрировал свой адрес e-mail.
+[Send e-mail]
+Отправить e-mail
+[File from %s]
+Файл от %s
+[bytes]
+байт
+[&File]
+&Файл
+[File &transfers...]
+Передачи &файлов...
+[Incoming]
+Входящие
+[Complete]
+Готово
+[Error]
+Ошибка
+[Denied]
+Отказано
+[%s file]
+%s файл
+[All files]
+Все файлы
+[Executable files]
+Исполняемые файлы
+[Events]
+События
+[Select folder]
+Выбрать папку
+[My received files]
+Принятые файлы
+[View user's history]
+История сообщений
+[User menu]
+Меню пользователя
+[Canceled]
+Отменённые
+[This file transfer has been canceled by the other side]
+Передача файла отменена другой стороной
+[%d files]
+%d файла(ов)
+[%d directories]
+%d каталога(ов)
+[This file has not yet been scanned for viruses. Are you certain you want to open it?]
+Этот файл ещё не проверялся антивирусом. Вы всё-таки хотите открыть его?
+[File received]
+Файл получен
+[of]
+из
+[Request sent, waiting for acceptance...]
+Запрос отправлен, ожидание подтверждения...
+[Waiting for connection...]
+Ожидание соединения...
+[Unable to initiate transfer.]
+Невозможно начать передачу.
+[Contact menu]
+Меню контакта
+[Open...]
+Открыть...
+[sec]
+с
+[remaining]
+осталось
+[Decision sent]
+Решение отправлено
+[Connecting...]
+Подключение...
+[Connecting to proxy...]
+Подключение к прокси...
+[Connected]
+Подключён
+[Initializing...]
+Инициализация...
+[Moving to next file...]
+Следующий файл...
+[Sending...]
+Передача...
+[Receiving...]
+Получение...
+[File transfer denied]
+В передаче файла отказано
+[File transfer failed]
+Неудачная передача файла
+[Transfer completed.]
+Передача завершена.
+[Transfer completed, open file.]
+Передача завершена, открыть файл.
+[Transfer completed, open folder.]
+Передача завершена, открыть папку.
+[Scanning for viruses...]
+Проверка на вирусы...
+[Transfer and virus scan complete]
+Передача и проверка на вирусы завершены
+[Outgoing]
+Исходящие
+[< Copyright]
+< Авторские права
+[&Help]
+&Справка
+[&About...]
+&О программе...
+[&Support]
+&Поддержка
+[&Miranda NG homepage]
+О&фициальный сайт Miranda NG
+[&Report bug]
+Сооб&щить об ошибке
+[Idle]
+Ожидание
[Chat module]
Модуль чата
[Group chat log background]
@@ -1553,8 +1711,6 @@ UIN, E-mail и т.д. Значки в трее
[Popups to display]
Всплывающие окна
-[Select folder]
-Выбрать папку
[Message sessions]
Беседы
[General]
@@ -1591,10 +1747,6 @@ UIN, E-mail и т.д. Включить/выключить фильтр событий (CTRL+F)
[Close current tab (CTRL+F4)]
Закрыть текущую вкладку (CTRL+F4)
-[Nickname]
-Ник
-[Unique ID]
-Уник. ID
[%s: chat room (%u user)]
%s: комната чата (%u пользователь)
[%s: chat room (%u users)]
@@ -1603,162 +1755,10 @@ UIN, E-mail и т.д. %s: беседа
[%s: message session (%u users)]
%s: беседа (%u пользователей)
-[Standard contacts]
-Стандартные контакты
-[Online contacts to whom you have a different visibility]
-Контакты с изменённой видимостью (в сети)
-[Offline contacts]
-Отключённые контакты
-[Contacts which are 'not on list']
-Контакты 'не в списке'
-[Group member counts]
-Счётчики групп
-[Dividers]
-Разделители
-[Offline contacts to whom you have a different visibility]
-Контакты с изменённой видимостью (отключённые)
-[Selected text]
-Выделенный текст
-[Hottrack text]
-Под курсором
-[Quicksearch text]
-Быстрый поиск
-[Not focused]
-Не в фокусе
-[Offline]
-Не в сети
-[Online]
-В сети
-[Away]
-Отсутствую
-[Not available]
-Недоступен
-[Occupied]
-Занят
-[Do not disturb]
-Не беспокоить
-[Free for chat]
-Готов болтать
-[Invisible]
-Невидимый
-[Out to lunch]
-Обедаю
-[On the phone]
-На телефоне
-[List background]
-Фон списка
-[Global]
-Глобальные
-[Standard crypto provider]
-Поставщик шифрования по умолчанию
-[User has not registered an e-mail address]
-Пользователь не зарегистрировал свой адрес e-mail.
-[Send e-mail]
-Отправить e-mail
-[File from %s]
-Файл от %s
-[bytes]
-байт
-[&File]
-&Файл
-[File &transfers...]
-Передачи &файлов...
-[Incoming]
-Входящие
-[Complete]
-Готово
-[Error]
-Ошибка
-[Denied]
-Отказано
-[%s file]
-%s файл
-[All files]
-Все файлы
-[Executable files]
-Исполняемые файлы
-[Events]
-События
-[My received files]
-Принятые файлы
-[View user's history]
-История сообщений
-[User menu]
-Меню пользователя
-[Canceled]
-Отменённые
-[This file transfer has been canceled by the other side]
-Передача файла отменена другой стороной
-[%d files]
-%d файла(ов)
-[%d directories]
-%d каталога(ов)
-[This file has not yet been scanned for viruses. Are you certain you want to open it?]
-Этот файл ещё не проверялся антивирусом. Вы всё-таки хотите открыть его?
-[File received]
-Файл получен
-[of]
-из
-[Request sent, waiting for acceptance...]
-Запрос отправлен, ожидание подтверждения...
-[Waiting for connection...]
-Ожидание соединения...
-[Unable to initiate transfer.]
-Невозможно начать передачу.
-[Contact menu]
-Меню контакта
-[Open...]
-Открыть...
-[sec]
-с
-[remaining]
-осталось
-[Decision sent]
-Решение отправлено
-[Connecting...]
-Подключение...
-[Connecting to proxy...]
-Подключение к прокси...
-[Connected]
-Подключён
-[Initializing...]
-Инициализация...
-[Moving to next file...]
-Следующий файл...
-[Sending...]
-Передача...
-[Receiving...]
-Получение...
-[File transfer denied]
-В передаче файла отказано
-[File transfer failed]
-Неудачная передача файла
-[Transfer completed.]
-Передача завершена.
-[Transfer completed, open file.]
-Передача завершена, открыть файл.
-[Transfer completed, open folder.]
-Передача завершена, открыть папку.
-[Scanning for viruses...]
-Проверка на вирусы...
-[Transfer and virus scan complete]
-Передача и проверка на вирусы завершены
-[Outgoing]
-Исходящие
-[< Copyright]
-< Авторские права
-[&Help]
-&Справка
-[&About...]
-&О программе...
-[&Support]
-&Поддержка
-[&Miranda NG homepage]
-О&фициальный сайт Miranda NG
-[&Report bug]
-Сооб&щить об ошибке
-[Idle]
-Ожидание
+[Nickname]
+Ник
+[Unique ID]
+Уник. ID
[The message send timed out.]
Таймаут отправки сообщения
[Incoming message (10x10)]
@@ -2039,6 +2039,8 @@ Miranda не смогла загрузить встроенную систему Тема '%s'
[The topic is '%s' (set by %s)]
Тема '%s' (установлена %s)
+[Nick]
+Ник
[New group]
Новая группа
[Are you sure you want to delete group '%s'? This operation cannot be undone.]
@@ -2067,8 +2069,6 @@ Miranda не смогла загрузить встроенную систему &Добавить в постоянный список
[My custom name (not movable)]
Заданное имя (всегда первое)
-[Nick]
-Ник
[FirstName]
Имя
[E-mail]
diff --git a/langpacks/russian/Plugins/Jabber.txt b/langpacks/russian/Plugins/Jabber.txt index b0cc659a6a..a9dff32a19 100644 --- a/langpacks/russian/Plugins/Jabber.txt +++ b/langpacks/russian/Plugins/Jabber.txt @@ -2190,4 +2190,4 @@ Jabber vCard: редактирование телефона [I'm happy Miranda NG user. Get it at http://miranda-ng.org/.]
Я использую Miranda NG (http://miranda-ng.org/.)
[/me slaps %s around a bit with a large trout]
-/me шарахнул %s веслом по голове
+/me шарахнул %s веслом по голове
\ No newline at end of file diff --git a/langpacks/russian/Plugins/MRA.txt b/langpacks/russian/Plugins/MRA.txt index dd344e1cd2..b8245999ca 100644 --- a/langpacks/russian/Plugins/MRA.txt +++ b/langpacks/russian/Plugins/MRA.txt @@ -486,4 +486,4 @@ MRIM_CS_SMS_ACK: не найден в очереди [Music]
Музыка
[Dating]
-Знакомства
+Знакомства
\ No newline at end of file diff --git a/langpacks/russian/Plugins/Quotes.txt b/langpacks/russian/Plugins/Quotes.txt index 1899cc4580..f53cb630e1 100644 --- a/langpacks/russian/Plugins/Quotes.txt +++ b/langpacks/russian/Plugins/Quotes.txt @@ -2,7 +2,7 @@ ;============================================================
; File: Quotes.dll
; Plugin: Quotes
-; Version: 0.1.0.1
+; Version: 0.1.0.101
; Authors: Dioksin
;============================================================
[Shows currency rates and economic quotes.]
@@ -57,12 +57,6 @@ Источник: <a href="http://www.google.com">Google</a>
[Close]
Закрыть
-[Chart]
-Диаграмма
-[Info provided by <a href="http://www.dukascopy.com">Dukascopy Swiss Forex Group</a>]
-Источник: <a href="http://www.dukascopy.com">Dukascopy Swiss Forex Group</a>
-[Filter:]
-Фильтр
[Popup Window Settings]
Настройки всплывающих окон
[Colors]
@@ -195,22 +189,6 @@ HTTP подключение Quotes Не удалось загрузить плагин Quotes. Отсутствует парсер XML.
[Miranda could not load Quotes plugin. Microsoft HTML parser is missing.]
Не удалось загрузить плагин Quotes. Отсутствует парсер Microsoft HTML.
-[Log File]
-Файл журнала
-[Miranda's History]
-История Miranda
-[All]
-Все
-[Last Day]
-Последний день
-[Last Week]
-Последняя неделя
-[Last Month]
-Последний месяц
-[Last Year]
-Последний год
-[User-Defined]
-Настраивается пользователем
[Error occurred during site access.]
Ошибка при доступе к сайту.
[Quote Symbol]
diff --git a/langpacks/russian/Plugins/Scriver.txt b/langpacks/russian/Plugins/Scriver.txt index a0c4753660..5d852ef205 100644 --- a/langpacks/russian/Plugins/Scriver.txt +++ b/langpacks/russian/Plugins/Scriver.txt @@ -813,12 +813,6 @@ ID текущего контакта (если определён). Наприм Управление комнатой чата (CTRL+O)
[Enable/disable the event filter (CTRL+F)]
Включить/выключить фильтр событий (CTRL+F)
-[Nickname]
-Ник
-[Unique ID]
-Уник. ID
-[Status]
-Статус
[%s: chat room (%u user)]
%s: комната чата (%u пользователь)
[%s: chat room (%u users)]
@@ -827,3 +821,9 @@ ID текущего контакта (если определён). Наприм %s: беседа
[%s: message session (%u users)]
%s: беседа (%u пользователей)
+[Nickname]
+Ник
+[Unique ID]
+Уник. ID
+[Status]
+Статус
diff --git a/langpacks/russian/Plugins/SkypeWeb.txt b/langpacks/russian/Plugins/SkypeWeb.txt index 84fd4a1e43..9f2f8a4e7c 100644 --- a/langpacks/russian/Plugins/SkypeWeb.txt +++ b/langpacks/russian/Plugins/SkypeWeb.txt @@ -179,7 +179,5 @@ URI объект Звук отмены входящего звонка
[Skypename]
Логин Skype
-[Failed to establish a TRouter connection.]
-Невозможно установить соединение для TRouter.
[Incoming call from %s]
Входящий звонок от %s
diff --git a/langpacks/russian/Plugins/TabSRMM.txt b/langpacks/russian/Plugins/TabSRMM.txt index 5fdf480819..81c2610e1f 100644 --- a/langpacks/russian/Plugins/TabSRMM.txt +++ b/langpacks/russian/Plugins/TabSRMM.txt @@ -2111,10 +2111,6 @@ ID текущего контакта (если определён). Наприм Подсвечивать пользователей...
[Edit highlight list...]
Редактировать список подсветки...
-[Unique ID]
-Уник. ID
-[Nick]
-Ник
[%s: chat room (%u user%s)]
%s: комната чата (%u пользователь%s)
[%s: chat room (%u users%s)]
diff --git a/langpacks/russian/Plugins/VKontakte.txt b/langpacks/russian/Plugins/VKontakte.txt index b87dd46188..914c2f5739 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.2.7
+; Version: 0.1.2.8
; Authors: Miranda NG Team
;============================================================
[VKontakte protocol support for Miranda NG.]
diff --git a/langpacks/russian/Untranslated/Quotes.txt b/langpacks/russian/Untranslated/Quotes.txt index b9c6674052..f66a9a08d7 100644 --- a/langpacks/russian/Untranslated/Quotes.txt +++ b/langpacks/russian/Untranslated/Quotes.txt @@ -1,5 +1,4 @@ -[Get data from:]
-[Do not add to popup's history]
+[Do not add to popup's history]
[There is nothing to show]
[Enter text to display in contact list.]
[Error occurred during html parsing.]
diff --git a/langpacks/russian/Untranslated/VKontakte.txt b/langpacks/russian/Untranslated/VKontakte.txt index 4d2147c4cb..98017f861c 100644 --- a/langpacks/russian/Untranslated/VKontakte.txt +++ b/langpacks/russian/Untranslated/VKontakte.txt @@ -1 +1,5 @@ [URL:]
+[User restored control over own page]
+[User was deactivated (deleted)]
+[User was deactivated (banned)]
+[VK user activate/deactivate action]
diff --git a/protocols/JabberG/src/jabber_misc.cpp b/protocols/JabberG/src/jabber_misc.cpp index c6e995a074..1aba22e73c 100644 --- a/protocols/JabberG/src/jabber_misc.cpp +++ b/protocols/JabberG/src/jabber_misc.cpp @@ -41,16 +41,6 @@ void CJabberProto::AddContactToRoster(const wchar_t *jid, const wchar_t *nick, c }
///////////////////////////////////////////////////////////////////////////////
-// JabberChatDllError() - missing CHAT.DLL
-
-void JabberChatDllError()
-{
- MessageBox(NULL,
- TranslateT("Chat plugin is required for conferences. Install it before chatting"),
- TranslateT("Jabber Error"), MB_OK | MB_SETFOREGROUND);
-}
-
-///////////////////////////////////////////////////////////////////////////////
// JabberDBAddAuthRequest()
void CJabberProto::DBAddAuthRequest(const wchar_t *jid, const wchar_t *nick)
diff --git a/protocols/MRA/src/MraChat.cpp b/protocols/MRA/src/MraChat.cpp index 936ebdcb74..de0a69c52b 100644 --- a/protocols/MRA/src/MraChat.cpp +++ b/protocols/MRA/src/MraChat.cpp @@ -6,10 +6,6 @@ static LPWSTR lpwszStatuses[] = { LPGENW("Owners"), LPGENW("Inviter"), LPGENW("V #define MRA_CHAT_STATUS_INVITER 1
#define MRA_CHAT_STATUS_VISITOR 2
-void CMraProto::MraChatDllError()
-{
- MessageBox(NULL, TranslateT("Chat plugin is required for conferences. Install it before chatting"), m_tszUserName, (MB_OK | MB_ICONWARNING));
-}
bool CMraProto::MraChatRegister()
{
|