- langpacks/english: update;

- langpacks/russian: update;


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

10 files changed, 14 insertions, 34 deletions

diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index 44aeb05712..b6a0160fdf 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -659,6 +659,7 @@
 ;file \src\core\stdchat\src\colorchooser.cpp

 ;file \src\core\stdchat\src\main.cpp

 [Chat module]

+[Group chat log background]

 [Message background]

 [User list background]

 [User list lines]

diff --git a/langpacks/english/Plugins/PluginUpdater.txt b/langpacks/english/Plugins/PluginUpdater.txt
index 5609f7b57d..e3b1a051f5 100644
--- a/langpacks/english/Plugins/PluginUpdater.txt
+++ b/langpacks/english/Plugins/PluginUpdater.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: PluginUpdater.dll

 ;  Plugin: Plugin updater

-;  Version: 0.1.1.6

+;  Version: 0.1.1.7

 ;  Authors: Mataes, George Hazan

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

 [Plugin updater for Miranda NG.]

@@ -68,6 +68,7 @@
 [List loading already started!]

 ;file \plugins\PluginUpdater\src\DlgUpdate.cpp

 [Will be deleted!]

+[Update failed! One of the components wasn't downloaded correctly. Try it again later.]

 [Update complete. Press Yes to restart Miranda now or No to postpone a restart until the exit.]

 [<< Details]

 [No updates found.]

diff --git a/langpacks/english/Plugins/Scriver.txt b/langpacks/english/Plugins/Scriver.txt
index b96b19aeef..9ff17d67e9 100644
--- a/langpacks/english/Plugins/Scriver.txt
+++ b/langpacks/english/Plugins/Scriver.txt
@@ -338,6 +338,7 @@
 [The message send timed out.]

 ;file \plugins\Scriver\src\chat\colorchooser.cpp

 ;file \plugins\Scriver\src\chat\main.cpp

+[Group chat log background]

 [User list background]

 [User list lines]

 [User list background (selected)]

diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index 84dfa4aa0f..be8637c909 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -1105,16 +1105,6 @@
 [Show as icons]

 [Show as text symbols]

 ;file \plugins\TabSRMM\src\chat\tools.cpp

-[%s wants your attention in %s]

-[%s speaks in %s]

-[%s has joined %s]

-[%s has left %s]

-[%s kicked %s from %s]

-[Notice from %s]

-[Topic change in %s]

-[Information in %s]

-[%s enables '%s' status for %s in %s]

-[%s disables '%s' status for %s in %s]

 [%s%s says:%s %s]

 [Look up '%s':]

 [No word to look up]

diff --git a/langpacks/russian/=CORE=.txt b/langpacks/russian/=CORE=.txt
index adc348e037..345d831294 100644
--- a/langpacks/russian/=CORE=.txt
+++ b/langpacks/russian/=CORE=.txt
@@ -1271,6 +1271,8 @@ Miranda NG перезапускается.\nПожалуйста, подожди
 Открыть окно чата

 [Chat module]

 Модуль чата

+[Group chat log background]

+Фон журнала чата

 [Message background]

 Фон поля ввода

 [User list background]

diff --git a/langpacks/russian/Plugins/PluginUpdater.txt b/langpacks/russian/Plugins/PluginUpdater.txt
index 5de393c6fc..61881b2249 100644
--- a/langpacks/russian/Plugins/PluginUpdater.txt
+++ b/langpacks/russian/Plugins/PluginUpdater.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: PluginUpdater.dll

 ;  Plugin: Plugin updater

-;  Version: 0.1.1.6

+;  Version: 0.1.1.7

 ;  Authors: Mataes, George Hazan

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

 [Plugin updater for Miranda NG.]

@@ -125,6 +125,8 @@
 Список загружается!

 [Will be deleted!]

 Удалено!

+[Update failed! One of the components wasn't downloaded correctly. Try it again later.]

+Ошибка обновления! Архив одного из закачанных компонентов поврежден. Попробуйте повторить попытку позже.

 [Update complete. Press Yes to restart Miranda now or No to postpone a restart until the exit.]

 Обновление завершено. Нажмите "Да" для немедленной перезагрузки программы или "Нет", чтобы отложить обновление до выхода.

 [<< Details]

diff --git a/langpacks/russian/Plugins/Scriver.txt b/langpacks/russian/Plugins/Scriver.txt
index 06f130c9cb..2aab80bbb5 100644
--- a/langpacks/russian/Plugins/Scriver.txt
+++ b/langpacks/russian/Plugins/Scriver.txt
@@ -619,6 +619,8 @@ Miranda не смогла загрузить встроенную систему
 Поверх всех окон

 [The message send timed out.]

 Таймаут отправки сообщения

+[Group chat log background]

+Фон журнала чата

 [User list background]

 Фон списка

 [User list lines]

diff --git a/langpacks/russian/Plugins/TabSRMM.txt b/langpacks/russian/Plugins/TabSRMM.txt
index 555274b7f2..5d234ff085 100644
--- a/langpacks/russian/Plugins/TabSRMM.txt
+++ b/langpacks/russian/Plugins/TabSRMM.txt
@@ -1805,6 +1805,8 @@ tabSRMM: %s
 %s выключает статус '%s' для %s

 [Add user to highlight list]

 Добавить пользователя в список подсветки

+[Group chat log background]

+Фон журнала чата

 [Input area background]

 Окна ввода текста

 [Log background]

@@ -2099,26 +2101,6 @@ ID текущего контакта (если определен). Наприм
 Иконки

 [Show as text symbols]

 Текстовые символы

-[%s wants your attention in %s]

-%s требует вашего внимания в %s

-[%s speaks in %s]

-%s говорит в %s

-[%s has joined %s]

-%s вошёл в %s

-[%s has left %s]

-%s вышел из %s

-[%s kicked %s from %s]

-%s выкинул %s из %s

-[Notice from %s]

-Уведомление от %s

-[Topic change in %s]

-Смена темы в %s

-[Information in %s]

-Информация в %s

-[%s enables '%s' status for %s in %s]

-%s включает статус '%s' для %s в %s

-[%s disables '%s' status for %s in %s]

-%s выключает статус '%s' для %s в %s

 [%s%s says:%s %s]

 %s%s пишет:%s %s

 [Look up '%s':]

diff --git a/langpacks/russian/Untranslated/TabSRMM.txt b/langpacks/russian/Untranslated/TabSRMM.txt
index b85992887b..a32750575e 100644
--- a/langpacks/russian/Untranslated/TabSRMM.txt
+++ b/langpacks/russian/Untranslated/TabSRMM.txt
@@ -9,5 +9,4 @@
 [The message cannot be sent delayed or to multiple contacts, because it exceeds the maximum allowed message length of %d bytes]

 [Important release notes|A test warning message]

 [Edit user highlight list]

-[Group chat log background]

 [will return parsed string %miranda_userdata%\\Logs]

diff --git a/plugins/PluginUpdater/src/DlgUpdate.cpp b/plugins/PluginUpdater/src/DlgUpdate.cpp
index 4448dda157..0646dc15df 100644
--- a/plugins/PluginUpdater/src/DlgUpdate.cpp
+++ b/plugins/PluginUpdater/src/DlgUpdate.cpp
@@ -83,7 +83,7 @@ static void ApplyUpdates(void *param)
 			SetStringText(hwndList, i, TranslateT("Failed!"));

 

 			// interrupt update as we require all components to be updated

-			MessageBox(hDlg, TranslateT("Update failed! Some component wasn't downloaded correctly. Try it again later."), TranslateT("Plugin Updater"), MB_OK | MB_ICONERROR);

+			MessageBox(hDlg, TranslateT("Update failed! One of the components wasn't downloaded correctly. Try it again later."), TranslateT("Plugin Updater"), MB_OK | MB_ICONERROR);

 			error = true;

 			break;

 		} else