Merge branch 'master' of https://git-tails.immerda.ch/tails into fr-merge-patches-from-the-list

wiki/src/blueprint/l10n_Italian.mdwn

@@ -4,6 +4,7 @@
 
 <http://tp.linux.it/glossario.html>
 
+[[Domande aperte sui termini]]
 
 # Info
 
@@ -170,7 +171,7 @@ Attingere nuove pagine da tradurre dando precedenza a queste:
 ___
 
 
-./doc/about.index
+./doc/about.index DONE daRev
 
 ./doc/about/openpgp_keys --80% DONE, a lot of issues... daRev
 
@@ -178,10 +179,15 @@ ___
 
 ./doc/about/fingerprint --DONE,  pushed  daRev
 ./doc/first_steps/persistence
+
 ./doc/first_steps/persistence.caution
+
 ./doc/first_steps/persistence/configure
+
 ./doc/first_steps/persistence/delete
+
 ./doc/first_steps/persistence/use
+
 ./doc/first_steps/persistence/warnings
 
 ___

wiki/src/blueprint/report_2015_08.mdwn

@@ -90,23 +90,20 @@ Outreach
 
 * [We have Tails stickers again](http://t.co/AgtuTN0XmJ)! We'll share them during upcoming events, you can also [[make your own|contribute/how/promote/material/stickers]].
 
-* A talk about Tails took place during DebConf15 in Heidelberg, Germany, on August 15th.
-
-* DrWhax did a lightning talk about Tails at CCCamp.
+* Alan attended [GUADEC, the GNOME conference](https://2015.guadec.org/) in Gothenburg, Sweden on August 7 – 9  and connected us better with the GNOME community.
 
-* Alan attended GUADEC, the GNOME conference and connected us better
-  with the GNOME community.
+* A talk about Tails took place during DebConf15 in Heidelberg, Germany, on August 15th.
 
-FIXME
+* DrWhax did a lightning talk about Tails at [CCCamp](https://events.ccc.de/camp/2015/wiki/Main_Page) on August 13 - 17 in Zehdenick, Germany.
 
 Upcoming events
 ---------------
 
 * 2015-09-22: [Tails - Computer nutzen und Privatsphäre schützen](http://pentabarf.linkemedienakademie.de/export/lima15_2/events/158.de.html) by Vera Henssler and Ulrich Overdieck in Berlin, Germany (in German)
 
-* 2015-09-29 to 2015-10-02: Farsi localization sprint in Amsterdam
+* 2015-09-29 to 2015-10-02: Farsi localization sprint in Amsterdam, Netherlands.
 
-* 2015-10-06 to 08: OTF Annual Summit in Washington DC
+* 2015-10-06 to 08: OTF Annual Summit in Washington DC, USA.
 
 On-going discussions
 ====================

wiki/src/contribute/design/application_isolation.mdwn

@@ -314,6 +314,7 @@ To mitigate that problem, we could:
   build hosts. See `apparmor_parser(8)`, `apparmor_parser --help`,
   examples in `parser/tst/features_files/*`, and `parser.conf`.
   Potential problems:
+  * missing documentation: see <https://bugs.launchpad.net/bugs/1491147>
   * if alias rules need to be added at login time, then the cache must
     be invalidated, and the policy entirely recompiled;
   * it remains to be researched how well this would work, once

wiki/src/contribute/release_process/test.mdwn

@@ -65,6 +65,8 @@ documented on a [[dedicated page|test/automated_tests]].
 
 See [[test/setup]] and [[test/usage]].
 
+Do point `--old-iso` to the ISO of the previous stable release.
+
 ## Automated test suite migration progress
 
 The manual test suite below either contains tests that cannot be

wiki/src/doc/first_steps/installation/manual.de.po

@@ -3,39 +3,43 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: Tails\n"
 "POT-Creation-Date: 2013-10-24 02:22+0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"PO-Revision-Date: 2015-09-03 16:24+0100\n"
+"Last-Translator: Tails translators <tails@boum.org>\n"
+"Language-Team: DE\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.6.10\n"
 
 #. type: Plain text
 #, no-wrap
 msgid "[[!meta title=\"Manually installing onto a USB stick or SD card\"]]\n"
-msgstr ""
+msgstr "[[!meta title=\"Händisch auf einen USB-Stick oder eine SD-Karte installieren\"]]\n"
 
 #. type: Plain text
 #, no-wrap
 msgid "[[!inline pages=\"doc/first_steps/installation/manual.intro\" raw=\"yes\"]]\n"
-msgstr ""
+msgstr "[[!inline pages=\"doc/first_steps/installation/manual.intro.de\" raw=\"yes\"]]\n"
 
 #. type: Bullet: '  - '
 msgid ""
 "[[Manual installation using Linux|first_steps/installation/manual/linux]]"
 msgstr ""
+"[[Händische Installation unter Linux|first_steps/installation/manual/linux]]"
 
 #. type: Bullet: '  - '
 msgid ""
 "[[Manual installation using Windows|first_steps/installation/manual/windows]]"
 msgstr ""
+"[[Händische Installation unter Windows|first_steps/installation/manual/"
+"windows]]"
 
 #. type: Bullet: '  - '
 msgid "[[Manual installation using Mac|first_steps/installation/manual/mac]]"
 msgstr ""
+"[[Händische Installation unter Mac|first_steps/installation/manual/mac]]"

wiki/src/doc/first_steps/installation/manual.intro.de.po

@@ -3,18 +3,18 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: Tails\n"
 "POT-Creation-Date: 2013-10-24 02:22+0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"PO-Revision-Date: 2015-09-07 22:17+0100\n"
+"Last-Translator: spriver <spriver@autistici.org>\n"
+"Language-Team: DE\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.6.10\n"
 
 #. type: Plain text
 #, no-wrap
@@ -25,8 +25,13 @@ msgid ""
 "running Tails, and be able to use\n"
 "<span class=\"application\">Tails Installer</span> on a second device.\n"
 msgstr ""
+"Es wird empfohlen, den\n"
+"<span class=\"application\">[[Tails Installer|installation]]</span> zu benutzen,\n"
+"um Tails auf einen USB-Stick oder eine SD-Karte zu installieren. Aber es könnte für Sie erforderlich sein, diese Vorgehensweise\n"
+"zu nutzen, um ein erstes laufendes Tails zu erhalten und in der Lage zu sein, den \n"
+"<span class=\"application\">Tails Installer</span> für ein weiteres Speichermedium zu nutzen.\n"
 
 #. type: Plain text
 #, no-wrap
 msgid "**This technique does not allow you to set up a persistent volume.**\n"
-msgstr ""
+msgstr "**Diese Vorgehensweise erlaubt es Ihnen nicht, einen verschlüsselten, beständigen Speicherbereich einzurichten.**\n"