per Benno Schulenberg's patch with a few tweaks by me, add minor wording

fixes to various messages

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3635 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index 624133967cac1c17deaa46f693e3995864177d9b..0cdc7a486fb3918169b2f0d0e228d9376e7ab0f5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -143,6 +143,8 @@ CVS code -
          could break anything using extended regular expressions, and
          glibc 2.2.3 is old.  Changes to configure.ac, faq.html,
          nano.h, proto.h, and UPGRADE; removal of safe_regexec(). (DLR)
+       - Minor wording fixes to various messages. (Benno Schulenberg,
+         minor tweaks by DLR)
 - browser.c:
   do_browser()
        - Reference NANO_GOTODIR_(ALT|F)?KEY instead of

diff --git a/src/files.c b/src/files.c
index 2dfb0218311862c5ab9c6a17646a0e6efa170a04..08da9da6ad496665ce712ab61c7e3cf607af0100 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -2376,7 +2376,7 @@ void load_history(void)
                rcfile_error(N_("Error reading %s: %s"), nanohist,
                        strerror(errno));
                fprintf(stderr,
-                       _("\nPress Enter to continue starting nano\n"));
+                       _("\nPress Enter to continue starting nano.\n"));
                while (getchar() != '\n')
                    ;
            }

diff --git a/src/global.c b/src/global.c
index c61077e214d90f85a89a5d6e59a37253285a99cc..e8ae32f4dacdbcb899499016adf1582c840a0661 100644 (file)
--- a/src/global.c
+++ b/src/global.c
@@ -352,7 +352,7 @@ void shortcut_init(bool unjustify)
     const char *nano_back_msg = N_("Move back one character");
 #ifndef NANO_TINY
     const char *nano_nextword_msg = N_("Move forward one word");
-    const char *nano_prevword_msg = N_("Move backward one word");
+    const char *nano_prevword_msg = N_("Move back one word");
 #endif
     const char *nano_prevline_msg = N_("Move to the previous line");
     const char *nano_nextline_msg = N_("Move to the next line");
@@ -408,12 +408,13 @@ void shortcut_init(bool unjustify)
        N_("Refresh (redraw) the current screen");
 #ifndef NANO_TINY
     const char *nano_case_msg =
-       N_("Make the current search/replace case (in)sensitive");
+       N_("Toggle the case sensitivity of the search");
     const char *nano_reverse_msg =
-       N_("Make the current search/replace go backwards");
+       N_("Reverse the direction of the search");
 #endif
 #ifdef HAVE_REGEX_H
-    const char *nano_regexp_msg = N_("Use regular expressions");
+    const char *nano_regexp_msg =
+       N_("Toggle the use of regular expressions");
 #endif
 #ifndef NANO_TINY
     const char *nano_prev_history_msg =
@@ -425,18 +426,19 @@ void shortcut_init(bool unjustify)
     const char *nano_tofiles_msg = N_("Go to file browser");
 #endif
 #ifndef NANO_TINY
-    const char *nano_dos_msg = N_("Write file out in DOS format");
-    const char *nano_mac_msg = N_("Write file out in Mac format");
+    const char *nano_dos_msg = N_("Toggle the use of DOS format");
+    const char *nano_mac_msg = N_("Toggle the use of Mac format");
 #endif
-    const char *nano_append_msg = N_("Append to the current file");
-    const char *nano_prepend_msg = N_("Prepend to the current file");
+    const char *nano_append_msg = N_("Toggle appending");
+    const char *nano_prepend_msg = N_("Toggle prepending");
 #ifndef NANO_TINY
     const char *nano_backup_msg =
-       N_("Back up original file when saving");
+       N_("Toggle backing up of the original file");
     const char *nano_execute_msg = N_("Execute external command");
 #endif
 #if !defined(NANO_TINY) && defined(ENABLE_MULTIBUFFER)
