- langpacks/english: update;

- langpacks/russian: update; 



git-svn-id: http://svn.miranda-ng.org/main/trunk@13744 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

20 files changed, 96 insertions, 68 deletions

diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index 671a45fc46..6082821063 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -28,6 +28,7 @@
 [Contact display options]

 [Instead of displaying contacts by their nickname,\ndrag to choose another order:]

 [Miranda NG profile manager]

+[Manage your Miranda NG profile]

 [&Run]

 [&Exit]

 [Start in service mode with]

@@ -172,7 +173,7 @@
 [Service:]

 [Default]

 [Set]

-[Disable icons]

+[Enable icons]

 [Show accounts in the following order,\ndrag to choose another order:]

 [Account order and visibility]

 [Note: Miranda NG will have to be restarted for changes to take effect.]

@@ -1125,6 +1126,7 @@
 ;file \src\modules\clist\movetogroup.cpp

 [&Move to group]

 [<Root group>]

+;file \src\modules\clist\protocolorder.cpp

 ;file \src\modules\database\database.cpp

 [Miranda is trying to upgrade your profile structure.\nIt cannot move profile %s to the new location %s\nBecause profile with this name already exists. Please resolve the issue manually.]

 [Miranda is trying to upgrade your profile structure.\nIt cannot move profile %s to the new location %s automatically\nMost likely this is due to insufficient privileges. Please move profile manually.]

@@ -1165,7 +1167,6 @@
 [Size]

 [Created]

 [Modified]

-[Manage your Miranda NG profile]

 [My profiles]

 [New profile]

 ;file \src\modules\extraicons\DefaultExtraIcons.cpp

diff --git a/langpacks/english/Plugins/Dropbox.txt b/langpacks/english/Plugins/Dropbox.txt
index 203ec47b72..855b94e192 100644
--- a/langpacks/english/Plugins/Dropbox.txt
+++ b/langpacks/english/Plugins/Dropbox.txt
@@ -2,8 +2,8 @@
 ;============================================================

 ;  File: Dropbox.dll

 ;  Plugin: Dropbox

-;  Version: 0.11.0.3

-;  Authors: unsane

+;  Version: 0.12.0.4

+;  Authors: Miranda NG Team

 ;============================================================

 [Allows you to transfer files via Dropbox.]

 ;file \plugins\Dropbox\res\resource.rc

@@ -22,8 +22,8 @@
 [Copy download link to clipboard]

 ;file \plugins\Dropbox\src\dropbox.cpp

 [in process...]

-[you have been authorized]

 [server does not respond]

+[you have been authorized]

 ;file \plugins\Dropbox\src\dropbox_commands.cpp

 [Dropbox supports the following commands:]

 [shows all files in folder "dir" ("dir" can be omitted for root folder)]

@@ -34,16 +34,15 @@
 ["%s" command has invalid parameter.\nUse "/help" for more info.]

 [is not deleted]

 [is deleted]

-;file \plugins\Dropbox\src\dropbox_dialogs.cpp

-[you are already authorized]

-[you are not authorized yet]

 ;file \plugins\Dropbox\src\dropbox_events.cpp

 [Send files to Dropbox]

-[Network]

 ;file \plugins\Dropbox\src\dropbox_icons.cpp

-[Protocols]

 [Protocol icon]

 ;file \plugins\Dropbox\src\dropbox_menus.cpp

+;file \plugins\Dropbox\src\dropbox_options.cpp

+[you are already authorized]

+[you are not authorized yet]

+[Network]

+[Dropbox]

 ;file \plugins\Dropbox\src\dropbox_services.cpp

-[Unknown command "%s".\nUse "/help" for more info.]

 ["%s" is not valid.\nUse "/help" for more info.]

diff --git a/langpacks/english/Plugins/LotusNotify.txt b/langpacks/english/Plugins/LotusNotify.txt
index e84e3e06fc..5f4f4ca930 100644
--- a/langpacks/english/Plugins/LotusNotify.txt
+++ b/langpacks/english/Plugins/LotusNotify.txt
@@ -36,6 +36,7 @@
 [Offline status mean:]

 [To / CopyTo]

 [autoregister]

+[Keep connection on error]

 ;file \plugins\LotusNotify\src\LotusNotify.cpp

 [Unable to load all required Lotus API functions]

 [Lotus Notes Client not detected. Check plugin configuration description on install.txt]

