IM <> MG

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

7 files changed, 19 insertions, 19 deletions

diff --git a/langpacks/english/Plugins/HistoryStats.txt b/langpacks/english/Plugins/HistoryStats.txt
index c18c52013a..b791b35419 100644
--- a/langpacks/english/Plugins/HistoryStats.txt
+++ b/langpacks/english/Plugins/HistoryStats.txt
@@ -250,7 +250,7 @@
 ;file \plugins\HistoryStats\src\contact.cpp

 [(multiple)]

 ;file \plugins\HistoryStats\src\dlgconfigure.cpp

-[You can't access the stand-alone configuration dialog of HistoryStats as long as the options dialog of Miranda IM is open. Please close the options dialog and try again.\r\n\r\nNote that the options offered by both dialogs are the same.]

+[You can't access the stand-alone configuration dialog of HistoryStats as long as the options dialog of Miranda NG is open. Please close the options dialog and try again.\r\n\r\nNote that the options offered by both dialogs are the same.]

 [HistoryStats - Warning]

 ;file \plugins\HistoryStats\src\dlgfilterwords.cpp

 [Add set]

@@ -278,7 +278,7 @@
 [Create]

 [Create statistics]

 [Create statistics (there are warnings)]

-[You can't access the options of HistoryStats as long as the stand-alone configuration dialog of HistoryStats is open. Please close the stand-alone dialog before opening the options dialog of Miranda IM to see the options of HistoryStats here.\r\n\r\nNote that the options offered by both dialogs are the same.]

+[You can't access the options of HistoryStats as long as the stand-alone configuration dialog of HistoryStats is open. Please close the stand-alone dialog before opening the options dialog of Miranda NG to see the options of HistoryStats here.\r\n\r\nNote that the options offered by both dialogs are the same.]

 [You have unsaved settings. Do you want to save before running HistoryStats?]

 [HistoryStats]

 [Show warnings...]

@@ -311,7 +311,7 @@
 [** All contacts **]

 ;file \plugins\HistoryStats\src\dlgoption_subglobal.cpp

 [Integration]

-[Create statistics on Miranda IM's startup]

+[Create statistics on Miranda NG's startup]

 [Add menu items to main menu]

 [Put menu items into submenu]

 [Add menu items to contact menu]

@@ -399,8 +399,8 @@
 [Always overwrite already existing files (dangerous!)]

 [Auto open statistics after being generated...]

 [...via button "Create statistics" in options]

-[...on Miranda IM's startup]

-[...via Miranda IM's main menu]

+[...on Miranda NG's startup]

+[...via Miranda NG's main menu]

 [First sort by]

 [Then sort by]

 [Finally sort by]

diff --git a/langpacks/russian/Plugins/HistoryStats.txt b/langpacks/russian/Plugins/HistoryStats.txt
index 3d5b3f62ff..c24943050f 100644
--- a/langpacks/russian/Plugins/HistoryStats.txt
+++ b/langpacks/russian/Plugins/HistoryStats.txt
@@ -381,8 +381,8 @@ wday3:Вос
 Колонка содержит список часто используемых слов/или самых длинных слов, использованных Вами/контактом/всего.

 [(multiple)]

 (несколько)

-[You can't access the stand-alone configuration dialog of HistoryStats as long as the options dialog of Miranda IM is open. Please close the options dialog and try again.\r\n\r\nNote that the options offered by both dialogs are the same.]

-Вы не можете открыть отдельное окно опций HistoryStats, так как открыто окно опций Miranda IM. Закройте его, и попытайтесь снова. \r\n\r\nПримечание: опции в 2х диалогах одинаковы.

+[You can't access the stand-alone configuration dialog of HistoryStats as long as the options dialog of Miranda NG is open. Please close the options dialog and try again.\r\n\r\nNote that the options offered by both dialogs are the same.]

+Вы не можете открыть отдельное окно опций HistoryStats, так как открыто окно опций Miranda NG. Закройте его, и попытайтесь снова. \r\n\r\nПримечание: опции в 2х диалогах одинаковы.

 [HistoryStats - Warning]

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

 [Add set]

@@ -429,7 +429,7 @@ HistoryStats - Предупреждение
 Создать статистику

 [Create statistics (there are warnings)]

 Создать статистику (есть предупреждения)

-[You can't access the options of HistoryStats as long as the stand-alone configuration dialog of HistoryStats is open. Please close the stand-alone dialog before opening the options dialog of Miranda IM to see the options of HistoryStats here.\r\n\r\nNote that the options offered by both dialogs are the same.]

+[You can't access the options of HistoryStats as long as the stand-alone configuration dialog of HistoryStats is open. Please close the stand-alone dialog before opening the options dialog of Miranda NG to see the options of HistoryStats here.\r\n\r\nNote that the options offered by both dialogs are the same.]

 Вы не можете открыть опции HistoryStats здесь, пока открыто отдельное окно опций. Закройте его, и попытайтесь снова.\r\n\r\nПримечание: опции в 2х диалогах одинаковы.

 [You have unsaved settings. Do you want to save before running HistoryStats?]

 Вы не сохранили настройки. Желаете сохранить их перед запуском HistoryStats?

@@ -481,7 +481,7 @@ HTML вывод невозможен.
 Опция пропущена, так как включён вывод PNG.

 [** All contacts **]

 ** Все контакты **

-[Create statistics on Miranda IM's startup]

+[Create statistics on Miranda NG's startup]

 Создавать статистику при старте программы

 [Add menu items to main menu]

 Добавить пункты в главное меню

@@ -645,9 +645,9 @@ HistoryStats поддерживает некоторые плагины. Наж�
 Автооткрытие статистики после генерации...

 [...via button "Create statistics" in options]

 ...через кнопку "Создать статистику" в опциях

-[...on Miranda IM's startup]

+[...on Miranda NG's startup]

 ...при старте программы

-[...via Miranda IM's main menu]

+[...via Miranda NG's main menu]

 ...через главное меню

 [First sort by]

 Сначала сортировать по

diff --git a/plugins/HistoryStats/src/dlgconfigure.cpp b/plugins/HistoryStats/src/dlgconfigure.cpp
index 50ef62827d..33af5a88b1 100644
--- a/plugins/HistoryStats/src/dlgconfigure.cpp
+++ b/plugins/HistoryStats/src/dlgconfigure.cpp
@@ -89,7 +89,7 @@ void DlgConfigure::showModal()
 {

 	if (g_bConfigureLock) {

 		MessageBox(0,

-			TranslateT("You can't access the stand-alone configuration dialog of HistoryStats as long as the options dialog of Miranda IM is open. Please close the options dialog and try again.\r\n\r\nNote that the options offered by both dialogs are the same."),

+			TranslateT("You can't access the stand-alone configuration dialog of HistoryStats as long as the options dialog of Miranda NG is open. Please close the options dialog and try again.\r\n\r\nNote that the options offered by both dialogs are the same."),

 			TranslateT("HistoryStats - Warning"),

 			MB_ICONWARNING | MB_OK);

 

diff --git a/plugins/HistoryStats/src/dlgoption.cpp b/plugins/HistoryStats/src/dlgoption.cpp
index d66d2d24a9..fb4820f956 100644
--- a/plugins/HistoryStats/src/dlgoption.cpp
+++ b/plugins/HistoryStats/src/dlgoption.cpp
@@ -148,7 +148,7 @@ void DlgOption::onWMInitDialog()
 		ShowWindow(m_Band, SW_HIDE);

 		ShowWindow(GetDlgItem(m_hWnd, IDC_MESSAGE), SW_SHOW);

 

-		SetDlgItemText(m_hWnd, IDC_MESSAGE, TranslateT("You can't access the options of HistoryStats as long as the stand-alone configuration dialog of HistoryStats is open. Please close the stand-alone dialog before opening the options dialog of Miranda IM to see the options of HistoryStats here.\r\n\r\nNote that the options offered by both dialogs are the same."));

+		SetDlgItemText(m_hWnd, IDC_MESSAGE, TranslateT("You can't access the options of HistoryStats as long as the stand-alone configuration dialog of HistoryStats is open. Please close the stand-alone dialog before opening the options dialog of Miranda NG to see the options of HistoryStats here.\r\n\r\nNote that the options offered by both dialogs are the same."));

 	}

 

 	// reset flag

diff --git a/plugins/HistoryStats/src/dlgoption_subglobal.cpp b/plugins/HistoryStats/src/dlgoption_subglobal.cpp
index 645a3876f0..bda621745c 100644
--- a/plugins/HistoryStats/src/dlgoption_subglobal.cpp
+++ b/plugins/HistoryStats/src/dlgoption_subglobal.cpp
@@ -220,7 +220,7 @@ void DlgOption::SubGlobal::onWMInitDialog()
 	OptionsCtrl::Item hTemp;

 

 	hTemp = m_Options.insertGroup(NULL, TranslateT("Integration"), OptionsCtrl::OCF_ROOTGROUP);

-	m_hOnStartup = m_Options.insertCheck(hTemp, TranslateT("Create statistics on Miranda IM's startup"));

+	m_hOnStartup = m_Options.insertCheck(hTemp, TranslateT("Create statistics on Miranda NG's startup"));

 	m_hShowMainMenu = m_Options.insertCheck(hTemp, TranslateT("Add menu items to main menu"), OptionsCtrl::OCF_DISABLECHILDSONUNCHECK);

 	m_hShowMainMenuSub = m_Options.insertCheck(m_hShowMainMenu, TranslateT("Put menu items into submenu"));

 	m_hShowContactMenu = m_Options.insertCheck(hTemp, TranslateT("Add menu items to contact menu"), OptionsCtrl::OCF_DISABLECHILDSONUNCHECK);

diff --git a/plugins/HistoryStats/src/dlgoption_suboutput.cpp b/plugins/HistoryStats/src/dlgoption_suboutput.cpp
index 704f837bb2..ddfdf984fb 100644
--- a/plugins/HistoryStats/src/dlgoption_suboutput.cpp
+++ b/plugins/HistoryStats/src/dlgoption_suboutput.cpp
@@ -133,8 +133,8 @@ void DlgOption::SubOutput::onWMInitDialog()
 			m_hOverwriteAlways           = m_Options.insertCheck(hTemp2, TranslateT("Always overwrite already existing files (dangerous!)"));

 		hTemp2                          = m_Options.insertGroup(hTemp, TranslateT("Auto open statistics after being generated..."));

 			m_hAutoOpenOptions           = m_Options.insertCheck(hTemp2, TranslateT("...via button \"Create statistics\" in options"));

-			m_hAutoOpenStartup           = m_Options.insertCheck(hTemp2, TranslateT("...on Miranda IM's startup"));

-			m_hAutoOpenMenu              = m_Options.insertCheck(hTemp2, TranslateT("...via Miranda IM's main menu"));

+			m_hAutoOpenStartup           = m_Options.insertCheck(hTemp2, TranslateT("...on Miranda NG's startup"));

+			m_hAutoOpenMenu              = m_Options.insertCheck(hTemp2, TranslateT("...via Miranda NG's main menu"));

 

 	// our sort levels

 	static const TCHAR* sortLevels[Settings::cNumSortLevels] = {

diff --git a/plugins/HistoryStats/src/main.cpp b/plugins/HistoryStats/src/main.cpp
index 8d0d5470e4..5da8460d05 100644
--- a/plugins/HistoryStats/src/main.cpp
+++ b/plugins/HistoryStats/src/main.cpp
@@ -471,9 +471,9 @@ extern "C" __declspec(dllexport) int Load()
 	{

 		MessageBox(

 			0,

-			_T("This version of HistoryStats isn't compatible with your Miranda IM ")

-			_T("version. Possibly, your Miranda IM is outdated or you are trying to ")

-			_T("use the Unicode version with a non-Unicode Miranda IM.\r\n\r\n")

+			_T("This version of HistoryStats isn't compatible with your Miranda NG ")

+			_T("version. Possibly, your Miranda NG is outdated or you are trying to ")

+			_T("use the Unicode version with a non-Unicode Miranda NG.\r\n\r\n")

 			_T("Please go to the plugin's homepage and check the requirements."),

 			_T("HistoryStats - Error"),

 			MB_OK | MB_ICONERROR);