Autor: intrigeri
Data:
A: Tails localization discussion
Assumpte: Re: [Tails-l10n] [Review](fr) Tails user support mailing list
related and a bonus
mercedes508 wrote (12 Aug 2013 16:22:30 GMT) :
> wiki/src/doc/about/features.fr.po
> wiki/src/support/tails-support.fr.po
> commit 9523048, master branch, mercedes508 repo.
It conflicts with current master. May you please resolve this?