Miranda IM renamed to Miranda NG part 2

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

2 files changed, 11 insertions, 11 deletions

diff --git a/include/m_system.h b/include/m_system.h
index bac3721493..847aecc5f0 100644
--- a/include/m_system.h
+++ b/include/m_system.h
@@ -27,7 +27,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 

 #ifndef MIRANDANAME

-	#define MIRANDANAME "Miranda IM"

+	#define MIRANDANAME "Miranda NG"

 #endif

 #ifndef MIRANDACLASS

 	#define MIRANDACLASS	"Miranda"

diff --git a/src/resource.rc b/src/resource.rc
index d760907b70..5ffd3e1bf9 100644
--- a/src/resource.rc
+++ b/src/resource.rc
@@ -86,7 +86,7 @@ END
 

 IDD_PROFILEMANAGER DIALOGEX 0, 0, 400, 211

 STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_FIXEDSYS | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_SYSMENU

-CAPTION "Miranda IM Profile Manager"

+CAPTION "Miranda NG Profile Manager"

 FONT 8, "MS Shell Dlg", 0, 0, 0x1

 BEGIN

     CONTROL         "",IDC_NAME,"MHeaderbarCtrl",0x0,0,0,400,25

@@ -187,7 +187,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN

     DEFPUSHBUTTON   "Yes",IDOK,26,84,50,14

     PUSHBUTTON      "No",IDCANCEL,81,84,50,14

-    LTEXT           "A file containing new database settings has been placed in the Miranda IM directory.",IDC_STATIC,5,5,203,16

+    LTEXT           "A file containing new database settings has been placed in the Miranda NG directory.",IDC_STATIC,5,5,203,16

     LTEXT           "Do you want to import the settings now?",IDC_STATIC,5,69,203,8

     PUSHBUTTON      "No to all",IDC_NOTOALL,136,84,50,14

     LTEXT           "",IDC_ININAME,5,24,143,16,SS_NOPREFIX | SS_CENTERIMAGE

@@ -254,11 +254,11 @@ BEGIN
     EDITTEXT        IDC_FILENAME,14,159,270,12,ES_AUTOHSCROLL

     PUSHBUTTON      "...",IDC_FILENAMEBROWSE,288,159,15,12

     LTEXT           "",IDC_PATH,14,174,294,10

-    GROUPBOX        "Run programm when Miranda IM starts (eg tail -f, dbgview, etc):",IDC_STATIC,6,188,302,32

+    GROUPBOX        "Run programm when Miranda NG starts (eg tail -f, dbgview, etc):",IDC_STATIC,6,188,302,32

     EDITTEXT        IDC_RUNATSTART,14,200,203,12,ES_AUTOHSCROLL

     PUSHBUTTON      "...",IDC_RUNATSTARTBROWSE,220,200,15,12

     PUSHBUTTON      "Run now",IDC_RUNNOW,241,200,60,12

-    CONTROL         "Show this dialog box when Miranda IM starts",IDC_SHOWTHISDLGATSTART,

+    CONTROL         "Show this dialog box when Miranda NG starts",IDC_SHOWTHISDLGATSTART,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,226,294,10

     PUSHBUTTON      "Save as default",IDC_SAVE,6,241,79,14

     DEFPUSHBUTTON   "Ok",IDOK,173,241,54,14

@@ -440,7 +440,7 @@ BEGIN
     RTEXT           "Homepage:",IDC_STATIC,10,200,38,9

     RTEXT           "Unique ID:",IDC_STATIC,7,214,38,10

     RTEXT           "Copyright:",IDC_STATIC,8,227,38,10

-    CTEXT           "Please restart Miranda IM for your changes to take effect.",IDC_RESTART,14,240,288,8,NOT WS_VISIBLE

+    CTEXT           "Please restart Miranda NG for your changes to take effect.",IDC_RESTART,14,240,288,8,NOT WS_VISIBLE

 END

 

 IDD_OPT_FONTS DIALOGEX 0, 0, 316, 251

@@ -547,7 +547,7 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
 EXSTYLE WS_EX_CONTROLPARENT

 FONT 8, "MS Shell Dlg", 0, 0, 0x1

 BEGIN

