X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=main.c;h=5b1c674ad3e54dba454c09f4ea69833420daafba;hp=e8f4ef385eab620a4ee541eb8425ff1fe938f1de;hb=1bf100814942c455dfd1d99fdd6fce80970a9999;hpb=22601f25ede6703ba7cd06ee84eddd2045308570

diff --git a/main.c b/main.c
index e8f4ef3..5b1c674 100644
--- a/main.c
+++ b/main.c
@@ -88,14 +88,14 @@ extern int optind;
 
 static const char *ReachingUs = N_("\
 To contact the developers, please mail to <mutt-ng-devel@lists.berlios.de>.\n\
-To visit the Mutt-ng homepage go to http://www.muttng.org.\n\
+To visit the Madmutt homepage go to http://www.muttng.org.\n\
 To report a bug, please use the fleang(1) utility.\n");
 
 static const char *Notice = N_("\
 Copyright (C) 1996-2002 Michael R. Elkins and others.\n\
-Mutt-ng comes with ABSOLUTELY NO WARRANTY; for details type `muttng -vv'.\n\
+Madmutt comes with ABSOLUTELY NO WARRANTY; for details type `madmutt -vv'.\n\
 Mutt is free software, and you are welcome to redistribute it\n\
-under certain conditions; type `muttng -vv' for details.\n");
+under certain conditions; type `madmutt -vv' for details.\n");
 
 static const char *Copyright_Mutt = N_("\
 Copyright (C) 1996-2004 Michael R. Elkins <me@mutt.org>\n\
@@ -146,16 +146,16 @@ static void mutt_usage (void)
   puts (mutt_make_version (1));
 
   puts
-    _("usage: muttng [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f <file> ]\n\
-       muttng [ -nR ] [ -e <cmd> ] [ -F <file> ] -Q <query> [ -Q <query> ] [...]\n\
-       muttng [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] [...]\n\
-       muttng [ -nR ] [ -e <cmd> ] [ -F <file> ] -t");
+    _("usage: madmutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f <file> ]\n\
+       madmutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -Q <query> [ -Q <query> ] [...]\n\
+       madmutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] [...]\n\
+       madmutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -t");
   puts
     _("\
-       muttng [ -nR ] [ -e <cmd> ] [ -F <file> ] -T\n\
-       muttng [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] [ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n\
-       muttng [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n\
-       muttng -v[v]\n\
+       madmutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -T\n\
+       madmutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] [ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n\
+       madmutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n\
+       madmutt -v[v]\n\
 \n\
 options:\n\
   -A <alias>\texpand the given alias\n\
@@ -163,7 +163,7 @@ options:\n\
   -b <address>\tspecify a blind carbon-copy (BCC) address\n\
   -c <address>\tspecify a carbon-copy (CC) address");
 #if DEBUG
-  puts _("  -d <level>\tlog debugging output to ~/.muttngdebug0");
+  puts _("  -d <level>\tlog debugging output to ~/.madmuttdebug0");
 #endif
   puts _("\
   -e <command>\tspecify a command to be executed after initialization\n\
@@ -172,11 +172,11 @@ options:\n\
   -g <server>\tspecify a newsserver (if compiled with NNTP)\n\
   -G\t\tselect a newsgroup (if compiled with NNTP)\n\
   -H <file>\tspecify a draft file to read header and body from\n\
-  -i <file>\tspecify a file which Mutt-ng should include in the body");
+  -i <file>\tspecify a file which Madmutt should include in the body");
   puts _("\
-  -d <level>\t specify debugging level of Mutt-ng\n\
+  -d <level>\t specify debugging level of Madmutt\n\
   -m <type>\tspecify a default mailbox type\n\
-  -n\t\tcauses Mutt-ng not to read the system Muttngrc\n\
+  -n\t\tcauses Madmutt not to read the system Madmuttrc\n\
   -p\t\trecall a postponed message\n\
   -Q <variable>\tquery a configuration variable\n\
   -R\t\topen mailbox in read-only mode\n\
@@ -461,7 +461,7 @@ static void show_version (void)
 
   puts (_(ReachingUs));
 
-  puts (_("MadMutt is based on Mutt-ng wich was based on Mutt before\n"));
+  puts (_("MadMutt is based on Madmutt wich was based on Mutt before\n"));
 
   exit (0);
 }
@@ -760,16 +760,16 @@ int main (int argc, char **argv)
   if (!option (OPTNOCURSES) && Maildir) {
     struct stat sb;
     char fpath[_POSIX_PATH_MAX];
-    char msg[STRING];
+    char mesg[STRING];
 
     m_strcpy(fpath, sizeof(fpath), Maildir);
     mutt_expand_path (fpath, sizeof (fpath));
     /* we're not connected yet - skip mail folder creation */
     if (mx_get_magic (fpath) != M_IMAP)
       if (stat (fpath, &sb) == -1 && errno == ENOENT) {
-        snprintf (msg, sizeof (msg), _("%s does not exist. Create it?"),
+        snprintf (mesg, sizeof (mesg), _("%s does not exist. Create it?"),
                   Maildir);
-        if (mutt_yesorno (msg, M_YES) == M_YES) {
+        if (mutt_yesorno (mesg, M_YES) == M_YES) {
           if (mkdir (fpath, 0700) == -1 && errno != EEXIST)
             mutt_error (_("Can't create %s: %s."), Maildir, strerror (errno));
         }