Merge remote-tracking branch 'origin/master' into testing

Conflicts:
	wiki/src/about.de.po
	wiki/src/doc/encryption_and_privacy/secure_deletion.fr.po

wiki/src/about.de.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-02-06 10:28+0100\n"
+"POT-Creation-Date: 2015-02-12 13:25+0100\n"
 "PO-Revision-Date: 2015-01-28 14:19+0100\n"
 "Last-Translator: Tails developers <tails@boum.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

wiki/src/blueprint/UEFI.mdwn

@@ -65,6 +65,7 @@ useful for many.
 Resources
 =========
 
+* [The bootstrap process on EFI systems](https://lwn.net/Articles/632528/) on LWN
 * lernstick Grub configuration, implemented as a live-build binary
   hook, that's meant to be nice with an existing syslinux
   configuration managed by live-build:

wiki/src/blueprint/automated_builds_and_tests/autobuild_specs.mdwn

 [[!meta title="Automated builds specification"]]
 
 
-This blueprint helps to keep track of the discussion on the mailing list, and
-is attached to tickets **#8655** to specify how to implement **#6196** (Build all
-active branches).
+This blueprint helps to keep track of the discussion on the mailing
+list, and is attached to [[!tails_ticket 8655]]
+to specify how to implement [[!tails_ticket 6196]] ("Build all active
+branches").
 
 [[!toc levels=2]]
 
@@ -21,13 +22,13 @@ Some metrics about the number of branches merged per release could give hints
 that might help to decide of selection process. See at the bottom of this
 page.
 
-Given a branch take around 45 minutes to be build on lizard (worth case),
-with two builders, lizard will be able to build something like 64 ISOs a
+Given an ISO build takes around 45 minutes on lizard (worst case),
+given two builders lizard will be able to build something like 64 ISOs a
 day.
 
-Devs should be able to trigger automatic builds for a branch whose build
+Developers should be able to trigger automatic builds for a branch whose build
 was dropped (eg. last commit too old) by pushing a dumb commit on a
-timestamp file in their branch.
+timestamp file in that branch.
 
 
 Proposal1:
@@ -39,7 +40,7 @@ Proposal1:
 ## When to build it
 
 Define the regularity we want to build topic branches, apart from being build
-on git pushes.
+on Git push.
 
 As with the first question, some metrics could help the discussion,
 at least having an average number of branches per release.
@@ -59,11 +60,11 @@ Proposal 1: Notify by email the author of the offending commit on failure.
 
 # Scenarios
 
-In the folowing scenario:
+In the following scenario:
 
 0. topic branches are named branch T
 0. base branches are named branch B
-0. builds are ran on merges which don't raise a conflict. If the merge raises a conflict, then the topic branch's developpes should take care of resolving it.
+0. builds are ran on merges which don't raise a conflict. If the merge raises a conflict, then the topic branch's developer should take care of resolving it.
 
 
 ## Scenario 1 : reviewer
@@ -76,16 +77,16 @@ In the folowing scenario:
     And if the build succeeded
       I might want to download the resulting ISO
       I might want to get the pkg list
-      I want the redmine ticket to be notified (optional feature)
+      I want the Redmine ticket to be notified (optional)
     Otherwise if it fails the developer who proposed the merge should be notified
-      And the developper _need_ to see the build logs
+      And the developer *needs* to see the build logs
       And the ticket should be reassigned to the branch submitter
-      And QA check should be set to `Dev needed`
+      And QA check should be set to "Dev needed"
 
 
 ## Scenario 2 : developer
 
-    As a developper who has the commit bit
+    As a developer who has the commit bit
     When I'm working on branch T
     Then I need to know if my branch builds after I've pushed
     And I need to know if my branch build is broken by something else
@@ -94,11 +95,11 @@ In the folowing scenario:
     And if the build succeeded
       I might want to download the resulting ISO
       I might want to get the pkg list
-      I want the redmine ticket to be notified (optional feature)
+      I want the Redmine ticket to be notified (optional)
     Otherwise if it fails I _need_ to see the build logs
       And the developer who proposed the merge should be notified
       And the ticket should be reassigned to the branch submitter
-      And QA check should be set to `Dev needed`
+      And QA check should be set to "Dev needed"
 
 
 ## Scenario 3 : RM
@@ -137,46 +138,46 @@ might want to consider it in the future.
 
 ## Scenario 3
 
-    As a Tails developper
+    As a Tails developer
     When the test suite is ran on the ISO build from my last commit
-    I want to watch the TV and see the test video in HTML5 from a Torbrowser
+    I want to watch TV and see the test video in HTML5 from Tor Browser
 
 
 ## Scenario 4
 
-    As a Tails developper
+    As a Tails developer
     When an ISO is build from my last commit
-    I want to access it throught remote desktop (VNC/Spice/...) over Tor
+    I want to access it through remote desktop (VNC/Spice/...) over Tor
 
 # Statistics
 
 As of 2015-02-02, there are 26 branches that would be automatically
 build as part of the next 1.3 release, following the for now defined
-criterias (above in this bluepint):
-
-feature/7779-revisit-touchpad-settings
-feature/6992-whisperback-email-address
-bugfix/8714-tor-is-ready-robustness
-bugfix/8680-git-without-polipo
-feature/8719-mount-output-in-bug-reports
-feature/6241-gnupg2
-feature/8725-remove-vagrant-bootstrap-cache
-bugfix/8715-build-system-independent-APT-sources
-feature/7756-reintroduce-whisperback
-bugfix/8699-only-create-timestamps-in-Jenkins
-feature/8740-new-signing-key-phase-2
-feature/8665-remove-adblock
-bugfix/8756-repair-local-packages
-feature/7530-docker_anonym
-feature/7530-docker-with-apt-cacher-ng
-feature/7963-background-color
-feature/8491-live-additional-software-in-whisperback
-feature/7530-docker
-feature/linux-3.18
-feature/torbrowser-alpha
-bugfix/8747-update-tails-apt-repo-signing-key
-feature/8726-use-homogenous-Debian-mirrors-at-build-time
-feature/5525-sandbox-web-browser
-feature/7752-keyringer
-feature/6739-install-electrum
-bugfix/quote-wrappers-arguments
+criterias (above in this blueprint):
+
+* feature/7779-revisit-touchpad-settings
+* feature/6992-whisperback-email-address
+* bugfix/8714-tor-is-ready-robustness
+* bugfix/8680-git-without-polipo
+* feature/8719-mount-output-in-bug-reports
+* feature/6241-gnupg2
+* feature/8725-remove-vagrant-bootstrap-cache
+* bugfix/8715-build-system-independent-APT-sources
+* feature/7756-reintroduce-whisperback
+* bugfix/8699-only-create-timestamps-in-Jenkins
+* feature/8740-new-signing-key-phase-2
+* feature/8665-remove-adblock
+* bugfix/8756-repair-local-packages
+* feature/7530-docker_anonym
+* feature/7530-docker-with-apt-cacher-ng
+* feature/7963-background-color
+* feature/8491-live-additional-software-in-whisperback
+* feature/7530-docker
+* feature/linux-3.18
+* feature/torbrowser-alpha
+* bugfix/8747-update-tails-apt-repo-signing-key
+* feature/8726-use-homogenous-Debian-mirrors-at-build-time
+* feature/5525-sandbox-web-browser
+* feature/7752-keyringer
+* feature/6739-install-electrum
+* bugfix/quote-wrappers-arguments

wiki/src/contribute/calendar.mdwn

@@ -38,8 +38,8 @@
   - intrigeri is the RM from June 10 to the release
 
 * 2015-08-11: Release 1.5
-  - intrigeri is the RM until July 10
-  - anonym is the RM from July 10 to the release
+  - intrigeri is the RM until July 20
+  - anonym is the RM from July 20 to the release
 
 * 2015-09-22: Release 1.5.1 (anonym is the RM)
 

wiki/src/contribute/design/UEFI.mdwn

@@ -30,8 +30,8 @@ Non-goals
   in Legacy BIOS boot mode from hybrid ISO cat'd on a USB device.
   If the firmware supports it, this can be done on the same computer;
   else, from another computer.
-* 32-bit UEFI boot: this hardware is rare and mostly obsolete these
-  days
+* 32-bit UEFI boot: this hardware is rare; we have [[!tails_ticket
+  8471 desc="plans to reconsider this decision"]], though.
 * [[blueprint/UEFI Secure boot]] is not part of this plan.
   Picking technical solutions that leave room for it would be a great
   bonus, though.

wiki/src/doc/encryption_and_privacy/secure_deletion.fr.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-02-06 10:28+0100\n"
+"POT-Creation-Date: 2015-02-12 13:25+0100\n"
 "PO-Revision-Date: 2015-01-31 15:44-0000\n"
 "Last-Translator: \n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

wiki/src/news/test_1.3-rc1.de.po

+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# 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"
+"POT-Creation-Date: 2015-02-12 13:25+0100\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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"Call for testing: 1.3~rc1\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta date=\"2015-02-12 12:00:00\"]]\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"You can help Tails! The first release candidate for the upcoming version 1.3 "
+"is out. Please test it and see if it works for you."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!toc levels=1]]\n"
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "How to test Tails 1.3~rc1?\n"
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"**Keep in mind that this is a test image.** We have made sure that it is not "
+"broken in an obvious way, but it might still contain undiscovered issues."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"Either try the <a href=\"#automatic_upgrade\">automatic upgrade</a>, or "
+"download the ISO image and its signature:"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   <a class=\"download-file\" "
+"href=\"http://dl.amnesia.boum.org/tails/alpha/tails-i386-1.3~rc1/tails-i386-1.3~rc1.iso\">Tails "
+"1.3~rc1 ISO image</a>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   <a class=\"download-signature\"\n"
+"   "
+"href=\"https://tails.boum.org/torrents/files/tails-i386-1.3~rc1.iso.sig\">Tails "
+"1.3~rc1 signature</a>\n"
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid "[[Verify the ISO image|download#verify]]."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"Have a look at the list of <a href=\"#known_issues\">known issues of this "
+"release</a> and the list of [[longstanding known "
+"issues|support/known_issues]]."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid "Test wildly!"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"If you find anything that is not working as it should, please [[report to\n"
+"us|doc/first_steps/bug_reporting]]! Bonus points if you first check if it is "
+"a\n"
+"<a href=\"#known_issues\">known issue of this release</a> or a\n"
+"[[longstanding known issue|support/known_issues]].\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<div id=\"automatic_upgrade\"></a>\n"
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "How to automatically upgrade from 1.2.3?\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"These steps allow you to automatically upgrade a device installed with "
+"<span\n"
+"class=\"application\">Tails Installer</span> from Tails 1.2.3 to Tails "
+"1.3~rc1.\n"
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"Start Tails 1.2.3 from a USB stick or SD card (installed by the Tails "
+"Installer), and [[set an administration "
+"password|doc/first_steps/startup_options/administration_password]]."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"Run this command in a <span class=\"application\">Root Terminal</span> to "
+"select the \"alpha\" upgrade channel and start the upgrade:"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"       echo TAILS_CHANNEL=\\\"alpha\\\" >> /etc/os-release && \\\n"
+"            tails-upgrade-frontend-wrapper\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"1. Once the upgrade has been installed, restart Tails and look at\n"
+"   <span class=\"menuchoice\">\n"
+"     <span class=\"guimenu\">System</span>&nbsp;▸\n"
+"     <span class=\"guimenuitem\">About Tails</span>\n"
+"   </span>\n"
+"   to confirm that the running system is Tails 1.3~rc1.\n"
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "What's new since 1.2.3?\n"
+msgstr ""
+
+#. type: Plain text
+msgid "Notable changes since Tails 1.2.3 include:"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  * Major new features\n"
+"    - Distribute a hybrid ISO image again: no need for anyone to\n"
+"      manually run `isohybrid` anymore! ([[!tails_ticket 8510]])\n"
+"    - Confine the Tor Browser using AppArmor to protect against some\n"
+"      types of attack. [Learn "
+"more](https://git-tails.immerda.ch/tails/plain/wiki/src/doc/anonymous_internet/Tor_Browser.mdwn?h=testing)\n"
+"      about how this will affect your usage of Tails.\n"
+"      ([[!tails_ticket 5525]])\n"
+"    - Install the Electrum bitcoin client, and allow users\n"
+"      to persist their wallet. ([[!tails_ticket 6739]])\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  * Minor improvements\n"
+"    - Support obfs4 Tor bridges ([[!tails_ticket 7980]])\n"
+"    - Touchpad: enable tap-to-click, 2-fingers scrolling, and disable\n"
+"      while typing. ([[!tails_ticket 7779]])\n"
+"    - Support Vietnamese input in IBus. ([[!tails_ticket 7999]])\n"
+"    - Improve support for OpenPGP smartcards. ([[!tails_ticket 6241]])\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"See the <a "
+"href=\"https://git-tails.immerda.ch/tails/plain/debian/changelog?h=1.3-rc1\">online\n"
+"Changelog</a> for technical details.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"known_issues\"></a>\n"
+msgstr ""
+
+#. type: Title #
+#, no-wrap
+msgid "Known issues in 1.3~rc1"
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "[[Longstanding known issues|support/known_issues]]"
+msgstr ""
+
+#. type: Title #
+#, no-wrap
+msgid "Required persistent configuration updates"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"If you have the Pidgin persistence preset enabled, then you perform the "
+"following manual steps to make it open links in the Tor Browser:"
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "Start Tails"
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "Enable persistence without the read-only option"
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "Start Pidgin"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"* Choose\n"
+"  <span class=\"menuchoice\">\n"
+"    <span class=\"guimenu\">Tools</span>&nbsp;▸\n"
+"    <span class=\"guimenuitem\">Preferences</span>\n"
+"  </span>\n"
+"* Click the <span class=\"guilabel\">Browser</span> tab\n"
+"* Type `/usr/local/bin/tor-browser %s` in the <span\n"
+"  class=\"guilabel\">Manual</span> field\n"
+"* Click the <span class=\"button\">Close</span> button\n"
+msgstr ""

