I18N: Unify printed string on signal caught

Also include the signal number in the output.

diff --git a/mutt/signal.c b/mutt/signal.c
index f6fefa3bf2c670890c50e09cbafc5c8c23910a38..6a824c686779d86408e0b13fb2d8c6cd419f5b27 100644 (file)
--- a/mutt/signal.c
+++ b/mutt/signal.c
@@ -64,13 +64,13 @@ void mutt_sig_empty_handler(int sig)
 void mutt_sig_exit_handler(int sig)
 {
 #if HAVE_DECL_SYS_SIGLIST
-  printf(_("%s...  Exiting.\n"), sys_siglist[sig]);
+  printf(_("Caught signal %d (%s) ...  Exiting.\n"), sig, sys_siglist[sig]);
 #elif (defined(__sun__) && defined(__svr4__))
-  printf(_("Caught %s...  Exiting.\n"), _sys_siglist[sig]);
+  printf(_("Caught signal %d (%s) ...  Exiting.\n"), sig, _sys_siglist[sig]);
 #elif (defined(__alpha) && defined(__osf__))
-  printf(_("Caught %s...  Exiting.\n"), __sys_siglist[sig]);
+  printf(_("Caught signal %d (%s) ...  Exiting.\n"), sig, __sys_siglist[sig]);
 #else
-  printf(_("Caught signal %d...  Exiting.\n"), sig);
+  printf(_("Caught signal %d ...  Exiting.\n"), sig);
 #endif
   exit(0);
 }

diff --git a/signal.c b/signal.c
index c1419cafedfd560ff266cc4ea2be3e209b4113a9..ec720a5f51838bebc358c98a8c0abeda4adac73e 100644 (file)
--- a/signal.c
+++ b/signal.c
@@ -46,18 +46,18 @@ static void exit_handler(int sig)
   curs_set(1);
   endwin(); /* just to be safe */
 
-/*
+  /*
    * if sys_siglist is not defined, HAVE_DECL_SYS_SIGLIST will be set to 0
    * so we must check it with #if and not #ifdef
    */
 #if HAVE_DECL_SYS_SIGLIST
-  printf(_("%s...  Exiting.\n"), sys_siglist[sig]);
+  printf(_("Caught signal %d (%s) ...  Exiting.\n"), sig, sys_siglist[sig]);
 #elif (defined(__sun__) && defined(__svr4__))
-  printf(_("Caught %s...  Exiting.\n"), _sys_siglist[sig]);
+  printf(_("Caught signal %d (%s) ...  Exiting.\n"), sig, _sys_siglist[sig]);
 #elif (defined(__alpha) && defined(__osf__))
-  printf(_("Caught %s...  Exiting.\n"), __sys_siglist[sig]);
+  printf(_("Caught signal %d (%s) ...  Exiting.\n"), sig, __sys_siglist[sig]);
 #else
-  printf(_("Caught signal %d...  Exiting.\n"), sig);
+  printf(_("Caught signal %d ...  Exiting.\n"), sig);
 #endif
   exit(0);
 }