Eliding four unneeded tags.

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

diff --git a/ChangeLog b/ChangeLog
index b5de8dd6340d3bc86de8affbcb196109fc9ad23c..b3f4f994671623169174c5479403663648cc6d72 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,7 @@
        'do_insertfile_void' instead of the unintuitive 'ext_cmd_void'.
        * src/browser (filesearch_init): Remove an unneeded format specifier.
        * src/nano.c (usage): Add a translator comment for the --help output.
+       * src/global.c (shortcut_init): Elide four unneeded tags.
 
 2014-05-27  Chris Allegretta <chrisa@asty.org>
        * src/winio.c (edit_refresh): wredrawln() is not supported under

diff --git a/src/global.c b/src/global.c
index 84072ad485f45909f469a02c44cd7d27c7ca0598..7fa8e63c3430ffd598bf00762be976ecfab1df9a 100644 (file)
--- a/src/global.c
+++ b/src/global.c
@@ -482,7 +482,7 @@ const char *whereis_next_tag = N_("WhereIs Next");
 /* Initialize the list of functions and the list of shortcuts. */
 void shortcut_init(void)
 {
-    /* TRANSLATORS: Try to keep the next nine strings at most 10 characters. */
+    /* TRANSLATORS: Try to keep the next eight strings at most 10 characters. */
     const char *whereis_tag = N_("Where Is");
     const char *replace_tag = N_("Replace");
     const char *gotoline_tag = N_("Go To Line");
@@ -493,15 +493,6 @@ void shortcut_init(void)
     const char *fulljustify_tag = N_("FullJstify");
 #endif
     const char *refresh_tag = N_("Refresh");
-#ifndef DISABLE_SPELLER
-    const char *spell_tag = N_("To Spell");
-#endif
-#ifndef DISABLE_COLOR
-    const char *lint_tag = N_("To Linter");
-    /* TRANSLATORS: Try to keep the next two strings at most 14 characters. */
-    const char *prev_lint_tag = N_("Prev Lint Msg");
-    const char *next_lint_tag = N_("Next Lint Msg");
-#endif
 
 #ifndef DISABLE_JUSTIFY
     /* TRANSLATORS: The next long series of strings are shortcut descriptions;
@@ -730,13 +721,13 @@ void shortcut_init(void)
 #endif
 
 #ifndef DISABLE_SPELLER
-    add_to_funcs(do_spell, MMAIN, spell_tag, IFSCHELP(nano_spell_msg),
-       FALSE, NOVIEW);
+    add_to_funcs(do_spell, MMAIN,
+       N_("To Spell"), IFSCHELP(nano_spell_msg), FALSE, NOVIEW);
 #endif
 
 #ifndef DISABLE_COLOR
-    add_to_funcs(do_linter, MMAIN, lint_tag, IFSCHELP(nano_lint_msg),
-       TRUE, NOVIEW);
+    add_to_funcs(do_linter, MMAIN,
+       N_("To Linter"), IFSCHELP(nano_lint_msg), TRUE, NOVIEW);
 #endif
 
 #ifndef NANO_TINY
@@ -975,10 +966,11 @@ void shortcut_init(void)
 #endif
 
 #ifndef DISABLE_COLOR
+    /* TRANSLATORS: Try to keep the next two strings at most 20 characters. */
     add_to_funcs(do_page_up, MLINTER,
-       prev_lint_tag, IFSCHELP(nano_prevlint_msg), FALSE, VIEW);
+       N_("Prev Lint Msg"), IFSCHELP(nano_prevlint_msg), FALSE, VIEW);
     add_to_funcs(do_page_down, MLINTER,
-       next_lint_tag, IFSCHELP(nano_nextlint_msg), FALSE, VIEW);
+       N_("Next Lint Msg"), IFSCHELP(nano_nextlint_msg), FALSE, VIEW);
 #endif
 
     /* Start associating key combos with functions in specific menus. */