Re: [PATCH] Make conflict message translatable
From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Fri, 29 Mar 2013 02:03:59 +0000 (GMT)
Mattias Engdegård wrote:
>T he conflict message "local %s %s, incoming %s %s upon %s" in
Thanks, Mattias. Your patch certainly looks to me like a good improvement.
> The patch assumes that svn_node_none, svn_node_unknown or svn_wc_operation_none
I haven't checked whether these can occur in this message. svn_node_unknown can certainly occur for the local kind of node -- such as in a tree conflict when a merge tries to edit a path which doesn't exist in the local working copy. I *think* the node kind that appears in these messages can be 'none' for this reason I can check this and fix if necessary and commit it, probably on Monday if nobody does it sooner.
> The produced (English) strings are not changed, although doing so should perhaps
Looks good at a quick read-through.
My only other suggestion would be to include the comma in the English strings instead of in the format string -- _("local file edit,") instead of _("local file edit") -- so that the other translations can use different (or no) punctuation.
This is an archived mail posted to the Subversion Dev mailing list.