wiki/src/news/test_1.3-rc1.fr.po

+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# 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"
+"POT-Creation-Date: 2015-02-12 13:25+0100\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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"Call for testing: 1.3~rc1\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta date=\"2015-02-12 12:00:00\"]]\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"You can help Tails! The first release candidate for the upcoming version 1.3 "
+"is out. Please test it and see if it works for you."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!toc levels=1]]\n"
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "How to test Tails 1.3~rc1?\n"
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"**Keep in mind that this is a test image.** We have made sure that it is not "
+"broken in an obvious way, but it might still contain undiscovered issues."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"Either try the <a href=\"#automatic_upgrade\">automatic upgrade</a>, or "
+"download the ISO image and its signature:"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   <a class=\"download-file\" "
+"href=\"http://dl.amnesia.boum.org/tails/alpha/tails-i386-1.3~rc1/tails-i386-1.3~rc1.iso\">Tails "
+"1.3~rc1 ISO image</a>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   <a class=\"download-signature\"\n"
+"   "
+"href=\"https://tails.boum.org/torrents/files/tails-i386-1.3~rc1.iso.sig\">Tails "
+"1.3~rc1 signature</a>\n"
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid "[[Verify the ISO image|download#verify]]."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"Have a look at the list of <a href=\"#known_issues\">known issues of this "
+"release</a> and the list of [[longstanding known "
+"issues|support/known_issues]]."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid "Test wildly!"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"If you find anything that is not working as it should, please [[report to\n"
+"us|doc/first_steps/bug_reporting]]! Bonus points if you first check if it is "
+"a\n"
+"<a href=\"#known_issues\">known issue of this release</a> or a\n"
+"[[longstanding known issue|support/known_issues]].\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<div id=\"automatic_upgrade\"></a>\n"
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "How to automatically upgrade from 1.2.3?\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"These steps allow you to automatically upgrade a device installed with "
+"<span\n"
+"class=\"application\">Tails Installer</span> from Tails 1.2.3 to Tails "
+"1.3~rc1.\n"
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"Start Tails 1.2.3 from a USB stick or SD card (installed by the Tails "
+"Installer), and [[set an administration "
+"password|doc/first_steps/startup_options/administration_password]]."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid ""
+"Run this command in a <span class=\"application\">Root Terminal</span> to "
+"select the \"alpha\" upgrade channel and start the upgrade:"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"       echo TAILS_CHANNEL=\\\"alpha\\\" >> /etc/os-release && \\\n"
+"            tails-upgrade-frontend-wrapper\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"1. Once the upgrade has been installed, restart Tails and look at\n"
+"   <span class=\"menuchoice\">\n"
+"     <span class=\"guimenu\">System</span>&nbsp;▸\n"
+"     <span class=\"guimenuitem\">About Tails</span>\n"
+"   </span>\n"
+"   to confirm that the running system is Tails 1.3~rc1.\n"
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "What's new since 1.2.3?\n"
+msgstr ""
+
+#. type: Plain text
+msgid "Notable changes since Tails 1.2.3 include:"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  * Major new features\n"
+"    - Distribute a hybrid ISO image again: no need for anyone to\n"
+"      manually run `isohybrid` anymore! ([[!tails_ticket 8510]])\n"
+"    - Confine the Tor Browser using AppArmor to protect against some\n"
+"      types of attack. [Learn "
+"more](https://git-tails.immerda.ch/tails/plain/wiki/src/doc/anonymous_internet/Tor_Browser.mdwn?h=testing)\n"
+"      about how this will affect your usage of Tails.\n"
+"      ([[!tails_ticket 5525]])\n"
+"    - Install the Electrum bitcoin client, and allow users\n"
+"      to persist their wallet. ([[!tails_ticket 6739]])\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  * Minor improvements\n"
+"    - Support obfs4 Tor bridges ([[!tails_ticket 7980]])\n"
+"    - Touchpad: enable tap-to-click, 2-fingers scrolling, and disable\n"
+"      while typing. ([[!tails_ticket 7779]])\n"
+"    - Support Vietnamese input in IBus. ([[!tails_ticket 7999]])\n"
+"    - Improve support for OpenPGP smartcards. ([[!tails_ticket 6241]])\n"
+msgstr ""