[PATCH 2 of 2] merge: use labels in prompts to the user

[Simon Farnsworth]

Switching back to inline replies. Quoting below will be a bit messed up.

On 19/03/2016 21:53, timeless wrote:
> As long as it's possible for things to be written to the disk
> consistently using "untranslated" messages, and shown w/ eventual
> translations, and we have to maintain a table of all these constants
> forever -- so that future translators will always translate them even
> if we eventually replace the strings (because the disk versions will
> persists forever).
I've fixed up locally to translate "local" and "other", avoiding a 
regression in translations. We currently show the raw (untranslated) 
labels to the user in conflict markers; I'm writing the same form of the 
string that's used for conflict markers to disk.

I'm not clear on how you'd expect the translation system to handle 
labels, given their use in conflict markers (see _formatlabels in 
filemerge.py). Would you mind writing a sample patch?
> On Sat, Mar 19, 2016 at 11:52 PM, Simon Farnsworth <simonfar at fb.com> wrote:
>> Good point. I think that I might make translations a little worse in this
>> version, as 'local' and 'other' will not be translated.
>>
>> I can fix this in a V2, but I'm not sure what happens with the labels -
>> they're already exposed to users, so should be translated.
>>
>> Sent from Mobile
>>
>>
<snip>

-- 
Simon Farnsworth