Merge remote-tracking branch 'origin/stable'

Conflicts:
	wiki/src/contribute/release_process.mdwn
	wiki/src/doc/about/features.fr.po

4 files changed, 51 insertions, 26 deletions

diff --git a/wiki/src/upgrade/v1/Tails/1.4.1~rc1/i386/stable/upgrades.yml b/wiki/src/upgrade/v1/Tails/1.4.1~rc1/i386/stable/upgrades.yml
index 1c340ab..8a4b40f 100644
--- a/wiki/src/upgrade/v1/Tails/1.4.1~rc1/i386/stable/upgrades.yml
+++ b/wiki/src/upgrade/v1/Tails/1.4.1~rc1/i386/stable/upgrades.yml
@@ -3,3 +3,13 @@ build-target: i386
 channel: stable
 product-name: Tails
 product-version: 1.4.1~rc1
+upgrades:
+- details-url: https://tails.boum.org/news/version_1.4.1/
+  type: major
+  upgrade-paths:
+  - target-files:
+    - sha256: c7bf55250ca7a7ad897fd219af6ef3d4768be54fb3e2537abb3da8f7f4ed8913
+      size: 970584064
+      url: http://dl.amnesia.boum.org/tails/stable/tails-i386-1.4.1/tails-i386-1.4.1.iso
+    type: full
+  version: 1.4.1
diff --git a/wiki/src/upgrade/v1/Tails/1.4.1~rc1/i386/stable/upgrades.yml.pgp b/wiki/src/upgrade/v1/Tails/1.4.1~rc1/i386/stable/upgrades.yml.pgp
index 457647e..d92c031 100644
--- a/wiki/src/upgrade/v1/Tails/1.4.1~rc1/i386/stable/upgrades.yml.pgp
+++ b/wiki/src/upgrade/v1/Tails/1.4.1~rc1/i386/stable/upgrades.yml.pgp
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNATURE-----
 
-iQIcBAABCgAGBQJVUPMmAAoJEJj+xrx1Kj22Zu0P/iY0fBUqFXbYRgddBdLsYgZM
-OyGBi/NQOAoTJuC4XgxclV/fuLEi/ztFfmm2+p7opMHdsXlMMHd2yp6UfdxPicXK
-WaD9H7EkXpdHA2gM8YCf6RtIHlhW9X9uQ1Ot/81Iet8ASXtK6Un1x41Ktf1YDfCh
-zoqgM+XEK/mdxud6q1i5Np5gw9W/k6pIKM4GPptWkSwQSIbXgKPEG2LZiO5gF039
-A3NaRqp2Ni5rQHDUtCZK6k8HEbv0gWCl4HuU5XKKS38m5b/WPb+QPaL0tHxpcWaZ
-YV1Uw3A3IXjcweu9xUjX2l8a//0SOpszUZqe1BcDNkw3ffswlxUj5URuiFv3Z117
-DbeP2LH1j2R/GNJrK1AZDis8NkW70tooKIokVDOIspIOuW4OsM9W0Tz4lb5m12tE
-NGoCNmuGNchNwZ+uW6dQZ+YA3Ack8uk3zNeD9kKO/hiC+xYqiI+qQw4PU3L/+/sM
-DrIten5FAuspaI5GW+OQHiBnrKR/HoSyLlSBra0fTGwZ1Kx2nV2jHF0aE6dXEPnC
-y0QTZDGMfRWasT3YnJGBNAdT0MUD1xrzrHCV3nWRKRfsvuZJfvyEYIj8WWeDns3o
-F6wcyPQ/jmicZLj4R3SBA6cHbDK5l6DJdrcHsrk2g5uLdkOQJdJMzFLyzBUi+m+w
-u+2yq8UvsQvkR8JLqKXv
-=yzxG
+iQIcBAABCgAGBQJVkRnKAAoJEDyD3LUvaZxW7dIP/1pOUqri2uY0hJYbLMxeHqXk
+Y5DP1kiAImLZPLkLXQqC/zHqjwRrWtJNZ0Lktp+8NVYitJUu4s6oT07fh3bGjBhy
+09RH40hMJSwC4N8aiHVzzEBi0mOd+TdfR+EjwqTjm/7J1Zm4W8ckP6v/EgM95mJh
+0uAAGjy62UBznG0Bhjq5x4CTip84F0CXGvi77CxiwqabsG+zCtDn/gyTiCPIHSx/
+n+G+f0e0OzTYYrDAtrJadUxkQ/BLWZRaRFfJF39MTOCbaH0X4XLXsz3hbIGA0uPp
+JTV4PHOjfvqa1hVPL1r5OWD4I44QObB+94RrSRZ5byb/QZgwH2U09+DhhB8UOL+f
+ONacDsFNUKkXwrOjP874N/jK8b57WDq7jD4kFrcfiR/M6wPYXKaRz85VPZKmfoVc
++FBhvsoUeSZAoXIoh22eFKpFdq4u44KuJs1T2+atL3byqTboyZLLpcKA2mIPmnGk
++LzIwUIxxKPFmyYMSOOHXvqFoFr1WcMUF2U1U9p3wu45MwwZOSvuuZVkTu0G+vJk
+yTzbEnLNhf+w6a7HGkf57FYmnZpTSzbWUlDBJZZ5L9YBQ+BDRfpo4At/YvBvNaWR
+X2UomTZZCw1jXQfAP6JTC8zaThvajbRQ6LXFvqcA4h4bJproj0YfKF1+6C/CHYyy
+GJf9h5lbAJg4jy5gDeN9
+=UElB
 -----END PGP SIGNATURE-----
