Normalizing the punctuation in some prompts: no space before a question mark,

and a semicolon instead of a comma between phrases.

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

diff --git a/ChangeLog b/ChangeLog
index 3ddb19a4cd344d96998c7a87ef6797bc92dc68a0..df78076b0110fef03f84d695e55418f6f10d0715 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-03-20  Benno Schulenberg  <bensberg@justemail.net>
+       * src/files.c (do_writeout), src/nano.c (do_exit): Normalize the
+       punctuation in some prompts: no space before a question mark, and
+       a semicolon instead of a comma between phrases.
+
 2016-03-19  Benno Schulenberg  <bensberg@justemail.net>
        * src/search.c (search_init): Always remember the last typed string,
        also when it's an invalid regex.  This fixes Savannah bug #47440.

diff --git a/src/files.c b/src/files.c
index 0b226f68db16b549f8db2cb4513933bee4c10910..23ee8806ece0c182753fe695bf80841f909184ba 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -2346,7 +2346,7 @@ int do_writeout(bool exiting)
            if (func == discard_buffer) {
                if (openfile->modified)
                    i = do_yesno_prompt(FALSE,
-                               _("Save modified buffer anyway ? "));
+                               _("Save modified buffer anyway? "));
                else
                    i = 0;
 
@@ -2454,7 +2454,7 @@ int do_writeout(bool exiting)
 
                    if (name_exists) {
                        i = do_yesno_prompt(FALSE,
-                               _("File exists, OVERWRITE ? "));
+                               _("File exists; OVERWRITE? "));
                        if (i == 0 || i == -1)
                            continue;
                    } else
@@ -2463,7 +2463,7 @@ int do_writeout(bool exiting)
 #endif
                    {
                        i = do_yesno_prompt(FALSE,
-                               _("Save file under DIFFERENT NAME ? "));
+                               _("Save file under DIFFERENT NAME? "));
                        if (i == 0 || i == -1)
                            continue;
                    }
@@ -2477,12 +2477,12 @@ int do_writeout(bool exiting)
                        openfile->current_stat->st_dev != st.st_dev ||
                        openfile->current_stat->st_ino != st.st_ino)) {
                    i = do_yesno_prompt(FALSE,
-                       _("File was modified since you opened it, continue saving ? "));
+                               _("File was modified since you opened it;"
+                                 " continue saving? "));
                    if (i == 0 || i == -1)
                        continue;
                }
 #endif
-
            }
 
            /* Convert newlines to nulls, just before we save the file. */

diff --git a/src/nano.c b/src/nano.c
index 708e58945c0bef1415927aad7a964179520604c5..1398a78dcf0ea65af18a406125dd68a3db63271a 100644 (file)
--- a/src/nano.c
+++ b/src/nano.c
@@ -1105,7 +1105,8 @@ void do_exit(void)
            no_current_file_name_warning();
 
        i = do_yesno_prompt(FALSE,
-               _("Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "));
+               _("Save modified buffer?  (Answering \"No\" will"
+                 " DISCARD changes.) "));
     }
 
 #ifdef DEBUG