intrigeri: > flapflap wrote (14 Apr 2014 13:00:48 GMT) :
>> please merge branch nivatius-download
>
> Unfortunately, this branch causes conflicts. Please merge the current
> master branch into it, resolve conflicts as needed, and ping me again.
>
> Thanks in advance :) merged & conflict resolved in commit 299d48a, branch nivatius-download.
@German translators:
Two sections about (1) installing Tails on DVD/USB disk/SD card and (2)
about the work of the Debian security team have been removed in master
and moved to the first_steps section.
That was done by commits:
e425322 updated PO files (2014-04-13 20:59:41)
d1feba2 updated PO files (2014-04-13 19:59:44)
I'll try to find out where the strings moved and will re-add them there.
