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

Re: svn commit: r1727276 - in /subversion/trunk/subversion: libsvn_client/resolved.c svn/conflict-callbacks.c

From: Stefan Sperling <stsp_at_elego.de>
Date: Thu, 28 Jan 2016 13:54:21 +0100

On Thu, Jan 28, 2016 at 12:01:07PM +0100, Bert Huijben wrote:
> > + /* Add postpone option. */
> > + option = apr_pcalloc(result_pool, sizeof(*option));
> > + option->id = svn_client_conflict_option_postpone;
> > + option->description = N_("skip this conflict and leave it unresolved");
>
> I think description should now use _() to localize the option here, instead of in the callee.
>

Indeed, that was an oversight. I copied these strings from over from
'svn' where they were part of a static array. Fixed in r1727329.

Thanks!
Received on 2016-01-28 13:54:34 CET

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