-    const char *nano_multibuffer_msg = N_("Insert into new buffer");
+    const char *nano_multibuffer_msg =
+       N_("Toggle the use of a new buffer");
 #endif
 #ifndef DISABLE_BROWSER
     const char *nano_exitbrowser_msg = N_("Exit from the file browser");
@@ -1355,7 +1357,7 @@ void toggle_init(void)
     /* If we're using restricted mode, the suspend toggle is disabled.
      * It's useless since suspending is disabled. */
     if (!ISSET(RESTRICTED))
-       toggle_init_one(TOGGLE_SUSPEND_KEY, N_("Suspend"), FALSE,
+       toggle_init_one(TOGGLE_SUSPEND_KEY, N_("Suspension"), FALSE,
        SUSPEND);
 }
 #endif /* !NANO_TINY */

diff --git a/src/nano.c b/src/nano.c
index 1345b3895f08ddefcd2a28f566bc8ee55e4d9451..630b710a6838b4e9a61b0b9a5098820087324cc5 100644 (file)
--- a/src/nano.c
+++ b/src/nano.c
@@ -788,7 +788,7 @@ void usage(void)
     print_opt("-l", "--nofollow",
        N_("Don't follow symbolic links, overwrite"));
 #ifndef DISABLE_MOUSE
-    print_opt("-m", "--mouse", N_("Enable mouse"));
+    print_opt("-m", "--mouse", N_("Enable the use of the mouse"));
 #endif
 #ifndef DISABLE_OPERATINGDIR
     print_opt(_("-o <dir>"), _("--operatingdir=<dir>"),
@@ -810,8 +810,8 @@ void usage(void)
 #ifndef DISABLE_WRAPPING
     print_opt("-w", "--nowrap", N_("Don't wrap long lines"));
 #endif
-    print_opt("-x", "--nohelp", N_("Don't show help window"));
-    print_opt("-z", "--suspend", N_("Enable suspend"));
+    print_opt("-x", "--nohelp", N_("Don't show the two help lines"));
+    print_opt("-z", "--suspend", N_("Enable suspension"));
 
     /* This is a special case. */
     print_opt("-a, -b, -e,", "", NULL);
@@ -996,7 +996,7 @@ RETSIGTYPE do_suspend(int signal)
     /* Temporarily leave curses mode. */
     endwin();
 
-    printf(_("\n\n\n\n\n\nUse \"fg\" to return to nano\n"));
+    printf(_("\n\n\n\n\n\nUse \"fg\" to return to nano.\n"));
     fflush(stdout);
 
     /* Restore the old terminal settings. */
@@ -1373,10 +1373,10 @@ int do_input(bool *meta_key, bool *func_key, bool *s_or_t, bool
            switch (input) {
                /* Handle the "universal" edit window shortcuts. */
                case NANO_XON_KEY:
-                   statusbar(_("XON ignored, mumble mumble."));
+                   statusbar(_("XON ignored, mumble mumble"));
                    break;
                case NANO_XOFF_KEY:
-                   statusbar(_("XOFF ignored, mumble mumble."));
+                   statusbar(_("XOFF ignored, mumble mumble"));
                    break;
 #ifndef NANO_TINY
                case NANO_SUSPEND_KEY:

diff --git a/src/rcfile.c b/src/rcfile.c
index e652002d297450969762334a6cbe1b5415f6340b..1b134e748e24b57cc6029c401e49f9b47dc04b3d 100644 (file)
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -109,7 +109,7 @@ static colortype *endcolor = NULL;
 #endif
 
 /* We have an error in some part of the rcfile.  Put it on stderr and
- * make the user hit Enter to continue starting up nano. */
+ * make the user hit Enter to continue starting nano. */
 void rcfile_error(const char *msg, ...)
 {
     va_list ap;
@@ -844,7 +844,8 @@ void parse_rcfile(FILE *rcstream
 
     if (errors) {
        errors = FALSE;
-       fprintf(stderr, _("\nPress Enter to continue starting nano\n"));
+       fprintf(stderr,
+               _("\nPress Enter to continue starting nano.\n"));
        while (getchar() != '\n')
            ;
     }