- langpacks/english: update;

- langpacks/russian: update;






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

36 files changed, 87 insertions, 40 deletions

diff --git a/langpacks/english/Plugins/DbEditorPP.txt b/langpacks/english/Plugins/DbEditorPP.txt
index 426b82957e..64935b2ddb 100644
--- a/langpacks/english/Plugins/DbEditorPP.txt
+++ b/langpacks/english/Plugins/DbEditorPP.txt
@@ -150,7 +150,6 @@
 [%s Setting "%s" in module "%s" in contact "%s" - "%s"]

 [%s Setting "%s" in module "%s" in contact "%s"]

 [%s "%s" in Setting "%s" in module "%s" in contact "%s"]

-[Error Loading Module List]

 [Searching...]

 [Error Loading Setting List]

 [Finished. %d items were found, %d items were deleted.]

diff --git a/langpacks/english/Plugins/TopToolBar.txt b/langpacks/english/Plugins/TopToolBar.txt
index 83a08388b9..3497abd18f 100644
--- a/langpacks/english/Plugins/TopToolBar.txt
+++ b/langpacks/english/Plugins/TopToolBar.txt
@@ -22,20 +22,25 @@
 [Path:]

 [Set]

 ;file \plugins\TopToolBar\src\InternalButtons.cpp

-[Show only online users]

-[Hide offline users]

-[Show all users]

-[Groups on/off]

-[Hide groups]

-[Show groups]

-[Sounds enable/disable]

+[Show main menu]

+[Show options page]

+[Show accounts manager]

+[Find/add contacts]

+[Show status menu]

+[Show/hide offline contacts]

+[Hide offline contacts]

+[Show offline contacts]

+[Enable/disable MetaContacts]

+[Disable MetaContacts]

+[Enable MetaContacts]

+[Enable/disable groups]

+[Enable groups]

+[Disable groups]

+[Enable/disable sounds]

 [Disable sounds]

 [Enable sounds]

-[Show options page]

-[Show options]

-[Minimize button]

-[Find/Add contacts]

-[Show main menu]

+[Minimize contact list]

+[Exit]

 ;file \plugins\TopToolBar\src\toolbar.cpp

 [Default]

 [TopToolBar background]

diff --git a/langpacks/english/Plugins/Weather.txt b/langpacks/english/Plugins/Weather.txt
index ea6279d0ae..48e7d62ae7 100644
--- a/langpacks/english/Plugins/Weather.txt
+++ b/langpacks/english/Plugins/Weather.txt
@@ -165,7 +165,7 @@
 [HTTP Error: Service unavailable (503)]

 [HTTP Error: Gateway timeout (504)]

 [%c\\nTemperature: %t\\nFeel-Like: %f\\nPressure: %p\\nWind: %i  %w\\nHumidity: %m\\nDew Point: %e\\nVisibility: %v\\n\\nSun Rise: %r\\nSun Set: %y\\n\\n5 Days Forecast:\\n%[Forecast Day 1]\\n%[Forecast Day 2]\\n%[Forecast Day 3]\\n%[Forecast Day 4]\\n%[Forecast Day 5]]

-[Feel-Like: %f\\nPressure: %p\\nWind: %i  %w\\nHumidity: %m\\nDew Point: %e\\nVisibility: %v\\n\\nSun Rise: %r\nSun Set: %y\\n\\n5 Days Forecast:\\n%[Forecast Day 1]\\n%[Forecast Day 2]\\n%[Forecast Day 3]\\n%[Forecast Day 4]\\n%[Forecast Day 5]]

+[Feel-Like: %f\\nPressure: %p\\nWind: %i  %w\\nHumidity: %m\\nDew Point: %e\\nVisibility: %v\\n\\nSun Rise: %r\\nSun Set: %y\\n\\n5 Days Forecast:\\n%[Forecast Day 1]\\n%[Forecast Day 2]\\n%[Forecast Day 3]\\n%[Forecast Day 4]\\n%[Forecast Day 5]]

 [Weather Condition for %n as of %u]

 [%c, %t (feel-like %f)	Wind: %i %w	Humidity: %m]

 [%n at %u:	%c, %t (feel-like %f)	Wind: %i %w	Humidity: %m]

