- langpacks/english: update;

- langpacks/russian: update;

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

15 files changed, 62 insertions, 32 deletions

diff --git a/langpacks/english/Plugins/HwHotKeys.txt b/langpacks/english/Plugins/HwHotKeys.txt
new file mode 100644
index 0000000000..0fb3da88d7
--- /dev/null
+++ b/langpacks/english/Plugins/HwHotKeys.txt
@@ -0,0 +1,15 @@
+#muuid {315b3800-8258-44c4-b60e-58c50b9303b6}

+;langpack template for HwHotKeys

+;file \plugins\HwHotKeys\res\HwHotKeys.rc

+[Hardware HotKeys plugin\r\nAllows to assign expanded multimedia-keys (only for PS/2-keyboards)]

+[Close Miranda]

+[Assign]

+[Clear]

+[Show/Hide contact list]

+[Read message]

+[Last pressed key]

+[Extended flag (1xx), Hardware scan code (x23), KeyName]

+[Combine left/right keys Shift, Ctrl, Win, Alt]

+[Combination of keys for assignment]

+;file \plugins\HwHotKeys\src\HwHotKeys_DllMain.cpp

+[Customize]

diff --git a/langpacks/english/Plugins/IEView.txt b/langpacks/english/Plugins/IEView.txt
index 048b96086c..782a250415 100644
--- a/langpacks/english/Plugins/IEView.txt
+++ b/langpacks/english/Plugins/IEView.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: IEView.dll

 ;  Plugin: IEView

-;  Version: 1.4.0.2

+;  Version: 1.4.0.3

 ;  Authors: Piotr Piastucki, Francois Mean

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

 [IE Based Chat Log.]

diff --git a/langpacks/english/Plugins/IRC.txt b/langpacks/english/Plugins/IRC.txt
index b5b4e7b559..25532737bd 100644
--- a/langpacks/english/Plugins/IRC.txt
+++ b/langpacks/english/Plugins/IRC.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: IRC.dll

 ;  Plugin: IRC protocol

-;  Version: 0.11.0.2

+;  Version: 0.11.0.3

 ;  Authors: Miranda team

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

 [Internet Relay Chat (IRC) protocol support for Miranda NG.]

diff --git a/langpacks/english/Plugins/Import.txt b/langpacks/english/Plugins/Import.txt
index 28d785c4ac..ce608c9185 100644
--- a/langpacks/english/Plugins/Import.txt
+++ b/langpacks/english/Plugins/Import.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Import.dll

 ;  Plugin: Import contacts and messages

-;  Version: 0.95.4.1

+;  Version: 0.95.4.2

 ;  Authors: Miranda team

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

 [Imports contacts and messages from another Miranda profile or from an external program.]

@@ -84,7 +84,6 @@
 [Added %d contacts, %d groups and %d events.]

 [Skipped %d contacts.]

 [Skipped %d duplicates and %d filtered events.]

-[Skipped %d duplicates.]

 ;file \plugins\Import\src\main.cpp

 [&Import...]

 ;file \plugins\Import\src\miranda.cpp

diff --git a/langpacks/english/Plugins/MirOTR.txt b/langpacks/english/Plugins/MirOTR.txt
index 7284b0fa54..83720bf206 100644
--- a/langpacks/english/Plugins/MirOTR.txt
+++ b/langpacks/english/Plugins/MirOTR.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: MirOTR.dll

 ;  Plugin: Miranda OTR

-;  Version: 0.11.0.5

+;  Version: 0.14.1.15

 ;  Authors: ProgAndy & CHEF-KOCH

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

 [OTR (Off-the-Record) plugin for Miranda NG (using some code and ideas from SecureIM, Pidgin-OTR and old Miranda OTR (by SJE)).]

@@ -142,3 +142,5 @@
 [The following message received from '%s' was NOT encrypted: [%s]]

 ['%s' has sent a message intended for a different session. If you are logged in multiple times, another session may have received the message.]

 [unknown OTR message received, please report that to Miranda NG]

