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

Muri Nicanor:
> 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 ;)

I'm not sure to understand your concern, but:

$ git log
48f60be7d6945a05db4c74c1ac7686f88800e582...b5ecc1249a678766d81907c70a5903da5e0d8150
wiki/src/doc/first_steps/startup_options.de.po

returns:

commit b5ecc12
Author: amnesia <webmaster@???>
Date: Wed Apr 29 18:05:04 2015 +0200

    updated PO files

and:

$ git branch --contains b5ecc12

returns (amongst other branches):

* master

So the change you are referring to is in master already. But note that
this is not a translation but a "msgid".

I also looked at your branch
(origin/master...muri/muri-t10n/review-de_startup_options) and indeed
there's some stuff not merged in there...
Probably because what I merged (from spriver on 2015-05-26) was
flapflap/review_de_startup_options and not muri's.

Now I also merged muri/muri-t10n/review-de_startup_options and the page
now has "Tails Grafik" translated.

Is everything fine now?

--
sajolida