Removing duplicate translator comments, and adding some others.

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

diff --git a/ChangeLog b/ChangeLog
index 51fdfc5bad703128fa3e488b7871a90b286a3f28..242517b33d9014988bb42c4bc77219ca07b05066 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
        'ran_func', and 'finished'.  They are only ever set and never used.
        * src/text.c (do_justify): Adjust a call of do_input().
        * src/browser (do_browser): Actually translate the go-to-dir prompt.
+       * src/browser, src/search.c: There is no need to repeat translator
+       comments for the same string -- once is enough to get them included.
+       Add instead some translator comments for the prompts.
 
 2014-05-27  Chris Allegretta <chrisa@asty.org>
        * src/winio.c (edit_refresh): wredrawln() is not supported under

diff --git a/src/browser.c b/src/browser.c
index c21e973010f6f58f3b42b59ceea8b0848db1c924..60f6546e2f8d712ce7e30d8a5c576c3f7b0d1ea5 100644 (file)
--- a/src/browser.c
+++ b/src/browser.c
@@ -217,6 +217,7 @@ char *do_browser(char *path, DIR *dir)
 #ifndef NANO_TINY
                        NULL,
 #endif
+                       /* TRANSLATORS: This is a prompt. */
                        browser_refresh, _("Go To Directory"));
 
                curs_set(0);
@@ -798,20 +799,14 @@ int filesearch_init(void)
 #endif
        browser_refresh, "%s%s%s%s%s%s", _("Search"),
 #ifndef NANO_TINY
-       /* This string is just a modifier for the search prompt; no
-        * grammar is implied. */
        ISSET(CASE_SENSITIVE) ? _(" [Case Sensitive]") :
 #endif
        "",
 #ifdef HAVE_REGEX_H
-       /* This string is just a modifier for the search prompt; no
-        * grammar is implied. */
        ISSET(USE_REGEXP) ? _(" [Regexp]") :
 #endif
        "",
 #ifndef NANO_TINY
-       /* This string is just a modifier for the search prompt; no
-        * grammar is implied. */
        ISSET(BACKWARDS_SEARCH) ? _(" [Backwards]") :
 #endif
        "", "", buf);

diff --git a/src/search.c b/src/search.c
index da6ca517c553e09a6c100214d42f3f57027395cc..f17da7daccb473a466516d8d7ff033ecbc51cfbd 100644 (file)
--- a/src/search.c
+++ b/src/search.c
@@ -181,26 +181,23 @@ int search_init(bool replacing, bool use_answer)
 #ifndef NANO_TINY
        &search_history,
 #endif
+       /* TRANSLATORS: This is the main search prompt. */
        edit_refresh, "%s%s%s%s%s%s", _("Search"),
 #ifndef NANO_TINY
-       /* TRANSLATORS: This string is just a modifier for the search
-        * prompt; no grammar is implied. */
+       /* TRANSLATORS: The next three strings are modifiers of the search prompt. */
        ISSET(CASE_SENSITIVE) ? _(" [Case Sensitive]") :
 #endif
        "",
 #ifdef HAVE_REGEX_H
-       /* TRANSLATORS: This string is just a modifier for the search
-        * prompt; no grammar is implied. */
        ISSET(USE_REGEXP) ? _(" [Regexp]") :
 #endif
        "",
 #ifndef NANO_TINY
-       /* TRANSLATORS: This string is just a modifier for the search
-        * prompt; no grammar is implied. */
        ISSET(BACKWARDS_SEARCH) ? _(" [Backwards]") :
 #endif
        "", replacing ?
 #ifndef NANO_TINY
+       /* TRANSLATORS: The next two strings are modifiers of the search prompt. */
        openfile->mark_set ? _(" (to replace) in selection") :
 #endif
        _(" (to replace)") : "", buf);
@@ -781,6 +778,7 @@ ssize_t do_replace_loop(
 
            do_replace_highlight(TRUE, exp_word);
 
+           /* TRANSLATORS: This is a prompt. */
            i = do_yesno_prompt(TRUE, _("Replace this instance?"));
 
            do_replace_highlight(FALSE, exp_word);
@@ -959,6 +957,7 @@ void do_replace(void)
 #ifndef NANO_TINY
        &replace_history,
 #endif
+       /* TRANSLATORS: This is a prompt. */
        edit_refresh, _("Replace with"));
 
 #ifndef NANO_TINY
@@ -1044,6 +1043,7 @@ void do_gotolinecolumn(ssize_t line, ssize_t column, bool use_answer,
 #ifndef NANO_TINY
                NULL,
 #endif
+               /* TRANSLATORS: This is a prompt. */
                edit_refresh, _("Enter line number, column number"));
 
        free(ans);