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

[Pierre-Yves David]

On 03/20/2016 04:45 PM, timeless wrote:
> Simon Farnsworth wrote:
>> 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.
>
> As long as we write to disk untranslated (not just "local" and
> "other", but whatever enhanced labels we'll have) and give the
> translators a chance to translate what we read from disk, I'm happy.

+1 for writing on disk untranslated. For the translation part, I'm not 
sure if we want to have that translated at all because these 
(local/other/dest/base) are keyword used as is in the Mercurial command 
line API.

As they are currently untranslated I would prefer the simon series to 
not change this and a later series to revisit this independently if we 
wants it.

Cheers,

-- 
Pierre-Yves David