AtomiKe:
> Hello,
>
> On 22/12/2017 11:11, xin wrote:
>> Hello, please review.
>>
>> Repo: https://git-tails.immerda.ch/xin/tails/
>> Branch: translate/misc16
>> Last Commit: 2f918ba3f6b849887366c5674070a8a007138a8d
>
> I can't merge your branch, could you check it works with the current master?
I fix the conflict, please review.
Repo:
https://git-tails.immerda.ch/xin/tails/
Branch: translate/misc16
Last Commit: dbc1e3f8dba841cf2d6abe23838cfef3cc5e40f8
Cheers.
xin