xin: >> I fixed a merge conflict and translated the new string. Please review:
>> repo: https://gitlab.com/AtomiKe/tails.git >> branch: review/xin/news2.12
>>
>> AtomiKe.
>
> Hello, please merge (the last commit is
> c977dee530df71c6d4e3410310f9053f8e294b68).