diff --git a/langpacks/russian/Plugins/AIM.txt b/langpacks/russian/Plugins/AIM.txt
index 8f61fdc16f..baae1bcaba 100644
--- a/langpacks/russian/Plugins/AIM.txt
+++ b/langpacks/russian/Plugins/AIM.txt
@@ -111,6 +111,8 @@ AIM Установить Instant Idle
 *Пароли не совпадают.

 [Screen Name]

 Имя AIM

+[E-mail]

+Почта

 [Confirm Account]

 Подтвердить

 [*Applied upon reconnect]

diff --git a/langpacks/russian/Plugins/DbEditorPP.txt b/langpacks/russian/Plugins/DbEditorPP.txt
index 75b6a58636..7b8ed6c514 100644
--- a/langpacks/russian/Plugins/DbEditorPP.txt
+++ b/langpacks/russian/Plugins/DbEditorPP.txt
@@ -279,8 +279,6 @@ INI файлы
 %s настройка "%s" в модуле "%s" контакта "%s"

 [%s "%s" in Setting "%s" in module "%s" in contact "%s"]

 %s "%s" в настройке "%s" в модуле "%s" контакта "%s"

-[Error Loading Module List]

-Ошибка загрузки списка модулей

 [Searching...]

 Поиск...

 [Error Loading Setting List]

diff --git a/langpacks/russian/Plugins/Facebook.txt b/langpacks/russian/Plugins/Facebook.txt
index 2dd3ed0550..8473218881 100644
--- a/langpacks/russian/Plugins/Facebook.txt
+++ b/langpacks/russian/Plugins/Facebook.txt
@@ -7,6 +7,8 @@
 ;============================================================

 [Facebook protocol support for Miranda NG.]

 Поддержка протокола Facebook в Miranda NG.

+[E-mail:]

+Почта:

 [Password:]

 Пароль:

 [Create a new Facebook account]

diff --git a/langpacks/russian/Plugins/GG.txt b/langpacks/russian/Plugins/GG.txt
index c4e2415d0b..fa96048bd2 100644
--- a/langpacks/russian/Plugins/GG.txt
+++ b/langpacks/russian/Plugins/GG.txt
@@ -13,6 +13,8 @@
 Номер Gadu-Gadu:

 [Password:]

 Пароль:

+[E-mail:]

+Почта:

 [Create new account]

 Новая учётная запись

 [Remove account]

diff --git a/langpacks/russian/Plugins/HistoryStats.txt b/langpacks/russian/Plugins/HistoryStats.txt
index 1c0f6ddebc..c647c1fbd6 100644
--- a/langpacks/russian/Plugins/HistoryStats.txt
+++ b/langpacks/russian/Plugins/HistoryStats.txt
@@ -309,8 +309,6 @@ URL (все)
 #{type} для #{data}

 [wday3:Mon]

 wday3:Пнд

-[wday3:Te]

-wday3:Втр

 [wday3:Wed]

 wday3:Срд

 [wday3:Thu]

diff --git a/langpacks/russian/Plugins/ICQ.txt b/langpacks/russian/Plugins/ICQ.txt
index fa56e0f216..26a22ff60f 100644
--- a/langpacks/russian/Plugins/ICQ.txt
+++ b/langpacks/russian/Plugins/ICQ.txt
@@ -203,6 +203,8 @@
 Имя:

 [Last name:]

 Фамилия:

+[E-mail:]

+Почта:

 [Gender:]

 Пол:

 [Age:]

diff --git a/langpacks/russian/Plugins/Jabber.txt b/langpacks/russian/Plugins/Jabber.txt
index 953aaff183..d1082c43ca 100644
--- a/langpacks/russian/Plugins/Jabber.txt
+++ b/langpacks/russian/Plugins/Jabber.txt
@@ -151,6 +151,8 @@ Jabber Пароль
 Отдел:

 [Title:]

 Должность:

