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
%5Bde%5D%0Awiki/src/doc/first_steps/startup_options.de.po&References=5568A63B.207@pimienta.org&In-Reply-To=5568A63B.207@pimienta.org&Body=On%202015-05-29%2017:47,%20sajolida%20wrote:%0A>%20Muri%20Nicanor:%0A>%20>%20On%2005/28/2015%2004:34%20PM,%20sajolida%20wrote:%0A>%20>>%20flapflap:%0A>%20>>>%20Hmm..%20I'm%20wondering%20if%20that%20may%20have%20been%20too%20fast%20since%20Muri%20reported%20a%0A>%20>>>%20merge%20conflict%20from%20my%20branch%20with%20master.%20%20If%20I%20look%20a%20Muri's%20branch,%20I%0A>%20>>>%20see%20a%20manually%20resolved%20conflict%20that%20I%20don't%20see%20in%20sajolida's%20merge%0A>%20>>>%20commit%20in%20master%20(but%20I%20see%20there%20was%20a%20conflict)...%0A>%20>>%0A>%20>>%20Yes,%20there%20was%20a%20conflict%20in%20the%20PO%20file%20header%20which%20I%20resolved%20without%0A>%20>>%20paying%20much%20attention%20to%20it.%20It%20was%20the%20usual%20stuff%20about%20dates%20and%0A>%20>>%20author%20which%20I%20think%20we%20don't%20care%20much%20about.%20That's%20why%20I%20didn't%20ask%0A>%20>>%20you%20to%20resolve%20it%20before%20merging.%0A>%20>%20%0A>%20>%20hm,%20i've%20not%20much%20experience%20with%20git,%20so%20maybe%20i'm%20talking%20out%20of%20my%0A>%20>%20ass,%20but%20i%20thought%20it%20was%20this%20line:%0A>%20>%20muri@laptop:~/tails%24%20git%20diff%2048f60be7d6945a05db4c74c1ac7686f88800e582%0A>%20>%20b5ecc1249a678766d81907c70a5903da5e0d8150%0A>%20>%20wiki/src/doc/first_steps/startup_options.de.po%0A>%20>%20%0A>%20>%20-%22%5B%5B!img%20boot-menu-with-options.png%20link=no%20alt=%5C%22Black%20screen%20with%0A>%20>%20Debian%20live%5Cn%22%0A>%20>%20+%22%5B%5B!img%20boot-menu-with-options.png%20link=no%20alt=%5C%22Black%20screen%20with%20Tails%5Cn%22%0A>%20>%20%0A>%20>%20which%20is%20now%20still%20translated%20with%20'Debian%20Live'.%20it's%20actually%20no%0A>%20>%20biggie,%20but%20i'm%20wondering%20if%20i%20misinterpreted%20git%20;)%0A>%20%0A>%20I'm%20not%20sure%20to%20understand%20your%20concern,%20but:%0A>%20%0A>%20%24%20git%20log%0A>%2048f60be7d6945a05db4c74c1ac7686f88800e582...b5ecc1249a678766d81907c70a5903da5e0d8150%0A>%20wiki/src/doc/first_steps/startup_options.de.po%0A>%20%0A>%20returns:%0A>%20%0A>%20commit%20b5ecc12%0A>%20Author:%20amnesia%20<webmaster@???>%0A>%20Date:%20%20%20Wed%20Apr%2029%2018:05:04%202015%20+0200%0A>%20%0A>%20%0A>%20and:%0A>%20%0A>%20%24%20git%20branch%20--contains%20b5ecc12%0A>%20%0A>%20returns%20(amongst%20other%20branches):%0A>%20%0A>%20*%20master%0A>%20%0A>%20So%20the%20change%20you%20are%20referring%20to%20is%20in%20master%20already.%20But%20note%20that%0A>%20this%20is%20not%20a%20translation%20but%20a%20%22msgid%22.%0A>%20%0A>%20I%20also%20looked%20at%20your%20branch%0A>%20(origin/master...muri/muri-t10n/review-de_startup_options)%20and%20indeed%0A>%20there's%20some%20stuff%20not%20merged%20in%20there...%0A>%20Probably%20because%20what%20I%20merged%20(from%20spriver%20on%202015-05-26)%20was%0A>%20flapflap/review_de_startup_options%20and%20not%20muri's.%0A>%20%0A>%20Now%20I%20also%20merged%20muri/muri-t10n/review-de_startup_options%20and%20the%20page%0A>%20now%20has%20%22Tails%20Grafik%22%20translated.%0A>%20%0A>%20Is%20everything%20fine%20now?%0A>%20%0A>%20--%20%0A>%20sajolida%0A>%20%0A>%20 "Reply to this message")