summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVadim Dashevskiy <watcherhd@gmail.com>2012-08-15 09:23:57 +0000
committerVadim Dashevskiy <watcherhd@gmail.com>2012-08-15 09:23:57 +0000
commit25747f06ccfca211d883955608bd779d98c360c2 (patch)
treef17c20c4001d10e229a9d1a0a86a90bb65a01106
parentd8fdc1b64f985ca228ab231069b4e556ded07006 (diff)
Yet another Miranda IM > NG rename part 2
git-svn-id: http://svn.miranda-ng.org/main/trunk@1461 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--plugins/AssocMgr/src/assoclist.cpp2
-rw-r--r--plugins/AssocMgr/src/dde.cpp8
-rw-r--r--plugins/AutoRun/src/main.cpp2
-rw-r--r--plugins/AutoShutdown/src/shutdownsvc.cpp14
-rw-r--r--plugins/BASS_interface/src/Version.h2
-rw-r--r--plugins/BasicHistory/src/version.h2
-rw-r--r--plugins/BossKeyPlus/src/BossKey.cpp12
-rw-r--r--plugins/Dbx_mmap_SA/src/init.cpp2
-rw-r--r--plugins/Dbx_tree/DataBase.h2
-rw-r--r--plugins/Dbx_tree/FileAccess.cpp2
-rw-r--r--plugins/Dbx_tree/encryption/HC256.cpp2
-rw-r--r--plugins/FavContacts/src/main.cpp2
-rw-r--r--plugins/FreeImage/Miranda/version.h2
-rw-r--r--plugins/HistorySweeperLight/src/main.cpp2
-rw-r--r--plugins/LangMan/src/langpack.cpp8
-rw-r--r--plugins/MenuItemEx/src/main.cpp2
-rw-r--r--plugins/MirOTR/MirOTR/version.h4
-rw-r--r--plugins/OpenFolder/src/openFolder.h2
-rw-r--r--plugins/Popup/src/headers.h6
-rw-r--r--plugins/ProfileManager/src/pmanagerEx.cpp4
-rw-r--r--plugins/SendScreenshotPlus/src/global.h2
-rw-r--r--plugins/Sessions/Src/Version.h2
-rw-r--r--plugins/StatusPlugins/StartupStatus/startupstatus.h4
-rw-r--r--plugins/UserInfoEx/src/commonheaders.h2
-rw-r--r--plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp4
-rw-r--r--plugins/WhoUsesMyFiles/src/wumf.c2
-rw-r--r--plugins/WhoUsesMyFiles/src/wumfplug.c2
-rw-r--r--protocols/YAMN/main.cpp2
-rw-r--r--protocols/YAMN/proto/pop3/pop3comm.cpp4
29 files changed, 53 insertions, 53 deletions
diff --git a/plugins/AssocMgr/src/assoclist.cpp b/plugins/AssocMgr/src/assoclist.cpp
index 4ccb5645fe..b0e859e08d 100644
--- a/plugins/AssocMgr/src/assoclist.cpp
+++ b/plugins/AssocMgr/src/assoclist.cpp
@@ -1037,7 +1037,7 @@ void InitAssocList(void)
ftd.cbSize = sizeof(FILETYPEDESC);
ftd.pszFileExt = ".dat";
ftd.pszMimeType = NULL;
- ftd.ptszDescription = TranslateT("Miranda IM Database");
+ ftd.ptszDescription = TranslateT("Miranda NG Database");
ftd.hInstance = hInst;
ftd.nIconResID = IDI_MIRANDAFILE;
ftd.ptszVerbDesc = NULL;
diff --git a/plugins/AssocMgr/src/dde.cpp b/plugins/AssocMgr/src/dde.cpp
index a8328b4d34..285b575bb8 100644
--- a/plugins/AssocMgr/src/dde.cpp
+++ b/plugins/AssocMgr/src/dde.cpp
@@ -37,10 +37,10 @@ static void __stdcall FileActionAsync(void *param)
switch(InvokeFileHandler(pszFilePath)) { /* pszFilePath is always a long path name */
case 0: /* success */ break;
case CALLSERVICE_NOTFOUND:
- ShowInfoMessage(NIIF_ERROR,Translate("Miranda IM could not open file"),Translate("Miranda IM was not able to open \""TCHAR_STR_PARAM"\".\n\nThere is no registered handler for this file type."),pszFilePath);
+ ShowInfoMessage(NIIF_ERROR,Translate("Miranda NG could not open file"),Translate("Miranda NG was not able to open \""TCHAR_STR_PARAM"\".\n\nThere is no registered handler for this file type."),pszFilePath);
break;
default:
- ShowInfoMessage(NIIF_ERROR,Translate("Miranda IM could not open file"),Translate("Miranda IM was not able to open \""TCHAR_STR_PARAM"\".\n\nThe file could not be processed."),pszFilePath);
+ ShowInfoMessage(NIIF_ERROR,Translate("Miranda NG could not open file"),Translate("Miranda NG was not able to open \""TCHAR_STR_PARAM"\".\n\nThe file could not be processed."),pszFilePath);
}
mir_free(pszFilePath); /* async param */
}
@@ -53,10 +53,10 @@ static void __stdcall UrlActionAsync(void *param)
switch(InvokeUrlHandler(pszUrl)) {
case 0: /* success */ break;
case CALLSERVICE_NOTFOUND:
- ShowInfoMessage(NIIF_ERROR,Translate("Miranda IM could not open URL"),Translate("Miranda IM was not able to open \""TCHAR_STR_PARAM"\".\n\nThere is no registered handler for this URL type."),pszUrl);
+ ShowInfoMessage(NIIF_ERROR,Translate("Miranda NG could not open URL"),Translate("Miranda NG was not able to open \""TCHAR_STR_PARAM"\".\n\nThere is no registered handler for this URL type."),pszUrl);
break;
default:
- ShowInfoMessage(NIIF_ERROR,Translate("Miranda IM could not open URL"),Translate("Miranda IM was not able to open \""TCHAR_STR_PARAM"\".\n\nThe given URL is invalid and can not be parsed."),pszUrl);
+ ShowInfoMessage(NIIF_ERROR,Translate("Miranda NG could not open URL"),Translate("Miranda NG was not able to open \""TCHAR_STR_PARAM"\".\n\nThe given URL is invalid and can not be parsed."),pszUrl);
}
mir_free(pszUrl); /* async param */
}
diff --git a/plugins/AutoRun/src/main.cpp b/plugins/AutoRun/src/main.cpp
index 869869a9a0..1f023cd2b9 100644
--- a/plugins/AutoRun/src/main.cpp
+++ b/plugins/AutoRun/src/main.cpp
@@ -9,7 +9,7 @@ PLUGININFOEX pluginInfoEx=
sizeof(PLUGININFOEX),
"Autorun",
PLUGIN_MAKE_VERSION(0,1,0,1),
- "This plugin is a simple way to enable/disable to launch Miranda IM with system startup.",
+ "This plugin is a simple way to enable/disable to launch Miranda NG with system startup.",
"Sergey V. Gershovich a.k.a. Jazzy$ (fixed by Wolfram3D)",
"",
"Copyright © 2002-2007 Sergey V. Gershovich a.k.a. Jazzy$",
diff --git a/plugins/AutoShutdown/src/shutdownsvc.cpp b/plugins/AutoShutdown/src/shutdownsvc.cpp
index 57c12c65a2..3c33d39653 100644
--- a/plugins/AutoShutdown/src/shutdownsvc.cpp
+++ b/plugins/AutoShutdown/src/shutdownsvc.cpp
@@ -440,8 +440,8 @@ static INT_PTR CALLBACK ShutdownDlgProc(HWND hwndDlg,UINT msg,WPARAM wParam,LPAR
return TRUE;
case M_UPDATE_COUNTDOWN: /* lParam=(WORD)countdown */
{ TCHAR szText[256];
- TCHAR *desc[]={_T("Miranda IM is going to be automatically closed in %u second(s)."),
- _T("All Miranda IM protocols are going to be set to offline in %u second(s)."),
+ TCHAR *desc[]={_T("Miranda NG is going to be automatically closed in %u second(s)."),
+ _T("All Miranda NG protocols are going to be set to offline in %u second(s)."),
_T("You will be logged off automatically in %u second(s)."),
_T("The computer will automatically be restarted in %u second(s)."),
_T("The computer will automatically be set to standby mode in %u second(s)."),
@@ -517,13 +517,13 @@ INT_PTR ServiceIsTypeEnabled(WPARAM wParam,LPARAM lParam)
INT_PTR ServiceGetTypeDescription(WPARAM wParam,LPARAM lParam)
{
TCHAR *pszDesc;
- const TCHAR *apszShort[]={_T("Close Miranda IM"),_T("Set Miranda IM offline"),_T("Log off user"),
+ const TCHAR *apszShort[]={_T("Close Miranda NG"),_T("Set Miranda NG offline"),_T("Log off user"),
_T("Restart computer"),_T("Shutdown computer"),_T("Standby mode"),_T("Hibernate mode"),
- _T("Lock workstation"),_T("Hang up dialup connections"),_T("Close Miranda IM"),
- _T("Set Miranda IM offline"),_T("Log off user"),_T("Restart computer"),_T("Shutdown computer"),
+ _T("Lock workstation"),_T("Hang up dialup connections"),_T("Close Miranda NG"),
+ _T("Set Miranda NG offline"),_T("Log off user"),_T("Restart computer"),_T("Shutdown computer"),
_T("Standby mode"),_T("Hibernate mode"),_T("Lock workstation"),_T("Hang up dialup connections")};
- const TCHAR *apszLong[]={_T("Sets all Miranda IM protocols to offline and closes Miranda IM."),
- _T("Sets all Miranda IM protocols to offline."),
+ const TCHAR *apszLong[]={_T("Sets all Miranda NG protocols to offline and closes Miranda IM."),
+ _T("Sets all Miranda NG protocols to offline."),
_T("Logs the current Windows user off so that another user can log in."),
_T("Shuts down Windows and then restarts Windows."),
_T("Closes all running programs and shuts down Windows to a point at which it is safe to turn off the power."),
diff --git a/plugins/BASS_interface/src/Version.h b/plugins/BASS_interface/src/Version.h
index 66618eb818..0735651c7d 100644
--- a/plugins/BASS_interface/src/Version.h
+++ b/plugins/BASS_interface/src/Version.h
@@ -14,7 +14,7 @@
#define __PLUGIN_NAME "BASS_interface"
#define __INTERNAL_NAME "BASS_interface"
#define __FILENAME "BASS_interface.dll"
-#define __DESCRIPTION "un4seen's BASS interface Miranda IM plugin."
+#define __DESCRIPTION "un4seen's BASS interface Miranda NG plugin."
#define __AUTHOR "tico-tico"
#define __AUTHOREMAIL ""
#define __AUTHORWEB "http://miranda-ng.org/"
diff --git a/plugins/BasicHistory/src/version.h b/plugins/BasicHistory/src/version.h
index 9d428afdb7..21da8d9963 100644
--- a/plugins/BasicHistory/src/version.h
+++ b/plugins/BasicHistory/src/version.h
@@ -13,7 +13,7 @@
#define __PLUGIN_NAME "Basic History"
#define __INTERNAL_NAME "BasicHistory"
#define __FILENAME "BasicHistory.dll"
-#define __DESCRIPTION "History viewer for Miranda IM."
+#define __DESCRIPTION "History viewer for Miranda NG."
#define __AUTHOR "Krzysztof Kral"
#define __AUTHOREMAIL "krzysztof.kral@gmail.com"
#define __AUTHORWEB "http://miranda-ng.org/"
diff --git a/plugins/BossKeyPlus/src/BossKey.cpp b/plugins/BossKeyPlus/src/BossKey.cpp
index 5d4d6d4c21..1c6955320b 100644
--- a/plugins/BossKeyPlus/src/BossKey.cpp
+++ b/plugins/BossKeyPlus/src/BossKey.cpp
@@ -113,7 +113,7 @@ INT_PTR CALLBACK DlgStdInProc(HWND hDlg, UINT uMsg,WPARAM wParam,LPARAM lParam)
SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOZORDER);
}
SendMessage(GetDlgItem(hDlg, IDC_HEADERBAR), WM_SETICON, 0, (LPARAM)hIcon);
- SetWindowText(GetDlgItem(hDlg, IDC_HEADERBAR), _T("Miranda IM is locked.\nEnter password to unlock it."));
+ SetWindowText(GetDlgItem(hDlg, IDC_HEADERBAR), _T("Miranda NG is locked.\nEnter password to unlock it."));
TranslateDialogDefault(hDlg);
oldLangID = 0;
@@ -146,7 +146,7 @@ INT_PTR CALLBACK DlgStdInProc(HWND hDlg, UINT uMsg,WPARAM wParam,LPARAM lParam)
if (passlen == 0)
{
- SetWindowText(GetDlgItem(hDlg, IDC_HEADERBAR), TranslateT("Miranda IM is locked.\nEnter password to unlock it."));
+ SetWindowText(GetDlgItem(hDlg, IDC_HEADERBAR), TranslateT("Miranda NG is locked.\nEnter password to unlock it."));
SendMessage(GetDlgItem(hDlg, IDC_HEADERBAR), WM_NCPAINT, 0, 0);
}
else if (lstrcmpA(password, g_password))
@@ -320,7 +320,7 @@ static void CreateTrayIcon(bool create)
DBFreeVariant(&dbVar);
}
else
- lstrcpy(nim.szTip, _T("Miranda IM"));
+ lstrcpy(nim.szTip, _T("Miranda NG"));
nim.cbSize = sizeof(nim);
nim.hWnd = g_hListenWindow;
@@ -612,7 +612,7 @@ static int IcoLibInit (void) // Icolib support
sid.cx = sid.cy = 16;
sid.ptszSection = _T("BossKey");
sid.pszName = "hidemim";
- sid.ptszDescription = _T("Hide Miranda IM");
+ sid.ptszDescription = _T("Hide Miranda NG");
sid.iDefaultIndex = -IDI_DLGPASSWD;
g_hIcon = Skin_AddIcon(&sid);
return 0;
@@ -679,7 +679,7 @@ static int ModernToolbarInit(WPARAM, LPARAM) // Modern toolbar support
TTBButton button = {0};
button.cbSize = sizeof(button);
button.pszService = MS_BOSSKEY_HIDE;
- button.pszTooltipUp = button.name = LPGEN("Hide Miranda IM");
+ button.pszTooltipUp = button.name = LPGEN("Hide Miranda NG");
button.dwFlags = TTBBF_DISABLED | TTBBF_SHOWTOOLTIP;
button.hIconHandleUp = g_hIcon;
TopToolbar_AddButton(&button);
@@ -704,7 +704,7 @@ static int TabsrmmButtonsInit(WPARAM wParam, LPARAM lParam)
bbd.cbSize = sizeof(BBButton);
bbd.pszModuleName = MOD_NAME;
bbd.dwDefPos = 5000;
- bbd.ptszTooltip = _T("Hide Miranda IM");
+ bbd.ptszTooltip = _T("Hide Miranda NG");
bbd.bbbFlags = BBBF_ISRSIDEBUTTON | BBBF_CANBEHIDDEN;
bbd.hIcon = g_hIcon;
CallService (MS_BB_ADDBUTTON, 0, (LPARAM)&bbd);
diff --git a/plugins/Dbx_mmap_SA/src/init.cpp b/plugins/Dbx_mmap_SA/src/init.cpp
index f7d96822a8..cea82f5c79 100644
--- a/plugins/Dbx_mmap_SA/src/init.cpp
+++ b/plugins/Dbx_mmap_SA/src/init.cpp
@@ -37,7 +37,7 @@ PLUGININFOEX pluginInfo = {
"Provides Miranda database support: global settings, contacts, history, settings per contact. Enhanced modification with Encryption support.",
"Miranda-IM project, modification by FYR and chaos.persei, nullbie, Billy_Bons",
"chaos.persei@gmail.com; ashpynov@gmail.com; bio@msx.ru; ghazan@miranda.im",
- "Copyright 2000-2011 Miranda IM project, FYR, chaos.persei, induction, nullbie",
+ "Copyright 2000-2011 Miranda IM project, 2012 Miranda NG project FYR, chaos.persei, induction, nullbie",
"http://miranda-ng.org/",
UNICODE_AWARE,
// {28FF9B91-3E4D-4f1c-B47C-C641B037FF40}
diff --git a/plugins/Dbx_tree/DataBase.h b/plugins/Dbx_tree/DataBase.h
index 124fee4f9d..c8dacb3902 100644
--- a/plugins/Dbx_tree/DataBase.h
+++ b/plugins/Dbx_tree/DataBase.h
@@ -48,7 +48,7 @@ typedef enum TDBFileType {
DBFileMax = 2
} TDBFileType;
-static const uint8_t cFileSignature[DBFileMax][20] = {"Miranda IM Settings", "Miranda IM DataTree"};
+static const uint8_t cFileSignature[DBFileMax][20] = {"Miranda NG Settings", "Miranda NG DataTree"};
static const uint32_t cDBVersion = 0x00000001;
static const uint32_t cHeaderBlockSignature = 0x7265491E;
diff --git a/plugins/Dbx_tree/FileAccess.cpp b/plugins/Dbx_tree/FileAccess.cpp
index a0aa85aecb..4faab4e495 100644
--- a/plugins/Dbx_tree/FileAccess.cpp
+++ b/plugins/Dbx_tree/FileAccess.cpp
@@ -28,7 +28,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#endif
#include "Logger.h"
-const uint8_t CFileAccess::cJournalSignature[20] = "Miranda IM Journal!";
+const uint8_t CFileAccess::cJournalSignature[20] = "Miranda NG Journal!";
CFileAccess::CFileAccess(const TCHAR* FileName)
{
diff --git a/plugins/Dbx_tree/encryption/HC256.cpp b/plugins/Dbx_tree/encryption/HC256.cpp
index 19b1ca7150..056b4e4dae 100644
--- a/plugins/Dbx_tree/encryption/HC256.cpp
+++ b/plugins/Dbx_tree/encryption/HC256.cpp
@@ -195,7 +195,7 @@ inline void HC256::EncryptBlock(uint32_t *Data)
inline void HC256::CreateTables(uint8_t* Key)
{
uint32_t i, j;
- uint8_t iv[32] = "Miranda IM dbx_tree Protogenes!";
+ uint8_t iv[32] = "Miranda NG dbx_tree Protogenes!";
//expand the key and iv into P and Q
for (i = 0; i < 8; i++)
P[i] = Key[i];
diff --git a/plugins/FavContacts/src/main.cpp b/plugins/FavContacts/src/main.cpp
index 9f83dd1f0c..c359462267 100644
--- a/plugins/FavContacts/src/main.cpp
+++ b/plugins/FavContacts/src/main.cpp
@@ -90,7 +90,7 @@ bool CoreCheck()
{
MessageBoxA(0,
Translate(
- "Favourite Contacts plugin was designed to be used with Miranda IM only.\n"
+ "Favourite Contacts plugin was designed to be used with Miranda IM and Miranda NG only.\n"
"For use with any other application, please contact author.\n"
),
"Favourite Contacts Error",
diff --git a/plugins/FreeImage/Miranda/version.h b/plugins/FreeImage/Miranda/version.h
index b9335d586c..cb909c8a03 100644
--- a/plugins/FreeImage/Miranda/version.h
+++ b/plugins/FreeImage/Miranda/version.h
@@ -9,4 +9,4 @@
#define __AUTHOR "Nightwish, The FreeImage project (http://freeimage.sourceforge.net/)"
#define __AUTHOREMAIL ""
#define __AUTHORWEB "http://miranda-ng.org/"
-#define __COPYRIGHT "© 2000-2012 Miranda-IM project, uses the FreeImage distribution"
+#define __COPYRIGHT "© 2000-2012 Miranda-IM project, 2012 Miranda-NG project uses the FreeImage distribution"
diff --git a/plugins/HistorySweeperLight/src/main.cpp b/plugins/HistorySweeperLight/src/main.cpp
index 577aa6a951..fdbb6f3cd3 100644
--- a/plugins/HistorySweeperLight/src/main.cpp
+++ b/plugins/HistorySweeperLight/src/main.cpp
@@ -33,7 +33,7 @@ static PLUGININFOEX pluginInfoEx =
sizeof(PLUGININFOEX),
"History Sweeper Light",
__VERSION_DWORD,
- "This plugin can sweep system history, history from all contacts or only from chosen; also it may sweep history older than certain time; and may do it at Miranda IM startup/shutdown.",
+ "This plugin can sweep system history, history from all contacts or only from chosen; also it may sweep history older than certain time; and may do it at Miranda NG startup/shutdown.",
"Sergey V. Gershovich a.k.a. Jazzy$, Boris Krasnovskiy, tico-tico",
"",
"© 2002-2003 Sergey V. Gershovich a.k.a. Jazzy$, 2006-2009 Boris Krasnovskiy, 2010, 2011 tico-tico",
diff --git a/plugins/LangMan/src/langpack.cpp b/plugins/LangMan/src/langpack.cpp
index 0f783e0bbe..1fb31928de 100644
--- a/plugins/LangMan/src/langpack.cpp
+++ b/plugins/LangMan/src/langpack.cpp
@@ -145,8 +145,8 @@ static BOOL LoadPackData(LANGPACK_INFO *pack, BOOL fEnabledPacks, const char *ps
Miranda Language Pack Version 1
Language: (optional)
Locale: 0809
- Authors: Miranda IM Development Team (multiple tags allowed)
- Author-email: project-info at miranda-im.org (" at " instead of "@" allowed)
+ Authors: Miranda NG Development Team (multiple tags allowed)
+ Author-email: project-info at miranda-ng.org (" at " instead of "@" allowed)
Last-Modified-Using: Miranda IM 0.7
Plugins-included: (multiple tags allowed)
X-FLName: name as used on the file listing (non-standard extension)
@@ -295,8 +295,8 @@ BOOL EnumPacks(ENUM_PACKS_CALLBACK callback, const TCHAR *pszFilePattern, const
ZeroMemory(&pack, sizeof(pack));
pack.Locale = LOCALE_USER_DEFAULT; /* miranda uses default locale in this case */
lstrcpy(pack.szLanguage, _T("English (default)")); /* buffer safe */
- lstrcpyA(pack.szAuthors, "Miranda IM Development Team"); /* buffer safe */
- lstrcpyA(pack.szAuthorEmail, "project-info at miranda-im.org"); /* buffer safe */
+ lstrcpyA(pack.szAuthors, "Miranda NG Development Team"); /* buffer safe */
+ lstrcpyA(pack.szAuthorEmail, "project-info at miranda-ng.org"); /* buffer safe */
CleanupEmail(pack.szAuthorEmail); /* correct " at " */
CleanupLastModifiedUsing(pack.szLastModifiedUsing, sizeof(pack.szLastModifiedUsing));
/* file date */
diff --git a/plugins/MenuItemEx/src/main.cpp b/plugins/MenuItemEx/src/main.cpp
index ca7a914527..c99a7358c2 100644
--- a/plugins/MenuItemEx/src/main.cpp
+++ b/plugins/MenuItemEx/src/main.cpp
@@ -880,7 +880,7 @@ INT_PTR onChangeProto(WPARAM wparam,LPARAM lparam)
return 0;
}
if(MessageBox(NULL,(LPCTSTR)TranslateT("Do you want to send authorization request\nto new contact?"),
- TranslateT("Miranda IM"), MB_OKCANCEL | MB_SETFOREGROUND | MB_TOPMOST) == IDOK)
+ TranslateT("Miranda NG"), MB_OKCANCEL | MB_SETFOREGROUND | MB_TOPMOST) == IDOK)
onSendAuthRequest((WPARAM)hContactNew, 0);
diff --git a/plugins/MirOTR/MirOTR/version.h b/plugins/MirOTR/MirOTR/version.h
index 45fcb67b71..2bd9618de7 100644
--- a/plugins/MirOTR/MirOTR/version.h
+++ b/plugins/MirOTR/MirOTR/version.h
@@ -12,10 +12,10 @@
#ifdef _UNICODE
#define SHORT_NAME_STRING "Miranda OTR"
- #define DESC_STRING "OTR (Off-the-Record) plugin for Miranda IM"
+ #define DESC_STRING "OTR (Off-the-Record) plugin for Miranda NG"
#else
#define SHORT_NAME_STRING "Miranda OTR (x64)"
- #define DESC_STRING "OTR (Off-the-Record) plugin for Miranda IM (64Bit)"
+ #define DESC_STRING "OTR (Off-the-Record) plugin for Miranda NG (64Bit)"
#endif
#define LONGDESC_STRING DESC_STRING "\r\n(using some code and ideas from SecureIM, Pidgin-OTR and old Miranda OTR (by SJE))."
#define COMPANY_NAME ""
diff --git a/plugins/OpenFolder/src/openFolder.h b/plugins/OpenFolder/src/openFolder.h
index d7eb02dad8..7f51889d77 100644
--- a/plugins/OpenFolder/src/openFolder.h
+++ b/plugins/OpenFolder/src/openFolder.h
@@ -16,7 +16,7 @@
#define MS_OPENFOLDER_OPEN "openFolder/Open"
#define OPENFOLDER_VERSION PLUGIN_MAKE_VERSION( 1, 1, 0, 0 )
-#define OPENFOLDER_DESCRIPTION "Adds a menu/toobar item which opens the main Miranda IM folder."
+#define OPENFOLDER_DESCRIPTION "Adds a menu/toobar item which opens the main Miranda NG folder."
#define MIID_OPENFOLDER { 0x10896143, 0x7249, 0x4b36, { 0xa4, 0x8, 0x65, 0x1, 0xa6, 0xb6, 0x3, 0x5a } }
//#define OPENFOLDER_DB_MODULENAME "openFolder"
#define OPENFOLDER_MODULE_NAME "openfolder"
diff --git a/plugins/Popup/src/headers.h b/plugins/Popup/src/headers.h
index 5436ae63cd..64b9ec04fa 100644
--- a/plugins/Popup/src/headers.h
+++ b/plugins/Popup/src/headers.h
@@ -36,11 +36,11 @@ project file.
Written by: Hrk (Luca Santarelli)
Updated by: Zazoo (Victor Pavlychko)
-Miranda IM can be found here:
+Miranda NG can be found here:
http://miranda-ng.org/
-Miranda IM plugins and tools can be found here:
-http://miranda-ng.org/
+Miranda NG plugins and tools can be found here:
+http://miranda-ng.org/distr/
===============================================================================
diff --git a/plugins/ProfileManager/src/pmanagerEx.cpp b/plugins/ProfileManager/src/pmanagerEx.cpp
index e2d9f0a3de..175182be67 100644
--- a/plugins/ProfileManager/src/pmanagerEx.cpp
+++ b/plugins/ProfileManager/src/pmanagerEx.cpp
@@ -29,9 +29,9 @@ HANDLE hLoadPM, hChangePM;
PLUGININFOEX pluginInfo={
sizeof(PLUGININFOEX),
- "Miranda IM Profile Changer",
+ "Miranda NG Profile Changer",
PLUGIN_MAKE_VERSION(0,0,0,3),
- "Adds a menu item to change or load a different profile of Miranda IM.",
+ "Adds a menu item to change or load a different profile of Miranda NG.",
"Roman Gemini",
"woobind@ukr.net",
"© 2008 - 2010 Roman Gemini",
diff --git a/plugins/SendScreenshotPlus/src/global.h b/plugins/SendScreenshotPlus/src/global.h
index bd1efd0809..9eec83abc6 100644
--- a/plugins/SendScreenshotPlus/src/global.h
+++ b/plugins/SendScreenshotPlus/src/global.h
@@ -61,7 +61,7 @@ Last change by : $Author: ing.u.horn $
#include <gdiplus.h>
using namespace std;
-// Miranda IM SDK includes
+// Miranda NG SDK includes
#include <win2k.h>
#include <msapi/vsstyle.h>
#include <msapi/vssym32.h>
diff --git a/plugins/Sessions/Src/Version.h b/plugins/Sessions/Src/Version.h
index e79e8d33c0..303ecf5ed0 100644
--- a/plugins/Sessions/Src/Version.h
+++ b/plugins/Sessions/Src/Version.h
@@ -14,7 +14,7 @@
#define __PLUGIN_NAME "Sessions"
#define __INTERNAL_NAME "Sessions"
#define __FILENAME "Sessions.dll"
-#define __DESCRIPTION "Sessions Manager for Miranda IM."
+#define __DESCRIPTION "Sessions Manager for Miranda NG."
#define __AUTHOR "MaD_CLuSTeR"
#define __AUTHOREMAIL "daniok@yandex.ru"
#define __AUTHORWEB "http://miranda-ng.org/"
diff --git a/plugins/StatusPlugins/StartupStatus/startupstatus.h b/plugins/StatusPlugins/StartupStatus/startupstatus.h
index 69cd54b392..f76f1a468a 100644
--- a/plugins/StatusPlugins/StartupStatus/startupstatus.h
+++ b/plugins/StatusPlugins/StartupStatus/startupstatus.h
@@ -125,8 +125,8 @@ typedef struct {
#define SETTING_SETPROFILEDELAY "SetStatusDelay"
#define SETTING_DLGTIMEOUT "DialogTimeout"
-#define SHORTCUT_DESC "Miranda IM"
-#define SHORTCUT_FILENAME "\\Miranda IM.lnk"
+#define SHORTCUT_DESC "Miranda NG"
+#define SHORTCUT_FILENAME "\\Miranda NG.lnk"
#define DOCKED_NONE 0
#define DOCKED_LEFT 1
diff --git a/plugins/UserInfoEx/src/commonheaders.h b/plugins/UserInfoEx/src/commonheaders.h
index b998884e65..f31a6fcac0 100644
--- a/plugins/UserInfoEx/src/commonheaders.h
+++ b/plugins/UserInfoEx/src/commonheaders.h
@@ -66,7 +66,7 @@ using namespace std;
typedef std::basic_string<TCHAR> tstring;
/***********************************************************************************************************
- * Miranda IM SDK includes and macros
+ * Miranda NG SDK includes and macros
***********************************************************************************************************/
#define MIRANDA_VER 0x0A00
diff --git a/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp b/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp
index d9d0efbd7d..6b72dbdb46 100644
--- a/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp
+++ b/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp
@@ -39,7 +39,7 @@ Last change by : $Author: ing.u.horn $
-#define HKEY_MIRANDA_PLACESBAR _T("Software\\Miranda IM\\PlacesBar")
+#define HKEY_MIRANDA_PLACESBAR _T("Software\\Miranda NG\\PlacesBar")
#define HKEY_WINPOL_PLACESBAR _T("Software\\Microsoft\\Windows\\CurrentVersion\\Policies\\ComDlg32\\PlacesBar")
static WNDPROC DefPlacesBarProc;
@@ -149,7 +149,7 @@ static LRESULT PlacesBarSubclassProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM
case 41063:
ZeroMemory(szBtnText, sizeof(szBtnText));
- mir_tcsncpy(szBtnText, TranslateT("Miranda IM"), SIZEOF(szBtnText));
+ mir_tcsncpy(szBtnText, TranslateT("Miranda NG"), SIZEOF(szBtnText));
iString = SendMessage(hWnd, TB_ADDSTRING, NULL, (LPARAM)szBtnText);
if (iString != -1) tbb->iString = iString;
// set tooltip
diff --git a/plugins/WhoUsesMyFiles/src/wumf.c b/plugins/WhoUsesMyFiles/src/wumf.c
index 03aa576d38..cac2a452df 100644
--- a/plugins/WhoUsesMyFiles/src/wumf.c
+++ b/plugins/WhoUsesMyFiles/src/wumf.c
@@ -112,7 +112,7 @@ int CALLBACK ConnDlgProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
if (IsUserAnAdmin()) {
SetTimer(NULL, 777, TIME,(TIMERPROC) TimerProc);
} else {
- MessageBox(NULL, "Plugin WhoUsesMyFiles requires admin privileges in order to work.", "Miranda IM", MB_OK);
+ MessageBox(NULL, "Plugin WhoUsesMyFiles requires admin privileges in order to work.", "Miranda NG", MB_OK);
}
ShowList(lst, hList);
Utils_RestoreWindowPosition(hWnd, NULL, ModuleName,"conn");
diff --git a/plugins/WhoUsesMyFiles/src/wumfplug.c b/plugins/WhoUsesMyFiles/src/wumfplug.c
index 4e5029f887..d7ba2a65bd 100644
--- a/plugins/WhoUsesMyFiles/src/wumfplug.c
+++ b/plugins/WhoUsesMyFiles/src/wumfplug.c
@@ -619,7 +619,7 @@ __declspec(dllexport) int Load(void)
if (IsUserAnAdmin()) {
SetTimer(NULL, 777, TIME,(TIMERPROC) TimerProc);
} else {
- MessageBox(NULL, "Plugin WhoUsesMyFiles requires admin privileges in order to work.", "Miranda IM", MB_OK);
+ MessageBox(NULL, "Plugin WhoUsesMyFiles requires admin privileges in order to work.", "Miranda NG", MB_OK);
}
return 0;
diff --git a/protocols/YAMN/main.cpp b/protocols/YAMN/main.cpp
index da9e0a1f53..e7e74ee7b4 100644
--- a/protocols/YAMN/main.cpp
+++ b/protocols/YAMN/main.cpp
@@ -42,7 +42,7 @@ PLUGININFOEX pluginInfo = {
sizeof(PLUGININFOEX),
YAMN_SHORTNAME,
YAMN_VERSION,
- "Mail notifier and browser for Miranda IM. Included POP3 protocol.",
+ "Mail notifier and browser for Miranda NG. Included POP3 protocol.",
"y_b tweety (majvan)",
"francois.mean@skynet.be",
"© (2002-2004 majvan) 2005-2007 tweety y_b Miranda community",
diff --git a/protocols/YAMN/proto/pop3/pop3comm.cpp b/protocols/YAMN/proto/pop3/pop3comm.cpp
index 1fbc6b4164..4fbfb86a7f 100644
--- a/protocols/YAMN/proto/pop3/pop3comm.cpp
+++ b/protocols/YAMN/proto/pop3/pop3comm.cpp
@@ -130,7 +130,7 @@ YAMN_PROTOREGISTRATION POP3ProtocolRegistration =
"POP3 protocol (internal)",
YAMN_VERSION_C,
"© 2002-2004 majvan | 2005-2007 tweety, yb",
- "Mail notifier and browser for Miranda IM. Included POP3 protocol.",
+ "Mail notifier and browser for Miranda NG. Included POP3 protocol.",
"francois.mean@skynet.be",
"http://miranda-ng.org/",
};
@@ -232,7 +232,7 @@ int RegisterPOP3Plugin(WPARAM,LPARAM)
//First, we register this plugin
//it is quite impossible this function returns zero (failure) as YAMN and internal plugin structre versions are the same
POP3ProtocolRegistration.Name = Translate("POP3 protocol (internal)");
- POP3ProtocolRegistration.Description = Translate("Mail notifier and browser for Miranda IM. Included POP3 protocol.");
+ POP3ProtocolRegistration.Description = Translate("Mail notifier and browser for Miranda NG. Included POP3 protocol.");
if (NULL==(POP3Plugin=(HYAMNPROTOPLUGIN)CallService(MS_YAMN_REGISTERPROTOPLUGIN,(WPARAM)&POP3ProtocolRegistration,(LPARAM)YAMN_PROTOREGISTRATIONVERSION)))
return 0;