- files.c: do_writeout() - Expanded strings to not use %s and ?: to determine write...

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

diff --git a/ChangeLog b/ChangeLog
index 2ca6c9dac294b1511c392be70296424b3a679c5b..3c2056d26a8e9d2aaacfe09b1c63041a23e52c92 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,10 @@ CVS code -
          New functions do_find_bracket(), changes to findnextstr(),
          command is Meta-] (hope you dont mind since I already sold off
          Meta-O to the MacOS file code Ken...)
+- files.c:
+  do_writeout()
+       - Expanded strings to not use %s and ?: to determine
+         write/append string to be nice to translators.
 - nano.c:
   main()
        - Added vars oldcurrent and oldcurrent_x to check whether cursor

diff --git a/config.h.in b/config.h.in
index 02ba1537cee5270db11b3f348f51d9db07b6e346..7fcb8da22dbb99fcf7454829ffd99851f4240d61 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -1,4 +1,4 @@
-/* config.h.in.  Generated automatically from configure.in by autoheader 2.13.  */
+/* config.h.in.  Generated automatically from configure.in by autoheader.  */
 
 /* Define if using alloca.c.  */
 #undef C_ALLOCA

diff --git a/files.c b/files.c
index c4b615b1aa81d71f8f28fa3c72382e723381e1e2..bdd037e01fc51dcca70da1ccb487d684a27f9d76 100644 (file)
--- a/files.c
+++ b/files.c
@@ -1284,14 +1284,26 @@ int do_writeout(char *path, int exiting, int append)
     }
 
     while (1) {
+
+       /* Be nice to the translation folks */
 #ifndef NANO_SMALL
-       if (ISSET(MARK_ISSET) && !exiting)
-           i = statusq(1, writefile_list, WRITEFILE_LIST_LEN, "",
-                   _("%s Selection to File"), append ? _("Append") : _("Write"));
-       else
+       if (ISSET(MARK_ISSET) && !exiting) {
+           if (append)
+               i = statusq(1, writefile_list, WRITEFILE_LIST_LEN, "",
+                   _("Append Selection to File"));
+           else
+               i = statusq(1, writefile_list, WRITEFILE_LIST_LEN, "",
+                   _("Write Selection to File"));
+       } else {
 #endif
-           i = statusq(1, writefile_list, WRITEFILE_LIST_LEN, answer,
-                   _("File Name to %s"), append ? _("Append") : _("Write"));
+           if (append)
+               i = statusq(1, writefile_list, WRITEFILE_LIST_LEN, answer,
+                   _("File Name to Append"));
+           else
+               i = statusq(1, writefile_list, WRITEFILE_LIST_LEN, answer,
+                   _("File Name to Write"));
+
+       }
 
        if (i != -1) {