+;file \plugins\MirOTR\src\otr.h

+[ has requested an Off-the-Record private conversation. However, you do not have a plugin to support that.\nSee http://wikipedia.org/wiki/Off-the-Record_Messaging for more information.]

diff --git a/langpacks/english/Plugins/Weather.txt b/langpacks/english/Plugins/Weather.txt
index baf88bfcec..ac426f0179 100644
--- a/langpacks/english/Plugins/Weather.txt
+++ b/langpacks/english/Plugins/Weather.txt
@@ -172,6 +172,13 @@
 [%n   (%u)]

 [%c, %t\\nToday:  High %h, Low %l]

 [Temperature: %[Temperature]]

+[%c\tcurrent condition\n%d\tcurrent date\n%e\tdewpoint\n%f\tfeel-like temperature\n%h\ttoday's high\n%i\twind direction\n%l\ttoday's low\n%m\thumidity\n%n\tstation name\n%p\tpressure\n%r\tsunrise time\n%s\tstation ID\n%t\ttemperature\n%u\tupdate time\n%v\tvisibility\n%w\twind speed\n%y\tsun set]

+[%c\tcurrent condition\n%d\tcurrent date\n%e\tdewpoint\n%f\tfeel-like temp\n%h\ttoday's high\n%i\twind direction\n%l\ttoday's low\n%m\thumidity\n%n\tstation name\n%p\tpressure\n%r\tsunrise time\n%s\tstation ID\n%t\ttemperature\n%u\tupdate time\n%v\tvisibility\n%w\twind speed\n%y\tsun set\n----------\n\\n\tnew line]

+[No information available.\r\nPlease update weather condition first.]

+[%[..]\tcustom variables]

+[Here is a list of custom variables that are currently available]

+[The URL for complete forecast has not been set. You can set it from the Edit Settings dialog.]

+[The URL for weather map has not been set. You can set it from the Edit Settings dialog.]

 ;file \plugins\Weather\src\weather_addstn.cpp

 [Current weather information for %s.]

 [%s is now the default weather station]

@@ -181,8 +188,6 @@
 [<Enter station ID here>]

 ;file \plugins\Weather\src\weather_contacts.cpp

 [Weather condition was not logged.]

-[The URL for complete forecast have not been set. You can set it from the Edit Settings dialog.]

-[The URL for weather map have not been set. You can set it from the Edit Settings dialog.]

 [Get city name from ID]

 [Weather INI information]

 [Browse]

@@ -233,7 +238,6 @@
 [Memory Used:]

 [bytes]

 [Description:]

-[Here is a list of custom variables that are currently available]

 ;file \plugins\Weather\src\weather_ini.cpp

 [No update data file is found. Please check your Plugins\\Weather directory.]

 [Invalid ini format for: %s]

@@ -247,11 +251,8 @@
 [General]

 [Display]

 [Popups]

-[%c\tcurrent condition\n%d\tcurrent date\n%e\tdewpoint\n%f\tfeel-like temp\n%h\ttoday's high\n%i\twind direction\n%l\ttoday's low\n%m\thumidity\n%n\tstation name\n%p\tpressure\n%r\tsunrise time\n%s\tstation ID\n%t\ttemperature\n%u\tupdate time\n%v\tvisibility\n%w\twind speed\n%y\tsun set\n----------\n\\n\tnew line]

 [Weather Protocol Text Preview]

 ;file \plugins\Weather\src\weather_popup.cpp

-[%c\tcurrent condition\n%d\tcurrent date\n%e\tdewpoint\n%f\tfeel-like temperature\n%h\ttoday's high\n%i\twind direction\n%l\ttoday's low\n%m\thumidity\n%n\tstation name\n%p\tpressure\n%r\tsunrise time\n%s\tstation ID\n%t\ttemperature\n%u\tupdate time\n%v\tvisibility\n%w\twind speed\n%y\tsun set]

-[%[..]\tcustom variables]

 ;file \plugins\Weather\src\weather_svcs.cpp

 [Station ID]

 [Disable &weather notification]

@@ -275,4 +276,3 @@
 [Information]

 [Retrieving new data, please wait...]

 [More Info]

-[No information available.\r\nPlease update weather condition first.]

diff --git a/langpacks/russian/Plugins/HwHotKeys.txt b/langpacks/russian/Plugins/HwHotKeys.txt
new file mode 100644
index 0000000000..b63fa1163d
--- /dev/null
+++ b/langpacks/russian/Plugins/HwHotKeys.txt
@@ -0,0 +1,10 @@
+#muuid {315b3800-8258-44c4-b60e-58c50b9303b6}

+;langpack template for HwHotKeys

+[Clear]

+Очистить

+[Show/Hide contact list]

+Показать/Скрыть список контактов

+[Read message]

+Прочитать сообщение

+[Customize]

+Тонкая настройка

diff --git a/langpacks/russian/Plugins/IEView.txt b/langpacks/russian/Plugins/IEView.txt
index 38261cc16c..6f0800d2ea 100644
--- a/langpacks/russian/Plugins/IEView.txt
+++ b/langpacks/russian/Plugins/IEView.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: IEView.dll

 ;  Plugin: IEView

-;  Version: 1.4.0.2

+;  Version: 1.4.0.3

 ;  Authors: Piotr Piastucki, Francois Mean

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

 [IE Based Chat Log.]

diff --git a/langpacks/russian/Plugins/IRC.txt b/langpacks/russian/Plugins/IRC.txt
index 3f8e3623ba..e0d44e91a2 100644
--- a/langpacks/russian/Plugins/IRC.txt
+++ b/langpacks/russian/Plugins/IRC.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: IRC.dll

 ;  Plugin: IRC protocol

-;  Version: 0.11.0.2

+;  Version: 0.11.0.3

 ;  Authors: Miranda team

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

 [Internet Relay Chat (IRC) protocol support for Miranda NG.]

diff --git a/langpacks/russian/Plugins/Import.txt b/langpacks/russian/Plugins/Import.txt
index 2c18852704..9eabbd4f17 100644
--- a/langpacks/russian/Plugins/Import.txt
+++ b/langpacks/russian/Plugins/Import.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Import.dll

 ;  Plugin: Import contacts and messages

-;  Version: 0.95.4.1

+;  Version: 0.95.4.2

 ;  Authors: Miranda team

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

 [Imports contacts and messages from another Miranda profile or from an external program.]

@@ -159,8 +159,6 @@ Miranda нашла следующие профили. Выберите проф�
 Пропущено %d контактов.

 [Skipped %d duplicates and %d filtered events.]

 Пропущено %d дубликатов и %d отфильтрованных событий.

-[Skipped %d duplicates.]

-Пропущено %d дубликатов.

 [&Import...]

 &Импорт...

 [The given file does not exist. Please check that you have entered the name correctly.]

diff --git a/langpacks/russian/Plugins/MirOTR.txt b/langpacks/russian/Plugins/MirOTR.txt
index 286f27c8d5..1d943a2201 100644
--- a/langpacks/russian/Plugins/MirOTR.txt
+++ b/langpacks/russian/Plugins/MirOTR.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: MirOTR.dll

 ;  Plugin: Miranda OTR

-;  Version: 0.11.0.5

+;  Version: 0.14.1.15

 ;  Authors: ProgAndy & CHEF-KOCH

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

 [OTR (Off-the-Record) plugin for Miranda NG (using some code and ideas from SecureIM, Pidgin-OTR and old Miranda OTR (by SJE)).]

diff --git a/langpacks/russian/Plugins/Weather.txt b/langpacks/russian/Plugins/Weather.txt
index 33b28a252d..0ec9ce8499 100644
--- a/langpacks/russian/Plugins/Weather.txt
+++ b/langpacks/russian/Plugins/Weather.txt
@@ -329,6 +329,16 @@ INI файл погоды для этой станции не найден (20)
 %c, %t\\nСегодня:  макс. %h, мин. %l

 [Temperature: %[Temperature]]

 Температура: %[Temperature]

+[%c\tcurrent condition\n%d\tcurrent date\n%e\tdewpoint\n%f\tfeel-like temperature\n%h\ttoday's high\n%i\twind direction\n%l\ttoday's low\n%m\thumidity\n%n\tstation name\n%p\tpressure\n%r\tsunrise time\n%s\tstation ID\n%t\ttemperature\n%u\tupdate time\n%v\tvisibility\n%w\twind speed\n%y\tsun set]

+%c\tпрогноз на сегодня\n%d\tтекущая дата\n%e\tроса\n%f\tощущение\n%h\tмаксимум\n%i\tнаправление ветра\n%l\tминимум\n%m\tвлажность\n%n\tгород\n%p\tдавление\n%r\tвосход\n%s\tID города\n%t\tтемпература\n%u\tобновление\n%v\tвидимость\n%w\tскорость ветра\n%y\tзакат

+[%c\tcurrent condition\n%d\tcurrent date\n%e\tdewpoint\n%f\tfeel-like temp\n%h\ttoday's high\n%i\twind direction\n%l\ttoday's low\n%m\thumidity\n%n\tstation name\n%p\tpressure\n%r\tsunrise time\n%s\tstation ID\n%t\ttemperature\n%u\tupdate time\n%v\tvisibility\n%w\twind speed\n%y\tsun set\n----------\n\\n\tnew line]

+%c   прогноз на сегодня\n%d   текущая дата\n%e   роса\n%f   ощущение\n%h   максимум\n%i   направление ветра\n%l   минимум\n%m   влажность\n%n   город\n%p   давление\n%r   восход\n%s   ID города\n%t   температура\n%u   обновление\n%v   видимость\n%w   скорость ветра\n%y   закат\n----------\n\\n   новая строка

+[No information available.\r\nPlease update weather condition first.]

+Информация недоступна.\r\nПредварительно обновите данные о погоде.

+[%[..]\tcustom variables]

+%[..]\tсвои переменные

+[Here is a list of custom variables that are currently available]

+Список дополнительных переменных, доступных на данный момент

 [Current weather information for %s.]

 Текущая информация о погоде для %s.

 [%s is now the default weather station]

@@ -343,10 +353,6 @@ INI файл погоды для этой станции не найден (20)
 <Введите ID города>

 [Weather condition was not logged.]

 Журнал погоды не ведется.

-[The URL for complete forecast have not been set. You can set it from the Edit Settings dialog.]

-Не указан URL для полного прогноза погоды. Укажите его в настройках.

-[The URL for weather map have not been set. You can set it from the Edit Settings dialog.]

-Не указан URL для карты погоды. Вы можете указать его в меню Настройки.

 [Get city name from ID]

 Получить название города по ID

 [Weather INI information]

@@ -437,8 +443,6 @@ HTTP подключение Weather
 байт

 [Description:]

 Описание:

-[Here is a list of custom variables that are currently available]

-Список дополнительных переменных, доступных на данный момент

 [No update data file is found. Please check your Plugins\\Weather directory.]

 Не найдено ни одного файла INI. Пожалуйста, проверьте папку Plugins\\Weather.

 [Invalid ini format for: %s]

@@ -459,14 +463,8 @@ HTTP подключение Weather
 Показывать

 [Popups]

 Всплывающие окна

-[%c\tcurrent condition\n%d\tcurrent date\n%e\tdewpoint\n%f\tfeel-like temp\n%h\ttoday's high\n%i\twind direction\n%l\ttoday's low\n%m\thumidity\n%n\tstation name\n%p\tpressure\n%r\tsunrise time\n%s\tstation ID\n%t\ttemperature\n%u\tupdate time\n%v\tvisibility\n%w\twind speed\n%y\tsun set\n----------\n\\n\tnew line]

-%c   прогноз на сегодня\n%d   текущая дата\n%e   роса\n%f   ощущение\n%h   максимум\n%i   направление ветра\n%l   минимум\n%m   влажность\n%n   город\n%p   давление\n%r   восход\n%s   ID города\n%t   температура\n%u   обновление\n%v   видимость\n%w   скорость ветра\n%y   закат\n----------\n\\n   новая строка

 [Weather Protocol Text Preview]

 Просмотр протокола погоды

-[%c\tcurrent condition\n%d\tcurrent date\n%e\tdewpoint\n%f\tfeel-like temperature\n%h\ttoday's high\n%i\twind direction\n%l\ttoday's low\n%m\thumidity\n%n\tstation name\n%p\tpressure\n%r\tsunrise time\n%s\tstation ID\n%t\ttemperature\n%u\tupdate time\n%v\tvisibility\n%w\twind speed\n%y\tsun set]

-%c\tпрогноз на сегодня\n%d\tтекущая дата\n%e\tроса\n%f\tощущение\n%h\tмаксимум\n%i\tнаправление ветра\n%l\tминимум\n%m\tвлажность\n%n\tгород\n%p\tдавление\n%r\tвосход\n%s\tID города\n%t\tтемпература\n%u\tобновление\n%v\tвидимость\n%w\tскорость ветра\n%y\tзакат

-[%[..]\tcustom variables]

-%[..]\tсвои переменные

 [Station ID]

 ID города

 [Disable &weather notification]

@@ -507,5 +505,3 @@ ID города
 Получаю новые данные. Подождите, пожалуйста...

 [More Info]

 Подробнее

-[No information available.\r\nPlease update weather condition first.]

-Информация недоступна.\r\nПредварительно обновите данные о погоде.

diff --git a/langpacks/russian/Untranslated/HwHotKeys.txt b/langpacks/russian/Untranslated/HwHotKeys.txt
new file mode 100644
index 0000000000..51be63431a
--- /dev/null
+++ b/langpacks/russian/Untranslated/HwHotKeys.txt
@@ -0,0 +1,7 @@
+[Hardware HotKeys plugin\r\nAllows to assign expanded multimedia-keys (only for PS/2-keyboards)]

+[Close Miranda]

+[Assign]

+[Last pressed key]

+[Extended flag (1xx), Hardware scan code (x23), KeyName]

+[Combine left/right keys Shift, Ctrl, Win, Alt]

+[Combination of keys for assignment]

diff --git a/langpacks/russian/Untranslated/MirOTR.txt b/langpacks/russian/Untranslated/MirOTR.txt
index 6cd4933a54..265fa2f6a6 100644
--- a/langpacks/russian/Untranslated/MirOTR.txt
+++ b/langpacks/russian/Untranslated/MirOTR.txt
@@ -14,3 +14,4 @@
 [The following message received from '%s' was NOT encrypted: [%s]]

 ['%s' has sent a message intended for a different session. If you are logged in multiple times, another session may have received the message.]

 [unknown OTR message received, please report that to Miranda NG]

+[ has requested an Off-the-Record private conversation. However, you do not have a plugin to support that.\nSee http://wikipedia.org/wiki/Off-the-Record_Messaging for more information.]

diff --git a/langpacks/russian/Untranslated/Weather.txt b/langpacks/russian/Untranslated/Weather.txt
index 309e36cc2b..84fec9d030 100644
--- a/langpacks/russian/Untranslated/Weather.txt
+++ b/langpacks/russian/Untranslated/Weather.txt
@@ -1,2 +1,4 @@
 [ID]

 [%n   (%u)]

+[The URL for complete forecast has not been set. You can set it from the Edit Settings dialog.]

+[The URL for weather map has not been set. You can set it from the Edit Settings dialog.]