[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [PATCH] Re-localise conflict prompt

From: Philip Martin <philip.martin_at_wandisco.com>
Date: Mon, 08 Apr 2013 10:15:33 +0100

Mattias Engdegård <mattiase_at_bredband.net> writes:

> The conflict prompt is no longer localised, probably because of an
> oversight.

Were they localised in the past?

> Index: subversion/svn/conflict-callbacks.c
> ===================================================================
> --- subversion/svn/conflict-callbacks.c (revision 1465357)
> +++ subversion/svn/conflict-callbacks.c (working copy)

> + { "e", N_("edit"), N_("change merged file in an editor"), -1 },
> + { "df", N_("diff-full"), N_("show all changes made to merged file"),
> + -1 },
> + { "r", N_("resolved"), N_("accept merged version of file"),
> + svn_wc_conflict_choose_merged },
> + { "", "", "", svn_wc_conflict_choose_unspecified },
> + { "dc", N_("display-conflict"), N_("show all conflicts "
> + "(ignoring merged version)"), -1 },
> + { "mc", N_("mine-conflict"), N_("accept my version for all conflicts "
> + "(same)"),
> + svn_wc_conflict_choose_mine_conflict },
> + { "tc", N_("theirs-conflict"), N_("accept their version for all conflicts "

Do we want the long options localised? If I run

   svn update --accept=mine-conflict

the 'mine-conflict' is not localised. I don't think we want the command
line and the prompt to be different.

> @@ -513,7 +529,8 @@
> const char *s = apr_psprintf(pool, " (%s)", opt->code);
>
> result = apr_psprintf(pool, "%s%-6s %-16s - %s\n",
> - result, s, opt->short_desc, opt->long_desc);
> + result, s,
> + _(opt->short_desc), _(opt->long_desc));
> }
> else
> {

What about the 6 and 16, do they need to change?

-- 
Certified & Supported Apache Subversion Downloads:
http://www.wandisco.com/subversion/download
Received on 2013-04-08 11:16:10 CEST

This is an archived mail posted to the Subversion Dev mailing list.