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): Update the comment on short_desc.
  (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.

Patch by: Mattias Engdegård <mattiase{_AT_}bredband.net>


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1469871 13f79535-47bb-0310-9956-ffa450edef68