[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: Stefan Sperling <stsp_at_elego.de>
Date: Mon, 8 Apr 2013 12:06:51 +0200

On Mon, Apr 08, 2013 at 10:15:33AM +0100, Philip Martin wrote:
> 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.

I agree. The menu options should mirror the --accept command line options.
Unfortunately (or fortunately?) the command line cannot be translated.

So I think it is OK to have short menu option names in English and provide
long descriptions in the native language.

Does that work for you, Mattias? Of course, if there is anything we're
doing in the code that makes translation harder than necessary, we need
to fix that. But in this particular case I believe there is nothing to fix.
Received on 2013-04-08 12:07:28 CEST

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