[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: Julian Foad <julianfoad_at_btopenworld.com>
Date: Fri, 19 Apr 2013 16:19:09 +0100 (BST)

Mattias Engdegård wrote:
> This version of the patch is like the previous one, but the prompt labels have
> been translated into English as well. This makes them more descriptive and
> easier to understand. As an extra added benefit, it makes them easier to
> translate unambiguously, in particular single short words like "quit".

Thanks, Mattias.  This looks great.  Committed in r1469871.  Proposed for back-port to 1.8.x in r1469888.

- Julian

> As before, the patch does not change or localise the user-written reply codes
> ("mc", "p", etc).
>
> I'd really like to get this done as soon as possible, so that the
> translators can work on the new strings. As shown upthreads, we currently have a
> regression from 1.7.x.
>
> [[[
> Make the conflict prompt correctly localised again (except the
> option codes, which never were). The long help now includes
> the corresponding --accept options but not the (superfluous)
> prompt labels, to make room for better descriptions. The labels
> are now in something slightly closer to English.
>
> * subversion/svn/conflict-callbacks.c
>   (resolver_option_t,
>   text_conflict_options, prop_conflict_options, obstructed_add_options,
>   tree_conflict_options, tree_conflict_options_update_moved_away,
>   tree_conflict_options_update_deleted,
>   tree_conflict_options_update_replaced): Improve and localise short_desc
>    and add corresponding --accept arguments to long_desc.
>   (prompt_string): Localise the static part of the prompt, call gettext
>    for translated strings, and measure the width of the generated prompt
>    correctly for UTF-8.
>   (help_string): Remove short_desc, call gettext for long_desc and add
>    a final line explaining the --accept arguments.
> ]]]
>
Received on 2013-04-19 17:36:32 CEST

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