-    CTEXT           "Note: Miranda IM will have to be restarted for changes to take effect.",IDC_PROTOCOLORDERWARNING,5,190,289,14,NOT WS_VISIBLE

+    CTEXT           "Note: Miranda NG will have to be restarted for changes to take effect.",IDC_PROTOCOLORDERWARNING,5,190,289,14,NOT WS_VISIBLE

     GROUPBOX        "Account Order && Visibility",IDC_STATIC,75,0,147,185

     CONTROL         "Tree1",IDC_PROTOCOLORDER,"SysTreeView32",TVS_NOTOOLTIPS | WS_BORDER | WS_TABSTOP,85,40,132,95

     LTEXT           "Show protocols in the following order, drag to choose another order:",IDC_STATIC,85,15,132,20

@@ -592,7 +592,7 @@ BEGIN
                     "MHeaderbarCtrl",0x0,0,0,350,25

     LISTBOX         IDC_ACCLIST,7,32,130,187,LBS_SORT | LBS_OWNERDRAWVARIABLE | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP

     LTEXT           "Account information:",IDC_TXT_ACCOUNT,142,32,201,8

-    LTEXT           "Welcome to Miranda IM's account manager!\nHere you can set up your IM accounts.\n\nSelect an account from the list on the left to see the available options.  Alternatively, just click on the Plus sign underneath the list to set up a new IM account.",IDC_TXT_INFO,157,45,186,134

+    LTEXT           "Welcome to Miranda NG's account manager!\nHere you can set up your IM accounts.\n\nSelect an account from the list on the left to see the available options.  Alternatively, just click on the Plus sign underneath the list to set up a new IM account.",IDC_TXT_INFO,157,45,186,134

     LTEXT           "Additional:",IDC_TXT_ADDITIONAL,142,184,201,8

     CONTROL         "Configure network...",IDC_LNK_NETWORK,"Hyperlink",WS_TABSTOP,157,197,186,11

     CONTROL         "Get more protocols...",IDC_LNK_ADDONS,"Hyperlink",WS_TABSTOP,157,208,186,11

@@ -608,10 +608,10 @@ END
 IDD_WAITRESTART DIALOGEX 0, 0, 167, 70

 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION

 EXSTYLE WS_EX_TOOLWINDOW

-CAPTION "Miranda IM"

+CAPTION "Miranda NG"

 FONT 8, "MS Shell Dlg", 400, 0, 0x1

 BEGIN

-    LTEXT           "Miranda IM is being restarted.\nPlease wait...",IDC_STATIC,7,7,153,18

+    LTEXT           "Miranda NG is being restarted.\nPlease wait...",IDC_STATIC,7,7,153,18

     CONTROL         "",IDC_PROGRESSBAR,"msctls_progress32",WS_BORDER,7,30,153,14

     PUSHBUTTON      "Close",IDCANCEL,110,49,50,14

 END

@@ -670,7 +670,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN

     LISTBOX         IDC_ACCLIST,0,0,162,192,LBS_SORT | LBS_OWNERDRAWVARIABLE | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP

     LTEXT           "Account information:",IDC_TXT_ACCOUNT,167,0,201,8

-    LTEXT           "Welcome to Miranda IM's account manager!\nHere you can set up your IM accounts.\n\nSelect an account from the list on the left to see the available options.  Alternatively, just click on the ""New"" button underneath the list to set up a new IM account.",IDC_TXT_INFO,182,13,186,134

+    LTEXT           "Welcome to Miranda NG's account manager!\nHere you can set up your IM accounts.\n\nSelect an account from the list on the left to see the available options.  Alternatively, just click on the ""New"" button underneath the list to set up a new IM account.",IDC_TXT_INFO,182,13,186,134

     CONTROL         "&Add...",IDC_ADD,"MButtonClass",WS_TABSTOP,0,196,16,14,WS_EX_NOACTIVATE | 0x10000000L

     CONTROL         "&Edit",IDC_EDIT,"MButtonClass",WS_TABSTOP,22,196,16,14,WS_EX_NOACTIVATE | 0x10000000L

     CONTROL         "&Options",IDC_OPTIONS,"MButtonClass",WS_TABSTOP,38,196,16,14,WS_EX_NOACTIVATE | 0x10000000L