+[E-mail:]

+Почта:

 [Phone:]

 Телефон:

 [Jabber vCard: Add Email Address]

diff --git a/langpacks/russian/Plugins/MRA.txt b/langpacks/russian/Plugins/MRA.txt
index 55abd8c629..a67196406f 100644
--- a/langpacks/russian/Plugins/MRA.txt
+++ b/langpacks/russian/Plugins/MRA.txt
@@ -7,6 +7,8 @@
 ;============================================================

 [Miranda Mail.ru Agent protocol plugin.]

 Поддержка протокола Mail.ru Агент (MRA) в Miranda NG.

+[E-mail:]

+Почта:

 [Password:]

 Пароль:

 [Create a new Mail.ru account]

diff --git a/langpacks/russian/Plugins/SendSS.txt b/langpacks/russian/Plugins/SendSS.txt
index c35b51fcf1..e20d9e48b1 100644
--- a/langpacks/russian/Plugins/SendSS.txt
+++ b/langpacks/russian/Plugins/SendSS.txt
@@ -143,6 +143,8 @@ HTTP подключение SendSS
 Файл

 [File Transfer]

 Передача файла

+[E-mail]

+Почта

 [FTP File]

 Файл на FTP

 [Information]

diff --git a/langpacks/russian/Plugins/Tlen.txt b/langpacks/russian/Plugins/Tlen.txt
index 563c3c8b51..c8ef68e8c7 100644
--- a/langpacks/russian/Plugins/Tlen.txt
+++ b/langpacks/russian/Plugins/Tlen.txt
@@ -99,6 +99,8 @@ P2P Подключения
 Имя:

 [Last name:]

 Фамилия:

+[E-mail:]

+Почта:

 [Gender:]

 Пол:

 [Year of birth:]

@@ -229,6 +231,8 @@ Tlen входящие
 %s Web сообщений

 [From]

 От

+[E-mail]

+Почта

 [An alert has been received.]

 Уведомление принято.

 [Private conference]

diff --git a/langpacks/russian/Plugins/TopToolBar.txt b/langpacks/russian/Plugins/TopToolBar.txt
index 913d8c1f2b..5c5ef7f2ca 100644
--- a/langpacks/russian/Plugins/TopToolBar.txt
+++ b/langpacks/russian/Plugins/TopToolBar.txt
@@ -35,10 +35,12 @@
 Путь:

 [Set]

 Выбрать

-[Hide offline users]

-Скрыть отключённых

-[Find/Add contacts]

+[Find/add contacts]

 Найти/Добавить контакты

+[Disable groups]

+Отключить группы

+[Exit]

+Выход

 [Default]

 По умолчанию

 [TopToolBar background]

diff --git a/langpacks/russian/Plugins/UInfoEx.txt b/langpacks/russian/Plugins/UInfoEx.txt
index 8dba284447..ff2e8e2724 100644
--- a/langpacks/russian/Plugins/UInfoEx.txt
+++ b/langpacks/russian/Plugins/UInfoEx.txt
@@ -277,6 +277,8 @@
 Сайт

 [Phone]

 Телефон

+[E-mail]

+Почта

 [Gender]

 Пол

 [Misc]