diff --git a/langpacks/english/Plugins/MSN.txt b/langpacks/english/Plugins/MSN.txt
index 1afe1f77e8..97d51dd252 100644
--- a/langpacks/english/Plugins/MSN.txt
+++ b/langpacks/english/Plugins/MSN.txt
@@ -2,8 +2,8 @@
 ;============================================================

 ;  File: MSN.dll

 ;  Plugin: MSN protocol

-;  Version: 0.11.1.2

-;  Authors: Boris Krasnovskiy, George Hazan, Richard Hughes

+;  Version: 0.12.1.1

+;  Authors: Boris Krasnovskiy, George Hazan, Richard Hughes, leecher

 ;============================================================

 [Microsoft Network (MSN) protocol support for Miranda NG.]

 ;file \protocols\MSN\res\msn.rc

@@ -33,14 +33,14 @@
 [Somebody included you in his/her server list]

 [Refresh]

 [Hotmail]

-[Disable Popup notifications]

-[Disable Tray notifications]

+[Enable Popup notifications]

+[Enable Contact List notifications]

+[Enable Tray notifications]

 [Ignore new messages not in Inbox folder]

 [Other]

 [Display errors using popups]

 [Enable 'Chat Session Established' popup]

 [Enable 'Contact left channel' popup]

-[Disable Contact List notifications]

 [Set Nickname]

 [Cancel]

 [Mobile Device (used for SMS)]

