spriver:
> I have it done like you suggested. Branch is now news.3, filenames
> and git unchanged.
>
> I hope it is okay now.
Yes. There was some older merge conflict to news_1.2.de.po in your
repository so I cherry-picked your fix into sycamoreone/stable.
Everything should be OK now.
I somewhat prefer "im Klaren" to "in Klartext", but both should be OK.
So, please merge the 2 commits
commit cd5a4a96208febed24d1af9c3fb60048b994a88d
Author: spriver <tails@???>
Date: Thu Jan 15 19:55:29 2015 +0100
Few small changes and some typos fixed from sycamoreone's translation
commit 6c56582681affd561ad3624c08b990239aee735c
Author: Tails developers <amnesia@???>
Date: Wed Jan 14 22:28:50 2015 +0000
[de] First translation of the Tails 1.2.3 release notes.
from sycamoreone/stable.
Cheers!
> On 01/15/2015 18:29, sycamoreone wrote:
>> spriver:
>>> I reviewed them both and made some smaller changes. Someone
>>> should have a look and then we can pull ;)
>>>
>>> Files are
>>>
>>> wiki/src/news/version_1.2.3.de.po
>>> wiki/src/security/Numerous_security_holes_in_1.2.2.de.po
>>>
>>> My repo as usual
>>>
>>> https://github.com/spriver/tails
>>>
>>> And the branch is
>>>
>>> news123
>>
>> thanks for doing the review. A few questions: I can't see on what
>> branch your branch news123 is based on. Also it doesn't contain
>> the original commits 6c56582681affd5 from sycamoreone/stable so
>> it is hard for me to see what changed.
>>
>> The workflow I would suggest for reviews would be something along
>> the lines of
>>
>> git checkout -b review_news123 torsocks git pull
>> https://git-tails.immerda.ch/sycamoreone/tails stable [fix
>> translations and git add] git commit -m "Small changes to ..."
>>
>> In this way one would only have to look at the last commit to see
>> your fixes instead of having to re-check everything.
>>
>> Does this make sense?
>>
