flapflap:
> DP Tor-Contact:
>> Hi again,
>> I reviewed it again, sorry for the long delay. I fixed some small typos
>> and changed the term "MAC address spoofing" into "MAC-Adressen
>> spoofing". I hope it's okay. The rest was good work as usual, my initial
>> translation was not that good, as you had so much work to do with
>> it...sorry because of that. And please forgive my little git skills.
>>
>>
>> branch: mac_spoof
>> commit: 0e0ea74f53
>> git: https://github.com/spriver/tails/
>>
>>
>> Cheers,
>> spriver
>
> Usually, I'd prefer to go for another round of review until no new
> commits are added.
>
> @intrigeri
> I'll do such another review now... just wait a couple of minutes please...
I think it was good to do the review again.
spriver added his commit 0e0ea74f53 on top of the mac_spoof branch which
was the one with the wrongly resolved conflict in version_1.2.de.po.
Therefore, I re-imported/cherry-picked spriver's changes (*) of only
that commit on top of my branch and then did another review.
Please review
https://gitorious.org/flapflap/tailsxlat.git
branch de-mac_spoof
77cdd47 (de) another review of mac_spoof.de.po
7db6a22 Minor improvements to flapflap's review
d8a7436 review of spriver's translation
8d8c576 breaking long lines
3df6178 translation
(*) straightforward cherry-picking was not possible because spriver's
poedit seems not to make linebreaks after 80 characters or so and
creates very long lines which mine (the one from inside Tails) doesn't.
So I switched to spriver's branch opened the file in my poedit, saved
it, and made a commit with just the linebreaks fixed. Then created a
temporary branch, squashed the last two commits (spriver's review +
linebreak fix), switched to my de-mac_spoof branch and cherry-picked the
previously squashed commit and resolved the conflicts.
spriver's changes of the review (which are all valid) should be these:
https://gitorious.org/flapflap/tailsxlat/commit/7db6a22a967ce66c9a9fb57fa77bdb2feb278874
(@spriver: please shout if something got lost)
and my changes on top are those:
https://gitorious.org/flapflap/tailsxlat/commit/77cdd47167711ea313776302885b343bdbf31264
~flapflap