@@ -62,18 +62,19 @@
 [Add]

 ;file \protocols\MSN\src\msn_chat.cpp

 [Chat #]

-[Me]

-[Others]

 [&Invite user...]

 [&Leave chat session]

 [User &details]

 [User &history]

+[&Kick user]

+[&Op user]

+[&Deop user]

 ;file \protocols\MSN\src\msn_commands.cpp

+[MSN Alert]

 [Contact tried to open an audio conference (not currently supported)]

 [%I64u bytes]

 [Accept NetMeeting request from %s?]

 [MSN Protocol]

-[MSN Alert]

 [Chat session established by my request]

 [Chat session established by contact request]

 [Contact left channel]

@@ -81,6 +82,7 @@
 [To resume the conversation, please quit this session and start a new chat session.]

 [There is only 1 person left in the chat, do you want to switch back to standard message window?]

 [MSN Chat]

+[Others]

 [Message delivery failed]

 ;file \protocols\MSN\src\msn_errors.cpp

 [User not online]

diff --git a/langpacks/english/Plugins/Omegle.txt b/langpacks/english/Plugins/Omegle.txt
index e48cf34756..b952a47174 100644
--- a/langpacks/english/Plugins/Omegle.txt
+++ b/langpacks/english/Plugins/Omegle.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Omegle.dll

 ;  Plugin: Omegle protocol

-;  Version: 0.1.2.2

+;  Version: 0.1.2.3

 ;  Authors: Robert Pösel

 ;============================================================

 [Omegle protocol support for Miranda NG.]

diff --git a/langpacks/english/Plugins/Popup.txt b/langpacks/english/Plugins/Popup.txt
index 3eaa427e45..a5a866f379 100644
--- a/langpacks/english/Plugins/Popup.txt
+++ b/langpacks/english/Plugins/Popup.txt
@@ -105,14 +105,15 @@
 [Fullscreen mode]

 [Debug]

 ;file \plugins\Popup\src\actions.cpp

-[No overwrite]

-[Send message]

 [Quick reply]

+[Send message]

 [User details]

 [Contact menu]

-[Dismiss popup]

+[Add permanently]

 [Pin popup]

+[Dismiss popup]

 [Copy to clipboard]

+[No overwrite]

 [Action]

 ;file \plugins\Popup\src\config.cpp

 [The Jabberwocky]

diff --git a/langpacks/english/Plugins/Tox.txt b/langpacks/english/Plugins/Tox.txt
index 4cb470f0a5..4a9ba7ad77 100644
--- a/langpacks/english/Plugins/Tox.txt
+++ b/langpacks/english/Plugins/Tox.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Tox.dll

 ;  Plugin: Tox protocol

-;  Version: 0.11.1.1

+;  Version: 0.11.1.5

 ;  Authors: Miranda NG Team

 ;============================================================

 [Tox protocol support for Miranda NG.]

diff --git a/langpacks/english/Plugins/WhenWasIt.txt b/langpacks/english/Plugins/WhenWasIt.txt
index ecaed75fa4..ffc582960d 100644
--- a/langpacks/english/Plugins/WhenWasIt.txt
+++ b/langpacks/english/Plugins/WhenWasIt.txt
@@ -107,8 +107,6 @@
 ;file \plugins\WhenWasIt\src\services.cpp

 [Starting to refresh user details]

 [Done refreshing user details]

-[Could not create worker thread. Error#%d - threadID %d]

-[Error]

 [Birthdays files]

 [Please select a file to import birthdays from...]

 [Importing birthdays from file: %s]

@@ -118,6 +116,7 @@
 [Exporting birthdays to file: %s]

 [Done exporting birthdays]

 [Could not open file to import birthdays]

+[Error]

 [Warning]

 [Could not open file to export birthdays]

 [Please do not edit this file by hand. Use the export function of WhenWasIt plugin.\n]

diff --git a/langpacks/english/Plugins/ZeroSwitch.txt b/langpacks/english/Plugins/ZeroSwitch.txt
new file mode 100644
index 0000000000..50a81f70ea
--- /dev/null
+++ b/langpacks/english/Plugins/ZeroSwitch.txt
@@ -0,0 +1,12 @@
+#muuid {3f1657b1-69cb-4992-9cfc-226c808a5202}

+;============================================================

+;  File: ZeroSwitch.dll

+;  Plugin: Zero switch

+;  Version: 1.0.0.1

+;  Authors: ZERO_BiT

+;============================================================

+[Adds Miranda NG icon into Alt-Tab switch dialog even if Miranda's main window has style other Title bar.]

+;file \plugins\ZeroSwitch\src\ZeroSwitch.cpp

+[Plugin works under Windows XP only]

+[ZeroSwitch plugin failed]

+[Oops, we've got a big hook error here :(]

diff --git a/langpacks/russian/=CORE=.txt b/langpacks/russian/=CORE=.txt
index 93b9deacd3..b4e230b752 100644
--- a/langpacks/russian/=CORE=.txt
+++ b/langpacks/russian/=CORE=.txt
@@ -51,6 +51,8 @@
 Вместо показа псевдонимов,\nвыберите перетаскиванием другой приоритет показа имён:

 [Miranda NG profile manager]

 Менеджер профилей Miranda NG

+[Manage your Miranda NG profile]

+Управление профилями пользователя

 [&Run]

 &Запустить

 [&Exit]

@@ -339,8 +341,8 @@ Cлужба:
 По умолчанию

 [Set]

 Выбрать

-[Disable icons]

-Отключить значки

+[Enable icons]

+Включить значки

 [Show accounts in the following order,\ndrag to choose another order:]

 Порядок отображения учётных записей.\nПеретаскивайте для изменения:

 [Account order and visibility]

@@ -2177,8 +2179,6 @@ Miranda NG не может открыть этот профиль
 Создан

 [Modified]

 Изменён

-[Manage your Miranda NG profile]

-Управление профилями пользователя

 [My profiles]

 Мои профили

 [New profile]

diff --git a/langpacks/russian/Plugins/Dropbox.txt b/langpacks/russian/Plugins/Dropbox.txt
index 9253897646..746d8bc04c 100644
--- a/langpacks/russian/Plugins/Dropbox.txt
+++ b/langpacks/russian/Plugins/Dropbox.txt
@@ -2,8 +2,8 @@
 ;============================================================

 ;  File: Dropbox.dll

 ;  Plugin: Dropbox

-;  Version: 0.11.0.3

-;  Authors: unsane

+;  Version: 0.12.0.4

+;  Authors: Miranda NG Team

 ;============================================================

 [Allows you to transfer files via Dropbox.]

 Загрузка и пересылка файлов с помощью Dropbox.

@@ -35,10 +35,10 @@
 Копировать ссылку в буфер обмена

 [in process...]

 в процессе...

-[you have been authorized]

-авторизация прошла успешно

 [server does not respond]

 сервер не отвечает

+[you have been authorized]

+авторизация прошла успешно

 [Dropbox supports the following commands:]

 Доступны следующие команды:

 [shows all files in folder "dir" ("dir" can be omitted for root folder)]

@@ -57,19 +57,15 @@
 не удалён

 [is deleted]

 удалён

+[Send files to Dropbox]

+Файл через Dropbox

+[Protocol icon]

+Значок протокола

 [you are already authorized]

 вы уже авторизованы

 [you are not authorized yet]

 вы ещё не авторизованы

-[Send files to Dropbox]

-Файл через Dropbox

 [Network]

 Сеть

-[Protocols]

-Протоколы

-[Protocol icon]

-Значок протокола

-[Unknown command "%s".\nUse "/help" for more info.]

-Неизвестная команда "%s".\nИспользуйте "/help" для получения справки.

 ["%s" is not valid.\nUse "/help" for more info.]

 "%s" не действительна.\nИспользуйте "/help" для получения справки.

diff --git a/langpacks/russian/Plugins/MSN.txt b/langpacks/russian/Plugins/MSN.txt
index 9a97b61a56..1adc49f693 100644
--- a/langpacks/russian/Plugins/MSN.txt
+++ b/langpacks/russian/Plugins/MSN.txt
@@ -2,8 +2,8 @@
 ;============================================================

 ;  File: MSN.dll

 ;  Plugin: MSN protocol

-;  Version: 0.11.1.2

-;  Authors: Boris Krasnovskiy, George Hazan, Richard Hughes

+;  Version: 0.12.1.1

+;  Authors: Boris Krasnovskiy, George Hazan, Richard Hughes, leecher

 ;============================================================

 [Microsoft Network (MSN) protocol support for Miranda NG.]

 Поддержка протокола Microsoft Network (MSN) в Miranda NG.

@@ -53,10 +53,12 @@
 Вы в списке контакта на сервере

 [Refresh]

 Обновить

-[Disable Popup notifications]

-Отключить уведомление всплывающими окнами

-[Disable Tray notifications]

-Отключить уведомления в трее

+[Enable Popup notifications]

+Включить уведомления всплывающими окнами

+[Enable Contact List notifications]

+Включить уведомления в списке контактов

+[Enable Tray notifications]

+Включить уведомления в трее

 [Ignore new messages not in Inbox folder]

 Игнорировать новые письма не из "Входящих"

 [Other]

@@ -67,8 +69,6 @@
 Всплывающее окно 'Чат сессия установлена'

 [Enable 'Contact left channel' popup]

 Всплывающее окно 'Контакт покинул канал'

-[Disable Contact List notifications]

-Отключить уведомления в списке контактов

 [Set Nickname]

 Ввод ника

 [Cancel]

@@ -107,10 +107,6 @@
 Добавить

 [Chat #]

 Чат #

-[Me]

-Я

-[Others]

-Другое

 [&Invite user...]

 П&ригласить пользователя...

 [&Leave chat session]

@@ -119,6 +115,14 @@
 &Информация

 [User &history]

 &История пользователя

+[&Kick user]

+&Выгнать пользователя

+[&Op user]

+&Сделать пользователя админом

+[&Deop user]

+&Снять с пользователя админ права

+[MSN Alert]

+MSN уведомление

 [Contact tried to open an audio conference (not currently supported)]

 Контакт пытался открыть аудиоконференцию (не поддерживается)

 [%I64u bytes]

@@ -127,8 +131,6 @@
 Принять запрос NetMeeting от %s?

 [MSN Protocol]

 Протокол MSN

-[MSN Alert]

-MSN уведомление

 [Chat session established by my request]

 Сессия установлена по моему запросу

 [Chat session established by contact request]

@@ -143,6 +145,8 @@ MSN уведомление
 В чате остался только один человек, вернуться к обычному окну сообщений?

 [MSN Chat]

 MSN Чат

+[Others]

+Другое

 [Message delivery failed]

 Доставка сообщения не удалась

 [User not online]

diff --git a/langpacks/russian/Plugins/Omegle.txt b/langpacks/russian/Plugins/Omegle.txt
index ef9e9d90d8..a7ea8767a0 100644
--- a/langpacks/russian/Plugins/Omegle.txt
+++ b/langpacks/russian/Plugins/Omegle.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Omegle.dll

 ;  Plugin: Omegle protocol

-;  Version: 0.1.2.2

+;  Version: 0.1.2.3

 ;  Authors: Robert Pösel

 ;============================================================

 [Omegle protocol support for Miranda NG.]

diff --git a/langpacks/russian/Plugins/Popup.txt b/langpacks/russian/Plugins/Popup.txt
index fdf0b89ffd..786547f85a 100644
--- a/langpacks/russian/Plugins/Popup.txt
+++ b/langpacks/russian/Plugins/Popup.txt
@@ -201,22 +201,24 @@ History++ для истории окон
 Полный экран

 [Debug]

 Отладка

-[No overwrite]

-нет действия

-[Send message]

-Отправить

 [Quick reply]

 Быстрый ответ

+[Send message]

+Отправить

 [User details]

 О пользователе

 [Contact menu]

 Меню контакта

-[Dismiss popup]

-Закрыть

+[Add permanently]

+Добавить в список

 [Pin popup]

 Закрепить

+[Dismiss popup]

+Закрыть

 [Copy to clipboard]

 Копировать в буфер обмена

+[No overwrite]

+нет действия

 [Action]

 Действие

 [The Jabberwocky]

diff --git a/langpacks/russian/Plugins/Tox.txt b/langpacks/russian/Plugins/Tox.txt
index ccbc1a52fb..29c07a0994 100644
--- a/langpacks/russian/Plugins/Tox.txt
+++ b/langpacks/russian/Plugins/Tox.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Tox.dll

 ;  Plugin: Tox protocol

-;  Version: 0.11.1.1

+;  Version: 0.11.1.5

 ;  Authors: Miranda NG Team

 ;============================================================

 [Tox protocol support for Miranda NG.]

diff --git a/langpacks/russian/Plugins/WhenWasIt.txt b/langpacks/russian/Plugins/WhenWasIt.txt
index 32f5e5af67..2134481b80 100644
--- a/langpacks/russian/Plugins/WhenWasIt.txt
+++ b/langpacks/russian/Plugins/WhenWasIt.txt
@@ -197,10 +197,6 @@
 Начало обновления информации о пользователях

 [Done refreshing user details]

 Обновление информации о пользователях завершено

-[Could not create worker thread. Error#%d - threadID %d]

-Не удалось создать рабочий поток. Ошибка #%d - threadID %d

-[Error]

-Ошибка

 [Birthdays files]

 Файлы дней рождений

 [Please select a file to import birthdays from...]

@@ -219,6 +215,8 @@
 Экспорт завершен

 [Could not open file to import birthdays]

 Невозможно открыть файл для импорта дней рождения

+[Error]

+Ошибка

 [Warning]

 Предупреждение

 [Could not open file to export birthdays]

diff --git a/langpacks/russian/Plugins/ZeroSwitch.txt b/langpacks/russian/Plugins/ZeroSwitch.txt
new file mode 100644
index 0000000000..2221887f8a
--- /dev/null
+++ b/langpacks/russian/Plugins/ZeroSwitch.txt
@@ -0,0 +1,7 @@
+#muuid {3f1657b1-69cb-4992-9cfc-226c808a5202}

+;============================================================

+;  File: ZeroSwitch.dll

+;  Plugin: Zero switch

+;  Version: 1.0.0.1

+;  Authors: ZERO_BiT

+;============================================================

diff --git a/langpacks/russian/Untranslated/Dropbox.txt b/langpacks/russian/Untranslated/Dropbox.txt
new file mode 100644
index 0000000000..56eb18c63d
--- /dev/null
+++ b/langpacks/russian/Untranslated/Dropbox.txt
@@ -0,0 +1 @@
+[Dropbox]

diff --git a/langpacks/russian/Untranslated/LotusNotify.txt b/langpacks/russian/Untranslated/LotusNotify.txt
index 28592d6b02..8e3205f37e 100644
--- a/langpacks/russian/Untranslated/LotusNotify.txt
+++ b/langpacks/russian/Untranslated/LotusNotify.txt
@@ -3,6 +3,7 @@
 [Offline status mean:]

 [To / CopyTo]

 [autoregister]

+[Keep connection on error]

 [Lotus Notes Client not detected. Check plugin configuration description on install.txt]

 [Unable to initialize Notes.]

 [Lotus Notes Extension Manager was not registered. Authentication function will not work properly]

diff --git a/langpacks/russian/Untranslated/ZeroSwitch.txt b/langpacks/russian/Untranslated/ZeroSwitch.txt
new file mode 100644
index 0000000000..a570695c56
--- /dev/null
+++ b/langpacks/russian/Untranslated/ZeroSwitch.txt
@@ -0,0 +1,4 @@
+[Adds Miranda NG icon into Alt-Tab switch dialog even if Miranda's main window has style other Title bar.]

+[Plugin works under Windows XP only]

+[ZeroSwitch plugin failed]

+[Oops, we've got a big hook error here :(]