flapflap:
> DP Tor-Contact:
>> Hi,
>> I just translated:
>> wiki/src/doc/first_steps/startup_options/mac_spoofing.de.po in the
>> branch "mac_spoof".
>>
>> My git is: https://github.com/spriver/tails
>>
>> I hope it is okay that I changed the term "MAC address spoofing" into
>> "Verschleiern der MAC-Adresse"
>
> Hi spriver!
>
> thanks for the translation, I only had to make a few modifications.
>
> I cherry-picked your HEAD commit fd2e4adecd408 because your merge commit
> 4ad3f2fd14eec broke wiki/src/news/version_1.2.de.po by wrongly resolving
> a conflict (added lines such as "<<<<<<< HEAD").
>
> I noticed it when merging in master and looking at the changed files:
> git checkout spriver/mac_spoof
> git branch mac_spoof
> git merge master
> git diff master..mac_spoof
>
> The cherry-picked and reviewed branch is in my repository
> https://gitorious.org/flapflap/tailsxlat.git
> branch de-mac_spoof
>
> Commits:
> d8a7436 review of spriver's translation
> 8d8c576 breaking long lines
> 3df6178 translation
>
>
> Please review.
> (gitk with "Markup words" diff setting might be handy :-)
<snip>
ping?
Are there any problems or anything I can do or help with?
~flapflap
(I currently have ~5 more branches for review but I'll wait with them
until the others have been merged)
