svn commit: r1740171 - /subversion/trunk/subversion/svn/conflict-callbacks.c

[st...@apache.org]

Author: stsp
Date: Wed Apr 20 17:10:03 2016
New Revision: 1740171

URL: http://svn.apache.org/viewvc?rev=1740171&view=rev
Log:
Don't mark string with no translatable content for translation.

* subversion/svn/conflict-callbacks.c
  (prompt_string, prompt_user): Remove translation marker from two strings.

Modified:
    subversion/trunk/subversion/svn/conflict-callbacks.c

Modified: subversion/trunk/subversion/svn/conflict-callbacks.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/conflict-callbacks.c?rev=1740171&r1=1740170&r2=1740171&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Wed Apr 20 17:10:03 2016
@@ -564,8 +564,7 @@ prompt_string(const resolver_option_t *o
 
       if (! first)
         result = apr_pstrcat(pool, result, ",", SVN_VA_NULL);
-      s = apr_psprintf(pool, _(" (%s) %s"),
-                       opt->code,
+      s = apr_psprintf(pool, " (%s) %s", opt->code,
                        opt->short_desc ? _(opt->short_desc) : opt->long_desc);
       slen = svn_utf_cstring_utf8_width(s);
       /* Break the line if adding the next option would make it too long */
@@ -649,7 +648,7 @@ prompt_user(const resolver_option_t **op
       const char *helpstr;
 
       if (conflict_description)
-        SVN_ERR(svn_cmdline_fprintf(stderr, scratch_pool, _("\n%s\n"),
+        SVN_ERR(svn_cmdline_fprintf(stderr, scratch_pool, "\n%s\n",
                                     conflict_description));
       SVN_ERR(help_string(&helpstr, conflict_options, scratch_pool));
       SVN_ERR(svn_cmdline_fprintf(stderr, scratch_pool, "\n%s\n", helpstr));