12 apr 2013 kl. 20.33 skrev Mattias Engdegård:
To make progress, I'll prepare another patch that avoids this particular point of disagreement.
And here it is. Now the (unlocalised) --accept options are explicitly shown in the long help, but not the prompt labels, since they are redundant, consume space and make it difficult to format the table.
The short_desc strings were left untouched, but I suggest that we translate them into English (so that "display-conflict" becomes "display conflict", "mine-conflict" becomes "my side of conflicts" and so on). I can do that in a follow-up patch.
[[[ 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. * 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): Localise short_desc and add corresponding --accept arguments to long_desc. (prompt_string): Localise the static part of the prompt, call gettextfor 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. ]]]
conflict-callbacks.patch
Description: Binary data
