Re: [Tails-l10n] (pull)[de] wiki/src/doc/first_steps/startup…

Supprimer ce message

Répondre à ce message
Auteur: Muri Nicanor
Date:  
À: tails-l10n
Sujet: Re: [Tails-l10n] (pull)[de] wiki/src/doc/first_steps/startup_options.de.po
hi,

On 05/28/2015 04:34 PM, sajolida wrote:
> flapflap:
>> Hmm.. I'm wondering if that may have been too fast since Muri reported a
>> merge conflict from my branch with master. If I look a Muri's branch, I
>> see a manually resolved conflict that I don't see in sajolida's merge
>> commit in master (but I see there was a conflict)...
>
> Yes, there was a conflict in the PO file header which I resolved without
> paying much attention to it. It was the usual stuff about dates and
> author which I think we don't care much about. That's why I didn't ask
> you to resolve it before merging.


hm, i've not much experience with git, so maybe i'm talking out of my
ass, but i thought it was this line:
muri@laptop:~/tails$ git diff 48f60be7d6945a05db4c74c1ac7686f88800e582
b5ecc1249a678766d81907c70a5903da5e0d8150
wiki/src/doc/first_steps/startup_options.de.po

-"[[!img boot-menu-with-options.png link=no alt=\"Black screen with
Debian live\n"
+"[[!img boot-menu-with-options.png link=no alt=\"Black screen with Tails\n"

which is now still translated with 'Debian Live'. it's actually no
biggie, but i'm wondering if i misinterpreted git ;)

cheers,
muri