diff --git a/wiki/src/upgrade/v1/Tails/1.4/i386/stable/upgrades.yml b/wiki/src/upgrade/v1/Tails/1.4/i386/stable/upgrades.yml
index 318caf9..f63afba 100644
--- a/wiki/src/upgrade/v1/Tails/1.4/i386/stable/upgrades.yml
+++ b/wiki/src/upgrade/v1/Tails/1.4/i386/stable/upgrades.yml
@@ -3,3 +3,18 @@ build-target: i386
 channel: stable
 product-name: Tails
 product-version: '1.4'
+upgrades:
+- details-url: https://tails.boum.org/news/version_1.4.1/
+  type: major
+  upgrade-paths:
+  - target-files:
+    - sha256: c7bf55250ca7a7ad897fd219af6ef3d4768be54fb3e2537abb3da8f7f4ed8913
+      size: 970584064
+      url: http://dl.amnesia.boum.org/tails/stable/tails-i386-1.4.1/tails-i386-1.4.1.iso
+    type: full
+  - target-files:
+    - sha256: 78ead22bec100e6d9effe303a76fd1868c76baa42bcfda94db4adb62cebe1a81
+      size: 180469760
+      url: http://dl.amnesia.boum.org/tails/stable/iuk/Tails_i386_1.4_to_1.4.1.iuk
+    type: incremental
+  version: 1.4.1
diff --git a/wiki/src/upgrade/v1/Tails/1.4/i386/stable/upgrades.yml.pgp b/wiki/src/upgrade/v1/Tails/1.4/i386/stable/upgrades.yml.pgp
index cee987e..d62d2fe 100644
--- a/wiki/src/upgrade/v1/Tails/1.4/i386/stable/upgrades.yml.pgp
+++ b/wiki/src/upgrade/v1/Tails/1.4/i386/stable/upgrades.yml.pgp
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNATURE-----
 
-iQIcBAABCgAGBQJVDZ51AAoJEDyD3LUvaZxWDv4QAL+MB79jt2xZfs4u1v3h7J73
-p7LdZcevS0MgHriBFZ0t/CKfKyEBvToSQL+mEZOlpNW8Hk/ft+36l3gd2f55WQA6
-6XNtcBDeyusojfQF1XpisHAekYv7kOGgdIcOKQhkfHt++mj6eypCBempz959BXAB
-WuozXNNJdSt2TgCejJEI8nP/JIWOLjHYiOwvdBMp+t1dzgd10inu6v0+PSqmyaXL
-opENgLb+Ik9aQN2hiyVuf9bJEv2lk2ua5YhDm96A3JnJGZ+jTHaldM1pGD8j8I2N
-55kqTtSOov8QFFnyooD+7R0m4TGKQJeUAsGZ4MqsF4n/OohdxQn7p1hH2/TtuZWu
-fO7V/ec+4YGCMUWUb7EkUwvRCWQV+c6V3ndBNzmm2tYy4bzhOBy/v5duM18wLmc4
-JS0be42xVfhEIjp7/MS1NUvgKizGZbHDm9kZPQD4ybM/K2glKLpioOLGzyF6LEvc
-KqDJiG6k65Z2VAhM5+6MJVnM0cUXy4PtMyx6ut/g8ll9fD0RrG67+rZXnpd6z2IZ
-AY+GJSqYataggSDN3JFfUAFbOUTaeSqfVbOByXHFyx4Pu5hTNl+AZ0oV2BvJDBJr
-Yr1AXtYIwjEiU6TBruBxy4uW7eyIx4aQvRUMEgNmk50DT8irGQ7qjFGdDSsPAGOH
-2UuRcyTdxCFTX756EP7a
-=rikq
+iQIcBAABCgAGBQJVkRnVAAoJEDyD3LUvaZxWPU0P/1jJ0P3UEhquIadM28pLMeu0
+WpF01XiZYzNBOKsJwCIJ3ANnSB0XxU/XsbIOUKmX4Yy5JVnN1CkVmuFy2qfd7wOa
+Sn5IvTEcJRfIy66e93brDiHzV9+K/y5BZRCJGPuNz/8jXTx3EH8u9Rl7yiwjJ/BE
+Z3fVzzPZyNoY4+gfqaNZAQ+HYcSk/tccO0eA4XRbIygM+CTNoor45mih0dhPMe8R
+NILVT2Nl2FIwgHIhzvNtd8qxmw5lW5U9lVlzbReLME2guej/vB5t6Ar78Mp3yaXI
+vPJ+p2jhc/HRlpZ6DfuJ16KmN0c1YFIZ09rZ1LtZjvkTUghueLD2EaMl7qKJlV9z
+kyoJUHxnAB2cgf5so5SfKKM2lqP3NZiTu32TMh0RYCL7LxKxhMfaG7/KkMxQoeax
+XXCNc/ZtLeu2CkHozfFbU0k5cjqj5IzZhbGfSjy0pR1ttrcG7pxgDe9kuO2Ko5To
+cPk+NQM1ywe8bItamK8vhg+fiRrEswFIcg4AmyUiC5BxW0Zk4vQziKe9U5PSt6Xj
+WKJOx8Qug+LgQpWm73UaVLlnCggUEXuBHK0LLNOSQ8UhI4S4su+S4z6djxm+3hdA
+KdUTIkLIVrmm7Q94QiJ3T0N0rWNMq7WdhFO5g0MIG/C7WDvlRIfeQRCCKeZS2wlr
+2FjVVaXXgLz243YHPbZ9
+=NlVn
 -----END PGP SIGNATURE-----