From eeb500428df4148663738bb6e7b296734efeeae5 Mon Sep 17 00:00:00 2001 From: Jordi Mallach Date: Sat, 18 Jan 2003 22:42:34 +0000 Subject: [PATCH] i18n fixes. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@1380 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 5 +++++ nano.c | 11 ++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index ee6367c5..4a606061 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,9 @@ CVS Code - +- nano.c: + usage(): + - Remove gettext markings from -p/--preserve (Jordi). + do_preserve_msg(): + - Unsplit error message into a single fprintf call (Jordi). GNU nano 1.1.99pre1 - 2003.01.17 - General: diff --git a/nano.c b/nano.c index 838f6433..4da521d1 100644 --- a/nano.c +++ b/nano.c @@ -665,7 +665,7 @@ void usage(void) #ifndef DISABLE_OPERATINGDIR print1opt(_("-o [dir]"), _("--operatingdir=[dir]"), _("Set operating directory")); #endif - print1opt(_("-p"), _("--preserve"), _("Preserve XON (^Q) and XOFF (^S) keys")); + print1opt("-p", "--preserve", _("Preserve XON (^Q) and XOFF (^S) keys")); #ifndef DISABLE_WRAPJUSTIFY print1opt(_("-r [#cols]"), _("--fill=[#cols]"), _("Set fill cols to (wrap lines at) #cols")); #endif @@ -770,10 +770,11 @@ void nano_disabled_msg(void) void do_preserve_msg(void) { - fprintf(stderr, _("\nThe -p flag now invokes the Pico \"preserve\" flag. The Pico\n")); - fprintf(stderr, _("compatibility flag has been removed as nano is now fully Pico\n")); - fprintf(stderr, _("compatible. Please see the nano FAQ for more info on this change...\n\n")); - fprintf(stderr, _("Press return to continue\n")); + fprintf(stderr, _("\nThe -p flag now invokes the Pico \"preserve\" flag.\n" + "The Pico compatibility flag has been removed as nano\n" + "now fully Pico compatible. Please see the nano FAQ\n" + "for more info on this change...\n\n" + "Press return to continue\n")); while (getchar() != '\n'); } -- 2.39.5