diff --git a/Build.PL b/Build.PL
index 3b3a1dbff092b0d4f48a4fc2e0b71e19f1888933..3020cc6b90abc1442d9b599774747646942a2c71 100644
--- a/Build.PL
+++ b/Build.PL
@@ -21,7 +21,7 @@ my %module_build_args = (
     "Tails developers <tails\@boum.org>"
   ],
   "dist_name" => "Tails-Persistence",
-  "dist_version" => "1.1.7",
+  "dist_version" => "1.1.8",
   "license" => "gpl",
   "module_name" => "Tails::Persistence",
   "recursive_test_files" => 1,
diff --git a/Changes b/Changes
index f9d15aa3ca051468856fa0296d7b9fa533f78047..65fca93c8a5d43f792a2d48caafefdc3d5d9da3a 100644
--- a/Changes
+++ b/Changes
@@ -1,11 +1,35 @@
 ==================================================
-Changes from 1743-06-23 00:00:00 +0000 to present.
+Changes from 1743-08-01 00:00:00 +0000 to present.
 ==================================================
 
 ------------------------------------------
-version 1.1.7 at 2017-04-06 18:32:15 +0000
+version 1.1.8 at 2017-05-15 11:53:20 +0000
 ------------------------------------------
 
+  Change: 9089d86dc7f925f2f4008dfffea6669de2fd67fc
+  Author: anonym <anonym@riseup.net>
+  Date : 2017-05-15 13:53:14 +0000
+
+    tails-persistent-setup 1.1.8 
+
+  Change: 930bc493f9f3f03ed2ad8f9b42eac74696c5abb4
+  Author: anonym <anonym@riseup.net>
+  Date : 2017-05-15 13:52:00 +0000
+
+    Do the Icedove → Thunderbird migration.
+
+    Will-fix: #12242 
+
+  Change: a88a8a88b90a2be25e10ea8838b06fb770f4cea5
+  Author: anonym <anonym@riseup.net>
+  Date : 2017-05-15 13:49:12 +0000
+
+    Import PO files from Transifex, update POT and PO files. 
+
+-------------------------------------
+version  at 2017-04-06 18:31:59 +0000
+-------------------------------------
+
   Change: d5ab6f632e118e22102822439207d065eee612ef
   Author: anonym <anonym@riseup.net>
   Date : 2017-04-06 20:31:59 +0000
diff --git a/META.json b/META.json
index e0fc798509ce66efaf3cec14641ee564b0ff6943..285f59eebe2105ae49568f7df90f395738c4daf5 100644
--- a/META.json
+++ b/META.json
@@ -79,7 +79,7 @@
          "url" : "git://git.immerda.ch/tails/persistence-setup.git"
       }
    },
-   "version" : "1.1.7",
+   "version" : "1.1.8",
    "x_serialization_backend" : "JSON::XS version 3.03"
 }
 
diff --git a/META.yml b/META.yml
index dd73772692e67c980ba593793211d0f92fb4a651..245f93a8f47d5761e28130a605a2f1048377d0e9 100644
--- a/META.yml
+++ b/META.yml
@@ -47,5 +47,5 @@ requires:
 resources:
   homepage: https://tails.boum.org/
   repository: git://git.immerda.ch/tails/persistence-setup.git
-version: 1.1.7
+version: 1.1.8
 x_serialization_backend: 'YAML::Tiny version 1.70'
diff --git a/bin/tails-persistence-setup b/bin/tails-persistence-setup
index e323ed7962c945f59a822d2253fe8243948cb06a..bef571db2af4e0d1c3605ef466c2f724b35c7682 100755
--- a/bin/tails-persistence-setup
+++ b/bin/tails-persistence-setup
@@ -6,7 +6,7 @@ tails-persistence-setup - setup Tails persistent storage
 
 =head1 VERSION
 
-Version 1.1.7
+Version 1.1.8
 
 =cut
 
@@ -14,7 +14,7 @@ use strict;
 use warnings FATAL => 'all';
 use 5.10.1;
 
-our $VERSION = '1.1.7';
+our $VERSION = '1.1.8';
 
 use FindBin;
 use lib "$FindBin::Bin/../lib";
