[Tails-l10n] nice merge howto

ThreadAuthorDate ()
Memma peel