Re: [Tails-l10n] [fr](review) misc16

This message is part of the following thread:
Mthe complete thread tree sorted by date
MAtomiKe at <-
M 
Delete this message

Reply to this message
Author: xin
Date:  
To: Tails localization discussion
New-Topics: Re: [Tails-l10n] [fr](pull) misc16
Subject: Re: [Tails-l10n] [fr](review) misc16
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

This message was posted to the following mailing lists:
tails-l10n
Mailing List Info | Nearby Messages		<-Re: [Tails-l10n] [fr](pull) unfuzzyingRe: [Tails-l10n] [fr](pull) unfuzzying->
lists.autistici.org administrated by postmasterLurker (version 2.3)