diff --git a/lib/Tails/Persistence/Configuration/Presets.pm b/lib/Tails/Persistence/Configuration/Presets.pm
index 1f6bfd9405b9dc602855dbd682273d7e3e576e35..3db179e9a66bca83c5c56bc2c172c9249c6f2067 100644
--- a/lib/Tails/Persistence/Configuration/Presets.pm
+++ b/lib/Tails/Persistence/Configuration/Presets.pm
@@ -85,14 +85,14 @@ method _build__presets {
             icon_name   => 'pidgin',
         },
         {
-            name        => $self->encoding->decode(gettext(q{Icedove})),
+            name        => $self->encoding->decode(gettext(q{Thunderbird})),
             description => $self->encoding->decode(gettext(
-                q{Icedove profiles and locally stored email}
+                q{Thunderbird profiles and locally stored email}
             )),
-            destination => '/home/amnesia/.icedove',
-            options     => [ 'source=icedove' ],
+            destination => '/home/amnesia/.thunderbird',
+            options     => [ 'source=thunderbird' ],
             enabled     => 0,
-            icon_name   => 'icedove',
+            icon_name   => 'thunderbird',
         },
         {
             name        => $self->encoding->decode(gettext(q{GNOME Keyring})),
diff --git a/po/ar.mo b/po/ar.mo
index d95713d87d824a5be36b3389efabd7423866ae4c..7860e1b9707c989b6dee088f9808fbbd43a8163b 100644
Binary files a/po/ar.mo and b/po/ar.mo differ
diff --git a/po/ar.po b/po/ar.po
index 86dfaa51893aa12eb5eb78c707dfac7c34175401..9e028497b261524399796a97f85eb20861d4bcbe 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers <tails@boum.org>\n"
-"POT-Creation-Date: 2016-05-25 02:27+0200\n"
+"POT-Creation-Date: 2017-05-15 13:51+0200\n"
 "PO-Revision-Date: 2016-09-24 07:07+0000\n"
 "Last-Translator: Singapore Goldindor\n"
 "Language-Team: Arabic (http://www.transifex.com/otf/torproject/language/"
@@ -62,12 +62,12 @@ msgid "Pidgin profiles and OTR keyring"
 msgstr "الحسابات الشخصية  في Pidgin و OTR keyring"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:88
-msgid "Icedove"
-msgstr "Icedove"
+msgid "Thunderbird"
+msgstr "Thunderbird"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:90
-msgid "Icedove profiles and locally stored email"
-msgstr "الحسابات الشخصية والبريد الإلكتروني المخزن محليا في Icedove."
+msgid "Thunderbird profiles and locally stored email"
+msgstr "الحسابات الشخصية والبريد الإلكتروني المخزن محليا في Thunderbird."
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:98
 msgid "GNOME Keyring"
diff --git a/po/az.mo b/po/az.mo
index 28ac9d705b4cee7c6cf583c641852c0d7c44449e..547c9a1711a86a3fb14dbfc76deedf32d947ecfb 100644
Binary files a/po/az.mo and b/po/az.mo differ
diff --git a/po/az.po b/po/az.po
index 4347390995733bf7d54b4680208b7d77ee1c8bdc..97ed7a3c8cc92fb2ba4e86175ce65a93638fd8a3 100644
--- a/po/az.po
+++ b/po/az.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers <tails@boum.org>\n"
-"POT-Creation-Date: 2016-05-25 02:27+0200\n"
+"POT-Creation-Date: 2017-05-15 13:51+0200\n"
 "PO-Revision-Date: 2014-12-30 14:21+0000\n"
 "Last-Translator: E <ehuseynzade@gmail.com>\n"
 "Language-Team: Azerbaijani (http://www.transifex.com/projects/p/torproject/"
@@ -52,12 +52,12 @@ msgid "Pidgin profiles and OTR keyring"
 msgstr "Pidgin profillər və OTR açar üzüyü"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:88
-msgid "Icedove"
+msgid "Thunderbird"
 msgstr ""
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:90
 #, fuzzy
-msgid "Icedove profiles and locally stored email"
+msgid "Thunderbird profiles and locally stored email"
 msgstr "Claws Mail profillər və yerli saxlanmış email"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:98
diff --git a/po/bg.mo b/po/bg.mo
index 1a0b44c14363b12b3f586b639078453e745767a8..88413ec33da90c16693d4c874a6ec1ba409123c0 100644
Binary files a/po/bg.mo and b/po/bg.mo differ
diff --git a/po/bg.po b/po/bg.po
index ea6b1d50a90222b9be5c0a3bc4a684ad6551e152..359916b150a04cd1430e31f8e49faada77e1afa3 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers <tails@boum.org>\n"
-"POT-Creation-Date: 2016-05-25 02:27+0200\n"
+"POT-Creation-Date: 2017-05-15 13:51+0200\n"
 "PO-Revision-Date: 2016-06-06 08:15+0000\n"
 "Last-Translator: carolyn <carolyn@anhalt.org>\n"
 "Language-Team: Bulgarian (http://www.transifex.com/otf/torproject/language/"
@@ -60,12 +60,12 @@ msgid "Pidgin profiles and OTR keyring"
 msgstr "Pidgin профили и OTR ключодържател"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:88
-msgid "Icedove"
-msgstr "Icedove"
+msgid "Thunderbird"
+msgstr "Thunderbird"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:90
-msgid "Icedove profiles and locally stored email"
-msgstr "Icedove профили и локално съхранени мейли."
+msgid "Thunderbird profiles and locally stored email"
+msgstr "Thunderbird профили и локално съхранени мейли."
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:98
 msgid "GNOME Keyring"
diff --git a/po/ca.mo b/po/ca.mo
index c90922db901364443b6c86193f6f0288d100bede..0e5c5e9de781d41920984863df0dfb79754b4dd2 100644
Binary files a/po/ca.mo and b/po/ca.mo differ
diff --git a/po/ca.po b/po/ca.po
index 2aa2b5736f54954d1554d52eb4e409fa9015886e..d4e6f4604c25f3b47bffa07ab84843b484ec5285 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers <tails@boum.org>\n"
-"POT-Creation-Date: 2016-05-25 02:27+0200\n"
+"POT-Creation-Date: 2017-05-15 13:51+0200\n"
 "PO-Revision-Date: 2016-06-06 08:15+0000\n"
 "Last-Translator: carolyn <carolyn@anhalt.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/otf/torproject/language/"
@@ -54,12 +54,12 @@ msgid "Pidgin profiles and OTR keyring"
 msgstr "Perfils de Pidgin i clauer d'OTR"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:88
-msgid "Icedove"
-msgstr "Icedove"
+msgid "Thunderbird"
+msgstr "Thunderbird"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:90
-msgid "Icedove profiles and locally stored email"
-msgstr "Perfils de l'Icedove i correu emmagatzemat localment."
+msgid "Thunderbird profiles and locally stored email"
+msgstr "Perfils de l'Thunderbird i correu emmagatzemat localment."
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:98
 msgid "GNOME Keyring"
diff --git a/po/cs.mo b/po/cs.mo
index 94c8091b364655178fee701242beffcc7de8c07a..3201770ce8e73ff7cdde0f9086feb6af836d1d13 100644
Binary files a/po/cs.mo and b/po/cs.mo differ
diff --git a/po/cs.po b/po/cs.po
index ba9fd4f81a573fbbba71751048a01a78e6fbcb87..d259a2279c890764e1a1f4f31ab56b427bb26678 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers <tails@boum.org>\n"
-"POT-Creation-Date: 2016-05-25 02:27+0200\n"
+"POT-Creation-Date: 2017-05-15 13:51+0200\n"
 "PO-Revision-Date: 2016-06-23 08:43+0000\n"
 "Last-Translator: Jiří Vírava <appukonrad@gmail.com>\n"
 "Language-Team: Czech (http://www.transifex.com/otf/torproject/language/cs/)\n"
@@ -56,12 +56,12 @@ msgid "Pidgin profiles and OTR keyring"
 msgstr "Pidgin profily a OTR klíčenka"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:88
-msgid "Icedove"
-msgstr "Icedove"
+msgid "Thunderbird"
+msgstr "Thunderbird"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:90
-msgid "Icedove profiles and locally stored email"
-msgstr "Icedove profily a místní uložené emaily"
+msgid "Thunderbird profiles and locally stored email"
+msgstr "Thunderbird profily a místní uložené emaily"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:98
 msgid "GNOME Keyring"
diff --git a/po/da.mo b/po/da.mo
index d44a77c476928511df57460c2f873b39fcf70193..d87196eccd1c6ae93d5743a69d9da65f3762c031 100644
Binary files a/po/da.mo and b/po/da.mo differ
diff --git a/po/da.po b/po/da.po
index e19cba8599a5328d8cdc78f8ba82f080c2b45ed1..23e312925ccfd59dfebb300798ba22d18d41a50f 100644
--- a/po/da.po
+++ b/po/da.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers <tails@boum.org>\n"
-"POT-Creation-Date: 2016-05-25 02:27+0200\n"
+"POT-Creation-Date: 2017-05-15 13:51+0200\n"
 "PO-Revision-Date: 2017-01-19 09:13+0000\n"
 "Last-Translator: scootergrisen\n"
 "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/"
@@ -58,12 +58,12 @@ msgid "Pidgin profiles and OTR keyring"
 msgstr "Pidgin profiler og OTR nøglering"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:88
-msgid "Icedove"
-msgstr "Icedove"
+msgid "Thunderbird"
+msgstr "Thunderbird"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:90
-msgid "Icedove profiles and locally stored email"
-msgstr "Icedove profiler og lokalt gemt e-mail"
+msgid "Thunderbird profiles and locally stored email"
+msgstr "Thunderbird profiler og lokalt gemt e-mail"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:98
 msgid "GNOME Keyring"
diff --git a/po/de.mo b/po/de.mo
index 7fd87b373a713d0d0bf246960f4257b851ca6885..864c2800b364e07b81ad485421016d717fbd85db 100644
Binary files a/po/de.mo and b/po/de.mo differ
diff --git a/po/de.po b/po/de.po
index 8f957c0865aa42a0d19f79a37a8a9d26f86a5392..565ae5df57d5149f47853ed20842528d41db61aa 100644
--- a/po/de.po
+++ b/po/de.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers <tails@boum.org>\n"
-"POT-Creation-Date: 2016-05-25 02:27+0200\n"
+"POT-Creation-Date: 2017-05-15 13:51+0200\n"
 "PO-Revision-Date: 2016-06-06 08:15+0000\n"
 "Last-Translator: carolyn <carolyn@anhalt.org>\n"
 "Language-Team: German (http://www.transifex.com/otf/torproject/language/"
@@ -65,12 +65,12 @@ msgid "Pidgin profiles and OTR keyring"
 msgstr "Pidgin-Profile und OTR-Schlüsselbund"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:88
-msgid "Icedove"
-msgstr "Icedove"
+msgid "Thunderbird"
+msgstr "Thunderbird"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:90
-msgid "Icedove profiles and locally stored email"
-msgstr "Icedove-Profile und lokal gespeicherte E-Mails"
+msgid "Thunderbird profiles and locally stored email"
+msgstr "Thunderbird-Profile und lokal gespeicherte E-Mails"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:98
 msgid "GNOME Keyring"
diff --git a/po/el.mo b/po/el.mo
index e29948964a1553bc6b4925908c5672ffc6aa1be6..293dd36ec076882009f0569e7eadf902f96512e8 100644
Binary files a/po/el.mo and b/po/el.mo differ
diff --git a/po/el.po b/po/el.po
index b7e4fd841eb7b0f866355668590da4f685afe3c0..c3904ef0e01e90050314d5a3946cc39a9325ea13 100644
--- a/po/el.po
+++ b/po/el.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers <tails@boum.org>\n"
-"POT-Creation-Date: 2016-05-25 02:27+0200\n"
+"POT-Creation-Date: 2017-05-15 13:51+0200\n"
 "PO-Revision-Date: 2016-06-06 08:15+0000\n"
 "Last-Translator: carolyn <carolyn@anhalt.org>\n"
 "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n"
@@ -58,12 +58,12 @@ msgid "Pidgin profiles and OTR keyring"
 msgstr "Προφίλ του Pidgin και κλειδοθήκη OTR "
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:88
-msgid "Icedove"
-msgstr "Icedove"
+msgid "Thunderbird"
+msgstr "Thunderbird"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:90
-msgid "Icedove profiles and locally stored email"
-msgstr "Προφίλ Icedove και τοπικά αποθηκευμένα email"
+msgid "Thunderbird profiles and locally stored email"
+msgstr "Προφίλ Thunderbird και τοπικά αποθηκευμένα email"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:98
 msgid "GNOME Keyring"
diff --git a/po/en_GB.mo b/po/en_GB.mo
index 70865bf5d610d6c6a9ce050f796cf78fbb1500f8..5ff4e5ec8ccca2b9950dd0b95169ae60225c68e0 100644
Binary files a/po/en_GB.mo and b/po/en_GB.mo differ
diff --git a/po/en_GB.po b/po/en_GB.po
index b1d91ead721592093a6a04b40a8c6188d11cf34e..70e05f89074d655b64adabfbcc795aaccdaadc62 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers <tails@boum.org>\n"
-"POT-Creation-Date: 2016-05-25 02:27+0200\n"
+"POT-Creation-Date: 2017-05-15 13:51+0200\n"
 "PO-Revision-Date: 2016-06-06 08:15+0000\n"
 "Last-Translator: carolyn <carolyn@anhalt.org>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/otf/"
@@ -55,12 +55,12 @@ msgid "Pidgin profiles and OTR keyring"
 msgstr "Pidgin profiles and OTR keyring"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:88
-msgid "Icedove"
-msgstr "Icedove"
+msgid "Thunderbird"
+msgstr "Thunderbird"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:90
-msgid "Icedove profiles and locally stored email"
-msgstr "Icedove profiles and locally stored email"
+msgid "Thunderbird profiles and locally stored email"
+msgstr "Thunderbird profiles and locally stored email"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:98
 msgid "GNOME Keyring"
diff --git a/po/es.mo b/po/es.mo
index d80958f06302775511e428acf71aa617f21db9e1..2649af0817dbcf20488b0d8b9d87c4a72c021a4d 100644
Binary files a/po/es.mo and b/po/es.mo differ
diff --git a/po/es.po b/po/es.po
index ddf057b05d7ca0f57e5e04113243937dbfdac9ed..a3a0771c4ee4d4b87c3dbcd0782754c7bc412144 100644
--- a/po/es.po
+++ b/po/es.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers <tails@boum.org>\n"
-"POT-Creation-Date: 2016-05-25 02:27+0200\n"
+"POT-Creation-Date: 2017-05-15 13:51+0200\n"
 "PO-Revision-Date: 2017-02-09 09:10+0000\n"
 "Last-Translator: Emma Peel\n"
 "Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/"
@@ -57,12 +57,12 @@ msgstr ""
 "Perfiles de Pidgin y grupo de claves ('keyring') OTR (cifrado Off The Record)"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:88
-msgid "Icedove"
-msgstr "Icedove"
+msgid "Thunderbird"
+msgstr "Thunderbird"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:90
-msgid "Icedove profiles and locally stored email"
-msgstr "Perfiles de Icedove y correo electrónico almacenado localmente"
+msgid "Thunderbird profiles and locally stored email"
+msgstr "Perfiles de Thunderbird y correo electrónico almacenado localmente"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:98
 msgid "GNOME Keyring"
diff --git a/po/eu.mo b/po/eu.mo
index d18e5fda8017e2c1d3675e43e40df7c42a926255..58ea3c532ce4f95ff0d19eb2e47b159e4d0cc4cf 100644
Binary files a/po/eu.mo and b/po/eu.mo differ
diff --git a/po/eu.po b/po/eu.po
index 7512ce7fecaacf886f0b605c343ff5970c5c02eb..e19e785866136a3cf300353c16baef0e90730521 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers <tails@boum.org>\n"
-"POT-Creation-Date: 2016-05-25 02:27+0200\n"
+"POT-Creation-Date: 2017-05-15 13:51+0200\n"
 "PO-Revision-Date: 2016-06-06 08:15+0000\n"
 "Last-Translator: carolyn <carolyn@anhalt.org>\n"
 "Language-Team: Basque (http://www.transifex.com/otf/torproject/language/"
@@ -59,12 +59,12 @@ msgid "Pidgin profiles and OTR keyring"
 msgstr "Pidgin profilak eta OTR gako sorta"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:88
-msgid "Icedove"
-msgstr "Icedove"
+msgid "Thunderbird"
+msgstr "Thunderbird"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:90
-msgid "Icedove profiles and locally stored email"
-msgstr "Icedove profilak eta bertan gordetako posta elektronikoa"
+msgid "Thunderbird profiles and locally stored email"
+msgstr "Thunderbird profilak eta bertan gordetako posta elektronikoa"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:98
 msgid "GNOME Keyring"
diff --git a/po/fa.mo b/po/fa.mo
index 03951a5fa686c70a5f1dca8120c11cacb2d3ea67..3c1ab173b55d472256f9682566b8556c265a46b6 100644
Binary files a/po/fa.mo and b/po/fa.mo differ
diff --git a/po/fa.po b/po/fa.po
index ed3afaf5141d3f1fba3978d69c7b73bb3fae2fa9..8d75b0afddc620b9c1ab1a618677007d2d9f7c4f 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers <tails@boum.org>\n"
-"POT-Creation-Date: 2016-05-25 02:27+0200\n"
+"POT-Creation-Date: 2017-05-15 13:51+0200\n"
 "PO-Revision-Date: 2016-06-06 08:15+0000\n"
 "Last-Translator: carolyn <carolyn@anhalt.org>\n"
 "Language-Team: Persian (http://www.transifex.com/otf/torproject/language/"
@@ -59,12 +59,12 @@ msgid "Pidgin profiles and OTR keyring"
 msgstr "نمايه‌ها و جاكليدى پيجين"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:88
-msgid "Icedove"
-msgstr "Icedove"
+msgid "Thunderbird"
+msgstr "Thunderbird"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:90
-msgid "Icedove profiles and locally stored email"
-msgstr "نمايه‌ها و اى‌ميل‌هاى ذخيره‌شده‌ی Icedove"
+msgid "Thunderbird profiles and locally stored email"
+msgstr "نمايه‌ها و اى‌ميل‌هاى ذخيره‌شده‌ی Thunderbird"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:98
 msgid "GNOME Keyring"
diff --git a/po/fi.mo b/po/fi.mo
index cfc1f55f3611ad3f10c3328341b4bb5f3b6cb12f..e873f188c048fee778c431fcfba3d782be74b1bb 100644
Binary files a/po/fi.mo and b/po/fi.mo differ
diff --git a/po/fi.po b/po/fi.po
index f614e54662cedd23c75fd533400b14a6abbfbc94..614226ddc51c61ea05f8a897de1686b3ca52ceca 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers <tails@boum.org>\n"
-"POT-Creation-Date: 2016-05-25 02:27+0200\n"
+"POT-Creation-Date: 2017-05-15 13:51+0200\n"
 "PO-Revision-Date: 2016-08-06 10:15+0000\n"
 "Last-Translator: Thomas <lab777ee@hotmail.com>\n"
 "Language-Team: Finnish (http://www.transifex.com/otf/torproject/language/"
@@ -57,12 +57,12 @@ msgid "Pidgin profiles and OTR keyring"
 msgstr "Pidgin-profiilit ja OTR-avaimet"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:88
-msgid "Icedove"
-msgstr "Icedove"
+msgid "Thunderbird"
+msgstr "Thunderbird"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:90
-msgid "Icedove profiles and locally stored email"
-msgstr "Icedove-profiilit ja paikallisesti tallennetut sähköpostit"
+msgid "Thunderbird profiles and locally stored email"
+msgstr "Thunderbird-profiilit ja paikallisesti tallennetut sähköpostit"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:98
 msgid "GNOME Keyring"
diff --git a/po/fr.mo b/po/fr.mo
index 4b6ff76b5cdb1e64bcff86d842ec79e39009d506..da72c8161827f3ab2116ea7bb651165de658df47 100644
Binary files a/po/fr.mo and b/po/fr.mo differ
diff --git a/po/fr.po b/po/fr.po
index 9a34da762e781646573501ff1a2d5361a7efac6f..8ef2d4b9778a059d296c06ac3a2c56a18e19ab99 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers <tails@boum.org>\n"
-"POT-Creation-Date: 2016-05-25 02:27+0200\n"
+"POT-Creation-Date: 2017-05-15 13:51+0200\n"
 "PO-Revision-Date: 2016-12-22 17:02+0000\n"
 "Last-Translator: French language coordinator <french.translation@rbox.me>\n"
 "Language-Team: French (http://www.transifex.com/otf/torproject/language/"
@@ -66,12 +66,12 @@ msgid "Pidgin profiles and OTR keyring"
 msgstr "Profils Pidgin et trousseau de clés OTR"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:88
-msgid "Icedove"
-msgstr "Icedove"
+msgid "Thunderbird"
+msgstr "Thunderbird"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:90
-msgid "Icedove profiles and locally stored email"
-msgstr "Profils Icedove et courriel stockés localement"
+msgid "Thunderbird profiles and locally stored email"
+msgstr "Profils Thunderbird et courriel stockés localement"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:98
 msgid "GNOME Keyring"
diff --git a/po/fr_CA.mo b/po/fr_CA.mo
index 2df5c910726885b7f5c2d875087fcf161bffb5ec..681a8928a0d6a580f7f0d1aabaeac77e984ef7a5 100644
Binary files a/po/fr_CA.mo and b/po/fr_CA.mo differ
diff --git a/po/fr_CA.po b/po/fr_CA.po
index 7c9d78121a220869c8c5e918b037b233003de809..34e78bc064ca602961fba08d296e00e34798c09e 100644
--- a/po/fr_CA.po
+++ b/po/fr_CA.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers <tails@boum.org>\n"
-"POT-Creation-Date: 2016-05-25 02:27+0200\n"
+"POT-Creation-Date: 2017-05-15 13:51+0200\n"
 "PO-Revision-Date: 2016-12-16 18:51+0000\n"
 "Last-Translator: French language coordinator <french.translation@rbox.me>\n"
 "Language-Team: French (Canada) (http://www.transifex.com/otf/torproject/"
@@ -60,12 +60,12 @@ msgid "Pidgin profiles and OTR keyring"
 msgstr "Profils Pidgin et trousseau de clés OTR"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:88
-msgid "Icedove"
-msgstr "Icedove"
+msgid "Thunderbird"
+msgstr "Thunderbird"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:90
-msgid "Icedove profiles and locally stored email"
-msgstr "Profils Icedove et courriel stockés localement"
+msgid "Thunderbird profiles and locally stored email"
+msgstr "Profils Thunderbird et courriel stockés localement"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:98
 msgid "GNOME Keyring"
diff --git a/po/gl.mo b/po/gl.mo
index 152ed8453428bafe6f131e3b5be87a9c4bc32436..50ba4329b684a0526c939a6c7c0bbdc2875ddabd 100644
Binary files a/po/gl.mo and b/po/gl.mo differ
diff --git a/po/gl.po b/po/gl.po
index dc994c6d73df16dd49e21ec79b91334018f2a5c6..b3a769f1f0327ade7c64d063f182fe38324ede09 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers <tails@boum.org>\n"
-"POT-Creation-Date: 2016-05-25 02:27+0200\n"
+"POT-Creation-Date: 2017-05-15 13:51+0200\n"
 "PO-Revision-Date: 2016-06-06 08:15+0000\n"
 "Last-Translator: carolyn <carolyn@anhalt.org>\n"
 "Language-Team: Galician (http://www.transifex.com/otf/torproject/language/"
@@ -58,12 +58,12 @@ msgid "Pidgin profiles and OTR keyring"
 msgstr "Perfís Pidgin e anel de chaves OTR"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:88
-msgid "Icedove"
-msgstr "Icedove"
+msgid "Thunderbird"
+msgstr "Thunderbird"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:90
-msgid "Icedove profiles and locally stored email"
-msgstr "Perfís Icedove i email almacenado localmente"
+msgid "Thunderbird profiles and locally stored email"
+msgstr "Perfís Thunderbird i email almacenado localmente"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:98
 msgid "GNOME Keyring"
diff --git a/po/he.mo b/po/he.mo
index 9163b693af9038be3dd5c1ea2fe3f417d91c54bd..c40d23af5332e2d4b08922fadf926f64472b704d 100644
Binary files a/po/he.mo and b/po/he.mo differ
diff --git a/po/he.po b/po/he.po
index 4a452931addff9e525766dbcba294dd8a9d3da14..1abd2cee2e24f3cdcd5312914ae767e082188dc0 100644
--- a/po/he.po
+++ b/po/he.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers <tails@boum.org>\n"
-"POT-Creation-Date: 2016-05-25 02:27+0200\n"
+"POT-Creation-Date: 2017-05-15 13:51+0200\n"
 "PO-Revision-Date: 2016-06-06 08:15+0000\n"
 "Last-Translator: carolyn <carolyn@anhalt.org>\n"
 "Language-Team: Hebrew (http://www.transifex.com/otf/torproject/language/"
@@ -55,12 +55,12 @@ msgid "Pidgin profiles and OTR keyring"
 msgstr "פרופילי Pidgin ומחזיקי מפתחות OTR"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:88
-msgid "Icedove"
-msgstr "Icedove"
+msgid "Thunderbird"
+msgstr "Thunderbird"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:90
-msgid "Icedove profiles and locally stored email"
-msgstr "פרופילי Icedove ודוא\"ל שמור מקומי"
+msgid "Thunderbird profiles and locally stored email"
+msgstr "פרופילי Thunderbird ודוא\"ל שמור מקומי"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:98
 msgid "GNOME Keyring"
diff --git a/po/hr_HR.mo b/po/hr_HR.mo
index afabb5f929efc6c601bef3658545ac7f3a93f5ec..114b802da0baffaf44570f6d517048a2ba550da3 100644
Binary files a/po/hr_HR.mo and b/po/hr_HR.mo differ
diff --git a/po/hr_HR.po b/po/hr_HR.po
index c99d2d88f2ea615848f5e68db34107439a828019..c01afa6ae78324590981129346cbd537f94f30b7 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers <tails@boum.org>\n"
-"POT-Creation-Date: 2016-05-25 02:27+0200\n"
+"POT-Creation-Date: 2017-05-15 13:51+0200\n"
 "PO-Revision-Date: 2016-09-01 08:13+0000\n"
 "Last-Translator: Igor <lyricaltumor@gmail.com>\n"
 "Language-Team: Croatian (Croatia) (http://www.transifex.com/otf/torproject/"
@@ -56,12 +56,12 @@ msgid "Pidgin profiles and OTR keyring"
 msgstr "Pidgin profili i OTR prsten ključeva"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:88
-msgid "Icedove"
-msgstr "Icedove"
+msgid "Thunderbird"
+msgstr "Thunderbird"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:90
-msgid "Icedove profiles and locally stored email"
-msgstr "Icedove profili i lokalno pohranjen email"
+msgid "Thunderbird profiles and locally stored email"
+msgstr "Thunderbird profili i lokalno pohranjen email"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:98
 msgid "GNOME Keyring"
diff --git a/po/hu.mo b/po/hu.mo
index b88d77a72009701d6a5dca96c4861a348823bead..b94c0afad553b2571eb2df3671cdb17cb49aa942 100644
Binary files a/po/hu.mo and b/po/hu.mo differ
diff --git a/po/hu.po b/po/hu.po
index 8a9b3823b3bbd8ecca71e7cc5a1834288b993bd3..0f82891e377c5871f887b4921ab106c36798f667 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers <tails@boum.org>\n"
-"POT-Creation-Date: 2016-05-25 02:27+0200\n"
+"POT-Creation-Date: 2017-05-15 13:51+0200\n"
 "PO-Revision-Date: 2016-06-06 08:15+0000\n"
 "Last-Translator: carolyn <carolyn@anhalt.org>\n"
 "Language-Team: Hungarian (http://www.transifex.com/otf/torproject/language/"
@@ -58,12 +58,12 @@ msgid "Pidgin profiles and OTR keyring"
 msgstr "Pidgin profilok és OTR kulcstár"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:88
-msgid "Icedove"
-msgstr "Icedove"
+msgid "Thunderbird"
+msgstr "Thunderbird"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:90
-msgid "Icedove profiles and locally stored email"
-msgstr "Icedove profilok és helyileg tárolt email"
+msgid "Thunderbird profiles and locally stored email"
+msgstr "Thunderbird profilok és helyileg tárolt email"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:98
 msgid "GNOME Keyring"
diff --git a/po/id.mo b/po/id.mo
index bcd0139e4780447236403c43cbd7024a2365e2cd..950bfe93840984494d8eda7bb53379dfcd4e9f1e 100644
Binary files a/po/id.mo and b/po/id.mo differ
diff --git a/po/id.po b/po/id.po
index e063ae270b2facc0fa23f493f1a75857fe639edc..eec764582a016d6abbf6fe7ab1ef394e176acb61 100644
--- a/po/id.po
+++ b/po/id.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers <tails@boum.org>\n"
-"POT-Creation-Date: 2016-05-25 02:27+0200\n"
+"POT-Creation-Date: 2017-05-15 13:51+0200\n"
 "PO-Revision-Date: 2016-06-06 08:15+0000\n"
 "Last-Translator: carolyn <carolyn@anhalt.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/otf/torproject/language/"
@@ -60,12 +60,12 @@ msgid "Pidgin profiles and OTR keyring"
 msgstr "Profil Pidgin dan keyring OTR"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:88
-msgid "Icedove"
-msgstr "Icedove"
+msgid "Thunderbird"
+msgstr "Thunderbird"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:90
-msgid "Icedove profiles and locally stored email"
-msgstr "Profil-profil dan surel tersimpan lokal dari Icedove"
+msgid "Thunderbird profiles and locally stored email"
+msgstr "Profil-profil dan surel tersimpan lokal dari Thunderbird"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:98
 msgid "GNOME Keyring"
diff --git a/po/it.mo b/po/it.mo
index 3d30eee1a3265d66cdf58fc92e87773eb78e8694..20ee01e60055ea28b64e9ed4fa378321bb73fb83 100644
Binary files a/po/it.mo and b/po/it.mo differ
diff --git a/po/it.po b/po/it.po
index c74feaab8544446958924be3faee0687a5b864eb..e62bb52fe25dd19147e55e8e5bbf98455023a98e 100644
--- a/po/it.po
+++ b/po/it.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers <tails@boum.org>\n"
-"POT-Creation-Date: 2016-05-25 02:27+0200\n"
+"POT-Creation-Date: 2017-05-15 13:51+0200\n"
 "PO-Revision-Date: 2016-06-06 08:15+0000\n"
 "Last-Translator: carolyn <carolyn@anhalt.org>\n"
 "Language-Team: Italian (http://www.transifex.com/otf/torproject/language/"
@@ -61,12 +61,12 @@ msgid "Pidgin profiles and OTR keyring"
 msgstr "Profili Pidgin e portachiavi OTR"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:88
-msgid "Icedove"
-msgstr "Icedove"
+msgid "Thunderbird"
+msgstr "Thunderbird"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:90
-msgid "Icedove profiles and locally stored email"
-msgstr "Profili Icedove e email locali"
+msgid "Thunderbird profiles and locally stored email"
+msgstr "Profili Thunderbird e email locali"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:98
 msgid "GNOME Keyring"
diff --git a/po/ja.mo b/po/ja.mo
index 28d6449d84b8fb1c5d179148e20b27b09b5c5b97..d895a77e7815b04dbf375bdd244d8af144fb92ff 100644
Binary files a/po/ja.mo and b/po/ja.mo differ
diff --git a/po/ja.po b/po/ja.po
index 9354274a241be3ebd42d962959196e120fab6769..62e7475241da8856b1c390f06235224e38d80fc1 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers <tails@boum.org>\n"
-"POT-Creation-Date: 2016-05-25 02:27+0200\n"
+"POT-Creation-Date: 2017-05-15 13:51+0200\n"
 "PO-Revision-Date: 2016-06-06 08:15+0000\n"
 "Last-Translator: carolyn <carolyn@anhalt.org>\n"
 "Language-Team: Japanese (http://www.transifex.com/otf/torproject/language/"
@@ -56,12 +56,12 @@ msgid "Pidgin profiles and OTR keyring"
 msgstr "PidginのプロファイルとOTRキーホルダー"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:88
-msgid "Icedove"
-msgstr "Icedove"
+msgid "Thunderbird"
+msgstr "Thunderbird"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:90
-msgid "Icedove profiles and locally stored email"
-msgstr "Icedoveのプロファイルとローカルに保存された電子メール"
+msgid "Thunderbird profiles and locally stored email"
+msgstr "Thunderbirdのプロファイルとローカルに保存された電子メール"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:98
 msgid "GNOME Keyring"
diff --git a/po/km.mo b/po/km.mo
index 03e70ec9a1558badcc4458e71033be9b2fa3e278..ef14f72cad75819bbc677477a5fe502c26c70c79 100644
Binary files a/po/km.mo and b/po/km.mo differ
diff --git a/po/km.po b/po/km.po
index afddc81065d734e42915b26367fd8e13c5e24fc6..5d2652ba94b25dc7f92ce6e3027c6b0f11959c99 100644
--- a/po/km.po
+++ b/po/km.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers <tails@boum.org>\n"
-"POT-Creation-Date: 2016-05-25 02:27+0200\n"
+"POT-Creation-Date: 2017-05-15 13:51+0200\n"
 "PO-Revision-Date: 2014-04-21 16:22+0000\n"
 "Last-Translator: khoemsokhem <sokhem@open.org.kh>\n"
 "Language-Team: Khmer (http://www.transifex.com/projects/p/torproject/"
@@ -53,12 +53,12 @@ msgid "Pidgin profiles and OTR keyring"
 msgstr "ប្រវត្តិរូប Pidgin និង OTR keyring"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:88
-msgid "Icedove"
+msgid "Thunderbird"
 msgstr ""
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:90
 #, fuzzy
-msgid "Icedove profiles and locally stored email"
+msgid "Thunderbird profiles and locally stored email"
 msgstr "ប្រវត្តិរូប Claws Mail និង​អ៊ីមែល​រក្សាទុក​មូលដ្ឋាន"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:98
diff --git a/po/ko.mo b/po/ko.mo
index fa45ee77e73a607a57c932e2dc3e13b61f8589aa..2852b9e120b4b2d2521d60f09057cefe64b9a92b 100644
Binary files a/po/ko.mo and b/po/ko.mo differ
diff --git a/po/ko.po b/po/ko.po
index 913e8f380e40acfcff2056044589c61770b2dce2..9be2cf1298335e9fbc6fbf475c74199f76bff228 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers <tails@boum.org>\n"
-"POT-Creation-Date: 2016-05-25 02:27+0200\n"
+"POT-Creation-Date: 2017-05-15 13:51+0200\n"
 "PO-Revision-Date: 2016-06-06 08:15+0000\n"
 "Last-Translator: carolyn <carolyn@anhalt.org>\n"
 "Language-Team: Korean (http://www.transifex.com/otf/torproject/language/"
@@ -55,12 +55,12 @@ msgid "Pidgin profiles and OTR keyring"
 msgstr "Pidgin 프로필 및 OTR 키홀더"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:88
-msgid "Icedove"
-msgstr "Icedove"
+msgid "Thunderbird"
+msgstr "Thunderbird"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:90
-msgid "Icedove profiles and locally stored email"
-msgstr "Icedove 프로필과 로컬 저장소에 저장된 이메일"
+msgid "Thunderbird profiles and locally stored email"
+msgstr "Thunderbird 프로필과 로컬 저장소에 저장된 이메일"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:98
 msgid "GNOME Keyring"
diff --git a/po/lv.mo b/po/lv.mo
index 8d1bc671744e72ea7d28236c8b45a63f0f32814c..343311cd5b546dba6874abc165c6cf343d063e41 100644
Binary files a/po/lv.mo and b/po/lv.mo differ
diff --git a/po/lv.po b/po/lv.po
index 1bf895239ddcf0261ebb414332d7a1801270fb4c..45392900fdb336dc2d39d7187f67ec76d686287e 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers <tails@boum.org>\n"
-"POT-Creation-Date: 2016-05-25 02:27+0200\n"
+"POT-Creation-Date: 2017-05-15 13:51+0200\n"
 "PO-Revision-Date: 2016-06-06 08:15+0000\n"
 "Last-Translator: carolyn <carolyn@anhalt.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/otf/torproject/language/"
@@ -54,12 +54,12 @@ msgid "Pidgin profiles and OTR keyring"
 msgstr "Pidžinvalodu profili un OTR atslēgu turētājs"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:88
-msgid "Icedove"
-msgstr "Icedove"
+msgid "Thunderbird"
+msgstr "Thunderbird"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:90
-msgid "Icedove profiles and locally stored email"
-msgstr "Icedove profili un lokāli saglabāts e-pasts"
+msgid "Thunderbird profiles and locally stored email"
+msgstr "Thunderbird profili un lokāli saglabāts e-pasts"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:98
 msgid "GNOME Keyring"
diff --git a/po/nb.mo b/po/nb.mo
index 11c9705263872bb7beebbec55f19674e359d372f..7bfba115c000aec82065e68e713fe84959354fd5 100644
Binary files a/po/nb.mo and b/po/nb.mo differ
diff --git a/po/nb.po b/po/nb.po
index 4b1952093d0cbde49195d8a029b38e7adeafd4e0..45bd0a95d2a926e8b0060961f858d419cc5eac38 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers <tails@boum.org>\n"
-"POT-Creation-Date: 2016-05-25 02:27+0200\n"
+"POT-Creation-Date: 2017-05-15 13:51+0200\n"
 "PO-Revision-Date: 2017-02-12 01:58+0000\n"
 "Last-Translator: Allan Nordhøy <epost@anotheragency.no>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/otf/torproject/"
@@ -56,12 +56,12 @@ msgid "Pidgin profiles and OTR keyring"
 msgstr "Pidgin-profiler, og OTR-nøkkelring"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:88
-msgid "Icedove"
-msgstr "Icedove"
+msgid "Thunderbird"
+msgstr "Thunderbird"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:90
-msgid "Icedove profiles and locally stored email"
-msgstr "Icedove-profiler og lokalt lagret e-post"
+msgid "Thunderbird profiles and locally stored email"
+msgstr "Thunderbird-profiler og lokalt lagret e-post"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:98
 msgid "GNOME Keyring"
diff --git a/po/nl.mo b/po/nl.mo
index e681f3b779b9ba0345478d03130397c96b9dc5d9..d7c3b50c59f94da2234b5b7aea80ac9161725438 100644
Binary files a/po/nl.mo and b/po/nl.mo differ
diff --git a/po/nl.po b/po/nl.po
index d1e74b2852120742815f7737ef428b8873ea1ab7..d1e5960eee7a755aa56598cf14bbca6c7f4149ad 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers <tails@boum.org>\n"
-"POT-Creation-Date: 2016-05-25 02:27+0200\n"
+"POT-Creation-Date: 2017-05-15 13:51+0200\n"
 "PO-Revision-Date: 2016-10-17 13:46+0000\n"
 "Last-Translator: Nathan Follens\n"
 "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n"
@@ -61,12 +61,12 @@ msgid "Pidgin profiles and OTR keyring"
 msgstr "Pidgin-profielen en OTR-sleutelring"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:88
-msgid "Icedove"
-msgstr "Icedove"
+msgid "Thunderbird"
+msgstr "Thunderbird"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:90
-msgid "Icedove profiles and locally stored email"
-msgstr "Icedove profielen en lokaal opgeslagen e-mail"
+msgid "Thunderbird profiles and locally stored email"
+msgstr "Thunderbird profielen en lokaal opgeslagen e-mail"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:98
 msgid "GNOME Keyring"
diff --git a/po/pl.mo b/po/pl.mo
index b1ed4740b0c382224bbcd1cb4584787bcf012cff..3a28484477d4d21e170478da7e8c84534ea99f1e 100644
Binary files a/po/pl.mo and b/po/pl.mo differ
diff --git a/po/pl.po b/po/pl.po
index 0644a7446dc59e2e8865cb3ecbfeda2c823f9df1..d8990b71ab1c5801b6b632a2dacd76612f6a694e 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers <tails@boum.org>\n"
-"POT-Creation-Date: 2016-05-25 02:27+0200\n"
+"POT-Creation-Date: 2017-05-15 13:51+0200\n"
 "PO-Revision-Date: 2016-06-06 08:15+0000\n"
 "Last-Translator: carolyn <carolyn@anhalt.org>\n"
 "Language-Team: Polish (http://www.transifex.com/otf/torproject/language/"
@@ -56,12 +56,12 @@ msgid "Pidgin profiles and OTR keyring"
 msgstr "Zestaw kluczy OTR i profile Pidgina"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:88
-msgid "Icedove"
-msgstr "Icedove"
+msgid "Thunderbird"
+msgstr "Thunderbird"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:90
-msgid "Icedove profiles and locally stored email"
-msgstr "Profile Icedove oraz lokalnie trzymana poczta"
+msgid "Thunderbird profiles and locally stored email"
+msgstr "Profile Thunderbird oraz lokalnie trzymana poczta"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:98
 msgid "GNOME Keyring"
diff --git a/po/pt.mo b/po/pt.mo
index 80d892db92448904a8d6cf60bdae0bcefc0dd3ce..40db6b7d6d80cf7768a4ae1a311d2081dd4b7e8b 100644
Binary files a/po/pt.mo and b/po/pt.mo differ
diff --git a/po/pt.po b/po/pt.po
index 3bdf209d5d5747f6fda4ffcc11a7ea3cf5b91a19..1d2a30097eef1619fcf413bd87a2f0237f93c164 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -14,13 +14,13 @@
 # Drew Melim <nokostya.translation@gmail.com>, 2014
 # Pedro Albuquerque <palbuquerque73@gmail.com>, 2014
 # Sérgio Marques <smarquespt@gmail.com>, 2016
-# sccosta <sonia.peres.costa@gmail.com>, 2014
+# sccosta <inactive+sccosta@transifex.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers <tails@boum.org>\n"
-"POT-Creation-Date: 2016-05-25 02:27+0200\n"
-"PO-Revision-Date: 2017-02-28 15:55+0000\n"
+"POT-Creation-Date: 2017-05-15 13:51+0200\n"
+"PO-Revision-Date: 2017-04-14 14:07+0000\n"
 "Last-Translator: Manuela Silva <manuela.silva@sky.com>\n"
 "Language-Team: Portuguese (http://www.transifex.com/otf/torproject/language/"
 "pt/)\n"
@@ -44,7 +44,7 @@ msgstr "GnuPG"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:60
 msgid "GnuPG keyrings and configuration"
-msgstr "Configuração e chaveiro GnuPG"
+msgstr "Configuração e gestor de chaves GnuPG"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:68
 msgid "SSH Client"
@@ -63,12 +63,12 @@ msgid "Pidgin profiles and OTR keyring"
 msgstr "Perfis Pidgin e chaveiro OTR"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:88
-msgid "Icedove"
-msgstr "Icedove"
+msgid "Thunderbird"
+msgstr "Thunderbird"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:90
-msgid "Icedove profiles and locally stored email"
-msgstr "Perfis Icedove e email armazenado localmente"
+msgid "Thunderbird profiles and locally stored email"
+msgstr "Perfis Thunderbird e email armazenado localmente"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:98
 msgid "GNOME Keyring"
diff --git a/po/pt_BR.mo b/po/pt_BR.mo
index 9a370e2a62256497488900b9ca9f121cf11aecad..584692cdd5c449e9ec154800afc7c0ecd549648f 100644
Binary files a/po/pt_BR.mo and b/po/pt_BR.mo differ
diff --git a/po/pt_BR.po b/po/pt_BR.po
index ad6d4aae9aa8de69fa1b4a706304448d19174c38..4f0917821bf5ab5f30f176582a1b9fbfde15e89d 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers <tails@boum.org>\n"
-"POT-Creation-Date: 2016-05-25 02:27+0200\n"
+"POT-Creation-Date: 2017-05-15 13:51+0200\n"
 "PO-Revision-Date: 2017-02-24 23:36+0000\n"
 "Last-Translator: Communia <ameaneantie@riseup.net>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/"
@@ -64,11 +64,11 @@ msgid "Pidgin profiles and OTR keyring"
 msgstr "Perfis do Pidgin e chaveiro OTR (Off-The-Record)"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:88
-msgid "Icedove"
-msgstr "Icedove"
+msgid "Thunderbird"
+msgstr "Thunderbird"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:90
-msgid "Icedove profiles and locally stored email"
+msgid "Thunderbird profiles and locally stored email"
 msgstr "Perfis do Claws Mail e e-mails armazenados localmente"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:98
diff --git a/po/ro.mo b/po/ro.mo
index 4e5cf6a221e9baa096b08af7d7148fecd9c6c368..4799db3f6dd5831abd6821007fc9fb5e8832c57c 100644
Binary files a/po/ro.mo and b/po/ro.mo differ
diff --git a/po/ro.po b/po/ro.po
index 15141f4a627131d48e7e8fcb30cef0ef8da1b22d..0a72d95a2ef9c0f0fbb1fe6091614a9a8f1997cf 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers <tails@boum.org>\n"
-"POT-Creation-Date: 2016-05-25 02:27+0200\n"
+"POT-Creation-Date: 2017-05-15 13:51+0200\n"
 "PO-Revision-Date: 2016-06-06 08:15+0000\n"
 "Last-Translator: carolyn <carolyn@anhalt.org>\n"
 "Language-Team: Romanian (http://www.transifex.com/otf/torproject/language/"
@@ -58,12 +58,12 @@ msgid "Pidgin profiles and OTR keyring"
 msgstr "Profile Pidgin și inel de chei OTR"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:88
-msgid "Icedove"
-msgstr "Icedove"
+msgid "Thunderbird"
+msgstr "Thunderbird"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:90
-msgid "Icedove profiles and locally stored email"
-msgstr "Profile Icedove și email-uri stocate local"
+msgid "Thunderbird profiles and locally stored email"
+msgstr "Profile Thunderbird și email-uri stocate local"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:98
 msgid "GNOME Keyring"
diff --git a/po/si_LK.mo b/po/si_LK.mo
index 83b9d362af36c89e41be90635d8162f93ca7d4f5..ba5795fecb1c7999044a6a6f952f9a69f26d80af 100644
Binary files a/po/si_LK.mo and b/po/si_LK.mo differ
diff --git a/po/si_LK.po b/po/si_LK.po
index fe04f9512b120d6046c4b3bae8da5451610ad12e..363231263a34fed274897d4b40ab2937daef5a70 100644
--- a/po/si_LK.po
+++ b/po/si_LK.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers <tails@boum.org>\n"
-"POT-Creation-Date: 2016-05-25 02:27+0200\n"
+"POT-Creation-Date: 2017-05-15 13:51+0200\n"
 "PO-Revision-Date: 2013-08-02 08:38+0000\n"
 "Last-Translator: runasand <runa.sandvik@gmail.com>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/"
@@ -53,12 +53,12 @@ msgid "Pidgin profiles and OTR keyring"
 msgstr "Pidgin පැතිකඩ සහ OTR keyring"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:88
-msgid "Icedove"
+msgid "Thunderbird"
 msgstr ""
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:90
 #, fuzzy
-msgid "Icedove profiles and locally stored email"
+msgid "Thunderbird profiles and locally stored email"
 msgstr "Claws තැපෑල පැතිකඩ ස්ථානීය තැන්පත් කල විද්‍යුත් තැපෑල "
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:98
diff --git a/po/sk.mo b/po/sk.mo
index fbb1ccf121520e64a11a3f6d2d9681d445a71846..04ea9b14da44bd71560211f03de62520162d10e9 100644
Binary files a/po/sk.mo and b/po/sk.mo differ
diff --git a/po/sk.po b/po/sk.po
index 9925be7bbe6a71004497017a03c537afffa6446a..1eb621709412fa863872c6cd9ae8589a966a8b49 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers <tails@boum.org>\n"
-"POT-Creation-Date: 2016-05-25 02:27+0200\n"
+"POT-Creation-Date: 2017-05-15 13:51+0200\n"
 "PO-Revision-Date: 2015-03-31 13:51+0000\n"
 "Last-Translator: Júlia Csalová <jcsalova@gmail.com>\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/torproject/"
@@ -56,12 +56,12 @@ msgid "Pidgin profiles and OTR keyring"
 msgstr "Pidgin profily a OTR zväzok kľúčov"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:88
-msgid "Icedove"
+msgid "Thunderbird"
 msgstr ""
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:90
 #, fuzzy
-msgid "Icedove profiles and locally stored email"
+msgid "Thunderbird profiles and locally stored email"
 msgstr "Claws Mail profily a lokálne uložený email"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:98
diff --git a/po/sl_SI.mo b/po/sl_SI.mo
index ce58d837f5bf95161780c88a782f91fbe8a77013..6c3c967443f49ae8d9e4a5ffafdd31facc143bf4 100644
Binary files a/po/sl_SI.mo and b/po/sl_SI.mo differ
diff --git a/po/sl_SI.po b/po/sl_SI.po
index ae1c18cec6dabc6aee282ae0f45e2dc7775776a6..863e805cb31615dee5d0db7b1abb1a66c50213ef 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers <tails@boum.org>\n"
-"POT-Creation-Date: 2016-05-25 02:27+0200\n"
+"POT-Creation-Date: 2017-05-15 13:51+0200\n"
 "PO-Revision-Date: 2015-02-25 23:51+0000\n"
 "Last-Translator: Matija <matija@srebrni-galeb.si>\n"
 "Language-Team: Slovenian (Slovenia) (http://www.transifex.com/projects/p/"
@@ -54,12 +54,12 @@ msgid "Pidgin profiles and OTR keyring"
 msgstr "Pidgin profili in OTR datoteke s ključi"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:88
-msgid "Icedove"
+msgid "Thunderbird"
 msgstr ""
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:90
 #, fuzzy
-msgid "Icedove profiles and locally stored email"
+msgid "Thunderbird profiles and locally stored email"
 msgstr "Claws Mail profili in lokalno shranjena e-pošta"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:98
diff --git a/po/sq.mo b/po/sq.mo
index 8a710b4d5735e3e9943388842c49f73462596a91..88fe0799de31d6df314359cf9e4048787f89bd81 100644
Binary files a/po/sq.mo and b/po/sq.mo differ
diff --git a/po/sq.po b/po/sq.po
index b8a37c79f5a6ac242a708bb5b06807297615b9a6..0da32572701dcf8c299fe197e1f0d7b597d14385 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers <tails@boum.org>\n"
-"POT-Creation-Date: 2016-05-25 02:27+0200\n"
+"POT-Creation-Date: 2017-05-15 13:51+0200\n"
 "PO-Revision-Date: 2016-06-06 08:15+0000\n"
 "Last-Translator: carolyn <carolyn@anhalt.org>\n"
 "Language-Team: Albanian (http://www.transifex.com/otf/torproject/language/"
@@ -52,12 +52,12 @@ msgid "Pidgin profiles and OTR keyring"
 msgstr "Profilet Pidgin dhe \"mbajtëset e çelësave\" OTR"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:88
-msgid "Icedove"
-msgstr "Icedove"
+msgid "Thunderbird"
+msgstr "Thunderbird"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:90
-msgid "Icedove profiles and locally stored email"
-msgstr " Profilet Icedove dhe e-postat e ruajtura lokalisht"
+msgid "Thunderbird profiles and locally stored email"
+msgstr " Profilet Thunderbird dhe e-postat e ruajtura lokalisht"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:98
 msgid "GNOME Keyring"
diff --git a/po/sv.mo b/po/sv.mo
index 960bad2d1bbf3d84242030bb3c6dd64ec8b0661f..771ba9af0da6eff0633f8cd37f916379c968c3fd 100644
Binary files a/po/sv.mo and b/po/sv.mo differ
diff --git a/po/sv.po b/po/sv.po
index 209120b765970ab243b7d19b685a17d6a3b22755..9f9169b7151967baa6107a5ee61f4a6874e5ff8e 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -6,18 +6,19 @@
 # Anders Nilsson <anders@devode.se>, 2016
 # Anders Nilsson <anders@devode.se>, 2015
 # Filip Nyquist <fillerix@fillerix.se>, 2015
-# Michael Cavén, 2014
-# phst <transifex@sturman.se>, 2014
-# leveebreaks, 2014
+# Jonatan Nyberg <jonatan@autistici.org>, 2017
+# miccav, 2014
+# phst, 2014
+# Isis, 2014
 # WinterFairy <winterfairy@riseup.net>, 2013
 # WinterFairy <winterfairy@riseup.net>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers <tails@boum.org>\n"
-"POT-Creation-Date: 2016-05-25 02:27+0200\n"
-"PO-Revision-Date: 2016-06-06 08:15+0000\n"
-"Last-Translator: carolyn <carolyn@anhalt.org>\n"
+"POT-Creation-Date: 2017-05-15 13:51+0200\n"
+"PO-Revision-Date: 2017-04-14 02:25+0000\n"
+"Last-Translator: Jonatan Nyberg <jonatan@autistici.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/"
 "sv/)\n"
 "Language: sv\n"
@@ -40,15 +41,15 @@ msgstr "GnuPG"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:60
 msgid "GnuPG keyrings and configuration"
-msgstr "Nyckelringar och konfiguration för GnuPG"
+msgstr "GnuPG nyckelringar och konfiguration"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:68
 msgid "SSH Client"
-msgstr "SSH klient"
+msgstr "SSH-klient"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:70
 msgid "SSH keys, configuration and known hosts"
-msgstr "Nycklar, konfiguration och kända värdar för SSH"
+msgstr "SSH-nycklar, konfiguration och kända värdar"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:78
 msgid "Pidgin"
@@ -56,15 +57,15 @@ msgstr "Pidgin"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:80
 msgid "Pidgin profiles and OTR keyring"
-msgstr "Pidgin profiler och OTR nyckelring"
+msgstr "Pidgin-profiler och OTR-nyckelring"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:88
-msgid "Icedove"
-msgstr "Icedove"
+msgid "Thunderbird"
+msgstr "Thunderbird"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:90
-msgid "Icedove profiles and locally stored email"
-msgstr "Icedove-profiler och lokal sparad e-post"
+msgid "Thunderbird profiles and locally stored email"
+msgstr "Thunderbird-profiler och lokal sparad e-post"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:98
 msgid "GNOME Keyring"
diff --git a/po/tails-persistence-setup.pot b/po/tails-persistence-setup.pot
index 44a5ea35c22adfde6c3467223b25d29e7ced4a7b..f128fb7d1f760fd86cdd3ac8c02b31d468419143 100644
--- a/po/tails-persistence-setup.pot
+++ b/po/tails-persistence-setup.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: Tails developers <tails@boum.org>\n"
-"POT-Creation-Date: 2016-05-25 02:27+0200\n"
+"POT-Creation-Date: 2017-05-15 13:51+0200\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"
@@ -50,11 +50,11 @@ msgid "Pidgin profiles and OTR keyring"
 msgstr ""
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:88
-msgid "Icedove"
+msgid "Thunderbird"
 msgstr ""
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:90
-msgid "Icedove profiles and locally stored email"
+msgid "Thunderbird profiles and locally stored email"
 msgstr ""
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:98
diff --git a/po/uk.mo b/po/uk.mo
index 59043025d133fc11c961d84b7e5849f621895a91..34df14c44a0861d3cf4a759a2b8e94eb475b805c 100644
Binary files a/po/uk.mo and b/po/uk.mo differ
diff --git a/po/uk.po b/po/uk.po
index 2582c89d1c62ac17ef2a54bc72e61069e66b8429..82e96ad83adc861e44a3f0662e2cf669d1438d89 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers <tails@boum.org>\n"
-"POT-Creation-Date: 2016-05-25 02:27+0200\n"
+"POT-Creation-Date: 2017-05-15 13:51+0200\n"
 "PO-Revision-Date: 2016-06-06 08:15+0000\n"
 "Last-Translator: carolyn <carolyn@anhalt.org>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/otf/torproject/language/"
@@ -58,12 +58,12 @@ msgid "Pidgin profiles and OTR keyring"
 msgstr "Профілі Pidgin і OTR"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:88
-msgid "Icedove"
-msgstr "Icedove"
+msgid "Thunderbird"
+msgstr "Thunderbird"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:90
-msgid "Icedove profiles and locally stored email"
-msgstr "Профілі Icedove і локально збережені листи"
+msgid "Thunderbird profiles and locally stored email"
+msgstr "Профілі Thunderbird і локально збережені листи"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:98
 msgid "GNOME Keyring"
diff --git a/po/zh_CN.mo b/po/zh_CN.mo
index b8e7d1f48401132a2b36cdc15cb04202107982fd..142d48a1f9ac0eaa056325c39264c0de3e25372c 100644
Binary files a/po/zh_CN.mo and b/po/zh_CN.mo differ
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 201d36c6314f3571a59b7142371365a08c8a19d4..2fd46b8de3ae49ce75d01190458d6b621d256163 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers <tails@boum.org>\n"
-"POT-Creation-Date: 2016-05-25 02:27+0200\n"
+"POT-Creation-Date: 2017-05-15 13:51+0200\n"
 "PO-Revision-Date: 2017-03-17 04:31+0000\n"
 "Last-Translator: Chi-Hsun Tsai <chihsun.tsai@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/otf/torproject/"
@@ -59,12 +59,12 @@ msgid "Pidgin profiles and OTR keyring"
 msgstr "Pidgin 配置文件及 OTR 钥匙环"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:88
-msgid "Icedove"
-msgstr "Icedove"
+msgid "Thunderbird"
+msgstr "Thunderbird"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:90
-msgid "Icedove profiles and locally stored email"
-msgstr "Icedove 配置文件和本地存储的电子邮件"
+msgid "Thunderbird profiles and locally stored email"
+msgstr "Thunderbird 配置文件和本地存储的电子邮件"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:98
 msgid "GNOME Keyring"
diff --git a/po/zh_TW.mo b/po/zh_TW.mo
index f7f30cd8a8dac057e0d56d2e9754de9cf221b698..f6e4019f4b6aba7032c7d29288931efaed977e43 100644
Binary files a/po/zh_TW.mo and b/po/zh_TW.mo differ
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 753b3e2889e3884299768ec0081d70acbc892365..c213507f5fa44f352973d24bd1da0221ac32f289 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers <tails@boum.org>\n"
-"POT-Creation-Date: 2016-05-25 02:27+0200\n"
+"POT-Creation-Date: 2017-05-15 13:51+0200\n"
 "PO-Revision-Date: 2016-12-21 05:31+0000\n"
 "Last-Translator: Agustín Wu <losangwuyts@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/otf/torproject/"
@@ -58,12 +58,12 @@ msgid "Pidgin profiles and OTR keyring"
 msgstr "Pidgin 設定檔和 OTR 鑰匙圈"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:88
-msgid "Icedove"
-msgstr "Icedove"
+msgid "Thunderbird"
+msgstr "Thunderbird"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:90
-msgid "Icedove profiles and locally stored email"
-msgstr "Icedove 設定和本機所儲存的郵件"
+msgid "Thunderbird profiles and locally stored email"
+msgstr "Thunderbird 設定和本機所儲存的郵件"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:98
 msgid "GNOME Keyring"