diff --git a/langpacks/russian/Plugins/Weather.txt b/langpacks/russian/Plugins/Weather.txt
index 2aa8bcade3..dc89c9cf38 100644
--- a/langpacks/russian/Plugins/Weather.txt
+++ b/langpacks/russian/Plugins/Weather.txt
@@ -317,8 +317,6 @@ INI файл погоды для этой станции не найден (20)
 Ошибка HTTP: Таймаут шлюза (504)

 [%c\\nTemperature: %t\\nFeel-Like: %f\\nPressure: %p\\nWind: %i  %w\\nHumidity: %m\\nDew Point: %e\\nVisibility: %v\\n\\nSun Rise: %r\\nSun Set: %y\\n\\n5 Days Forecast:\\n%[Forecast Day 1]\\n%[Forecast Day 2]\\n%[Forecast Day 3]\\n%[Forecast Day 4]\\n%[Forecast Day 5]]

 %c\\nТемпература: %t\\nОщущение: %f\\nДавление: %p\\nВетер: %i  %w\\nВлажность: %m\\nРоса: %e\\nВидимость: %v\\n\\nВосход: %r\\nЗакат: %y\\n\\nПрогноз на 5 дней:\\n%[Forecast Day 1]\\n%[Forecast Day 2]\\n%[Forecast Day 3]\\n%[Forecast Day 4]\\n%[Forecast Day 5]

-[Feel-Like: %f\\nPressure: %p\\nWind: %i  %w\\nHumidity: %m\\nDew Point: %e\\nVisibility: %v\\n\\nSun Rise: %r\nSun Set: %y\\n\\n5 Days Forecast:\\n%[Forecast Day 1]\\n%[Forecast Day 2]\\n%[Forecast Day 3]\\n%[Forecast Day 4]\\n%[Forecast Day 5]]

-Ощущение: %f\\nДавление: %p\\nВетер: %i  %w\\nВлажность: %m\\nРоса: %e\\nВидимость: %v\\n\\nВосход: %r\\nЗакат: %y\\n\\nПрогноз на 5 дней:\\n%[Forecast Day 1]\\n%[Forecast Day 2]\\n%[Forecast Day 3]\\n%[Forecast Day 4]\\n%[Forecast Day 5]

 [Weather Condition for %n as of %u]

 Состояние погоды для %n на %u

 [%c, %t (feel-like %f)	Wind: %i %w	Humidity: %m]

diff --git a/langpacks/russian/Untranslated/=CORE=.txt b/langpacks/russian/Untranslated/=CORE=.txt
index 60e4bd7559..262a3a9f0a 100644
--- a/langpacks/russian/Untranslated/=CORE=.txt
+++ b/langpacks/russian/Untranslated/=CORE=.txt
@@ -1,5 +1,6 @@
 [AaBbYyZz]

-[<mixed>]

+[&E-mail]

+[ID]

 [Ctrl + ]

 [Alt + ]

 [Shift + ]

diff --git a/langpacks/russian/Untranslated/Clist_blind.txt b/langpacks/russian/Untranslated/Clist_blind.txt
new file mode 100644
index 0000000000..4d2147c4cb
--- /dev/null
+++ b/langpacks/russian/Untranslated/Clist_blind.txt
@@ -0,0 +1 @@
+[URL:]

diff --git a/langpacks/russian/Untranslated/DbEditorPP.txt b/langpacks/russian/Untranslated/DbEditorPP.txt
index 5ea2480de7..c98c888b32 100644
--- a/langpacks/russian/Untranslated/DbEditorPP.txt
+++ b/langpacks/russian/Untranslated/DbEditorPP.txt
@@ -1,4 +1,5 @@
-[Delete module from all contacts (including Setting)]

+[BL&OB]

+[Delete module from all contacts (including Setting)]

 [Open user tree]

 [BLOB setting]

 [Byte setting]

@@ -6,3 +7,4 @@
 [Dword setting]

 [String setting]

 [Unicode setting]

+[BLOB]

diff --git a/langpacks/russian/Untranslated/Facebook.txt b/langpacks/russian/Untranslated/Facebook.txt
index a2ecc987f1..dbaa88ea95 100644
--- a/langpacks/russian/Untranslated/Facebook.txt
+++ b/langpacks/russian/Untranslated/Facebook.txt
@@ -1 +1,2 @@
-[Message read]

+[URL:]

+[Message read]

diff --git a/langpacks/russian/Untranslated/HistoryPP.txt b/langpacks/russian/Untranslated/HistoryPP.txt
new file mode 100644
index 0000000000..09a9c53421
--- /dev/null
+++ b/langpacks/russian/Untranslated/HistoryPP.txt
@@ -0,0 +1,3 @@
+[WATrack: %s]

