diff -wur nano-cvs/src/files.c nano-new/src/files.c --- nano-cvs/src/files.c 2006-07-29 00:49:07.000000000 +0200 +++ nano-new/src/files.c 2006-07-30 22:21:07.000000000 +0200 @@ -899,7 +899,7 @@ { #ifdef ENABLE_MULTIBUFFER if (ISSET(VIEW_MODE) && !ISSET(MULTIBUFFER)) - statusbar(_("Key illegal in non-multibuffer mode")); + statusbar(_("Key invalid in non-multibuffer mode")); else #endif do_insertfile( diff -wur nano-cvs/src/global.c nano-new/src/global.c --- nano-cvs/src/global.c 2006-07-29 00:49:07.000000000 +0200 +++ nano-new/src/global.c 2006-07-30 23:04:01.000000000 +0200 @@ -422,9 +422,9 @@ #endif #ifndef NANO_TINY const char *nano_prev_history_msg = - N_("Edit the previous search/replace string"); + N_("Recall the previous search/replace string"); const char *nano_next_history_msg = - N_("Edit the next search/replace string"); + N_("Recall the next search/replace string"); #endif #ifndef DISABLE_BROWSER const char *nano_tofiles_msg = N_("Go to file browser"); @@ -1297,7 +1297,7 @@ CONST_UPDATE)); toggle_init_one(TOGGLE_MORESPACE_KEY, - IFTHELP(N_("Use of more space for editing"), FALSE, + IFTHELP(N_("Use of one more line for editing"), FALSE, MORE_SPACE)); toggle_init_one(TOGGLE_SMOOTH_KEY, diff -wur nano-cvs/src/help.c nano-new/src/help.c --- nano-cvs/src/help.c 2006-07-25 23:20:04.000000000 +0200 +++ nano-new/src/help.c 2006-07-30 22:29:43.000000000 +0200 @@ -355,7 +355,7 @@ #endif /* !NANO_TINY */ else { /* Default to the main help list. */ - htx[0] = N_(" nano help text\n\n " + htx[0] = N_("Main nano help text\n\n " "The nano editor is designed to emulate the " "functionality and ease-of-use of the UW Pico text " "editor. There are four main sections of the editor. " @@ -370,7 +370,7 @@ "Control-key sequences are notated with a caret (^) " "symbol and can be entered either by using the Control " "(Ctrl) key or pressing the Escape (Esc) key twice. " - "Escape-key sequences are notated with the Meta (M) " + "Escape-key sequences are notated with the Meta (M-) " "symbol and can be entered using either the Esc, Alt, " "or Meta key depending on your keyboard setup. "); htx[2] = N_("Also, pressing Esc twice and then typing a " diff -wur nano-cvs/src/nano.c nano-new/src/nano.c --- nano-cvs/src/nano.c 2006-07-25 23:20:04.000000000 +0200 +++ nano-new/src/nano.c 2006-07-30 23:07:32.000000000 +0200 @@ -520,7 +520,7 @@ /* Display a warning about a key disabled in view mode. */ void print_view_warning(void) { - statusbar(_("Key illegal in VIEW mode")); + statusbar(_("Key invalid in VIEW mode")); } /* What we do when we're all set to exit. */ @@ -767,7 +767,7 @@ print_opt("-N", "--noconvert", N_("Don't convert files from DOS/Mac format")); #endif - print_opt("-O", "--morespace", N_("Use more space for editing")); + print_opt("-O", "--morespace", N_("Use one more line for editing")); #ifndef DISABLE_JUSTIFY print_opt(_("-Q "), _("--quotestr="), N_("Quoting string")); @@ -777,7 +777,7 @@ print_opt("-S", "--smooth", N_("Smooth scrolling")); #endif print_opt(_("-T <#cols>"), _("--tabsize=<#cols>"), - N_("Set width of a tab in cols to #cols")); + N_("Set width of a tab to #cols columns")); #ifndef NANO_TINY print_opt("-U", "--quickblank", N_("Do quick statusbar blanking")); #endif @@ -789,7 +789,7 @@ #endif #ifdef ENABLE_COLOR print_opt(_("-Y "), _("--syntax="), - N_("Syntax definition to use")); + N_("Syntax definition to use for coloring")); #endif print_opt("-c", "--const", N_("Constantly show cursor position")); print_opt("-d", "--rebinddelete", @@ -812,7 +812,7 @@ N_("Preserve XON (^Q) and XOFF (^S) keys")); #ifndef DISABLE_WRAPJUSTIFY print_opt(_("-r <#cols>"), _("--fill=<#cols>"), - N_("Set fill cols to (wrap lines at) #cols")); + N_("Set wrapping point at column #cols")); #endif #ifndef DISABLE_SPELLER print_opt(_("-s "), _("--speller="), @@ -820,7 +820,7 @@ #endif print_opt("-t", "--tempfile", N_("Auto save on exit, don't prompt")); - print_opt("-v", "--view", N_("View (read only) mode")); + print_opt("-v", "--view", N_("View mode (read-only)")); #ifndef DISABLE_WRAPPING print_opt("-w", "--nowrap", N_("Don't wrap long lines")); #endif diff -wur nano-cvs/src/winio.c nano-new/src/winio.c --- nano-cvs/src/winio.c 2006-07-29 00:49:07.000000000 +0200 +++ nano-new/src/winio.c 2006-07-30 22:59:16.000000000 +0200 @@ -3201,7 +3201,7 @@ "Pavel Curtis", "Zeyd Ben-Halim", "Eric S. Raymond", - NULL, /* "and anyone else we forgot..." */ + NULL, /* "and anyone we forgot..." */ NULL, /* "Thank you for using nano!" */ "", "", @@ -3223,7 +3223,7 @@ N_("Special thanks to:"), N_("The Free Software Foundation"), N_("For ncurses:"), - N_("and anyone else we forgot..."), + N_("and anyone we forgot..."), N_("Thank you for using nano!") };