From 7b0531aa0b0a89cdba9351973351c4ad4afb953b Mon Sep 17 00:00:00 2001 From: David Lawrence Ramsey Date: Mon, 31 Jul 2006 01:30:31 +0000 Subject: [PATCH] per Benno Schulenberg's patch with a few tweaks by me, add various clarifications to translated strings git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3828 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 4 ++++ src/files.c | 2 +- src/global.c | 6 +++--- src/help.c | 4 ++-- src/nano.c | 12 ++++++------ src/text.c | 2 +- 6 files changed, 17 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5832344a..6adb990a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -52,6 +52,10 @@ CVS code - documentation. (Benno Schulenberg and DLR) - Make bad_mbchar a static const char* const in chars.c, as its value doesn't change. (DLR) + - Add various clarifications to translated strings. Changes to + do_insertfile_void(), shortcut_init(), toggle_init(), + help_init(), print_view_warning(), usage(), and do_mark(). + (Benno Schulenberg, minor tweaks by DLR) - browser.c: do_browser() - Refactor the mouse support, modeling it after do_mouse() for diff --git a/src/files.c b/src/files.c index 4128aba0..a9190e79 100644 --- a/src/files.c +++ b/src/files.c @@ -899,7 +899,7 @@ void do_insertfile_void(void) { #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 --git a/src/global.c b/src/global.c index 66ba316f..75173e3e 100644 --- a/src/global.c +++ b/src/global.c @@ -422,9 +422,9 @@ void shortcut_init(bool unjustify) #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 @@ void toggle_init(void) 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 --git a/src/help.c b/src/help.c index 27e211bb..fe7adda6 100644 --- a/src/help.c +++ b/src/help.c @@ -355,7 +355,7 @@ void help_init(void) #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 @@ void help_init(void) "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 --git a/src/nano.c b/src/nano.c index 3ca9632a..08850822 100644 --- a/src/nano.c +++ b/src/nano.c @@ -520,7 +520,7 @@ void free_openfilestruct(openfilestruct *src) /* 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 @@ void usage(void) 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 @@ void usage(void) 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 @@ void usage(void) #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 @@ void usage(void) 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 @@ void usage(void) #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 --git a/src/text.c b/src/text.c index 463fd6de..ad9f5b26 100644 --- a/src/text.c +++ b/src/text.c @@ -55,7 +55,7 @@ void do_mark(void) openfile->mark_begin = openfile->current; openfile->mark_begin_x = openfile->current_x; } else { - statusbar(_("Mark UNset")); + statusbar(_("Mark Unset")); openfile->mark_begin = NULL; openfile->mark_begin_x = 0; edit_refresh(); -- 2.39.5