- One more portion of Miranda IM extermination from Russian langpack

- Some obsolete warning messageboxes removed
- Geraman language added to LangpackSuite

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

6 files changed, 6 insertions, 12 deletions

diff --git a/plugins/LangMan/src/main.cpp b/plugins/LangMan/src/main.cpp
index db222bf309..c5b267fd33 100644
--- a/plugins/LangMan/src/main.cpp
+++ b/plugins/LangMan/src/main.cpp
@@ -115,12 +115,6 @@ __declspec(dllexport) int Load(void)
 	 * is checked in MirandaPluginInfo().

 	 * Not placed in MirandaPluginInfo() to avoid MessageBoxes on plugin options. 

 	 * Using ANSI as LANG_UNICODE might not be supported. */

-	if ( CallService(MS_SYSTEM_GETVERSION, 0, 0) < NEEDED_MIRANDA_VERSION ) {

-		char szText[256];

-		mir_snprintf(szText, sizeof(szText), Translate("The Language Pack Manager Plugin can not be loaded. It requires Miranda IM %hs or later."), NEEDED_MIRANDA_VERSION_STR);

-		MessageBoxA(NULL, szText, Translate("Language Pack Manager Plugin"), MB_OK|MB_ICONERROR|MB_SETFOREGROUND|MB_TOPMOST|MB_TASKMODAL);

-		return 1;

-	}

 

 	INITCOMMONCONTROLSEX icc;

 	icc.dwSize = sizeof(icc);

diff --git a/plugins/New_GPG/res/new_gpg.rc b/plugins/New_GPG/res/new_gpg.rc
index b6955f56ac..23db85b137 100755
--- a/plugins/New_GPG/res/new_gpg.rc
+++ b/plugins/New_GPG/res/new_gpg.rc
@@ -345,7 +345,7 @@ BEGIN
     CONTROL         "Turn on debug log",IDC_DEBUG_LOG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,181,159,89,10

     EDITTEXT        IDC_LOG_FILE_EDIT,11,157,98,14,ES_AUTOHSCROLL

     PUSHBUTTON      "Browse",IDC_LOG_FILE_SET,119,156,50,14

-    CONTROL         "Use jabber api on Miranda IM >= 0.9 (recomended)",IDC_JABBER_API,

+    CONTROL         "Use jabber api on Miranda NG (recomended)",IDC_JABBER_API,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,175,251,10

     LTEXT           "Default key",IDC_CURRENT_KEY,12,196,110,8

     CONTROL         "Encrypt file transfers",IDC_FILE_TRANSFERS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,185,137,10

diff --git a/plugins/PackUpdater/Src/Notifications.cpp b/plugins/PackUpdater/Src/Notifications.cpp
index ea402b2373..9896404b00 100644
--- a/plugins/PackUpdater/Src/Notifications.cpp
+++ b/plugins/PackUpdater/Src/Notifications.cpp
@@ -526,9 +526,9 @@ INT_PTR CALLBACK DlgUpdate(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam
 								}

 

 								if (UpdatesCount > 1 && lstrcmp(arExt[0].c_str(), _T(".html")) != 0)

-									lstrcpyn(tszBuff, TranslateT("Downloads complete. Start updating? All your data will be saved and Miranda IM will be closed."), SIZEOF(tszBuff));

+									lstrcpyn(tszBuff, TranslateT("Downloads complete. Start updating? All your data will be saved and Miranda NG will be closed."), SIZEOF(tszBuff));

 								else if (UpdatesCount == 1 && lstrcmp(arExt[0].c_str(), _T(".html")) != 0)

-									lstrcpyn(tszBuff, TranslateT("Download complete. Start updating? All your data will be saved and Miranda IM will be closed."), SIZEOF(tszBuff));

+									lstrcpyn(tszBuff, TranslateT("Download complete. Start updating? All your data will be saved and Miranda NG will be closed."), SIZEOF(tszBuff));

 								if (UpdatesCount > 0 && lstrcmp(arExt[0].c_str(), _T(".html")) != 0)

 								{

 									INT rc = -1;

diff --git a/plugins/PackUpdater/Src/Utils.cpp b/plugins/PackUpdater/Src/Utils.cpp
index 150552b18d..fef2ebb9f1 100644
--- a/plugins/PackUpdater/Src/Utils.cpp
+++ b/plugins/PackUpdater/Src/Utils.cpp
@@ -303,7 +303,7 @@ static void CheckUpdates(void *)
 

 			if (Files[CurrentFile].FileType != 1 && !IsUserAnAdmin() && (_tcsstr(tszRoot, tszSysRoot) || _tcsstr(tszRoot, tszProgFiles)))

 			{

-				MessageBox(NULL, TranslateT("Update is not possible!\nYou have no Administrator's rights.\nPlease run Miranda IM with Administrator's rights."), Title, MB_ICONINFORMATION);

+				MessageBox(NULL, TranslateT("Update is not possible!\nYou have no Administrator's rights.\nPlease run Miranda NG with Administrator's rights."), Title, MB_ICONINFORMATION);

 				DeleteFile(tszTmpIni);

 				CheckThread = NULL;

 				return;

diff --git a/plugins/PackUpdater/Src/Version.h b/plugins/PackUpdater/Src/Version.h
index 5fa646e5eb..4f1950f3bb 100644
--- a/plugins/PackUpdater/Src/Version.h
+++ b/plugins/PackUpdater/Src/Version.h
@@ -13,7 +13,7 @@
 #define __PLUGIN_NAME				"Pack Updater"

 #define __INTERNAL_NAME				"PackUpdater"

 #define __FILENAME					"PackUpdater.dll"

-#define __DESCRIPTION 				"Simple updater for Miranda IM premodified packs."

+#define __DESCRIPTION 				"Simple updater for Miranda NG premodified packs."

 #define __AUTHOR					"Mataes, ZERO_BiT"

 #define __AUTHOREMAIL				"mataes2007@gmail.com, zero-bit@mail.ru"

 #define __AUTHORWEB					"http://miranda-ng.org/"

diff --git a/plugins/SecureIM/src/language.cpp b/plugins/SecureIM/src/language.cpp
index 49e066a2dd..eb19e4605e 100644
--- a/plugins/SecureIM/src/language.cpp
+++ b/plugins/SecureIM/src/language.cpp
@@ -53,7 +53,7 @@ LPCSTR sim220 = "This version not supported!";
 LPCSTR sim221 = "(none)";

 LPCSTR sim222 = "Private key loaded.";

 LPCSTR sim223 = "Private key not loaded!";

-LPCSTR sim224 = "The new settings will become valid when you restart MirandaIM!";

+LPCSTR sim224 = "The new settings will become valid when you restart MirandaNG!";

 LPCSTR sim225 = "Keyrings disabled!";

 LPCSTR sim226 = "GPG";

 LPCSTR sim227 = "CP";