summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoranonym <anonym@riseup.net>2015-05-12 16:31:20 +0200
committeranonym <anonym@riseup.net>2015-05-12 16:31:20 +0200
commit6ced1bddc250d85a04819cdc6a5029de345c8393 (patch)
tree697bc5c5457fdde62b8a18da5b2b8a5ed7287d83
parent1009ada901f3a0caf4d5357a494e9eb56692489b (diff)
parentbecfe5e073bf26173ac26abf0fc4602db09b40e7 (diff)
Merge remote-tracking branch 'origin/master' into testing
Conflicts: wiki/src/doc/anonymous_internet/Tor_Browser.de.po wiki/src/doc/anonymous_internet/Tor_Browser.fr.po wiki/src/doc/anonymous_internet/Tor_Browser.pt.po wiki/src/support/known_issues.de.po wiki/src/support/known_issues.fr.po wiki/src/support/known_issues.mdwn wiki/src/support/known_issues.pt.po
-rw-r--r--wiki/src/blueprint/UEFI/32-bit.mdwn3
-rw-r--r--wiki/src/blueprint/audit_AppArmor_profiles.mdwn2
-rw-r--r--wiki/src/blueprint/report_2015_05.mdwn2
-rw-r--r--wiki/src/doc/anonymous_internet/Tor_Browser.de.po11
-rw-r--r--wiki/src/doc/anonymous_internet/Tor_Browser.fr.po11
-rw-r--r--wiki/src/doc/anonymous_internet/Tor_Browser.mdwn9
-rw-r--r--wiki/src/doc/anonymous_internet/Tor_Browser.pt.po11
-rw-r--r--wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.de.po9
-rw-r--r--wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fr.po14
-rw-r--r--wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.mdwn1
-rw-r--r--wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.pt.po14
-rw-r--r--wiki/src/inc/trace2
-rw-r--r--wiki/src/support/known_issues.de.po19
-rw-r--r--wiki/src/support/known_issues.fr.po19
-rw-r--r--wiki/src/support/known_issues.mdwn11
-rw-r--r--wiki/src/support/known_issues.pt.po19
-rw-r--r--wiki/src/upgrade/v1/Tails/1.3.2/i386/alpha/upgrades.yml16
-rw-r--r--wiki/src/upgrade/v1/Tails/1.3.2/i386/alpha/upgrades.yml.pgp26
-rw-r--r--wiki/src/upgrade/v1/Tails/1.4~rc1/i386/alpha/upgrades.yml15
-rw-r--r--wiki/src/upgrade/v1/Tails/1.4~rc1/i386/alpha/upgrades.yml.pgp26
20 files changed, 197 insertions, 43 deletions
diff --git a/wiki/src/blueprint/UEFI/32-bit.mdwn b/wiki/src/blueprint/UEFI/32-bit.mdwn
index 796a228..bd9a0d1 100644
--- a/wiki/src/blueprint/UEFI/32-bit.mdwn
+++ b/wiki/src/blueprint/UEFI/32-bit.mdwn
@@ -62,7 +62,8 @@ Note that:
* Support for `{vesa,}menu.c32` was added in GRUB upstream, but didn't
make it into Debian yet as of 2.02~beta2-22. intrigeri has a
- 2.02~beta2-22tails1~bpo70+1 package with that new code in it.
+ 2.02~beta2-22tails1~bpo70+1 package with that new code in it,
+ and indeed it successfully loads our syslinux configuration.
* We'll need to load the `cpuid` module to make our `ifcpu64`
directives work.
diff --git a/wiki/src/blueprint/audit_AppArmor_profiles.mdwn b/wiki/src/blueprint/audit_AppArmor_profiles.mdwn
index 14d3796..e3b00c7 100644
--- a/wiki/src/blueprint/audit_AppArmor_profiles.mdwn
+++ b/wiki/src/blueprint/audit_AppArmor_profiles.mdwn
@@ -23,7 +23,7 @@ Things to check
* test how AppArmor confinement behaves wrt. `/live/overlay`
(that's a symlink to `/lib/live/mount/overlay`, created in
[[!tails_gitweb_commit 3233da6]]; maybe it's not needed
- anymore given the )
+ anymore?)
* test how AppArmor confinement behaves wrt.
`/lib/live/mount/overlay` (at least it blocks access for Evince
to `/lib/live/mount/overlay/home/amnesia/.gnupg/default.pdf`)
diff --git a/wiki/src/blueprint/report_2015_05.mdwn b/wiki/src/blueprint/report_2015_05.mdwn
index 2e95fd6..19a4fdd 100644
--- a/wiki/src/blueprint/report_2015_05.mdwn
+++ b/wiki/src/blueprint/report_2015_05.mdwn
@@ -18,6 +18,8 @@ Code
FIXME
+* FIXME: initial steps to evaluate Tails on touchscreen devices
+
Documentation and Website
=========================
diff --git a/wiki/src/doc/anonymous_internet/Tor_Browser.de.po b/wiki/src/doc/anonymous_internet/Tor_Browser.de.po
index 5c27107..ee4ce3a 100644
--- a/wiki/src/doc/anonymous_internet/Tor_Browser.de.po
+++ b/wiki/src/doc/anonymous_internet/Tor_Browser.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-05-11 14:31+0000\n"
+"POT-Creation-Date: 2015-05-11 19:29+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"
@@ -119,6 +119,15 @@ msgstr ""
#. type: Plain text
#, no-wrap
+msgid ""
+"<p>To be able to download files larger than the available RAM, you need\n"
+"to activate the <span class=\"guilabel\">[[Personal\n"
+"Data|doc/first_steps/persistence/configure#personal_data]]</span>\n"
+"persistence feature.</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
msgid "<a id=\"https\"></a>\n"
msgstr ""
diff --git a/wiki/src/doc/anonymous_internet/Tor_Browser.fr.po b/wiki/src/doc/anonymous_internet/Tor_Browser.fr.po
index 2b15609..fba6254 100644
--- a/wiki/src/doc/anonymous_internet/Tor_Browser.fr.po
+++ b/wiki/src/doc/anonymous_internet/Tor_Browser.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-05-11 14:31+0000\n"
+"POT-Creation-Date: 2015-05-11 19:29+0300\n"
"PO-Revision-Date: 2015-01-18 10:51-0000\n"
"Last-Translator: amnesia <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -126,6 +126,15 @@ msgstr ""
#. type: Plain text
#, no-wrap
+msgid ""
+"<p>To be able to download files larger than the available RAM, you need\n"
+"to activate the <span class=\"guilabel\">[[Personal\n"
+"Data|doc/first_steps/persistence/configure#personal_data]]</span>\n"
+"persistence feature.</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
msgid "<a id=\"https\"></a>\n"
msgstr "<a id=\"https\"></a>\n"
diff --git a/wiki/src/doc/anonymous_internet/Tor_Browser.mdwn b/wiki/src/doc/anonymous_internet/Tor_Browser.mdwn
index 6bee2da..ef42776 100644
--- a/wiki/src/doc/anonymous_internet/Tor_Browser.mdwn
+++ b/wiki/src/doc/anonymous_internet/Tor_Browser.mdwn
@@ -50,6 +50,15 @@ class="filename">Tor Browser</span> folder that is located in the
content of this folder is saved and remains available across separate
working sessions.
+<div class="note">
+
+<p>To be able to download files larger than the available RAM, you need
+to activate the <span class="guilabel">[[Personal
+Data|doc/first_steps/persistence/configure#personal_data]]</span>
+persistence feature.</p>
+
+</div>
+
<a id="https"></a>
HTTPS Encryption
diff --git a/wiki/src/doc/anonymous_internet/Tor_Browser.pt.po b/wiki/src/doc/anonymous_internet/Tor_Browser.pt.po
index d59d068..c29d437 100644
--- a/wiki/src/doc/anonymous_internet/Tor_Browser.pt.po
+++ b/wiki/src/doc/anonymous_internet/Tor_Browser.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-05-11 14:31+0000\n"
+"POT-Creation-Date: 2015-05-11 19:29+0300\n"
"PO-Revision-Date: 2014-08-26 15:43-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -123,6 +123,15 @@ msgstr ""
#. type: Plain text
#, no-wrap
+msgid ""
+"<p>To be able to download files larger than the available RAM, you need\n"
+"to activate the <span class=\"guilabel\">[[Personal\n"
+"Data|doc/first_steps/persistence/configure#personal_data]]</span>\n"
+"persistence feature.</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
msgid "<a id=\"https\"></a>\n"
msgstr "<a id=\"https\"></a>\n"
diff --git a/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.de.po b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.de.po
index fa354b7..d3b2cbf 100644
--- a/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.de.po
+++ b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-04-19 12:06+0300\n"
+"POT-Creation-Date: 2015-05-11 19:58+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"
@@ -429,6 +429,13 @@ msgstr ""
#. type: Plain text
#, no-wrap
+msgid ""
+"<a id=\"keyboard_layout\"></a>\n"
+"<div class=\"icon\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
msgid "[[!img keyboard-en.png link=no]]\n"
msgstr ""
diff --git a/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fr.po b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fr.po
index 71f1db6..6fefe7a 100644
--- a/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fr.po
+++ b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-04-19 12:06+0300\n"
+"POT-Creation-Date: 2015-05-11 19:58+0300\n"
"PO-Revision-Date: 2015-01-18 11:09-0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -542,6 +542,18 @@ msgstr ""
"</div>\n"
#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<a id=\"audio\"></a>\n"
+#| "<div class=\"icon\">\n"
+msgid ""
+"<a id=\"keyboard_layout\"></a>\n"
+"<div class=\"icon\">\n"
+msgstr ""
+"<a id=\"audio\"></a>\n"
+"<div class=\"icon\">\n"
+
+#. type: Plain text
#, no-wrap
msgid "[[!img keyboard-en.png link=no]]\n"
msgstr "[[!img keyboard-en.png link=no]]\n"
diff --git a/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.mdwn b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.mdwn
index 87cbe16..17dafa3 100644
--- a/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.mdwn
+++ b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.mdwn
@@ -197,6 +197,7 @@ a laptop<br/>
</div>
</div>
+<a id="keyboard_layout"></a>
<div class="icon">
[[!img keyboard-en.png link=no]]
[[!img keyboard-de.png link=no]]
diff --git a/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.pt.po b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.pt.po
index 3e00269..6266186 100644
--- a/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.pt.po
+++ b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-04-19 12:06+0300\n"
+"POT-Creation-Date: 2015-05-11 19:58+0300\n"
"PO-Revision-Date: 2014-08-06 07:18-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -553,6 +553,18 @@ msgstr ""
"</div>\n"
#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<a id=\"audio\"></a>\n"
+#| "<div class=\"icon\">\n"
+msgid ""
+"<a id=\"keyboard_layout\"></a>\n"
+"<div class=\"icon\">\n"
+msgstr ""
+"<a id=\"audio\"></a>\n"
+"<div class=\"icon\">\n"
+
+#. type: Plain text
#, no-wrap
msgid "[[!img keyboard-en.png link=no]]\n"
msgstr "[[!img keyboard-en.png link=no]]\n"
diff --git a/wiki/src/inc/trace b/wiki/src/inc/trace
index cf7c72b..15c246f 100644
--- a/wiki/src/inc/trace
+++ b/wiki/src/inc/trace
@@ -1 +1 @@
-1430619426
+1431369002
diff --git a/wiki/src/support/known_issues.de.po b/wiki/src/support/known_issues.de.po
index 4b719e5..f24787a 100644
--- a/wiki/src/support/known_issues.de.po
+++ b/wiki/src/support/known_issues.de.po
@@ -808,3 +808,22 @@ msgstr ""
#. type: Bullet: '* '
msgid "the search bar is enabled (it should be disabled)."
msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"keyboard_layout\"></a>\n"
+msgstr ""
+
+#. type: Title -
+#, no-wrap
+msgid "Keyboard layout is sometimes not applied\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"The keyboard layout selected in *Tails Greeter* is sometimes not applied if "
+"different from **English (US)**. Click on the [[keyboard layout|doc/"
+"first_steps/introduction_to_gnome_and_the_tails_desktop#keyboard_layout]] in "
+"the notification area to switch between English and the layout selected in "
+"*Tails Greeter*."
+msgstr ""
diff --git a/wiki/src/support/known_issues.fr.po b/wiki/src/support/known_issues.fr.po
index 3edd480..eb74754 100644
--- a/wiki/src/support/known_issues.fr.po
+++ b/wiki/src/support/known_issues.fr.po
@@ -1008,6 +1008,25 @@ msgstr ""
msgid "the search bar is enabled (it should be disabled)."
msgstr ""
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"keyboard_layout\"></a>\n"
+msgstr ""
+
+#. type: Title -
+#, no-wrap
+msgid "Keyboard layout is sometimes not applied\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"The keyboard layout selected in *Tails Greeter* is sometimes not applied if "
+"different from **English (US)**. Click on the [[keyboard layout|doc/"
+"first_steps/introduction_to_gnome_and_the_tails_desktop#keyboard_layout]] in "
+"the notification area to switch between English and the layout selected in "
+"*Tails Greeter*."
+msgstr ""
+
#, fuzzy
#~| msgid ""
#~| "Browser window resizing is in not reliable: [[!tails_ticket 6377]] and "
diff --git a/wiki/src/support/known_issues.mdwn b/wiki/src/support/known_issues.mdwn
index 0a1328e..f878268 100644
--- a/wiki/src/support/known_issues.mdwn
+++ b/wiki/src/support/known_issues.mdwn
@@ -426,3 +426,14 @@ theme for the Tor Browser, Unsafe Browser and I2P Browser is incorrect
* the default Firefox tab bar is used (it should be positioned above
the URL bar, and use a "square" style), and
* the search bar is enabled (it should be disabled).
+
+<a id="keyboard_layout"></a>
+
+Keyboard layout is sometimes not applied
+----------------------------------------
+
+The keyboard layout selected in *Tails Greeter* is sometimes not
+applied if different from **English (US)**. Click on the
+[[keyboard layout|doc/first_steps/introduction_to_gnome_and_the_tails_desktop#keyboard_layout]]
+in the notification area to switch between English and the layout
+selected in *Tails Greeter*.
diff --git a/wiki/src/support/known_issues.pt.po b/wiki/src/support/known_issues.pt.po
index 29f249a..91ce614 100644
--- a/wiki/src/support/known_issues.pt.po
+++ b/wiki/src/support/known_issues.pt.po
@@ -958,6 +958,25 @@ msgstr ""
msgid "the search bar is enabled (it should be disabled)."
msgstr ""
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"keyboard_layout\"></a>\n"
+msgstr ""
+
+#. type: Title -
+#, no-wrap
+msgid "Keyboard layout is sometimes not applied\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"The keyboard layout selected in *Tails Greeter* is sometimes not applied if "
+"different from **English (US)**. Click on the [[keyboard layout|doc/"
+"first_steps/introduction_to_gnome_and_the_tails_desktop#keyboard_layout]] in "
+"the notification area to switch between English and the layout selected in "
+"*Tails Greeter*."
+msgstr ""
+
#, fuzzy
#~| msgid ""
#~| "Browser window resizing is in not reliable: [[!tails_ticket 6377]] and "
diff --git a/wiki/src/upgrade/v1/Tails/1.3.2/i386/alpha/upgrades.yml b/wiki/src/upgrade/v1/Tails/1.3.2/i386/alpha/upgrades.yml
index cd782bd..ea490a7 100644
--- a/wiki/src/upgrade/v1/Tails/1.3.2/i386/alpha/upgrades.yml
+++ b/wiki/src/upgrade/v1/Tails/1.3.2/i386/alpha/upgrades.yml
@@ -4,17 +4,17 @@ channel: alpha
product-name: Tails
product-version: 1.3.2
upgrades:
-- details-url: https://tails.boum.org/news/test_1.4-rc1/
+- details-url: https://tails.boum.org/news/version_1.4/
type: major
upgrade-paths:
- target-files:
- - sha256: 7815dca9ba9fae0b828fefd40addeb10b694c9371041457e217b26daed6779a0
- size: 962357760
- url: http://dl.amnesia.boum.org/tails/alpha/tails-i386-1.4~rc1/tails-i386-1.4~rc1.iso
+ - sha256: 339c8712768c831e59c4b1523002b83ccb98a4fe62f6a221fee3a15e779ca65d
+ size: 970584064
+ url: http://dl.amnesia.boum.org/tails/stable/tails-i386-1.4/tails-i386-1.4.iso
type: full
- target-files:
- - sha256: 6109a70f253d11cbc51d462075c67b3edad7999d5536941a77a17a762048f387
- size: 285573120
- url: http://dl.amnesia.boum.org/tails/alpha/iuk/Tails_i386_1.3.2_to_1.4~rc1.iuk
+ - sha256: 77824d7ab8e89b6c54ed8405c4dd9d3b8a42befd10d5354eba0c97d978a4bfad
+ size: 291164160
+ url: http://dl.amnesia.boum.org/tails/stable/iuk/Tails_i386_1.3.2_to_1.4.iuk
type: incremental
- version: 1.4~rc1
+ version: '1.4'
diff --git a/wiki/src/upgrade/v1/Tails/1.3.2/i386/alpha/upgrades.yml.pgp b/wiki/src/upgrade/v1/Tails/1.3.2/i386/alpha/upgrades.yml.pgp
index 7d8fd43..9f837c0 100644
--- a/wiki/src/upgrade/v1/Tails/1.3.2/i386/alpha/upgrades.yml.pgp
+++ b/wiki/src/upgrade/v1/Tails/1.3.2/i386/alpha/upgrades.yml.pgp
@@ -1,16 +1,16 @@
-----BEGIN PGP SIGNATURE-----
-iQIcBAABCgAGBQJVRXxtAAoJEJj+xrx1Kj227zQP/Rro7EWSN69NKvpzFkpC1oFS
-hkuaXgi5+LT9oXArCVeA0NUyES4Xpt7ouAQ9pLKnQ8FmRpZ1kp8LPXyOTeRPsaLa
-b0MJjlEB2m+6j1jzaNvH77adxpMlbSkb198laBsWcr66w/ASRRfN+qg1tWG9dt4e
-qyibDcy0h6gXEvG+WL7ZP3mJahmsH819giEBXeo32XNIzYOOoSwh7TvKQMHa7ocN
-3uWMNA32YzIe61eBnj44i27wpiXouVKFpwcdDNR6gfMpxzL38rBc8Tf0pfNMmfe4
-enzaNLJKV6H8981mOkZRX4oV0Uxnjjt+tQsP+t787UP+NuliECxU2496+ikTwAB3
-UvFrTBik7m2y/rcbR1bOUGNpNjMOPu/Gf4o2Vp+6+YpEYhgK74DWLr/W82XJVoYt
-JsFdb4ZEpZkHfgiS0OYj0RkvqBmNkgs+x1KOqp4eLLXjC7B2e1MimeN7lmsb1D4K
-6r3wnhzn78nVUTbMaAVObxDkKSKh7kXBg/cg9BlTIvQ6KgNkZTlOfCJv48R7tdRM
-ImxzrDjz2rMi7XJmrnwAiIO6IPauBytKl9AePViauaZJtmg78wN+mOsuVxHena16
-x+fWx7/l5C5F9v5Veotndk866OXtmYHC/Dn1TVnYOM3VrcLLVAkWtCOktNTTO2hG
-IDK7HiSdSk0ba93FyOb3
-=4pwX
+iQIcBAABCgAGBQJVUZdnAAoJEJj+xrx1Kj22OLoP+QFFQFebg4bNCLi+mDsDWhbP
+CTnaUCiELZWE80NpqJ4gQIL0/yv0acsJaBstGBa4zpfIRJ4fy2YIBZmEu78/DyiU
+BlXb404SCnbwOE5k+/NOUCV9Rsg/Z0NdkofY/XTBcwsn3wKWl2xByEeclHhvG5sX
+z8oLrgvaQU+XmNdAWuXFPujxBxOP4k7SLSo3drDVTI9nhqtIju5N7ceWxTt6LlU/
+AjxXTYh4N2V683NEEjlvSoD5pJ8ES6olSZxvIUuPzJOeR55Sgv2qPowVN/6+Z4wj
+x12bdZYGR7R/ScGHzr+HlHIiQW/l55Wd/HL3CnVzcyfgs0q7plbEasNvQZu3ZV8D
+Rj5UiXLlWGqXBLQRhG9ICXzqoXBQxSGcoirn2+bNZPcexZFgax7r7YT25CAgRVp3
+Z9pmPHgo+sgBnsAnVVymE1Q4eJx4guSVcK+dcLpVexvfULWBzZbLpZhoEWBoOfbE
+LUUHNcZyTFo4xJ3ERyXOEhC37eer3uGPNY9D0YiUR5PJ27mjq3ho+iSRdIrjajjy
+stwc+dqPDcgK2TSl+3kT4E0ikerli47o9ufgTw01znYGYR+uLs28OK9uOMSlA/7j
+UFiK3yK+4Ci6GjbhxskF4rpuNCPmHNzhCKxDkW4T6KXzNQMAnlKzUAVWOuu2dUA5
+LQj/0pcKIzC3WxLH7BIw
+=FzLm
-----END PGP SIGNATURE-----
diff --git a/wiki/src/upgrade/v1/Tails/1.4~rc1/i386/alpha/upgrades.yml b/wiki/src/upgrade/v1/Tails/1.4~rc1/i386/alpha/upgrades.yml
index 983796d..2a765f6 100644
--- a/wiki/src/upgrade/v1/Tails/1.4~rc1/i386/alpha/upgrades.yml
+++ b/wiki/src/upgrade/v1/Tails/1.4~rc1/i386/alpha/upgrades.yml
@@ -3,3 +3,18 @@ build-target: i386
channel: alpha
product-name: Tails
product-version: 1.4~rc1
+upgrades:
+- details-url: https://tails.boum.org/news/version_1.4/
+ type: major
+ upgrade-paths:
+ - target-files:
+ - sha256: 339c8712768c831e59c4b1523002b83ccb98a4fe62f6a221fee3a15e779ca65d
+ size: 970584064
+ url: http://dl.amnesia.boum.org/tails/stable/tails-i386-1.4/tails-i386-1.4.iso
+ type: full
+ - target-files:
+ - sha256: 7b4e5c356b58dbe8166ea14a0f025cc1eaf14722e7504ec5bc2a1562c7d2c181
+ size: 87562240
+ url: http://dl.amnesia.boum.org/tails/stable/iuk/Tails_i386_1.4~rc1_to_1.4.iuk
+ type: incremental
+ version: '1.4'
diff --git a/wiki/src/upgrade/v1/Tails/1.4~rc1/i386/alpha/upgrades.yml.pgp b/wiki/src/upgrade/v1/Tails/1.4~rc1/i386/alpha/upgrades.yml.pgp
index 192dcce..9517cf7 100644
--- a/wiki/src/upgrade/v1/Tails/1.4~rc1/i386/alpha/upgrades.yml.pgp
+++ b/wiki/src/upgrade/v1/Tails/1.4~rc1/i386/alpha/upgrades.yml.pgp
@@ -1,16 +1,16 @@
-----BEGIN PGP SIGNATURE-----
-iQIcBAABCgAGBQJVDw6hAAoJEDyD3LUvaZxWv6cQANdiXNzwA6HRZwxeRqojf1jx
-6Tvb35UOV8P8mxywndczVM5oaxUAMgLkrK2Wn4X6q8YnOxAiX/Wf3ueP0/AppFCa
-XpeCGRMBVRXakUjLdKHVjIpdn5W8tE6STeVu7hXRyFxvjNKJY1loPuUiJoUiRSaJ
-sgh3fPFrRdvQVvClPmLFd/36fsZomyJMhxCtpU7RnMvcWCn6ig9oeX03dptfPNL3
-Iul05NykSmQL1Gtb8O55udtBAJhPG/IvKbOysOFn5VyJr2m3eReNYH5nNEFztyf4
-uZT8PLp19EwDuGfZ5q8QxjFzjjlSYgZQJ6q6bPOo49lXXlYXLCSLXz6VKMnxrtb1
-gL+GqrG99Yak//BVqAuApuV/LvGuWsohrNm2a6wUyooiociaDKz+cwYAxkrocd9R
-qORM5S5fURUgwXIJvdNzwOQs35KYEtpuYD8lw8tbN5mpghha1tgBj0noWyvvgq2u
-Hji7nZ7xnvnt3vYBjLJNmECB8a8BcvqYjFNsHD4BumL4uuYOghzPoKUCjnY3VcYO
-E4LXNIPaGN0N/ajTrGkV3QUHAMl86KeDLVzCwMH0OZfCn/gpDIDLb8LAbNlblbhZ
-Cn7Zxkc6S5wtxzNTaiZNdOLB6FOAGT3AvBH8gvorvUD79ZXAyPdRCM8zrsbF9Tpe
-BJYNa5pihGuUNxsTBQ+L
-=92bm
+iQIcBAABCgAGBQJVUPIUAAoJEJj+xrx1Kj22fgoP/Aj8CHNGq4MSADdsAoaY3XuJ
+JD1iP72jrQD94OxQFxFdeKIMeDFYblxuwMZ9fLfNVN9D3ZrxGU+7GQD1CXu3HZpR
+yYN7OZSSBONSAXEDiQWSRoZeEYtVCZAW1DMoGduACD/YUvsi1Set9KXGLu5jXd3+
+Q7q1lXQAtpGSPqsxbrwGN8NXewCLy33jDJUs3m1gomaYsU0teymSM5fgST8/dKcd
+4vJ6nIQgekqA36rtd6qvNqQlJKhKVaoFG5rrSQhsTn4U8LMCioiqVWPLmXwh/RdE
+YwKM1msmZ0jhLvr1Z4gWzyC/A2Jqo6ZmGOuS+7LaOlzWYG3dbrdquRsMQpLvvmgH
+8S3uUev0n0VWEHXpieRYv62NoHDODZXCV1JZBaBmPxy0h21jJWJTt7Uzzrlpd8Q8
+J3Vvg2vnUcRW72wl+WsdPFeK2yd4OXis6jJpuajED9QXrBIK1RcZLp9ifY+d7gdY
+AVmnOziMiLSr4SQDSMpPOs0Ly5VXxsjSGupERy8mK/2DLYfuFH5Td84nn+yL0/di
+B8H8uGG7Ya/QUU57mUx6+2aizRwAEu612HNO3kkQt755seQ92d5L5pR54V/sX2HX
++s/AMhOk/32c/MxyusHQc2JgU9FyGIiSBpy+Din6jMdPZElCvfI1zhvFG7Ixna8A
+eW+rASmGlM8r4JWj4KeG
+=ar1e
-----END PGP SIGNATURE-----