Changing "Justify" to a tag and regrouping a couple.

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

diff --git a/ChangeLog b/ChangeLog
index 610ac67ba965c4ee91fa3661fe9deb87c7ad4976..4302db44b4d812da445885c01699badf0b175575 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@
        Differentiate between something being disabled/restricted (because
        of the way of invocation) and help texts being unavailable (which
        is a compile-time decision).
+       * src/global.c (shortcut_init): Change "Justify" to a tag and regroup.
 
 2015-07-29  Benno Schulenberg  <bensberg@justemail.net>
        * src/text.c (do_linter): When the linter is called in restricted mode

diff --git a/src/global.c b/src/global.c
index ad62d876e24bcd9b9ddd0b7237047c5a15382b13..cde81a6ccdd2f1db4979c960ef33a00beaf97c13 100644 (file)
--- a/src/global.c
+++ b/src/global.c
@@ -474,22 +474,19 @@ void print_sclist(void)
 }
 #endif
 
-/* TRANSLATORS: Try to keep the next four strings at most 10 characters. */
+/* These four tags are used elsewhere too, so they are global. */
+/* TRANSLATORS: Try to keep the next fifteen strings at most 10 characters. */
 const char *exit_tag = N_("Exit");
 const char *close_tag = N_("Close");
 const char *uncut_tag = N_("Uncut Text");
 #ifndef DISABLE_JUSITIFY
 const char *unjust_tag = N_("Unjustify");
 #endif
-#ifndef NANO_TINY
-/* TRANSLATORS: Try to keep this at most 12 characters. */
-const char *whereis_next_tag = N_("WhereIs Next");
-#endif
 
 /* Initialize the list of functions and the list of shortcuts. */
 void shortcut_init(void)
 {
-    /* TRANSLATORS: Try to keep the next ten strings at most 10 characters. */
+    const char *read_file_tag = N_("Read File");
     const char *whereis_tag = N_("Where Is");
     const char *replace_tag = N_("Replace");
     const char *gotoline_tag = N_("Go To Line");
@@ -497,11 +494,15 @@ void shortcut_init(void)
     const char *next_line_tag = N_("Next Line");
     const char *prev_page_tag = N_("Prev Page");
     const char *next_page_tag = N_("Next Page");
-    const char *read_file_tag = N_("Read File");
 #ifndef DISABLE_JUSTIFY
+    const char *justify_tag = N_("Justify");
     const char *fulljustify_tag = N_("FullJstify");
 #endif
     const char *refresh_tag = N_("Refresh");
+#ifndef NANO_TINY
+    /* TRANSLATORS: Try to keep this string at most 12 characters. */
+    const char *whereis_next_tag = N_("WhereIs Next");
+#endif
 
 #ifndef DISABLE_HELP
 #ifndef DISABLE_JUSTIFY
@@ -704,7 +705,7 @@ void shortcut_init(void)
     } else {
 #ifndef DISABLE_JUSTIFY
        add_to_funcs(do_justify_void, MMAIN,
-               N_("Justify"), IFSCHELP(nano_justify_msg), BLANKAFTER, NOVIEW);
+               justify_tag, IFSCHELP(nano_justify_msg), BLANKAFTER, NOVIEW);
 #endif
     }
 
@@ -744,7 +745,7 @@ void shortcut_init(void)
     if (!ISSET(RESTRICTED)) {
 #ifndef DISABLE_JUSTIFY
        add_to_funcs(do_justify_void, MMAIN,
-               N_("Justify"), IFSCHELP(nano_justify_msg), TOGETHER, NOVIEW);
+               justify_tag, IFSCHELP(nano_justify_msg), TOGETHER, NOVIEW);
 #endif
 
 #ifndef DISABLE_SPELLER