+[WebPager]

+[EMail Express]

diff --git a/langpacks/russian/Untranslated/HistoryStats.txt b/langpacks/russian/Untranslated/HistoryStats.txt
index ccdc05db25..91ae1c5160 100644
--- a/langpacks/russian/Untranslated/HistoryStats.txt
+++ b/langpacks/russian/Untranslated/HistoryStats.txt
@@ -1,5 +1,6 @@
 [Band]

 [#{rank}.]

+[wday3:Tue]

 [[#{hour}:00-#{hour}:59] #{amount}]

 [[#{day}] #{amount}]

 [#{amount}]

diff --git a/langpacks/russian/Untranslated/IRC.txt b/langpacks/russian/Untranslated/IRC.txt
index 750a03fe2b..620a66552e 100644
--- a/langpacks/russian/Untranslated/IRC.txt
+++ b/langpacks/russian/Untranslated/IRC.txt
@@ -1,6 +1,7 @@
 [SSL]

 [CTCP]

 [DCC]

+[Jerk]

 [Incorrect parameters. Usage: /sleep [ms], ms should be greater than 0 and less than 4000.]

 [NickServ]

 [Faster! Searches the network for an exact match of the nickname only. The hostmask is optional and provides further security if used. Wildcards (? and *) are allowed.]

diff --git a/langpacks/russian/Untranslated/Jabber.txt b/langpacks/russian/Untranslated/Jabber.txt
index 1e04fa2625..923232d949 100644
--- a/langpacks/russian/Untranslated/Jabber.txt
+++ b/langpacks/russian/Untranslated/Jabber.txt
@@ -153,3 +153,4 @@
 [Google Talk!]

 [Odnoklassniki]

 [Choose the group chats you want to leave]

+[Jabber vCard]

diff --git a/langpacks/russian/Untranslated/MRA.txt b/langpacks/russian/Untranslated/MRA.txt
new file mode 100644
index 0000000000..2a0371dc62
--- /dev/null
+++ b/langpacks/russian/Untranslated/MRA.txt
@@ -0,0 +1 @@
+[Mail.ru Xstatus]

diff --git a/langpacks/russian/Untranslated/MSN.txt b/langpacks/russian/Untranslated/MSN.txt
index 777b310053..ea45669a81 100644
--- a/langpacks/russian/Untranslated/MSN.txt
+++ b/langpacks/russian/Untranslated/MSN.txt
@@ -1,3 +1,4 @@
 [MSN]

 [Live ID:]

+[Hotmail]

 [Live ID]

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

diff --git a/langpacks/russian/Untranslated/Msg_Export.txt b/langpacks/russian/Untranslated/Msg_Export.txt
index 49b398ed91..b84cf9feee 100644
--- a/langpacks/russian/Untranslated/Msg_Export.txt
+++ b/langpacks/russian/Untranslated/Msg_Export.txt
@@ -41,6 +41,7 @@
 [- About -\r\n%About%\r\n]

 [Failed to write user details to file :\n]

 [Failed to write timestamp and username to file :\n]

+[e-mail    :]

 [Invalid Database event received. Type %d, size %d]

 [Failed to write Invalid Database event the file :\n]

 [UIN       :]

diff --git a/langpacks/russian/Untranslated/MyDetails.txt b/langpacks/russian/Untranslated/MyDetails.txt
new file mode 100644
index 0000000000..4207d087f2
--- /dev/null
+++ b/langpacks/russian/Untranslated/MyDetails.txt
@@ -0,0 +1 @@
+[RTL]

diff --git a/langpacks/russian/Untranslated/Sametime.txt b/langpacks/russian/Untranslated/Sametime.txt
index a2b849bc3f..bca384d102 100644
--- a/langpacks/russian/Untranslated/Sametime.txt
+++ b/langpacks/russian/Untranslated/Sametime.txt
@@ -1 +1,2 @@
 [ID:]

+[ID]

diff --git a/langpacks/russian/Untranslated/Scriver.txt b/langpacks/russian/Untranslated/Scriver.txt
index 6edaa4691b..3a4163f72f 100644
--- a/langpacks/russian/Untranslated/Scriver.txt
+++ b/langpacks/russian/Untranslated/Scriver.txt
@@ -3,6 +3,7 @@
 [Wikipedia (en)]

 [Google Maps]

 [Google Translate]

+[Yahoo]

 [Foodnetwork]

 [O Lord, bless this Thy hand grenade that with it Thou mayest blow Thine enemies]

 [to tiny bits, in Thy mercy]

diff --git a/langpacks/russian/Untranslated/TopToolBar.txt b/langpacks/russian/Untranslated/TopToolBar.txt
index 2cf9cecb93..05805bc284 100644
--- a/langpacks/russian/Untranslated/TopToolBar.txt
+++ b/langpacks/russian/Untranslated/TopToolBar.txt
@@ -1,14 +1,16 @@
-[Show only online users]

-[Hide offline users]

-[Show all users]

-[Groups on/off]

-[Hide groups]

-[Show groups]

-[Sounds enable/disable]

+[Show main menu]

+[Show options page]

+[Show accounts manager]

+[Show status menu]

+[Show/hide offline contacts]

+[Hide offline contacts]

+[Show offline contacts]

+[Enable/disable MetaContacts]

+[Disable MetaContacts]

+[Enable MetaContacts]

+[Enable/disable groups]

+[Enable groups]

+[Enable/disable sounds]

 [Disable sounds]

 [Enable sounds]

-[Show options page]

-[Show options]

-[Minimize button]

-[Find/Add contacts]

-[Show main menu]

+[Minimize contact list]

diff --git a/langpacks/russian/Untranslated/Variables.txt b/langpacks/russian/Untranslated/Variables.txt
new file mode 100644
index 0000000000..c8e3448644
--- /dev/null
+++ b/langpacks/russian/Untranslated/Variables.txt
@@ -0,0 +1,2 @@
+[x + y + ...]

+[x - y - ...]

diff --git a/langpacks/russian/Untranslated/Weather.txt b/langpacks/russian/Untranslated/Weather.txt
index a5d5a32954..67cd0ef828 100644
--- a/langpacks/russian/Untranslated/Weather.txt
+++ b/langpacks/russian/Untranslated/Weather.txt
@@ -1,2 +1,4 @@
-[%n   (%u)]

+[ID]

+[Feel-Like: %f\\nPressure: %p\\nWind: %i  %w\\nHumidity: %m\\nDew Point: %e\\nVisibility: %v\\n\\nSun Rise: %r\\nSun Set: %y\\n\\n5 Days Forecast:\\n%[Forecast Day 1]\\n%[Forecast Day 2]\\n%[Forecast Day 3]\\n%[Forecast Day 4]\\n%[Forecast Day 5]]

+[%n   (%u)]

 [%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]

diff --git a/langpacks/russian/Untranslated/WebView.txt b/langpacks/russian/Untranslated/WebView.txt
index 905c675a9b..32013dbf23 100644
--- a/langpacks/russian/Untranslated/WebView.txt
+++ b/langpacks/russian/Untranslated/WebView.txt
@@ -13,6 +13,7 @@
 [Display data in popup]

 [You may need to restart Miranda NG for this change to take effect.]

 [Contact name:]

+[URL:]

 [Between start and end strings]

 [Whole web page]

 [Start:]

diff --git a/langpacks/russian/Untranslated/Yahoo.txt b/langpacks/russian/Untranslated/Yahoo.txt
index a2b849bc3f..37c6417cf9 100644
--- a/langpacks/russian/Untranslated/Yahoo.txt
+++ b/langpacks/russian/Untranslated/Yahoo.txt
@@ -1 +1,3 @@
-[ID:]

+[Yahoo]

+[ID:]

+[ID]