summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsajolida <sajolida@pimienta.org>2017-05-18 18:07:41 +0000
committersajolida <sajolida@pimienta.org>2017-05-18 18:07:41 +0000
commit220646aaf7e4046e65eaeab2a166b02c5acaa2fe (patch)
treea75dd474a6f842b7fd46792c98154876ed7fdec7
parente74b5eeb36afc9da23e386286ac4899254caf09d (diff)
parentbd903d7e4f6a0599a133e7af46f99069b4d2ebf3 (diff)
Merge branch 'feature/stretch' into doc/11110-software-properties-gtk
-rw-r--r--Rakefile57
-rwxr-xr-xauto/config2
-rwxr-xr-xauto/scripts/apt-snapshots-serials18
-rw-r--r--config/APT_overlays.d/bugfix-12364-greeter-races0
-rw-r--r--config/APT_overlays.d/feature-11712-thunderbird0
-rw-r--r--config/APT_snapshots.d/debian/serial2
-rw-r--r--config/APT_snapshots.d/torproject/serial2
-rw-r--r--config/amnesia2
-rw-r--r--config/binary_local-hooks/05-rename-kernels20
-rw-r--r--config/chroot_apt/preferences4
-rwxr-xr-xconfig/chroot_local-hooks/11-enable-thunderbird-addons (renamed from config/chroot_local-hooks/11-enable-icedove-addons)4
-rwxr-xr-xconfig/chroot_local-hooks/30-disable-wayland-in-gdm5
-rwxr-xr-xconfig/chroot_local-hooks/52-update-rc.d10
-rwxr-xr-xconfig/chroot_local-hooks/53-icedove-menu6
-rwxr-xr-xconfig/chroot_local-hooks/53-thunderbird-menu8
-rwxr-xr-xconfig/chroot_local-hooks/65-initramfs-scripts14
-rwxr-xr-xconfig/chroot_local-includes/etc/NetworkManager/dispatcher.d/10-tor.sh4
l---------config/chroot_local-includes/etc/apparmor.d/disable/usr.bin.thunderbird1
-rw-r--r--config/chroot_local-includes/etc/apparmor.d/usr.bin.onioncircuits1
-rw-r--r--config/chroot_local-includes/etc/dconf/db/local.d/00_Tails_defaults2
-rw-r--r--config/chroot_local-includes/etc/default/kexec21
-rw-r--r--config/chroot_local-includes/etc/memlockd.cfg18
-rw-r--r--config/chroot_local-includes/etc/skel/.config/keepassx/keepassx2.ini1
-rw-r--r--config/chroot_local-includes/etc/skel/.local/share/applications/mimeapps.list4
-rw-r--r--config/chroot_local-includes/etc/skel/.thunderbird/profile.default/chrome/userChrome.css (renamed from config/chroot_local-includes/etc/skel/.icedove/profile.default/chrome/userChrome.css)2
-rw-r--r--config/chroot_local-includes/etc/skel/.thunderbird/profile.default/preferences/0000tails.js (renamed from config/chroot_local-includes/etc/skel/.icedove/profile.default/preferences/0000tails.js)0
-rw-r--r--config/chroot_local-includes/etc/thunderbird/pref/thunderbird.js (renamed from config/chroot_local-includes/etc/icedove/pref/icedove.js)6
-rwxr-xr-xconfig/chroot_local-includes/lib/systemd/system-shutdown/tails17
-rwxr-xr-xconfig/chroot_local-includes/lib/systemd/system-shutdown/tails-kexec96
-rw-r--r--config/chroot_local-includes/lib/systemd/system/initramfs-shutdown.service12
l---------config/chroot_local-includes/lib/systemd/system/kexec.service1
-rw-r--r--config/chroot_local-includes/lib/systemd/system/tails-reconfigure-kexec.service17
-rw-r--r--config/chroot_local-includes/lib/systemd/system/tails-reconfigure-memlockd.service18
-rw-r--r--config/chroot_local-includes/lib/systemd/system/tails-shutdown-on-media-removal.service (renamed from config/chroot_local-includes/lib/systemd/system/tails-sdmem-on-media-removal.service)2
-rwxr-xr-xconfig/chroot_local-includes/usr/local/bin/icedove72
-rwxr-xr-xconfig/chroot_local-includes/usr/local/bin/thunderbird51
-rwxr-xr-xconfig/chroot_local-includes/usr/local/lib/initramfs-pre-shutdown-hook56
-rwxr-xr-xconfig/chroot_local-includes/usr/local/lib/initramfs-restore19
-rwxr-xr-xconfig/chroot_local-includes/usr/local/lib/udev-watchdog-wrapper14
-rwxr-xr-xconfig/chroot_local-includes/usr/local/sbin/live-persist93
-rwxr-xr-xconfig/chroot_local-includes/usr/local/sbin/tails-reconfigure-kexec19
-rwxr-xr-xconfig/chroot_local-includes/usr/local/sbin/tails-reconfigure-memlockd10
-rwxr-xr-xconfig/chroot_local-includes/usr/share/initramfs-tools/hooks/sdmem24
-rwxr-xr-xconfig/chroot_local-includes/usr/share/initramfs-tools/hooks/shutdown34
-rwxr-xr-xconfig/chroot_local-includes/usr/share/initramfs-tools/scripts/init-top/memory_wipe63
-rw-r--r--config/chroot_local-includes/usr/share/live/config/xserver-xorg/intel.ids2
-rw-r--r--config/chroot_local-packageslists/tails-common.list13
-rw-r--r--config/chroot_local-patches/bilibop-debian-bug-861685.diff60
-rw-r--r--config/chroot_local-patches/run_kexec-load_even_in_emergency_shutdown.diff23
-rw-r--r--config/chroot_local-patches/run_kexec-load_on_halt.diff8
-rw-r--r--config/chroot_local-patches/thunderbird_default_to_IMAP.diff (renamed from config/chroot_local-patches/icedove_default_to_IMAP.diff)0
-rw-r--r--config/chroot_local-preseed/live-boot2
-rw-r--r--features/build.feature14
-rw-r--r--features/emergency_shutdown.feature53
-rw-r--r--features/erase_memory.feature26
-rw-r--r--features/images/DesktopTailsDocumentation.pngbin4513 -> 2153 bytes
-rw-r--r--features/images/MemoryWipeCompleted.pngbin2302 -> 425 bytes
-rw-r--r--features/images/TailsBug11786a.pngbin209 -> 0 bytes
-rw-r--r--features/images/TailsBug11786b.pngbin1592 -> 0 bytes
-rw-r--r--features/step_definitions/common_steps.rb59
-rw-r--r--features/step_definitions/erase_memory.rb79
-rw-r--r--features/step_definitions/thunderbird.rb (renamed from features/step_definitions/icedove.rb)100
-rw-r--r--features/support/helpers/vm_helper.rb23
-rw-r--r--features/support/hooks.rb1
-rw-r--r--features/thunderbird.feature (renamed from features/icedove.feature)16
-rw-r--r--po/POTFILES.in1
-rw-r--r--po/ar.po14
-rw-r--r--po/az.po14
-rw-r--r--po/bg.po18
-rw-r--r--po/ca.po18
-rw-r--r--po/cs.po14
-rw-r--r--po/cy.po14
-rw-r--r--po/da.po18
-rw-r--r--po/de.po18
-rw-r--r--po/el.po18
-rw-r--r--po/en_GB.po18
-rw-r--r--po/es.po18
-rw-r--r--po/fa.po18
-rw-r--r--po/fi.po18
-rw-r--r--po/fr.po18
-rw-r--r--po/fr_CA.po18
-rw-r--r--po/he.po14
-rw-r--r--po/hr_HR.po18
-rw-r--r--po/hu.po18
-rw-r--r--po/id.po18
-rw-r--r--po/is.po18
-rw-r--r--po/it.po18
-rw-r--r--po/ja.po18
-rw-r--r--po/km.po14
-rw-r--r--po/ko.po18
-rw-r--r--po/lv.po18
-rw-r--r--po/nb.po18
-rw-r--r--po/nl.po18
-rw-r--r--po/nn.po14
-rw-r--r--po/pl.po18
-rw-r--r--po/pt.po18
-rw-r--r--po/pt_BR.po18
-rw-r--r--po/ro.po18
-rw-r--r--po/ru.po18
-rw-r--r--po/sk.po14
-rw-r--r--po/sk_SK.po18
-rw-r--r--po/sl_SI.po14
-rw-r--r--po/sq.po18
-rw-r--r--po/sr.po14
-rw-r--r--po/sv.po18
-rw-r--r--po/tails.pot14
-rw-r--r--po/tr.po18
-rw-r--r--po/uk.po18
-rw-r--r--po/vi.po18
-rw-r--r--po/zh.po14
-rw-r--r--po/zh_CN.po18
-rw-r--r--po/zh_HK.po18
-rw-r--r--po/zh_TW.po18
-rwxr-xr-xrefresh-translations1
-rw-r--r--vagrant/Vagrantfile5
-rw-r--r--vagrant/definitions/tails-builder/config/APT_snapshots.d/.placeholder0
-rw-r--r--vagrant/definitions/tails-builder/config/APT_snapshots.d/debian-security/serial1
-rw-r--r--vagrant/definitions/tails-builder/config/APT_snapshots.d/debian/serial1
-rw-r--r--vagrant/definitions/tails-builder/config/APT_snapshots.d/tails/serial1
-rwxr-xr-xvagrant/definitions/tails-builder/generate-tails-builder-box.sh45
-rwxr-xr-xvagrant/definitions/tails-builder/postinstall.sh13
-rw-r--r--vagrant/lib/tails_build_settings.rb12
-rwxr-xr-xvagrant/provision/assets/build-tails1
-rwxr-xr-xvagrant/provision/setup-tails-builder9
-rw-r--r--wiki/src/contribute/APT_repository/time-based_snapshots.mdwn34
-rw-r--r--wiki/src/contribute/design.mdwn20
-rw-r--r--wiki/src/contribute/design/memory_erasure.mdwn109
-rw-r--r--wiki/src/contribute/design/stream_isolation.mdwn2
-rw-r--r--wiki/src/contribute/how/documentation/release_notes.mdwn2
-rw-r--r--wiki/src/contribute/l10n_tricks/core_po_files.txt2
-rw-r--r--wiki/src/contribute/release_process.mdwn48
-rw-r--r--wiki/src/contribute/release_process/test.mdwn18
-rw-r--r--wiki/src/contribute/release_process/test/erase_memory_on_shutdown.mdwn80
-rw-r--r--wiki/src/contribute/release_process/test/erase_memory_on_shutdown/live_system.mdwn45
-rw-r--r--wiki/src/contribute/release_process/test/erase_memory_on_shutdown/pxedump.mdwn65
-rw-r--r--wiki/src/contribute/release_process/test/erase_memory_on_shutdown/qemu_pmemsave.mdwn19
-rw-r--r--wiki/src/contribute/release_process/test/erase_memory_on_shutdown/virtualbox_dumpguestcore.mdwn11
-rw-r--r--wiki/src/contribute/release_process/test/usage.mdwn4
-rw-r--r--wiki/src/contribute/release_process/thunderbird.mdwn (renamed from wiki/src/contribute/release_process/icedove.mdwn)36
-rw-r--r--wiki/src/doc/about/features.de.po6
-rw-r--r--wiki/src/doc/about/features.fa.po2
-rw-r--r--wiki/src/doc/about/features.fr.po4
-rw-r--r--wiki/src/doc/about/features.it.po6
-rw-r--r--wiki/src/doc/about/features.mdwn4
-rw-r--r--wiki/src/doc/about/features.pt.po2
-rw-r--r--wiki/src/doc/advanced_topics/cold_boot_attacks.mdwn13
-rw-r--r--wiki/src/doc/advanced_topics/lan.mdwn15
-rw-r--r--wiki/src/doc/advanced_topics/virtualization/boxes.mdwn14
-rw-r--r--wiki/src/doc/advanced_topics/virtualization/preferences-system-symbolic.pngbin488 -> 0 bytes
-rw-r--r--wiki/src/doc/anonymous_internet.index.de.po6
-rw-r--r--wiki/src/doc/anonymous_internet.index.fa.po3
-rw-r--r--wiki/src/doc/anonymous_internet.index.fr.po6
-rw-r--r--wiki/src/doc/anonymous_internet.index.it.po3
-rw-r--r--wiki/src/doc/anonymous_internet.index.mdwn3
-rw-r--r--wiki/src/doc/anonymous_internet.index.pt.po3
-rw-r--r--wiki/src/doc/anonymous_internet/claws_mail.de.po27
-rw-r--r--wiki/src/doc/anonymous_internet/claws_mail.fa.po94
-rw-r--r--wiki/src/doc/anonymous_internet/claws_mail.fr.po90
-rw-r--r--wiki/src/doc/anonymous_internet/claws_mail.it.po27
-rw-r--r--wiki/src/doc/anonymous_internet/claws_mail.mdwn3
-rw-r--r--wiki/src/doc/anonymous_internet/claws_mail.pt.po27
-rw-r--r--wiki/src/doc/anonymous_internet/claws_mail_to_icedove.de.po518
-rw-r--r--wiki/src/doc/anonymous_internet/claws_mail_to_icedove.fa.po518
-rw-r--r--wiki/src/doc/anonymous_internet/claws_mail_to_icedove.fr.po519
-rw-r--r--wiki/src/doc/anonymous_internet/claws_mail_to_icedove.it.po518
-rw-r--r--wiki/src/doc/anonymous_internet/claws_mail_to_icedove.mdwn258
-rw-r--r--wiki/src/doc/anonymous_internet/claws_mail_to_icedove.pt.po518
-rw-r--r--wiki/src/doc/anonymous_internet/claws_mail_to_icedove/single_mh.pngbin8680 -> 0 bytes
-rw-r--r--wiki/src/doc/anonymous_internet/icedove/replacement.inline.de.po39
-rw-r--r--wiki/src/doc/anonymous_internet/icedove/replacement.inline.fa.po35
-rw-r--r--wiki/src/doc/anonymous_internet/icedove/replacement.inline.fr.po39
-rw-r--r--wiki/src/doc/anonymous_internet/icedove/replacement.inline.it.po35
-rw-r--r--wiki/src/doc/anonymous_internet/icedove/replacement.inline.mdwn7
-rw-r--r--wiki/src/doc/anonymous_internet/icedove/replacement.inline.pt.po35
-rw-r--r--wiki/src/doc/anonymous_internet/networkmanager.mdwn2
-rw-r--r--wiki/src/doc/anonymous_internet/thunderbird.de.po (renamed from wiki/src/doc/anonymous_internet/icedove.de.po)48
-rw-r--r--wiki/src/doc/anonymous_internet/thunderbird.fa.po (renamed from wiki/src/doc/anonymous_internet/icedove.pt.po)24
-rw-r--r--wiki/src/doc/anonymous_internet/thunderbird.fr.po (renamed from wiki/src/doc/anonymous_internet/icedove.fr.po)48
-rw-r--r--wiki/src/doc/anonymous_internet/thunderbird.it.po (renamed from wiki/src/doc/anonymous_internet/icedove.it.po)24
-rw-r--r--wiki/src/doc/anonymous_internet/thunderbird.mdwn (renamed from wiki/src/doc/anonymous_internet/icedove.mdwn)24
-rw-r--r--wiki/src/doc/anonymous_internet/thunderbird.pt.po (renamed from wiki/src/doc/anonymous_internet/icedove.fa.po)24
-rw-r--r--wiki/src/doc/anonymous_internet/thunderbird/account_creation.inline.de.po (renamed from wiki/src/doc/anonymous_internet/icedove/account_creation.inline.de.po)34
-rw-r--r--wiki/src/doc/anonymous_internet/thunderbird/account_creation.inline.fa.po (renamed from wiki/src/doc/anonymous_internet/icedove/account_creation.inline.fa.po)12
-rw-r--r--wiki/src/doc/anonymous_internet/thunderbird/account_creation.inline.fr.po (renamed from wiki/src/doc/anonymous_internet/icedove/account_creation.inline.fr.po)24
-rw-r--r--wiki/src/doc/anonymous_internet/thunderbird/account_creation.inline.it.po (renamed from wiki/src/doc/anonymous_internet/icedove/account_creation.inline.it.po)12
-rw-r--r--wiki/src/doc/anonymous_internet/thunderbird/account_creation.inline.mdwn (renamed from wiki/src/doc/anonymous_internet/icedove/account_creation.inline.mdwn)12
-rw-r--r--wiki/src/doc/anonymous_internet/thunderbird/account_creation.inline.pt.po (renamed from wiki/src/doc/anonymous_internet/icedove/account_creation.inline.pt.po)12
-rw-r--r--wiki/src/doc/anonymous_internet/thunderbird/assistant.png (renamed from wiki/src/doc/anonymous_internet/icedove/assistant.png)bin17654 -> 17654 bytes
-rw-r--r--wiki/src/doc/anonymous_internet/thunderbird/name.inline.de.po (renamed from wiki/src/doc/anonymous_internet/icedove/name.inline.de.po)4
-rw-r--r--wiki/src/doc/anonymous_internet/thunderbird/name.inline.fa.po (renamed from wiki/src/doc/anonymous_internet/icedove/name.inline.fa.po)2
-rw-r--r--wiki/src/doc/anonymous_internet/thunderbird/name.inline.fr.po (renamed from wiki/src/doc/anonymous_internet/icedove/name.inline.fr.po)4
-rw-r--r--wiki/src/doc/anonymous_internet/thunderbird/name.inline.it.po (renamed from wiki/src/doc/anonymous_internet/icedove/name.inline.it.po)2
-rw-r--r--wiki/src/doc/anonymous_internet/thunderbird/name.inline.mdwn (renamed from wiki/src/doc/anonymous_internet/icedove/name.inline.mdwn)2
-rw-r--r--wiki/src/doc/anonymous_internet/thunderbird/name.inline.pt.po (renamed from wiki/src/doc/anonymous_internet/icedove/name.inline.pt.po)2
-rw-r--r--wiki/src/doc/encryption_and_privacy/gpgapplet.warning.de.po4
-rw-r--r--wiki/src/doc/encryption_and_privacy/gpgapplet.warning.fa.po2
-rw-r--r--wiki/src/doc/encryption_and_privacy/gpgapplet.warning.fr.po4
-rw-r--r--wiki/src/doc/encryption_and_privacy/gpgapplet.warning.it.po2
-rw-r--r--wiki/src/doc/encryption_and_privacy/gpgapplet.warning.mdwn2
-rw-r--r--wiki/src/doc/encryption_and_privacy/gpgapplet.warning.pt.po2
-rw-r--r--wiki/src/doc/encryption_and_privacy/manage_passwords.de.po8
-rw-r--r--wiki/src/doc/encryption_and_privacy/manage_passwords.fa.po4
-rw-r--r--wiki/src/doc/encryption_and_privacy/manage_passwords.fr.po4
-rw-r--r--wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.de.po40
-rw-r--r--wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.fa.po40
-rw-r--r--wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.fr.po50
-rw-r--r--wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.it.po20
-rw-r--r--wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.mdwn10
-rw-r--r--wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.pt.po20
-rw-r--r--wiki/src/doc/first_steps.index.mdwn4
-rw-r--r--wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.de.po16
-rw-r--r--wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fa.po8
-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.it.po8
-rw-r--r--wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.mdwn6
-rw-r--r--wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.pt.po8
-rw-r--r--wiki/src/doc/first_steps/persistence/configure.de.po16
-rw-r--r--wiki/src/doc/first_steps/persistence/configure.fa.po8
-rw-r--r--wiki/src/doc/first_steps/persistence/configure.fr.po16
-rw-r--r--wiki/src/doc/first_steps/persistence/configure.it.po8
-rw-r--r--wiki/src/doc/first_steps/persistence/configure.mdwn8
-rw-r--r--wiki/src/doc/first_steps/persistence/configure.pt.po8
-rw-r--r--wiki/src/doc/first_steps/persistence/copy.de.po14
-rw-r--r--wiki/src/doc/first_steps/persistence/copy.fa.po6
-rw-r--r--wiki/src/doc/first_steps/persistence/copy.fr.po12
-rw-r--r--wiki/src/doc/first_steps/persistence/copy.it.po6
-rw-r--r--wiki/src/doc/first_steps/persistence/copy.mdwn30
-rw-r--r--wiki/src/doc/first_steps/persistence/copy.pt.po6
-rw-r--r--wiki/src/doc/first_steps/persistence/use.mdwn11
-rw-r--r--wiki/src/doc/first_steps/startup_options.mdwn138
-rw-r--r--wiki/src/doc/first_steps/startup_options/US_calendar_in_Russian.pngbin0 -> 32821 bytes
-rw-r--r--wiki/src/doc/first_steps/startup_options/additional.pngbin0 -> 8234 bytes
-rw-r--r--wiki/src/doc/first_steps/startup_options/locale.pngbin0 -> 9601 bytes
-rw-r--r--wiki/src/doc/first_steps/startup_options/network_configuration.de.po89
-rw-r--r--wiki/src/doc/first_steps/startup_options/network_configuration.fa.po86
-rw-r--r--wiki/src/doc/first_steps/startup_options/network_configuration.fr.po114
-rw-r--r--wiki/src/doc/first_steps/startup_options/network_configuration.it.po123
-rw-r--r--wiki/src/doc/first_steps/startup_options/network_configuration.mdwn23
-rw-r--r--wiki/src/doc/first_steps/startup_options/network_configuration.pt.po94
-rw-r--r--wiki/src/doc/first_steps/startup_options/offline_mode.de.po59
-rw-r--r--wiki/src/doc/first_steps/startup_options/offline_mode.fa.po48
-rw-r--r--wiki/src/doc/first_steps/startup_options/offline_mode.fr.po59
-rw-r--r--wiki/src/doc/first_steps/startup_options/offline_mode.it.po48
-rw-r--r--wiki/src/doc/first_steps/startup_options/offline_mode.mdwn15
-rw-r--r--wiki/src/doc/first_steps/startup_options/offline_mode.pt.po48
-rw-r--r--wiki/src/doc/first_steps/startup_options/persistence.pngbin0 -> 8213 bytes
-rw-r--r--wiki/src/install/inc/steps/create_persistence.inline.mdwn12
-rw-r--r--wiki/src/install/inc/steps/restart_first_time.inline.mdwn5
-rw-r--r--wiki/src/install/inc/steps/restart_second_time.inline.mdwn6
-rw-r--r--wiki/src/lib/menu.pngbin289 -> 0 bytes
-rw-r--r--wiki/src/lib/tab-new.pngbin0 -> 275 bytes
-rw-r--r--wiki/src/misc/claws_to_icedove.sh105
-rw-r--r--wiki/src/news/report_2015_12.mdwn2
-rw-r--r--wiki/src/news/version_0.23.mdwn2
-rw-r--r--wiki/src/news/version_1.0.mdwn2
-rw-r--r--wiki/src/news/version_1.7.mdwn2
-rw-r--r--wiki/src/support/faq.mdwn5
-rw-r--r--wiki/src/support/known_issues.mdwn64
258 files changed, 1748 insertions, 6233 deletions
diff --git a/Rakefile b/Rakefile
index a24efbf..bb2f611 100644
--- a/Rakefile
+++ b/Rakefile
@@ -404,46 +404,39 @@ task :build => ['parse_build_options', 'ensure_clean_repository', 'maybe_clean_u
run_vagrant_ssh("#{exported_env} build-tails")
artifacts = list_artifacts
- raise 'No build artifacts was found!' if artifacts.empty?
+ raise 'No build artifacts were found!' if artifacts.empty?
user = vagrant_ssh_config('User')
hostname = vagrant_ssh_config('HostName')
key_file = vagrant_ssh_config('IdentityFile')
$stderr.puts "Retrieving artifacts from Vagrant build box."
- artifacts.each do |artifact|
- run_vagrant_ssh("sudo chown #{user} '#{artifact}'")
- Process.wait(
- Kernel.spawn(
- 'scp',
- '-i', key_file,
- # We need this since the user will not necessarily have a
- # known_hosts entry. It is safe since an attacker must
- # compromise libvirt's network config or the user running the
- # command to modify the #{hostname} below.
- '-o', 'StrictHostKeyChecking=no',
- '-o', 'UserKnownHostsFile=/dev/null',
- "#{user}@#{hostname}:#{artifact}", "#{ENV['ARTIFACTS']}"
- )
- )
- raise "Failed to fetch artifact '#{artifact}'" unless $?.success?
- end
+ run_vagrant_ssh(
+ "sudo chown #{user} " + artifacts.map { |a| "'#{a}'" } .join(' ')
+ )
+ fetch_command = [
+ 'scp',
+ '-i', key_file,
+ # We need this since the user will not necessarily have a
+ # known_hosts entry. It is safe since an attacker must
+ # compromise libvirt's network config or the user running the
+ # command to modify the #{hostname} below.
+ '-o', 'StrictHostKeyChecking=no',
+ '-o', 'UserKnownHostsFile=/dev/null',
+ ]
+ fetch_command += artifacts.map { |a| "#{user}@#{hostname}:#{a}" }
+ fetch_command << ENV['ARTIFACTS']
+ run_command(*fetch_command)
clean_up_builder_vms unless $keep_running
ensure
clean_up_builder_vms if $force_cleanup
end
end
-def box_name(vagrantfile_contents = open('vagrant/Vagrantfile') { |f| f.read })
- /^\s*config.vm.box = '([^']+)'/.match(vagrantfile_contents)[1]
-end
-
-def has_box?(name = box_name)
- not(capture_vagrant('box', 'list').grep(/^#{name}\s+\(libvirt,/).empty?)
+def has_box?
+ not(capture_vagrant('box', 'list').grep(/^#{box_name}\s+\(libvirt,/).empty?)
end
-def domain_name(name = box_name)
- # Vagrant drops some characters when creating the domain and volumes
- # based on the box name.
- "#{name.delete('+')}_default"
+def domain_name
+ "#{box_name}_default"
end
def clean_up_builder_vms
@@ -577,15 +570,11 @@ namespace :basebox do
time needed for downloading around 250 MiB of Debian packages.
END_OF_MESSAGE
- # args will be either [serial] or [serial, comment]
- args = /^tails-builder-(?:[^-]+)-(?:[^-]+)-(\d{10})(?:-(.+))?$/.match(box_name)[1,2].select { |m| not(m.nil?) }
box_dir = VAGRANT_PATH + '/definitions/tails-builder'
- Dir.chdir(box_dir) do
- run_command('./generate-tails-builder-box.sh', *args)
- end
+ run_command("#{box_dir}/generate-tails-builder-box.sh")
# Let's use an absolute path since run_vagrant changes the working
# directory but File.delete doesn't
- box_path = "#{Dir.pwd}/vagrant/definitions/tails-builder/#{box_name}.box"
+ box_path = "#{box_dir}/#{box_name}.box"
run_vagrant('box', 'add', '--name', box_name, box_path)
File.delete(box_path)
end
diff --git a/auto/config b/auto/config
index 236ac0f..3405ac0 100755
--- a/auto/config
+++ b/auto/config
@@ -76,7 +76,7 @@ $RUN_LB_CONFIG \
--iso-application="The Amnesic Incognito Live System" \
--iso-publisher="https://tails.boum.org/" \
--iso-volume="TAILS ${AMNESIA_FULL_VERSION}" \
- --linux-flavours amd64-unsigned \
+ --linux-flavours amd64 \
--memtest none \
--mirror-binary "$DEBIAN_MIRROR" \
--mirror-bootstrap "$DEBIAN_MIRROR" \
diff --git a/auto/scripts/apt-snapshots-serials b/auto/scripts/apt-snapshots-serials
index d21c03c..528a406 100755
--- a/auto/scripts/apt-snapshots-serials
+++ b/auto/scripts/apt-snapshots-serials
@@ -6,6 +6,8 @@ set -o pipefail
BASE_URL=http://time-based.snapshots.deb.tails.boum.org/
CONFIG=config/APT_snapshots.d
+SERIAL_ONLY=
+FREEZE_EXCEPTIONS=debian-security
get_latest_serial() {
origin=$1
@@ -19,6 +21,14 @@ if [ $# -eq 0 ]; then
else
action="${1}"
shift
+ if [ "${1:-}" = --print-serials-only ]; then
+ SERIAL_ONLY=yes
+ shift
+ fi
+ if [ "${1:-}" = --freeze-debian-security ]; then
+ FREEZE_EXCEPTIONS=
+ shift
+ fi
if [ $# -eq 0 ]; then
ORIGINS="$(cd ${CONFIG}; ls -d *)"
else
@@ -29,14 +39,14 @@ fi
case "$action" in
cat)
for origin in $ORIGINS; do
- echo -n "$origin: "
+ [ -z "${SERIAL_ONLY}" ] && echo -n "$origin: "
cat "$CONFIG/$origin/serial"
done
;;
get-latest)
for origin in $ORIGINS; do
- online=$(get_latest_serial $origin)
- echo "$origin: $online"
+ [ -z "${SERIAL_ONLY}" ] && echo -n "$origin: "
+ get_latest_serial $origin
done
;;
freeze)
@@ -44,7 +54,7 @@ case "$action" in
serial_file="$CONFIG/$origin/serial"
git=$(cat $serial_file)
case "$origin" in
- debian-security)
+ ${FREEZE_EXCEPTIONS})
new=latest
;;
*)
diff --git a/config/APT_overlays.d/bugfix-12364-greeter-races b/config/APT_overlays.d/bugfix-12364-greeter-races
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/config/APT_overlays.d/bugfix-12364-greeter-races
diff --git a/config/APT_overlays.d/feature-11712-thunderbird b/config/APT_overlays.d/feature-11712-thunderbird
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/config/APT_overlays.d/feature-11712-thunderbird
diff --git a/config/APT_snapshots.d/debian/serial b/config/APT_snapshots.d/debian/serial
index 46309c0..3be6e28 100644
--- a/config/APT_snapshots.d/debian/serial
+++ b/config/APT_snapshots.d/debian/serial
@@ -1 +1 @@
-2017041704
+2017051803
diff --git a/config/APT_snapshots.d/torproject/serial b/config/APT_snapshots.d/torproject/serial
index 46309c0..3be6e28 100644
--- a/config/APT_snapshots.d/torproject/serial
+++ b/config/APT_snapshots.d/torproject/serial
@@ -1 +1 @@
-2017041704
+2017051803
diff --git a/config/amnesia b/config/amnesia
index 97e0115..a2e64e0 100644
--- a/config/amnesia
+++ b/config/amnesia
@@ -22,7 +22,7 @@ AMNESIA_ISOHYBRID_OPTS="-h 255 -s 63"
REQUIRED_SYSLINUX_UTILS_UPSTREAM_VERSION="6.03~pre20"
# Kernel version
-KERNEL_VERSION='4.9.0-2'
+KERNEL_VERSION='4.9.0-3'
KERNEL_SOURCE_VERSION=$(
echo "$KERNEL_VERSION" \
| perl -p -E 's{\A (\d+ [.] \d+) [.] .*}{$1}xms'
diff --git a/config/binary_local-hooks/05-rename-kernels b/config/binary_local-hooks/05-rename-kernels
deleted file mode 100644
index c29f8d9..0000000
--- a/config/binary_local-hooks/05-rename-kernels
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Including common functions
-. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'renaming kernels')"
-HELP=""
-USAGE="${PROGRAM}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/binary
-Set_defaults
-
-Echo_message "Renaming kernels"
-
-mv binary/live/vmlinuz-*-amd64 binary/live/vmlinuz
-mv binary/live/initrd.img-*-amd64 binary/live/initrd.img
diff --git a/config/chroot_apt/preferences b/config/chroot_apt/preferences
index 6e2d9f2..6c19c10 100644
--- a/config/chroot_apt/preferences
+++ b/config/chroot_apt/preferences
@@ -23,8 +23,8 @@ Package: firmware-zd1211
Pin: release o=Debian,n=sid
Pin-Priority: 999
-Explanation: We ship our custom-built Icedove for now, see #6156
-Package: icedove* iceowl* calendar-google-provider
+Explanation: We ship our custom-built Thunderbird for now, see #6156
+Package: thunderbird* calendar-google-provider
Pin: origin deb.tails.boum.org
Pin-Priority: 999
diff --git a/config/chroot_local-hooks/11-enable-icedove-addons b/config/chroot_local-hooks/11-enable-thunderbird-addons
index cae947b..3280a2e 100755
--- a/config/chroot_local-hooks/11-enable-icedove-addons
+++ b/config/chroot_local-hooks/11-enable-thunderbird-addons
@@ -3,10 +3,10 @@
set -e
set -u
-EXT="/usr/lib/icedove/extensions"
+EXT="/usr/lib/thunderbird/extensions"
[ -d "$EXT" ] || exit 1
-echo "Enabling Torbirdy and Enigmail in Icedove"
+echo "Enabling Torbirdy and Enigmail in Thunderbird"
ln -s /usr/share/xul-ext/torbirdy "${EXT}/castironthunderbirdclub@torproject.org"
ln -s /usr/share/xul-ext/enigmail "${EXT}/{847b3a00-7ab1-11d4-8f02-006008948af5}"
diff --git a/config/chroot_local-hooks/30-disable-wayland-in-gdm b/config/chroot_local-hooks/30-disable-wayland-in-gdm
index 6c6464d..efe4107 100755
--- a/config/chroot_local-hooks/30-disable-wayland-in-gdm
+++ b/config/chroot_local-hooks/30-disable-wayland-in-gdm
@@ -1,9 +1,6 @@
#!/bin/sh
set -e
set -u
-echo "Explicitly disable Wayland in GDM, and adjust permissions accordingly"
+echo "Explicitly disable Wayland in GDM"
sed --in-place --regexp-extended \
's/^#WaylandEnable=false$/WaylandEnable=false/' /etc/gdm3/daemon.conf
-
-# rootless X.Org may require access to /dev/fb0, that's owned by root:video
-adduser Debian-gdm video
diff --git a/config/chroot_local-hooks/52-update-rc.d b/config/chroot_local-hooks/52-update-rc.d
index ddb97f1..a01b4d4 100755
--- a/config/chroot_local-hooks/52-update-rc.d
+++ b/config/chroot_local-hooks/52-update-rc.d
@@ -8,12 +8,11 @@ set -e
systemctl enable memlockd.service
# Enable our own systemd unit files
+systemctl enable initramfs-shutdown.service
systemctl enable onion-grater.service
systemctl enable tails-autotest-remote-shell.service
-systemctl enable tails-reconfigure-kexec.service
-systemctl enable tails-reconfigure-memlockd.service
-systemctl enable tails-sdmem-on-media-removal.service
systemctl enable tails-set-wireless-devices-state.service
+systemctl enable tails-shutdown-on-media-removal.service
systemctl enable tails-tor-has-bootstrapped.target
systemctl enable tails-wait-until-tor-has-bootstrapped.service
systemctl enable tails-tor-has-bootstrapped-flag-file.service
@@ -46,11 +45,6 @@ systemctl disable tor.service
systemctl disable NetworkManager.service
systemctl disable NetworkManager-wait-online.service
-# Don't hide tails-kexec's shutdown messages with an empty splash screen
-for suffix in halt kexec poweroff reboot shutdown ; do
- systemctl mask "plymouth-${suffix}.service"
-done
-
# systemd-networkd fallbacks to Google's nameservers when no other nameserver
# is provided by the network configuration. In Jessie, this service is disabled
# by default, but it feels safer to make this explicit. Besides, it might be
diff --git a/config/chroot_local-hooks/53-icedove-menu b/config/chroot_local-hooks/53-icedove-menu
deleted file mode 100755
index 0b1a30e..0000000
--- a/config/chroot_local-hooks/53-icedove-menu
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-set -e
-
-echo 'Updating icedove.desktop'
-sed -i 's;^Exec=icedove;Exec=/usr/local/bin/icedove;' /usr/share/applications/icedove.desktop
diff --git a/config/chroot_local-hooks/53-thunderbird-menu b/config/chroot_local-hooks/53-thunderbird-menu
new file mode 100755
index 0000000..9501446
--- /dev/null
+++ b/config/chroot_local-hooks/53-thunderbird-menu
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+set -e
+
+echo 'Updating thunderbird.desktop'
+sed -i --regexp-extended \
+ 's;^Exec=\S+;Exec=/usr/local/bin/thunderbird;' \
+ /usr/share/applications/thunderbird.desktop
diff --git a/config/chroot_local-hooks/65-initramfs-scripts b/config/chroot_local-hooks/65-initramfs-scripts
deleted file mode 100755
index b69cb3d..0000000
--- a/config/chroot_local-hooks/65-initramfs-scripts
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-set -e
-
-echo "Adding memory_wipe to the prereqs of all other init-top initramfs scripts"
-
-(
- cd /usr/share/initramfs-tools/scripts/init-top
- for script in * ; do
- [ "$script" != memory_wipe ] || continue
- sed --regexp-extended -i \
- -e 's/^(PREREQS?)="(.*)"/\1="memory_wipe \2"/' \
- "$script"
- done
-)
diff --git a/config/chroot_local-includes/etc/NetworkManager/dispatcher.d/10-tor.sh b/config/chroot_local-includes/etc/NetworkManager/dispatcher.d/10-tor.sh
index adfca27..6350887 100755
--- a/config/chroot_local-includes/etc/NetworkManager/dispatcher.d/10-tor.sh
+++ b/config/chroot_local-includes/etc/NetworkManager/dispatcher.d/10-tor.sh
@@ -43,7 +43,9 @@ systemctl --no-block restart tails-tor-has-bootstrapped.target
# a HTTP proxy or allowed firewall ports won't get the sandboxing, but
# much better than nothing.
if [ "$(tails_netconf)" = "direct" ]; then
- tor_set_in_torrc Sandbox 1
+ # https://trac.torproject.org/projects/tor/ticket/21943
+ # tor_set_in_torrc Sandbox 1
+ true
fi
# We would like Tor to be started during init time, even before the
diff --git a/config/chroot_local-includes/etc/apparmor.d/disable/usr.bin.thunderbird b/config/chroot_local-includes/etc/apparmor.d/disable/usr.bin.thunderbird
new file mode 120000
index 0000000..4a8d0f1
--- /dev/null
+++ b/config/chroot_local-includes/etc/apparmor.d/disable/usr.bin.thunderbird
@@ -0,0 +1 @@
+/etc/apparmor.d/usr.bin.thunderbird \ No newline at end of file
diff --git a/config/chroot_local-includes/etc/apparmor.d/usr.bin.onioncircuits b/config/chroot_local-includes/etc/apparmor.d/usr.bin.onioncircuits
index 61c0cb6..d41b4de 100644
--- a/config/chroot_local-includes/etc/apparmor.d/usr.bin.onioncircuits
+++ b/config/chroot_local-includes/etc/apparmor.d/usr.bin.onioncircuits
@@ -18,6 +18,7 @@
/usr/bin/ r,
/usr/bin/onioncircuits r,
/usr/share/xml/iso-codes/** r,
+ owner @{PROC}/@{pid}/status r,
deny /etc/machine-id r,
diff --git a/config/chroot_local-includes/etc/dconf/db/local.d/00_Tails_defaults b/config/chroot_local-includes/etc/dconf/db/local.d/00_Tails_defaults
index 1be621e..0df284d 100644
--- a/config/chroot_local-includes/etc/dconf/db/local.d/00_Tails_defaults
+++ b/config/chroot_local-includes/etc/dconf/db/local.d/00_Tails_defaults
@@ -78,4 +78,4 @@ lid-close-battery-action = 'blank'
[org/gnome/shell]
enabled-extensions = ['apps-menu@gnome-shell-extensions.gcampax.github.com', 'places-menu@gnome-shell-extensions.gcampax.github.com', 'window-list@gnome-shell-extensions.gcampax.github.com', 'florenceIndicator@UshakovVasilii_Github.yahoo.com', 'TopIcons@phocean.net', 'shutdown-helper@tails.boum.org', 'torstatus@tails.boum.org']
-favorite-apps=['tor-browser.desktop', 'icedove.desktop', 'pidgin.desktop', 'keepassx.desktop', 'gnome-terminal.desktop']
+favorite-apps=['tor-browser.desktop', 'thunderbird.desktop', 'pidgin.desktop', 'keepassx.desktop', 'gnome-terminal.desktop']
diff --git a/config/chroot_local-includes/etc/default/kexec b/config/chroot_local-includes/etc/default/kexec
deleted file mode 100644
index ab6cc02..0000000
--- a/config/chroot_local-includes/etc/default/kexec
+++ /dev/null
@@ -1,21 +0,0 @@
-# Defaults for kexec initscript
-# sourced by kexec-tools.config, /etc/init.d/kexec and /etc/init.d/kexec-load
-
-# Load a kexec kernel (true/false)
-LOAD_KEXEC=true
-
-# Kernel and initrd image
-# Unused: tails-reconfigure-kexec appends the correct values to this file
-# at boot time.
-KERNEL_IMAGE=/vmlinux
-INITRD=/initrd.img
-
-rebooting() {
- systemctl list-jobs systemd-reboot.service | grep -qs systemd-reboot.service
-}
-
-if rebooting ; then
- APPEND="${APPEND} sdmem=reboot sdmemopts=vllf"
-else
- APPEND="${APPEND} sdmem=halt sdmemopts=vllf"
-fi
diff --git a/config/chroot_local-includes/etc/memlockd.cfg b/config/chroot_local-includes/etc/memlockd.cfg
index be992b3..a2907fe 100644
--- a/config/chroot_local-includes/etc/memlockd.cfg
+++ b/config/chroot_local-includes/etc/memlockd.cfg
@@ -1,12 +1,20 @@
+/bin/cat
+/bin/echo
++/bin/grep
++/bin/kill
++/bin/loginctl
++/bin/ls
++/bin/mkdir
++/bin/mktemp
++/bin/mount
++/bin/mv
++/bin/plymouth
++/bin/rm
+/bin/sh
+/bin/sleep
-+/bin/stty
-/etc/default/locale
-/etc/init.d/kexec-load
-/lib/systemd/system-shutdown/tails-kexec
-+/sbin/kexec
++/bin/systemctl
+/lib/systemd/system-shutdown/tails
++/lib/systemd/systemd-shutdown
+/usr/bin/eject
+/usr/bin/pkill
+/usr/local/sbin/udev-watchdog
diff --git a/config/chroot_local-includes/etc/skel/.config/keepassx/keepassx2.ini b/config/chroot_local-includes/etc/skel/.config/keepassx/keepassx2.ini
index eebc543..64814ec 100644
--- a/config/chroot_local-includes/etc/skel/.config/keepassx/keepassx2.ini
+++ b/config/chroot_local-includes/etc/skel/.config/keepassx/keepassx2.ini
@@ -1,4 +1,5 @@
[General]
+AutoSaveAfterEveryChange=true
ShowToolbar=true
LastOpenedDatabases=/home/amnesia/Persistent/keepassx.kdbx
LastDatabases=/home/amnesia/Persistent/keepassx.kdbx
diff --git a/config/chroot_local-includes/etc/skel/.local/share/applications/mimeapps.list b/config/chroot_local-includes/etc/skel/.local/share/applications/mimeapps.list
index a23aa67..301d35e 100644
--- a/config/chroot_local-includes/etc/skel/.local/share/applications/mimeapps.list
+++ b/config/chroot_local-includes/etc/skel/.local/share/applications/mimeapps.list
@@ -9,11 +9,11 @@ application/pgp-encrypted=seahorse-pgp-encrypted.desktop
application/pgp-keys=seahorse-pgp-keys.desktop
application/pgp-signature=seahorse-pgp-signature.desktop
application/x-iwork-keynote-sffkey=seahorse-pgp-keys.desktop
-x-scheme-handler/mailto=icedove.desktop
+x-scheme-handler/mailto=thunderbird.desktop
[Added Associations]
application/pgp-encrypted=seahorse-pgp-encrypted.desktop
application/pgp-keys=seahorse-pgp-keys.desktop
application/pgp-signature=seahorse-pgp-signature.desktop
application/x-iwork-keynote-sffkey=seahorse-pgp-keys.desktop
-x-scheme-handler/mailto=icedove.desktop
+x-scheme-handler/mailto=thunderbird.desktop
diff --git a/config/chroot_local-includes/etc/skel/.icedove/profile.default/chrome/userChrome.css b/config/chroot_local-includes/etc/skel/.thunderbird/profile.default/chrome/userChrome.css
index 5c6bd6d..a9a4a85 100644
--- a/config/chroot_local-includes/etc/skel/.icedove/profile.default/chrome/userChrome.css
+++ b/config/chroot_local-includes/etc/skel/.thunderbird/profile.default/chrome/userChrome.css
@@ -9,7 +9,7 @@
#torbirdy-anon-settings,
#torbirdy-anonservice,
-/* Hide "Chat account" on Icedove's start-up page */
+/* Hide "Chat account" on Thunderbird's start-up page */
#CreateAccountChat
{ display: none; }
diff --git a/config/chroot_local-includes/etc/skel/.icedove/profile.default/preferences/0000tails.js b/config/chroot_local-includes/etc/skel/.thunderbird/profile.default/preferences/0000tails.js
index e817a81..e817a81 100644
--- a/config/chroot_local-includes/etc/skel/.icedove/profile.default/preferences/0000tails.js
+++ b/config/chroot_local-includes/etc/skel/.thunderbird/profile.default/preferences/0000tails.js
diff --git a/config/chroot_local-includes/etc/icedove/pref/icedove.js b/config/chroot_local-includes/etc/thunderbird/pref/thunderbird.js
index fe71bde..059d46e 100644
--- a/config/chroot_local-includes/etc/icedove/pref/icedove.js
+++ b/config/chroot_local-includes/etc/thunderbird/pref/thunderbird.js
@@ -32,13 +32,13 @@ pref("extensions.enabledScopes", 4);
// Only show the tab bar if there's more than one tab to display
pref("mail.tabs.autoHide", true);
-// Try to disable "Would you like to help Icedove Mail/News by automatically reporting memory usage, performance, and responsiveness to Mozilla"
+// Try to disable "Would you like to help Thunderbird Mail/News by automatically reporting memory usage, performance, and responsiveness to Mozilla"
pref("toolkit.telemetry.prompted", 2);
pref("toolkit.telemetry.rejected", true);
pref("toolkit.telemetry.enabled", false);
-// Only allow Icedove's automatic configuration wizard to use and
-// configure secure (SSL/TLS) protocols. This is the Icedove default
+// Only allow Thunderbird's automatic configuration wizard to use and
+// configure secure (SSL/TLS) protocols. This is the Thunderbird default
// but let's be extra sure!
pref("mailnews.auto_config.ssl_only", true);
// Drop auto-fetched configurations using Oauth2 -- they do not work
diff --git a/config/chroot_local-includes/lib/systemd/system-shutdown/tails b/config/chroot_local-includes/lib/systemd/system-shutdown/tails
new file mode 100755
index 0000000..4a496d1
--- /dev/null
+++ b/config/chroot_local-includes/lib/systemd/system-shutdown/tails
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+set -x
+
+# This script is only run by the instance of systemd-shutdown that's
+# run outside of the initramfs, and not by the other instance of
+# systemd-shutdown that's run (as /shutdown) after returning to the
+# initramfs during shutdown: in the initramfs, this script is
+# overwritten with /usr/local/lib/initramfs-pre-shutdown-hook.
+
+# Otherwise systemd-shutdown cannot execute /run/initramfs/shutdown
+/bin/mount -o remount,exec /run
+
+# Debugging
+/bin/ls -l /run/initramfs
+
+echo 3 > /proc/sys/vm/drop_caches
diff --git a/config/chroot_local-includes/lib/systemd/system-shutdown/tails-kexec b/config/chroot_local-includes/lib/systemd/system-shutdown/tails-kexec
deleted file mode 100755
index 57fc4d4..0000000
--- a/config/chroot_local-includes/lib/systemd/system-shutdown/tails-kexec
+++ /dev/null
@@ -1,96 +0,0 @@
-#! /bin/sh
-
-# FIXME: this script should be translatable in a better way than the
-# ugly case..esac thing. Note that using gettext at this point -i.e.
-# after the DVD has been ejected- is probably too brittle. A possible
-# solution would be to turn this script into a .in file, with
-# placeholders for translatable string. Translatable strings and their
-# translations could be managed by ikiwiki+po, and the placeholders
-# could be replaced at boot time -depending on the chosen locale- by
-# the appropriate strings. Unfortunately po4a does not support shell
-# scripts.
-
-PATH=/sbin:/bin
-
-print_text () {
- echo "$1" > /dev/console
-}
-
-print_empty_line () {
- print_text ''
-}
-
-### Main
-
-test "x`/bin/cat /sys/kernel/kexec_loaded`y" = "x1y" || exit 0
-
-/bin/stty sane < /dev/console
-
-print_empty_line
-print_empty_line
-print_text "--------------------------------------------------------------------------------"
-
-# $LANG was set there by the FIXME live-config upstream script
-. /etc/default/locale
-
-# Note to translators: any text line must fit on a 80 characters wide screen
-case "${LANG}" in
- de_DE.UTF-8)
- print_text " Sie können nun die Start-DVD oder den Start-USB-Stick entfernen"
- print_empty_line
- print_text " Der Systemspeicher wird in einigen Sekunden gelöscht..."
- print_empty_line
- print_text " Die Anzeige könnte anschließend fehlerhaft sein."
- print_empty_line
- print_text " Falls sich das System in einigen Sekunden nicht selbst ausschaltet,"
- print_text " bedeutet dies, dass die Speicherlöschung fehlgeschlagen ist."
- ;;
- es_ES.UTF-8)
- print_text " Puede ahora retirar el DVD o el USB de arranque."
- print_empty_line
- print_text " Se borrará dentro de pocos segundos la memoria RAM del sistema..."
- print_empty_line
- print_text "Pueden aparecer problemas de visualización en el monitor durante esta operación."
- print_empty_line
- print_text " If the system does not power off automatically in a few seconds,"
- print_text " it may mean the memory wiping has failed."
- ;;
- fr_FR.UTF-8)
- print_text " Vous pouvez maintenant retirer le DVD / clé USB de boot."
- print_empty_line
- print_text " La mémoire vive va être effacée dans quelques secondes..."
- print_empty_line
- print_text " Il est possible que l'affichage soit corrompu au cours de cette opération."
- print_empty_line
- print_text " Si l'ordinateur ne s'éteint pas automatiquement après quelques secondes,"
- print_text " il est possible que l'effacement de la mémoire ait échoué."
- ;;
- it*)
- print_text " Adesso puoi rimuovere il cd o la penna USB."
- print_empty_line
- print_text " La memoria del computer verra' cancellata tra pochi secondi..."
- print_empty_line
- print_text " Il display potra' essere corrotto durante questa operazione."
- print_empty_line
- print_text " Se vostro PC non si spegnera' automaticamente in pochi secondi"
- print_text " la cancellazione della memoria potrebbe essere incompleta."
-
- ;;
- *)
- print_text " You can now remove the boot DVD or USB stick."
- print_empty_line
- print_text " The system memory is going to be wiped in a few seconds..."
- print_empty_line
- print_text " Display might be corrupted during this operation."
- print_empty_line
- print_text " If the system does not power off automatically in a few seconds,"
- print_text " it may mean the memory wiping has failed."
- ;;
-esac
-
-print_text "--------------------------------------------------------------------------------"
-print_empty_line
-print_empty_line
-
-/bin/sleep 5
-/sbin/kexec -e --reset-vga
diff --git a/config/chroot_local-includes/lib/systemd/system/initramfs-shutdown.service b/config/chroot_local-includes/lib/systemd/system/initramfs-shutdown.service
new file mode 100644
index 0000000..431c05c
--- /dev/null
+++ b/config/chroot_local-includes/lib/systemd/system/initramfs-shutdown.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Prepare /run/initramfs for shutdown
+Documentation=https://tails.boum.org/contribute/design/memory_erasure/
+ConditionPathExists=!/run/initramfs/bin/sh
+
+[Service]
+RemainAfterExit=yes
+Type=oneshot
+ExecStart=/usr/local/lib/initramfs-restore
+
+[Install]
+WantedBy=multi-user.target
diff --git a/config/chroot_local-includes/lib/systemd/system/kexec.service b/config/chroot_local-includes/lib/systemd/system/kexec.service
deleted file mode 120000
index dc1dc0c..0000000
--- a/config/chroot_local-includes/lib/systemd/system/kexec.service
+++ /dev/null
@@ -1 +0,0 @@
-/dev/null \ No newline at end of file
diff --git a/config/chroot_local-includes/lib/systemd/system/tails-reconfigure-kexec.service b/config/chroot_local-includes/lib/systemd/system/tails-reconfigure-kexec.service
deleted file mode 100644
index cd276ea..0000000
--- a/config/chroot_local-includes/lib/systemd/system/tails-reconfigure-kexec.service
+++ /dev/null
@@ -1,17 +0,0 @@
-[Unit]
-Description=Reconfigure kexec depending on running kernel
-Documentation=https://tails.boum.org/contribute/design/memory_erasure/
-
-[Service]
-Type=oneshot
-ExecStart=/usr/local/sbin/tails-reconfigure-kexec
-RemainAfterExit=yes
-CapabilityBoundingSet=
-PrivateDevices=yes
-PrivateNetwork=yes
-PrivateTmp=yes
-ProtectHome=yes
-ProtectSystem=yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/config/chroot_local-includes/lib/systemd/system/tails-reconfigure-memlockd.service b/config/chroot_local-includes/lib/systemd/system/tails-reconfigure-memlockd.service
deleted file mode 100644
index 1641835..0000000
--- a/config/chroot_local-includes/lib/systemd/system/tails-reconfigure-memlockd.service
+++ /dev/null
@@ -1,18 +0,0 @@
-[Unit]
-Description=Reconfigure memlockd depending on running kernel
-Documentation=https://tails.boum.org/contribute/design/memory_erasure/
-Before=memlockd.service
-
-[Service]
-Type=oneshot
-ExecStart=/usr/local/sbin/tails-reconfigure-memlockd
-RemainAfterExit=yes
-CapabilityBoundingSet=
-PrivateDevices=yes
-PrivateNetwork=yes
-PrivateTmp=yes
-ProtectHome=yes
-ProtectSystem=yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/config/chroot_local-includes/lib/systemd/system/tails-sdmem-on-media-removal.service b/config/chroot_local-includes/lib/systemd/system/tails-shutdown-on-media-removal.service
index 702f4cb..ac9c96c 100644
--- a/config/chroot_local-includes/lib/systemd/system/tails-sdmem-on-media-removal.service
+++ b/config/chroot_local-includes/lib/systemd/system/tails-shutdown-on-media-removal.service
@@ -1,7 +1,7 @@
[Unit]
Description=Wipe memory on live media removal
Documentation=https://tails.boum.org/contribute/design/memory_erasure/
-After=memlockd.service tails-reconfigure-kexec.service tails-reconfigure-memlockd.service
+After=memlockd.service
[Service]
Type=simple
diff --git a/config/chroot_local-includes/usr/local/bin/icedove b/config/chroot_local-includes/usr/local/bin/icedove
deleted file mode 100755
index 705d975..0000000
--- a/config/chroot_local-includes/usr/local/bin/icedove
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/bin/sh
-
-set -e
-set -u
-
-# Import set_mozilla_pref()
-. /usr/local/lib/tails-shell-library/tor-browser.sh
-
-. gettext.sh
-TEXTDOMAIN="tails"
-export TEXTDOMAIN
-
-CLAWSMAIL_CONFIG_DIR="${HOME}/.claws-mail"
-ICEDOVE_CONFIG_DIR="${HOME}/.icedove"
-PROFILE="${ICEDOVE_CONFIG_DIR}/profile.default"
-
-claws_mail_config_is_persistent() {
- [ "$(findmnt --noheadings --output SOURCE --target "${CLAWSMAIL_CONFIG_DIR}")" = "/dev/mapper/TailsData_unlocked[/claws-mail]" ]
-}
-
-icedove_config_is_persistent() {
- [ "$(findmnt --noheadings --output SOURCE --target "${ICEDOVE_CONFIG_DIR}")" = "/dev/mapper/TailsData_unlocked[/icedove]" ]
-}
-
-warn_about_claws_mail_persistence() {
-
- local dialog_msg="<b><big>`gettext \"The <b>Claws Mail</b> persistence feature is activated.\"`</big></b>
-
-`gettext \"If you have emails saved in <b>Claws Mail</b>, you should <a href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate your data</a> before starting <b>Icedove</b>.\"`"
-
- if [ -f "${PROFILE}/prefs.js" ]; then
- dialog_msg="${dialog_msg}
-
-`gettext \"If you already migrated your emails to <b>Icedove</b>, you should <a href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove#delete'>delete all your <b>Claws Mail</b> data</a> to remove this warning.\"`"
- fi
-
- local launch="`gettext \"_Launch\"`"
- local exit="`gettext \"_Exit\"`"
- zenity --question --title "" --text "${dialog_msg}" --default-cancel \
- --ok-label "${launch}" --cancel-label "${exit}"
-}
-
-configure_default_incoming_protocol() {
- # For extensions.torbirdy.defaultprotocol, POP = 0, IMAP = 1
- local default_protocol
- if icedove_config_is_persistent; then
- default_protocol=0
- else
- default_protocol=1
- fi
- set_mozilla_pref "${PROFILE}/preferences/0000tails.js" \
- "extensions.torbirdy.defaultprotocol" \
- "${default_protocol}"
-}
-
-start_icedove() {
- # Give Icedove its own temp directory, similar rationale to a1fd1f0f & #9558.
- TMPDIR="${PROFILE}/tmp"
- mkdir --mode=0700 -p "$TMPDIR"
- export TMPDIR
-
- unset SESSION_MANAGER
-
- configure_default_incoming_protocol
- /usr/bin/icedove --class "Icedove" -profile "${PROFILE}" "${@}"
-}
-
-if claws_mail_config_is_persistent && [ -f "${CLAWSMAIL_CONFIG_DIR}/accountrc" ]; then
- warn_about_claws_mail_persistence || exit 0
-fi
-
-start_icedove "${@}"
diff --git a/config/chroot_local-includes/usr/local/bin/thunderbird b/config/chroot_local-includes/usr/local/bin/thunderbird
new file mode 100755
index 0000000..b426343
--- /dev/null
+++ b/config/chroot_local-includes/usr/local/bin/thunderbird
@@ -0,0 +1,51 @@
+#!/bin/sh
+
+set -e
+set -u
+
+# Import set_mozilla_pref()
+. /usr/local/lib/tails-shell-library/tor-browser.sh
+
+THUNDERBIRD_CONFIG_DIR="${HOME}/.thunderbird"
+PROFILE="${THUNDERBIRD_CONFIG_DIR}/profile.default"
+
+thunderbird_config_is_persistent() {
+ [ "$(findmnt --noheadings --output SOURCE --target "${THUNDERBIRD_CONFIG_DIR}")" = "/dev/mapper/TailsData_unlocked[/thunderbird]" ]
+}
+
+configure_default_incoming_protocol() {
+ # For extensions.torbirdy.defaultprotocol, POP = 0, IMAP = 1
+ local default_protocol
+ if thunderbird_config_is_persistent; then
+ default_protocol=0
+ else
+ default_protocol=1
+ fi
+ set_mozilla_pref "${PROFILE}/preferences/0000tails.js" \
+ "extensions.torbirdy.defaultprotocol" \
+ "${default_protocol}"
+}
+
+start_thunderbird() {
+ # Give Thunderbird its own temp directory, similar rationale to a1fd1f0f & #9558.
+ TMPDIR="${PROFILE}/tmp"
+ mkdir --mode=0700 -p "$TMPDIR"
+ export TMPDIR
+
+ unset SESSION_MANAGER
+
+ configure_default_incoming_protocol
+
+ # Apply only the relevant parts of Debian's Icedove → Thunderbird
+ # migration procedure.
+ TB_PROFILE_FOLDER="${THUNDERBIRD_CONFIG_DIR}"
+ if [ ! -f "${TB_PROFILE_FOLDER}/.migrated" ]; then
+ . /usr/lib/thunderbird/thunderbird-wrapper-helper.sh
+ do_fix_mimetypes_rdf
+ do_create_migrated_mark_file
+ fi
+
+ /usr/bin/thunderbird --class "Thunderbird" -profile "${PROFILE}" "${@}"
+}
+
+start_thunderbird "${@}"
diff --git a/config/chroot_local-includes/usr/local/lib/initramfs-pre-shutdown-hook b/config/chroot_local-includes/usr/local/lib/initramfs-pre-shutdown-hook
new file mode 100755
index 0000000..607c257
--- /dev/null
+++ b/config/chroot_local-includes/usr/local/lib/initramfs-pre-shutdown-hook
@@ -0,0 +1,56 @@
+#!/bin/sh
+
+# This script is installed by /usr/share/initramfs-tools/hooks/shutdown
+# into the initramfs, as /lib/systemd/system-shutdown/tails. It's run by the
+# copy of systemd-shutdown that runs (as /shutdown) from inside
+# the unpacked initramfs, immediately before executing the requested action
+# (halt/poweroff/reboot).
+
+set -x
+
+### Unmount relevant filesystems
+
+# Debugging
+mount
+
+# Otherwise aufs pseudo-links can't be cleaned and we cannot drop caches.
+# This may also help for tracking remaining mounts.
+mount -o remount,rw /proc
+
+# Otherwise we can't create new mountpoints in /mnt
+mount -o remount,rw /
+
+# Otherwise aufs pseudo-links can't be removed while unmounting /oldroot,
+# and we can't clean up the content of /mnt/live/overlay.
+mount -o remount,rw /oldroot/lib/live/mount/overlay
+
+# Move /oldroot/* mountpoints out of the way
+mkdir -p /mnt/live/overlay
+mount --move \
+ /oldroot/lib/live/mount/overlay \
+ /mnt/live/overlay
+mkdir -p /mnt/live/squashfs
+mount --move \
+ /oldroot/lib/live/mount/rootfs/filesystem.squashfs \
+ /mnt/live/squashfs
+mkdir -p /mnt/live/medium
+mount --move \
+ /oldroot/lib/live/mount/medium \
+ /mnt/live/medium
+
+# Finally, really unmount relevant filesystems
+umount /oldroot
+rm -rf /mnt/live/overlay/.w* /mnt/live/overlay/*
+umount /mnt/live/overlay
+
+# Debugging
+mount
+
+### Ensure any remaining disk cache is erased by Linux' memory poisoning
+echo 3 > /proc/sys/vm/drop_caches
+
+### Pause if the test suite wants us to
+if [ -e /tails_shutdown_debugging ] ; then
+ echo "Going to sleep 2 minutes. Happy dumping!"
+ sleep 120
+fi
diff --git a/config/chroot_local-includes/usr/local/lib/initramfs-restore b/config/chroot_local-includes/usr/local/lib/initramfs-restore
new file mode 100755
index 0000000..7f006a9
--- /dev/null
+++ b/config/chroot_local-includes/usr/local/lib/initramfs-restore
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+set -e
+set -u
+
+WORKDIR=$(/bin/mktemp -d)
+
+/usr/bin/unmkinitramfs \
+ "$(/usr/local/bin/tails-get-bootinfo initrd)" \
+ "$WORKDIR"
+
+# We should not need any kernel modules in there at shutdown time,
+# and they take 66% of the entire uncompressed initramfs size, so
+# let's save some RAM.
+/bin/rm -rf "$WORKDIR"/main/lib/modules
+
+/bin/mv "$WORKDIR"/main/* /run/initramfs/
+
+/bin/rm -rf "$WORKDIR"
diff --git a/config/chroot_local-includes/usr/local/lib/udev-watchdog-wrapper b/config/chroot_local-includes/usr/local/lib/udev-watchdog-wrapper
index 1da9b2c..681319a 100755
--- a/config/chroot_local-includes/usr/local/lib/udev-watchdog-wrapper
+++ b/config/chroot_local-includes/usr/local/lib/udev-watchdog-wrapper
@@ -51,9 +51,17 @@ do_stop() {
/usr/bin/eject -m "${BOOT_DEVICE}" || true
fi
- /usr/bin/pkill gdm3 || true
- /etc/init.d/kexec-load stop || true
- /lib/systemd/system-shutdown/tails-kexec || true
+ # Kill everything run by amnesia or Debian-gdm, otherwise emergency
+ # shutdown fails for some reason. Incidentally, this also allows
+ # the test suite to look for a known message ("Happy dumping!")
+ # on the screen.
+ /bin/loginctl --signal=9 kill-user amnesia || true
+ /bin/systemctl stop gdm.service || true
+ /bin/systemctl --signal=9 kill gdm.service || true
+ /bin/loginctl --signal=9 kill-user Debian-gdm || true
+
+ # Finally, return to the initramfs and poweroff the system
+ /bin/systemctl --force poweroff
}
diff --git a/config/chroot_local-includes/usr/local/sbin/live-persist b/config/chroot_local-includes/usr/local/sbin/live-persist
index 3182beb..8165912 100755
--- a/config/chroot_local-includes/usr/local/sbin/live-persist
+++ b/config/chroot_local-includes/usr/local/sbin/live-persist
@@ -6,6 +6,11 @@ error ()
exit 1
}
+warning ()
+{
+ echo "warning: ${@}" >&2
+}
+
# import Cmdline_old()
. /lib/live/boot/9990-cmdline-old \
|| error 'Could not source /lib/live/boot/9990-cmdline-old'
@@ -64,40 +69,78 @@ Options affecting the 'activate' action:
"
}
+escape() {
+ printf "%s\n" "${2}" | sed --regexp-extended "s/[${1}]/\\\&/g"
+}
+
escape_dots() {
- printf "%s\n" $1 | sed 's/\./\\./g'
+ escape . "${@}"
+}
+
+add_persistence_preset()
+{
+ local PRESET="${1}"
+ local PRESET_SOURCE="${2}"
+ local CONFIG="${3}"
+ if [ "${PERSISTENCE_READONLY}" = true ]
+ then
+ warning "We are trying to add a persistence preset while" \
+ "persistence is in read-only mode"
+ else
+ echo "${PRESET} source=${PRESET_SOURCE}" \
+ >> "${CONFIG}" || error "Failed to make ${PRESET}: $?"
+ warning "Successfully made ${PRESET} persistent"
+ fi
+}
+
+remove_persistence_preset()
+{
+ local PRESET="${1}"
+ local CONFIG="${2}"
+ # The intent here is to simply remove the line starting with
+ # $PRESET, but since it is a path, and sed uses / as delimiter
+ # for patterns we can use together with d, we have to escape /
+ # (and . as usual).
+ sed -i "/^$(escape './' "${PRESET}")\s/d" "${CONFIG}"
+}
+
+is_preset_enabled() {
+ local PRESET="${1}"
+ local PRESET_SOURCE="${2}"
+ local CONFIG="${3}"
+ grep --extended-regexp --line-regex --quiet --no-messages \
+ -e "$(escape_dots ${PRESET})\s+source=${PRESET_SOURCE}" "$CONFIG"
}
migrate_persistence_preset()
{
- local OLD_PRESET="${1}"
- local OLD_PRESET_SOURCE="${2}"
- local NEW_PRESET="${3}"
- local NEW_PRESET_SOURCE="${4}"
+ local OLD="${1}"
+ local OLD_SOURCE="${2}"
+ local NEW="${3}"
+ local NEW_SOURCE="${4}"
local CONFIG="${5}"
- if grep -E -qs --line-regex \
- -e "$(escape_dots ${OLD_PRESET})\s+source=${OLD_PRESET_SOURCE}" \
- "$CONFIG" \
- && ! grep -E -qs --line-regex \
- -e "$(escape_dots ${NEW_PRESET})\s+source=${NEW_PRESET_SOURCE}" \
- "$CONFIG"
+ if is_preset_enabled "${OLD}" "${OLD_SOURCE}" "${CONFIG}" && \
+ ! is_preset_enabled "${NEW}" "${NEW_SOURCE}" "${CONFIG}"
then
- warning "Need to make $NEW_PRESET persistent"
- if [ "$PERSISTENCE_READONLY" = true ]
- then
- warning "Persistence configuration needs to be migrated, but read only was selected; please retry in read-write mode"
- else
- echo "$NEW_PRESET source=$NEW_PRESET_SOURCE" \
- >> "$CONFIG" \
- || error "Failed to make $NEW_PRESET: $?"
- warning "Successfully made $NEW_PRESET persistent"
- fi
+ warning "Need to make ${NEW} persistent"
+ add_persistence_preset "${NEW}" "${NEW_SOURCE}" \
+ "${CONFIG}"
fi
}
-warning ()
-{
- echo "warning: ${@}" >&2
+migrate_icedove_to_thunderbird() {
+ local CONFIG="${1}"
+ local PERSISTENCE_DIR="$(dirname "${CONFIG}")"
+ if [ -d "${PERSISTENCE_DIR}/thunderbird" ] || \
+ ! [ -d "${PERSISTENCE_DIR}/icedove" ]
+ then
+ return
+ fi
+ mv "${PERSISTENCE_DIR}/icedove" "${PERSISTENCE_DIR}/thunderbird"
+ add_persistence_preset /home/amnesia/.thunderbird thunderbird "${conf}"
+ remove_persistence_preset /home/amnesia/.icedove "${conf}"
+ # The script /usr/local/bin/thunderbird takes care of the rest of
+ # the migration when starting Thunderbird.
}
# We override live-boot's logging facilities to get more useful error messages
@@ -331,6 +374,8 @@ activate_volumes ()
# Migrate Claws-mail persistence setting to Icedove
migrate_persistence_preset '/home/amnesia/.claws-mail' 'claws-mail' \
'/home/amnesia/.icedove' 'icedove' "$conf"
+
+ migrate_icedove_to_thunderbird "${conf}"
done
# Fix permissions on persistent directories that were created
diff --git a/config/chroot_local-includes/usr/local/sbin/tails-reconfigure-kexec b/config/chroot_local-includes/usr/local/sbin/tails-reconfigure-kexec
deleted file mode 100755
index 5c1c9ff..0000000
--- a/config/chroot_local-includes/usr/local/sbin/tails-reconfigure-kexec
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-set -e
-set -u
-
-PATH="/usr/local/bin:${PATH}"
-KEXEC_CONF=/etc/default/kexec
-
-KERNEL_IMAGE=$(tails-get-bootinfo kernel)
-INITRD=$(tails-get-bootinfo initrd)
-
-echo "KERNEL_IMAGE=\"${KERNEL_IMAGE}\"" >> "$KEXEC_CONF"
-echo "INITRD=\"${INITRD}\"" >> "$KEXEC_CONF"
-
-if grep -qw debug=wipemem /proc/cmdline; then
- echo 'APPEND="${APPEND} sdmemdebug=1"' >> "$KEXEC_CONF"
-else
- echo 'APPEND="${APPEND} quiet"' >> "$KEXEC_CONF"
-fi
diff --git a/config/chroot_local-includes/usr/local/sbin/tails-reconfigure-memlockd b/config/chroot_local-includes/usr/local/sbin/tails-reconfigure-memlockd
deleted file mode 100755
index 328d304..0000000
--- a/config/chroot_local-includes/usr/local/sbin/tails-reconfigure-memlockd
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-set -e
-set -u
-
-PATH="/usr/local/bin:${PATH}"
-MEMLOCKD_CONF=/etc/memlockd.cfg
-
-tails-get-bootinfo kernel >> "$MEMLOCKD_CONF"
-tails-get-bootinfo initrd >> "$MEMLOCKD_CONF"
diff --git a/config/chroot_local-includes/usr/share/initramfs-tools/hooks/sdmem b/config/chroot_local-includes/usr/share/initramfs-tools/hooks/sdmem
deleted file mode 100755
index 837f164..0000000
--- a/config/chroot_local-includes/usr/share/initramfs-tools/hooks/sdmem
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# FIXME: what is this used for? dependency-based hooks ordering?
-PREREQ=""
-
-prereqs() {
- echo "${PREREQ}"
-}
-
-case "${1}" in
- prereqs)
- prereqs
- exit 0
- ;;
-esac
-
-. /usr/share/initramfs-tools/hook-functions
-
-copy_exec /sbin/poweroff
-copy_exec /sbin/reboot
-copy_exec /usr/bin/sdmem
-copy_exec /usr/bin/seq
diff --git a/config/chroot_local-includes/usr/share/initramfs-tools/hooks/shutdown b/config/chroot_local-includes/usr/share/initramfs-tools/hooks/shutdown
new file mode 100755
index 0000000..ef7d9c5
--- /dev/null
+++ b/config/chroot_local-includes/usr/share/initramfs-tools/hooks/shutdown
@@ -0,0 +1,34 @@
+#!/bin/sh
+
+set -e
+
+PREREQ=""
+
+prereqs () {
+ echo "${PREREQ}"
+}
+
+case "${1}" in
+ prereqs)
+ prereqs
+ exit 0
+ ;;
+esac
+
+. /usr/share/initramfs-tools/hook-functions
+
+# systemd-shutdown itself
+mkdir -p $DESTDIR/lib/systemd
+copy_exec /lib/systemd/systemd-shutdown /shutdown
+
+# Our shutdown hook (run from inside the initramfs)
+mkdir -p $DESTDIR/lib/systemd/system-shutdown
+copy_file "regular file" \
+ /usr/local/lib/initramfs-pre-shutdown-hook \
+ /lib/systemd/system-shutdown/tails
+
+# Ensure systemd detects when we're in the initramfs on shutdown
+# (see the in_initrd function in the systemd source tree)
+touch $DESTDIR/etc/initrd-release
+
+exit 0
diff --git a/config/chroot_local-includes/usr/share/initramfs-tools/scripts/init-top/memory_wipe b/config/chroot_local-includes/usr/share/initramfs-tools/scripts/init-top/memory_wipe
deleted file mode 100755
index e4fc5f6..0000000
--- a/config/chroot_local-includes/usr/share/initramfs-tools/scripts/init-top/memory_wipe
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/sh
-
-PREREQ=""
-
-# Duplicated in features/step_definitions/erase_memory.rb
-KERNEL_MEM_RESERVED_K=$((64*1024))
-ADMIN_MEM_RESERVED_K=$((128*1024))
-
-prereqs() {
- echo "${PREREQ}"
-}
-
-tweak_sysctl() {
- echo 3 > /proc/sys/kernel/printk
-
- echo 3 > /proc/sys/vm/drop_caches
-
- echo 0 > /proc/sys/vm/overcommit_memory
- echo 0 > /proc/sys/vm/oom_kill_allocating_task
- echo 0 > /proc/sys/vm/oom_dump_tasks
-
- if [ "${sdmemdebug}" = 1 ] ; then
- # Make sure the kernel doesn't starve, for better reliability when
- # running the test suite.
- echo "$KERNEL_MEM_RESERVED_K" > /proc/sys/vm/min_free_kbytes
- echo "$ADMIN_MEM_RESERVED_K" > /proc/sys/vm/admin_reserve_kbytes
- fi
-}
-
-case ${1} in
- prereqs)
- prereqs
- exit 0
- ;;
-esac
-
-if [ -n "${sdmem}" ] ; then
- tweak_sysctl
- if [ -z "${sdmemopts}" ] ; then
- sdmemopts="v"
- fi
- /usr/bin/sdmem "-${sdmemopts}"
- echo "Memory has been wiped!"
-fi
-
-if [ "${sdmemdebug}" = 1 ] ; then
- clear
- echo "Going to sleep 10 minutes. Happy dumping!"
- sleep 1200
-fi
-
-case "${sdmem}" in
- halt)
- echo "Powering off..."
- /sbin/poweroff -fd
- ;;
- reboot)
- echo "Restarting..."
- /sbin/reboot -fd
- ;;
- *)
- ;;
-esac
diff --git a/config/chroot_local-includes/usr/share/live/config/xserver-xorg/intel.ids b/config/chroot_local-includes/usr/share/live/config/xserver-xorg/intel.ids
index 7f47243..36b0797 100644
--- a/config/chroot_local-includes/usr/share/live/config/xserver-xorg/intel.ids
+++ b/config/chroot_local-includes/usr/share/live/config/xserver-xorg/intel.ids
@@ -1,3 +1,5 @@
+8086A001
+8086A002
80860046
80862582
808627A2
diff --git a/config/chroot_local-packageslists/tails-common.list b/config/chroot_local-packageslists/tails-common.list
index 940da0a..dbb365c 100644
--- a/config/chroot_local-packageslists/tails-common.list
+++ b/config/chroot_local-packageslists/tails-common.list
@@ -131,15 +131,12 @@ haveged
# needed by laptop-mode-tools to spin-down hard drives
hdparm
hopenpgp-tools
-icedove
-icedove-l10n-all
inkscape
iptables
# ships isolinux.bin in syslinux 6.x packaging
isolinux
ferm
keepassx
-kexec-tools
keyringer
memlockd
less
@@ -224,6 +221,8 @@ traverso
ttf-dejavu
tcpdump
tcpflow
+thunderbird
+thunderbird-l10n-all
tor
tor-geoipdb
sound-juicer
@@ -267,6 +266,7 @@ firmware-b43legacy-installer
### Xorg
xorg
xserver-xorg-input-all
+xserver-xorg-legacy
xserver-xorg-video-all
xserver-xorg-video-cirrus
xserver-xorg-video-intel
@@ -406,9 +406,14 @@ xdotool
python-qt4
python-trezor
-# Provide gnome-open (used to open e.g. URLs in KeePassX, Icedove, Electrum...)
+# Provide gnome-open (used to open e.g. URLs in KeePassX, Thunderbird,
+# Electrum...)
libgnome2-bin
# onion-grater
python3-psutil
python3-yaml
+
+# needed for "Test speakers"
+libcanberra-pulse
+sound-theme-freedesktop
diff --git a/config/chroot_local-patches/bilibop-debian-bug-861685.diff b/config/chroot_local-patches/bilibop-debian-bug-861685.diff
new file mode 100644
index 0000000..09ecb86
--- /dev/null
+++ b/config/chroot_local-patches/bilibop-debian-bug-861685.diff
@@ -0,0 +1,60 @@
+commit 85af45f3c5cf10ec60f1301169ee94ac978c5b69
+Author: Yann Amar <quidame@poivron.org>
+Date: Fri May 5 16:12:24 2017 +0000
+
+ bilibop-common: re-add support for multiple aufs readonly branches.
+
+ This partially reverts commit 03a49203.
+
+diff --git a/lib/bilibop/common.sh b/lib/bilibop/common.sh
+index 9f91478..4017726 100644
+--- a/lib/bilibop.orig/common.sh 2017-01-16 23:29:07.000000000 +0000
++++ b/lib/bilibop/common.sh 2017-05-17 10:30:17.669677163 +0000
+@@ -513,24 +513,31 @@
+ # branch of an aufs mountpoint given as argument. We assume that there is only
+ # and at least one physical device used to build the aufs (but the directory
+ # is not necessarly the mountpoint of this device), other branch(s) being
+-# virtual fs.
++# virtual fs. Note that if there are more than one readonly branch, the first
++# block device found wins.
+ underlying_device_from_aufs() {
+ ${DEBUG} && echo "> underlying_device_from_aufs $@" >&2
+- local dir="$(aufs_readonly_branch "${1}")"
+- local dev="$(device_id_of_file "${dir}")"
+- case "${dev}" in
+- "")
+- ;;
+- 0:*)
+- # aufs mounts can't be nested; but this may be btrfs
+- dev="$(underlying_device_from_file "${dir}")"
+- ;;
+- *)
+- dev="$(device_node_from_major_minor "${dev}")"
+- ;;
+- esac
+-
+- [ -b "${dev}" ] && readlink -f "${dev}"
++ local dev dir
++ for dir in $(aufs_readonly_branch "${1}"); do
++ dev="$(device_id_of_file "${dir}")"
++ case "${dev}" in
++ "")
++ continue
++ ;;
++ 0:*)
++ # aufs mounts can't be nested; but this may be btrfs
++ dev="$(underlying_device_from_file "${dir}")"
++ ;;
++ *)
++ dev="$(device_node_from_major_minor "${dev}")"
++ ;;
++ esac
++ if [ -b "${dev}" ]; then
++ readlink -f "${dev}"
++ return 0
++ fi
++ done
++ return 1
+ }
+ # ===========================================================================}}}
+ # underlying_device_from_overlayfs() ========================================{{{
diff --git a/config/chroot_local-patches/run_kexec-load_even_in_emergency_shutdown.diff b/config/chroot_local-patches/run_kexec-load_even_in_emergency_shutdown.diff
deleted file mode 100644
index 83e8114..0000000
--- a/config/chroot_local-patches/run_kexec-load_even_in_emergency_shutdown.diff
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/etc/init.d/kexec-load 2014-12-01 20:23:12.826065938 +0100
-+++ b/etc/init.d/kexec-load 2014-12-01 20:23:31.389572352 +0100
-@@ -106,19 +106,6 @@
- exit 3
- ;;
- stop)
-- # If running systemd, we want kexec reboot only if current
-- # command is reboot. If not running systemd, check if
-- # runlevel has been changed to 6 which indicates we are
-- # rebooting
-- if [ -d /run/systemd/system ]; then
-- systemctl list-jobs systemd-kexec.service | grep -q systemd-kexec.service
-- if [ $? -ne 0 ]; then
-- exit 0
-- fi
-- else if [ -x /sbin/runlevel -a "$(runlevel | awk '{ print $2 }')" != "6" ]; then
-- exit 0
-- fi
-- fi
- do_stop
- ;;
- *)
-
diff --git a/config/chroot_local-patches/run_kexec-load_on_halt.diff b/config/chroot_local-patches/run_kexec-load_on_halt.diff
deleted file mode 100644
index e806e66..0000000
--- a/config/chroot_local-patches/run_kexec-load_on_halt.diff
+++ /dev/null
@@ -1,8 +0,0 @@
-Tails specific: we use kexec on both halt (runlevel 0) on top of reboot
-(runlevel 6).
-
---- chroot.orig/etc/init.d/kexec-load 2011-01-14 12:30:05.089859516 +0100
-+++ chroot/etc/init.d/kexec-load 2011-01-14 12:30:29.159667183 +0100
-@@ -8,1 +8,1 @@
--# Default-Stop: 6
-+# Default-Stop: 0 6
diff --git a/config/chroot_local-patches/icedove_default_to_IMAP.diff b/config/chroot_local-patches/thunderbird_default_to_IMAP.diff
index 486ff70..486ff70 100644
--- a/config/chroot_local-patches/icedove_default_to_IMAP.diff
+++ b/config/chroot_local-patches/thunderbird_default_to_IMAP.diff
diff --git a/config/chroot_local-preseed/live-boot b/config/chroot_local-preseed/live-boot
deleted file mode 100644
index 4db3bb9..0000000
--- a/config/chroot_local-preseed/live-boot
+++ /dev/null
@@ -1,2 +0,0 @@
-live-boot live-boot/smem boolean true
-live-boot live-boot/sdmem boolean true
diff --git a/features/build.feature b/features/build.feature
index 49b2d24..841d4f1 100644
--- a/features/build.feature
+++ b/features/build.feature
@@ -346,22 +346,22 @@ Feature: custom APT sources to build branches
And I should see the 'feature-7756-reintroduce-whisperback' suite
Scenario: build from a feature branch with overlays based on devel
- Given I am working on the feature/icedove branch based on devel
- And config/APT_overlays.d contains 'feature-icedove'
+ Given I am working on the feature/thunderbird branch based on devel
+ And config/APT_overlays.d contains 'feature-thunderbird'
And config/APT_overlays.d contains 'bugfix-bar'
When I successfully run tails-custom-apt-sources
Then I should see the 'devel' suite
- And I should see the 'feature-icedove' suite
+ And I should see the 'feature-thunderbird' suite
And I should see the 'bugfix-bar' suite
Scenario: build from a feature branch without overlays based on devel
- Given I am working on the feature/icedove branch based on devel
+ Given I am working on the feature/thunderbird branch based on devel
And the config/APT_overlays.d directory is empty
When I successfully run tails-custom-apt-sources
Then I should see only the 'devel' suite
Scenario: build from a feature branch based on devel with no encoded time-based snapshot
- Given I am working on the feature/icedove branch based on devel
+ Given I am working on the feature/thunderbird branch based on devel
And no frozen APT snapshot is encoded in config/APT_snapshots.d
When I successfully run "apt-snapshots-serials prepare-build"
And I successfully run "apt-mirror debian"
@@ -372,7 +372,7 @@ Feature: custom APT sources to build branches
Then I should see a time-based snapshot
Scenario: build from a feature branch based on devel with encoded time-based snapshots
- Given I am working on the feature/icedove branch based on devel
+ Given I am working on the feature/thunderbird branch based on devel
And frozen APT snapshots are encoded in config/APT_snapshots.d
When I successfully run "apt-snapshots-serials prepare-build"
And I run "apt-mirror debian"
@@ -392,7 +392,7 @@ Feature: custom APT sources to build branches
And I should see the 'bugfix-bar' suite
Scenario: build from a feature branch without overlays based on feature/jessie
- Given I am working on the feature/icedove branch based on feature/jessie
+ Given I am working on the feature/thunderbird branch based on feature/jessie
And the config/APT_overlays.d directory is empty
When I successfully run tails-custom-apt-sources
Then I should see only the 'feature-jessie' suite
diff --git a/features/emergency_shutdown.feature b/features/emergency_shutdown.feature
index 3fac61e..be2ae88 100644
--- a/features/emergency_shutdown.feature
+++ b/features/emergency_shutdown.feature
@@ -2,21 +2,62 @@
Feature: Emergency shutdown
Scenario: The emergency shutdown applet can shutdown Tails
- Given I have started Tails from DVD without network and logged in
+ Given I have started Tails from DVD and logged in and the network is connected
When I request a shutdown using the emergency shutdown applet
Then Tails eventually shuts down
Scenario: The emergency shutdown applet can reboot Tails
- Given I have started Tails from DVD without network and logged in
+ Given I have started Tails from DVD and logged in and the network is connected
When I request a reboot using the emergency shutdown applet
Then Tails eventually restarts
+ # Test something close to real-world usage, without interfering,
+ # i.e. without the "I prepare Tails for memory erasure tests" step
Scenario: Tails shuts down on DVD boot medium removal
- Given I have started Tails from DVD without network and logged in
+ Given I have started Tails from DVD and logged in and the network is connected
When I eject the boot medium
Then Tails eventually shuts down
- Scenario: Tails shuts down on USB boot medium removal
- Given I have started Tails without network from a USB drive without a persistent partition and logged in
+ Scenario: Tails erases memory and shuts down on DVD boot medium removal: aufs read-write branch
+ Given I have started Tails from DVD without network and logged in
+ And I prepare Tails for memory erasure tests
+ And I fill a 128 MiB file with a known pattern on the root filesystem
+ And patterns cover at least 128 MiB in the guest's memory
When I eject the boot medium
- Then Tails eventually shuts down
+ And I wait for Tails to finish wiping the memory
+ Then I find very few patterns in the guest's memory
+ And Tails eventually shuts down
+
+ Scenario: Tails erases memory and shuts down on DVD boot medium removal: vfat
+ Given I have started Tails from DVD without network and logged in
+ And I prepare Tails for memory erasure tests
+ And I plug and mount a 128 MiB USB drive with a vfat filesystem
+ And I fill the USB drive with a known pattern
+ And I read the content of the test FS
+ And patterns cover at least 99% of the test FS size in the guest's memory
+ When I eject the boot medium
+ And I wait for Tails to finish wiping the memory
+ Then I find very few patterns in the guest's memory
+ And Tails eventually shuts down
+
+ Scenario: Tails erases memory and shuts down on DVD boot medium removal: LUKS-encrypted ext4
+ Given I have started Tails from DVD without network and logged in
+ And I prepare Tails for memory erasure tests
+ And I plug and mount a 128 MiB USB drive with an ext4 filesystem encrypted with password "asdf"
+ And I fill the USB drive with a known pattern
+ And I read the content of the test FS
+ And patterns cover at least 99% of the test FS size in the guest's memory
+ When I eject the boot medium
+ And I wait for Tails to finish wiping the memory
+ Then I find very few patterns in the guest's memory
+ And Tails eventually shuts down
+
+ Scenario: Tails erases memory and shuts down on USB boot medium removal: persistent data
+ Given I have started Tails without network from a USB drive with a persistent partition enabled and logged in
+ And I prepare Tails for memory erasure tests
+ And I fill a 128 MiB file with a known pattern on the persistent filesystem
+ And patterns cover at least 128 MiB in the guest's memory
+ When I eject the boot medium
+ And I wait for Tails to finish wiping the memory
+ Then I find very few patterns in the guest's memory
+ And Tails eventually shuts down
diff --git a/features/erase_memory.feature b/features/erase_memory.feature
index 7be0eeb..5596344 100644
--- a/features/erase_memory.feature
+++ b/features/erase_memory.feature
@@ -6,10 +6,9 @@ Feature: System memory erasure on shutdown
# These tests rely on the Linux kernel's memory poisoning features.
# The feature is called "on shutdown" as this is the security guarantee
-# we document, but in practice we have no good way to test behavior on shutdown
-# per-se (known patterns allocated in memory will be erased _before_ shutdown
-# by the kernel). So we test that some important bits of memory are erased
-# _before_ shutdown.
+# we document, but in practice we test that some important bits of memory
+# are erased _before_ shutdown, while for some others we really test
+# behavior at shutdown time.
Scenario: Erasure of memory freed by killed userspace processes
Given I have started Tails from DVD without network and logged in
@@ -59,3 +58,22 @@ Feature: System memory erasure on shutdown
Then patterns cover at least 99% of the test FS size in the guest's memory
When I umount the USB drive
Then I find very few patterns in the guest's memory
+
+ Scenario: Erasure of the aufs read-write branch on shutdown
+ Given I have started Tails from DVD without network and logged in
+ And I prepare Tails for memory erasure tests
+ When I fill a 128 MiB file with a known pattern on the root filesystem
+ # ensure the pattern is in memory due to tmpfs, not to disk cache
+ And I drop all kernel caches
+ Then patterns cover at least 128 MiB in the guest's memory
+ When I trigger shutdown
+ And I wait 20 seconds
+ Then I find very few patterns in the guest's memory
+
+ Scenario: Erasure of read and write disk caches of persistent data on shutdown
+ Given I have started Tails without network from a USB drive with a persistent partition enabled and logged in
+ And I prepare Tails for memory erasure tests
+ When I fill a 128 MiB file with a known pattern on the persistent filesystem
+ When I trigger shutdown
+ And I wait 20 seconds
+ Then I find very few patterns in the guest's memory
diff --git a/features/images/DesktopTailsDocumentation.png b/features/images/DesktopTailsDocumentation.png
index 49f8c61..3bf13f7 100644
--- a/features/images/DesktopTailsDocumentation.png
+++ b/features/images/DesktopTailsDocumentation.png
Binary files differ
diff --git a/features/images/MemoryWipeCompleted.png b/features/images/MemoryWipeCompleted.png
index fe17943..670fb8c 100644
--- a/features/images/MemoryWipeCompleted.png
+++ b/features/images/MemoryWipeCompleted.png
Binary files differ
diff --git a/features/images/TailsBug11786a.png b/features/images/TailsBug11786a.png
deleted file mode 100644
index c1ea95b..0000000
--- a/features/images/TailsBug11786a.png
+++ /dev/null
Binary files differ
diff --git a/features/images/TailsBug11786b.png b/features/images/TailsBug11786b.png
deleted file mode 100644
index 49ad928..0000000
--- a/features/images/TailsBug11786b.png
+++ /dev/null
Binary files differ
diff --git a/features/step_definitions/common_steps.rb b/features/step_definitions/common_steps.rb
index 214f00b..41389eb 100644
--- a/features/step_definitions/common_steps.rb
+++ b/features/step_definitions/common_steps.rb
@@ -48,10 +48,6 @@ Given /^a computer$/ do
$vm = VM.new($virt, VM_XML_PATH, $vmnet, $vmstorage, DISPLAY)
end
-Given /^the computer has (\d+) ([[:alpha:]]+) of RAM$/ do |size, unit|
- $vm.set_ram_size(size, unit)
-end
-
Given /^the computer is set to boot from the Tails DVD$/ do
$vm.set_cdrom_boot(TAILS_ISO)
end
@@ -193,15 +189,8 @@ def boot_menu_tab_msg_image
end
end
-def memory_wipe_timeout
- nr_gigs_of_ram = convert_from_bytes($vm.get_ram_size_in_bytes, 'GiB').ceil
- nr_gigs_of_ram*30
-end
-
Given /^Tails is at the boot menu's cmdline( after rebooting)?$/ do |reboot|
boot_timeout = 3*60
- # We need some extra time for memory wiping if rebooting
- boot_timeout += memory_wipe_timeout if reboot
# Simply looking for the boot splash image is not robust; sometimes
# sikuli is not fast enough to see it. Here we hope that spamming
# TAB, which will halt the boot process by showing the prompt for
@@ -323,6 +312,7 @@ Given /^the Tails desktop is ready$/ do
@screen.wait(desktop_started_picture, 180)
# We wait for the Florence icon to be displayed to ensure reliable systray icon clicking.
@screen.wait("GnomeSystrayFlorence.png", 30)
+ @screen.wait("DesktopTailsDocumentation.png", 30)
# Disable screen blanking since we sometimes need to wait long
# enough for it to activate, which can mess with Sikuli wait():ing
# for some image.
@@ -511,26 +501,12 @@ Given /^I kill the process "([^"]+)"$/ do |process|
end
Then /^Tails eventually (shuts down|restarts)$/ do |mode|
- nr_gibs_of_ram = convert_from_bytes($vm.get_ram_size_in_bytes, 'GiB').ceil
- timeout = nr_gibs_of_ram*5*60
- # Work around Tails bug #11786, where something goes wrong when we
- # kexec to the new kernel for memory wiping and gets dropped to a
- # BusyBox shell instead.
- try_for(timeout) do
- if @screen.existsAny(['TailsBug11786a.png', 'TailsBug11786b.png'])
- puts "We were hit by bug #11786: memory wiping got stuck"
- if mode == 'restarts'
- $vm.reset
- else
- $vm.power_off
- end
+ try_for(3*60) do
+ if mode == 'restarts'
+ @screen.find('TailsGreeter.png')
+ true
else
- if mode == 'restarts'
- @screen.find('TailsGreeter.png')
- true
- else
- ! $vm.is_running?
- end
+ ! $vm.is_running?
end
end
end
@@ -955,12 +931,13 @@ def share_host_files(files)
return mount_dir
end
-def mount_USB_drive(disk, fs)
+def mount_USB_drive(disk, fs_options = {})
+ fs_options[:encrypted] ||= false
@tmp_usb_drive_mount_dir = $vm.execute_successfully('mktemp -d').stdout.chomp
dev = $vm.disk_dev(disk)
partition = dev + '1'
- if /\bencrypted with password\b/.match(fs)
- password = /encrypted with password "([^"]+)"/.match(fs)[1]
+ if fs_options[:encrypted]
+ password = fs_options[:password]
assert_not_nil(password)
luks_mapping = "#{disk}_unlocked"
$vm.execute_successfully(
@@ -970,13 +947,11 @@ def mount_USB_drive(disk, fs)
$vm.execute_successfully(
"mount /dev/mapper/#{luks_mapping} #{@tmp_usb_drive_mount_dir}"
)
- @tmp_filesystem_is_encrypted = true
else
$vm.execute_successfully("mount #{partition} #{@tmp_usb_drive_mount_dir}")
- @tmp_filesystem_is_encrypted = false
end
@tmp_filesystem_disk = disk
- @tmp_filesystem_fs = fs
+ @tmp_filesystem_options = fs_options
@tmp_filesystem_partition = partition
return @tmp_usb_drive_mount_dir
end
@@ -988,7 +963,13 @@ When(/^I plug and mount a (\d+) MiB USB drive with an? (.*)$/) do |size_MiB, fs|
step "I create a gpt partition labeled \"#{disk}\" with " +
"an #{fs} on disk \"#{disk}\""
step "I plug USB drive \"#{disk}\""
- mount_dir = mount_USB_drive(disk, fs)
+ fs_options = {}
+ fs_options[:filesystem] = /(.*) filesystem/.match(fs)[1]
+ if /\bencrypted with password\b/.match(fs)
+ fs_options[:encrypted] = true
+ fs_options[:password] = /encrypted with password "([^"]+)"/.match(fs)[1]
+ end
+ mount_dir = mount_USB_drive(disk, fs_options)
@tmp_filesystem_size_b = convert_to_bytes(
avail_space_in_mountpoint_kB(mount_dir),
'KB'
@@ -996,12 +977,12 @@ When(/^I plug and mount a (\d+) MiB USB drive with an? (.*)$/) do |size_MiB, fs|
end
When(/^I mount the USB drive again$/) do
- mount_USB_drive(@tmp_filesystem_disk, @tmp_filesystem_fs)
+ mount_USB_drive(@tmp_filesystem_disk, @tmp_filesystem_options)
end
When(/^I umount the USB drive$/) do
$vm.execute_successfully("umount #{@tmp_usb_drive_mount_dir}")
- if @tmp_filesystem_is_encrypted
+ if @tmp_filesystem_options[:encrypted]
$vm.execute_successfully("cryptsetup luksClose #{@tmp_filesystem_disk}_unlocked")
end
end
diff --git a/features/step_definitions/erase_memory.rb b/features/step_definitions/erase_memory.rb
index e070cd0..a39aaab 100644
--- a/features/step_definitions/erase_memory.rb
+++ b/features/step_definitions/erase_memory.rb
@@ -58,7 +58,10 @@ Given /^I prepare Tails for memory erasure tests$/ do
@detected_ram_m = detected_ram_in_MiB
# Free some more memory by dropping the caches etc.
- $vm.execute_successfully("echo 3 > /proc/sys/vm/drop_caches")
+ step "I drop all kernel caches"
+
+ # Have our initramfs-pre-shutdown-hook sleep for a while
+ $vm.execute_successfully("touch /run/initramfs/tails_shutdown_debugging")
# The (guest) kernel may freeze when approaching full memory without
# adjusting the OOM killer and memory overcommitment limitations.
@@ -92,6 +95,10 @@ Given /^I prepare Tails for memory erasure tests$/ do
free_mem_before_fill_m = @detected_ram_m - used_mem_before_fill_m -
kernel_mem_reserved_m - admin_mem_reserved_m
@free_mem_before_fill_b = convert_to_bytes(free_mem_before_fill_m, 'MiB')
+
+ ['initramfs-shutdown', 'memlockd', 'tails-shutdown-on-media-removal'].each do |srv|
+ assert($vm.execute("systemctl status #{srv}.service").success?)
+ end
end
Given /^I fill the guest's memory with a known pattern and the allocating processes get killed$/ do
@@ -179,6 +186,26 @@ Then /^patterns cover at least (\d+)% of the test FS size in the guest's memory$
"was expected")
end
+Then(/^patterns cover at least (\d+) MiB in the guest's memory$/) do |expected_patterns_MiB|
+ reference_memory_b = convert_to_bytes(expected_patterns_MiB.to_i, 'MiB')
+ coverage = pattern_coverage_in_guest_ram(reference_memory_b)
+ min_coverage = 1
+ assert(coverage >= min_coverage,
+ "#{"%.3f" % (coverage*100)}% of the expected size (#{expected_patterns_MiB} MiB) " +
+ "has the pattern, but more than #{"%.3f" % (min_coverage*100)}% " +
+ "was expected")
+end
+
+Then(/^patterns cover less than (\d+) MiB in the guest's memory$/) do |expected_patterns_MiB|
+ reference_memory_b = convert_to_bytes(expected_patterns_MiB.to_i, 'MiB')
+ coverage = pattern_coverage_in_guest_ram(reference_memory_b)
+ max_coverage = 1
+ assert(coverage < max_coverage,
+ "#{"%.3f" % (coverage*100)}% of the expected size (#{expected_patterns_MiB} MiB) " +
+ "has the pattern, but less than #{"%.3f" % (max_coverage*100)}% " +
+ "was expected")
+end
+
When(/^I umount "([^"]*)"$/) do |mount_arg|
$vm.execute_successfully("umount '#{mount_arg}'")
end
@@ -191,33 +218,35 @@ Then /^I find very few patterns in the guest's memory$/ do
"pattern, but less than #{"%.3f" % (max_coverage*100)}% was expected")
end
-When /^I reboot without wiping the memory$/ do
- $vm.reset
-end
-
When /^I stop the boot at the bootloader menu$/ do
step "Tails is at the boot menu's cmdline"
end
-When /^I shutdown and wait for Tails to finish wiping the memory$/ do
- $vm.spawn("halt")
- match = nil
- begin
- try_for(memory_wipe_timeout, msg: "memory wipe didn't finish, probably the VM crashed") do
- # We spam keypresses to prevent console blanking from hiding the
- # image we're waiting for
- @screen.type(" ")
- match, _ = @screen.findAny(
- ['MemoryWipeCompleted.png', 'TailsBug11786a.png', 'TailsBug11786b.png']
- )
- match != nil
- end
- # Just throw the same exception as a if the try_for would fail
- raise Timeout::Error if match != 'MemoryWipeCompleted.png'
- rescue Timeout::Error
- puts "Cannot tell if memory wipe completed. " +
- "One possible reason for this is #11786, " +
- "so let's go on and rely on the next steps to check " +
- "how well memory was wiped."
+When /^I wait for Tails to finish wiping the memory$/ do
+ @screen.wait("MemoryWipeCompleted.png", 30)
+end
+
+When(/^I fill a (\d+) MiB file with a known pattern on the (persistent|root) filesystem$/) do |size_MiB, fs|
+ pattern = "wipe_didnt_work\n"
+ pattern_nb = (convert_to_bytes(size_MiB.to_i, 'MiB') / pattern.size).floor
+ if fs == 'root'
+ dest_file = "/" + random_alpha_string(10)
+ elsif fs == 'persistent'
+ dest_file = "/home/amnesia/Persistent/" + random_alpha_string(10)
+ else
+ raise "This should not happen"
end
+ $vm.execute_successfully(
+ "for i in $(seq 1 #{pattern_nb}) ; do " +
+ " echo wipe_didnt_work >> '#{dest_file}' ; " +
+ "done"
+ )
+end
+
+When(/^I drop all kernel caches$/) do
+ $vm.execute_successfully("echo 3 > /proc/sys/vm/drop_caches")
+end
+
+When(/^I trigger shutdown$/) do
+ $vm.spawn("halt")
end
diff --git a/features/step_definitions/icedove.rb b/features/step_definitions/thunderbird.rb
index 18523a8..ee8b230 100644
--- a/features/step_definitions/icedove.rb
+++ b/features/step_definitions/thunderbird.rb
@@ -1,72 +1,72 @@
-def icedove_app
- Dogtail::Application.new('Icedove')
+def thunderbird_app
+ Dogtail::Application.new('Thunderbird')
end
-def icedove_main
+def thunderbird_main
# The main window title depends on context so without regexes it
# will be hard to find it, but it so happens that it is always the
- # first frame of Icedove, so we do not have to be specific.
- icedove_app.child(roleName: 'frame')
+ # first frame of Thunderbird, so we do not have to be specific.
+ thunderbird_app.child(roleName: 'frame')
end
-def icedove_wizard
- icedove_app.child('Mail Account Setup', roleName: 'frame')
+def thunderbird_wizard
+ thunderbird_app.child('Mail Account Setup', roleName: 'frame')
end
-def icedove_inbox
- folder_view = icedove_main.child($config['Icedove']['address'],
+def thunderbird_inbox
+ folder_view = thunderbird_main.child($config['Icedove']['address'],
roleName: 'table row').parent
folder_view.children(roleName: 'table row', recursive: false).find do |e|
e.name.match(/^Inbox( .*)?$/)
end
end
-When /^I start Icedove$/ do
+When /^I start Thunderbird$/ do
workaround_pref_lines = [
# When we generate a random subject line it may contain one of the
- # keywords that will make Icedove show an extra prompt when trying
+ # keywords that will make Thunderbird show an extra prompt when trying
# to send an email. Let's disable this feature.
'pref("mail.compose.attachment_reminder", false);'
]
workaround_pref_lines.each do |line|
- $vm.file_append('/etc/icedove/pref/icedove.js ', line)
+ $vm.file_append('/etc/thunderbird/pref/thunderbird.js ', line)
end
- step 'I start "Icedove" via the GNOME "Internet" applications menu'
- try_for(60) { icedove_main }
+ step 'I start "Thunderbird" via the GNOME "Internet" applications menu'
+ try_for(60) { thunderbird_main }
end
When /^I have not configured an email account$/ do
- conf_path = "/home/#{LIVE_USER}/.icedove/profile.default/prefs.js"
+ conf_path = "/home/#{LIVE_USER}/.thunderbird/profile.default/prefs.js"
if $vm.file_exist?(conf_path)
- icedove_prefs = $vm.file_content(conf_path).chomp
- assert(!icedove_prefs.include?('mail.accountmanager.accounts'))
+ thunderbird_prefs = $vm.file_content(conf_path).chomp
+ assert(!thunderbird_prefs.include?('mail.accountmanager.accounts'))
end
end
Then /^I am prompted to setup an email account$/ do
- icedove_wizard
+ thunderbird_wizard
end
Then /^I cancel setting up an email account$/ do
- icedove_wizard.button('Cancel').click
+ thunderbird_wizard.button('Cancel').click
end
-Then /^I open Icedove's Add-ons Manager$/ do
- icedove_main.button('AppMenu').click
- icedove_main.child('Add-ons', roleName: 'menu item').click
- @icedove_addons = icedove_app.child(
- 'Add-ons Manager - Icedove Mail/News', roleName: 'frame'
+Then /^I open Thunderbird's Add-ons Manager$/ do
+ thunderbird_main.button('AppMenu').click
+ thunderbird_main.child('Add-ons', roleName: 'menu item').click
+ @thunderbird_addons = thunderbird_app.child(
+ 'Add-ons Manager - Mozilla Thunderbird', roleName: 'frame'
)
end
Then /^I click the extensions tab$/ do
- @icedove_addons.child('Extensions', roleName: 'list item').click
+ @thunderbird_addons.child('Extensions', roleName: 'list item').click
end
-Then /^I see that only the (.+) addons are enabled in Icedove$/ do |addons|
+Then /^I see that only the (.+) addons are enabled in Thunderbird$/ do |addons|
expected_addons = addons.split(/, | and /)
actual_addons =
- @icedove_addons.child('TorBirdy', roleName: 'label')
+ @thunderbird_addons.child('TorBirdy', roleName: 'label')
.parent.parent.children(roleName: 'list item', recursive: false)
.map { |item| item.name }
expected_addons.each do |addon|
@@ -78,39 +78,39 @@ Then /^I see that only the (.+) addons are enabled in Icedove$/ do |addons|
end
Then /^I see that Torbirdy is configured to use Tor$/ do
- icedove_main.child(roleName: 'status bar')
+ thunderbird_main.child(roleName: 'status bar')
.child('TorBirdy Enabled: Tor', roleName: 'label')
end
When /^I enter my email credentials into the autoconfiguration wizard$/ do
- icedove_wizard.child('Email address:', roleName: 'entry')
+ thunderbird_wizard.child('Email address:', roleName: 'entry')
.typeText($config['Icedove']['address'])
- icedove_wizard.child('Password:', roleName: 'entry')
+ thunderbird_wizard.child('Password:', roleName: 'entry')
.typeText($config['Icedove']['password'])
- icedove_wizard.button('Continue').click
+ thunderbird_wizard.button('Continue').click
# This button is shown if and only if a configuration has been found
- try_for(120) { icedove_wizard.button('Done') }
+ try_for(120) { thunderbird_wizard.button('Done') }
end
Then /^the autoconfiguration wizard's choice for the (incoming|outgoing) server is secure (.+)$/ do |type, protocol|
type = type.capitalize + ':'
assert_not_nil(
- icedove_wizard.child(type, roleName: 'entry').text
+ thunderbird_wizard.child(type, roleName: 'entry').text
.match(/^#{protocol},[^,]+, (SSL|STARTTLS)$/)
)
end
When /^I fetch my email$/ do
- account = icedove_main.child($config['Icedove']['address'],
+ account = thunderbird_main.child($config['Icedove']['address'],
roleName: 'table row')
account.click
- icedove_main = icedove_app.child("#{$config['Icedove']['address']} - Icedove Mail/News", roleName: 'frame')
+ thunderbird_main = thunderbird_app.child("#{$config['Icedove']['address']} - Mozilla Thunderbird", roleName: 'frame')
- icedove_main.child('Mail Toolbar', roleName: 'tool bar')
+ thunderbird_main.child('Mail Toolbar', roleName: 'tool bar')
.button('Get Messages').click
try_for(120) do
begin
- icedove_main.child(roleName: 'status bar', retry: false)
+ thunderbird_main.child(roleName: 'status bar', retry: false)
.child(roleName: 'progress bar', retry: false)
false
rescue
@@ -126,7 +126,7 @@ When /^I accept the (?:autoconfiguration wizard's|manual) configuration$/ do
begin
# Spam the button, even if it is disabled (while it is still
# testing the password).
- icedove_wizard.button('Done').click
+ thunderbird_wizard.button('Done').click
false
rescue
true
@@ -147,11 +147,11 @@ When /^I select the autoconfiguration wizard's (IMAP|POP3) choice$/ do |protocol
else
choice = 'POP3 (keep mail on your computer)'
end
- icedove_wizard.child(choice, roleName: 'radio button').click
+ thunderbird_wizard.child(choice, roleName: 'radio button').click
end
When /^I select manual configuration$/ do
- icedove_wizard.button('Manual config').click
+ thunderbird_wizard.button('Manual config').click
end
When /^I alter the email configuration to use (.*) over a hidden services$/ do |protocol|
@@ -163,14 +163,14 @@ When /^I alter the email configuration to use (.*) over a hidden services$/ do |
else
raise "Unknown mail protocol '#{protocol}'"
end
- entry = icedove_wizard.child(entry_name, roleName: 'entry')
+ entry = thunderbird_wizard.child(entry_name, roleName: 'entry')
entry.text = ''
entry.typeText($config['Icedove']["#{protocol.downcase}_hidden_service"])
end
When /^I send an email to myself$/ do
- icedove_main.child('Mail Toolbar', roleName: 'tool bar').button('Write').click
- compose_window = icedove_app.child('Write: (no subject)')
+ thunderbird_main.child('Mail Toolbar', roleName: 'tool bar').button('Write').click
+ compose_window = thunderbird_app.child('Write: (no subject)')
compose_window.child('To:', roleName: 'autocomplete').child(roleName: 'entry')
.typeText($config['Icedove']['address'])
# The randomness of the subject will make it easier for us to later
@@ -179,7 +179,7 @@ When /^I send an email to myself$/ do
@subject = "Automated test suite: #{random_alnum_string(32)}"
compose_window.child('Subject:', roleName: 'entry')
.typeText(@subject)
- compose_window = icedove_app.child("Write: #{@subject}")
+ compose_window = thunderbird_app.child("Write: #{@subject}")
compose_window.child('about:blank', roleName: 'document frame')
.typeText('test')
compose_window.child('Composition Toolbar', roleName: 'tool bar')
@@ -192,11 +192,11 @@ end
Then /^I can find the email I sent to myself in my inbox$/ do
recovery_proc = Proc.new { step 'I fetch my email' }
retry_tor(recovery_proc) do
- icedove_inbox.click
- filter = icedove_main.child('Filter these messages <Ctrl+Shift+K>',
+ thunderbird_inbox.click
+ filter = thunderbird_main.child('Filter these messages <Ctrl+Shift+K>',
roleName: 'entry')
filter.typeText(@subject)
- hit_counter = icedove_main.child('1 message')
+ hit_counter = thunderbird_main.child('1 message')
inbox_view = hit_counter.parent
message_list = inbox_view.child(roleName: 'table')
the_message = message_list.child(@subject, roleName: 'table cell')
@@ -207,11 +207,11 @@ Then /^I can find the email I sent to myself in my inbox$/ do
end
end
-Then /^my Icedove inbox is non-empty$/ do
- icedove_inbox.click
+Then /^my Thunderbird inbox is non-empty$/ do
+ thunderbird_inbox.click
# The button is located on the first row in the message list, the
# one that shows the column labels (Subject, From, ...).
- message_list = icedove_main.child('Select columns to display',
+ message_list = thunderbird_main.child('Select columns to display',
roleName: 'push button')
.parent.parent
visible_messages = message_list.children(recursive: false,
diff --git a/features/support/helpers/vm_helper.rb b/features/support/helpers/vm_helper.rb
index c2e9379..c920a7a 100644
--- a/features/support/helpers/vm_helper.rb
+++ b/features/support/helpers/vm_helper.rb
@@ -174,6 +174,10 @@ class VM
end
def eject_cdrom
+ execute_successfully('/usr/bin/eject -m')
+ end
+
+ def remove_cdrom_image
domain_rexml = REXML::Document.new(@domain.xml_desc)
cdrom_el = domain_rexml.elements["domain/devices/disk[@device='cdrom']"]
if cdrom_el.nil?
@@ -195,7 +199,7 @@ class VM
if image.nil? or image == ''
raise "Can't set cdrom image to an empty string"
end
- eject_cdrom
+ remove_cdrom_image
domain_rexml = REXML::Document.new(@domain.xml_desc)
cdrom_el = domain_rexml.elements["domain/devices/disk[@device='cdrom']"]
cdrom_el.add_element('source', { 'file' => image })
@@ -374,23 +378,6 @@ class VM
return list
end
- def set_ram_size(size, unit = "KiB")
- raise "System memory can only be added to inactive vms" if is_running?
- domain_xml = REXML::Document.new(@domain.xml_desc)
- domain_xml.elements['domain/memory'].text = size
- domain_xml.elements['domain/memory'].attributes['unit'] = unit
- domain_xml.elements['domain/currentMemory'].text = size
- domain_xml.elements['domain/currentMemory'].attributes['unit'] = unit
- update(domain_xml.to_s)
- end
-
- def get_ram_size_in_bytes
- domain_xml = REXML::Document.new(@domain.xml_desc)
- unit = domain_xml.elements['domain/memory'].attribute('unit').to_s
- size = domain_xml.elements['domain/memory'].text.to_i
- return convert_to_bytes(size, unit)
- end
-
def set_os_loader(type)
if is_running?
raise "boot settings can only be set for inactive vms"
diff --git a/features/support/hooks.rb b/features/support/hooks.rb
index 6a7891d..3e7a1be 100644
--- a/features/support/hooks.rb
+++ b/features/support/hooks.rb
@@ -21,6 +21,7 @@ AfterConfiguration do |config|
'features/time_syncing.feature',
'features/tor_bridges.feature',
# Features using large amounts of scratch space for other reasons:
+ 'features/emergency_shutdown.feature',
'features/erase_memory.feature',
# This feature needs the almost biggest snapshot (USB install,
# excluding persistence) and will create yet another disk and
diff --git a/features/icedove.feature b/features/thunderbird.feature
index 90dc654..0de44b8 100644
--- a/features/icedove.feature
+++ b/features/thunderbird.feature
@@ -1,20 +1,20 @@
#11465
@product @check_tor_leaks
-Feature: Icedove email client
+Feature: Thunderbird email client
As a Tails user
I may want to use an email client
Background:
Given I have started Tails from DVD and logged in and the network is connected
And I have not configured an email account
- When I start Icedove
+ When I start Thunderbird
Then I am prompted to setup an email account
Scenario: Only the expected addons are installed
Given I cancel setting up an email account
- When I open Icedove's Add-ons Manager
+ When I open Thunderbird's Add-ons Manager
And I click the extensions tab
- Then I see that only the Enigmail and TorBirdy addons are enabled in Icedove
+ Then I see that only the Enigmail and TorBirdy addons are enabled in Thunderbird
Scenario: Torbirdy is configured to use Tor
Given I cancel setting up an email account
@@ -22,14 +22,14 @@ Feature: Icedove email client
#11890
@fragile
- Scenario: Icedove's autoconfiguration wizard defaults to IMAP and secure protocols
+ Scenario: Thunderbird's autoconfiguration wizard defaults to IMAP and secure protocols
When I enter my email credentials into the autoconfiguration wizard
Then the autoconfiguration wizard's choice for the incoming server is secure IMAP
Then the autoconfiguration wizard's choice for the outgoing server is secure SMTP
#11890
@fragile
- Scenario: Icedove can send emails, and receive emails over IMAP
+ Scenario: Thunderbird can send emails, and receive emails over IMAP
When I enter my email credentials into the autoconfiguration wizard
Then the autoconfiguration wizard's choice for the incoming server is secure IMAP
When I accept the autoconfiguration wizard's configuration
@@ -39,11 +39,11 @@ Feature: Icedove email client
#11890
@fragile
- Scenario: Icedove can download the inbox with POP3
+ Scenario: Thunderbird can download the inbox with POP3
When I enter my email credentials into the autoconfiguration wizard
Then the autoconfiguration wizard's choice for the incoming server is secure IMAP
When I select the autoconfiguration wizard's POP3 choice
Then the autoconfiguration wizard's choice for the incoming server is secure POP3
When I accept the autoconfiguration wizard's configuration
And I fetch my email
- Then my Icedove inbox is non-empty
+ Then my Thunderbird inbox is non-empty
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 7df5420..75c8f1c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,7 +2,6 @@
tmp/pot/60-tor-ready.sh.pot
tmp/pot/config.py.pot
tmp/pot/electrum.pot
-tmp/pot/icedove.pot
tmp/pot/shutdown-helper-extension.js.pot
tmp/pot/tails-about.pot
tmp/pot/tails-additional-software.pot
diff --git a/po/ar.po b/po/ar.po
index 2bdfffb..72d3b91 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -83,31 +83,31 @@ msgid "Do you want to start Electrum anyway?"
msgstr ""
#: config/chroot_local-includes/usr/local/bin/electrum:23
-#: config/chroot_local-includes/usr/local/bin/icedove:37
+#: config/chroot_local-includes/usr/local/bin/thunderbird:37
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
msgid "_Launch"
msgstr "_Launch"
#: config/chroot_local-includes/usr/local/bin/electrum:24
-#: config/chroot_local-includes/usr/local/bin/icedove:38
+#: config/chroot_local-includes/usr/local/bin/thunderbird:38
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
msgid "_Exit"
msgstr "_Exit"
-#: config/chroot_local-includes/usr/local/bin/icedove:27
+#: config/chroot_local-includes/usr/local/bin/thunderbird:27
msgid "The <b>Claws Mail</b> persistence feature is activated."
msgstr ""
-#: config/chroot_local-includes/usr/local/bin/icedove:29
+#: config/chroot_local-includes/usr/local/bin/thunderbird:29
msgid ""
"If you have emails saved in <b>Claws Mail</b>, you should <a href='https://"
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate your "
-"data</a> before starting <b>Icedove</b>."
+"data</a> before starting <b>Thunderbird</b>."
msgstr ""
-#: config/chroot_local-includes/usr/local/bin/icedove:34
+#: config/chroot_local-includes/usr/local/bin/thunderbird:34
msgid ""
-"If you already migrated your emails to <b>Icedove</b>, you should <a "
+"If you already migrated your emails to <b>Thunderbird</b>, you should <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>delete all your <b>Claws Mail</b> data</a> to "
"remove this warning."
diff --git a/po/az.po b/po/az.po
index ac7e394..7fc5a36 100644
--- a/po/az.po
+++ b/po/az.po
@@ -76,31 +76,31 @@ msgid "Do you want to start Electrum anyway?"
msgstr ""
#: config/chroot_local-includes/usr/local/bin/electrum:23
-#: config/chroot_local-includes/usr/local/bin/icedove:37
+#: config/chroot_local-includes/usr/local/bin/thunderbird:37
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
msgid "_Launch"
msgstr "_Başlat"
#: config/chroot_local-includes/usr/local/bin/electrum:24
-#: config/chroot_local-includes/usr/local/bin/icedove:38
+#: config/chroot_local-includes/usr/local/bin/thunderbird:38
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
msgid "_Exit"
msgstr "_Çıxış"
-#: config/chroot_local-includes/usr/local/bin/icedove:27
+#: config/chroot_local-includes/usr/local/bin/thunderbird:27
msgid "The <b>Claws Mail</b> persistence feature is activated."
msgstr ""
-#: config/chroot_local-includes/usr/local/bin/icedove:29
+#: config/chroot_local-includes/usr/local/bin/thunderbird:29
msgid ""
"If you have emails saved in <b>Claws Mail</b>, you should <a href='https://"
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate your "
-"data</a> before starting <b>Icedove</b>."
+"data</a> before starting <b>Thunderbird</b>."
msgstr ""
-#: config/chroot_local-includes/usr/local/bin/icedove:34
+#: config/chroot_local-includes/usr/local/bin/thunderbird:34
msgid ""
-"If you already migrated your emails to <b>Icedove</b>, you should <a "
+"If you already migrated your emails to <b>Thunderbird</b>, you should <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>delete all your <b>Claws Mail</b> data</a> to "
"remove this warning."
diff --git a/po/bg.po b/po/bg.po
index 89fc582..ef81b11 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -88,40 +88,40 @@ msgid "Do you want to start Electrum anyway?"
msgstr "Искате ли да стартирате Electrum така или иначе?"
#: config/chroot_local-includes/usr/local/bin/electrum:23
-#: config/chroot_local-includes/usr/local/bin/icedove:37
+#: config/chroot_local-includes/usr/local/bin/thunderbird:37
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
msgid "_Launch"
msgstr "_Стартиране"
#: config/chroot_local-includes/usr/local/bin/electrum:24
-#: config/chroot_local-includes/usr/local/bin/icedove:38
+#: config/chroot_local-includes/usr/local/bin/thunderbird:38
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
msgid "_Exit"
msgstr "_Изход"
-#: config/chroot_local-includes/usr/local/bin/icedove:27
+#: config/chroot_local-includes/usr/local/bin/thunderbird:27
msgid "The <b>Claws Mail</b> persistence feature is activated."
msgstr "Функцията на <b>Claws Mail</b> за настойчивост е активирана."
-#: config/chroot_local-includes/usr/local/bin/icedove:29
+#: config/chroot_local-includes/usr/local/bin/thunderbird:29
msgid ""
"If you have emails saved in <b>Claws Mail</b>, you should <a href='https://"
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate your "
-"data</a> before starting <b>Icedove</b>."
+"data</a> before starting <b>Thunderbird</b>."
msgstr ""
"Ако имате запазени съобщения в е-пощи <b>Claws Mail</b>, вие трябва <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove'>да мигрирате вашите данни</a> преди да стартирате "
-"<b>Icedove</b>."
+"<b>Thunderbird</b>."
-#: config/chroot_local-includes/usr/local/bin/icedove:34
+#: config/chroot_local-includes/usr/local/bin/thunderbird:34
msgid ""
-"If you already migrated your emails to <b>Icedove</b>, you should <a "
+"If you already migrated your emails to <b>Thunderbird</b>, you should <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>delete all your <b>Claws Mail</b> data</a> to "
"remove this warning."
msgstr ""
-"Ако вече сте мигрирали е-пощите си към <b>Icedove</b>, трябва да <a "
+"Ако вече сте мигрирали е-пощите си към <b>Thunderbird</b>, трябва да <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'> изтриете всичката си <b>Claws Mail</b> "
"информация</а> за да премахнете това предупреждение."
diff --git a/po/ca.po b/po/ca.po
index 65f247f..374ff93 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -86,39 +86,39 @@ msgid "Do you want to start Electrum anyway?"
msgstr "Voleu iniciar l'Electrum igualment?"
#: config/chroot_local-includes/usr/local/bin/electrum:23
-#: config/chroot_local-includes/usr/local/bin/icedove:37
+#: config/chroot_local-includes/usr/local/bin/thunderbird:37
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
msgid "_Launch"
msgstr "_Executa"
#: config/chroot_local-includes/usr/local/bin/electrum:24
-#: config/chroot_local-includes/usr/local/bin/icedove:38
+#: config/chroot_local-includes/usr/local/bin/thunderbird:38
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
msgid "_Exit"
msgstr "_Surt"
-#: config/chroot_local-includes/usr/local/bin/icedove:27
+#: config/chroot_local-includes/usr/local/bin/thunderbird:27
msgid "The <b>Claws Mail</b> persistence feature is activated."
msgstr "La característica de persistència <b>Claws Mail</b> està activada."
-#: config/chroot_local-includes/usr/local/bin/icedove:29
+#: config/chroot_local-includes/usr/local/bin/thunderbird:29
msgid ""
"If you have emails saved in <b>Claws Mail</b>, you should <a href='https://"
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate your "
-"data</a> before starting <b>Icedove</b>."
+"data</a> before starting <b>Thunderbird</b>."
msgstr ""
"Si teniu correu guardat a <b>Claws Mail</b>, hauríeu de<a href='https://"
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrar les "
-"dades</a> abans d'iniciar l'<b>Icedove</b>."
+"dades</a> abans d'iniciar l'<b>Thunderbird</b>."
-#: config/chroot_local-includes/usr/local/bin/icedove:34
+#: config/chroot_local-includes/usr/local/bin/thunderbird:34
msgid ""
-"If you already migrated your emails to <b>Icedove</b>, you should <a "
+"If you already migrated your emails to <b>Thunderbird</b>, you should <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>delete all your <b>Claws Mail</b> data</a> to "
"remove this warning."
msgstr ""
-"Si ja heu migrat els correus a l' <b>Icedove</b>, hauríeu de <a "
+"Si ja heu migrat els correus a l' <b>Thunderbird</b>, hauríeu de <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>suprimir totes les vostres dades de <b>Claws "
"Mail</b> </a> per treure aquest avís."
diff --git a/po/cs.po b/po/cs.po
index 5cf32f3..d3198c1 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -84,31 +84,31 @@ msgid "Do you want to start Electrum anyway?"
msgstr "Chcete i přesto spustit Electrum?"
#: config/chroot_local-includes/usr/local/bin/electrum:23
-#: config/chroot_local-includes/usr/local/bin/icedove:37
+#: config/chroot_local-includes/usr/local/bin/thunderbird:37
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
msgid "_Launch"
msgstr "_Spustit"
#: config/chroot_local-includes/usr/local/bin/electrum:24
-#: config/chroot_local-includes/usr/local/bin/icedove:38
+#: config/chroot_local-includes/usr/local/bin/thunderbird:38
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
msgid "_Exit"
msgstr "_Odejít"
-#: config/chroot_local-includes/usr/local/bin/icedove:27
+#: config/chroot_local-includes/usr/local/bin/thunderbird:27
msgid "The <b>Claws Mail</b> persistence feature is activated."
msgstr ""
-#: config/chroot_local-includes/usr/local/bin/icedove:29
+#: config/chroot_local-includes/usr/local/bin/thunderbird:29
msgid ""
"If you have emails saved in <b>Claws Mail</b>, you should <a href='https://"
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate your "
-"data</a> before starting <b>Icedove</b>."
+"data</a> before starting <b>Thunderbird</b>."
msgstr ""
-#: config/chroot_local-includes/usr/local/bin/icedove:34
+#: config/chroot_local-includes/usr/local/bin/thunderbird:34
msgid ""
-"If you already migrated your emails to <b>Icedove</b>, you should <a "
+"If you already migrated your emails to <b>Thunderbird</b>, you should <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>delete all your <b>Claws Mail</b> data</a> to "
"remove this warning."
diff --git a/po/cy.po b/po/cy.po
index fbf49fd..c2974d4 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -77,31 +77,31 @@ msgid "Do you want to start Electrum anyway?"
msgstr ""
#: config/chroot_local-includes/usr/local/bin/electrum:23
-#: config/chroot_local-includes/usr/local/bin/icedove:37
+#: config/chroot_local-includes/usr/local/bin/thunderbird:37
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
msgid "_Launch"
msgstr "_Llwythwch"
#: config/chroot_local-includes/usr/local/bin/electrum:24
-#: config/chroot_local-includes/usr/local/bin/icedove:38
+#: config/chroot_local-includes/usr/local/bin/thunderbird:38
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
msgid "_Exit"
msgstr "_Gadael"
-#: config/chroot_local-includes/usr/local/bin/icedove:27
+#: config/chroot_local-includes/usr/local/bin/thunderbird:27
msgid "The <b>Claws Mail</b> persistence feature is activated."
msgstr ""
-#: config/chroot_local-includes/usr/local/bin/icedove:29
+#: config/chroot_local-includes/usr/local/bin/thunderbird:29
msgid ""
"If you have emails saved in <b>Claws Mail</b>, you should <a href='https://"
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate your "
-"data</a> before starting <b>Icedove</b>."
+"data</a> before starting <b>Thunderbird</b>."
msgstr ""
-#: config/chroot_local-includes/usr/local/bin/icedove:34
+#: config/chroot_local-includes/usr/local/bin/thunderbird:34
msgid ""
-"If you already migrated your emails to <b>Icedove</b>, you should <a "
+"If you already migrated your emails to <b>Thunderbird</b>, you should <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>delete all your <b>Claws Mail</b> data</a> to "
"remove this warning."
diff --git a/po/da.po b/po/da.po
index 0762243..c01338b 100644
--- a/po/da.po
+++ b/po/da.po
@@ -92,39 +92,39 @@ msgid "Do you want to start Electrum anyway?"
msgstr "Vil du starte Electrum alligevel?"
#: config/chroot_local-includes/usr/local/bin/electrum:23
-#: config/chroot_local-includes/usr/local/bin/icedove:37
+#: config/chroot_local-includes/usr/local/bin/thunderbird:37
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
msgid "_Launch"
msgstr "_Start"
#: config/chroot_local-includes/usr/local/bin/electrum:24
-#: config/chroot_local-includes/usr/local/bin/icedove:38
+#: config/chroot_local-includes/usr/local/bin/thunderbird:38
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
msgid "_Exit"
msgstr "_Afslut"
-#: config/chroot_local-includes/usr/local/bin/icedove:27
+#: config/chroot_local-includes/usr/local/bin/thunderbird:27
msgid "The <b>Claws Mail</b> persistence feature is activated."
msgstr "Vedholdende-funktionaliteten i <b>Claws Mail</b> er aktiveret."
-#: config/chroot_local-includes/usr/local/bin/icedove:29
+#: config/chroot_local-includes/usr/local/bin/thunderbird:29
msgid ""
"If you have emails saved in <b>Claws Mail</b>, you should <a href='https://"
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate your "
-"data</a> before starting <b>Icedove</b>."
+"data</a> before starting <b>Thunderbird</b>."
msgstr ""
"Hvis du har e-mails gemt i <b>Claws Mail</b>, så bør du <a href='https://"
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'> overføre dine "
-"data</a> før du starter <b>Icedove</b>."
+"data</a> før du starter <b>Thunderbird</b>."
-#: config/chroot_local-includes/usr/local/bin/icedove:34
+#: config/chroot_local-includes/usr/local/bin/thunderbird:34
msgid ""
-"If you already migrated your emails to <b>Icedove</b>, you should <a "
+"If you already migrated your emails to <b>Thunderbird</b>, you should <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>delete all your <b>Claws Mail</b> data</a> to "
"remove this warning."
msgstr ""
-"Hvis du allerede har overført dine e-mails til <b>Icedove</b>, så bør du <a "
+"Hvis du allerede har overført dine e-mails til <b>Thunderbird</b>, så bør du <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'> slette alle dine <b>Claws Mail</b> data</a> "
"for at fjerne denne advarsel."
diff --git a/po/de.po b/po/de.po
index bbc9c5e..58d27f8 100644
--- a/po/de.po
+++ b/po/de.po
@@ -100,39 +100,39 @@ msgid "Do you want to start Electrum anyway?"
msgstr "Wollen Sie Electrum trotzdem starten?"
#: config/chroot_local-includes/usr/local/bin/electrum:23
-#: config/chroot_local-includes/usr/local/bin/icedove:37
+#: config/chroot_local-includes/usr/local/bin/thunderbird:37
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
msgid "_Launch"
msgstr "_Start"
#: config/chroot_local-includes/usr/local/bin/electrum:24
-#: config/chroot_local-includes/usr/local/bin/icedove:38
+#: config/chroot_local-includes/usr/local/bin/thunderbird:38
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
msgid "_Exit"
msgstr "_Beenden"
-#: config/chroot_local-includes/usr/local/bin/icedove:27
+#: config/chroot_local-includes/usr/local/bin/thunderbird:27
msgid "The <b>Claws Mail</b> persistence feature is activated."
msgstr "Die Persistenzfunktion von <b>Claws Mail</b> ist aktiviert."
-#: config/chroot_local-includes/usr/local/bin/icedove:29
+#: config/chroot_local-includes/usr/local/bin/thunderbird:29
msgid ""
"If you have emails saved in <b>Claws Mail</b>, you should <a href='https://"
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate your "
-"data</a> before starting <b>Icedove</b>."
+"data</a> before starting <b>Thunderbird</b>."
msgstr ""
"Falls Sie gespeicherte E-Mails in <b>Claws Mail</b> haben, sollten Sie noch "
-"vor dem Start von <b>Icedove</b> <a href='https://tails.boum.org/doc/"
+"vor dem Start von <b>Thunderbird</b> <a href='https://tails.boum.org/doc/"
"anonymous_internet/claws_mail_to_icedove'>Ihre Daten migrieren</a>."
-#: config/chroot_local-includes/usr/local/bin/icedove:34
+#: config/chroot_local-includes/usr/local/bin/thunderbird:34
msgid ""
-"If you already migrated your emails to <b>Icedove</b>, you should <a "
+"If you already migrated your emails to <b>Thunderbird</b>, you should <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>delete all your <b>Claws Mail</b> data</a> to "
"remove this warning."
msgstr ""
-"Wenn Sie Ihre E-Mails bereits auf <b>Icedove</b> migriert haben, sollten Sie "
+"Wenn Sie Ihre E-Mails bereits auf <b>Thunderbird</b> migriert haben, sollten Sie "
"Ihre kompletten <a href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'><b>Claws Mail</b>-Daten</a> löschen, um diese "
"Warnung zu entfernen."
diff --git a/po/el.po b/po/el.po
index e7bd6f0..6b74909 100644
--- a/po/el.po
+++ b/po/el.po
@@ -97,40 +97,40 @@ msgid "Do you want to start Electrum anyway?"
msgstr "Θέλετε να εκκινήσετε το Electrum ούτως ή άλλως;"
#: config/chroot_local-includes/usr/local/bin/electrum:23
-#: config/chroot_local-includes/usr/local/bin/icedove:37
+#: config/chroot_local-includes/usr/local/bin/thunderbird:37
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
msgid "_Launch"
msgstr "_Εκκίνηση"
#: config/chroot_local-includes/usr/local/bin/electrum:24
-#: config/chroot_local-includes/usr/local/bin/icedove:38
+#: config/chroot_local-includes/usr/local/bin/thunderbird:38
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
msgid "_Exit"
msgstr "_Έξοδος"
-#: config/chroot_local-includes/usr/local/bin/icedove:27
+#: config/chroot_local-includes/usr/local/bin/thunderbird:27
msgid "The <b>Claws Mail</b> persistence feature is activated."
msgstr "Η λειτουργία μονιμότητας του <b>Claws Mail</b> είναι ενεργοποιημένη."
-#: config/chroot_local-includes/usr/local/bin/icedove:29
+#: config/chroot_local-includes/usr/local/bin/thunderbird:29
msgid ""
"If you have emails saved in <b>Claws Mail</b>, you should <a href='https://"
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate your "
-"data</a> before starting <b>Icedove</b>."
+"data</a> before starting <b>Thunderbird</b>."
msgstr ""
"Αν έχετε μηνύματα ηλεκτρονικού ταχυδρομείου αποθηκευμένα στο <b>Claws Mail</"
"b>, πρέπει να <a href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove'>μεταφέρετε τα δεδομένα σας</a> πριν ξεκινήσετε το "
-"<b>Icedove</b>."
+"<b>Thunderbird</b>."
-#: config/chroot_local-includes/usr/local/bin/icedove:34
+#: config/chroot_local-includes/usr/local/bin/thunderbird:34
msgid ""
-"If you already migrated your emails to <b>Icedove</b>, you should <a "
+"If you already migrated your emails to <b>Thunderbird</b>, you should <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>delete all your <b>Claws Mail</b> data</a> to "
"remove this warning."
msgstr ""
-"Εάν έχετε ήδη μεταφέρει τα μηνύματά σας στο <b>Icedove</b>, θα πρέπει να <a "
+"Εάν έχετε ήδη μεταφέρει τα μηνύματά σας στο <b>Thunderbird</b>, θα πρέπει να <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>διαγράψετε όλα τα δεδομένα από το <b>Claws "
"Mail</b> data</a> για φύγει αυτή η προειδοποίηση."
diff --git a/po/en_GB.po b/po/en_GB.po
index 55e0a85..569c4bbf 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -82,39 +82,39 @@ msgid "Do you want to start Electrum anyway?"
msgstr "Do you want to start Electrum anyway?"
#: config/chroot_local-includes/usr/local/bin/electrum:23
-#: config/chroot_local-includes/usr/local/bin/icedove:37
+#: config/chroot_local-includes/usr/local/bin/thunderbird:37
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
msgid "_Launch"
msgstr "_Launch"
#: config/chroot_local-includes/usr/local/bin/electrum:24
-#: config/chroot_local-includes/usr/local/bin/icedove:38
+#: config/chroot_local-includes/usr/local/bin/thunderbird:38
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
msgid "_Exit"
msgstr "_Exit"
-#: config/chroot_local-includes/usr/local/bin/icedove:27
+#: config/chroot_local-includes/usr/local/bin/thunderbird:27
msgid "The <b>Claws Mail</b> persistence feature is activated."
msgstr "The <b>Claws Mail</b> persistence feature is activated."
-#: config/chroot_local-includes/usr/local/bin/icedove:29
+#: config/chroot_local-includes/usr/local/bin/thunderbird:29
msgid ""
"If you have emails saved in <b>Claws Mail</b>, you should <a href='https://"
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate your "
-"data</a> before starting <b>Icedove</b>."
+"data</a> before starting <b>Thunderbird</b>."
msgstr ""
"If you have emails saved in <b>Claws Mail</b>, you should <a href='https://"
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate your "
-"data</a> before starting <b>Icedove</b>."
+"data</a> before starting <b>Thunderbird</b>."
-#: config/chroot_local-includes/usr/local/bin/icedove:34
+#: config/chroot_local-includes/usr/local/bin/thunderbird:34
msgid ""
-"If you already migrated your emails to <b>Icedove</b>, you should <a "
+"If you already migrated your emails to <b>Thunderbird</b>, you should <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>delete all your <b>Claws Mail</b> data</a> to "
"remove this warning."
msgstr ""
-"If you already migrated your emails to <b>Icedove</b>, you should <a "
+"If you already migrated your emails to <b>Thunderbird</b>, you should <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>delete all your <b>Claws Mail</b> data</a> to "
"remove this warning."
diff --git a/po/es.po b/po/es.po
index 5a51a4a..a79b49a 100644
--- a/po/es.po
+++ b/po/es.po
@@ -87,39 +87,39 @@ msgid "Do you want to start Electrum anyway?"
msgstr "¿Quiere iniciar Electrum de todas formas?"
#: config/chroot_local-includes/usr/local/bin/electrum:23
-#: config/chroot_local-includes/usr/local/bin/icedove:37
+#: config/chroot_local-includes/usr/local/bin/thunderbird:37
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
msgid "_Launch"
msgstr "_Iniciar"
#: config/chroot_local-includes/usr/local/bin/electrum:24
-#: config/chroot_local-includes/usr/local/bin/icedove:38
+#: config/chroot_local-includes/usr/local/bin/thunderbird:38
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
msgid "_Exit"
msgstr "_Salir"
-#: config/chroot_local-includes/usr/local/bin/icedove:27
+#: config/chroot_local-includes/usr/local/bin/thunderbird:27
msgid "The <b>Claws Mail</b> persistence feature is activated."
msgstr "La característica de persistencia de <b>Claws Mail</b> está activada."
-#: config/chroot_local-includes/usr/local/bin/icedove:29
+#: config/chroot_local-includes/usr/local/bin/thunderbird:29
msgid ""
"If you have emails saved in <b>Claws Mail</b>, you should <a href='https://"
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate your "
-"data</a> before starting <b>Icedove</b>."
+"data</a> before starting <b>Thunderbird</b>."
msgstr ""
"Si tienes correos guardados en <b>Claws Mail</b>, debes <a href='https://"
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrar tus "
-"datos</a> antes de iniciar <b>Icedove</b>."
+"datos</a> antes de iniciar <b>Thunderbird</b>."
-#: config/chroot_local-includes/usr/local/bin/icedove:34
+#: config/chroot_local-includes/usr/local/bin/thunderbird:34
msgid ""
-"If you already migrated your emails to <b>Icedove</b>, you should <a "
+"If you already migrated your emails to <b>Thunderbird</b>, you should <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>delete all your <b>Claws Mail</b> data</a> to "
"remove this warning."
msgstr ""
-"Si ya migraste tus correos electrónicos a <b>Icedove</b>, deberías <a "
+"Si ya migraste tus correos electrónicos a <b>Thunderbird</b>, deberías <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>borrar todos tus datos de <b>Claws Mail</b></"
"a> para eliminar esta advertencia."
diff --git a/po/fa.po b/po/fa.po
index a5cc4d3..577924c 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -102,40 +102,40 @@ msgid "Do you want to start Electrum anyway?"
msgstr "آیا شما می خواهید برای شروع های Electrum به هر حال؟"
#: config/chroot_local-includes/usr/local/bin/electrum:23
-#: config/chroot_local-includes/usr/local/bin/icedove:37
+#: config/chroot_local-includes/usr/local/bin/thunderbird:37
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
msgid "_Launch"
msgstr "اجرا"
#: config/chroot_local-includes/usr/local/bin/electrum:24
-#: config/chroot_local-includes/usr/local/bin/icedove:38
+#: config/chroot_local-includes/usr/local/bin/thunderbird:38
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
msgid "_Exit"
msgstr "خروج"
-#: config/chroot_local-includes/usr/local/bin/icedove:27
+#: config/chroot_local-includes/usr/local/bin/thunderbird:27
msgid "The <b>Claws Mail</b> persistence feature is activated."
msgstr "<b>Claws Mail</b> فعال شد."
-#: config/chroot_local-includes/usr/local/bin/icedove:29
+#: config/chroot_local-includes/usr/local/bin/thunderbird:29
msgid ""
"If you have emails saved in <b>Claws Mail</b>, you should <a href='https://"
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate your "
-"data</a> before starting <b>Icedove</b>."
+"data</a> before starting <b>Thunderbird</b>."
msgstr ""
"اگر ایمیلی دارید که در <b>Claws Mail</b> ذخبره شده است، باید <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
-"claws_mail_to_icedove'>اطلاعات خود را قبل از اجرای <b>Icedove</b> منتقل کنید."
+"claws_mail_to_icedove'>اطلاعات خود را قبل از اجرای <b>Thunderbird</b> منتقل کنید."
"</a>"
-#: config/chroot_local-includes/usr/local/bin/icedove:34
+#: config/chroot_local-includes/usr/local/bin/thunderbird:34
msgid ""
-"If you already migrated your emails to <b>Icedove</b>, you should <a "
+"If you already migrated your emails to <b>Thunderbird</b>, you should <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>delete all your <b>Claws Mail</b> data</a> to "
"remove this warning."
msgstr ""
-"اگر پیش از این ایمیلهای خود را به <b>Icedove</b> انتقال داده اید، باید <a "
+"اگر پیش از این ایمیلهای خود را به <b>Thunderbird</b> انتقال داده اید، باید <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>تمامی اطلاعات خود را از <b>Claws Mail</b> پاک "
"کنید تا این اخطار را از بین ببرید."
diff --git a/po/fi.po b/po/fi.po
index 02a3997..b596975 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -85,40 +85,40 @@ msgid "Do you want to start Electrum anyway?"
msgstr "Haluatko silti käynnistää Electrum-sovelluksen?"
#: config/chroot_local-includes/usr/local/bin/electrum:23
-#: config/chroot_local-includes/usr/local/bin/icedove:37
+#: config/chroot_local-includes/usr/local/bin/thunderbird:37
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
msgid "_Launch"
msgstr "_Käynnistä"
#: config/chroot_local-includes/usr/local/bin/electrum:24
-#: config/chroot_local-includes/usr/local/bin/icedove:38
+#: config/chroot_local-includes/usr/local/bin/thunderbird:38
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
msgid "_Exit"
msgstr "_Lopeta"
-#: config/chroot_local-includes/usr/local/bin/icedove:27
+#: config/chroot_local-includes/usr/local/bin/thunderbird:27
msgid "The <b>Claws Mail</b> persistence feature is activated."
msgstr "<b>Claws Mail</b> -pysyvyystoiminto on päällä."
-#: config/chroot_local-includes/usr/local/bin/icedove:29
+#: config/chroot_local-includes/usr/local/bin/thunderbird:29
msgid ""
"If you have emails saved in <b>Claws Mail</b>, you should <a href='https://"
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate your "
-"data</a> before starting <b>Icedove</b>."
+"data</a> before starting <b>Thunderbird</b>."
msgstr ""
"Jos sinulla on sähköposteja tallennettuna <b>Claws Mailiin</b>, sinun "
"pitäisi <a href='https://tails.boum.org/doc/anonymous_internet/"
-"claws_mail_to_icedove'>siirtää tietosi</a> ennen <b>Icedoven</b> "
+"claws_mail_to_icedove'>siirtää tietosi</a> ennen <b>Thunderbirdn</b> "
"käynnistämistä."
-#: config/chroot_local-includes/usr/local/bin/icedove:34
+#: config/chroot_local-includes/usr/local/bin/thunderbird:34
msgid ""
-"If you already migrated your emails to <b>Icedove</b>, you should <a "
+"If you already migrated your emails to <b>Thunderbird</b>, you should <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>delete all your <b>Claws Mail</b> data</a> to "
"remove this warning."
msgstr ""
-"Jos olet jo siirtänyt sähköpostisi <b>Icedoveen</b>, sinun pitäisi <a "
+"Jos olet jo siirtänyt sähköpostisi <b>Thunderbirden</b>, sinun pitäisi <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>poistaa kaikki tietosi <b>Claws Mailista</b></"
"a> poistaaksesi tämän varoituksen."
diff --git a/po/fr.po b/po/fr.po
index 21f1fbd..63f4ebc 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -93,40 +93,40 @@ msgid "Do you want to start Electrum anyway?"
msgstr "Voulez-vous quand même démarrer Electrum ?"
#: config/chroot_local-includes/usr/local/bin/electrum:23
-#: config/chroot_local-includes/usr/local/bin/icedove:37
+#: config/chroot_local-includes/usr/local/bin/thunderbird:37
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
msgid "_Launch"
msgstr "_Lancer"
#: config/chroot_local-includes/usr/local/bin/electrum:24
-#: config/chroot_local-includes/usr/local/bin/icedove:38
+#: config/chroot_local-includes/usr/local/bin/thunderbird:38
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
msgid "_Exit"
msgstr "_Quitter"
-#: config/chroot_local-includes/usr/local/bin/icedove:27
+#: config/chroot_local-includes/usr/local/bin/thunderbird:27
msgid "The <b>Claws Mail</b> persistence feature is activated."
msgstr "La fonction de persistance du client <b>Claws Mail</b> est activée."
-#: config/chroot_local-includes/usr/local/bin/icedove:29
+#: config/chroot_local-includes/usr/local/bin/thunderbird:29
msgid ""
"If you have emails saved in <b>Claws Mail</b>, you should <a href='https://"
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate your "
-"data</a> before starting <b>Icedove</b>."
+"data</a> before starting <b>Thunderbird</b>."
msgstr ""
"Si vous avez des courriels enregistrés dans le client <b>Claws Mail</b>, "
"vous devriez <a href='https://tails.boum.org/doc/anonymous_internet/"
-"claws_mail_to_icedove'>migrer vos données</a> avant de démarrer <b>Icedove</"
+"claws_mail_to_icedove'>migrer vos données</a> avant de démarrer <b>Thunderbird</"
"b>."
-#: config/chroot_local-includes/usr/local/bin/icedove:34
+#: config/chroot_local-includes/usr/local/bin/thunderbird:34
msgid ""
-"If you already migrated your emails to <b>Icedove</b>, you should <a "
+"If you already migrated your emails to <b>Thunderbird</b>, you should <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>delete all your <b>Claws Mail</b> data</a> to "
"remove this warning."
msgstr ""
-"Si vous avez déjà migré vos courriels vers <b>Icedove</b>, vous devriez <a "
+"Si vous avez déjà migré vos courriels vers <b>Thunderbird</b>, vous devriez <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>supprimer toutes vos données <b>Claws Mail</"
"b></a> pour que cet avertissement n'apparaisse plus."
diff --git a/po/fr_CA.po b/po/fr_CA.po
index a1013bc..2d83042 100644
--- a/po/fr_CA.po
+++ b/po/fr_CA.po
@@ -85,39 +85,39 @@ msgid "Do you want to start Electrum anyway?"
msgstr "Voulez-vous quand même démarrer Electrum?"
#: config/chroot_local-includes/usr/local/bin/electrum:23
-#: config/chroot_local-includes/usr/local/bin/icedove:37
+#: config/chroot_local-includes/usr/local/bin/thunderbird:37
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
msgid "_Launch"
msgstr "_Lancer"
#: config/chroot_local-includes/usr/local/bin/electrum:24
-#: config/chroot_local-includes/usr/local/bin/icedove:38
+#: config/chroot_local-includes/usr/local/bin/thunderbird:38
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
msgid "_Exit"
msgstr "_Quitter"
-#: config/chroot_local-includes/usr/local/bin/icedove:27
+#: config/chroot_local-includes/usr/local/bin/thunderbird:27
msgid "The <b>Claws Mail</b> persistence feature is activated."
msgstr "La fonction de persistance du client <b>Claws Mail</b> est activée."
-#: config/chroot_local-includes/usr/local/bin/icedove:29
+#: config/chroot_local-includes/usr/local/bin/thunderbird:29
msgid ""
"If you have emails saved in <b>Claws Mail</b>, you should <a href='https://"
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate your "
-"data</a> before starting <b>Icedove</b>."
+"data</a> before starting <b>Thunderbird</b>."
msgstr ""
"Si vous avez des courriels enregistrés dans le client <b>Claws Mail</b>, "
"vous devriez <a href='https://tails.boum.org/doc/anonymous_internet/"
-"claws_mail_to_icedove'>migrer vos données</a> avant de lancer <b>Icedove</b>."
+"claws_mail_to_icedove'>migrer vos données</a> avant de lancer <b>Thunderbird</b>."
-#: config/chroot_local-includes/usr/local/bin/icedove:34
+#: config/chroot_local-includes/usr/local/bin/thunderbird:34
msgid ""
-"If you already migrated your emails to <b>Icedove</b>, you should <a "
+"If you already migrated your emails to <b>Thunderbird</b>, you should <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>delete all your <b>Claws Mail</b> data</a> to "
"remove this warning."
msgstr ""
-"Si vous avez déjà migré vos courriels vers <b>Icedove</b>, vous devriez <a "
+"Si vous avez déjà migré vos courriels vers <b>Thunderbird</b>, vous devriez <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>supprimer toutes vos données <b>Claws Mail</"
"b></a> pour que cet avertissement n'apparaisse plus."
diff --git a/po/he.po b/po/he.po
index 7ece9c3..40c27da 100644
--- a/po/he.po
+++ b/po/he.po
@@ -75,31 +75,31 @@ msgid "Do you want to start Electrum anyway?"
msgstr "האם ברצונך להפעיל את אלקטרום בכל זאת?"
#: config/chroot_local-includes/usr/local/bin/electrum:23
-#: config/chroot_local-includes/usr/local/bin/icedove:37
+#: config/chroot_local-includes/usr/local/bin/thunderbird:37
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
msgid "_Launch"
msgstr "_שגר"
#: config/chroot_local-includes/usr/local/bin/electrum:24
-#: config/chroot_local-includes/usr/local/bin/icedove:38
+#: config/chroot_local-includes/usr/local/bin/thunderbird:38
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
msgid "_Exit"
msgstr "י_ציאה"
-#: config/chroot_local-includes/usr/local/bin/icedove:27
+#: config/chroot_local-includes/usr/local/bin/thunderbird:27
msgid "The <b>Claws Mail</b> persistence feature is activated."
msgstr ""
-#: config/chroot_local-includes/usr/local/bin/icedove:29
+#: config/chroot_local-includes/usr/local/bin/thunderbird:29
msgid ""
"If you have emails saved in <b>Claws Mail</b>, you should <a href='https://"
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate your "
-"data</a> before starting <b>Icedove</b>."
+"data</a> before starting <b>Thunderbird</b>."
msgstr ""
-#: config/chroot_local-includes/usr/local/bin/icedove:34
+#: config/chroot_local-includes/usr/local/bin/thunderbird:34
msgid ""
-"If you already migrated your emails to <b>Icedove</b>, you should <a "
+"If you already migrated your emails to <b>Thunderbird</b>, you should <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>delete all your <b>Claws Mail</b> data</a> to "
"remove this warning."
diff --git a/po/hr_HR.po b/po/hr_HR.po
index 141348d..d2925e0 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -84,40 +84,40 @@ msgid "Do you want to start Electrum anyway?"
msgstr "Želite li svejedno pokrenuti Electrum?"
#: config/chroot_local-includes/usr/local/bin/electrum:23
-#: config/chroot_local-includes/usr/local/bin/icedove:37
+#: config/chroot_local-includes/usr/local/bin/thunderbird:37
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
msgid "_Launch"
msgstr "_Pokreni"
#: config/chroot_local-includes/usr/local/bin/electrum:24
-#: config/chroot_local-includes/usr/local/bin/icedove:38
+#: config/chroot_local-includes/usr/local/bin/thunderbird:38
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
msgid "_Exit"
msgstr "_Izlaz"
-#: config/chroot_local-includes/usr/local/bin/icedove:27
+#: config/chroot_local-includes/usr/local/bin/thunderbird:27
msgid "The <b>Claws Mail</b> persistence feature is activated."
msgstr "<b>Claws Mailova</b> značajka trajnosti je aktivirana."
-#: config/chroot_local-includes/usr/local/bin/icedove:29
+#: config/chroot_local-includes/usr/local/bin/thunderbird:29
msgid ""
"If you have emails saved in <b>Claws Mail</b>, you should <a href='https://"
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate your "
-"data</a> before starting <b>Icedove</b>."
+"data</a> before starting <b>Thunderbird</b>."
msgstr ""
"Ako imate emailove pohranjene u <b>Claws Mailu</b>, trebali bi <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove'>migrirati svoje podatke</a> prije pokretanja "
-"<b>Icedovea</b>."
+"<b>Thunderbirda</b>."
-#: config/chroot_local-includes/usr/local/bin/icedove:34
+#: config/chroot_local-includes/usr/local/bin/thunderbird:34
msgid ""
-"If you already migrated your emails to <b>Icedove</b>, you should <a "
+"If you already migrated your emails to <b>Thunderbird</b>, you should <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>delete all your <b>Claws Mail</b> data</a> to "
"remove this warning."
msgstr ""
-"Ako ste već migrirali svoje email-ove na <b>Icedove</b> trebali bi <a "
+"Ako ste već migrirali svoje email-ove na <b>Thunderbird</b> trebali bi <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'> izbrisati sve <b>Claws Mail</b> podatke</a> "
"kako bi uklonili ovo upozorenje."
diff --git a/po/hu.po b/po/hu.po
index 9636319..a6090f0 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -89,39 +89,39 @@ msgid "Do you want to start Electrum anyway?"
msgstr "Mindenképp el szeretné indítani az Electum-ot?"
#: config/chroot_local-includes/usr/local/bin/electrum:23
-#: config/chroot_local-includes/usr/local/bin/icedove:37
+#: config/chroot_local-includes/usr/local/bin/thunderbird:37
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
msgid "_Launch"
msgstr "_Indítás"
#: config/chroot_local-includes/usr/local/bin/electrum:24
-#: config/chroot_local-includes/usr/local/bin/icedove:38
+#: config/chroot_local-includes/usr/local/bin/thunderbird:38
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
msgid "_Exit"
msgstr "_Kilépés"
-#: config/chroot_local-includes/usr/local/bin/icedove:27
+#: config/chroot_local-includes/usr/local/bin/thunderbird:27
msgid "The <b>Claws Mail</b> persistence feature is activated."
msgstr "A <b>Claws Mail</b> perzisztencia aktiválva."
-#: config/chroot_local-includes/usr/local/bin/icedove:29
+#: config/chroot_local-includes/usr/local/bin/thunderbird:29
msgid ""
"If you have emails saved in <b>Claws Mail</b>, you should <a href='https://"
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate your "
-"data</a> before starting <b>Icedove</b>."
+"data</a> before starting <b>Thunderbird</b>."
msgstr ""
"Ha vannak elmentett emailjei a <b>Claws Mail-ben</b>, akkor <a href='https://"
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>másolja át az "
-"adatait</a> az <b>Icedove</b> indítása előtt."
+"adatait</a> az <b>Thunderbird</b> indítása előtt."
-#: config/chroot_local-includes/usr/local/bin/icedove:34
+#: config/chroot_local-includes/usr/local/bin/thunderbird:34
msgid ""
-"If you already migrated your emails to <b>Icedove</b>, you should <a "
+"If you already migrated your emails to <b>Thunderbird</b>, you should <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>delete all your <b>Claws Mail</b> data</a> to "
"remove this warning."
msgstr ""
-"Ha a levelezés migrálása <b>Icedove</b>-ra már megtörtént, akkor <a "
+"Ha a levelezés migrálása <b>Thunderbird</b>-ra már megtörtént, akkor <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>minden <b>Claws Mail</b> adatod törlése</a> "
"után ez a figyelmeztetés nem fog megjelenni."
diff --git a/po/id.po b/po/id.po
index a58c266..eda1c01 100644
--- a/po/id.po
+++ b/po/id.po
@@ -89,40 +89,40 @@ msgid "Do you want to start Electrum anyway?"
msgstr "Apakah Anda tetap ingin memulai Electrum?"
#: config/chroot_local-includes/usr/local/bin/electrum:23
-#: config/chroot_local-includes/usr/local/bin/icedove:37
+#: config/chroot_local-includes/usr/local/bin/thunderbird:37
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
msgid "_Launch"
msgstr "_Luncurkan"
#: config/chroot_local-includes/usr/local/bin/electrum:24
-#: config/chroot_local-includes/usr/local/bin/icedove:38
+#: config/chroot_local-includes/usr/local/bin/thunderbird:38
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
msgid "_Exit"
msgstr "_Keluar"
-#: config/chroot_local-includes/usr/local/bin/icedove:27
+#: config/chroot_local-includes/usr/local/bin/thunderbird:27
msgid "The <b>Claws Mail</b> persistence feature is activated."
msgstr "Fitur persistensi <b>Claws Mail</b> sudah diaktifkan."
-#: config/chroot_local-includes/usr/local/bin/icedove:29
+#: config/chroot_local-includes/usr/local/bin/thunderbird:29
msgid ""
"If you have emails saved in <b>Claws Mail</b>, you should <a href='https://"
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate your "
-"data</a> before starting <b>Icedove</b>."
+"data</a> before starting <b>Thunderbird</b>."
msgstr ""
"Jika Anda memiliki surel yang disimpan di <b>Claws Mail</b>, Anda harus <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove'>migrasikan data Anda</a> sebelum menjalankan "
-"<b>Icedove</b>."
+"<b>Thunderbird</b>."
-#: config/chroot_local-includes/usr/local/bin/icedove:34
+#: config/chroot_local-includes/usr/local/bin/thunderbird:34
msgid ""
-"If you already migrated your emails to <b>Icedove</b>, you should <a "
+"If you already migrated your emails to <b>Thunderbird</b>, you should <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>delete all your <b>Claws Mail</b> data</a> to "
"remove this warning."
msgstr ""
-"Jika anda telah melakukan migrasi email ke <b>Icedove</b> anda harus <a "
+"Jika anda telah melakukan migrasi email ke <b>Thunderbird</b> anda harus <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>menghapus semua data <b>Mail Claw</b></a> "
"untuk menghilangkan peringatan ini."
diff --git a/po/is.po b/po/is.po
index b15d7e4..9785e7b 100644
--- a/po/is.po
+++ b/po/is.po
@@ -81,40 +81,40 @@ msgid "Do you want to start Electrum anyway?"
msgstr "Viltu samt ræsa Electrum?"
#: config/chroot_local-includes/usr/local/bin/electrum:23
-#: config/chroot_local-includes/usr/local/bin/icedove:37
+#: config/chroot_local-includes/usr/local/bin/thunderbird:37
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
msgid "_Launch"
msgstr "_Ræsa"
#: config/chroot_local-includes/usr/local/bin/electrum:24
-#: config/chroot_local-includes/usr/local/bin/icedove:38
+#: config/chroot_local-includes/usr/local/bin/thunderbird:38
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
msgid "_Exit"
msgstr "_Hætta"
-#: config/chroot_local-includes/usr/local/bin/icedove:27
+#: config/chroot_local-includes/usr/local/bin/thunderbird:27
msgid "The <b>Claws Mail</b> persistence feature is activated."
msgstr "Varanleg geymsla gagna <b>Claws-pósti</b> er virk."
-#: config/chroot_local-includes/usr/local/bin/icedove:29
+#: config/chroot_local-includes/usr/local/bin/thunderbird:29
msgid ""
"If you have emails saved in <b>Claws Mail</b>, you should <a href='https://"
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate your "
-"data</a> before starting <b>Icedove</b>."
+"data</a> before starting <b>Thunderbird</b>."
msgstr ""
"Ef þú ert með tölvupósta vistaða í <b>Claws-pósti</b>, þá ættirðu að <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
-"claws_mail_to_icedove'>yfirfæra gögnin þín</a> áður en þú ræsir <b>Icedove</"
+"claws_mail_to_icedove'>yfirfæra gögnin þín</a> áður en þú ræsir <b>Thunderbird</"
"b>."
-#: config/chroot_local-includes/usr/local/bin/icedove:34
+#: config/chroot_local-includes/usr/local/bin/thunderbird:34
msgid ""
-"If you already migrated your emails to <b>Icedove</b>, you should <a "
+"If you already migrated your emails to <b>Thunderbird</b>, you should <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>delete all your <b>Claws Mail</b> data</a> to "
"remove this warning."
msgstr ""
-"Ef þú ert þegar búinn að yfirfæra tölvupóstana þína í <b>Icedove</b>, þá "
+"Ef þú ert þegar búinn að yfirfæra tölvupóstana þína í <b>Thunderbird</b>, þá "
"ættirðu að <a href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>eyða öllum gögnum úr <b>Claws-póstinum</b></a> "
"til að losna við þessa aðvörun."
diff --git a/po/it.po b/po/it.po
index 24192df..1bd00c9 100644
--- a/po/it.po
+++ b/po/it.po
@@ -98,39 +98,39 @@ msgid "Do you want to start Electrum anyway?"
msgstr "Vuoi comunque avviare Electrum?"
#: config/chroot_local-includes/usr/local/bin/electrum:23
-#: config/chroot_local-includes/usr/local/bin/icedove:37
+#: config/chroot_local-includes/usr/local/bin/thunderbird:37
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
msgid "_Launch"
msgstr "_Avvia"
#: config/chroot_local-includes/usr/local/bin/electrum:24
-#: config/chroot_local-includes/usr/local/bin/icedove:38
+#: config/chroot_local-includes/usr/local/bin/thunderbird:38
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
msgid "_Exit"
msgstr "_Esci"
-#: config/chroot_local-includes/usr/local/bin/icedove:27
+#: config/chroot_local-includes/usr/local/bin/thunderbird:27
msgid "The <b>Claws Mail</b> persistence feature is activated."
msgstr "La caratteristica di persistenza di <b>Claws Mail</b> è attivata."
-#: config/chroot_local-includes/usr/local/bin/icedove:29
+#: config/chroot_local-includes/usr/local/bin/thunderbird:29
msgid ""
"If you have emails saved in <b>Claws Mail</b>, you should <a href='https://"
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate your "
-"data</a> before starting <b>Icedove</b>."
+"data</a> before starting <b>Thunderbird</b>."
msgstr ""
"Se le tue email sono salvate in <b>Claws Mail</b>, dovresti <a href='https://"
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrare i tuoi "
-"dati</a> prima di avviare <b>Icedove</b>."
+"dati</a> prima di avviare <b>Thunderbird</b>."
-#: config/chroot_local-includes/usr/local/bin/icedove:34
+#: config/chroot_local-includes/usr/local/bin/thunderbird:34
msgid ""
-"If you already migrated your emails to <b>Icedove</b>, you should <a "
+"If you already migrated your emails to <b>Thunderbird</b>, you should <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>delete all your <b>Claws Mail</b> data</a> to "
"remove this warning."
msgstr ""
-"Se hai già migrato le tue email su <b>Icedove</b>, devi <a href='https://"
+"Se hai già migrato le tue email su <b>Thunderbird</b>, devi <a href='https://"
"tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>eliminare tutti i tuoi dati di <b>Claws Mail</"
"b></a> per rimuovere questo avvertimento."
diff --git a/po/ja.po b/po/ja.po
index 58ba035..dd532fe 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -85,39 +85,39 @@ msgid "Do you want to start Electrum anyway?"
msgstr "それでも Electrum を起動しますか?"
#: config/chroot_local-includes/usr/local/bin/electrum:23
-#: config/chroot_local-includes/usr/local/bin/icedove:37
+#: config/chroot_local-includes/usr/local/bin/thunderbird:37
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
msgid "_Launch"
msgstr "起動 (_L)"
#: config/chroot_local-includes/usr/local/bin/electrum:24
-#: config/chroot_local-includes/usr/local/bin/icedove:38
+#: config/chroot_local-includes/usr/local/bin/thunderbird:38
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
msgid "_Exit"
msgstr "終了 (_E)"
-#: config/chroot_local-includes/usr/local/bin/icedove:27
+#: config/chroot_local-includes/usr/local/bin/thunderbird:27
msgid "The <b>Claws Mail</b> persistence feature is activated."
msgstr "<b>Claws Mail</b>のデータ保持機能は有効化されています。"
-#: config/chroot_local-includes/usr/local/bin/icedove:29
+#: config/chroot_local-includes/usr/local/bin/thunderbird:29
msgid ""
"If you have emails saved in <b>Claws Mail</b>, you should <a href='https://"
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate your "
-"data</a> before starting <b>Icedove</b>."
+"data</a> before starting <b>Thunderbird</b>."
msgstr ""
-"<b>Claws Mail</b>にメールが保存されている場合、<b>Icedove</b>を開始する前に"
+"<b>Claws Mail</b>にメールが保存されている場合、<b>Thunderbird</b>を開始する前に"
"<a href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove'>データを移行</a>すべきです。"
-#: config/chroot_local-includes/usr/local/bin/icedove:34
+#: config/chroot_local-includes/usr/local/bin/thunderbird:34
msgid ""
-"If you already migrated your emails to <b>Icedove</b>, you should <a "
+"If you already migrated your emails to <b>Thunderbird</b>, you should <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>delete all your <b>Claws Mail</b> data</a> to "
"remove this warning."
msgstr ""
-"あなたが既に<b>Icedove</b>にメールを移行した場合、この警告をなくすために<a "
+"あなたが既に<b>Thunderbird</b>にメールを移行した場合、この警告をなくすために<a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>すべての<b>Claws Mail</b>データを削除</a>すべき"
"です。"
diff --git a/po/km.po b/po/km.po
index 1ccaf68..e229d09 100644
--- a/po/km.po
+++ b/po/km.po
@@ -72,31 +72,31 @@ msgid "Do you want to start Electrum anyway?"
msgstr ""
#: config/chroot_local-includes/usr/local/bin/electrum:23
-#: config/chroot_local-includes/usr/local/bin/icedove:37
+#: config/chroot_local-includes/usr/local/bin/thunderbird:37
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
msgid "_Launch"
msgstr "ចាប់ផ្ដើម"
#: config/chroot_local-includes/usr/local/bin/electrum:24
-#: config/chroot_local-includes/usr/local/bin/icedove:38
+#: config/chroot_local-includes/usr/local/bin/thunderbird:38
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
msgid "_Exit"
msgstr "ចេញ"
-#: config/chroot_local-includes/usr/local/bin/icedove:27
+#: config/chroot_local-includes/usr/local/bin/thunderbird:27
msgid "The <b>Claws Mail</b> persistence feature is activated."
msgstr ""
-#: config/chroot_local-includes/usr/local/bin/icedove:29
+#: config/chroot_local-includes/usr/local/bin/thunderbird:29
msgid ""
"If you have emails saved in <b>Claws Mail</b>, you should <a href='https://"
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate your "
-"data</a> before starting <b>Icedove</b>."
+"data</a> before starting <b>Thunderbird</b>."
msgstr ""
-#: config/chroot_local-includes/usr/local/bin/icedove:34
+#: config/chroot_local-includes/usr/local/bin/thunderbird:34
msgid ""
-"If you already migrated your emails to <b>Icedove</b>, you should <a "
+"If you already migrated your emails to <b>Thunderbird</b>, you should <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>delete all your <b>Claws Mail</b> data</a> to "
"remove this warning."
diff --git a/po/ko.po b/po/ko.po
index ba58d05..f2d327b 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -83,42 +83,42 @@ msgid "Do you want to start Electrum anyway?"
msgstr "그래도 Electrum을 실행하시겠습니까?"
#: config/chroot_local-includes/usr/local/bin/electrum:23
-#: config/chroot_local-includes/usr/local/bin/icedove:37
+#: config/chroot_local-includes/usr/local/bin/thunderbird:37
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
msgid "_Launch"
msgstr "_Launch"
#: config/chroot_local-includes/usr/local/bin/electrum:24
-#: config/chroot_local-includes/usr/local/bin/icedove:38
+#: config/chroot_local-includes/usr/local/bin/thunderbird:38
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
msgid "_Exit"
msgstr "_Exit"
-#: config/chroot_local-includes/usr/local/bin/icedove:27
+#: config/chroot_local-includes/usr/local/bin/thunderbird:27
msgid "The <b>Claws Mail</b> persistence feature is activated."
msgstr "<b>Claws Mail</b> 의 지속성 기능이 활성화되었습니다."
-#: config/chroot_local-includes/usr/local/bin/icedove:29
+#: config/chroot_local-includes/usr/local/bin/thunderbird:29
msgid ""
"If you have emails saved in <b>Claws Mail</b>, you should <a href='https://"
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate your "
-"data</a> before starting <b>Icedove</b>."
+"data</a> before starting <b>Thunderbird</b>."
msgstr ""
"<b>Claws Mail</b>에 이메일이 저장된 것이 있으시다면, <a href='https://tails."
"boum.org/doc/anonymous_internet/claws_mail_to_icedove'> 데이터 이동하기</a>"
-"를 <b>Icedove</b> 실행 전에 하셔야 합니다."
+"를 <b>Thunderbird</b> 실행 전에 하셔야 합니다."
-#: config/chroot_local-includes/usr/local/bin/icedove:34
+#: config/chroot_local-includes/usr/local/bin/thunderbird:34
#, fuzzy
msgid ""
-"If you already migrated your emails to <b>Icedove</b>, you should <a "
+"If you already migrated your emails to <b>Thunderbird</b>, you should <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>delete all your <b>Claws Mail</b> data</a> to "
"remove this warning."
msgstr ""
"<b>Claws Mail</b>에 이메일이 저장된 것이 있으시다면, <a href='https://tails."
"boum.org/doc/anonymous_internet/claws_mail_to_icedove'> 데이터 이동하기</a>"
-"를 <b>Icedove</b> 실행 전에 하셔야 합니다."
+"를 <b>Thunderbird</b> 실행 전에 하셔야 합니다."
#: config/chroot_local-includes/usr/share/gnome-shell/extensions/shutdown-helper@tails.boum.org/extension.js:71
msgid "Restart"
diff --git a/po/lv.po b/po/lv.po
index da1a105..3b3faca 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -78,39 +78,39 @@ msgid "Do you want to start Electrum anyway?"
msgstr "Vai vienalga vēlaties startēt Electrum? "
#: config/chroot_local-includes/usr/local/bin/electrum:23
-#: config/chroot_local-includes/usr/local/bin/icedove:37
+#: config/chroot_local-includes/usr/local/bin/thunderbird:37
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
msgid "_Launch"
msgstr "_Launch"
#: config/chroot_local-includes/usr/local/bin/electrum:24
-#: config/chroot_local-includes/usr/local/bin/icedove:38
+#: config/chroot_local-includes/usr/local/bin/thunderbird:38
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
msgid "_Exit"
msgstr "_Exit"
-#: config/chroot_local-includes/usr/local/bin/icedove:27
+#: config/chroot_local-includes/usr/local/bin/thunderbird:27
msgid "The <b>Claws Mail</b> persistence feature is activated."
msgstr "Ir aktivēta <b>Claws Mail</b> pastāvības iezīme."
-#: config/chroot_local-includes/usr/local/bin/icedove:29
+#: config/chroot_local-includes/usr/local/bin/thunderbird:29
msgid ""
"If you have emails saved in <b>Claws Mail</b>, you should <a href='https://"
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate your "
-"data</a> before starting <b>Icedove</b>."
+"data</a> before starting <b>Thunderbird</b>."
msgstr ""
"Ja esat saglabājis e-pastus <b>Claws Mail</b>, Jums vajadzētu <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
-"claws_mail_to_icedove'>migrēt savus datus</a> pirms palaižat <b>Icedove</b>."
+"claws_mail_to_icedove'>migrēt savus datus</a> pirms palaižat <b>Thunderbird</b>."
-#: config/chroot_local-includes/usr/local/bin/icedove:34
+#: config/chroot_local-includes/usr/local/bin/thunderbird:34
msgid ""
-"If you already migrated your emails to <b>Icedove</b>, you should <a "
+"If you already migrated your emails to <b>Thunderbird</b>, you should <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>delete all your <b>Claws Mail</b> data</a> to "
"remove this warning."
msgstr ""
-"Ja esat jau migrējis savus e-pastus uz <b>Icedove</b>, Jums vajadzētu <a "
+"Ja esat jau migrējis savus e-pastus uz <b>Thunderbird</b>, Jums vajadzētu <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>delete all your <b>Claws Mail</b> data</a> "
"noņemt šo brīdinājumu."
diff --git a/po/nb.po b/po/nb.po
index a91923c..9d3ad30 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -88,39 +88,39 @@ msgid "Do you want to start Electrum anyway?"
msgstr "Vil du starte Electrum uansett?"
#: config/chroot_local-includes/usr/local/bin/electrum:23
-#: config/chroot_local-includes/usr/local/bin/icedove:37
+#: config/chroot_local-includes/usr/local/bin/thunderbird:37
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
msgid "_Launch"
msgstr "_Start"
#: config/chroot_local-includes/usr/local/bin/electrum:24
-#: config/chroot_local-includes/usr/local/bin/icedove:38
+#: config/chroot_local-includes/usr/local/bin/thunderbird:38
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
msgid "_Exit"
msgstr "_Avslutt"
-#: config/chroot_local-includes/usr/local/bin/icedove:27
+#: config/chroot_local-includes/usr/local/bin/thunderbird:27
msgid "The <b>Claws Mail</b> persistence feature is activated."
msgstr "Vedvarende <b>Claws e-post</b> har blitt påskrudd."
-#: config/chroot_local-includes/usr/local/bin/icedove:29
+#: config/chroot_local-includes/usr/local/bin/thunderbird:29
msgid ""
"If you have emails saved in <b>Claws Mail</b>, you should <a href='https://"
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate your "
-"data</a> before starting <b>Icedove</b>."
+"data</a> before starting <b>Thunderbird</b>."
msgstr ""
"Hvis du har e-poster lagret i <b>Claws e-post</b>, burde du <a href='https://"
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>flytte over "
-"dataen din</a> før du starter <b>Icedove</b>."
+"dataen din</a> før du starter <b>Thunderbird</b>."
-#: config/chroot_local-includes/usr/local/bin/icedove:34
+#: config/chroot_local-includes/usr/local/bin/thunderbird:34
msgid ""
-"If you already migrated your emails to <b>Icedove</b>, you should <a "
+"If you already migrated your emails to <b>Thunderbird</b>, you should <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>delete all your <b>Claws Mail</b> data</a> to "
"remove this warning."
msgstr ""
-"Hvis du allerede har flyttet dine e-poster til <b>Icedove</b>, burde du "
+"Hvis du allerede har flyttet dine e-poster til <b>Thunderbird</b>, burde du "
"først <a href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>slette all din e-post <b>Claws Mail</b>-data</"
"a> for å fjerne denne advarselen."
diff --git a/po/nl.po b/po/nl.po
index 2ba9d11..22a72f5 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -96,39 +96,39 @@ msgid "Do you want to start Electrum anyway?"
msgstr "Weet je zeker dat je Electrum wilt starten?"
#: config/chroot_local-includes/usr/local/bin/electrum:23
-#: config/chroot_local-includes/usr/local/bin/icedove:37
+#: config/chroot_local-includes/usr/local/bin/thunderbird:37
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
msgid "_Launch"
msgstr "Start"
#: config/chroot_local-includes/usr/local/bin/electrum:24
-#: config/chroot_local-includes/usr/local/bin/icedove:38
+#: config/chroot_local-includes/usr/local/bin/thunderbird:38
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
msgid "_Exit"
msgstr "Sluiten"
-#: config/chroot_local-includes/usr/local/bin/icedove:27
+#: config/chroot_local-includes/usr/local/bin/thunderbird:27
msgid "The <b>Claws Mail</b> persistence feature is activated."
msgstr "De <b>Claws Mail</b> persistence feature is ingeschakeld."
-#: config/chroot_local-includes/usr/local/bin/icedove:29
+#: config/chroot_local-includes/usr/local/bin/thunderbird:29
msgid ""
"If you have emails saved in <b>Claws Mail</b>, you should <a href='https://"
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate your "
-"data</a> before starting <b>Icedove</b>."
+"data</a> before starting <b>Thunderbird</b>."
msgstr ""
"Wanneer u e-mails opgeslagen heeft in <b>Claws Mail</b> wordt aanbevolen om "
"uw data <a href='https://tails.boum.org/doc/anonymous_internet/"
-"claws_mail_to_icedove'>te migreren</a> voordat u <b>Icedove</b>opstart."
+"claws_mail_to_icedove'>te migreren</a> voordat u <b>Thunderbird</b>opstart."
-#: config/chroot_local-includes/usr/local/bin/icedove:34
+#: config/chroot_local-includes/usr/local/bin/thunderbird:34
msgid ""
-"If you already migrated your emails to <b>Icedove</b>, you should <a "
+"If you already migrated your emails to <b>Thunderbird</b>, you should <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>delete all your <b>Claws Mail</b> data</a> to "
"remove this warning."
msgstr ""
-"Als je al je e-mails al hebt gemigreerd naar <b>Icedove</b>, dan moet je <a "
+"Als je al je e-mails al hebt gemigreerd naar <b>Thunderbird</b>, dan moet je <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>al je <b>Claws Mail</b> gegevens verwijderen</"
"a> om deze waarschuwing te verwijderen."
diff --git a/po/nn.po b/po/nn.po
index 338c96f..e989806 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -78,34 +78,34 @@ msgid "Do you want to start Electrum anyway?"
msgstr "Vil du starte Electrum likevel?"
#: config/chroot_local-includes/usr/local/bin/electrum:23
-#: config/chroot_local-includes/usr/local/bin/icedove:37
+#: config/chroot_local-includes/usr/local/bin/thunderbird:37
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
msgid "_Launch"
msgstr "_Start"
#: config/chroot_local-includes/usr/local/bin/electrum:24
-#: config/chroot_local-includes/usr/local/bin/icedove:38
+#: config/chroot_local-includes/usr/local/bin/thunderbird:38
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
msgid "_Exit"
msgstr "_Avslutt"
-#: config/chroot_local-includes/usr/local/bin/icedove:27
+#: config/chroot_local-includes/usr/local/bin/thunderbird:27
msgid "The <b>Claws Mail</b> persistence feature is activated."
msgstr "<b>Klør-post</b>-vedvaringsfunksjonen er aktiverd."
-#: config/chroot_local-includes/usr/local/bin/icedove:29
+#: config/chroot_local-includes/usr/local/bin/thunderbird:29
msgid ""
"If you have emails saved in <b>Claws Mail</b>, you should <a href='https://"
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate your "
-"data</a> before starting <b>Icedove</b>."
+"data</a> before starting <b>Thunderbird</b>."
msgstr ""
"Um du hev e-postar lagra i <b>Klør-post</b>, bør du <a href='https://tails."
"boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrere upplysingi "
"dine</a> fyre du startar <b>Isdue</b>."
-#: config/chroot_local-includes/usr/local/bin/icedove:34
+#: config/chroot_local-includes/usr/local/bin/thunderbird:34
msgid ""
-"If you already migrated your emails to <b>Icedove</b>, you should <a "
+"If you already migrated your emails to <b>Thunderbird</b>, you should <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>delete all your <b>Claws Mail</b> data</a> to "
"remove this warning."
diff --git a/po/pl.po b/po/pl.po
index 309d0c6..cc8a7cc 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -91,40 +91,40 @@ msgid "Do you want to start Electrum anyway?"
msgstr "Mimo tego, czy chcesz uruchomić Electrum?"
#: config/chroot_local-includes/usr/local/bin/electrum:23
-#: config/chroot_local-includes/usr/local/bin/icedove:37
+#: config/chroot_local-includes/usr/local/bin/thunderbird:37
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
msgid "_Launch"
msgstr "_Uruchom"
#: config/chroot_local-includes/usr/local/bin/electrum:24
-#: config/chroot_local-includes/usr/local/bin/icedove:38
+#: config/chroot_local-includes/usr/local/bin/thunderbird:38
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
msgid "_Exit"
msgstr "_Wyjście"
-#: config/chroot_local-includes/usr/local/bin/icedove:27
+#: config/chroot_local-includes/usr/local/bin/thunderbird:27
msgid "The <b>Claws Mail</b> persistence feature is activated."
msgstr "Zapis plików jest włączony dla <b>Claws mail</b>"
-#: config/chroot_local-includes/usr/local/bin/icedove:29
+#: config/chroot_local-includes/usr/local/bin/thunderbird:29
msgid ""
"If you have emails saved in <b>Claws Mail</b>, you should <a href='https://"
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate your "
-"data</a> before starting <b>Icedove</b>."
+"data</a> before starting <b>Thunderbird</b>."
msgstr ""
"Jeśli trzymasz swoją pocztę w <b>Claws Mail</b>, przeprowadź <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
-"claws_mail_to_icedove'>migrację Twoich danych do <b>Icedove</b></a>, zanim "
+"claws_mail_to_icedove'>migrację Twoich danych do <b>Thunderbird</b></a>, zanim "
"go uruchomisz."
-#: config/chroot_local-includes/usr/local/bin/icedove:34
+#: config/chroot_local-includes/usr/local/bin/thunderbird:34
msgid ""
-"If you already migrated your emails to <b>Icedove</b>, you should <a "
+"If you already migrated your emails to <b>Thunderbird</b>, you should <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>delete all your <b>Claws Mail</b> data</a> to "
"remove this warning."
msgstr ""
-"Jeśli przeniosłeś już swoje wiadomości do <b>Icedove</b>, powinieneś <a "
+"Jeśli przeniosłeś już swoje wiadomości do <b>Thunderbird</b>, powinieneś <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>skasować wszystkie dane z <b>Claws Mail</b> "
"data</a> aby usunąć to ostrzeżenie."
diff --git a/po/pt.po b/po/pt.po
index 44194da..4fe13e8 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -93,39 +93,39 @@ msgid "Do you want to start Electrum anyway?"
msgstr "Mesmo assim, deseja iniciar o Electrum?"
#: config/chroot_local-includes/usr/local/bin/electrum:23
-#: config/chroot_local-includes/usr/local/bin/icedove:37
+#: config/chroot_local-includes/usr/local/bin/thunderbird:37
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
msgid "_Launch"
msgstr "_Iniciar"
#: config/chroot_local-includes/usr/local/bin/electrum:24
-#: config/chroot_local-includes/usr/local/bin/icedove:38
+#: config/chroot_local-includes/usr/local/bin/thunderbird:38
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
msgid "_Exit"
msgstr "_Sair"
-#: config/chroot_local-includes/usr/local/bin/icedove:27
+#: config/chroot_local-includes/usr/local/bin/thunderbird:27
msgid "The <b>Claws Mail</b> persistence feature is activated."
msgstr "O <b>Claws Mail</b> opção de persistência está activado."
-#: config/chroot_local-includes/usr/local/bin/icedove:29
+#: config/chroot_local-includes/usr/local/bin/thunderbird:29
msgid ""
"If you have emails saved in <b>Claws Mail</b>, you should <a href='https://"
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate your "
-"data</a> before starting <b>Icedove</b>."
+"data</a> before starting <b>Thunderbird</b>."
msgstr ""
"Se tem mensagens guardadas em <b>Claws Mail</b>, deverá <a href='https://"
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrar os seus "
-"dados</a> antes de começar <b>Icedove</b>."
+"dados</a> antes de começar <b>Thunderbird</b>."
-#: config/chroot_local-includes/usr/local/bin/icedove:34
+#: config/chroot_local-includes/usr/local/bin/thunderbird:34
msgid ""
-"If you already migrated your emails to <b>Icedove</b>, you should <a "
+"If you already migrated your emails to <b>Thunderbird</b>, you should <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>delete all your <b>Claws Mail</b> data</a> to "
"remove this warning."
msgstr ""
-"Se já migrou as suas mensagens para <b>Icedove</b>, deverá <a href='https://"
+"Se já migrou as suas mensagens para <b>Thunderbird</b>, deverá <a href='https://"
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove#delete'>eliminar "
"todos os seus dados de <b>Claws Mail</b></a> para remover este aviso."
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 612ec01..9a256b8 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -89,40 +89,40 @@ msgid "Do you want to start Electrum anyway?"
msgstr "Você deseja iniciar o Electrum assim mesmo?"
#: config/chroot_local-includes/usr/local/bin/electrum:23
-#: config/chroot_local-includes/usr/local/bin/icedove:37
+#: config/chroot_local-includes/usr/local/bin/thunderbird:37
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
msgid "_Launch"
msgstr "_Lançar"
#: config/chroot_local-includes/usr/local/bin/electrum:24
-#: config/chroot_local-includes/usr/local/bin/icedove:38
+#: config/chroot_local-includes/usr/local/bin/thunderbird:38
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
msgid "_Exit"
msgstr "_Saída"
-#: config/chroot_local-includes/usr/local/bin/icedove:27
+#: config/chroot_local-includes/usr/local/bin/thunderbird:27
msgid "The <b>Claws Mail</b> persistence feature is activated."
msgstr "O recurso persistente <b>Claws Mail</b> foi ativado."
-#: config/chroot_local-includes/usr/local/bin/icedove:29
+#: config/chroot_local-includes/usr/local/bin/thunderbird:29
msgid ""
"If you have emails saved in <b>Claws Mail</b>, you should <a href='https://"
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate your "
-"data</a> before starting <b>Icedove</b>."
+"data</a> before starting <b>Thunderbird</b>."
msgstr ""
"Se você tiver e-mails salvos no <b>Claws Mail</b>, você deve <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
-"claws_mail_to_icedove'>migrar seus dados</a> antes de iniciar o <b>Icedove</"
+"claws_mail_to_icedove'>migrar seus dados</a> antes de iniciar o <b>Thunderbird</"
"b>."
-#: config/chroot_local-includes/usr/local/bin/icedove:34
+#: config/chroot_local-includes/usr/local/bin/thunderbird:34
msgid ""
-"If you already migrated your emails to <b>Icedove</b>, you should <a "
+"If you already migrated your emails to <b>Thunderbird</b>, you should <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>delete all your <b>Claws Mail</b> data</a> to "
"remove this warning."
msgstr ""
-"Se você já tver migrado seus e-mails para o <b>Icedove</b>, você deveria <a "
+"Se você já tver migrado seus e-mails para o <b>Thunderbird</b>, você deveria <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>apagar todos seus dados do <b>Claws Mail</b></"
"a> para remover este aviso."
diff --git a/po/ro.po b/po/ro.po
index add8555..9667585 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -100,39 +100,39 @@ msgid "Do you want to start Electrum anyway?"
msgstr "Vrei să inițializezi Electrum oricum?"
#: config/chroot_local-includes/usr/local/bin/electrum:23
-#: config/chroot_local-includes/usr/local/bin/icedove:37
+#: config/chroot_local-includes/usr/local/bin/thunderbird:37
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
msgid "_Launch"
msgstr "_Lansare"
#: config/chroot_local-includes/usr/local/bin/electrum:24
-#: config/chroot_local-includes/usr/local/bin/icedove:38
+#: config/chroot_local-includes/usr/local/bin/thunderbird:38
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
msgid "_Exit"
msgstr "_Iesire"
-#: config/chroot_local-includes/usr/local/bin/icedove:27
+#: config/chroot_local-includes/usr/local/bin/thunderbird:27
msgid "The <b>Claws Mail</b> persistence feature is activated."
msgstr "Caracteristica persistență a <b>Claws Mail</b> este activată."
-#: config/chroot_local-includes/usr/local/bin/icedove:29
+#: config/chroot_local-includes/usr/local/bin/thunderbird:29
msgid ""
"If you have emails saved in <b>Claws Mail</b>, you should <a href='https://"
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate your "
-"data</a> before starting <b>Icedove</b>."
+"data</a> before starting <b>Thunderbird</b>."
msgstr ""
"Dacă aveți email-uri salvate în <b>Claws Mail</b>, trebuie să <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
-"claws_mail_to_icedove'>mutați datele</a> înainte să porniți <b>Icedove</b>."
+"claws_mail_to_icedove'>mutați datele</a> înainte să porniți <b>Thunderbird</b>."
-#: config/chroot_local-includes/usr/local/bin/icedove:34
+#: config/chroot_local-includes/usr/local/bin/thunderbird:34
msgid ""
-"If you already migrated your emails to <b>Icedove</b>, you should <a "
+"If you already migrated your emails to <b>Thunderbird</b>, you should <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>delete all your <b>Claws Mail</b> data</a> to "
"remove this warning."
msgstr ""
-"Dacă ţi-ai migrat deja mailurile către <b>Icedove</b>, ar trebui să-ţi <a "
+"Dacă ţi-ai migrat deja mailurile către <b>Thunderbird</b>, ar trebui să-ţi <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>ştergi tot conţinutul<b>Claws Mail</b> pentru</"
"a> îndepărta acest avertisment."
diff --git a/po/ru.po b/po/ru.po
index 7cab9f9..6e2cdef 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -99,40 +99,40 @@ msgid "Do you want to start Electrum anyway?"
msgstr "Вы хотите запустить Electrum в любом случае?"
#: config/chroot_local-includes/usr/local/bin/electrum:23
-#: config/chroot_local-includes/usr/local/bin/icedove:37
+#: config/chroot_local-includes/usr/local/bin/thunderbird:37
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
msgid "_Launch"
msgstr "_Launch"
#: config/chroot_local-includes/usr/local/bin/electrum:24
-#: config/chroot_local-includes/usr/local/bin/icedove:38
+#: config/chroot_local-includes/usr/local/bin/thunderbird:38
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
msgid "_Exit"
msgstr "_Exit"
-#: config/chroot_local-includes/usr/local/bin/icedove:27
+#: config/chroot_local-includes/usr/local/bin/thunderbird:27
msgid "The <b>Claws Mail</b> persistence feature is activated."
msgstr "Функция сохранения <b>Claws Mail</b> активирована."
-#: config/chroot_local-includes/usr/local/bin/icedove:29
+#: config/chroot_local-includes/usr/local/bin/thunderbird:29
msgid ""
"If you have emails saved in <b>Claws Mail</b>, you should <a href='https://"
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate your "
-"data</a> before starting <b>Icedove</b>."
+"data</a> before starting <b>Thunderbird</b>."
msgstr ""
"Если у Вас есть почтовые сообщения, сохраненные в <b>Claws Mail</b>, Вам "
"следует <a href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove'>мигрировать Ваши данные</a> перед запуском "
-"<b>Icedove</b>."
+"<b>Thunderbird</b>."
-#: config/chroot_local-includes/usr/local/bin/icedove:34
+#: config/chroot_local-includes/usr/local/bin/thunderbird:34
msgid ""
-"If you already migrated your emails to <b>Icedove</b>, you should <a "
+"If you already migrated your emails to <b>Thunderbird</b>, you should <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>delete all your <b>Claws Mail</b> data</a> to "
"remove this warning."
msgstr ""
-"Если вы уже переместили свои сообщения в <b>Icedove</b>, нужно <a "
+"Если вы уже переместили свои сообщения в <b>Thunderbird</b>, нужно <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>удалить все свои данные <b>Claws Mail</b>,</a> "
"чтобы убрать это предупреждение."
diff --git a/po/sk.po b/po/sk.po
index bd75ccf..3420dc9 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -84,31 +84,31 @@ msgid "Do you want to start Electrum anyway?"
msgstr "Chcete spustiť napriek tomu Electrum?"
#: config/chroot_local-includes/usr/local/bin/electrum:23
-#: config/chroot_local-includes/usr/local/bin/icedove:37
+#: config/chroot_local-includes/usr/local/bin/thunderbird:37
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
msgid "_Launch"
msgstr "_Spustiť"
#: config/chroot_local-includes/usr/local/bin/electrum:24
-#: config/chroot_local-includes/usr/local/bin/icedove:38
+#: config/chroot_local-includes/usr/local/bin/thunderbird:38
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
msgid "_Exit"
msgstr "_Ukončiť"
-#: config/chroot_local-includes/usr/local/bin/icedove:27
+#: config/chroot_local-includes/usr/local/bin/thunderbird:27
msgid "The <b>Claws Mail</b> persistence feature is activated."
msgstr ""
-#: config/chroot_local-includes/usr/local/bin/icedove:29
+#: config/chroot_local-includes/usr/local/bin/thunderbird:29
msgid ""
"If you have emails saved in <b>Claws Mail</b>, you should <a href='https://"
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate your "
-"data</a> before starting <b>Icedove</b>."
+"data</a> before starting <b>Thunderbird</b>."
msgstr ""
-#: config/chroot_local-includes/usr/local/bin/icedove:34
+#: config/chroot_local-includes/usr/local/bin/thunderbird:34
msgid ""
-"If you already migrated your emails to <b>Icedove</b>, you should <a "
+"If you already migrated your emails to <b>Thunderbird</b>, you should <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>delete all your <b>Claws Mail</b> data</a> to "
"remove this warning."
diff --git a/po/sk_SK.po b/po/sk_SK.po
index 0a13c7c..6499439 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -82,39 +82,39 @@ msgid "Do you want to start Electrum anyway?"
msgstr "Chcete nepriek tomu spustiť Electum?"
#: config/chroot_local-includes/usr/local/bin/electrum:23
-#: config/chroot_local-includes/usr/local/bin/icedove:37
+#: config/chroot_local-includes/usr/local/bin/thunderbird:37
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
msgid "_Launch"
msgstr "_Spustiť"
#: config/chroot_local-includes/usr/local/bin/electrum:24
-#: config/chroot_local-includes/usr/local/bin/icedove:38
+#: config/chroot_local-includes/usr/local/bin/thunderbird:38
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
msgid "_Exit"
msgstr "_Ukončiť"
-#: config/chroot_local-includes/usr/local/bin/icedove:27
+#: config/chroot_local-includes/usr/local/bin/thunderbird:27
msgid "The <b>Claws Mail</b> persistence feature is activated."
msgstr "Vlastnosť persistence <b>Claws Mail</b> je aktivovaná"
-#: config/chroot_local-includes/usr/local/bin/icedove:29
+#: config/chroot_local-includes/usr/local/bin/thunderbird:29
msgid ""
"If you have emails saved in <b>Claws Mail</b>, you should <a href='https://"
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate your "
-"data</a> before starting <b>Icedove</b>."
+"data</a> before starting <b>Thunderbird</b>."
msgstr ""
"Ak máte emaily uložené v <b>Claws Mail</b>, mali by ste <a href='https://"
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>presunúť Vaše "
-"dáta</a> pred spustením <b>Icedove</b>."
+"dáta</a> pred spustením <b>Thunderbird</b>."
-#: config/chroot_local-includes/usr/local/bin/icedove:34
+#: config/chroot_local-includes/usr/local/bin/thunderbird:34
msgid ""
-"If you already migrated your emails to <b>Icedove</b>, you should <a "
+"If you already migrated your emails to <b>Thunderbird</b>, you should <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>delete all your <b>Claws Mail</b> data</a> to "
"remove this warning."
msgstr ""
-"Ak ste už Vaše dáta presunuli do <b>Icedove</b>, mali by ste <a "
+"Ak ste už Vaše dáta presunuli do <b>Thunderbird</b>, mali by ste <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>zmazať Vaše <b>Claws Mail</b> dáta</a>, aby "
"ste odstránili toto varovanie."
diff --git a/po/sl_SI.po b/po/sl_SI.po
index e2dd0d8..28e2bee 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -76,31 +76,31 @@ msgid "Do you want to start Electrum anyway?"
msgstr ""
#: config/chroot_local-includes/usr/local/bin/electrum:23
-#: config/chroot_local-includes/usr/local/bin/icedove:37
+#: config/chroot_local-includes/usr/local/bin/thunderbird:37
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
msgid "_Launch"
msgstr "_Zagon"
#: config/chroot_local-includes/usr/local/bin/electrum:24
-#: config/chroot_local-includes/usr/local/bin/icedove:38
+#: config/chroot_local-includes/usr/local/bin/thunderbird:38
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
msgid "_Exit"
msgstr "_Izhod"
-#: config/chroot_local-includes/usr/local/bin/icedove:27
+#: config/chroot_local-includes/usr/local/bin/thunderbird:27
msgid "The <b>Claws Mail</b> persistence feature is activated."
msgstr ""
-#: config/chroot_local-includes/usr/local/bin/icedove:29
+#: config/chroot_local-includes/usr/local/bin/thunderbird:29
msgid ""
"If you have emails saved in <b>Claws Mail</b>, you should <a href='https://"
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate your "
-"data</a> before starting <b>Icedove</b>."
+"data</a> before starting <b>Thunderbird</b>."
msgstr ""
-#: config/chroot_local-includes/usr/local/bin/icedove:34
+#: config/chroot_local-includes/usr/local/bin/thunderbird:34
msgid ""
-"If you already migrated your emails to <b>Icedove</b>, you should <a "
+"If you already migrated your emails to <b>Thunderbird</b>, you should <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>delete all your <b>Claws Mail</b> data</a> to "
"remove this warning."
diff --git a/po/sq.po b/po/sq.po
index f954f32..e520720 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -81,36 +81,36 @@ msgid "Do you want to start Electrum anyway?"
msgstr "Dëshironi ta nisni Electrum gjithsesi?"
#: config/chroot_local-includes/usr/local/bin/electrum:23
-#: config/chroot_local-includes/usr/local/bin/icedove:37
+#: config/chroot_local-includes/usr/local/bin/thunderbird:37
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
msgid "_Launch"
msgstr "_Lëshoni"
#: config/chroot_local-includes/usr/local/bin/electrum:24
-#: config/chroot_local-includes/usr/local/bin/icedove:38
+#: config/chroot_local-includes/usr/local/bin/thunderbird:38
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
msgid "_Exit"
msgstr "_Dilni"
-#: config/chroot_local-includes/usr/local/bin/icedove:27
+#: config/chroot_local-includes/usr/local/bin/thunderbird:27
msgid "The <b>Claws Mail</b> persistence feature is activated."
msgstr "Tipari i vijueshmërisë së <b>Claws Mail</b> është aktivizuar."
-#: config/chroot_local-includes/usr/local/bin/icedove:29
+#: config/chroot_local-includes/usr/local/bin/thunderbird:29
msgid ""
"If you have emails saved in <b>Claws Mail</b>, you should <a href='https://"
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate your "
-"data</a> before starting <b>Icedove</b>."
+"data</a> before starting <b>Thunderbird</b>."
msgstr ""
"Nëse keni e-posta të ruajtura në <b>Claws Mail</b>, duhet t'i <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove'>emigroni të dhënat tuaja</a> përpara se të nisni "
-"<b>Icedove</b>."
+"<b>Thunderbird</b>."
-#: config/chroot_local-includes/usr/local/bin/icedove:34
+#: config/chroot_local-includes/usr/local/bin/thunderbird:34
#, fuzzy
msgid ""
-"If you already migrated your emails to <b>Icedove</b>, you should <a "
+"If you already migrated your emails to <b>Thunderbird</b>, you should <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>delete all your <b>Claws Mail</b> data</a> to "
"remove this warning."
@@ -118,7 +118,7 @@ msgstr ""
"Nëse keni e-posta të ruajtura në <b>Claws Mail</b>, duhet t'i <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove'>emigroni të dhënat tuaja</a> përpara se të nisni "
-"<b>Icedove</b>."
+"<b>Thunderbird</b>."
#: config/chroot_local-includes/usr/share/gnome-shell/extensions/shutdown-helper@tails.boum.org/extension.js:71
msgid "Restart"
diff --git a/po/sr.po b/po/sr.po
index 53be58e..8f55fe5 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -93,31 +93,31 @@ msgid "Do you want to start Electrum anyway?"
msgstr "Da li ipak želite da pokrenete Electrum? "
#: config/chroot_local-includes/usr/local/bin/electrum:23
-#: config/chroot_local-includes/usr/local/bin/icedove:37
+#: config/chroot_local-includes/usr/local/bin/thunderbird:37
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
msgid "_Launch"
msgstr "_Лансирати"
#: config/chroot_local-includes/usr/local/bin/electrum:24
-#: config/chroot_local-includes/usr/local/bin/icedove:38
+#: config/chroot_local-includes/usr/local/bin/thunderbird:38
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
msgid "_Exit"
msgstr "_Излаз"
-#: config/chroot_local-includes/usr/local/bin/icedove:27
+#: config/chroot_local-includes/usr/local/bin/thunderbird:27
msgid "The <b>Claws Mail</b> persistence feature is activated."
msgstr ""
-#: config/chroot_local-includes/usr/local/bin/icedove:29
+#: config/chroot_local-includes/usr/local/bin/thunderbird:29
msgid ""
"If you have emails saved in <b>Claws Mail</b>, you should <a href='https://"
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate your "
-"data</a> before starting <b>Icedove</b>."
+"data</a> before starting <b>Thunderbird</b>."
msgstr ""
-#: config/chroot_local-includes/usr/local/bin/icedove:34
+#: config/chroot_local-includes/usr/local/bin/thunderbird:34
msgid ""
-"If you already migrated your emails to <b>Icedove</b>, you should <a "
+"If you already migrated your emails to <b>Thunderbird</b>, you should <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>delete all your <b>Claws Mail</b> data</a> to "
"remove this warning."
diff --git a/po/sv.po b/po/sv.po
index 02c2e71..9a73ac1 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -89,39 +89,39 @@ msgid "Do you want to start Electrum anyway?"
msgstr "Vill du starta Electrum ändå?"
#: config/chroot_local-includes/usr/local/bin/electrum:23
-#: config/chroot_local-includes/usr/local/bin/icedove:37
+#: config/chroot_local-includes/usr/local/bin/thunderbird:37
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
msgid "_Launch"
msgstr "_Starta"
#: config/chroot_local-includes/usr/local/bin/electrum:24
-#: config/chroot_local-includes/usr/local/bin/icedove:38
+#: config/chroot_local-includes/usr/local/bin/thunderbird:38
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
msgid "_Exit"
msgstr "_Avsluta"
-#: config/chroot_local-includes/usr/local/bin/icedove:27
+#: config/chroot_local-includes/usr/local/bin/thunderbird:27
msgid "The <b>Claws Mail</b> persistence feature is activated."
msgstr "<b>Claws Mail</b> persistens funktionen är aktiverad."
-#: config/chroot_local-includes/usr/local/bin/icedove:29
+#: config/chroot_local-includes/usr/local/bin/thunderbird:29
msgid ""
"If you have emails saved in <b>Claws Mail</b>, you should <a href='https://"
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate your "
-"data</a> before starting <b>Icedove</b>."
+"data</a> before starting <b>Thunderbird</b>."
msgstr ""
"Om du har sparat e-postmeddelanden i <b>Claws Mail</b> borde du <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
-"claws_mail_to_icedove'>migrera din data</a> innan du startar <b>Icedove</b>."
+"claws_mail_to_icedove'>migrera din data</a> innan du startar <b>Thunderbird</b>."
-#: config/chroot_local-includes/usr/local/bin/icedove:34
+#: config/chroot_local-includes/usr/local/bin/thunderbird:34
msgid ""
-"If you already migrated your emails to <b>Icedove</b>, you should <a "
+"If you already migrated your emails to <b>Thunderbird</b>, you should <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>delete all your <b>Claws Mail</b> data</a> to "
"remove this warning."
msgstr ""
-"Om du redan har flyttat din e-post till <b>Icedove</b>, borde du <a "
+"Om du redan har flyttat din e-post till <b>Thunderbird</b>, borde du <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>radera all din <b>Claws Mail</b>-data</a> för "
"att ta bort den här varningen."
diff --git a/po/tails.pot b/po/tails.pot
index 5f263fc..4745e08 100644
--- a/po/tails.pot
+++ b/po/tails.pot
@@ -60,31 +60,31 @@ msgid "Do you want to start Electrum anyway?"
msgstr ""
#: config/chroot_local-includes/usr/local/bin/electrum:23
-#: config/chroot_local-includes/usr/local/bin/icedove:37
+#: config/chroot_local-includes/usr/local/bin/thunderbird:37
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
msgid "_Launch"
msgstr ""
#: config/chroot_local-includes/usr/local/bin/electrum:24
-#: config/chroot_local-includes/usr/local/bin/icedove:38
+#: config/chroot_local-includes/usr/local/bin/thunderbird:38
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/local/bin/icedove:27
+#: config/chroot_local-includes/usr/local/bin/thunderbird:27
msgid "The <b>Claws Mail</b> persistence feature is activated."
msgstr ""
-#: config/chroot_local-includes/usr/local/bin/icedove:29
+#: config/chroot_local-includes/usr/local/bin/thunderbird:29
msgid ""
"If you have emails saved in <b>Claws Mail</b>, you should <a href='https://"
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate your "
-"data</a> before starting <b>Icedove</b>."
+"data</a> before starting <b>Thunderbird</b>."
msgstr ""
-#: config/chroot_local-includes/usr/local/bin/icedove:34
+#: config/chroot_local-includes/usr/local/bin/thunderbird:34
msgid ""
-"If you already migrated your emails to <b>Icedove</b>, you should <a "
+"If you already migrated your emails to <b>Thunderbird</b>, you should <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>delete all your <b>Claws Mail</b> data</a> to "
"remove this warning."
diff --git a/po/tr.po b/po/tr.po
index 95645c5..bde880a 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -97,39 +97,39 @@ msgid "Do you want to start Electrum anyway?"
msgstr "Electrum yine de başlatılsın mı?"
#: config/chroot_local-includes/usr/local/bin/electrum:23
-#: config/chroot_local-includes/usr/local/bin/icedove:37
+#: config/chroot_local-includes/usr/local/bin/thunderbird:37
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
msgid "_Launch"
msgstr "_Başlat"
#: config/chroot_local-includes/usr/local/bin/electrum:24
-#: config/chroot_local-includes/usr/local/bin/icedove:38
+#: config/chroot_local-includes/usr/local/bin/thunderbird:38
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
msgid "_Exit"
msgstr "Çı_kış"
-#: config/chroot_local-includes/usr/local/bin/icedove:27
+#: config/chroot_local-includes/usr/local/bin/thunderbird:27
msgid "The <b>Claws Mail</b> persistence feature is activated."
msgstr "<b>Claws Mail</b> kalıcılık özelliği etkinleştirildi."
-#: config/chroot_local-includes/usr/local/bin/icedove:29
+#: config/chroot_local-includes/usr/local/bin/thunderbird:29
msgid ""
"If you have emails saved in <b>Claws Mail</b>, you should <a href='https://"
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate your "
-"data</a> before starting <b>Icedove</b>."
+"data</a> before starting <b>Thunderbird</b>."
msgstr ""
-"<b>Claws Mail</b> üzerinde kaydedilmiş e-postalarınız varsa, <b>Icedove</b> "
+"<b>Claws Mail</b> üzerinde kaydedilmiş e-postalarınız varsa, <b>Thunderbird</b> "
"başlatılmadan önce <a href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove'>verilerinizi aktarmalısınız</a>."
-#: config/chroot_local-includes/usr/local/bin/icedove:34
+#: config/chroot_local-includes/usr/local/bin/thunderbird:34
msgid ""
-"If you already migrated your emails to <b>Icedove</b>, you should <a "
+"If you already migrated your emails to <b>Thunderbird</b>, you should <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>delete all your <b>Claws Mail</b> data</a> to "
"remove this warning."
msgstr ""
-"E-postalarınızı zaten <b>Icedove</b> üzerine aktardıysanız bu uyarıyı "
+"E-postalarınızı zaten <b>Thunderbird</b> üzerine aktardıysanız bu uyarıyı "
"kaldırmak için <a href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>tüm <b>Claws Mail</b> verilerinizi silin</a>."
diff --git a/po/uk.po b/po/uk.po
index 68e6e61..e128091 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -91,40 +91,40 @@ msgid "Do you want to start Electrum anyway?"
msgstr "У будь-якому випадку запустити Electrum ?"
#: config/chroot_local-includes/usr/local/bin/electrum:23
-#: config/chroot_local-includes/usr/local/bin/icedove:37
+#: config/chroot_local-includes/usr/local/bin/thunderbird:37
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
msgid "_Launch"
msgstr "_Запуск"
#: config/chroot_local-includes/usr/local/bin/electrum:24
-#: config/chroot_local-includes/usr/local/bin/icedove:38
+#: config/chroot_local-includes/usr/local/bin/thunderbird:38
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
msgid "_Exit"
msgstr "_Вихід"
-#: config/chroot_local-includes/usr/local/bin/icedove:27
+#: config/chroot_local-includes/usr/local/bin/thunderbird:27
msgid "The <b>Claws Mail</b> persistence feature is activated."
msgstr "Увімкнено функцію стійкості <b>Claws Mail</b>."
-#: config/chroot_local-includes/usr/local/bin/icedove:29
+#: config/chroot_local-includes/usr/local/bin/thunderbird:29
msgid ""
"If you have emails saved in <b>Claws Mail</b>, you should <a href='https://"
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate your "
-"data</a> before starting <b>Icedove</b>."
+"data</a> before starting <b>Thunderbird</b>."
msgstr ""
"Якщо Ваші електронні листи зберігаються у <b>Claws Mail</b>, Вам варто <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove'>мігрувати свої дані</a> перед початком використання "
-"<b>Icedove</b>."
+"<b>Thunderbird</b>."
-#: config/chroot_local-includes/usr/local/bin/icedove:34
+#: config/chroot_local-includes/usr/local/bin/thunderbird:34
msgid ""
-"If you already migrated your emails to <b>Icedove</b>, you should <a "
+"If you already migrated your emails to <b>Thunderbird</b>, you should <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>delete all your <b>Claws Mail</b> data</a> to "
"remove this warning."
msgstr ""
-"Якщо Ви вже перемістили Ваші електронні листи до <b>Icedove</b>, Вам слід <a "
+"Якщо Ви вже перемістили Ваші електронні листи до <b>Thunderbird</b>, Вам слід <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'> видалити всі Ваші <b>Claws Mail</b> data</a>, "
"щоб прибрати це попередження"
diff --git a/po/vi.po b/po/vi.po
index 4dd58fe..8d54264 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -81,39 +81,39 @@ msgid "Do you want to start Electrum anyway?"
msgstr "Bạn có muốn khởi động Electrum dù thế nào đi nữa?"
#: config/chroot_local-includes/usr/local/bin/electrum:23
-#: config/chroot_local-includes/usr/local/bin/icedove:37
+#: config/chroot_local-includes/usr/local/bin/thunderbird:37
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
msgid "_Launch"
msgstr "_Launch"
#: config/chroot_local-includes/usr/local/bin/electrum:24
-#: config/chroot_local-includes/usr/local/bin/icedove:38
+#: config/chroot_local-includes/usr/local/bin/thunderbird:38
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
msgid "_Exit"
msgstr "__Exit"
-#: config/chroot_local-includes/usr/local/bin/icedove:27
+#: config/chroot_local-includes/usr/local/bin/thunderbird:27
msgid "The <b>Claws Mail</b> persistence feature is activated."
msgstr "Tính năng <b>Claws Mail</b> bền chắc được kích hoạt."
-#: config/chroot_local-includes/usr/local/bin/icedove:29
+#: config/chroot_local-includes/usr/local/bin/thunderbird:29
msgid ""
"If you have emails saved in <b>Claws Mail</b>, you should <a href='https://"
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate your "
-"data</a> before starting <b>Icedove</b>."
+"data</a> before starting <b>Thunderbird</b>."
msgstr ""
"Nếu bạn có email được lưu trong <b>Claws Mail</b>, bạn nên <a href='https://"
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>di chuyển dữ "
-"liệu của bạn</a> trước khi bắt đầu <b>Icedove</b>."
+"liệu của bạn</a> trước khi bắt đầu <b>Thunderbird</b>."
-#: config/chroot_local-includes/usr/local/bin/icedove:34
+#: config/chroot_local-includes/usr/local/bin/thunderbird:34
msgid ""
-"If you already migrated your emails to <b>Icedove</b>, you should <a "
+"If you already migrated your emails to <b>Thunderbird</b>, you should <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>delete all your <b>Claws Mail</b> data</a> to "
"remove this warning."
msgstr ""
-"Nếu bạn đã di chuyển email của bạn sang <b>Icedove</b>, bạn nên <a "
+"Nếu bạn đã di chuyển email của bạn sang <b>Thunderbird</b>, bạn nên <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>xóa tất cả dữ liệu của <b>Claws Mail</b> để</"
"a> loại bỏ cảnh báo này."
diff --git a/po/zh.po b/po/zh.po
index 94b7a35..e58a4c4 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -118,31 +118,31 @@ msgid "Do you want to start Electrum anyway?"
msgstr ""
#: config/chroot_local-includes/usr/local/bin/electrum:23
-#: config/chroot_local-includes/usr/local/bin/icedove:37
+#: config/chroot_local-includes/usr/local/bin/thunderbird:37
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
msgid "_Launch"
msgstr ""
#: config/chroot_local-includes/usr/local/bin/electrum:24
-#: config/chroot_local-includes/usr/local/bin/icedove:38
+#: config/chroot_local-includes/usr/local/bin/thunderbird:38
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/local/bin/icedove:27
+#: config/chroot_local-includes/usr/local/bin/thunderbird:27
msgid "The <b>Claws Mail</b> persistence feature is activated."
msgstr ""
-#: config/chroot_local-includes/usr/local/bin/icedove:29
+#: config/chroot_local-includes/usr/local/bin/thunderbird:29
msgid ""
"If you have emails saved in <b>Claws Mail</b>, you should <a href='https://"
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate your "
-"data</a> before starting <b>Icedove</b>."
+"data</a> before starting <b>Thunderbird</b>."
msgstr ""
-#: config/chroot_local-includes/usr/local/bin/icedove:34
+#: config/chroot_local-includes/usr/local/bin/thunderbird:34
msgid ""
-"If you already migrated your emails to <b>Icedove</b>, you should <a "
+"If you already migrated your emails to <b>Thunderbird</b>, you should <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>delete all your <b>Claws Mail</b> data</a> to "
"remove this warning."
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 02ecdfb..cddf7e4 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -81,39 +81,39 @@ msgid "Do you want to start Electrum anyway?"
msgstr "您无论如何都要启动 Electrum 吗?"
#: config/chroot_local-includes/usr/local/bin/electrum:23
-#: config/chroot_local-includes/usr/local/bin/icedove:37
+#: config/chroot_local-includes/usr/local/bin/thunderbird:37
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
msgid "_Launch"
msgstr "启动(_L)"
#: config/chroot_local-includes/usr/local/bin/electrum:24
-#: config/chroot_local-includes/usr/local/bin/icedove:38
+#: config/chroot_local-includes/usr/local/bin/thunderbird:38
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
msgid "_Exit"
msgstr "退出(_E)"
-#: config/chroot_local-includes/usr/local/bin/icedove:27
+#: config/chroot_local-includes/usr/local/bin/thunderbird:27
msgid "The <b>Claws Mail</b> persistence feature is activated."
msgstr "<b>Claws Mail</b> 持久功能已激活。"
-#: config/chroot_local-includes/usr/local/bin/icedove:29
+#: config/chroot_local-includes/usr/local/bin/thunderbird:29
msgid ""
"If you have emails saved in <b>Claws Mail</b>, you should <a href='https://"
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate your "
-"data</a> before starting <b>Icedove</b>."
+"data</a> before starting <b>Thunderbird</b>."
msgstr ""
-"如果您有电子邮件保存在 <b>Claws Mail</b> 中,您应该在启动 <b>Icedove</b> 前"
+"如果您有电子邮件保存在 <b>Claws Mail</b> 中,您应该在启动 <b>Thunderbird</b> 前"
"<a href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove'>迁移数据</a>。"
-#: config/chroot_local-includes/usr/local/bin/icedove:34
+#: config/chroot_local-includes/usr/local/bin/thunderbird:34
msgid ""
-"If you already migrated your emails to <b>Icedove</b>, you should <a "
+"If you already migrated your emails to <b>Thunderbird</b>, you should <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>delete all your <b>Claws Mail</b> data</a> to "
"remove this warning."
msgstr ""
-"如果您已迁移您的邮件到 <b>Icedove</b>,您应该<a href='https://tails.boum.org/"
+"如果您已迁移您的邮件到 <b>Thunderbird</b>,您应该<a href='https://tails.boum.org/"
"doc/anonymous_internet/claws_mail_to_icedove#delete'>删除您所有的 <b>Claws "
"Mail</b> 数据</a>以去除此警告。"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 0933db1..0c41183 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -77,40 +77,40 @@ msgid "Do you want to start Electrum anyway?"
msgstr "啟用Electrum嗎?"
#: config/chroot_local-includes/usr/local/bin/electrum:23
-#: config/chroot_local-includes/usr/local/bin/icedove:37
+#: config/chroot_local-includes/usr/local/bin/thunderbird:37
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
msgid "_Launch"
msgstr "_Launch"
#: config/chroot_local-includes/usr/local/bin/electrum:24
-#: config/chroot_local-includes/usr/local/bin/icedove:38
+#: config/chroot_local-includes/usr/local/bin/thunderbird:38
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
msgid "_Exit"
msgstr "_Exit"
-#: config/chroot_local-includes/usr/local/bin/icedove:27
+#: config/chroot_local-includes/usr/local/bin/thunderbird:27
msgid "The <b>Claws Mail</b> persistence feature is activated."
msgstr "<b>Claws Mail</b>嘅持續儲存功能已啟用。"
-#: config/chroot_local-includes/usr/local/bin/icedove:29
+#: config/chroot_local-includes/usr/local/bin/thunderbird:29
msgid ""
"If you have emails saved in <b>Claws Mail</b>, you should <a href='https://"
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate your "
-"data</a> before starting <b>Icedove</b>."
+"data</a> before starting <b>Thunderbird</b>."
msgstr ""
-"如果有郵件儲存喺<b>Claws Mail</b>嘅話,應該喺啟用<b>Icedove</b>前,先將佢哋"
+"如果有郵件儲存喺<b>Claws Mail</b>嘅話,應該喺啟用<b>Thunderbird</b>前,先將佢哋"
"<a \"\n"
"\"href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>"
"轉移</a>。"
-#: config/chroot_local-includes/usr/local/bin/icedove:34
+#: config/chroot_local-includes/usr/local/bin/thunderbird:34
msgid ""
-"If you already migrated your emails to <b>Icedove</b>, you should <a "
+"If you already migrated your emails to <b>Thunderbird</b>, you should <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>delete all your <b>Claws Mail</b> data</a> to "
"remove this warning."
msgstr ""
-"如果已經將郵件轉移到<b>Icedove</b>嘅話,只要<a 'href='https://tails.boum.org/"
+"如果已經將郵件轉移到<b>Thunderbird</b>嘅話,只要<a 'href='https://tails.boum.org/"
"doc/anonymous_internet/claws_mail_to_icedove#delete'>刪除全部<b>Claws Mail</"
"b>資料</a>,就能消除呢個警告。"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index cdd8eda..babae52 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -83,39 +83,39 @@ msgid "Do you want to start Electrum anyway?"
msgstr "您想要啟用 Electrum 嗎?"
#: config/chroot_local-includes/usr/local/bin/electrum:23
-#: config/chroot_local-includes/usr/local/bin/icedove:37
+#: config/chroot_local-includes/usr/local/bin/thunderbird:37
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
msgid "_Launch"
msgstr "_啟動器"
#: config/chroot_local-includes/usr/local/bin/electrum:24
-#: config/chroot_local-includes/usr/local/bin/icedove:38
+#: config/chroot_local-includes/usr/local/bin/thunderbird:38
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
msgid "_Exit"
msgstr "_離開"
-#: config/chroot_local-includes/usr/local/bin/icedove:27
+#: config/chroot_local-includes/usr/local/bin/thunderbird:27
msgid "The <b>Claws Mail</b> persistence feature is activated."
msgstr "<b>Claws Mail</b> 的永久保存功能已經啟用。"
-#: config/chroot_local-includes/usr/local/bin/icedove:29
+#: config/chroot_local-includes/usr/local/bin/thunderbird:29
msgid ""
"If you have emails saved in <b>Claws Mail</b>, you should <a href='https://"
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate your "
-"data</a> before starting <b>Icedove</b>."
+"data</a> before starting <b>Thunderbird</b>."
msgstr ""
-"如果您有郵件儲存在 <b>Claws Mail</b> 中的話, 您應該要在啟用 <b>Icedove</b> 之"
+"如果您有郵件儲存在 <b>Claws Mail</b> 中的話, 您應該要在啟用 <b>Thunderbird</b> 之"
"前,先將它們<a href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove'>轉移</a>。"
-#: config/chroot_local-includes/usr/local/bin/icedove:34
+#: config/chroot_local-includes/usr/local/bin/thunderbird:34
msgid ""
-"If you already migrated your emails to <b>Icedove</b>, you should <a "
+"If you already migrated your emails to <b>Thunderbird</b>, you should <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>delete all your <b>Claws Mail</b> data</a> to "
"remove this warning."
msgstr ""
-"若您已經將您的郵件都轉移到 <b>Icedove</b> 了,您就必須要<a href='https://"
+"若您已經將您的郵件都轉移到 <b>Thunderbird</b> 了,您就必須要<a href='https://"
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove#delete'>刪除存放"
"在 <b>Claws Mail</b> 上的資料</a>,才能移除這個警告訊息。"
diff --git a/refresh-translations b/refresh-translations
index a6c6d67..85de963 100755
--- a/refresh-translations
+++ b/refresh-translations
@@ -10,7 +10,6 @@ PYTHON_PROGS="/etc/whisperback/config.py \
/usr/local/bin/tails-about /usr/local/sbin/tails-additional-software"
SHELL_PROGS="/etc/NetworkManager/dispatcher.d/60-tor-ready.sh \
/usr/local/bin/electrum \
- /usr/local/bin/icedove \
/usr/local/bin/tails-upgrade-frontend-wrapper \
/usr/local/lib/tails-spoof-mac \
/usr/local/bin/tor-browser \
diff --git a/vagrant/Vagrantfile b/vagrant/Vagrantfile
index 2256e0a..9c49224 100644
--- a/vagrant/Vagrantfile
+++ b/vagrant/Vagrantfile
@@ -21,10 +21,9 @@ require_relative 'lib/tails_build_settings'
ENV['VAGRANT_DEFAULT_PROVIDER'] = 'libvirt'
Vagrant.configure("2") do |config|
- config.vm.box = 'tails-builder-amd64-jessie-2017042704-feature-11980'
+ config.vm.box = box_name
config.vm.box_url = "http://dl.amnesia.boum.org/tails/project/vagrant/#{config.vm.box}.box"
- config.vm.box_download_checksum_type = "sha256"
- config.vm.box_download_checksum = '9cd2df4b0b5f520b46fbfc126f46a56d0f7c2f20462d9b64bbdf75acd75edc49'
+ config.vm.box_url = "http://127.0.0.1/dev/null"
ENV['EXPORTED_VARIABLES'] ||= ""
env_vars = ENV.select { |k,v| ENV['EXPORTED_VARIABLES'].split.include?(k) }
.map { |k, v| "#{k}='#{v}'" } .join(' ')
diff --git a/vagrant/definitions/tails-builder/config/APT_snapshots.d/.placeholder b/vagrant/definitions/tails-builder/config/APT_snapshots.d/.placeholder
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/vagrant/definitions/tails-builder/config/APT_snapshots.d/.placeholder
diff --git a/vagrant/definitions/tails-builder/config/APT_snapshots.d/debian-security/serial b/vagrant/definitions/tails-builder/config/APT_snapshots.d/debian-security/serial
new file mode 100644
index 0000000..95bd7f9
--- /dev/null
+++ b/vagrant/definitions/tails-builder/config/APT_snapshots.d/debian-security/serial
@@ -0,0 +1 @@
+2017051002
diff --git a/vagrant/definitions/tails-builder/config/APT_snapshots.d/debian/serial b/vagrant/definitions/tails-builder/config/APT_snapshots.d/debian/serial
new file mode 100644
index 0000000..95bd7f9
--- /dev/null
+++ b/vagrant/definitions/tails-builder/config/APT_snapshots.d/debian/serial
@@ -0,0 +1 @@
+2017051002
diff --git a/vagrant/definitions/tails-builder/config/APT_snapshots.d/tails/serial b/vagrant/definitions/tails-builder/config/APT_snapshots.d/tails/serial
new file mode 100644
index 0000000..95bd7f9
--- /dev/null
+++ b/vagrant/definitions/tails-builder/config/APT_snapshots.d/tails/serial
@@ -0,0 +1 @@
+2017051002
diff --git a/vagrant/definitions/tails-builder/generate-tails-builder-box.sh b/vagrant/definitions/tails-builder/generate-tails-builder-box.sh
index f9c6911..145d0fc 100755
--- a/vagrant/definitions/tails-builder/generate-tails-builder-box.sh
+++ b/vagrant/definitions/tails-builder/generate-tails-builder-box.sh
@@ -5,27 +5,33 @@ set -u
# Based on ypcs' scripts found at:
# https://github.com/ypcs/vmdebootstrap-vagrant/
-SERIAL="${1}"
-COMMENT="${2:-}"
-ARCHITECTURE="amd64"
-DISTRIBUTION="jessie"
+GIT_DIR="$(git rev-parse --show-toplevel)"
+cd "${GIT_DIR}/vagrant/definitions/tails-builder"
+
+build_setting() {
+ ruby -I "${GIT_DIR}/vagrant/lib" \
+ -e "require 'tails_build_settings.rb'; print ${1}"
+}
+
+get_serial() {
+ "${GIT_DIR}/auto/scripts/apt-snapshots-serials" \
+ cat --print-serials-only "${1}"
+}
+
+TARGET_NAME="$(build_setting box_name)"
+TARGET_IMG="${TARGET_NAME}.qcow2"
+TARGET_BOX="${TARGET_NAME}.box"
+ARCHITECTURE="$(build_setting ARCHITECTURE)"
+DISTRIBUTION="$(build_setting DISTRIBUTION)"
+HOSTNAME="vagrant-${DISTRIBUTION}"
USERNAME="vagrant"
PASSWORD="vagrant"
SIZE="20G"
-HOSTNAME="vagrant-${DISTRIBUTION}"
-TARGET_NAME="tails-builder-${ARCHITECTURE}-${DISTRIBUTION}-${SERIAL}"
-if [ -n "${COMMENT}" ]; then
- TARGET_NAME="${TARGET_NAME}-${COMMENT}"
-fi
-TARGET_IMG="${TARGET_NAME}.qcow2"
-TARGET_BOX="${TARGET_NAME}.box"
LC_ALL=C
-SECURITY_SERIAL="$(
- cd ../../.. && \
- auto/scripts/apt-snapshots-serials get-latest debian-security | \
- sed s/^debian-security:[^0-9]*// \
-)"
+DEBIAN_SERIAL="$(get_serial debian)"
+DEBIAN_SECURITY_SERIAL="$(get_serial debian-security)"
+TAILS_SERIAL="$(get_serial tails)"
DEBOOTSTRAP_GNUPG_HOMEDIR=$(mktemp -d)
gpg --homedir "${DEBOOTSTRAP_GNUPG_HOMEDIR}" \
@@ -43,8 +49,9 @@ sudo ${http_proxy:+http_proxy="$http_proxy"} \
LC_ALL=${LC_ALL} \
ARCHITECTURE=${ARCHITECTURE} \
DISTRIBUTION=${DISTRIBUTION} \
- SECURITY_SERIAL=${SECURITY_SERIAL} \
- SERIAL=${SERIAL} \
+ DEBIAN_SERIAL=${DEBIAN_SERIAL} \
+ DEBIAN_SECURITY_SERIAL=${DEBIAN_SECURITY_SERIAL} \
+ TAILS_SERIAL=${TAILS_SERIAL} \
vmdebootstrap \
--arch "${ARCHITECTURE}" \
--distribution "${DISTRIBUTION}" \
@@ -54,7 +61,7 @@ sudo ${http_proxy:+http_proxy="$http_proxy"} \
--grub \
--hostname "${HOSTNAME}" \
--log-level "debug" \
- --mirror "http://time-based.snapshots.deb.tails.boum.org/debian/${SERIAL}" \
+ --mirror "http://time-based.snapshots.deb.tails.boum.org/debian/${DEBIAN_SERIAL}" \
--debootstrapopts "keyring=${DEBOOTSTRAP_GNUPG_PUBRING}" \
--owner "${SUDO_USER:-${USER}}" \
--kernel-package "linux-image-${ARCHITECTURE}" \
diff --git a/vagrant/definitions/tails-builder/postinstall.sh b/vagrant/definitions/tails-builder/postinstall.sh
index 7952f6f..2c66eb5 100755
--- a/vagrant/definitions/tails-builder/postinstall.sh
+++ b/vagrant/definitions/tails-builder/postinstall.sh
@@ -27,7 +27,9 @@ cat > /etc/apt/apt.conf.d/99recommends << EOF
APT::Install-Recommends "false";
APT::Install-Suggests "false";
EOF
-echo 'APT::Acquire::Retries "20";' > /etc/apt/apt.conf.d/99retries
+cat > /etc/apt/apt.conf.d/99retries << EOF
+APT::Acquire::Retries "20";
+EOF
echo "I: Install Tails APT repo signing key."
apt-key add /tmp/tails.binary.gpg
@@ -41,11 +43,11 @@ cat "/etc/apt/sources.list" | \
sed -e 's/jessie/jessie-backports/' \
> "/etc/apt/sources.list.d/jessie-backports.list"
-echo "deb http://time-based.snapshots.deb.tails.boum.org/debian-security/${SECURITY_SERIAL}/ jessie/updates main" \
+echo "deb http://time-based.snapshots.deb.tails.boum.org/debian-security/${DEBIAN_SECURITY_SERIAL}/ jessie/updates main" \
> "/etc/apt/sources.list.d/jessie-security.list"
echo "I: Adding our builder-jessie suite with live-build, pin it low."
-echo "deb http://time-based.snapshots.deb.tails.boum.org/tails/${SERIAL}/ builder-jessie main" > "/etc/apt/sources.list.d/tails.list"
+echo "deb http://time-based.snapshots.deb.tails.boum.org/tails/${TAILS_SERIAL}/ builder-jessie main" > "/etc/apt/sources.list.d/tails.list"
sed -e 's/^[[:blank:]]*//' > /etc/apt/preferences.d/tails <<EOF
Package: *
Pin: release o=Tails,n=builder-jessie
@@ -67,6 +69,7 @@ sed -e 's/^[[:blank:]]*//' > /etc/apt/preferences.d/jessie-backports << EOF
Pin-Priority: 991
EOF
+echo "I: Upgrading system..."
apt-get update
apt-get -y dist-upgrade
@@ -112,6 +115,7 @@ apt-get -y install \
psmisc
# Start apt-cacher-ng inside the VM only if the "in-VM proxy" is to be used.
+echo "I: Installing the caching proxy..."
apt-get -o Dpkg::Options::="--force-confold" -y install apt-cacher-ng
systemctl disable apt-cacher-ng.service
@@ -155,7 +159,6 @@ rm -rf \
/var/cache/apt/*.bin \
/var/cache/apt/archives/*.deb \
/var/log/installer \
- /var/lib/dhcp/* \
- || :
+ /var/lib/dhcp/*
exit 0
diff --git a/vagrant/lib/tails_build_settings.rb b/vagrant/lib/tails_build_settings.rb
index 33c3836..5571ae3 100644
--- a/vagrant/lib/tails_build_settings.rb
+++ b/vagrant/lib/tails_build_settings.rb
@@ -13,3 +13,15 @@ VM_MEMORY_FOR_DISK_BUILDS = 512
# Virtual machine memory size for in-memory builds
VM_MEMORY_FOR_RAM_BUILDS = VM_MEMORY_FOR_DISK_BUILDS + BUILD_SPACE_REQUIREMENT
+
+# The builder VM's platform
+ARCHITECTURE = "amd64"
+DISTRIBUTION = "jessie"
+
+# The name of the Vagrant box
+def box_name
+ git_root = `git rev-parse --show-toplevel`.chomp
+ shortid, date = `git log -1 --date="format:%Y%m%d" --pretty="%h %ad" -- \
+ #{git_root}/vagrant/definitions/tails-builder/`.chomp.split
+ return "tails-builder-#{ARCHITECTURE}-#{DISTRIBUTION}-#{date}-#{shortid}"
+end
diff --git a/vagrant/provision/assets/build-tails b/vagrant/provision/assets/build-tails
index cdfbaab..70ac449 100755
--- a/vagrant/provision/assets/build-tails
+++ b/vagrant/provision/assets/build-tails
@@ -24,7 +24,6 @@ as_root_do() {
cleanup() {
[ -n "${BUILD_DIR}" ] || return 0
- sudo killall -q gpg-agent
cd /
remove_build_dirs
sudo rm -rf "${BUILD_DIR}"
diff --git a/vagrant/provision/setup-tails-builder b/vagrant/provision/setup-tails-builder
index 880208d..8316968 100755
--- a/vagrant/provision/setup-tails-builder
+++ b/vagrant/provision/setup-tails-builder
@@ -17,11 +17,10 @@ fi
latest_serial(){
local archive="${1}"
- get_serial="$(
- cd /amnesia.git
- auto/scripts/apt-snapshots-serials get-latest ${archive}
- )"
- echo "${get_serial#${1}: }"
+ (
+ cd /amnesia.git
+ auto/scripts/apt-snapshots-serials get-latest --print-serials-only ${archive}
+ )
}
if [ "${TAILS_PROXY_TYPE}" = "vmproxy" ]; then
diff --git a/wiki/src/contribute/APT_repository/time-based_snapshots.mdwn b/wiki/src/contribute/APT_repository/time-based_snapshots.mdwn
index 3aef34f..e361423 100644
--- a/wiki/src/contribute/APT_repository/time-based_snapshots.mdwn
+++ b/wiki/src/contribute/APT_repository/time-based_snapshots.mdwn
@@ -77,9 +77,21 @@ that shall be used during the freeze:
git checkout "$RELEASE_BRANCH" && \
./auto/scripts/apt-snapshots-serials freeze && \
+
+Normally when freezing the APT snapshots used when building Tails we
+also freeze the snapshots used to generate our builder VM:
+
+ ( \
+ cd vagrant/definitions/tails-builder && \
+ ../../../auto/scripts/apt-snapshots-serials freeze --freeze-debian-security \
+ )
+
+Then commit:
+
git commit \
-m "Freeze APT snapshots for ${VERSION}." \
- config/APT_snapshots.d/*/serial
+ config/APT_snapshots.d/*/serial \
+ vagrant/definitions/tails-builder/config/APT_snapshots.d/*/serial
<a id="thaw"></a>
@@ -127,15 +139,17 @@ days from now:
git checkout "$RELEASE_BRANCH" && \
(
- cd config/APT_snapshots.d && \
- for ARCHIVE in * ; do
- if ! grep -qs '^latest$' "$ARCHIVE"/serial; then
- ssh reprepro-time-based-snapshots@incoming.deb.tails.boum.org \
- tails-bump-apt-snapshot-valid-until \
- "$ARCHIVE" "$(cat "$ARCHIVE"/serial)" \
- "$DAYS_FROM_NOW"
- fi
- done
+ for dir in config/APT_snapshots.d vagrant/definitions/tails-builder/config/APT_snapshots.d; do
+ cd "${dir}" && \
+ for ARCHIVE in * ; do
+ if ! grep -qs '^latest$' "$ARCHIVE"/serial; then
+ ssh reprepro-time-based-snapshots@incoming.deb.tails.boum.org \
+ tails-bump-apt-snapshot-valid-until \
+ "$ARCHIVE" "$(cat "$ARCHIVE"/serial)" \
+ "$DAYS_FROM_NOW"
+ fi
+ done
+ done
)
Stop tracking a distribution
diff --git a/wiki/src/contribute/design.mdwn b/wiki/src/contribute/design.mdwn
index 391d4bc..cd00daf 100644
--- a/wiki/src/contribute/design.mdwn
+++ b/wiki/src/contribute/design.mdwn
@@ -1032,17 +1032,17 @@ for the [[Unsafe Browser]], although it is
user-isolated and use a separate profile with very different
configuration.
-### 3.6.14 Icedove
+### 3.6.14 Thunderbird
-Icedove, in combination with TorBirdy, sends email through Tor.
+Thunderbird, in combination with TorBirdy, sends email through Tor.
-Icedove itself leaks a lot of data and makes DNS requests, for example by
+Thunderbird itself leaks a lot of data and makes DNS requests, for example by
retrieving mail server configurations from a remote server over an insecure
channel. This is prevented by the TorBirdy extension as well as by custom
-patches for Icedove in Tails, which we are currently in the process of
+patches for Thunderbird in Tails, which we are currently in the process of
upstreaming ([[!tails_ticket 11215]]).
-Icedove generates `Message-ID` headers using the hostname part of
+Thunderbird generates `Message-ID` headers using the hostname part of
the sender's email address, which does not leak usage of the PELD nor
any user location information.
@@ -1052,10 +1052,10 @@ disclosing the real IP address and hostname.
Torbirdy disables HTML email and inline attachments
in order to get rid of a whole class of privacy concerns.
Furthermore, when setting up an IMAP account, the drafts folder, instead
-of being remote, is set to `~$HOME/.icedove/Local Folders`.
+of being remote, is set to `~$HOME/.thunderbird/Local Folders`.
The original TorBirdy extension disables automatic email configuration
-through Icedove's email configuration wizard. This wizard is enabled in
+through Thunderbird's email configuration wizard. This wizard is enabled in
Tails. This is possible because our patches allow using only secure protocols
for the domain and ISPDB lookups as well as for the actual mail account
configuration. In detail this means:
@@ -1074,13 +1074,13 @@ manual configuration.
OpenPGP support is provided by the Enigmail addon.
-- [[!tails_gitweb config/chroot_local-includes/etc/icedove/pref/icedove.js]]
+- [[!tails_gitweb config/chroot_local-includes/etc/thunderbird/pref/thunderbird.js]]
- [[!tails_gitweb config/chroot_local-patches/torbirdy-0001-secure-autoconfig-compat.diff]]
- [[!tails_gitweb config/chroot_local-patches/torbirdy-0001-secure-autoconfig-compat.diff]]
- [[!tails_gitweb config/chroot_local-patches/torbirdy-0002-secure-autoconfig-POP-defaults.diff]]
-- [[!tails_gitweb_dir config/chroot_local-includes/etc/skel/.icedove]] is copied to
+- [[!tails_gitweb_dir config/chroot_local-includes/etc/skel/.thunderbird]] is copied to
the user's `$HOME` at boot time
-- [[!tails_gitweb config/chroot_local-includes/usr/local/bin/icedove]]
+- [[!tails_gitweb config/chroot_local-includes/usr/local/bin/thunderbird]]
### 3.6.15 Pidgin
diff --git a/wiki/src/contribute/design/memory_erasure.mdwn b/wiki/src/contribute/design/memory_erasure.mdwn
index fd13b52..28413ea 100644
--- a/wiki/src/contribute/design/memory_erasure.mdwn
+++ b/wiki/src/contribute/design/memory_erasure.mdwn
@@ -1,83 +1,63 @@
[[!meta title="Memory erasure"]]
In order to protect against memory recovery such as cold boot attack,
-the system RAM is overwritten when Tails is being shutdown or when the
+most of the system RAM is overwritten when Tails is being shutdown or when the
boot medium is physically removed.
#### The big picture
-The previous implementation of the Tails memory erasure feature
+The initial implementation of the Tails memory erasure feature
suffered from flaws that were demonstrated by [[external
audit|security/audits/Blackhat_De-Anonymizing_Live_CDs]]. In short, it
only erased free memory and let data in the aufs read-write branch in
recoverable state.
-In order to erase the biggest possible part of the system memory, the
-hereby described new implementation, shipped in Tails 0.7, runs in a
+Then, in order to erase the biggest possible part of the system memory,
+a new implementation, shipped from Tails 0.7 to 2.12, runs in a
fresh environment provided by a newly started Linux kernel. This way,
a given part of the memory either is *used* by the memory erasure
process itself or it is considered as free and thus *erased* by this
process; in any case, it is at least overwritten once.
-#### initramfs tweaks
+Sadly, this approach suffered from severe usability and reliability
+problems (e.g. [[!tails_ticket 12354]], [[!tails_ticket 11786]]).
+So it was removed in Tails 3.0, and Tails now relies on the Linux
+kernel's freed memory poisoning feature.
-The Linux kernel and initramfs used to erase the memory are the same
-as the ones normally used by a Tails system... that actually includes
-some bits of code dedicated to this mission.
+But memory poisoning only works when memory is actually freed,
+and a regular shutdown would not free the memory used by the aufs
+read-write branch. So we use the `systemd-shutdown` ability to return
+to the initramfs, to ensure the root filesystem is unmounted.
-An initramfs-tools hook includes the necessary files in the initramfs
-at build time. A runtime init-premount script either does nothing, or
-erases memory before shutting down or rebooting the system; its
-behaviour depends on the `sdmem` kernel command line parameter value.
-Additionally, the `sdmemopts` kernel command line parameter allows
-fine tuning the options passed to the `sdmem` program.
+The initramfs is unpacked in `/run/initramfs` at boot time:
-- [[!tails_gitweb config/chroot_local-includes/usr/share/initramfs-tools/hooks/sdmem]]
-- [[!tails_gitweb config/chroot_local-includes/usr/share/initramfs-tools/scripts/init-top/memory_wipe]]
-- [[!tails_gitweb config/chroot_local-hooks/65-initramfs-scripts]]
+ * [[!tails_gitweb config/chroot_local-includes/lib/systemd/system/initramfs-shutdown.service]]
+ * [[!tails_gitweb config/chroot_local-includes/usr/local/lib/initramfs-restore]]
+ * [[!tails_gitweb config/chroot_local-includes/usr/local/lib/udev-watchdog-wrapper]]
-These `sdmem` and `sdmemopts` are appended to the fresh kernel command
-line parameters, when memory erasure is triggered, by the
-`tails-kexec` shutdown script that is itself parameterized by the usual,
-slightly customized, kexec-tools configuration file.
-
-- [[!tails_gitweb config/chroot_local-includes/etc/default/kexec]]
-- [[!tails_gitweb config/chroot_local-includes/lib/systemd/system-shutdown/tails-kexec]]
-
-#### Actual memory erasure process
-
-The software that performs the actual memory erasure is sdmem, which
-is part of the [secure-delete](http://www.thc.org/) package. sdmem is
-called using the `-v` (verbose mode) option to give feedback to the
-user, as well as the `-llf` options: memory is only overwritten once
-with zeros; this is the fastest available mode, and is enough to
-protect against every memory forensics attack we know of.
-
-- [[!tails_gitweb config/chroot_local-includes/etc/default/kexec]]
+… so that the copy of `systemd-shutdown` that runs in the real,
+non-initramfs system can switch root into `/run/initramfs`, and run
+another copy of `systemd-shutdown` that's
+[[!tails_gitweb config/chroot_local-includes/usr/share/initramfs-tools/hooks/shutdown desc="included"]]
+in the initramfs. That one will unmount all filesystems, run
+[[!tails_gitweb config/chroot_local-includes/usr/local/lib/initramfs-pre-shutdown-hook desc="a custom hook"]]
+that helps us automatically test this behavior, and finally perform
+the requested poweroff/reboot action.
#### Triggers
Different kinds of events trigger the memory erasure process. All lead
to run the `tails-kexec` shutdown script.
-**First, the memory erasure process is triggered at the end of a normal
-shutdown/reboot sequence.** This is implemented by slightly modifying
-the System V initscripts shipped by the `kexec-tools` Debian package:
-the `kexec-load` initscript, that normally only runs at reboot time,
-is enabled to run at shutdown time as well. A custom `tails-kexec`
-shutdown script replaces the `kexec` initscript, in order to support the case when
-the boot medium is not available anymore at the time this script runs;
-it also provides an improved user interface more suitable for Tails
-target users needs. Finally, the standard systemd `halt`, `poweroff`,
-`reboot`, `kexec` and `shutdown`
-actions are taken over by having the `tails-kexec` script, that is run
-just before they have a chance to be triggered (thanks to systemd's
-`/lib/systemd/system-shutdown/` facility, documented in
-`systemd-kexec.service(8)`).
-
-- [[!tails_gitweb config/chroot_local-patches/run_kexec-load_on_halt.diff]]
-- [[!tails_gitweb config/chroot_local-hooks/52-update-rc.d]]
-- [[!tails_gitweb config/chroot_local-includes/lib/systemd/system-shutdown/tails-kexec]]
+**First, most memory is erased at the end of a normal shutdown/reboot
+sequence.** This is implemented by the [[Linux kernel's freed memory
+poisoning feature|design/kernel_hardening]], more specifically:
+
+* `page_poison`
+* passing "P" to `slub_debug`
+
+[[!tails_gitweb features/erase_memory.feature desc="Automated tests"]]
+ensure that the most important parts of memory are erased this way.
**Second, the memory erasure process is triggered when the boot medium
is physically removed during runtime (USB boot medium is unplugged or
@@ -90,9 +70,8 @@ physically removed.
- [[!tails_gitweb config/chroot_local-includes/usr/local/lib/udev-watchdog-wrapper]]
- [[!tails_gitweb config/chroot_local-includes/usr/src/udev-watchdog.c]]
- [[!tails_gitweb config/chroot_local-hooks/52-udev-watchdog]]
-- [[!tails_gitweb config/chroot_local-includes/lib/systemd/system/tails-sdmem-on-media-removal.service]]
+- [[!tails_gitweb config/chroot_local-includes/lib/systemd/system/tails-shutdown-on-media-removal.service]]
- [[!tails_gitweb config/chroot_local-hooks/52-update-rc.d]]
-- [[!tails_gitweb config/chroot_local-patches/run_kexec-load_even_in_emergency_shutdown.diff]]
- [[!tails_gitweb config/chroot_local-includes/lib/systemd/system/gdm.service.d/restart.conf]]
#### Making sure needed files are available
@@ -105,23 +84,3 @@ to memory erasure time.
- [[!tails_gitweb config/chroot_local-includes/etc/memlockd.cfg]]
- [[!tails_gitweb config/chroot_local-patches/keep_memlockd_on_shutdown.diff]]
- [[!tails_gitweb config/chroot_local-includes/lib/systemd/system/memlockd.service.d/oom.conf]]
-- [[!tails_gitweb config/chroot_local-includes/lib/systemd/system/tails-reconfigure-kexec.service]]
-- [[!tails_gitweb config/chroot_local-includes/lib/systemd/system/tails-reconfigure-memlockd.service]]
-- [[!tails_gitweb config/chroot_local-includes/usr/local/sbin/tails-reconfigure-kexec]]
-- [[!tails_gitweb config/chroot_local-includes/usr/local/sbin/tails-reconfigure-memlockd]]
-
-#### User interface
-
-Since this process can take a while the user can leave the computer
-and let it finish on its own after removing the boot medium, or simply
-turn it off if he or she is not worried about this attack: if Tails
-was booted from a DVD it is ejected before the memory wiping is
-started, and if it was booted from a USB drive it can be removed as
-soon as the memory wiping has been started.
-
-A short but visible message, displayed for a few seconds, explains the
-user what is going to happen. To make this possible, we mask the
-`plymouth-{halt,kexec,poweroff,reboot,shutdown}` services.
-
-- [[!tails_gitweb config/chroot_local-includes/lib/systemd/system-shutdown/tails-kexec]]
-- [[!tails_gitweb config/chroot_local-hooks/52-update-rc.d]]
diff --git a/wiki/src/contribute/design/stream_isolation.mdwn b/wiki/src/contribute/design/stream_isolation.mdwn
index a967af4..b92d469 100644
--- a/wiki/src/contribute/design/stream_isolation.mdwn
+++ b/wiki/src/contribute/design/stream_isolation.mdwn
@@ -90,4 +90,4 @@ Applications are configured to use the right SOCKS port:
- [[!tails_gitweb config/chroot_local-includes/etc/tor-browser/profile/preferences/0000tails.js]]
- [[!tails_gitweb config/chroot_local-includes/lib/systemd/system/htpdate.service]]
- [[!tails_gitweb config/chroot_local-includes/usr/local/bin/tails-security-check]]
-- [[!tails_gitweb config/chroot_local-includes/usr/local/bin/icedove]]
+- [[!tails_gitweb config/chroot_local-includes/usr/local/bin/thunderbird]]
diff --git a/wiki/src/contribute/how/documentation/release_notes.mdwn b/wiki/src/contribute/how/documentation/release_notes.mdwn
index 751ec86..7aebf82 100644
--- a/wiki/src/contribute/how/documentation/release_notes.mdwn
+++ b/wiki/src/contribute/how/documentation/release_notes.mdwn
@@ -21,7 +21,7 @@
- Tor: <https://blog.torproject.org/>
- Tor: <https://gitweb.torproject.org/tor.git/tree/ChangeLog>
- Tor Browser: <https://gitweb.torproject.org/builders/tor-browser-bundle.git/tree/Bundle-Data/Docs/ChangeLog.txt?h=maint-6.5>
- - Icedove: <https://www.mozilla.org/en-US/thunderbird/notes/>
+ - Thunderbird: <https://www.mozilla.org/en-US/thunderbird/notes/>
- Electrum: <https://github.com/spesmilo/electrum/blob/master/RELEASE-NOTES>
- TorBirdy: <https://gitweb.torproject.org/torbirdy.git/tree/ChangeLog>
- obfs4proxy: <https://anonscm.debian.org/cgit/pkg-privacy/packages/obfs4proxy.git/tree/ChangeLog>
diff --git a/wiki/src/contribute/l10n_tricks/core_po_files.txt b/wiki/src/contribute/l10n_tricks/core_po_files.txt
index e7c8fbb..a6d3aa9 100644
--- a/wiki/src/contribute/l10n_tricks/core_po_files.txt
+++ b/wiki/src/contribute/l10n_tricks/core_po_files.txt
@@ -26,8 +26,6 @@
./doc/first_steps/startup_options/administration_password
./doc/first_steps/startup_options/bridge_mode
./doc/first_steps/startup_options/mac_spoofing
-./doc/first_steps/startup_options/network_configuration
-./doc/first_steps/startup_options/offline_mode
./doc/first_steps/reset
./doc/first_steps/reset.intro
./doc/first_steps/reset/linux
diff --git a/wiki/src/contribute/release_process.mdwn b/wiki/src/contribute/release_process.mdwn
index b1e7209..70c6abc 100644
--- a/wiki/src/contribute/release_process.mdwn
+++ b/wiki/src/contribute/release_process.mdwn
@@ -54,11 +54,11 @@ Pre-freeze
The [[contribute/working_together/roles/release_manager]] role
documentation has more tasks that should be done early enough.
-Update Icedove preferences
+Update Thunderbird preferences
------------------------------
* update `extensions.enigmail.configuredVersion` in
- `config/chroot_local-includes/etc/skel/.icedove/profile.default/preferences/0000tails.js`
+ `config/chroot_local-includes/etc/skel/.thunderbird/profile.default/preferences/0000tails.js`
Coordinate with Debian security updates
---------------------------------------
@@ -221,10 +221,10 @@ Upgrade Tor Browser
See the dedicated page: [[tor-browser]]
-Upgrade Icedove
+Upgrade Thunderbird
---------------
-See the dedicated page: [[icedove]]
+See the dedicated page: [[thunderbird]]
Update PO files
---------------
@@ -685,8 +685,10 @@ Prepare upgrade-description files
make this work, one must _not_ pass `--previous-version 1.1`,
that would remove the existing incremental upgrade path from 1.1
to 1.1.1.
- * If preparing a release candidate, add `--channel alpha`
- * If preparing a release candidate, drop all `--next-version`
+ * If preparing anything but a final release (e.g. an alpha, beta
+ or RC), add `--channel alpha`
+ * If preparing anything but a final release (e.g. an alpha, beta
+ or RC), drop all `--next-version`
arguments, and instead pass (**untested!**)
`--next-version $(echo ${VERSION:?} | sed -e 's,~rc.*$,,')`
* If preparing a point-release, pass neither
@@ -719,15 +721,14 @@ Prepare upgrade-description files
git push origin ${RELEASE_BRANCH:?} \
)
-1. If preparing a release candidate, move the generated or updated
- files to `${MASTER_CHECKOUT:?}`, commit and push: given the updates are
- advertised on the *alpha* channel, while all users use the *stable*
- one by default, this will allow you to more easily test the IUK
- without impacting anyone.
+1. If preparing anything but a final release (e.g. an alpha, beta
+ or RC), copy the generated or updated files to
+ `${MASTER_CHECKOUT:?}`, replace `channel: alpha` with `channel:
+ test`, sign them, commit and push.
-1. If preparing a point release, copy the generated UDF for the previous
- release in the alpha channel in the master branch, modify its content
- accordingly, sign it, commit and push
+1. Else, if preparing a final release, copy the generated UDF for the previous
+ release to the *test* channel in `$MASTER_CHECKOUT`, modify its content
+ accordingly, sign it, commit and push:
# If more old versions are supported, add them (whitespace
# separated) to this variable
@@ -738,14 +739,14 @@ Prepare upgrade-description files
git fetch && \
for old_version in ${SUPPORTED_OLD_VERSIONS:?}; do
stable_udf="wiki/src/upgrade/v1/Tails/${old_version:?}/amd64/stable/upgrades.yml" && \
- alpha_udf="wiki/src/upgrade/v1/Tails/${old_version:?}/amd64/alpha/upgrades.yml" && \
+ test_udf="wiki/src/upgrade/v1/Tails/${old_version:?}/amd64/test/upgrades.yml" && \
git show origin/${RELEASE_BRANCH:?}:${stable_udf:?} \
- | sed -e 's/channel: stable/channel: alpha/' > ${alpha_udf:?} && \
- gpg -u "${TAILS_SIGNATURE_KEY:?}" --armor --detach-sign ${alpha_udf:?} && \
- mv ${alpha_udf:?}.asc ${alpha_udf:?}.pgp && \
- git add ${alpha_udf:?}* ; \
+ | sed -e 's/channel: stable/channel: test/' > ${test_udf:?} && \
+ gpg -u "${TAILS_SIGNATURE_KEY:?}" --armor --detach-sign ${test_udf:?} && \
+ mv ${test_udf:?}.asc ${test_udf:?}.pgp && \
+ git add ${test_udf:?}* ; \
done && \
- git commit -m "Add incremental upgrades on the alpha channel for Tails ${VERSION:?}" && \
+ git commit -m "Add incremental upgrades on the test channel for Tails ${VERSION:?}" && \
git push origin master:master \
)
@@ -932,6 +933,10 @@ If preparing a release candidate
Skip this part if preparing a final release.
+Copy the updated or or updated update-description files and their
+detached signatures to `${MASTER_CHECKOUT:?}`. They should be on the
+*alpha* channel.
+
Copy the `.iso.sig` file into the website repository:
cp "${ISO_PATH:?}.sig" \
@@ -957,6 +962,9 @@ Write the announcement for the release in
In any case
-----------
+If preparing a final release, what follows happens in
+`$RELEASE_CHECKOUT`. Else, it happens in `$MASTER_CHECKOUT`.
+
Generate PO files for the announcements with `./build-website`.
Then, send them to <tails-l10n@boum.org> so that they get translated
diff --git a/wiki/src/contribute/release_process/test.mdwn b/wiki/src/contribute/release_process/test.mdwn
index b0ef299..119473f 100644
--- a/wiki/src/contribute/release_process/test.mdwn
+++ b/wiki/src/contribute/release_process/test.mdwn
@@ -98,7 +98,7 @@ tracked by tickets prefixed with `todo/test_suite:`.
* Running `/usr/local/lib/getTorBrowserUserAgent` should produce the User-Agent set by the
installed version of Torbutton, and used in the Tor Browser. (automate: [[!tails_ticket 10268]])
-# Icedove
+# Thunderbird
* Check mail over IMAP using:
- a hidden service IMAP server (e.g. Riseup, zsolxunfmbfuq7wf.onion with SSL).
@@ -108,19 +108,19 @@ tracked by tickets prefixed with `todo/test_suite:`.
- a hidden service SMTP server (see above).
* Check that the profile works and is torified:
- 1. Send an email using Icedove and a non-anonymizing SMTP relay (a
+ 1. Send an email using Thunderbird and a non-anonymizing SMTP relay (a
SMTP relay that writes the IP address of the client it is
relaying email for in the Received header).
1. Then check that email's headers once received, especially the
`Received:` one.
* Also check that the EHLO/HELO SMTP message is not leaking anything
at the application level:
- 1. Start Icedove using the GNOME Applications menu.
- 2. Disable SSL/TLS for SMTP in Icedove (so take precautions for not
+ 1. Start Thunderbird using the GNOME Applications menu.
+ 2. Disable SSL/TLS for SMTP in Thunderbird (so take precautions for not
leaking your password in plaintext by either changing it
temporarily or using a disposable account). Or better, configure
StartTLS, since it will send two EHLO/HELO: one before TLS is
- initiated; one after. The assumption here is that Icedove will
+ initiated; one after. The assumption here is that Thunderbird will
send the same both times.
3. Run `sudo tcpdump -n -i lo -w dump` while sending an email to
capture the packets before Tor encrypts it, then close
@@ -130,12 +130,12 @@ tracked by tickets prefixed with `todo/test_suite:`.
4. Check the dump for the HELO/EHLO message and
verify that it only contains `127.0.0.1`:
`sudo tcpdump -A -r dump | grep EHLO`
-* Make sure Icedove Mail use its dedicated `SocksPort` (see "SocksPort
+* Make sure Thunderbird Mail use its dedicated `SocksPort` (see "SocksPort
for the MUA" in `/etc/tor/torrc`) when connecting to IMAP / POP3 /
SMTP servers (both clearnet and hidden services) by monitoring the
output of this command:
- sudo watch -n 0.1 'ss -taupen | grep icedove'
+ sudo watch -n 0.1 'ss -taupen | grep thunderbird'
# Tor
@@ -189,14 +189,14 @@ tracked by tickets prefixed with `todo/test_suite:`.
If:
* the update-description files have been published on the
- *alpha* channel already (see <https://tails.boum.org/upgrade/v1/Tails/>)
+ *test* channel already (see <https://tails.boum.org/upgrade/v1/Tails/>)
* and the IUK has been published already (see
<https://archive.torproject.org/amnesia.boum.org/tails/alpha/>
and <https://archive.torproject.org/amnesia.boum.org/tails/stable/>):
then:
- echo 'TAILS_CHANNEL="alpha"' | sudo tee --append /etc/os-release && \
+ echo 'TAILS_CHANNEL="test"' | sudo tee --append /etc/os-release && \
tails-upgrade-frontend-wrapper
Else, use a local test setup:
diff --git a/wiki/src/contribute/release_process/test/erase_memory_on_shutdown.mdwn b/wiki/src/contribute/release_process/test/erase_memory_on_shutdown.mdwn
deleted file mode 100644
index 0a27803..0000000
--- a/wiki/src/contribute/release_process/test/erase_memory_on_shutdown.mdwn
+++ /dev/null
@@ -1,80 +0,0 @@
-**FIXME** this process is quite complicated and should be automated using VMs
-
-[[!toc levels=2]]
-
-You are highly welcome to save the result of this test in [[test_results]]
-
-# 0. Prepare the needed tools
-
-Make sure the BIOS is *not* configured to "test" the memory on startup.
-
-Pick one of those:
-
-* [[erase_memory_on_shutdown/qemu_pmemsave]] (pros: no initial setup)
-* [[erase_memory_on_shutdown/virtualbox_dumpguestcore]]
- (pros: no initial setup)
-* [[erase_memory_on_shutdown/pxedump]] (pros: works for bare metal,
- possible to `|grep` and avoid writting the huge dump file to disk;
- cons: initial setup)
-* [[erase_memory_on_shutdown/live_system]] (pros: works for bare metal;
- cons: storage requirements, quite more complicated to get right than
- the other methods)
-
-# 1. Fill the RAM with a known pattern
-
-* Run `fillram` a few times in parallel (on a 32-bit architecture the
- address space of a given process is usually limited at 3 GiB - or
- less, depends on the kernel configuration); as root:
-
- for i in $(seq 0 31) ; do fillram & done ; watch -n 0.1 free -m
-
-* The `free` output should allow you to reboot late enough (so that
- enough memory is filled) and soon enough (so that the system is
- still reactive somehow).
-
-# 2. Test that you can get the pattern after rebooting, if no memory wiping takes place
-
-* Make sure your preferred memory scrapper toolkit is ready.
-* Kill fillram processes and reboot with `SysRq + 1` when free memory is under a threshold by running:
-
- while [ $(free -m -o | grep Mem | sed -e 's/ */ /g' | cut -d ' ' -f 4) -ge 256 ] ; do sleep 0.1 ; done ; killall fillram ; echo 1 > /proc/sys/kernel/sysrq ; echo b > /proc/sysrq-trigger
-
-* Dump memory and try to find the known pattern in it, e.g.:
-
- grep -c wipe_didnt_work tails.dump
-
- - you should get some integer larger than zero if the pattern was found in
- RAM, which is the expected result;
- - you should get `grep: /dev/mem: Cannot allocate memory` otherwise. In that
- case, it is **not** useful to process to the next step, there is something
- wrong in the way you tested.
-
-# 3. Test that you can*not* get the pattern after rebooting Tails normally
-
-* Redo step 1 (don't forget to add `debug=wipemem` to the kernel
- command-line if your memory scrapper toolkit needs it).
-* Kill fillram processes and reboot Tails when free memory is under a threshold by running:
-
- while [ $(free -m -o | grep Mem | sed -e 's/ */ /g' | cut -d ' ' -f 4) -ge 256 ] ; do sleep 0.1 ; done ; killall fillram ; reboot
-
- This is especially important on 486 kernels. The threshold might be fine tuned.
-
-* Make sure your preferred memory scrapper toolkit is ready (e.g.
- plug your USB scrapper stick).
-* When Tails tells you you can unplug the USB stick, unplug the
- Tails stick.
-* Dump memory and try to find the known pattern in it, e.g.:
-
- grep -c wipe_didnt_work tails.dump
-
- - you should get zero if the pattern was not found in RAM, which is the
- optimal (and expected) result;
- - you should get an integer larger than zero if the pattern was found in
- RAM, which means that smem failed. However, there seems to be certain
- legit conditions which can make this happen any way. For instance, the new
- kernel loaded with kexec may allocate some buffer in the memory space
- that was filled with the pattern, and thus that space will not be wiped
- by smem. Hence a "reasonably small" number of occurances is still
- acceptible as it currently is unavoidable. For now, let us arbitrarily
- choose that up to 500 000 occurences (or around 8 MB since each pattern is
- 16 bytes) are acceptable.
diff --git a/wiki/src/contribute/release_process/test/erase_memory_on_shutdown/live_system.mdwn b/wiki/src/contribute/release_process/test/erase_memory_on_shutdown/live_system.mdwn
deleted file mode 100644
index b3e8a12..0000000
--- a/wiki/src/contribute/release_process/test/erase_memory_on_shutdown/live_system.mdwn
+++ /dev/null
@@ -1,45 +0,0 @@
-[[!toc levels=2]]
-
-# Prepare the needed tools
-
-We will use a minimal Debian Lenny Live system to set up a coldboot
-attack.
-
-Why minimal? So that it doesn't overwrite too much of the RAM we want
-to analyze.
-
-Why Lenny? To be able to grep `/dev/mem`, one must run a kernel that
-has `CONFIG_STRICT_DEVMEM` disabled. This setting has been enabled in
-Debian kernels since 2.6.28-1, so we use lenny.
-
-<div class="note">
-
-It is no more possible to build such an image from the Debian archive. Ask
-tails@boum.org if you need to one to run these tests.
-
-</div>
-
-Then install this image on a USB stick.
-
-# Dump the RAM
-
-Grep'ing `/dev/mem` does not work on systems with large amounts of
-memory, so let's use `dd`.
-
- RAM_SIZE_IN_KB=$(free -k | awk '/Mem:/ { print $2 }')
- dd if=/dev/mem of=$DUMP bs=1K count=$RAM_SIZE_IN_KB oflag=direct
-
-where `$DUMP` is some large enough storage for dumping your entire RAM
-into. It could be a USB drive, but I'd recommend a fast harddrive
-unless you want to wait for half an hour or more. The longer the dump
-takes, the more RAM may be overwritten, so speed is crucial, actually.
-One problem is that the live system built above doesn't include
-cryptsetup, lvm2 and friends, so you'll need an unencrypted partition.
-
-The point is to get `$RAM_SIZE_IN_KB` exactly right -- it should be in
-kilobytes of the 1024 bytes variant. The important thing is just to
-get bs and count in such a way that dd reads as much of your RAM as
-possible, but *NOT* more. Also, bs should be small since dd allocates
-that much memory for its own buffer, and that will overwrite RAM.
-oflag=direct will ensure that no cache is used, which otherwise would
-start to over-write RAM for buffers.
diff --git a/wiki/src/contribute/release_process/test/erase_memory_on_shutdown/pxedump.mdwn b/wiki/src/contribute/release_process/test/erase_memory_on_shutdown/pxedump.mdwn
deleted file mode 100644
index 822e59e..0000000
--- a/wiki/src/contribute/release_process/test/erase_memory_on_shutdown/pxedump.mdwn
+++ /dev/null
@@ -1,65 +0,0 @@
-[[!toc levels=2]]
-
-# Prepare the needed tools
-
-## Memory scrapping software
-
-Sources are available there:
-
-* <http://citp.princeton.edu/memory-content/src/bios_memimage-1.2.tar.gz>
-* <http://citp.princeton.edu/memory-content/src/bios_memimage-1.2.tar.gz.asc>
-
-0. Check the tarball signature, unpack.
-0. On an amd64 system run:
-
- $ make -f Makefile.64
-
-## DHCP/TFTP server
-
-If you already have a DHCP/TFTP server ready (e.g. thanks to libvirt),
-all you need to do is to make your tftp root point to
-`bios_memimage/pxe`, and set `scraper.bin` in the place of the
-boot loader.
-
-Else, dnsmasq will happily provide both a DHCP and a TFTP server,
-using the following command line:
-
- $ sudo dnsmasq --conf-file=/dev/null \
- --interface=tap0 \
- --dhcp-range=172.32.1.2,172.32.1.2,1h \
- --enable-tftp \
- --tftp-root=/tmp/bios_memimage/pxe \
- --dhcp-boot=scraper.bin \
- --no-daemon
-
-(Adjust `tftp-root` and `interface` according to your setup.)
-
-Don't forget to punch enough holes in your firewall so that DHCP, TFTP
-and port udp/31337 will go through.
-
-# Run Tails in qemu/kvm
-
-* Start kvm (using a tap interface, in order to
- be on layer 2 between host and VM, otherwise DHCP won't work.)
-
- $ kvm -boot nd -net nic,macaddr=0:0:e8:1:2:3,model=rtl8139 -net tap -m 1024 -cdrom tails.iso
-
-* Setup an IP address on your interface:
-
- sudo ip addr add 172.32.1.1/24 dev tap0
- sudo ip link set tap0 up
-* Press 'Q' to disable PXE for the initial boot. Let the Tails DVD boot.
-
-# Dump the RAM
-
-* At boot time, press 'N' to enable PXE boot. You should soon see
- `Waiting for handshake...`
-* Start the dumping process:
-
- pxedump 172.32.1.2 | pv > tails.dump
-
-# Final note
-
-By replacing `tap0` with `eth0` in the previous examples, it should be
-fairly easy to reproduce this for bare metal hardware, provided its
-network adapter and BIOS are PXE-ready.
diff --git a/wiki/src/contribute/release_process/test/erase_memory_on_shutdown/qemu_pmemsave.mdwn b/wiki/src/contribute/release_process/test/erase_memory_on_shutdown/qemu_pmemsave.mdwn
deleted file mode 100644
index 49a81ed..0000000
--- a/wiki/src/contribute/release_process/test/erase_memory_on_shutdown/qemu_pmemsave.mdwn
+++ /dev/null
@@ -1,19 +0,0 @@
-* Start the VM
-
- - with a 64-bit CPU that supports PAE
-
- qemu-system-x86_64 -enable-kvm -cpu Nehalem -cdrom tails.iso -m 5120
-
- - with a 32-bit CPU that does not support PAE
-
- qemu-system-x86_64 -enable-kvm -cpu 486 -cdrom tails.iso -m 5120
-
-* Open the qemu console (CTRL-ALT-2).
-* Save physical memory to the `tails.dump` file (length is an integer, max size for one dump is 4G = 0xF0000000):
-
- pmemsave <start address> <length> <filename>
-
- e.g for 5G one has to do two dumps:
-
- pmemsave 0 0xFFFFFFFF tails14.dump
- pmemsave 0x100000000 0x40000000 tails5.dump
diff --git a/wiki/src/contribute/release_process/test/erase_memory_on_shutdown/virtualbox_dumpguestcore.mdwn b/wiki/src/contribute/release_process/test/erase_memory_on_shutdown/virtualbox_dumpguestcore.mdwn
deleted file mode 100644
index d639bf7..0000000
--- a/wiki/src/contribute/release_process/test/erase_memory_on_shutdown/virtualbox_dumpguestcore.mdwn
+++ /dev/null
@@ -1,11 +0,0 @@
-Run the following from the host:
-
- vboxmanage debugvm "${VM_NAME}" dumpguestcore --filename tails.dump
-
-and that's it.
-
-VirtualBox' VM core is an ELF that contains [some headers and other
-state](http://www.virtualbox.org/manual/ch12.html#guestcoreformat) of
-the Tails guest in addition to the memory dump, but there's no
-reasonable possibility of finding the pattern as false positives there
-so there's no reason to bother cutting the headers away.
diff --git a/wiki/src/contribute/release_process/test/usage.mdwn b/wiki/src/contribute/release_process/test/usage.mdwn
index 971f5e4..38242ac 100644
--- a/wiki/src/contribute/release_process/test/usage.mdwn
+++ b/wiki/src/contribute/release_process/test/usage.mdwn
@@ -208,9 +208,9 @@ where `$TYPE` is `SSH` or `SFTP`. Secrets must be specified for both `SSH` and
The SSH test expects the remote system to have a default `bash` shell prompt.
-### Icedove
+### Thunderbird
-These settings are required for `icedove.feature`. The format is:
+These settings are required for `thunderbird.feature`. The format is:
Icedove:
address: user@example.com
diff --git a/wiki/src/contribute/release_process/icedove.mdwn b/wiki/src/contribute/release_process/thunderbird.mdwn
index be21347..543f818 100644
--- a/wiki/src/contribute/release_process/icedove.mdwn
+++ b/wiki/src/contribute/release_process/thunderbird.mdwn
@@ -1,25 +1,25 @@
-[[!meta title="Releasing Icedove"]]
+[[!meta title="Releasing Thunderbird"]]
Until we have
[[!tails_ticket 6156 desc="upstreamed our secure autoconfiguration patches"]]
-we have to maintain Icedove ourselves. This means we need to
-[track](https://tracker.debian.org/pkg/icedove) new versions hitting
+we have to maintain Thunderbird ourselves. This means we need to
+[track](https://tracker.debian.org/pkg/thunderbird) new versions hitting
Debian Stable.
The first time you do this requires some additional steps (WARNING!
this will download almost 2 GiB of data):
-1. Clone [Tails' Icedove repo](http://git.tails.boum.org/icedove/).
+1. Clone [Tails' Thunderbird repo](http://git.tails.boum.org/thunderbird/).
1. Add a remote for Debian:
- git remote add debian-upstream git://anonscm.debian.org/pkg-mozilla/icedove.git
+ git remote add debian-upstream git://anonscm.debian.org/pkg-mozilla/thunderbird.git
-Let's pretend the scenario is that Icedove 45.3.0-1 has just been
+Let's pretend the scenario is that Thunderbird 45.3.0-1 has just been
released:
- VERSION=45.3.0-1
- TAG=debian/1%${VERSION}_deb8u1
+ VERSION=45.8.0-3
+ TAG=debian/1%${VERSION}
1. `git fetch && git fetch debian-upstream`
@@ -30,21 +30,21 @@ released:
1. Let's update our branch to the new version:
- git checkout tails/jessie && git merge origin/tails/jessie && \
+ git checkout tails/stretch && git merge origin/tails/stretch && \
git merge --no-edit "${TAG}"
Now you most likely will have to deal with a merge conflict in
debian/changelog -- just reorder the entries chronologically. Then
let's release a new version:
- TAILS_VERSION="1:${VERSION}~deb8u1+tails1" && \
- DISTRIBUTION="feature-icedove-${VERSION}" && \
+ TAILS_VERSION="1:${VERSION}+tails1" && \
+ DISTRIBUTION="feature-thunderbird-${VERSION}" && \
dch --newversion "${TAILS_VERSION}" --force-bad-version \
--distribution "${DISTRIBUTION}" --force-distribution \
- "Rebuild Icedove with Tails' secure autoconfiguration patches." && \
+ "Rebuild Thunderbird with Tails' secure autoconfiguration patches." && \
git commit debian/changelog \
-m "document changes and release ${TAILS_VERSION}" && \
- gbp buildpackage --git-debian-branch=tails/jessie \
+ gbp buildpackage --git-debian-branch=tails/stretch \
--git-sign-tags --git-tag-only
1. Fetch the Debian sources to be used for the build:
@@ -52,8 +52,8 @@ released:
ICEDOVE_SOURCES="$(mktemp -d)" && \
GIT_DIR="$(pwd)" && \
cd "${ICEDOVE_SOURCES}" && \
- apt source icedove="1:${VERSION}" && \
- cp icedove_*.orig*.tar.xz "${GIT_DIR}/.." && \
+ apt source thunderbird="1:${VERSION}" && \
+ cp thunderbird_*.orig*.tar.xz "${GIT_DIR}/.." && \
cd "${GIT_DIR}" && \
rm -r "${ICEDOVE_SOURCES}"
@@ -68,7 +68,7 @@ released:
1. Include all sources in the `.changes` file:
- CHANGES_FILE="../icedove_${VERSION}~deb8u1+tails1_amd64.changes" && \
+ CHANGES_FILE="../thunderbird_${VERSION}+tails1_amd64.changes" && \
changestool "${CHANGES_FILE}" includeallsources
1. Due to [[!tails_ticket 11531]] we won't be able to push the tag
@@ -76,12 +76,12 @@ released:
named tag:
NEW_TAG="$(echo ${TAG} | sed 's/1%//')" && \
- git tag -s "${NEW_TAG}" -m "icedove Debian release 1:${VERSION}" "${TAG}" && \
+ git tag -s "${NEW_TAG}" -m "thunderbird Debian release 1:${VERSION}" "${TAG}" && \
TAG="${NEW_TAG}"
1. Git push and upload packages:
- git push origin "${TAG}" tails/jessie && \
+ git push origin "${TAG}" tails/stretch && \
debsign "${CHANGES_FILE}" && \
dupload --to tails "${CHANGES_FILE}"
diff --git a/wiki/src/doc/about/features.de.po b/wiki/src/doc/about/features.de.po
index 9c14e94..c5009b5 100644
--- a/wiki/src/doc/about/features.de.po
+++ b/wiki/src/doc/about/features.de.po
@@ -71,7 +71,7 @@ msgstr "Netzwerk\n"
#| "* [Pidgin](http://www.pidgin.im/) preconfigured with\n"
#| " [OTR](http://www.cypherpunks.ca/otr/index.php) for Off-the-Record\n"
#| " Messaging ([[More...|doc/anonymous_internet/pidgin]])\n"
-#| "* [Icedove (Thunderbird)](https://www.mozilla.org/en-US/thunderbird/) email client with [Enigmail](https://www.enigmail.net/) for OpenPGP support ([[More...|doc/anonymous_internet/icedove]])\n"
+#| "* [Thunderbird](https://www.mozilla.org/en-US/thunderbird/) email client with [Enigmail](https://www.enigmail.net/) for OpenPGP support ([[More...|doc/anonymous_internet/thunderbird]])\n"
#| "* [Liferea](http://liferea.sourceforge.net/) feed aggregator\n"
#| "* [Gobby](http://gobby.0x539.de/trac/) for collaborative text writing\n"
#| "* [Aircrack-ng](http://aircrack-ng.org/) for wireless network auditing\n"
@@ -98,7 +98,7 @@ msgid ""
" [OTR](http://www.cypherpunks.ca/otr/index.php) for Off-the-Record\n"
" Messaging ([[More...|doc/anonymous_internet/pidgin]])\n"
"* [OnionShare](https://onionshare.org/) for anonymous filesharing\n"
-"* [Icedove (Thunderbird)](https://www.mozilla.org/en-US/thunderbird/) email client with [Enigmail](https://www.enigmail.net/) for OpenPGP support ([[More...|doc/anonymous_internet/icedove]])\n"
+"* [Thunderbird](https://www.mozilla.org/en-US/thunderbird/) email client with [Enigmail](https://www.enigmail.net/) for OpenPGP support ([[More...|doc/anonymous_internet/thunderbird]])\n"
"* [Liferea](http://liferea.sourceforge.net/) feed aggregator\n"
"* [Gobby](http://gobby.0x539.de/trac/) for collaborative text writing\n"
"* [Aircrack-ng](http://aircrack-ng.org/) for wireless network auditing\n"
@@ -123,7 +123,7 @@ msgstr ""
"* [Pidgin](http://www.pidgin.im/) vorkonfiguriert mit\n"
" [OTR](http://www.cypherpunks.ca/otr/index.php) für Off-the-Record\n"
" Messaging (Verschlüsselung von Instant-Nachrichten) ([[Mehr...|doc/anonymous_internet/pidgin]])\n"
-"* [Icedove (Thunderbird)](https://www.mozilla.org/en-US/thunderbird/) E-Mail-Client mit [Enigmail](https://www.enigmail.net/) für OpenPGP Unterstützung ([[Mehr...|doc/anonymous_internet/icedove]])\n"
+"* [Thunderbird](https://www.mozilla.org/en-US/thunderbird/) E-Mail-Client mit [Enigmail](https://www.enigmail.net/) für OpenPGP Unterstützung ([[Mehr...|doc/anonymous_internet/thunderbird]])\n"
"* [Liferea](http://liferea.sourceforge.net/) Feed-Aggregator\n"
"* [Gobby](http://gobby.0x539.de/trac/) zum kollaborativen Schreiben von Texten\n"
"* [Aircrack-ng](http://aircrack-ng.org/) um drahtlose Netzwerke zu prüfen\n"
diff --git a/wiki/src/doc/about/features.fa.po b/wiki/src/doc/about/features.fa.po
index 574ed70..168c18c 100644
--- a/wiki/src/doc/about/features.fa.po
+++ b/wiki/src/doc/about/features.fa.po
@@ -108,7 +108,7 @@ msgid ""
" [OTR](http://www.cypherpunks.ca/otr/index.php) for Off-the-Record\n"
" Messaging ([[More...|doc/anonymous_internet/pidgin]])\n"
"* [OnionShare](https://onionshare.org/) for anonymous filesharing\n"
-"* [Icedove (Thunderbird)](https://www.mozilla.org/en-US/thunderbird/) email client with [Enigmail](https://www.enigmail.net/) for OpenPGP support ([[More...|doc/anonymous_internet/icedove]])\n"
+"* [Thunderbird](https://www.mozilla.org/en-US/thunderbird/) email client with [Enigmail](https://www.enigmail.net/) for OpenPGP support ([[More...|doc/anonymous_internet/thunderbird]])\n"
"* [Liferea](http://liferea.sourceforge.net/) feed aggregator\n"
"* [Gobby](http://gobby.0x539.de/trac/) for collaborative text writing\n"
"* [Aircrack-ng](http://aircrack-ng.org/) for wireless network auditing\n"
diff --git a/wiki/src/doc/about/features.fr.po b/wiki/src/doc/about/features.fr.po
index b0b1c29..f9599c0 100644
--- a/wiki/src/doc/about/features.fr.po
+++ b/wiki/src/doc/about/features.fr.po
@@ -75,7 +75,7 @@ msgid ""
" [OTR](http://www.cypherpunks.ca/otr/index.php) for Off-the-Record\n"
" Messaging ([[More...|doc/anonymous_internet/pidgin]])\n"
"* [OnionShare](https://onionshare.org/) for anonymous filesharing\n"
-"* [Icedove (Thunderbird)](https://www.mozilla.org/en-US/thunderbird/) email client with [Enigmail](https://www.enigmail.net/) for OpenPGP support ([[More...|doc/anonymous_internet/icedove]])\n"
+"* [Thunderbird](https://www.mozilla.org/en-US/thunderbird/) email client with [Enigmail](https://www.enigmail.net/) for OpenPGP support ([[More...|doc/anonymous_internet/thunderbird]])\n"
"* [Liferea](http://liferea.sourceforge.net/) feed aggregator\n"
"* [Gobby](http://gobby.0x539.de/trac/) for collaborative text writing\n"
"* [Aircrack-ng](http://aircrack-ng.org/) for wireless network auditing\n"
@@ -101,7 +101,7 @@ msgstr ""
" [OTR](http://www.cypherpunks.ca/otr/index.php) pour la messagerie\n"
" Off-the-Record ([[Plus d'information...|doc/anonymous_internet/pidgin]])\n"
"* [OnionShare](https://onionshare.org/) pour partager des fichiers anonymement\n"
-"* [Icedove (Thunderbird)](https://www.mozilla.org/fr/thunderbird/), un client de messagerie, avec [Enigmail](https://www.enigmail.net/) pour la prise en charge de OpenPGP ([[Plus d'information...|doc/anonymous_internet/icedove]])\n"
+"* [Thunderbird](https://www.mozilla.org/fr/thunderbird/), un client de messagerie, avec [Enigmail](https://www.enigmail.net/) pour la prise en charge de OpenPGP ([[Plus d'information...|doc/anonymous_internet/thunderbird]])\n"
"* [Liferea](http://liferea.sourceforge.net/) agrégateur de flux\n"
"* [Gobby](http://gobby.0x539.de/trac/) pour l'édition collaborative de texte\n"
"* [Aircrack-ng](http://aircrack-ng.org/) pour l'audit de réseaux sans-fil\n"
diff --git a/wiki/src/doc/about/features.it.po b/wiki/src/doc/about/features.it.po
index 36b57ad..43a4453 100644
--- a/wiki/src/doc/about/features.it.po
+++ b/wiki/src/doc/about/features.it.po
@@ -72,7 +72,7 @@ msgstr "Connessioni\n"
#| "* [Pidgin](http://www.pidgin.im/) preconfigured with\n"
#| " [OTR](http://www.cypherpunks.ca/otr/index.php) for Off-the-Record\n"
#| " Messaging ([[More...|doc/anonymous_internet/pidgin]])\n"
-#| "* [Icedove (Thunderbird)](https://www.mozilla.org/en-US/thunderbird/) email client with [Enigmail](https://www.enigmail.net/) for OpenPGP support ([[More...|doc/anonymous_internet/icedove]])\n"
+#| "* [Thunderbird](https://www.mozilla.org/en-US/thunderbird/) email client with [Enigmail](https://www.enigmail.net/) for OpenPGP support ([[More...|doc/anonymous_internet/thunderbird]])\n"
#| "* [Liferea](http://liferea.sourceforge.net/) feed aggregator\n"
#| "* [Gobby](http://gobby.0x539.de/trac/) for collaborative text writing\n"
#| "* [Aircrack-ng](http://aircrack-ng.org/) for wireless network auditing\n"
@@ -99,7 +99,7 @@ msgid ""
" [OTR](http://www.cypherpunks.ca/otr/index.php) for Off-the-Record\n"
" Messaging ([[More...|doc/anonymous_internet/pidgin]])\n"
"* [OnionShare](https://onionshare.org/) for anonymous filesharing\n"
-"* [Icedove (Thunderbird)](https://www.mozilla.org/en-US/thunderbird/) email client with [Enigmail](https://www.enigmail.net/) for OpenPGP support ([[More...|doc/anonymous_internet/icedove]])\n"
+"* [Thunderbird](https://www.mozilla.org/en-US/thunderbird/) email client with [Enigmail](https://www.enigmail.net/) for OpenPGP support ([[More...|doc/anonymous_internet/thunderbird]])\n"
"* [Liferea](http://liferea.sourceforge.net/) feed aggregator\n"
"* [Gobby](http://gobby.0x539.de/trac/) for collaborative text writing\n"
"* [Aircrack-ng](http://aircrack-ng.org/) for wireless network auditing\n"
@@ -124,7 +124,7 @@ msgstr ""
"* [Pidgin](http://www.pidgin.im/) preconfigurato con\n"
" [OTR](http://www.cypherpunks.ca/otr/index.php) per messaggistica Off-the-Record\n"
" ([[More...|doc/anonymous_internet/pidgin]])\n"
-"* [Icedove (Thunderbird)](https://www.mozilla.org/en-US/thunderbird/) client email con [Enigmail](https://www.enigmail.net/) per il supporto a OpenPGP ([[More...|doc/anonymous_internet/icedove]])\n"
+"* [Thunderbird](https://www.mozilla.org/en-US/thunderbird/) client email con [Enigmail](https://www.enigmail.net/) per il supporto a OpenPGP ([[More...|doc/anonymous_internet/thunderbird]])\n"
"* [Liferea](http://liferea.sourceforge.net/) aggregatore feed \n"
"* [Gobby](http://gobby.0x539.de/trac/) per la scrittura di testi collaborativi\n"
"* [Aircrack-ng](http://aircrack-ng.org/) per l'ascolto di network wireless\n"
diff --git a/wiki/src/doc/about/features.mdwn b/wiki/src/doc/about/features.mdwn
index 79f8b28..4ea77b7 100644
--- a/wiki/src/doc/about/features.mdwn
+++ b/wiki/src/doc/about/features.mdwn
@@ -33,7 +33,7 @@ Networking
[OTR](http://www.cypherpunks.ca/otr/index.php) for Off-the-Record
Messaging ([[More...|doc/anonymous_internet/pidgin]])
* [OnionShare](https://onionshare.org/) for anonymous filesharing
-* [Icedove (Thunderbird)](https://www.mozilla.org/en-US/thunderbird/) email client with [Enigmail](https://www.enigmail.net/) for OpenPGP support ([[More...|doc/anonymous_internet/icedove]])
+* [Thunderbird](https://www.mozilla.org/en-US/thunderbird/) email client with [Enigmail](https://www.enigmail.net/) for OpenPGP support ([[More...|doc/anonymous_internet/thunderbird]])
* [Liferea](http://liferea.sourceforge.net/) feed aggregator
* [Gobby](http://gobby.0x539.de/trac/) for collaborative text writing
* [Aircrack-ng](http://aircrack-ng.org/) for wireless network auditing
@@ -106,7 +106,7 @@ Additional features
* Some basic [[doc/first_steps/accessibility]] features
* Some [[contribute/design/application_isolation]] with AppArmor
* To prevent cold-boot attacks and various memory forensics, Tails
- erases memory on shutdown and when the boot media is physically
+ erases most memory on shutdown and when the boot media is physically
removed.
Multilingual support
diff --git a/wiki/src/doc/about/features.pt.po b/wiki/src/doc/about/features.pt.po
index 688d120..f32a2de 100644
--- a/wiki/src/doc/about/features.pt.po
+++ b/wiki/src/doc/about/features.pt.po
@@ -100,7 +100,7 @@ msgid ""
" [OTR](http://www.cypherpunks.ca/otr/index.php) for Off-the-Record\n"
" Messaging ([[More...|doc/anonymous_internet/pidgin]])\n"
"* [OnionShare](https://onionshare.org/) for anonymous filesharing\n"
-"* [Icedove (Thunderbird)](https://www.mozilla.org/en-US/thunderbird/) email client with [Enigmail](https://www.enigmail.net/) for OpenPGP support ([[More...|doc/anonymous_internet/icedove]])\n"
+"* [Thunderbird](https://www.mozilla.org/en-US/thunderbird/) email client with [Enigmail](https://www.enigmail.net/) for OpenPGP support ([[More...|doc/anonymous_internet/thunderbird]])\n"
"* [Liferea](http://liferea.sourceforge.net/) feed aggregator\n"
"* [Gobby](http://gobby.0x539.de/trac/) for collaborative text writing\n"
"* [Aircrack-ng](http://aircrack-ng.org/) for wireless network auditing\n"
diff --git a/wiki/src/doc/advanced_topics/cold_boot_attacks.mdwn b/wiki/src/doc/advanced_topics/cold_boot_attacks.mdwn
index f9765ca..91a65bd 100644
--- a/wiki/src/doc/advanced_topics/cold_boot_attacks.mdwn
+++ b/wiki/src/doc/advanced_topics/cold_boot_attacks.mdwn
@@ -16,19 +16,6 @@ attack"]] </span>. To prevent this attack, the data in RAM is
overwritten by random data when shutting down Tails. This erases all
traces from your session on that computer.
-<div class="bug">
-
-On some computers Tails might fail to:
-<ul>
- <li>[[erase all the data in RAM on
- shutdown|support/known_issues#memory-wipe]]</li>
- <li>[[completely shutdown or restart|support/known_issues#fails-to-shutdown]]
- (in this case there is no guarantee that all the data in RAM is
- erased).</li>
-</ul>
-
-</div>
-
Moreover, an attacker having physical access to the computer *while
Tails is running* can recover data from RAM as well. To avoid that,
learn the different methods to [[shutdown
diff --git a/wiki/src/doc/advanced_topics/lan.mdwn b/wiki/src/doc/advanced_topics/lan.mdwn
index 03af38d..e3f73a7 100644
--- a/wiki/src/doc/advanced_topics/lan.mdwn
+++ b/wiki/src/doc/advanced_topics/lan.mdwn
@@ -68,7 +68,14 @@ execute the following command:
Downloading files from an FTP server on the local network
=========================================================
-To connect to an FTP server on the local network choose
-<span class="menuchoice">
- <span class="guimenu">Places</span>&nbsp;▸
- <span class="guimenuitem">Connect to Server&hellip;</span></span>.
+1. Open <span class="application">Files</span>.
+
+1. Click on <span class="guilabel">Other Locations</span> in the sidebar.
+
+1. Enter the address of the FTP server in the
+ <span class="guilabel">Connect to Server</span> text box. For
+ example:
+
+ ftp://192.168.1.25/
+
+1. Click <span class="button">Connect</span>.
diff --git a/wiki/src/doc/advanced_topics/virtualization/boxes.mdwn b/wiki/src/doc/advanced_topics/virtualization/boxes.mdwn
index cd69d66..2b7370e 100644
--- a/wiki/src/doc/advanced_topics/virtualization/boxes.mdwn
+++ b/wiki/src/doc/advanced_topics/virtualization/boxes.mdwn
@@ -46,11 +46,9 @@ versa.</p>
To disable the shared clipboard:
- 1. Click on the
- [[!img preferences-system-symbolic.png alt="Preferences" class=symbolic link=no]]
- button on the top-right corner of the window.
- 2. Select the **Display** screen in the left pane.
- 3. Deactivate **Share clipboard** in the right pane.
- 4. Click on the
- [[!img go-previous-symbolic.png alt="Previous" class=symbolic link=no]]
- button to go back to the display of the virtual machine.
+ 1. Choose
+ <span class="menuchoice">
+ <span class="guimenu">[[!img lib/open-menu.png alt="Menu" class="symbolic" link="no"]]</span>&nbsp;▸
+ <span class="guisubmenu">Properties</span></span>.
+
+ 1. Deselect the <span class="guilabel">Share Clipboard</span> option.
diff --git a/wiki/src/doc/advanced_topics/virtualization/preferences-system-symbolic.png b/wiki/src/doc/advanced_topics/virtualization/preferences-system-symbolic.png
deleted file mode 100644
index c4c9d29..0000000
--- a/wiki/src/doc/advanced_topics/virtualization/preferences-system-symbolic.png
+++ /dev/null
Binary files differ
diff --git a/wiki/src/doc/anonymous_internet.index.de.po b/wiki/src/doc/anonymous_internet.index.de.po
index d1be28d..a189d1a 100644
--- a/wiki/src/doc/anonymous_internet.index.de.po
+++ b/wiki/src/doc/anonymous_internet.index.de.po
@@ -24,8 +24,7 @@ msgid ""
" - [[!traillink Viewing_the_status_and_circuits_of_Tor|anonymous_internet/tor_status]]\n"
" - [[!traillink Browsing_the_web_with_<span_class=\"application\">Tor_Browser</span>|anonymous_internet/tor_browser]]\n"
" - [[!traillink Chatting_with_Pidgin_&_OTR|anonymous_internet/pidgin]]\n"
-" - [[!traillink Emailing_with_<span_class=\"application\">Icedove_(Thunderbird)</span>|anonymous_internet/icedove]]\n"
-" - [[!traillink Migrating_from_<span_class=\"application\">Claws_Mail</span>_to_<span_class=\"application\">Icedove</span>|anonymous_internet/claws_mail_to_icedove]]\n"
+" - [[!traillink Emailing_with_<span_class=\"application\">Thunderbird</span>|anonymous_internet/thunderbird]]\n"
" - [[!traillink Sharing_files_with_<span_class=\"application\">OnionShare</span>|anonymous_internet/onionshare]]\n"
" - [[!traillink Exchange_bitcoins_using_<span_class=\"application\">Electrum</span>|anonymous_internet/electrum]]\n"
" - [[!traillink Why_Tor_is_slow?|anonymous_internet/why_tor_is_slow]]\n"
@@ -35,8 +34,7 @@ msgstr ""
" - [[!traillink Den_Status_und_die_Kanäle_von_Tor_einsehen|anonymous_internet/tor_status]]\n"
" - [[!traillink Mit_dem_<span_class=\"application\">Tor_Browser</span>_im_Internet_surfen|anonymous_internet/tor_browser]]\n"
" - [[!traillink Mit_Pidgin_&_OTR_chatten|anonymous_internet/pidgin]]\n"
-" - [[!traillink Emails_mit_<span_class=\"application\">Icedove_(Thunderbird)</span>|anonymous_internet/icedove]]\n"
-" - [[!traillink Von_<span_class=\"application\">Claws_Mail</span>_nach_<span_class=\"application\">Icedove</span>_migrieren|anonymous_internet/claws_mail_to_icedove]]\n"
+" - [[!traillink Emails_mit_<span_class=\"application\">Thunderbird</span>|anonymous_internet/thunderbird]]\n"
" - [[!traillink Dateien_mit_<span_class=\"application\">OnionShare</span>_freigeben|anonymous_internet/onionshare]]\n"
" - [[!traillink Bitcoins_mit_<span_class=\"application\">Electrum</span>_austauschen|anonymous_internet/electrum]]\n"
" - [[!traillink Wieso_ist_Tor_langsam?|anonymous_internet/why_tor_is_slow]]\n"
diff --git a/wiki/src/doc/anonymous_internet.index.fa.po b/wiki/src/doc/anonymous_internet.index.fa.po
index 5d853d4..c44cfcf 100644
--- a/wiki/src/doc/anonymous_internet.index.fa.po
+++ b/wiki/src/doc/anonymous_internet.index.fa.po
@@ -27,8 +27,7 @@ msgid ""
" - [[!traillink Viewing_the_status_and_circuits_of_Tor|anonymous_internet/tor_status]]\n"
" - [[!traillink Browsing_the_web_with_<span_class=\"application\">Tor_Browser</span>|anonymous_internet/tor_browser]]\n"
" - [[!traillink Chatting_with_Pidgin_&_OTR|anonymous_internet/pidgin]]\n"
-" - [[!traillink Emailing_with_<span_class=\"application\">Icedove_(Thunderbird)</span>|anonymous_internet/icedove]]\n"
-" - [[!traillink Migrating_from_<span_class=\"application\">Claws_Mail</span>_to_<span_class=\"application\">Icedove</span>|anonymous_internet/claws_mail_to_icedove]]\n"
+" - [[!traillink Emailing_with_<span_class=\"application\">Thunderbird</span>|anonymous_internet/thunderbird]]\n"
" - [[!traillink Sharing_files_with_<span_class=\"application\">OnionShare</span>|anonymous_internet/onionshare]]\n"
" - [[!traillink Exchange_bitcoins_using_<span_class=\"application\">Electrum</span>|anonymous_internet/electrum]]\n"
" - [[!traillink Why_Tor_is_slow?|anonymous_internet/why_tor_is_slow]]\n"
diff --git a/wiki/src/doc/anonymous_internet.index.fr.po b/wiki/src/doc/anonymous_internet.index.fr.po
index 76ccbd3..7e938de 100644
--- a/wiki/src/doc/anonymous_internet.index.fr.po
+++ b/wiki/src/doc/anonymous_internet.index.fr.po
@@ -24,8 +24,7 @@ msgid ""
" - [[!traillink Viewing_the_status_and_circuits_of_Tor|anonymous_internet/tor_status]]\n"
" - [[!traillink Browsing_the_web_with_<span_class=\"application\">Tor_Browser</span>|anonymous_internet/tor_browser]]\n"
" - [[!traillink Chatting_with_Pidgin_&_OTR|anonymous_internet/pidgin]]\n"
-" - [[!traillink Emailing_with_<span_class=\"application\">Icedove_(Thunderbird)</span>|anonymous_internet/icedove]]\n"
-" - [[!traillink Migrating_from_<span_class=\"application\">Claws_Mail</span>_to_<span_class=\"application\">Icedove</span>|anonymous_internet/claws_mail_to_icedove]]\n"
+" - [[!traillink Emailing_with_<span_class=\"application\">Thunderbird</span>|anonymous_internet/thunderbird]]\n"
" - [[!traillink Sharing_files_with_<span_class=\"application\">OnionShare</span>|anonymous_internet/onionshare]]\n"
" - [[!traillink Exchange_bitcoins_using_<span_class=\"application\">Electrum</span>|anonymous_internet/electrum]]\n"
" - [[!traillink Why_Tor_is_slow?|anonymous_internet/why_tor_is_slow]]\n"
@@ -35,8 +34,7 @@ msgstr ""
" - [[!traillink Voir_le_statut_et_les_circuits_de_Tor|anonymous_internet/tor_status]]\n"
" - [[!traillink Naviguer_sur_le_web_avec_le_<span_class=\"application\">Navigateur_Tor</span>|anonymous_internet/tor_browser]]\n"
" - [[!traillink Discuter_avec_Pidgin_et_OTR|anonymous_internet/pidgin]]\n"
-" - [[!traillink Lire_et_écrire_des_courriers_électroniques_avec_<span_class=\"application\">Icedove_(Thunderbird)</span>|anonymous_internet/icedove]]\n"
-" - [[!traillink Migrer_de_<span_class=\"application\">Claws_Mail</span>_à_<span_class=\"application\">Icedove</span>|anonymous_internet/claws_mail_to_icedove]]\n"
+" - [[!traillink Lire_et_écrire_des_courriers_électroniques_avec_<span_class=\"application\">Thunderbird</span>|anonymous_internet/thunderbird]]\n"
" - [[!traillink Partager_des_fichiers_avec_<span_class=\"application\">OnionShare</span>|anonymous_internet/onionshare]]\n"
" - [[!traillink Échanger_des_bitcoins_avec_<span_class=\"application\">Electrum</span>|anonymous_internet/electrum]]\n"
" - [[!traillink Pourquoi_Tor_est-il_lent_?|anonymous_internet/why_tor_is_slow]]\n"
diff --git a/wiki/src/doc/anonymous_internet.index.it.po b/wiki/src/doc/anonymous_internet.index.it.po
index ac37de3..2bd5f51 100644
--- a/wiki/src/doc/anonymous_internet.index.it.po
+++ b/wiki/src/doc/anonymous_internet.index.it.po
@@ -24,8 +24,7 @@ msgid ""
" - [[!traillink Viewing_the_status_and_circuits_of_Tor|anonymous_internet/tor_status]]\n"
" - [[!traillink Browsing_the_web_with_<span_class=\"application\">Tor_Browser</span>|anonymous_internet/tor_browser]]\n"
" - [[!traillink Chatting_with_Pidgin_&_OTR|anonymous_internet/pidgin]]\n"
-" - [[!traillink Emailing_with_<span_class=\"application\">Icedove_(Thunderbird)</span>|anonymous_internet/icedove]]\n"
-" - [[!traillink Migrating_from_<span_class=\"application\">Claws_Mail</span>_to_<span_class=\"application\">Icedove</span>|anonymous_internet/claws_mail_to_icedove]]\n"
+" - [[!traillink Emailing_with_<span_class=\"application\">Thunderbird</span>|anonymous_internet/thunderbird]]\n"
" - [[!traillink Sharing_files_with_<span_class=\"application\">OnionShare</span>|anonymous_internet/onionshare]]\n"
" - [[!traillink Exchange_bitcoins_using_<span_class=\"application\">Electrum</span>|anonymous_internet/electrum]]\n"
" - [[!traillink Why_Tor_is_slow?|anonymous_internet/why_tor_is_slow]]\n"
diff --git a/wiki/src/doc/anonymous_internet.index.mdwn b/wiki/src/doc/anonymous_internet.index.mdwn
index f97d9ac..9d4de50 100644
--- a/wiki/src/doc/anonymous_internet.index.mdwn
+++ b/wiki/src/doc/anonymous_internet.index.mdwn
@@ -3,8 +3,7 @@
- [[!traillink Viewing_the_status_and_circuits_of_Tor|anonymous_internet/tor_status]]
- [[!traillink Browsing_the_web_with_<span_class="application">Tor_Browser</span>|anonymous_internet/tor_browser]]
- [[!traillink Chatting_with_Pidgin_&_OTR|anonymous_internet/pidgin]]
- - [[!traillink Emailing_with_<span_class="application">Icedove_(Thunderbird)</span>|anonymous_internet/icedove]]
- - [[!traillink Migrating_from_<span_class="application">Claws_Mail</span>_to_<span_class="application">Icedove</span>|anonymous_internet/claws_mail_to_icedove]]
+ - [[!traillink Emailing_with_<span_class="application">Thunderbird</span>|anonymous_internet/thunderbird]]
- [[!traillink Sharing_files_with_<span_class="application">OnionShare</span>|anonymous_internet/onionshare]]
- [[!traillink Exchange_bitcoins_using_<span_class="application">Electrum</span>|anonymous_internet/electrum]]
- [[!traillink Why_Tor_is_slow?|anonymous_internet/why_tor_is_slow]]
diff --git a/wiki/src/doc/anonymous_internet.index.pt.po b/wiki/src/doc/anonymous_internet.index.pt.po
index a6fc4ab..c5fdce0 100644
--- a/wiki/src/doc/anonymous_internet.index.pt.po
+++ b/wiki/src/doc/anonymous_internet.index.pt.po
@@ -23,8 +23,7 @@ msgid ""
" - [[!traillink Viewing_the_status_and_circuits_of_Tor|anonymous_internet/tor_status]]\n"
" - [[!traillink Browsing_the_web_with_<span_class=\"application\">Tor_Browser</span>|anonymous_internet/tor_browser]]\n"
" - [[!traillink Chatting_with_Pidgin_&_OTR|anonymous_internet/pidgin]]\n"
-" - [[!traillink Emailing_with_<span_class=\"application\">Icedove_(Thunderbird)</span>|anonymous_internet/icedove]]\n"
-" - [[!traillink Migrating_from_<span_class=\"application\">Claws_Mail</span>_to_<span_class=\"application\">Icedove</span>|anonymous_internet/claws_mail_to_icedove]]\n"
+" - [[!traillink Emailing_with_<span_class=\"application\">Thunderbird</span>|anonymous_internet/thunderbird]]\n"
" - [[!traillink Sharing_files_with_<span_class=\"application\">OnionShare</span>|anonymous_internet/onionshare]]\n"
" - [[!traillink Exchange_bitcoins_using_<span_class=\"application\">Electrum</span>|anonymous_internet/electrum]]\n"
" - [[!traillink Why_Tor_is_slow?|anonymous_internet/why_tor_is_slow]]\n"
diff --git a/wiki/src/doc/anonymous_internet/claws_mail.de.po b/wiki/src/doc/anonymous_internet/claws_mail.de.po
deleted file mode 100644
index e82d4b5..0000000
--- a/wiki/src/doc/anonymous_internet/claws_mail.de.po
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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-12-15 16:51+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=\"Reading and writing emails with Claws Mail\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"doc/anonymous_internet/icedove/replacement.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr ""
diff --git a/wiki/src/doc/anonymous_internet/claws_mail.fa.po b/wiki/src/doc/anonymous_internet/claws_mail.fa.po
deleted file mode 100644
index 3aa3684..0000000
--- a/wiki/src/doc/anonymous_internet/claws_mail.fa.po
+++ /dev/null
@@ -1,94 +0,0 @@
-# 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.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2015-12-24 15:03+0100\n"
-"PO-Revision-Date: 2015-10-14 16:54+0000\n"
-"Last-Translator: sprint5 <translation5@451f.org>\n"
-"Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/"
-"claws_mail/fa/>\n"
-"Language: fa\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 2.4-dev\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"Reading and writing emails with Claws Mail\"]]\n"
-msgstr "[[!meta title=\"خواندن و نوشتن رایانامه با Claws Mail\"]]\n"
-
-#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid "[[!inline pages=\"doc/anonymous_internet/claws_mail/persistence.bug\" raw=\"yes\"]]\n"
-msgid "[[!inline pages=\"doc/anonymous_internet/icedove/replacement.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"doc/anonymous_internet/claws_mail/persistence.bug\" raw=\"yes\" sort=\"age\"]]\n"
-
-#~ msgid ""
-#~ "For reading and writing email, Tails includes <span\n"
-#~ "class=\"application\">[Claws Mail](http://www.claws-mail.org/)</span>.\n"
-#~ msgstr ""
-#~ "برای خواندن و نوشتن رایانه تیلز دارای <span\n"
-#~ "class=\"application\">[Claws Mail](http://www.claws-mail.org/)</span> است.\n"
-
-#~ msgid ""
-#~ "To start <span class=\"application\">Claws Mail</span> choose\n"
-#~ "<span class=\"menuchoice\">\n"
-#~ " <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
-#~ " <span class=\"guisubmenu\">Internet</span>&nbsp;▸\n"
-#~ " <span class=\"guimenuitem\">Claws Mail</span>\n"
-#~ "</span> or click on the <span class=\"application\">Claws Mail</span> icon in\n"
-#~ "the [[application\n"
-#~ "shortcuts|doc/first_steps/introduction_to_gnome_and_the_tails_desktop#claws_mail]].\n"
-#~ msgstr ""
-#~ "برای راه‌اندازی <span class=\"application\">Claws Mail</span> از این مسیر بروید:\n"
-#~ "<span class=\"menuchoice\">\n"
-#~ " <span class=\"guimenu\">ابزارها</span>&nbsp;◀\n"
-#~ " <span class=\"guisubmenu\">اینترنت</span>&nbsp;◀\n"
-#~ " <span class=\"guimenuitem\">Claws Mail</span>\n"
-#~ "</span> یا روی نمایهٔ <span class=\"application\">Claws Mail</span> در [[میان‌برهای\n"
-#~ "ابزارها|doc/first_steps/introduction_to_gnome_and_the_tails_desktop#claws_mail]] کلیک کنید.\n"
-
-#~ msgid "[[!img doc/first_steps/introduction_to_gnome_and_the_tails_desktop/claws-mail.png link=no]]\n"
-#~ msgstr "[[!img doc/first_steps/introduction_to_gnome_and_the_tails_desktop/claws-mail.png link=no]]\n"
-
-#~ msgid ""
-#~ "For detailed documentation, refer to the\n"
-#~ "[official <span class=\"application\">Claws Mail</span> documentation](http://www.claws-mail.org/documentation.php?section=general).\n"
-#~ msgstr ""
-#~ "برای خواندن مستندات مشروح در این مورد رجوع کنید به\n"
-#~ "[مستندات رسمی <span class=\"application\">Claws Mail</span>](http://www.claws-mail.org/documentation.php?section=general).\n"
-
-#~ msgid ""
-#~ "For specific documentation on how to configure a Riseup email account\n"
-#~ "with <span class=\"application\">Claws Mail</span>, read the\n"
-#~ "[Riseup documentation](https://help.riseup.net/en/email/clients/claws).\n"
-#~ msgstr ""
-#~ "برای مستندات دقیق در مورد نحوهٔ پیکربندی یک حساب کاربری رایزآپ با <span class=\"application\">Claws Mail</span> رجوع کنید به\n"
-#~ "[سند رایزآپ](https://help.riseup.net/en/email/clients/claws).\n"
-
-#~ msgid "<div class=\"tip\">\n"
-#~ msgstr "<div class=\"tip\">\n"
-
-#~ msgid ""
-#~ "To store your emails and email configuration, you can activate the\n"
-#~ "[[<strong>Claws Mail</strong> persistence feature|doc/first_steps/persistence/configure#claws_mail]].\n"
-#~ msgstr ""
-#~ "برای ذخیره کردن رایانامه‌ها و تنظیمات رایانامهٔ خود می‌توانید\n"
-#~ "[[ویژگی <strong>Claws Mail</strong> مانا|doc/first_steps/persistence/configure#claws_mail]] را فعال کنید.\n"
-
-#~ msgid "</div>\n"
-#~ msgstr "</div>\n"
-
-#~ msgid ""
-#~ "Please note that Tails will [migrate back to Icedove](https://labs.riseup."
-#~ "net/code/issues/5663) at some point."
-#~ msgstr ""
-#~ "لطفاً در نظر داشته باشید که تیلز در آینده دوباره به [Icedove مهاجرت خواهد "
-#~ "کرد](https://labs.riseup.net/code/issues/5663)."
diff --git a/wiki/src/doc/anonymous_internet/claws_mail.fr.po b/wiki/src/doc/anonymous_internet/claws_mail.fr.po
deleted file mode 100644
index 736a9848..0000000
--- a/wiki/src/doc/anonymous_internet/claws_mail.fr.po
+++ /dev/null
@@ -1,90 +0,0 @@
-# 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.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2015-12-15 16:51+0100\n"
-"PO-Revision-Date: 2016-05-17 06:20-0000\n"
-"Last-Translator: \n"
-"Language-Team: Tails translators <tails@boum.org>\n"
-"Language: fr\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.10\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"Reading and writing emails with Claws Mail\"]]\n"
-msgstr "[[!meta title=\"Lire et écrire des emails avec Claws Mail\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"doc/anonymous_internet/icedove/replacement.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"doc/anonymous_internet/icedove/replacement.inline.fr\" raw=\"yes\" sort=\"age\"]]\n"
-
-#~ msgid ""
-#~ "For reading and writing email, Tails includes <span\n"
-#~ "class=\"application\">[Claws Mail](http://www.claws-mail.org/)</span>.\n"
-#~ msgstr ""
-#~ "Pour lire et écrire des emails, Tails inclus <span\n"
-#~ "class=\"application\">[Claws Mail](http://www.claws-mail.org/)</span>.\n"
-
-#~ msgid ""
-#~ "To start <span class=\"application\">Claws Mail</span> choose\n"
-#~ "<span class=\"menuchoice\">\n"
-#~ " <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
-#~ " <span class=\"guisubmenu\">Internet</span>&nbsp;▸\n"
-#~ " <span class=\"guimenuitem\">Claws Mail</span>\n"
-#~ "</span> or click on the <span class=\"application\">Claws Mail</span> icon in\n"
-#~ "the [[application\n"
-#~ "shortcuts|doc/first_steps/introduction_to_gnome_and_the_tails_desktop#claws_mail]].\n"
-#~ msgstr ""
-#~ "Pour démarrer <span class=\"application\">Claws Mail</span> sélectionnez\n"
-#~ "<span class=\"menuchoice\">\n"
-#~ " <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
-#~ " <span class=\"guisubmenu\">Internet</span>&nbsp;▸\n"
-#~ " <span class=\"guimenuitem\">Claws Mail</span>\n"
-#~ "</span> ou cliquez sur l'icône <span class=\"application\">Claws Mail</span>\n"
-#~ "dans les [[raccourcis d'application|doc/first_steps/introduction_to_gnome_and_the_tails_desktop#claws_mail]].\n"
-
-#~ msgid "[[!img doc/first_steps/introduction_to_gnome_and_the_tails_desktop/claws-mail.png link=no]]\n"
-#~ msgstr "[[!img doc/first_steps/introduction_to_gnome_and_the_tails_desktop/claws-mail.png link=no]]\n"
-
-#~ msgid ""
-#~ "For detailed documentation, refer to the\n"
-#~ "[official <span class=\"application\">Claws Mail</span> documentation](http://www.claws-mail.org/documentation.php?section=general).\n"
-#~ msgstr ""
-#~ "Pour des instructions détaillées, se référer à la\n"
-#~ "[documentation officielle de <span class=\"application\">Claws Mail</span>](http://www.claws-mail.org/documentation.php?section=general).\n"
-
-#~ msgid ""
-#~ "For specific documentation on how to configure a Riseup email account\n"
-#~ "with <span class=\"application\">Claws Mail</span>, read the\n"
-#~ "[Riseup documentation](https://help.riseup.net/en/email/clients/claws).\n"
-#~ msgstr ""
-#~ "Pour apprendre à configurer un compte RiseUp dans <span class=\"application\">Claws Mail</span>, consultez la\n"
-#~ "[documentation Riseup](https://help.riseup.net/fr/email/clients/claws).\n"
-
-#~ msgid "<div class=\"tip\">\n"
-#~ msgstr "<div class=\"tip\">\n"
-
-#~ msgid ""
-#~ "To store your emails and email configuration, you can activate the\n"
-#~ "[[<strong>Claws Mail</strong> persistence feature|doc/first_steps/persistence/configure#claws_mail]].\n"
-#~ msgstr ""
-#~ "Pour sauvegarder vos emails et la configuration de votre client mail, vous pouvez\n"
-#~ "activer l'[[option de persistance de <strong>Claws Mail</strong>|doc/first_steps/persistence/configure#claws_mail]].\n"
-
-#~ msgid "</div>\n"
-#~ msgstr "</div>\n"
-
-#~ msgid ""
-#~ "Please note that Tails will [migrate back to Icedove](https://labs.riseup."
-#~ "net/code/issues/5663) at some point."
-#~ msgstr ""
-#~ "Notez que Tails [repassera à Icedove](https://labs.riseup.net/code/"
-#~ "issues/5663) dans un futur proche."
diff --git a/wiki/src/doc/anonymous_internet/claws_mail.it.po b/wiki/src/doc/anonymous_internet/claws_mail.it.po
deleted file mode 100644
index f4f43b0..0000000
--- a/wiki/src/doc/anonymous_internet/claws_mail.it.po
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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: 2016-01-03 23:50+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: ita <transitails@inventati.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=\"Reading and writing emails with Claws Mail\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"doc/anonymous_internet/icedove/replacement.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr ""
diff --git a/wiki/src/doc/anonymous_internet/claws_mail.mdwn b/wiki/src/doc/anonymous_internet/claws_mail.mdwn
deleted file mode 100644
index dda20c1..0000000
--- a/wiki/src/doc/anonymous_internet/claws_mail.mdwn
+++ /dev/null
@@ -1,3 +0,0 @@
-[[!meta title="Reading and writing emails with Claws Mail"]]
-
-[[!inline pages="doc/anonymous_internet/icedove/replacement.inline" raw="yes" sort="age"]]
diff --git a/wiki/src/doc/anonymous_internet/claws_mail.pt.po b/wiki/src/doc/anonymous_internet/claws_mail.pt.po
deleted file mode 100644
index e82d4b5..0000000
--- a/wiki/src/doc/anonymous_internet/claws_mail.pt.po
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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-12-15 16:51+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=\"Reading and writing emails with Claws Mail\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"doc/anonymous_internet/icedove/replacement.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr ""
diff --git a/wiki/src/doc/anonymous_internet/claws_mail_to_icedove.de.po b/wiki/src/doc/anonymous_internet/claws_mail_to_icedove.de.po
deleted file mode 100644
index aab19b7..0000000
--- a/wiki/src/doc/anonymous_internet/claws_mail_to_icedove.de.po
+++ /dev/null
@@ -1,518 +0,0 @@
-# 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: 2016-07-17 17:44+0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"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=\"Migrating from Claws Mail to Icedove\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<!-- Note for translators: Claws Mail was removed from Tails in December\n"
-"2015, so feel free to skip translating this page after some time. -->\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"doc/anonymous_internet/icedove/replacement.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<span class=\"application\">Claws Mail</span> was removed\n"
-"from Tails in version 2.0 (2016-01-26).\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"doc/anonymous_internet/icedove/name.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"We recommend you do the migration before launching <span class=\"application\">Icedove</span> for the first\n"
-"time. You should, in this order:\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"install\"></a>\n"
-msgstr ""
-
-#. type: Title =
-#, no-wrap
-msgid "Install <span class=\"application\">Claws Mail</span>\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Start Tails and [[set up an administration password|first_steps/"
-"startup_options/administration_password]]."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Choose <span class=\"menuchoice\"><span class=\"guimenu\">Applications</"
-"span>&nbsp;▸ <span class=\"guisubmenu\">Utilities</span>&nbsp;▸ <span class="
-"\"guimenuitem\">Terminal</span></span> to open a terminal."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Execute the following commands to install <span class=\"application\">Claws "
-"Mail</span>:"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " sudo apt update\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " sudo apt install claws-mail\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"mailboxes\"></a>\n"
-msgstr ""
-
-#. type: Title =
-#, no-wrap
-msgid "Copy your emails saved in the persistent storage\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid "Start <span class=\"application\">Claws Mail</span>."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"To know if you are using the IMAP or the POP protocol, choose <span class="
-"\"menuchoice\"> <span class=\"guimenu\">Configuration</span>&nbsp;▸ <span "
-"class=\"guimenuitem\">Edit accounts&hellip;</span></span> and refer to the "
-"<span class=\"guilabel\">Protocol</span> column in the list of accounts."
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid ""
-"If you use IMAP, your emails are stored on the remote email server and you "
-"can skip this section and start [[configuring your email account in <span "
-"class=\"application\">Icedove</span>|claws_mail_to_icedove#settings]]."
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid ""
-"If you use POP and have emails saved in the persistent storage, we propose "
-"in the following steps a script to copy your emails from <span class="
-"\"application\">Claws Mail</span> to <span class=\"application\">Icedove</"
-"span>."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Verify that the <span class=\"application\">Icedove</span> persistence "
-"feature is activated. Otherwise, you might loose data."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"The script only migrates the mailbox in <span class=\"filename\">/home/"
-"amnesia/.claws-mail/Mail</span> which is the default in Tails."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" Verify that there is a single <span class=\"guilabel\">MH</span> mailbox named\n"
-" <span class=\"guilabel\">Mail</span> in the left pane of\n"
-" <span class=\"application\">Claws Mail</span> like in the following\n"
-" screenshot:\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " [[!img single_mh.png alt=\"\" link=\"no\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" If you have several <span class=\"guilabel\">MH</span> mailboxes in\n"
-" <span class=\"application\">Claws Mail</span>, please move all your emails into\n"
-" the one corresponding to <span class=\"filename\">/home/amnesia/.claws-mail/Mail</span>.\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"In the terminal, execute the following command to download the migration "
-"script:"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " wget https://tails.boum.org/misc/claws_to_icedove.sh\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid "Execute the following command to run the migration script:"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " bash claws_to_icedove.sh\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <div class=\"note\">\n"
-" <p>If you had started <span class=\"application\">Icedove</span> already, the script might propose you to\n"
-" back up the existing <span class=\"application\">Icedove</span> email folders before doing the\n"
-" migration. If you have valuable data in these folders, you can access\n"
-" it again after the migration by doing the following:</p>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " <ol>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <li>In <span class=\"application\">Icedove</span>, choose\n"
-" <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">[[!img lib/open-menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Preferences</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Account Settings</span></span>.</li>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <li>Click <span class=\"button\">Browse&hellip;</span> in the\n"
-" <span class=\"guilabel\">Message Storage</span> section of the\n"
-" <span class=\"guilabel\">Local Folders</span> settings.</li>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " <li>Navigate to <span class=\"filename\">/home/amnesia/.icedove/profile.default/Mail.</li>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <li>Open the <span class=\"filename\">Local Folders Backup</span>\n"
-" folder that matches the date and time when you first ran the\n"
-" script.</li>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" </ol>\n"
-" </div>\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Continue with the next section to configure your email account in <span "
-"class=\"application\">Icedove</span>."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"settings\"></a>\n"
-msgstr ""
-
-#. type: Title =
-#, no-wrap
-msgid "Configure your email accounts in <span class=\"application\">Icedove</span>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"1. Choose\n"
-" <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Internet</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Icedove</span>\n"
-" </span>\n"
-" to start <span class=\"application\">Icedove</span>.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"doc/anonymous_internet/icedove/account_creation.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <div class=\"tip\">\n"
-" <p>If you want to compare with the settings in\n"
-" <span class=\"application\">Claws Mail</span>, choose\n"
-" <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Configuration</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Edit Accounts&hellip;</span>\n"
-" </span> in <span class=\"application\">Claws Mail</span>, then select\n"
-" your email account and click <span class=\"guilabel\">Edit</span>.</p>\n"
-" </div>\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"If you want to configure another email account, choose <span class=\"guilabel"
-"\">Account Actions</span>&nbsp;▸ <span class=\"guilabel\">Add Mail "
-"Account&hellip;</span>."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " Otherwise, click <span class=\"guilabel\">OK</span>.\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"If you used the migration script provided in the previous section to [[copy "
-"your emails saved in the persistent storage|"
-"claws_mail_to_icedove#mailboxes]], do the following to configure <span class="
-"\"application\">Icedove</span> to access them:"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" 1. Choose\n"
-" <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">[[!img lib/open-menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Preferences</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Account Settings</span></span>.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" 1. Click <span class=\"button\">Browse&hellip;</span> in the\n"
-" <span class=\"guilabel\">Message Storage</span> section of the\n"
-" <span class=\"guilabel\">Local Folders</span> settings.\n"
-msgstr ""
-
-#. type: Bullet: ' 1. '
-msgid ""
-"Navigate to <span class=\"filename\">/home/amnesia/.icedove/profile.default/"
-"Mail."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" 1. Open the <span class=\"filename\">Local Folders</span>\n"
-" folder.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"For further documentation, refer to the [official\n"
-"<span class=\"application\">Thunderbird</span>\n"
-"help](https://support.mozilla.org/en-US/products/thunderbird).\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"address_book\"></a>\n"
-msgstr ""
-
-#. type: Title =
-#, no-wrap
-msgid "Migrate your address book\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"To export an address book from\n"
-"<span class=\"application\">Claws Mail</span> do the following:\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"1. Choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Tools</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Address Book</span></span>.\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Select an address book, for example <span class=\"guilabel\">Common "
-"addresses</span>, in the left pane."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"1. Choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Tools</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Export LDIF&hellip;</span></span>.\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Specify where to save the address book as an LDIF file, then click <span "
-"class=\"guilabel\">Forward</span>. You can use the default setting."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Enter <span class=\"command\">claws</span> as <span class=\"guilabel"
-"\">Suffix</span>, then click <span class=\"guilabel\">Forward</span> and "
-"<span class=\"guilabel\">Close</span>."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"To import an address book into\n"
-"<span class=\"application\">Icedove</span> do the following:\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"1. Choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Tools</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Import&hellip;</span></span>.\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Select <span class=\"guilabel\">Text file (LDIF, .tab, .csv, .txt)</span> "
-"and click <span class=\"guilabel\">Next</span>."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Specify the LDIF file that you exported from <span class=\"application"
-"\">Claws Mail</span>, by default <span class=\"filename\">/home/amnesia/"
-"claws-mail-out/addressbook.ldif</span>."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"You can repeat these steps for every address book in\n"
-"<span class=\"application\">Claws Mail</span>.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"delete\"></a>\n"
-msgstr ""
-
-#. type: Title =
-#, no-wrap
-msgid "Delete all your <span class=\"application\">Claws Mail</span> data\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"Once you made sure that all your data (emails, email account settings,\n"
-"and address books) is imported into <span class=\"application\">Icedove</span>,\n"
-"you can delete all your <span class=\"application\">Claws Mail</span> data.\n"
-msgstr ""
-
-#. type: Plain text
-msgid "To do so:"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"1. Choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Places</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Home</span>\n"
-" </span> in the top navigation bar to open the file browser.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"1. Choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">[[!img lib/go-down.png class=\"symbolic\" link=\"no\" alt=\"View options\"]]</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Show Hidden Files</span></span>.\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid "Open the <span class=\"guilabel\">.claws-mail</span> folder."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"1. Choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">[[!img lib/open-menu.png class=\"symbolic\" link=\"no\" alt=\"View options\"]]</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Select All</span></span>.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"1. Right-click on one of the selected files, choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenuitem\">Wipe</span></span>,\n"
-" and confirm.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"persistence\"></a>\n"
-msgstr ""
-
-#. type: Title =
-#, no-wrap
-msgid "Deactivate the <span class=\"guilabel\">Claws Mail</span> persistence feature\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"1. Choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Tails</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Configure persistent volume</span></span>.\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Deactivate the <span class=\"guilabel\">Custom</span> persistence feature "
-"that has <span class=\"filename\">/home/amnesia/.claws-mail</span> as "
-"description."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid "Click <span class=\"button\">Save</span>."
-msgstr ""
diff --git a/wiki/src/doc/anonymous_internet/claws_mail_to_icedove.fa.po b/wiki/src/doc/anonymous_internet/claws_mail_to_icedove.fa.po
deleted file mode 100644
index aab19b7..0000000
--- a/wiki/src/doc/anonymous_internet/claws_mail_to_icedove.fa.po
+++ /dev/null
@@ -1,518 +0,0 @@
-# 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: 2016-07-17 17:44+0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"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=\"Migrating from Claws Mail to Icedove\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<!-- Note for translators: Claws Mail was removed from Tails in December\n"
-"2015, so feel free to skip translating this page after some time. -->\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"doc/anonymous_internet/icedove/replacement.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<span class=\"application\">Claws Mail</span> was removed\n"
-"from Tails in version 2.0 (2016-01-26).\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"doc/anonymous_internet/icedove/name.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"We recommend you do the migration before launching <span class=\"application\">Icedove</span> for the first\n"
-"time. You should, in this order:\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"install\"></a>\n"
-msgstr ""
-
-#. type: Title =
-#, no-wrap
-msgid "Install <span class=\"application\">Claws Mail</span>\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Start Tails and [[set up an administration password|first_steps/"
-"startup_options/administration_password]]."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Choose <span class=\"menuchoice\"><span class=\"guimenu\">Applications</"
-"span>&nbsp;▸ <span class=\"guisubmenu\">Utilities</span>&nbsp;▸ <span class="
-"\"guimenuitem\">Terminal</span></span> to open a terminal."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Execute the following commands to install <span class=\"application\">Claws "
-"Mail</span>:"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " sudo apt update\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " sudo apt install claws-mail\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"mailboxes\"></a>\n"
-msgstr ""
-
-#. type: Title =
-#, no-wrap
-msgid "Copy your emails saved in the persistent storage\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid "Start <span class=\"application\">Claws Mail</span>."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"To know if you are using the IMAP or the POP protocol, choose <span class="
-"\"menuchoice\"> <span class=\"guimenu\">Configuration</span>&nbsp;▸ <span "
-"class=\"guimenuitem\">Edit accounts&hellip;</span></span> and refer to the "
-"<span class=\"guilabel\">Protocol</span> column in the list of accounts."
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid ""
-"If you use IMAP, your emails are stored on the remote email server and you "
-"can skip this section and start [[configuring your email account in <span "
-"class=\"application\">Icedove</span>|claws_mail_to_icedove#settings]]."
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid ""
-"If you use POP and have emails saved in the persistent storage, we propose "
-"in the following steps a script to copy your emails from <span class="
-"\"application\">Claws Mail</span> to <span class=\"application\">Icedove</"
-"span>."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Verify that the <span class=\"application\">Icedove</span> persistence "
-"feature is activated. Otherwise, you might loose data."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"The script only migrates the mailbox in <span class=\"filename\">/home/"
-"amnesia/.claws-mail/Mail</span> which is the default in Tails."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" Verify that there is a single <span class=\"guilabel\">MH</span> mailbox named\n"
-" <span class=\"guilabel\">Mail</span> in the left pane of\n"
-" <span class=\"application\">Claws Mail</span> like in the following\n"
-" screenshot:\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " [[!img single_mh.png alt=\"\" link=\"no\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" If you have several <span class=\"guilabel\">MH</span> mailboxes in\n"
-" <span class=\"application\">Claws Mail</span>, please move all your emails into\n"
-" the one corresponding to <span class=\"filename\">/home/amnesia/.claws-mail/Mail</span>.\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"In the terminal, execute the following command to download the migration "
-"script:"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " wget https://tails.boum.org/misc/claws_to_icedove.sh\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid "Execute the following command to run the migration script:"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " bash claws_to_icedove.sh\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <div class=\"note\">\n"
-" <p>If you had started <span class=\"application\">Icedove</span> already, the script might propose you to\n"
-" back up the existing <span class=\"application\">Icedove</span> email folders before doing the\n"
-" migration. If you have valuable data in these folders, you can access\n"
-" it again after the migration by doing the following:</p>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " <ol>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <li>In <span class=\"application\">Icedove</span>, choose\n"
-" <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">[[!img lib/open-menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Preferences</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Account Settings</span></span>.</li>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <li>Click <span class=\"button\">Browse&hellip;</span> in the\n"
-" <span class=\"guilabel\">Message Storage</span> section of the\n"
-" <span class=\"guilabel\">Local Folders</span> settings.</li>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " <li>Navigate to <span class=\"filename\">/home/amnesia/.icedove/profile.default/Mail.</li>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <li>Open the <span class=\"filename\">Local Folders Backup</span>\n"
-" folder that matches the date and time when you first ran the\n"
-" script.</li>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" </ol>\n"
-" </div>\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Continue with the next section to configure your email account in <span "
-"class=\"application\">Icedove</span>."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"settings\"></a>\n"
-msgstr ""
-
-#. type: Title =
-#, no-wrap
-msgid "Configure your email accounts in <span class=\"application\">Icedove</span>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"1. Choose\n"
-" <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Internet</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Icedove</span>\n"
-" </span>\n"
-" to start <span class=\"application\">Icedove</span>.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"doc/anonymous_internet/icedove/account_creation.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <div class=\"tip\">\n"
-" <p>If you want to compare with the settings in\n"
-" <span class=\"application\">Claws Mail</span>, choose\n"
-" <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Configuration</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Edit Accounts&hellip;</span>\n"
-" </span> in <span class=\"application\">Claws Mail</span>, then select\n"
-" your email account and click <span class=\"guilabel\">Edit</span>.</p>\n"
-" </div>\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"If you want to configure another email account, choose <span class=\"guilabel"
-"\">Account Actions</span>&nbsp;▸ <span class=\"guilabel\">Add Mail "
-"Account&hellip;</span>."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " Otherwise, click <span class=\"guilabel\">OK</span>.\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"If you used the migration script provided in the previous section to [[copy "
-"your emails saved in the persistent storage|"
-"claws_mail_to_icedove#mailboxes]], do the following to configure <span class="
-"\"application\">Icedove</span> to access them:"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" 1. Choose\n"
-" <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">[[!img lib/open-menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Preferences</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Account Settings</span></span>.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" 1. Click <span class=\"button\">Browse&hellip;</span> in the\n"
-" <span class=\"guilabel\">Message Storage</span> section of the\n"
-" <span class=\"guilabel\">Local Folders</span> settings.\n"
-msgstr ""
-
-#. type: Bullet: ' 1. '
-msgid ""
-"Navigate to <span class=\"filename\">/home/amnesia/.icedove/profile.default/"
-"Mail."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" 1. Open the <span class=\"filename\">Local Folders</span>\n"
-" folder.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"For further documentation, refer to the [official\n"
-"<span class=\"application\">Thunderbird</span>\n"
-"help](https://support.mozilla.org/en-US/products/thunderbird).\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"address_book\"></a>\n"
-msgstr ""
-
-#. type: Title =
-#, no-wrap
-msgid "Migrate your address book\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"To export an address book from\n"
-"<span class=\"application\">Claws Mail</span> do the following:\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"1. Choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Tools</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Address Book</span></span>.\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Select an address book, for example <span class=\"guilabel\">Common "
-"addresses</span>, in the left pane."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"1. Choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Tools</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Export LDIF&hellip;</span></span>.\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Specify where to save the address book as an LDIF file, then click <span "
-"class=\"guilabel\">Forward</span>. You can use the default setting."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Enter <span class=\"command\">claws</span> as <span class=\"guilabel"
-"\">Suffix</span>, then click <span class=\"guilabel\">Forward</span> and "
-"<span class=\"guilabel\">Close</span>."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"To import an address book into\n"
-"<span class=\"application\">Icedove</span> do the following:\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"1. Choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Tools</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Import&hellip;</span></span>.\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Select <span class=\"guilabel\">Text file (LDIF, .tab, .csv, .txt)</span> "
-"and click <span class=\"guilabel\">Next</span>."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Specify the LDIF file that you exported from <span class=\"application"
-"\">Claws Mail</span>, by default <span class=\"filename\">/home/amnesia/"
-"claws-mail-out/addressbook.ldif</span>."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"You can repeat these steps for every address book in\n"
-"<span class=\"application\">Claws Mail</span>.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"delete\"></a>\n"
-msgstr ""
-
-#. type: Title =
-#, no-wrap
-msgid "Delete all your <span class=\"application\">Claws Mail</span> data\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"Once you made sure that all your data (emails, email account settings,\n"
-"and address books) is imported into <span class=\"application\">Icedove</span>,\n"
-"you can delete all your <span class=\"application\">Claws Mail</span> data.\n"
-msgstr ""
-
-#. type: Plain text
-msgid "To do so:"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"1. Choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Places</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Home</span>\n"
-" </span> in the top navigation bar to open the file browser.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"1. Choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">[[!img lib/go-down.png class=\"symbolic\" link=\"no\" alt=\"View options\"]]</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Show Hidden Files</span></span>.\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid "Open the <span class=\"guilabel\">.claws-mail</span> folder."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"1. Choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">[[!img lib/open-menu.png class=\"symbolic\" link=\"no\" alt=\"View options\"]]</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Select All</span></span>.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"1. Right-click on one of the selected files, choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenuitem\">Wipe</span></span>,\n"
-" and confirm.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"persistence\"></a>\n"
-msgstr ""
-
-#. type: Title =
-#, no-wrap
-msgid "Deactivate the <span class=\"guilabel\">Claws Mail</span> persistence feature\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"1. Choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Tails</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Configure persistent volume</span></span>.\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Deactivate the <span class=\"guilabel\">Custom</span> persistence feature "
-"that has <span class=\"filename\">/home/amnesia/.claws-mail</span> as "
-"description."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid "Click <span class=\"button\">Save</span>."
-msgstr ""
diff --git a/wiki/src/doc/anonymous_internet/claws_mail_to_icedove.fr.po b/wiki/src/doc/anonymous_internet/claws_mail_to_icedove.fr.po
deleted file mode 100644
index 543ac6a..0000000
--- a/wiki/src/doc/anonymous_internet/claws_mail_to_icedove.fr.po
+++ /dev/null
@@ -1,519 +0,0 @@
-# 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.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-07-17 17:44+0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"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=\"Migrating from Claws Mail to Icedove\"]]\n"
-msgstr "[[!meta title=\"Migrer de Claws Mail à Icedove\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<!-- Note for translators: Claws Mail was removed from Tails in December\n"
-"2015, so feel free to skip translating this page after some time. -->\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"doc/anonymous_internet/icedove/replacement.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"doc/anonymous_internet/icedove/replacement.inline.fr\" raw=\"yes\" sort=\"age\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<span class=\"application\">Claws Mail</span> was removed\n"
-"from Tails in version 2.0 (2016-01-26).\n"
-msgstr ""
-"<span class=\"application\">Claws Mail</span> a été retiré\n"
-"de Tails dans la version 2.0 (2016-01-26).\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"doc/anonymous_internet/icedove/name.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"doc/anonymous_internet/icedove/name.inline.fr\" raw=\"yes\" sort=\"age\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"We recommend you do the migration before launching <span class=\"application\">Icedove</span> for the first\n"
-"time. You should, in this order:\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"install\"></a>\n"
-msgstr ""
-
-#. type: Title =
-#, no-wrap
-msgid "Install <span class=\"application\">Claws Mail</span>\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Start Tails and [[set up an administration password|first_steps/"
-"startup_options/administration_password]]."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Choose <span class=\"menuchoice\"><span class=\"guimenu\">Applications</"
-"span>&nbsp;▸ <span class=\"guisubmenu\">Utilities</span>&nbsp;▸ <span class="
-"\"guimenuitem\">Terminal</span></span> to open a terminal."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Execute the following commands to install <span class=\"application\">Claws "
-"Mail</span>:"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " sudo apt update\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " sudo apt install claws-mail\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"mailboxes\"></a>\n"
-msgstr ""
-
-#. type: Title =
-#, no-wrap
-msgid "Copy your emails saved in the persistent storage\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid "Start <span class=\"application\">Claws Mail</span>."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"To know if you are using the IMAP or the POP protocol, choose <span class="
-"\"menuchoice\"> <span class=\"guimenu\">Configuration</span>&nbsp;▸ <span "
-"class=\"guimenuitem\">Edit accounts&hellip;</span></span> and refer to the "
-"<span class=\"guilabel\">Protocol</span> column in the list of accounts."
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid ""
-"If you use IMAP, your emails are stored on the remote email server and you "
-"can skip this section and start [[configuring your email account in <span "
-"class=\"application\">Icedove</span>|claws_mail_to_icedove#settings]]."
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid ""
-"If you use POP and have emails saved in the persistent storage, we propose "
-"in the following steps a script to copy your emails from <span class="
-"\"application\">Claws Mail</span> to <span class=\"application\">Icedove</"
-"span>."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Verify that the <span class=\"application\">Icedove</span> persistence "
-"feature is activated. Otherwise, you might loose data."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"The script only migrates the mailbox in <span class=\"filename\">/home/"
-"amnesia/.claws-mail/Mail</span> which is the default in Tails."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" Verify that there is a single <span class=\"guilabel\">MH</span> mailbox named\n"
-" <span class=\"guilabel\">Mail</span> in the left pane of\n"
-" <span class=\"application\">Claws Mail</span> like in the following\n"
-" screenshot:\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " [[!img single_mh.png alt=\"\" link=\"no\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" If you have several <span class=\"guilabel\">MH</span> mailboxes in\n"
-" <span class=\"application\">Claws Mail</span>, please move all your emails into\n"
-" the one corresponding to <span class=\"filename\">/home/amnesia/.claws-mail/Mail</span>.\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"In the terminal, execute the following command to download the migration "
-"script:"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " wget https://tails.boum.org/misc/claws_to_icedove.sh\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid "Execute the following command to run the migration script:"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " bash claws_to_icedove.sh\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <div class=\"note\">\n"
-" <p>If you had started <span class=\"application\">Icedove</span> already, the script might propose you to\n"
-" back up the existing <span class=\"application\">Icedove</span> email folders before doing the\n"
-" migration. If you have valuable data in these folders, you can access\n"
-" it again after the migration by doing the following:</p>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " <ol>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <li>In <span class=\"application\">Icedove</span>, choose\n"
-" <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">[[!img lib/open-menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Preferences</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Account Settings</span></span>.</li>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <li>Click <span class=\"button\">Browse&hellip;</span> in the\n"
-" <span class=\"guilabel\">Message Storage</span> section of the\n"
-" <span class=\"guilabel\">Local Folders</span> settings.</li>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " <li>Navigate to <span class=\"filename\">/home/amnesia/.icedove/profile.default/Mail.</li>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <li>Open the <span class=\"filename\">Local Folders Backup</span>\n"
-" folder that matches the date and time when you first ran the\n"
-" script.</li>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" </ol>\n"
-" </div>\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Continue with the next section to configure your email account in <span "
-"class=\"application\">Icedove</span>."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"settings\"></a>\n"
-msgstr ""
-
-#. type: Title =
-#, no-wrap
-msgid "Configure your email accounts in <span class=\"application\">Icedove</span>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"1. Choose\n"
-" <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Internet</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Icedove</span>\n"
-" </span>\n"
-" to start <span class=\"application\">Icedove</span>.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"doc/anonymous_internet/icedove/account_creation.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"doc/anonymous_internet/icedove/account_creation.inline.fr\" raw=\"yes\" sort=\"age\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <div class=\"tip\">\n"
-" <p>If you want to compare with the settings in\n"
-" <span class=\"application\">Claws Mail</span>, choose\n"
-" <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Configuration</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Edit Accounts&hellip;</span>\n"
-" </span> in <span class=\"application\">Claws Mail</span>, then select\n"
-" your email account and click <span class=\"guilabel\">Edit</span>.</p>\n"
-" </div>\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"If you want to configure another email account, choose <span class=\"guilabel"
-"\">Account Actions</span>&nbsp;▸ <span class=\"guilabel\">Add Mail "
-"Account&hellip;</span>."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " Otherwise, click <span class=\"guilabel\">OK</span>.\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"If you used the migration script provided in the previous section to [[copy "
-"your emails saved in the persistent storage|"
-"claws_mail_to_icedove#mailboxes]], do the following to configure <span class="
-"\"application\">Icedove</span> to access them:"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" 1. Choose\n"
-" <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">[[!img lib/open-menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Preferences</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Account Settings</span></span>.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" 1. Click <span class=\"button\">Browse&hellip;</span> in the\n"
-" <span class=\"guilabel\">Message Storage</span> section of the\n"
-" <span class=\"guilabel\">Local Folders</span> settings.\n"
-msgstr ""
-
-#. type: Bullet: ' 1. '
-msgid ""
-"Navigate to <span class=\"filename\">/home/amnesia/.icedove/profile.default/"
-"Mail."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" 1. Open the <span class=\"filename\">Local Folders</span>\n"
-" folder.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"For further documentation, refer to the [official\n"
-"<span class=\"application\">Thunderbird</span>\n"
-"help](https://support.mozilla.org/en-US/products/thunderbird).\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"address_book\"></a>\n"
-msgstr ""
-
-#. type: Title =
-#, no-wrap
-msgid "Migrate your address book\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"To export an address book from\n"
-"<span class=\"application\">Claws Mail</span> do the following:\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"1. Choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Tools</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Address Book</span></span>.\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Select an address book, for example <span class=\"guilabel\">Common "
-"addresses</span>, in the left pane."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"1. Choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Tools</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Export LDIF&hellip;</span></span>.\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Specify where to save the address book as an LDIF file, then click <span "
-"class=\"guilabel\">Forward</span>. You can use the default setting."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Enter <span class=\"command\">claws</span> as <span class=\"guilabel"
-"\">Suffix</span>, then click <span class=\"guilabel\">Forward</span> and "
-"<span class=\"guilabel\">Close</span>."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"To import an address book into\n"
-"<span class=\"application\">Icedove</span> do the following:\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"1. Choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Tools</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Import&hellip;</span></span>.\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Select <span class=\"guilabel\">Text file (LDIF, .tab, .csv, .txt)</span> "
-"and click <span class=\"guilabel\">Next</span>."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Specify the LDIF file that you exported from <span class=\"application"
-"\">Claws Mail</span>, by default <span class=\"filename\">/home/amnesia/"
-"claws-mail-out/addressbook.ldif</span>."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"You can repeat these steps for every address book in\n"
-"<span class=\"application\">Claws Mail</span>.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"delete\"></a>\n"
-msgstr ""
-
-#. type: Title =
-#, no-wrap
-msgid "Delete all your <span class=\"application\">Claws Mail</span> data\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"Once you made sure that all your data (emails, email account settings,\n"
-"and address books) is imported into <span class=\"application\">Icedove</span>,\n"
-"you can delete all your <span class=\"application\">Claws Mail</span> data.\n"
-msgstr ""
-
-#. type: Plain text
-msgid "To do so:"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"1. Choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Places</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Home</span>\n"
-" </span> in the top navigation bar to open the file browser.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"1. Choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">[[!img lib/go-down.png class=\"symbolic\" link=\"no\" alt=\"View options\"]]</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Show Hidden Files</span></span>.\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid "Open the <span class=\"guilabel\">.claws-mail</span> folder."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"1. Choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">[[!img lib/open-menu.png class=\"symbolic\" link=\"no\" alt=\"View options\"]]</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Select All</span></span>.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"1. Right-click on one of the selected files, choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenuitem\">Wipe</span></span>,\n"
-" and confirm.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"persistence\"></a>\n"
-msgstr ""
-
-#. type: Title =
-#, no-wrap
-msgid "Deactivate the <span class=\"guilabel\">Claws Mail</span> persistence feature\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"1. Choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Tails</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Configure persistent volume</span></span>.\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Deactivate the <span class=\"guilabel\">Custom</span> persistence feature "
-"that has <span class=\"filename\">/home/amnesia/.claws-mail</span> as "
-"description."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid "Click <span class=\"button\">Save</span>."
-msgstr ""
diff --git a/wiki/src/doc/anonymous_internet/claws_mail_to_icedove.it.po b/wiki/src/doc/anonymous_internet/claws_mail_to_icedove.it.po
deleted file mode 100644
index f8c529c..0000000
--- a/wiki/src/doc/anonymous_internet/claws_mail_to_icedove.it.po
+++ /dev/null
@@ -1,518 +0,0 @@
-# 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: 2016-07-17 17:44+0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: ita <transitails@inventati.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=\"Migrating from Claws Mail to Icedove\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<!-- Note for translators: Claws Mail was removed from Tails in December\n"
-"2015, so feel free to skip translating this page after some time. -->\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"doc/anonymous_internet/icedove/replacement.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<span class=\"application\">Claws Mail</span> was removed\n"
-"from Tails in version 2.0 (2016-01-26).\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"doc/anonymous_internet/icedove/name.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"We recommend you do the migration before launching <span class=\"application\">Icedove</span> for the first\n"
-"time. You should, in this order:\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"install\"></a>\n"
-msgstr ""
-
-#. type: Title =
-#, no-wrap
-msgid "Install <span class=\"application\">Claws Mail</span>\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Start Tails and [[set up an administration password|first_steps/"
-"startup_options/administration_password]]."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Choose <span class=\"menuchoice\"><span class=\"guimenu\">Applications</"
-"span>&nbsp;▸ <span class=\"guisubmenu\">Utilities</span>&nbsp;▸ <span class="
-"\"guimenuitem\">Terminal</span></span> to open a terminal."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Execute the following commands to install <span class=\"application\">Claws "
-"Mail</span>:"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " sudo apt update\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " sudo apt install claws-mail\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"mailboxes\"></a>\n"
-msgstr ""
-
-#. type: Title =
-#, no-wrap
-msgid "Copy your emails saved in the persistent storage\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid "Start <span class=\"application\">Claws Mail</span>."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"To know if you are using the IMAP or the POP protocol, choose <span class="
-"\"menuchoice\"> <span class=\"guimenu\">Configuration</span>&nbsp;▸ <span "
-"class=\"guimenuitem\">Edit accounts&hellip;</span></span> and refer to the "
-"<span class=\"guilabel\">Protocol</span> column in the list of accounts."
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid ""
-"If you use IMAP, your emails are stored on the remote email server and you "
-"can skip this section and start [[configuring your email account in <span "
-"class=\"application\">Icedove</span>|claws_mail_to_icedove#settings]]."
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid ""
-"If you use POP and have emails saved in the persistent storage, we propose "
-"in the following steps a script to copy your emails from <span class="
-"\"application\">Claws Mail</span> to <span class=\"application\">Icedove</"
-"span>."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Verify that the <span class=\"application\">Icedove</span> persistence "
-"feature is activated. Otherwise, you might loose data."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"The script only migrates the mailbox in <span class=\"filename\">/home/"
-"amnesia/.claws-mail/Mail</span> which is the default in Tails."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" Verify that there is a single <span class=\"guilabel\">MH</span> mailbox named\n"
-" <span class=\"guilabel\">Mail</span> in the left pane of\n"
-" <span class=\"application\">Claws Mail</span> like in the following\n"
-" screenshot:\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " [[!img single_mh.png alt=\"\" link=\"no\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" If you have several <span class=\"guilabel\">MH</span> mailboxes in\n"
-" <span class=\"application\">Claws Mail</span>, please move all your emails into\n"
-" the one corresponding to <span class=\"filename\">/home/amnesia/.claws-mail/Mail</span>.\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"In the terminal, execute the following command to download the migration "
-"script:"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " wget https://tails.boum.org/misc/claws_to_icedove.sh\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid "Execute the following command to run the migration script:"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " bash claws_to_icedove.sh\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <div class=\"note\">\n"
-" <p>If you had started <span class=\"application\">Icedove</span> already, the script might propose you to\n"
-" back up the existing <span class=\"application\">Icedove</span> email folders before doing the\n"
-" migration. If you have valuable data in these folders, you can access\n"
-" it again after the migration by doing the following:</p>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " <ol>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <li>In <span class=\"application\">Icedove</span>, choose\n"
-" <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">[[!img lib/open-menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Preferences</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Account Settings</span></span>.</li>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <li>Click <span class=\"button\">Browse&hellip;</span> in the\n"
-" <span class=\"guilabel\">Message Storage</span> section of the\n"
-" <span class=\"guilabel\">Local Folders</span> settings.</li>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " <li>Navigate to <span class=\"filename\">/home/amnesia/.icedove/profile.default/Mail.</li>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <li>Open the <span class=\"filename\">Local Folders Backup</span>\n"
-" folder that matches the date and time when you first ran the\n"
-" script.</li>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" </ol>\n"
-" </div>\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Continue with the next section to configure your email account in <span "
-"class=\"application\">Icedove</span>."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"settings\"></a>\n"
-msgstr ""
-
-#. type: Title =
-#, no-wrap
-msgid "Configure your email accounts in <span class=\"application\">Icedove</span>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"1. Choose\n"
-" <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Internet</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Icedove</span>\n"
-" </span>\n"
-" to start <span class=\"application\">Icedove</span>.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"doc/anonymous_internet/icedove/account_creation.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <div class=\"tip\">\n"
-" <p>If you want to compare with the settings in\n"
-" <span class=\"application\">Claws Mail</span>, choose\n"
-" <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Configuration</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Edit Accounts&hellip;</span>\n"
-" </span> in <span class=\"application\">Claws Mail</span>, then select\n"
-" your email account and click <span class=\"guilabel\">Edit</span>.</p>\n"
-" </div>\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"If you want to configure another email account, choose <span class=\"guilabel"
-"\">Account Actions</span>&nbsp;▸ <span class=\"guilabel\">Add Mail "
-"Account&hellip;</span>."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " Otherwise, click <span class=\"guilabel\">OK</span>.\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"If you used the migration script provided in the previous section to [[copy "
-"your emails saved in the persistent storage|"
-"claws_mail_to_icedove#mailboxes]], do the following to configure <span class="
-"\"application\">Icedove</span> to access them:"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" 1. Choose\n"
-" <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">[[!img lib/open-menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Preferences</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Account Settings</span></span>.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" 1. Click <span class=\"button\">Browse&hellip;</span> in the\n"
-" <span class=\"guilabel\">Message Storage</span> section of the\n"
-" <span class=\"guilabel\">Local Folders</span> settings.\n"
-msgstr ""
-
-#. type: Bullet: ' 1. '
-msgid ""
-"Navigate to <span class=\"filename\">/home/amnesia/.icedove/profile.default/"
-"Mail."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" 1. Open the <span class=\"filename\">Local Folders</span>\n"
-" folder.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"For further documentation, refer to the [official\n"
-"<span class=\"application\">Thunderbird</span>\n"
-"help](https://support.mozilla.org/en-US/products/thunderbird).\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"address_book\"></a>\n"
-msgstr ""
-
-#. type: Title =
-#, no-wrap
-msgid "Migrate your address book\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"To export an address book from\n"
-"<span class=\"application\">Claws Mail</span> do the following:\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"1. Choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Tools</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Address Book</span></span>.\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Select an address book, for example <span class=\"guilabel\">Common "
-"addresses</span>, in the left pane."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"1. Choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Tools</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Export LDIF&hellip;</span></span>.\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Specify where to save the address book as an LDIF file, then click <span "
-"class=\"guilabel\">Forward</span>. You can use the default setting."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Enter <span class=\"command\">claws</span> as <span class=\"guilabel"
-"\">Suffix</span>, then click <span class=\"guilabel\">Forward</span> and "
-"<span class=\"guilabel\">Close</span>."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"To import an address book into\n"
-"<span class=\"application\">Icedove</span> do the following:\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"1. Choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Tools</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Import&hellip;</span></span>.\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Select <span class=\"guilabel\">Text file (LDIF, .tab, .csv, .txt)</span> "
-"and click <span class=\"guilabel\">Next</span>."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Specify the LDIF file that you exported from <span class=\"application"
-"\">Claws Mail</span>, by default <span class=\"filename\">/home/amnesia/"
-"claws-mail-out/addressbook.ldif</span>."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"You can repeat these steps for every address book in\n"
-"<span class=\"application\">Claws Mail</span>.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"delete\"></a>\n"
-msgstr ""
-
-#. type: Title =
-#, no-wrap
-msgid "Delete all your <span class=\"application\">Claws Mail</span> data\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"Once you made sure that all your data (emails, email account settings,\n"
-"and address books) is imported into <span class=\"application\">Icedove</span>,\n"
-"you can delete all your <span class=\"application\">Claws Mail</span> data.\n"
-msgstr ""
-
-#. type: Plain text
-msgid "To do so:"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"1. Choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Places</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Home</span>\n"
-" </span> in the top navigation bar to open the file browser.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"1. Choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">[[!img lib/go-down.png class=\"symbolic\" link=\"no\" alt=\"View options\"]]</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Show Hidden Files</span></span>.\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid "Open the <span class=\"guilabel\">.claws-mail</span> folder."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"1. Choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">[[!img lib/open-menu.png class=\"symbolic\" link=\"no\" alt=\"View options\"]]</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Select All</span></span>.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"1. Right-click on one of the selected files, choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenuitem\">Wipe</span></span>,\n"
-" and confirm.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"persistence\"></a>\n"
-msgstr ""
-
-#. type: Title =
-#, no-wrap
-msgid "Deactivate the <span class=\"guilabel\">Claws Mail</span> persistence feature\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"1. Choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Tails</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Configure persistent volume</span></span>.\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Deactivate the <span class=\"guilabel\">Custom</span> persistence feature "
-"that has <span class=\"filename\">/home/amnesia/.claws-mail</span> as "
-"description."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid "Click <span class=\"button\">Save</span>."
-msgstr ""
diff --git a/wiki/src/doc/anonymous_internet/claws_mail_to_icedove.mdwn b/wiki/src/doc/anonymous_internet/claws_mail_to_icedove.mdwn
deleted file mode 100644
index edb0112..0000000
--- a/wiki/src/doc/anonymous_internet/claws_mail_to_icedove.mdwn
+++ /dev/null
@@ -1,258 +0,0 @@
-[[!meta title="Migrating from Claws Mail to Icedove"]]
-
-<!-- Note for translators: Claws Mail was removed from Tails in December
-2015, so feel free to skip translating this page after some time. -->
-
-[[!inline pages="doc/anonymous_internet/icedove/replacement.inline" raw="yes" sort="age"]]
-
-<span class="application">Claws Mail</span> was removed
-from Tails in version 2.0 (2016-01-26).
-
-[[!inline pages="doc/anonymous_internet/icedove/name.inline" raw="yes" sort="age"]]
-
-We recommend you do the migration before launching <span class="application">Icedove</span> for the first
-time. You should, in this order:
-
-[[!toc]]
-
-<a id="install"></a>
-
-Install <span class="application">Claws Mail</span>
-===================================================
-
-1. Start Tails and [[set up an administration password|first_steps/startup_options/administration_password]].
-
-1. Choose <span class="menuchoice"><span class="guimenu">Applications</span>&nbsp;▸
- <span class="guisubmenu">Utilities</span>&nbsp;▸
- <span class="guimenuitem">Terminal</span></span> to open a terminal.
-
-1. Execute the following commands to install <span class="application">Claws Mail</span>:
-
- sudo apt update
-
- sudo apt install claws-mail
-
-<a id="mailboxes"></a>
-
-Copy your emails saved in the persistent storage
-================================================
-
-1. Start <span class="application">Claws Mail</span>.
-
-1. To know if you are using the IMAP or the POP protocol, choose <span class="menuchoice">
- <span class="guimenu">Configuration</span>&nbsp;▸
- <span class="guimenuitem">Edit accounts&hellip;</span></span>
- and refer to the <span class="guilabel">Protocol</span> column in the
- list of accounts.
-
- - If you use IMAP, your emails are stored on the remote email server and
- you can skip this section and start [[configuring your email account
- in <span class="application">Icedove</span>|claws_mail_to_icedove#settings]].
-
- - If you use POP and have emails saved in the persistent storage, we
- propose in the following steps a script to copy your emails from
- <span class="application">Claws Mail</span> to
- <span class="application">Icedove</span>.
-
-1. Verify that the
- <span class="application">Icedove</span> persistence feature is
- activated. Otherwise, you might loose data.
-
-1. The script only migrates the mailbox in
- <span class="filename">/home/amnesia/.claws-mail/Mail</span> which is the default
- in Tails.
-
- Verify that there is a single <span class="guilabel">MH</span> mailbox named
- <span class="guilabel">Mail</span> in the left pane of
- <span class="application">Claws Mail</span> like in the following
- screenshot:
-
- [[!img single_mh.png alt="" link="no"]]
-
- If you have several <span class="guilabel">MH</span> mailboxes in
- <span class="application">Claws Mail</span>, please move all your emails into
- the one corresponding to <span class="filename">/home/amnesia/.claws-mail/Mail</span>.
-
-1. In the terminal, execute the following command to download the migration script:
-
- wget https://tails.boum.org/misc/claws_to_icedove.sh
-
-1. Execute the following command to run the migration script:
-
- bash claws_to_icedove.sh
-
- <div class="note">
- <p>If you had started <span class="application">Icedove</span> already, the script might propose you to
- back up the existing <span class="application">Icedove</span> email folders before doing the
- migration. If you have valuable data in these folders, you can access
- it again after the migration by doing the following:</p>
-
- <ol>
-
- <li>In <span class="application">Icedove</span>, choose
- <span class="menuchoice">
- <span class="guimenu">[[!img lib/open-menu.png alt="Menu" class=symbolic link=no]]</span>&nbsp;▸
- <span class="guisubmenu">Preferences</span>&nbsp;▸
- <span class="guimenuitem">Account Settings</span></span>.</li>
-
- <li>Click <span class="button">Browse&hellip;</span> in the
- <span class="guilabel">Message Storage</span> section of the
- <span class="guilabel">Local Folders</span> settings.</li>
-
- <li>Navigate to <span class="filename">/home/amnesia/.icedove/profile.default/Mail.</li>
-
- <li>Open the <span class="filename">Local Folders Backup</span>
- folder that matches the date and time when you first ran the
- script.</li>
-
- </ol>
- </div>
-
-1. Continue with the next section to configure your email account in
- <span class="application">Icedove</span>.
-
-<a id="settings"></a>
-
-Configure your email accounts in <span class="application">Icedove</span>
-=========================================================================
-
-1. Choose
- <span class="menuchoice">
- <span class="guimenu">Applications</span>&nbsp;▸
- <span class="guisubmenu">Internet</span>&nbsp;▸
- <span class="guimenuitem">Icedove</span>
- </span>
- to start <span class="application">Icedove</span>.
-
-[[!inline pages="doc/anonymous_internet/icedove/account_creation.inline" raw="yes" sort="age"]]
-
- <div class="tip">
- <p>If you want to compare with the settings in
- <span class="application">Claws Mail</span>, choose
- <span class="menuchoice">
- <span class="guimenu">Configuration</span>&nbsp;▸
- <span class="guimenuitem">Edit Accounts&hellip;</span>
- </span> in <span class="application">Claws Mail</span>, then select
- your email account and click <span class="guilabel">Edit</span>.</p>
- </div>
-
-1. If you want to configure another email account, choose
- <span class="guilabel">Account Actions</span>&nbsp;▸
- <span class="guilabel">Add Mail Account&hellip;</span>.
-
- Otherwise, click <span class="guilabel">OK</span>.
-
-1. If you used the migration script provided in the previous section to
- [[copy your emails saved in the persistent storage|claws_mail_to_icedove#mailboxes]],
- do the following to configure <span class="application">Icedove</span>
- to access them:
-
- 1. Choose
- <span class="menuchoice">
- <span class="guimenu">[[!img lib/open-menu.png alt="Menu" class=symbolic link=no]]</span>&nbsp;▸
- <span class="guisubmenu">Preferences</span>&nbsp;▸
- <span class="guimenuitem">Account Settings</span></span>.
-
- 1. Click <span class="button">Browse&hellip;</span> in the
- <span class="guilabel">Message Storage</span> section of the
- <span class="guilabel">Local Folders</span> settings.
-
- 1. Navigate to <span class="filename">/home/amnesia/.icedove/profile.default/Mail.
-
- 1. Open the <span class="filename">Local Folders</span>
- folder.
-
-For further documentation, refer to the [official
-<span class="application">Thunderbird</span>
-help](https://support.mozilla.org/en-US/products/thunderbird).
-
-<a id="address_book"></a>
-
-Migrate your address book
-=========================
-
-To export an address book from
-<span class="application">Claws Mail</span> do the following:
-
-1. Choose <span class="menuchoice">
- <span class="guimenu">Tools</span>&nbsp;▸
- <span class="guimenuitem">Address Book</span></span>.
-
-1. Select an address book, for example <span class="guilabel">Common
- addresses</span>, in the left pane.
-
-1. Choose <span class="menuchoice">
- <span class="guimenu">Tools</span>&nbsp;▸
- <span class="guimenuitem">Export LDIF&hellip;</span></span>.
-
-1. Specify where to save the address book as an LDIF file, then click
- <span class="guilabel">Forward</span>. You can use the default
- setting.
-
-1. Enter <span class="command">claws</span> as
- <span class="guilabel">Suffix</span>, then click
- <span class="guilabel">Forward</span> and
- <span class="guilabel">Close</span>.
-
-To import an address book into
-<span class="application">Icedove</span> do the following:
-
-1. Choose <span class="menuchoice">
- <span class="guimenu">Tools</span>&nbsp;▸
- <span class="guimenuitem">Import&hellip;</span></span>.
-
-1. Select <span class="guilabel">Text file (LDIF, .tab, .csv, .txt)</span>
- and click <span class="guilabel">Next</span>.
-
-1. Specify the LDIF file that you exported from
- <span class="application">Claws Mail</span>, by default
- <span class="filename">/home/amnesia/claws-mail-out/addressbook.ldif</span>.
-
-You can repeat these steps for every address book in
-<span class="application">Claws Mail</span>.
-
-<a id="delete"></a>
-
-Delete all your <span class="application">Claws Mail</span> data
-================================================================
-
-Once you made sure that all your data (emails, email account settings,
-and address books) is imported into <span class="application">Icedove</span>,
-you can delete all your <span class="application">Claws Mail</span> data.
-
-To do so:
-
-1. Choose <span class="menuchoice">
- <span class="guimenu">Places</span>&nbsp;▸
- <span class="guimenuitem">Home</span>
- </span> in the top navigation bar to open the file browser.
-
-1. Choose <span class="menuchoice">
- <span class="guimenu">[[!img lib/go-down.png class="symbolic" link="no" alt="View options"]]</span>&nbsp;▸
- <span class="guimenuitem">Show Hidden Files</span></span>.
-
-1. Open the <span class="guilabel">.claws-mail</span> folder.
-
-1. Choose <span class="menuchoice">
- <span class="guimenu">[[!img lib/open-menu.png class="symbolic" link="no" alt="View options"]]</span>&nbsp;▸
- <span class="guimenuitem">Select All</span></span>.
-
-1. Right-click on one of the selected files, choose <span class="menuchoice">
- <span class="guimenuitem">Wipe</span></span>,
- and confirm.
-
-<a id="persistence"></a>
-
-Deactivate the <span class="guilabel">Claws Mail</span> persistence feature
-===========================================================================
-
-1. Choose <span class="menuchoice">
- <span class="guimenu">Applications</span>&nbsp;▸
- <span class="guisubmenu">Tails</span>&nbsp;▸
- <span class="guimenuitem">Configure persistent volume</span></span>.
-
-1. Deactivate the <span class="guilabel">Custom</span> persistence
- feature that has <span class="filename">/home/amnesia/.claws-mail</span>
- as description.
-
-1. Click <span class="button">Save</span>.
diff --git a/wiki/src/doc/anonymous_internet/claws_mail_to_icedove.pt.po b/wiki/src/doc/anonymous_internet/claws_mail_to_icedove.pt.po
deleted file mode 100644
index aab19b7..0000000
--- a/wiki/src/doc/anonymous_internet/claws_mail_to_icedove.pt.po
+++ /dev/null
@@ -1,518 +0,0 @@
-# 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: 2016-07-17 17:44+0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"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=\"Migrating from Claws Mail to Icedove\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<!-- Note for translators: Claws Mail was removed from Tails in December\n"
-"2015, so feel free to skip translating this page after some time. -->\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"doc/anonymous_internet/icedove/replacement.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<span class=\"application\">Claws Mail</span> was removed\n"
-"from Tails in version 2.0 (2016-01-26).\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"doc/anonymous_internet/icedove/name.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"We recommend you do the migration before launching <span class=\"application\">Icedove</span> for the first\n"
-"time. You should, in this order:\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"install\"></a>\n"
-msgstr ""
-
-#. type: Title =
-#, no-wrap
-msgid "Install <span class=\"application\">Claws Mail</span>\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Start Tails and [[set up an administration password|first_steps/"
-"startup_options/administration_password]]."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Choose <span class=\"menuchoice\"><span class=\"guimenu\">Applications</"
-"span>&nbsp;▸ <span class=\"guisubmenu\">Utilities</span>&nbsp;▸ <span class="
-"\"guimenuitem\">Terminal</span></span> to open a terminal."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Execute the following commands to install <span class=\"application\">Claws "
-"Mail</span>:"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " sudo apt update\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " sudo apt install claws-mail\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"mailboxes\"></a>\n"
-msgstr ""
-
-#. type: Title =
-#, no-wrap
-msgid "Copy your emails saved in the persistent storage\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid "Start <span class=\"application\">Claws Mail</span>."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"To know if you are using the IMAP or the POP protocol, choose <span class="
-"\"menuchoice\"> <span class=\"guimenu\">Configuration</span>&nbsp;▸ <span "
-"class=\"guimenuitem\">Edit accounts&hellip;</span></span> and refer to the "
-"<span class=\"guilabel\">Protocol</span> column in the list of accounts."
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid ""
-"If you use IMAP, your emails are stored on the remote email server and you "
-"can skip this section and start [[configuring your email account in <span "
-"class=\"application\">Icedove</span>|claws_mail_to_icedove#settings]]."
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid ""
-"If you use POP and have emails saved in the persistent storage, we propose "
-"in the following steps a script to copy your emails from <span class="
-"\"application\">Claws Mail</span> to <span class=\"application\">Icedove</"
-"span>."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Verify that the <span class=\"application\">Icedove</span> persistence "
-"feature is activated. Otherwise, you might loose data."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"The script only migrates the mailbox in <span class=\"filename\">/home/"
-"amnesia/.claws-mail/Mail</span> which is the default in Tails."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" Verify that there is a single <span class=\"guilabel\">MH</span> mailbox named\n"
-" <span class=\"guilabel\">Mail</span> in the left pane of\n"
-" <span class=\"application\">Claws Mail</span> like in the following\n"
-" screenshot:\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " [[!img single_mh.png alt=\"\" link=\"no\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" If you have several <span class=\"guilabel\">MH</span> mailboxes in\n"
-" <span class=\"application\">Claws Mail</span>, please move all your emails into\n"
-" the one corresponding to <span class=\"filename\">/home/amnesia/.claws-mail/Mail</span>.\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"In the terminal, execute the following command to download the migration "
-"script:"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " wget https://tails.boum.org/misc/claws_to_icedove.sh\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid "Execute the following command to run the migration script:"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " bash claws_to_icedove.sh\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <div class=\"note\">\n"
-" <p>If you had started <span class=\"application\">Icedove</span> already, the script might propose you to\n"
-" back up the existing <span class=\"application\">Icedove</span> email folders before doing the\n"
-" migration. If you have valuable data in these folders, you can access\n"
-" it again after the migration by doing the following:</p>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " <ol>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <li>In <span class=\"application\">Icedove</span>, choose\n"
-" <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">[[!img lib/open-menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Preferences</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Account Settings</span></span>.</li>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <li>Click <span class=\"button\">Browse&hellip;</span> in the\n"
-" <span class=\"guilabel\">Message Storage</span> section of the\n"
-" <span class=\"guilabel\">Local Folders</span> settings.</li>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " <li>Navigate to <span class=\"filename\">/home/amnesia/.icedove/profile.default/Mail.</li>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <li>Open the <span class=\"filename\">Local Folders Backup</span>\n"
-" folder that matches the date and time when you first ran the\n"
-" script.</li>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" </ol>\n"
-" </div>\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Continue with the next section to configure your email account in <span "
-"class=\"application\">Icedove</span>."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"settings\"></a>\n"
-msgstr ""
-
-#. type: Title =
-#, no-wrap
-msgid "Configure your email accounts in <span class=\"application\">Icedove</span>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"1. Choose\n"
-" <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Internet</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Icedove</span>\n"
-" </span>\n"
-" to start <span class=\"application\">Icedove</span>.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"doc/anonymous_internet/icedove/account_creation.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <div class=\"tip\">\n"
-" <p>If you want to compare with the settings in\n"
-" <span class=\"application\">Claws Mail</span>, choose\n"
-" <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Configuration</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Edit Accounts&hellip;</span>\n"
-" </span> in <span class=\"application\">Claws Mail</span>, then select\n"
-" your email account and click <span class=\"guilabel\">Edit</span>.</p>\n"
-" </div>\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"If you want to configure another email account, choose <span class=\"guilabel"
-"\">Account Actions</span>&nbsp;▸ <span class=\"guilabel\">Add Mail "
-"Account&hellip;</span>."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " Otherwise, click <span class=\"guilabel\">OK</span>.\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"If you used the migration script provided in the previous section to [[copy "
-"your emails saved in the persistent storage|"
-"claws_mail_to_icedove#mailboxes]], do the following to configure <span class="
-"\"application\">Icedove</span> to access them:"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" 1. Choose\n"
-" <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">[[!img lib/open-menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Preferences</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Account Settings</span></span>.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" 1. Click <span class=\"button\">Browse&hellip;</span> in the\n"
-" <span class=\"guilabel\">Message Storage</span> section of the\n"
-" <span class=\"guilabel\">Local Folders</span> settings.\n"
-msgstr ""
-
-#. type: Bullet: ' 1. '
-msgid ""
-"Navigate to <span class=\"filename\">/home/amnesia/.icedove/profile.default/"
-"Mail."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" 1. Open the <span class=\"filename\">Local Folders</span>\n"
-" folder.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"For further documentation, refer to the [official\n"
-"<span class=\"application\">Thunderbird</span>\n"
-"help](https://support.mozilla.org/en-US/products/thunderbird).\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"address_book\"></a>\n"
-msgstr ""
-
-#. type: Title =
-#, no-wrap
-msgid "Migrate your address book\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"To export an address book from\n"
-"<span class=\"application\">Claws Mail</span> do the following:\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"1. Choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Tools</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Address Book</span></span>.\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Select an address book, for example <span class=\"guilabel\">Common "
-"addresses</span>, in the left pane."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"1. Choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Tools</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Export LDIF&hellip;</span></span>.\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Specify where to save the address book as an LDIF file, then click <span "
-"class=\"guilabel\">Forward</span>. You can use the default setting."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Enter <span class=\"command\">claws</span> as <span class=\"guilabel"
-"\">Suffix</span>, then click <span class=\"guilabel\">Forward</span> and "
-"<span class=\"guilabel\">Close</span>."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"To import an address book into\n"
-"<span class=\"application\">Icedove</span> do the following:\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"1. Choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Tools</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Import&hellip;</span></span>.\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Select <span class=\"guilabel\">Text file (LDIF, .tab, .csv, .txt)</span> "
-"and click <span class=\"guilabel\">Next</span>."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Specify the LDIF file that you exported from <span class=\"application"
-"\">Claws Mail</span>, by default <span class=\"filename\">/home/amnesia/"
-"claws-mail-out/addressbook.ldif</span>."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"You can repeat these steps for every address book in\n"
-"<span class=\"application\">Claws Mail</span>.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"delete\"></a>\n"
-msgstr ""
-
-#. type: Title =
-#, no-wrap
-msgid "Delete all your <span class=\"application\">Claws Mail</span> data\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"Once you made sure that all your data (emails, email account settings,\n"
-"and address books) is imported into <span class=\"application\">Icedove</span>,\n"
-"you can delete all your <span class=\"application\">Claws Mail</span> data.\n"
-msgstr ""
-
-#. type: Plain text
-msgid "To do so:"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"1. Choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Places</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Home</span>\n"
-" </span> in the top navigation bar to open the file browser.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"1. Choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">[[!img lib/go-down.png class=\"symbolic\" link=\"no\" alt=\"View options\"]]</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Show Hidden Files</span></span>.\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid "Open the <span class=\"guilabel\">.claws-mail</span> folder."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"1. Choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">[[!img lib/open-menu.png class=\"symbolic\" link=\"no\" alt=\"View options\"]]</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Select All</span></span>.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"1. Right-click on one of the selected files, choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenuitem\">Wipe</span></span>,\n"
-" and confirm.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"persistence\"></a>\n"
-msgstr ""
-
-#. type: Title =
-#, no-wrap
-msgid "Deactivate the <span class=\"guilabel\">Claws Mail</span> persistence feature\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"1. Choose <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
-" <span class=\"guisubmenu\">Tails</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Configure persistent volume</span></span>.\n"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid ""
-"Deactivate the <span class=\"guilabel\">Custom</span> persistence feature "
-"that has <span class=\"filename\">/home/amnesia/.claws-mail</span> as "
-"description."
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid "Click <span class=\"button\">Save</span>."
-msgstr ""
diff --git a/wiki/src/doc/anonymous_internet/claws_mail_to_icedove/single_mh.png b/wiki/src/doc/anonymous_internet/claws_mail_to_icedove/single_mh.png
deleted file mode 100644
index 06b0a54..0000000
--- a/wiki/src/doc/anonymous_internet/claws_mail_to_icedove/single_mh.png
+++ /dev/null
Binary files differ
diff --git a/wiki/src/doc/anonymous_internet/icedove/replacement.inline.de.po b/wiki/src/doc/anonymous_internet/icedove/replacement.inline.de.po
deleted file mode 100644
index 7a06cc6..0000000
--- a/wiki/src/doc/anonymous_internet/icedove/replacement.inline.de.po
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2015-12-15 16:51+0100\n"
-"PO-Revision-Date: 2016-01-24 16:06+0100\n"
-"Last-Translator: Tails translators <tails@boum.org>\n"
-"Language-Team: Tails translators <tails@boum.org>\n"
-"Language: de\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.6\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>Tails has replaced <span class=\"application\">[[Claws Mail]]</span> with\n"
-"<span class=\"application\">[[Icedove]]</span> as its email client in\n"
-"version 1.8.</p>\n"
-msgstr ""
-"<p>Tails hat in Version 1.8 <span class=\"application\">[[Claws Mail]]</span>\n"
-"mit <span class=\"application\">[[Icedove]]</span> als E-Mail-Client\n"
-"ersetzt.</p>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>If you have been using <span class=\"application\">Claws Mail</span>\n"
-"and activated its persistence feature, follow our instructions to\n"
-"[[migrate your data to <span class=\"application\">Icedove</span>|claws_mail_to_icedove]].</p>\n"
-msgstr ""
-"<p>Wenn Sie <span class=\"application\">Claws Mail</span> benutzt haben und die entsprechende\n"
-"Funktion für den beständigen Speicherbereich aktiviert hatten, befolgen Sie unsere Anweisungen\n"
-"zum [[Migrieren Ihrer Daten zu <span class=\"application\">Icedove</span>|claws_mail_to_icedove]].</p>\n"
diff --git a/wiki/src/doc/anonymous_internet/icedove/replacement.inline.fa.po b/wiki/src/doc/anonymous_internet/icedove/replacement.inline.fa.po
deleted file mode 100644
index 0d96341..0000000
--- a/wiki/src/doc/anonymous_internet/icedove/replacement.inline.fa.po
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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-12-23 15:02+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 ""
-"<p>Tails has replaced <span class=\"application\">[[Claws Mail]]</span> "
-"with\n"
-"<span class=\"application\">[[Icedove]]</span> as its email client in\n"
-"version 1.8.</p>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>If you have been using <span class=\"application\">Claws Mail</span>\n"
-"and activated its persistence feature, follow our instructions to\n"
-"[[migrate your data to <span "
-"class=\"application\">Icedove</span>|claws_mail_to_icedove]].</p>\n"
-msgstr ""
diff --git a/wiki/src/doc/anonymous_internet/icedove/replacement.inline.fr.po b/wiki/src/doc/anonymous_internet/icedove/replacement.inline.fr.po
deleted file mode 100644
index ebe5a35..0000000
--- a/wiki/src/doc/anonymous_internet/icedove/replacement.inline.fr.po
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2015-12-15 16:51+0100\n"
-"PO-Revision-Date: 2016-05-17 07:21-0000\n"
-"Last-Translator: \n"
-"Language-Team: Tails translators <tails@boum.org>\n"
-"Language: fr\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.10\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>Tails has replaced <span class=\"application\">[[Claws Mail]]</span> with\n"
-"<span class=\"application\">[[Icedove]]</span> as its email client in\n"
-"version 1.8.</p>\n"
-msgstr ""
-"<p>Tails a remplacé <span class=\"application\">[[Claws Mail]]</span> par\n"
-"<span class=\"application\">[[Icedove]]</span> comme client de messagerie dans\n"
-"la version 1.8.</p>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>If you have been using <span class=\"application\">Claws Mail</span>\n"
-"and activated its persistence feature, follow our instructions to\n"
-"[[migrate your data to <span class=\"application\">Icedove</span>|claws_mail_to_icedove]].</p>\n"
-msgstr ""
-"<p>Si vous avez utilisé <span class=\"application\">Claws Mail</span>\n"
-"et avez activé l'option de persistance, suivez nos instructions pour\n"
-"[[migrer vos données vers <span class=\"application\">Icedove</span>|claws_mail_to_icedove]].</p>\n"
diff --git a/wiki/src/doc/anonymous_internet/icedove/replacement.inline.it.po b/wiki/src/doc/anonymous_internet/icedove/replacement.inline.it.po
deleted file mode 100644
index 657faab..0000000
--- a/wiki/src/doc/anonymous_internet/icedove/replacement.inline.it.po
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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: 2016-01-03 23:50+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: ita <transitails@inventati.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 ""
-"<p>Tails has replaced <span class=\"application\">[[Claws Mail]]</span> "
-"with\n"
-"<span class=\"application\">[[Icedove]]</span> as its email client in\n"
-"version 1.8.</p>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>If you have been using <span class=\"application\">Claws Mail</span>\n"
-"and activated its persistence feature, follow our instructions to\n"
-"[[migrate your data to <span "
-"class=\"application\">Icedove</span>|claws_mail_to_icedove]].</p>\n"
-msgstr ""
diff --git a/wiki/src/doc/anonymous_internet/icedove/replacement.inline.mdwn b/wiki/src/doc/anonymous_internet/icedove/replacement.inline.mdwn
deleted file mode 100644
index e641019..0000000
--- a/wiki/src/doc/anonymous_internet/icedove/replacement.inline.mdwn
+++ /dev/null
@@ -1,7 +0,0 @@
-<p>Tails has replaced <span class="application">[[Claws Mail]]</span> with
-<span class="application">[[Icedove]]</span> as its email client in
-version 1.8.</p>
-
-<p>If you have been using <span class="application">Claws Mail</span>
-and activated its persistence feature, follow our instructions to
-[[migrate your data to <span class="application">Icedove</span>|claws_mail_to_icedove]].</p>
diff --git a/wiki/src/doc/anonymous_internet/icedove/replacement.inline.pt.po b/wiki/src/doc/anonymous_internet/icedove/replacement.inline.pt.po
deleted file mode 100644
index f93a433..0000000
--- a/wiki/src/doc/anonymous_internet/icedove/replacement.inline.pt.po
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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-12-15 16:51+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 ""
-"<p>Tails has replaced <span class=\"application\">[[Claws Mail]]</span> "
-"with\n"
-"<span class=\"application\">[[Icedove]]</span> as its email client in\n"
-"version 1.8.</p>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>If you have been using <span class=\"application\">Claws Mail</span>\n"
-"and activated its persistence feature, follow our instructions to\n"
-"[[migrate your data to <span "
-"class=\"application\">Icedove</span>|claws_mail_to_icedove]].</p>\n"
-msgstr ""
diff --git a/wiki/src/doc/anonymous_internet/networkmanager.mdwn b/wiki/src/doc/anonymous_internet/networkmanager.mdwn
index f4a0435..21a150b 100644
--- a/wiki/src/doc/anonymous_internet/networkmanager.mdwn
+++ b/wiki/src/doc/anonymous_internet/networkmanager.mdwn
@@ -20,7 +20,7 @@ connection:
[[!img doc/first_steps/introduction_to_gnome_and_the_tails_desktop/system.png link="no"]]
To connect to Tor using bridges or configure a proxy to access the Internet,
-you need to [[activate additional Tor configuration when starting Tails|first_steps/startup_options/network_configuration]].
+you need to [[activate additional Tor configuration when starting Tails|first_steps/startup_options#additional]].
After establishing a connection to a network:
diff --git a/wiki/src/doc/anonymous_internet/icedove.de.po b/wiki/src/doc/anonymous_internet/thunderbird.de.po
index b4f9872..9de893d 100644
--- a/wiki/src/doc/anonymous_internet/icedove.de.po
+++ b/wiki/src/doc/anonymous_internet/thunderbird.de.po
@@ -18,22 +18,22 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Emailing with Icedove (Thunderbird)\"]]\n"
-msgstr "[[!meta title=\"E-Mails mit Icedove (Thunderbird)\"]]\n"
+msgid "[[!meta title=\"Emailing with Thunderbird\"]]\n"
+msgstr "[[!meta title=\"E-Mails mit Thunderbird\"]]\n"
#. type: Plain text
#, no-wrap
msgid ""
"For reading and writing emails, Tails includes <span\n"
-"class=\"application\">Icedove</span>.\n"
+"class=\"application\">Thunderbird</span>.\n"
msgstr ""
"Zum Lesen und Schreiben von E-Mails enthält Tails\n"
-"<span class=\"application\">Icedove</span>.\n"
+"<span class=\"application\">Thunderbird</span>.\n"
#. type: Plain text
#, no-wrap
-msgid "[[!inline pages=\"doc/anonymous_internet/icedove/name.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"doc/anonymous_internet/icedove/name.inline.de\" raw=\"yes\" sort=\"age\"]]\n"
+msgid "[[!inline pages=\"doc/anonymous_internet/thunderbird/name.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr "[[!inline pages=\"doc/anonymous_internet/thunderbird/name.inline.de\" raw=\"yes\" sort=\"age\"]]\n"
#. type: Plain text
#, no-wrap
@@ -42,8 +42,8 @@ msgstr "<div class=\"note\">\n"
#. type: Plain text
#, no-wrap
-msgid "[[!inline pages=\"doc/anonymous_internet/icedove/replacement.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"doc/anonymous_internet/icedove/replacement.inline.de\" raw=\"yes\" sort=\"age\"]]\n"
+msgid "[[!inline pages=\"doc/anonymous_internet/thunderbird/replacement.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr "[[!inline pages=\"doc/anonymous_internet/thunderbird/replacement.inline.de\" raw=\"yes\" sort=\"age\"]]\n"
#. type: Plain text
#, no-wrap
@@ -53,17 +53,17 @@ msgstr "</div>\n"
#. type: Plain text
#, no-wrap
msgid ""
-"To start <span class=\"application\">Icedove</span> choose\n"
+"To start <span class=\"application\">Thunderbird</span> choose\n"
"<span class=\"menuchoice\">\n"
" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">Internet</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Icedove</span></span>.\n"
+" <span class=\"guimenuitem\">Thunderbird</span></span>.\n"
msgstr ""
-"Um <span class=\"application\">Icedove</span> zu starten, wählen Sie\n"
+"Um <span class=\"application\">Thunderbird</span> zu starten, wählen Sie\n"
"<span class=\"menuchoice\">\n"
" <span class=\"guimenu\">Anwendungen</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">Internet</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Icedove</span></span>.\n"
+" <span class=\"guimenuitem\">Thunderbird</span></span>.\n"
#. type: Plain text
#, no-wrap
@@ -73,12 +73,12 @@ msgstr "<div class=\"tip\">\n"
#. type: Plain text
#, no-wrap
msgid ""
-"<p>You can activate the [[<strong>Icedove</strong> persistence\n"
-"feature|doc/first_steps/persistence/configure#icedove]] to store your\n"
+"<p>You can activate the [[<strong>Thunderbird</strong> persistence\n"
+"feature|doc/first_steps/persistence/configure#thunderbird]] to store your\n"
"emails and settings across separate working sessions.</p>\n"
msgstr ""
-"<p>Sie können die [[Funktion für den beständigen Speicherbereich für <strong>Icedove</strong>\n"
-"|doc/first_steps/persistence/configure#icedove]] aktivieren, um Ihre\n"
+"<p>Sie können die [[Funktion für den beständigen Speicherbereich für <strong>Thunderbird</strong>\n"
+"|doc/first_steps/persistence/configure#thunderbird]] aktivieren, um Ihre\n"
"E-Mails und Einstellungen über mehrere Arbeitssitzungen hinweg zu speichern.</p>\n"
#. type: Plain text
@@ -99,8 +99,8 @@ msgstr "Konfigurieren Sie einen E-Mail Account\n"
#. type: Plain text
#, no-wrap
-msgid "[[!inline pages=\"doc/anonymous_internet/icedove/account_creation.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"doc/anonymous_internet/icedove/account_creation.inline.de\" raw=\"yes\" sort=\"age\"]]\n"
+msgid "[[!inline pages=\"doc/anonymous_internet/thunderbird/account_creation.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr "[[!inline pages=\"doc/anonymous_internet/thunderbird/account_creation.inline.de\" raw=\"yes\" sort=\"age\"]]\n"
#. type: Title =
#, no-wrap
@@ -110,11 +110,11 @@ msgstr "OpenPGP Verschlüsselung mit Enigmail\n"
#. type: Plain text
#, no-wrap
msgid ""
-"<span class=\"application\">Icedove</span> in Tails includes the\n"
+"<span class=\"application\">Thunderbird</span> in Tails includes the\n"
"<span class=\"application\">[Enigmail](https://www.enigmail.net/)</span>\n"
"extension to encrypt and authenticate emails using OpenPGP.\n"
msgstr ""
-"<span class=\"application\">Icedove</span> in Tails enthält die\n"
+"<span class=\"application\">Thunderbird</span> in Tails enthält die\n"
"<span class=\"application\">[Enigmail](https://www.enigmail.net/)</span>-Erweiterung,\n"
"um E-Mails mit OpenPGP zu verschlüsseln und authentifizieren.\n"
@@ -156,12 +156,12 @@ msgstr ""
msgid ""
"If you are new to OpenPGP, you can read the following guides on getting\n"
"started with encrypting emails using\n"
-"<span class=\"application\">Icedove</span> and\n"
+"<span class=\"application\">Thunderbird</span> and\n"
"<span class=\"application\">Enigmail</span>:\n"
msgstr ""
"Wenn OpenPGP neu für Sie ist, können Sie die folgenden Anleitungen\n"
"lesen, um mit dem Verschlüsseln von E-Mails mit\n"
-"<span class=\"application\">Icedove</span> und\n"
+"<span class=\"application\">Thunderbird</span> und\n"
"<span class=\"application\">Enigmail</span> zu beginnen:\n"
#. type: Bullet: ' - '
@@ -188,11 +188,11 @@ msgstr "Verbesserte Privatsphäre mit TorBirdy\n"
#. type: Plain text
#, no-wrap
msgid ""
-"<span class=\"application\">Icedove</span> in Tails includes the\n"
+"<span class=\"application\">Thunderbird</span> in Tails includes the\n"
"<span class=\"application\">[TorBirdy](https://trac.torproject.org/projects/tor/wiki/torbirdy)</span>\n"
"extension for additional privacy and anonymity.\n"
msgstr ""
-"<span class=\"application\">Icedove</span> in Tails enthält die\n"
+"<span class=\"application\">Thunderbird</span> in Tails enthält die\n"
"<span class=\"application\">[TorBirdy](https://trac.torproject.org/projects/tor/wiki/torbirdy)</span>-Erweiterung\n"
"für zusätzliche Privatsphäre und Anonymität.\n"
diff --git a/wiki/src/doc/anonymous_internet/icedove.pt.po b/wiki/src/doc/anonymous_internet/thunderbird.fa.po
index 5a9cc7d..8c6798f 100644
--- a/wiki/src/doc/anonymous_internet/icedove.pt.po
+++ b/wiki/src/doc/anonymous_internet/thunderbird.fa.po
@@ -18,19 +18,19 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Emailing with Icedove (Thunderbird)\"]]\n"
+msgid "[[!meta title=\"Emailing with Thunderbird\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
"For reading and writing emails, Tails includes <span\n"
-"class=\"application\">Icedove</span>.\n"
+"class=\"application\">Thunderbird</span>.\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!inline pages=\"doc/anonymous_internet/icedove/name.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgid "[[!inline pages=\"doc/anonymous_internet/thunderbird/name.inline\" raw=\"yes\" sort=\"age\"]]\n"
msgstr ""
#. type: Plain text
@@ -40,7 +40,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!inline pages=\"doc/anonymous_internet/icedove/replacement.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgid "[[!inline pages=\"doc/anonymous_internet/thunderbird/replacement.inline\" raw=\"yes\" sort=\"age\"]]\n"
msgstr ""
#. type: Plain text
@@ -51,11 +51,11 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"To start <span class=\"application\">Icedove</span> choose\n"
+"To start <span class=\"application\">Thunderbird</span> choose\n"
"<span class=\"menuchoice\">\n"
" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">Internet</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Icedove</span></span>.\n"
+" <span class=\"guimenuitem\">Thunderbird</span></span>.\n"
msgstr ""
#. type: Plain text
@@ -66,8 +66,8 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"<p>You can activate the [[<strong>Icedove</strong> persistence\n"
-"feature|doc/first_steps/persistence/configure#icedove]] to store your\n"
+"<p>You can activate the [[<strong>Thunderbird</strong> persistence\n"
+"feature|doc/first_steps/persistence/configure#thunderbird]] to store your\n"
"emails and settings across separate working sessions.</p>\n"
msgstr ""
@@ -86,7 +86,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!inline pages=\"doc/anonymous_internet/icedove/account_creation.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgid "[[!inline pages=\"doc/anonymous_internet/thunderbird/account_creation.inline\" raw=\"yes\" sort=\"age\"]]\n"
msgstr ""
#. type: Title =
@@ -97,7 +97,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"<span class=\"application\">Icedove</span> in Tails includes the\n"
+"<span class=\"application\">Thunderbird</span> in Tails includes the\n"
"<span class=\"application\">[Enigmail](https://www.enigmail.net/)</span>\n"
"extension to encrypt and authenticate emails using OpenPGP.\n"
msgstr ""
@@ -125,7 +125,7 @@ msgstr ""
msgid ""
"If you are new to OpenPGP, you can read the following guides on getting\n"
"started with encrypting emails using\n"
-"<span class=\"application\">Icedove</span> and\n"
+"<span class=\"application\">Thunderbird</span> and\n"
"<span class=\"application\">Enigmail</span>:\n"
msgstr ""
@@ -149,7 +149,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"<span class=\"application\">Icedove</span> in Tails includes the\n"
+"<span class=\"application\">Thunderbird</span> in Tails includes the\n"
"<span class=\"application\">[TorBirdy](https://trac.torproject.org/projects/tor/wiki/torbirdy)</span>\n"
"extension for additional privacy and anonymity.\n"
msgstr ""
diff --git a/wiki/src/doc/anonymous_internet/icedove.fr.po b/wiki/src/doc/anonymous_internet/thunderbird.fr.po
index cf85101..e1a6456 100644
--- a/wiki/src/doc/anonymous_internet/icedove.fr.po
+++ b/wiki/src/doc/anonymous_internet/thunderbird.fr.po
@@ -18,22 +18,22 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Emailing with Icedove (Thunderbird)\"]]\n"
-msgstr "[[!meta title=\"Envoyer des courriers électronique avec Icedove (Thunderbird)\"]]\n"
+msgid "[[!meta title=\"Emailing with Thunderbird\"]]\n"
+msgstr "[[!meta title=\"Envoyer des courriers électronique avec Thunderbird\"]]\n"
#. type: Plain text
#, no-wrap
msgid ""
"For reading and writing emails, Tails includes <span\n"
-"class=\"application\">Icedove</span>.\n"
+"class=\"application\">Thunderbird</span>.\n"
msgstr ""
"Pour lire et écrire des courriers électroniques, Tails inclut <span\n"
-"class=\"application\">Icedove</span>.\n"
+"class=\"application\">Thunderbird</span>.\n"
#. type: Plain text
#, no-wrap
-msgid "[[!inline pages=\"doc/anonymous_internet/icedove/name.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"doc/anonymous_internet/icedove/name.inline.fr\" raw=\"yes\" sort=\"age\"]]\n"
+msgid "[[!inline pages=\"doc/anonymous_internet/thunderbird/name.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr "[[!inline pages=\"doc/anonymous_internet/thunderbird/name.inline.fr\" raw=\"yes\" sort=\"age\"]]\n"
#. type: Plain text
#, no-wrap
@@ -42,8 +42,8 @@ msgstr "<div class=\"note\">\n"
#. type: Plain text
#, no-wrap
-msgid "[[!inline pages=\"doc/anonymous_internet/icedove/replacement.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"doc/anonymous_internet/icedove/replacement.inline.fr\" raw=\"yes\" sort=\"age\"]]\n"
+msgid "[[!inline pages=\"doc/anonymous_internet/thunderbird/replacement.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr "[[!inline pages=\"doc/anonymous_internet/thunderbird/replacement.inline.fr\" raw=\"yes\" sort=\"age\"]]\n"
#. type: Plain text
#, no-wrap
@@ -53,17 +53,17 @@ msgstr "</div>\n"
#. type: Plain text
#, no-wrap
msgid ""
-"To start <span class=\"application\">Icedove</span> choose\n"
+"To start <span class=\"application\">Thunderbird</span> choose\n"
"<span class=\"menuchoice\">\n"
" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">Internet</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Icedove</span></span>.\n"
+" <span class=\"guimenuitem\">Thunderbird</span></span>.\n"
msgstr ""
-"Pour démarrer <span class=\"application\">Icedove</span> choisissez\n"
+"Pour démarrer <span class=\"application\">Thunderbird</span> choisissez\n"
"<span class=\"menuchoice\">\n"
" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">Internet</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Messagerie Icedove</span></span>.\n"
+" <span class=\"guimenuitem\">Messagerie Thunderbird</span></span>.\n"
#. type: Plain text
#, no-wrap
@@ -73,12 +73,12 @@ msgstr "<div class=\"tip\">\n"
#. type: Plain text
#, no-wrap
msgid ""
-"<p>You can activate the [[<strong>Icedove</strong> persistence\n"
-"feature|doc/first_steps/persistence/configure#icedove]] to store your\n"
+"<p>You can activate the [[<strong>Thunderbird</strong> persistence\n"
+"feature|doc/first_steps/persistence/configure#thunderbird]] to store your\n"
"emails and settings across separate working sessions.</p>\n"
msgstr ""
-"<p>Vous pouvez activer l'[[option de persistance <strong>Icedove</strong>\n"
-"|doc/first_steps/persistence/configure#icedove]] pour stocker vos\n"
+"<p>Vous pouvez activer l'[[option de persistance <strong>Thunderbird</strong>\n"
+"|doc/first_steps/persistence/configure#thunderbird]] pour stocker vos\n"
"courriers et réglages entre plusieurs sessions de travail distinctes.</p>\n"
#. type: Plain text
@@ -99,8 +99,8 @@ msgstr "Configurer un compte de messagerie électronique\n"
#. type: Plain text
#, no-wrap
-msgid "[[!inline pages=\"doc/anonymous_internet/icedove/account_creation.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"doc/anonymous_internet/icedove/account_creation.inline.fr\" raw=\"yes\" sort=\"age\"]]\n"
+msgid "[[!inline pages=\"doc/anonymous_internet/thunderbird/account_creation.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr "[[!inline pages=\"doc/anonymous_internet/thunderbird/account_creation.inline.fr\" raw=\"yes\" sort=\"age\"]]\n"
#. type: Title =
#, no-wrap
@@ -110,11 +110,11 @@ msgstr "Chiffrement OpenPGP avec Enigmail\n"
#. type: Plain text
#, no-wrap
msgid ""
-"<span class=\"application\">Icedove</span> in Tails includes the\n"
+"<span class=\"application\">Thunderbird</span> in Tails includes the\n"
"<span class=\"application\">[Enigmail](https://www.enigmail.net/)</span>\n"
"extension to encrypt and authenticate emails using OpenPGP.\n"
msgstr ""
-"<span class=\"application\">Icedove</span> dans Tails inclut\n"
+"<span class=\"application\">Thunderbird</span> dans Tails inclut\n"
"<span class=\"application\">[Enigmail](https://www.enigmail.net/)</span>\n"
"une extension pour chiffrer et authentifier les messages électroniques en utilisant OpenPGP.\n"
@@ -149,12 +149,12 @@ msgstr ""
msgid ""
"If you are new to OpenPGP, you can read the following guides on getting\n"
"started with encrypting emails using\n"
-"<span class=\"application\">Icedove</span> and\n"
+"<span class=\"application\">Thunderbird</span> and\n"
"<span class=\"application\">Enigmail</span>:\n"
msgstr ""
"Si vous êtes débutant avec OpenPGP, vous pouvez lire les manuels suivants\n"
"sur comment débuter avec les courriers électroniques chiffrés en utilisant\n"
-"<span class=\"application\">Icedove</span> et\n"
+"<span class=\"application\">Thunderbird</span> et\n"
"<span class=\"application\">Enigmail</span> :\n"
#. type: Bullet: ' - '
@@ -181,11 +181,11 @@ msgstr "Amélioration de la confidentialité avec TorBirdy\n"
#. type: Plain text
#, no-wrap
msgid ""
-"<span class=\"application\">Icedove</span> in Tails includes the\n"
+"<span class=\"application\">Thunderbird</span> in Tails includes the\n"
"<span class=\"application\">[TorBirdy](https://trac.torproject.org/projects/tor/wiki/torbirdy)</span>\n"
"extension for additional privacy and anonymity.\n"
msgstr ""
-"<span class=\"application\">Icedove</span> dans Tails inclut\n"
+"<span class=\"application\">Thunderbird</span> dans Tails inclut\n"
"<span class=\"application\">[TorBirdy](https://trac.torproject.org/projects/tor/wiki/torbirdy)</span>\n"
"une extension pour plus de confidentialité et d'anonymat.\n"
diff --git a/wiki/src/doc/anonymous_internet/icedove.it.po b/wiki/src/doc/anonymous_internet/thunderbird.it.po
index 845fc15..8d0d784 100644
--- a/wiki/src/doc/anonymous_internet/icedove.it.po
+++ b/wiki/src/doc/anonymous_internet/thunderbird.it.po
@@ -18,19 +18,19 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Emailing with Icedove (Thunderbird)\"]]\n"
+msgid "[[!meta title=\"Emailing with Thunderbird\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
"For reading and writing emails, Tails includes <span\n"
-"class=\"application\">Icedove</span>.\n"
+"class=\"application\">Thunderbird</span>.\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!inline pages=\"doc/anonymous_internet/icedove/name.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgid "[[!inline pages=\"doc/anonymous_internet/thunderbird/name.inline\" raw=\"yes\" sort=\"age\"]]\n"
msgstr ""
#. type: Plain text
@@ -40,7 +40,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!inline pages=\"doc/anonymous_internet/icedove/replacement.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgid "[[!inline pages=\"doc/anonymous_internet/thunderbird/replacement.inline\" raw=\"yes\" sort=\"age\"]]\n"
msgstr ""
#. type: Plain text
@@ -51,11 +51,11 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"To start <span class=\"application\">Icedove</span> choose\n"
+"To start <span class=\"application\">Thunderbird</span> choose\n"
"<span class=\"menuchoice\">\n"
" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">Internet</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Icedove</span></span>.\n"
+" <span class=\"guimenuitem\">Thunderbird</span></span>.\n"
msgstr ""
#. type: Plain text
@@ -66,8 +66,8 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"<p>You can activate the [[<strong>Icedove</strong> persistence\n"
-"feature|doc/first_steps/persistence/configure#icedove]] to store your\n"
+"<p>You can activate the [[<strong>Thunderbird</strong> persistence\n"
+"feature|doc/first_steps/persistence/configure#thunderbird]] to store your\n"
"emails and settings across separate working sessions.</p>\n"
msgstr ""
@@ -86,7 +86,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!inline pages=\"doc/anonymous_internet/icedove/account_creation.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgid "[[!inline pages=\"doc/anonymous_internet/thunderbird/account_creation.inline\" raw=\"yes\" sort=\"age\"]]\n"
msgstr ""
#. type: Title =
@@ -97,7 +97,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"<span class=\"application\">Icedove</span> in Tails includes the\n"
+"<span class=\"application\">Thunderbird</span> in Tails includes the\n"
"<span class=\"application\">[Enigmail](https://www.enigmail.net/)</span>\n"
"extension to encrypt and authenticate emails using OpenPGP.\n"
msgstr ""
@@ -125,7 +125,7 @@ msgstr ""
msgid ""
"If you are new to OpenPGP, you can read the following guides on getting\n"
"started with encrypting emails using\n"
-"<span class=\"application\">Icedove</span> and\n"
+"<span class=\"application\">Thunderbird</span> and\n"
"<span class=\"application\">Enigmail</span>:\n"
msgstr ""
@@ -149,7 +149,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"<span class=\"application\">Icedove</span> in Tails includes the\n"
+"<span class=\"application\">Thunderbird</span> in Tails includes the\n"
"<span class=\"application\">[TorBirdy](https://trac.torproject.org/projects/tor/wiki/torbirdy)</span>\n"
"extension for additional privacy and anonymity.\n"
msgstr ""
diff --git a/wiki/src/doc/anonymous_internet/icedove.mdwn b/wiki/src/doc/anonymous_internet/thunderbird.mdwn
index 0f4a327..c701bcf 100644
--- a/wiki/src/doc/anonymous_internet/icedove.mdwn
+++ b/wiki/src/doc/anonymous_internet/thunderbird.mdwn
@@ -1,26 +1,26 @@
-[[!meta title="Emailing with Icedove (Thunderbird)"]]
+[[!meta title="Emailing with Thunderbird"]]
For reading and writing emails, Tails includes <span
-class="application">Icedove</span>.
+class="application">Thunderbird</span>.
-[[!inline pages="doc/anonymous_internet/icedove/name.inline" raw="yes" sort="age"]]
+[[!inline pages="doc/anonymous_internet/thunderbird/name.inline" raw="yes" sort="age"]]
<div class="note">
-[[!inline pages="doc/anonymous_internet/icedove/replacement.inline" raw="yes" sort="age"]]
+[[!inline pages="doc/anonymous_internet/thunderbird/replacement.inline" raw="yes" sort="age"]]
</div>
-To start <span class="application">Icedove</span> choose
+To start <span class="application">Thunderbird</span> choose
<span class="menuchoice">
<span class="guimenu">Applications</span>&nbsp;▸
<span class="guisubmenu">Internet</span>&nbsp;▸
- <span class="guimenuitem">Icedove</span></span>.
+ <span class="guimenuitem">Thunderbird</span></span>.
<div class="tip">
-<p>You can activate the [[<strong>Icedove</strong> persistence
-feature|doc/first_steps/persistence/configure#icedove]] to store your
+<p>You can activate the [[<strong>Thunderbird</strong> persistence
+feature|doc/first_steps/persistence/configure#thunderbird]] to store your
emails and settings across separate working sessions.</p>
</div>
@@ -32,12 +32,12 @@ help](https://support.mozilla.org/en-US/products/thunderbird).
Configure an email account
==========================
-[[!inline pages="doc/anonymous_internet/icedove/account_creation.inline" raw="yes" sort="age"]]
+[[!inline pages="doc/anonymous_internet/thunderbird/account_creation.inline" raw="yes" sort="age"]]
OpenPGP encryption with Enigmail
================================
-<span class="application">Icedove</span> in Tails includes the
+<span class="application">Thunderbird</span> in Tails includes the
<span class="application">[Enigmail](https://www.enigmail.net/)</span>
extension to encrypt and authenticate emails using OpenPGP.
@@ -53,7 +53,7 @@ part of the <span class="application">Enigmail Setup Wizard</span>.
If you are new to OpenPGP, you can read the following guides on getting
started with encrypting emails using
-<span class="application">Icedove</span> and
+<span class="application">Thunderbird</span> and
<span class="application">Enigmail</span>:
- [Security-in-a-Box: Thunderbird & OpenPGP - secure email](https://securityinabox.org/en/guide/thunderbird/windows)
@@ -62,7 +62,7 @@ started with encrypting emails using
Enhanced privacy with TorBirdy
==============================
-<span class="application">Icedove</span> in Tails includes the
+<span class="application">Thunderbird</span> in Tails includes the
<span class="application">[TorBirdy](https://trac.torproject.org/projects/tor/wiki/torbirdy)</span>
extension for additional privacy and anonymity.
diff --git a/wiki/src/doc/anonymous_internet/icedove.fa.po b/wiki/src/doc/anonymous_internet/thunderbird.pt.po
index 5a9cc7d..8c6798f 100644
--- a/wiki/src/doc/anonymous_internet/icedove.fa.po
+++ b/wiki/src/doc/anonymous_internet/thunderbird.pt.po
@@ -18,19 +18,19 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Emailing with Icedove (Thunderbird)\"]]\n"
+msgid "[[!meta title=\"Emailing with Thunderbird\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
"For reading and writing emails, Tails includes <span\n"
-"class=\"application\">Icedove</span>.\n"
+"class=\"application\">Thunderbird</span>.\n"
msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!inline pages=\"doc/anonymous_internet/icedove/name.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgid "[[!inline pages=\"doc/anonymous_internet/thunderbird/name.inline\" raw=\"yes\" sort=\"age\"]]\n"
msgstr ""
#. type: Plain text
@@ -40,7 +40,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!inline pages=\"doc/anonymous_internet/icedove/replacement.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgid "[[!inline pages=\"doc/anonymous_internet/thunderbird/replacement.inline\" raw=\"yes\" sort=\"age\"]]\n"
msgstr ""
#. type: Plain text
@@ -51,11 +51,11 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"To start <span class=\"application\">Icedove</span> choose\n"
+"To start <span class=\"application\">Thunderbird</span> choose\n"
"<span class=\"menuchoice\">\n"
" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">Internet</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Icedove</span></span>.\n"
+" <span class=\"guimenuitem\">Thunderbird</span></span>.\n"
msgstr ""
#. type: Plain text
@@ -66,8 +66,8 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"<p>You can activate the [[<strong>Icedove</strong> persistence\n"
-"feature|doc/first_steps/persistence/configure#icedove]] to store your\n"
+"<p>You can activate the [[<strong>Thunderbird</strong> persistence\n"
+"feature|doc/first_steps/persistence/configure#thunderbird]] to store your\n"
"emails and settings across separate working sessions.</p>\n"
msgstr ""
@@ -86,7 +86,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!inline pages=\"doc/anonymous_internet/icedove/account_creation.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgid "[[!inline pages=\"doc/anonymous_internet/thunderbird/account_creation.inline\" raw=\"yes\" sort=\"age\"]]\n"
msgstr ""
#. type: Title =
@@ -97,7 +97,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"<span class=\"application\">Icedove</span> in Tails includes the\n"
+"<span class=\"application\">Thunderbird</span> in Tails includes the\n"
"<span class=\"application\">[Enigmail](https://www.enigmail.net/)</span>\n"
"extension to encrypt and authenticate emails using OpenPGP.\n"
msgstr ""
@@ -125,7 +125,7 @@ msgstr ""
msgid ""
"If you are new to OpenPGP, you can read the following guides on getting\n"
"started with encrypting emails using\n"
-"<span class=\"application\">Icedove</span> and\n"
+"<span class=\"application\">Thunderbird</span> and\n"
"<span class=\"application\">Enigmail</span>:\n"
msgstr ""
@@ -149,7 +149,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"<span class=\"application\">Icedove</span> in Tails includes the\n"
+"<span class=\"application\">Thunderbird</span> in Tails includes the\n"
"<span class=\"application\">[TorBirdy](https://trac.torproject.org/projects/tor/wiki/torbirdy)</span>\n"
"extension for additional privacy and anonymity.\n"
msgstr ""
diff --git a/wiki/src/doc/anonymous_internet/icedove/account_creation.inline.de.po b/wiki/src/doc/anonymous_internet/thunderbird/account_creation.inline.de.po
index 92099bb..145d679 100644
--- a/wiki/src/doc/anonymous_internet/icedove/account_creation.inline.de.po
+++ b/wiki/src/doc/anonymous_internet/thunderbird/account_creation.inline.de.po
@@ -36,26 +36,26 @@ msgstr ""
#. type: Bullet: '1. '
msgid ""
-"When starting <span class=\"application\">Icedove</span> for the first time, "
+"When starting <span class=\"application\">Thunderbird</span> for the first time, "
"an assistant appears to guide you through the process of configuring <span "
-"class=\"application\">Icedove</span> to access your email account."
+"class=\"application\">Thunderbird</span> to access your email account."
msgstr ""
-"Wenn <span class=\"application\">Icedove</span> zum ersten Mal gestartet "
+"Wenn <span class=\"application\">Thunderbird</span> zum ersten Mal gestartet "
"wird, erscheint ein Assistent, um Sie durch den Vorgang der Konfiguration "
-"von <span class=\"application\">Icedove</span> zu führen, damit Sie auf Ihr "
+"von <span class=\"application\">Thunderbird</span> zu führen, damit Sie auf Ihr "
"E-Mailkonto zugreifen können."
#. type: Plain text
#, no-wrap
-msgid " [[!img icedove/assistant.png link=\"no\"]]\n"
-msgstr " [[!img icedove/assistant.png link=\"no\"]]\n"
+msgid " [[!img thunderbird/assistant.png link=\"no\"]]\n"
+msgstr " [[!img thunderbird/assistant.png link=\"no\"]]\n"
#. type: Plain text
#, fuzzy, no-wrap
#| msgid ""
#| " <div class=\"tip\">\n"
#| " <p>To start this assistant again in the future from the main window of\n"
-#| " <span class=\"application\">Icedove</span>, choose\n"
+#| " <span class=\"application\">Thunderbird</span>, choose\n"
#| " <span class=\"menuchoice\">\n"
#| " <span class=\"guimenu\">[[!img menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
#| " <span class=\"guisubmenu\">Preferences</span>&nbsp;▸\n"
@@ -67,7 +67,7 @@ msgstr " [[!img icedove/assistant.png link=\"no\"]]\n"
msgid ""
" <div class=\"tip\">\n"
" <p>To start this assistant again in the future from the main window of\n"
-" <span class=\"application\">Icedove</span>, choose\n"
+" <span class=\"application\">Thunderbird</span>, choose\n"
" <span class=\"menuchoice\">\n"
" <span class=\"guimenu\">[[!img lib/open-menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">Preferences</span>&nbsp;▸\n"
@@ -79,7 +79,7 @@ msgid ""
msgstr ""
" <div class=\"tip\">\n"
" <p>Um diesen Assistenten in der Zukunft vom Hauptfenster von\n"
-" <span class=\"application\">Icedove</span> aus zu starten, wählen Sie\n"
+" <span class=\"application\">Thunderbird</span> aus zu starten, wählen Sie\n"
" <span class=\"menuchoice\">\n"
" <span class=\"guimenu\">[[!img menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">Einstellungen</span>&nbsp;▸\n"
@@ -121,7 +121,7 @@ msgstr ""
#. type: Bullet: '1. '
#, fuzzy
#| msgid ""
-#| " <span class=\"application\">Icedove</span> can connect to your email\n"
+#| " <span class=\"application\">Thunderbird</span> can connect to your email\n"
#| " provider using either the <span class=\"guilabel\">IMAP</span> or\n"
#| " <span class=\"guilabel\">POP</span> protocol.\n"
msgid ""
@@ -129,7 +129,7 @@ msgid ""
"protocol to use to connect to your email provider, either <span class="
"\"guilabel\">IMAP</span> or <span class=\"guilabel\">POP</span>."
msgstr ""
-" <span class=\"application\">Icedove</span> kann sich zu Ihrem "
+" <span class=\"application\">Thunderbird</span> kann sich zu Ihrem "
"Kontenanbieter\n"
" entweder mit dem <span class=\"guilabel\">IMAP</span> oder dem\n"
" <span class=\"guilabel\">POP</span> Protokoll verbinden.\n"
@@ -138,13 +138,13 @@ msgstr ""
#, no-wrap
msgid ""
" - With <span class=\"guilabel\">IMAP</span>,\n"
-" <span class=\"application\">Icedove</span> constantly synchronizes\n"
+" <span class=\"application\">Thunderbird</span> constantly synchronizes\n"
" with the server and displays the emails and folders that are\n"
"\tcurrently stored on the server. IMAP is better suited if you access\n"
" your emails from different operating systems.\n"
msgstr ""
" - Mit <span class=\"guilabel\">IMAP</span> synchronisiert\n"
-" <span class=\"application\">Icedove</span> sich immer wieder mit\n"
+" <span class=\"application\">Thunderbird</span> sich immer wieder mit\n"
" dem Server und zeigt die E-Mails und Ordner an,\n"
"\tdie momentan auf dem Server gespeichert sind. IMAP bietet sich an, wenn\n"
" Sie von verschiedenen Betriebssystemen aus auf Ihre E-Mails zugreifen.\n"
@@ -153,13 +153,13 @@ msgstr ""
#, no-wrap
msgid ""
" - With <span class=\"guilabel\">POP</span>,\n"
-" <span class=\"application\">Icedove</span> downloads the emails that\n"
+" <span class=\"application\">Thunderbird</span> downloads the emails that\n"
" are in the inbox on the server and possibly deletes them from the\n"
"\tserver. POP is better suited if you access your emails from Tails only\n"
" and store them in the persistent storage.\n"
msgstr ""
" - Mit <span class=\"guilabel\">POP</span> lädt\n"
-" <span class=\"application\">Icedove</span> die E-Mails, die sich\n"
+" <span class=\"application\">Thunderbird</span> die E-Mails, die sich\n"
" im Posteingang des Servers befinden, herunter und löscht diese möglicherweise vom\n"
"\tServer. POP ist besser geeignet, wenn Sie nur von Tails aus auf Ihre E-Mails zugreifen\n"
" und diese im beständigen Speicherbereich speichern.\n"
@@ -184,7 +184,7 @@ msgstr ""
#~ " <div class=\"bug\">\n"
#~ " <p>After this first screen, the <a href=\"https://support.mozilla.org/"
#~ "en-US/kb/automatic-account-configuration\">automatic\n"
-#~ " account configuration</a> of <span class=\"application\">Icedove</"
+#~ " account configuration</a> of <span class=\"application\">Thunderbird</"
#~ "span>\n"
#~ " is currently disabled in Tails for security reasons. You should "
#~ "consult\n"
@@ -194,7 +194,7 @@ msgstr ""
#~ " <div class=\"bug\">\n"
#~ " <p>Nach diesem ersten Bildschirm ist die <a href=\"https://support."
#~ "mozilla.org/en-US/kb/automatic-account-configuration\">automatische\n"
-#~ " Konten-Einrichtung</a> von <span class=\"application\">Icedove</span>\n"
+#~ " Konten-Einrichtung</a> von <span class=\"application\">Thunderbird</span>\n"
#~ " momentan aus Sicherheitsgründen in Tails deaktiviert. Sie sollten sich "
#~ "auf die\n"
#~ " Dokumentation Ihres E-Mail Anbieters beziehen, um die Einrichtung "
diff --git a/wiki/src/doc/anonymous_internet/icedove/account_creation.inline.fa.po b/wiki/src/doc/anonymous_internet/thunderbird/account_creation.inline.fa.po
index 1216028..fea5eb9 100644
--- a/wiki/src/doc/anonymous_internet/icedove/account_creation.inline.fa.po
+++ b/wiki/src/doc/anonymous_internet/thunderbird/account_creation.inline.fa.po
@@ -36,14 +36,14 @@ msgstr ""
#. type: Bullet: '1. '
msgid ""
-"When starting <span class=\"application\">Icedove</span> for the first time, "
+"When starting <span class=\"application\">Thunderbird</span> for the first time, "
"an assistant appears to guide you through the process of configuring <span "
-"class=\"application\">Icedove</span> to access your email account."
+"class=\"application\">Thunderbird</span> to access your email account."
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img icedove/assistant.png link=\"no\"]]\n"
+msgid " [[!img thunderbird/assistant.png link=\"no\"]]\n"
msgstr ""
#. type: Plain text
@@ -51,7 +51,7 @@ msgstr ""
msgid ""
" <div class=\"tip\">\n"
" <p>To start this assistant again in the future from the main window of\n"
-" <span class=\"application\">Icedove</span>, choose\n"
+" <span class=\"application\">Thunderbird</span>, choose\n"
" <span class=\"menuchoice\">\n"
" <span class=\"guimenu\">[[!img lib/open-menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">Preferences</span>&nbsp;▸\n"
@@ -100,7 +100,7 @@ msgstr ""
#, no-wrap
msgid ""
" - With <span class=\"guilabel\">IMAP</span>,\n"
-" <span class=\"application\">Icedove</span> constantly synchronizes\n"
+" <span class=\"application\">Thunderbird</span> constantly synchronizes\n"
" with the server and displays the emails and folders that are\n"
"\tcurrently stored on the server. IMAP is better suited if you access\n"
" your emails from different operating systems.\n"
@@ -110,7 +110,7 @@ msgstr ""
#, no-wrap
msgid ""
" - With <span class=\"guilabel\">POP</span>,\n"
-" <span class=\"application\">Icedove</span> downloads the emails that\n"
+" <span class=\"application\">Thunderbird</span> downloads the emails that\n"
" are in the inbox on the server and possibly deletes them from the\n"
"\tserver. POP is better suited if you access your emails from Tails only\n"
" and store them in the persistent storage.\n"
diff --git a/wiki/src/doc/anonymous_internet/icedove/account_creation.inline.fr.po b/wiki/src/doc/anonymous_internet/thunderbird/account_creation.inline.fr.po
index ec17367..a713ca3 100644
--- a/wiki/src/doc/anonymous_internet/icedove/account_creation.inline.fr.po
+++ b/wiki/src/doc/anonymous_internet/thunderbird/account_creation.inline.fr.po
@@ -39,26 +39,26 @@ msgstr "</div>\n"
#. type: Bullet: '1. '
msgid ""
-"When starting <span class=\"application\">Icedove</span> for the first time, "
+"When starting <span class=\"application\">Thunderbird</span> for the first time, "
"an assistant appears to guide you through the process of configuring <span "
-"class=\"application\">Icedove</span> to access your email account."
+"class=\"application\">Thunderbird</span> to access your email account."
msgstr ""
-"Lorsque <span class=\"application\">Icedove</span> démarre pour la première "
+"Lorsque <span class=\"application\">Thunderbird</span> démarre pour la première "
"fois, un assistant apparaît pour vous guider à travers le processus de "
-"configuration d'<span class=\"application\">Icedove</span> permettant "
+"configuration d'<span class=\"application\">Thunderbird</span> permettant "
"d'accéder à votre compte de courrier électronique."
#. type: Plain text
#, no-wrap
-msgid " [[!img icedove/assistant.png link=\"no\"]]\n"
-msgstr " [[!img icedove/assistant.png link=\"no\"]]\n"
+msgid " [[!img thunderbird/assistant.png link=\"no\"]]\n"
+msgstr " [[!img thunderbird/assistant.png link=\"no\"]]\n"
#. type: Plain text
#, no-wrap
msgid ""
" <div class=\"tip\">\n"
" <p>To start this assistant again in the future from the main window of\n"
-" <span class=\"application\">Icedove</span>, choose\n"
+" <span class=\"application\">Thunderbird</span>, choose\n"
" <span class=\"menuchoice\">\n"
" <span class=\"guimenu\">[[!img lib/open-menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">Preferences</span>&nbsp;▸\n"
@@ -70,7 +70,7 @@ msgid ""
msgstr ""
" <div class=\"tip\">\n"
" <p>Pour plus tard démarrer à nouveau l'assistant, depuis la fenêtre principale\n"
-" <span class=\"application\">Icedove</span>, choisir\n"
+" <span class=\"application\">Thunderbird</span>, choisir\n"
" <span class=\"menuchoice\">\n"
" <span class=\"guimenu\">[[!img lib/open-menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">Préférences</span>&nbsp;▸\n"
@@ -129,13 +129,13 @@ msgstr ""
#, no-wrap
msgid ""
" - With <span class=\"guilabel\">IMAP</span>,\n"
-" <span class=\"application\">Icedove</span> constantly synchronizes\n"
+" <span class=\"application\">Thunderbird</span> constantly synchronizes\n"
" with the server and displays the emails and folders that are\n"
"\tcurrently stored on the server. IMAP is better suited if you access\n"
" your emails from different operating systems.\n"
msgstr ""
" - Avec <span class=\"guilabel\">IMAP</span>,\n"
-" <span class=\"application\">Icedove</span> se synchronise constamment\n"
+" <span class=\"application\">Thunderbird</span> se synchronise constamment\n"
" avec le serveur et affiche les courriers et les dossiers qui sont\n"
"\tstockés actuellement sur le serveur. IMAP est plus adapté si vous accédez\n"
" à vos courriers électroniques depuis différents systèmes d'exploitation.\n"
@@ -144,13 +144,13 @@ msgstr ""
#, no-wrap
msgid ""
" - With <span class=\"guilabel\">POP</span>,\n"
-" <span class=\"application\">Icedove</span> downloads the emails that\n"
+" <span class=\"application\">Thunderbird</span> downloads the emails that\n"
" are in the inbox on the server and possibly deletes them from the\n"
"\tserver. POP is better suited if you access your emails from Tails only\n"
" and store them in the persistent storage.\n"
msgstr ""
" - Avec <span class=\"guilabel\">POP</span>,\n"
-" <span class=\"application\">Icedove</span> télécharge les courriers électroniques qui\n"
+" <span class=\"application\">Thunderbird</span> télécharge les courriers électroniques qui\n"
" sont dans la boite de réception sur le serveur et peut ensuite les supprimer du\n"
"\tserveur. POP est plus adapté si vous accédez à vos courriers électroniques uniquement depuis Tails\n"
" et les stockez dans le stockage persistant.\n"
diff --git a/wiki/src/doc/anonymous_internet/icedove/account_creation.inline.it.po b/wiki/src/doc/anonymous_internet/thunderbird/account_creation.inline.it.po
index 1bc280a..f2cc6c0 100644
--- a/wiki/src/doc/anonymous_internet/icedove/account_creation.inline.it.po
+++ b/wiki/src/doc/anonymous_internet/thunderbird/account_creation.inline.it.po
@@ -36,14 +36,14 @@ msgstr ""
#. type: Bullet: '1. '
msgid ""
-"When starting <span class=\"application\">Icedove</span> for the first time, "
+"When starting <span class=\"application\">Thunderbird</span> for the first time, "
"an assistant appears to guide you through the process of configuring <span "
-"class=\"application\">Icedove</span> to access your email account."
+"class=\"application\">Thunderbird</span> to access your email account."
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img icedove/assistant.png link=\"no\"]]\n"
+msgid " [[!img thunderbird/assistant.png link=\"no\"]]\n"
msgstr ""
#. type: Plain text
@@ -51,7 +51,7 @@ msgstr ""
msgid ""
" <div class=\"tip\">\n"
" <p>To start this assistant again in the future from the main window of\n"
-" <span class=\"application\">Icedove</span>, choose\n"
+" <span class=\"application\">Thunderbird</span>, choose\n"
" <span class=\"menuchoice\">\n"
" <span class=\"guimenu\">[[!img lib/open-menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">Preferences</span>&nbsp;▸\n"
@@ -100,7 +100,7 @@ msgstr ""
#, no-wrap
msgid ""
" - With <span class=\"guilabel\">IMAP</span>,\n"
-" <span class=\"application\">Icedove</span> constantly synchronizes\n"
+" <span class=\"application\">Thunderbird</span> constantly synchronizes\n"
" with the server and displays the emails and folders that are\n"
"\tcurrently stored on the server. IMAP is better suited if you access\n"
" your emails from different operating systems.\n"
@@ -110,7 +110,7 @@ msgstr ""
#, no-wrap
msgid ""
" - With <span class=\"guilabel\">POP</span>,\n"
-" <span class=\"application\">Icedove</span> downloads the emails that\n"
+" <span class=\"application\">Thunderbird</span> downloads the emails that\n"
" are in the inbox on the server and possibly deletes them from the\n"
"\tserver. POP is better suited if you access your emails from Tails only\n"
" and store them in the persistent storage.\n"
diff --git a/wiki/src/doc/anonymous_internet/icedove/account_creation.inline.mdwn b/wiki/src/doc/anonymous_internet/thunderbird/account_creation.inline.mdwn
index e457d5e..2d4cef0 100644
--- a/wiki/src/doc/anonymous_internet/icedove/account_creation.inline.mdwn
+++ b/wiki/src/doc/anonymous_internet/thunderbird/account_creation.inline.mdwn
@@ -6,16 +6,16 @@ such as GMail or Mail.ru</p>
</div>
-1. When starting <span class="application">Icedove</span> for the first
+1. When starting <span class="application">Thunderbird</span> for the first
time, an assistant appears to guide you through the process of
- configuring <span class="application">Icedove</span> to access your
+ configuring <span class="application">Thunderbird</span> to access your
email account.
- [[!img icedove/assistant.png link="no"]]
+ [[!img thunderbird/assistant.png link="no"]]
<div class="tip">
<p>To start this assistant again in the future from the main window of
- <span class="application">Icedove</span>, choose
+ <span class="application">Thunderbird</span>, choose
<span class="menuchoice">
<span class="guimenu">[[!img lib/open-menu.png alt="Menu" class=symbolic link=no]]</span>&nbsp;▸
<span class="guisubmenu">Preferences</span>&nbsp;▸
@@ -42,13 +42,13 @@ such as GMail or Mail.ru</p>
<span class="guilabel">IMAP</span> or <span class="guilabel">POP</span>.
- With <span class="guilabel">IMAP</span>,
- <span class="application">Icedove</span> constantly synchronizes
+ <span class="application">Thunderbird</span> constantly synchronizes
with the server and displays the emails and folders that are
currently stored on the server. IMAP is better suited if you access
your emails from different operating systems.
- With <span class="guilabel">POP</span>,
- <span class="application">Icedove</span> downloads the emails that
+ <span class="application">Thunderbird</span> downloads the emails that
are in the inbox on the server and possibly deletes them from the
server. POP is better suited if you access your emails from Tails only
and store them in the persistent storage.
diff --git a/wiki/src/doc/anonymous_internet/icedove/account_creation.inline.pt.po b/wiki/src/doc/anonymous_internet/thunderbird/account_creation.inline.pt.po
index 1216028..fea5eb9 100644
--- a/wiki/src/doc/anonymous_internet/icedove/account_creation.inline.pt.po
+++ b/wiki/src/doc/anonymous_internet/thunderbird/account_creation.inline.pt.po
@@ -36,14 +36,14 @@ msgstr ""
#. type: Bullet: '1. '
msgid ""
-"When starting <span class=\"application\">Icedove</span> for the first time, "
+"When starting <span class=\"application\">Thunderbird</span> for the first time, "
"an assistant appears to guide you through the process of configuring <span "
-"class=\"application\">Icedove</span> to access your email account."
+"class=\"application\">Thunderbird</span> to access your email account."
msgstr ""
#. type: Plain text
#, no-wrap
-msgid " [[!img icedove/assistant.png link=\"no\"]]\n"
+msgid " [[!img thunderbird/assistant.png link=\"no\"]]\n"
msgstr ""
#. type: Plain text
@@ -51,7 +51,7 @@ msgstr ""
msgid ""
" <div class=\"tip\">\n"
" <p>To start this assistant again in the future from the main window of\n"
-" <span class=\"application\">Icedove</span>, choose\n"
+" <span class=\"application\">Thunderbird</span>, choose\n"
" <span class=\"menuchoice\">\n"
" <span class=\"guimenu\">[[!img lib/open-menu.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">Preferences</span>&nbsp;▸\n"
@@ -100,7 +100,7 @@ msgstr ""
#, no-wrap
msgid ""
" - With <span class=\"guilabel\">IMAP</span>,\n"
-" <span class=\"application\">Icedove</span> constantly synchronizes\n"
+" <span class=\"application\">Thunderbird</span> constantly synchronizes\n"
" with the server and displays the emails and folders that are\n"
"\tcurrently stored on the server. IMAP is better suited if you access\n"
" your emails from different operating systems.\n"
@@ -110,7 +110,7 @@ msgstr ""
#, no-wrap
msgid ""
" - With <span class=\"guilabel\">POP</span>,\n"
-" <span class=\"application\">Icedove</span> downloads the emails that\n"
+" <span class=\"application\">Thunderbird</span> downloads the emails that\n"
" are in the inbox on the server and possibly deletes them from the\n"
"\tserver. POP is better suited if you access your emails from Tails only\n"
" and store them in the persistent storage.\n"
diff --git a/wiki/src/doc/anonymous_internet/icedove/assistant.png b/wiki/src/doc/anonymous_internet/thunderbird/assistant.png
index 51f2815..51f2815 100644
--- a/wiki/src/doc/anonymous_internet/icedove/assistant.png
+++ b/wiki/src/doc/anonymous_internet/thunderbird/assistant.png
Binary files differ
diff --git a/wiki/src/doc/anonymous_internet/icedove/name.inline.de.po b/wiki/src/doc/anonymous_internet/thunderbird/name.inline.de.po
index 4fc5ee9..f555383 100644
--- a/wiki/src/doc/anonymous_internet/icedove/name.inline.de.po
+++ b/wiki/src/doc/anonymous_internet/thunderbird/name.inline.de.po
@@ -25,12 +25,12 @@ msgstr "<div class=\"tip\">\n"
#, no-wrap
msgid ""
"<p>For [[!wikipedia Mozilla_Corporation_software_rebranded_by_the_Debian_project desc=\"trademark reasons\"]],\n"
-"<span class=\"application\">Icedove</span> is the name of\n"
+"<span class=\"application\">Thunderbird</span> is the name of\n"
"<span class=\"application\">Mozilla Thunderbird</span> in Tails and they\n"
"are otherwise the same program.</p>\n"
msgstr ""
"<p>Aus [[!wikipedia_de Namensstreit_zwischen_Debian_und_Mozilla desc=\"lizenzrechtlichen Gründen\"]] ist\n"
-"in Tails <span class=\"application\">Icedove</span> der Name von\n"
+"in Tails <span class=\"application\">Thunderbird</span> der Name von\n"
"<span class=\"application\">Mozilla Thunderbird</span>, ansonsten\n"
"sind beide Programme dieselben.</p>\n"
diff --git a/wiki/src/doc/anonymous_internet/icedove/name.inline.fa.po b/wiki/src/doc/anonymous_internet/thunderbird/name.inline.fa.po
index b6034d9..9136cea 100644
--- a/wiki/src/doc/anonymous_internet/icedove/name.inline.fa.po
+++ b/wiki/src/doc/anonymous_internet/thunderbird/name.inline.fa.po
@@ -27,7 +27,7 @@ msgid ""
"<p>For [[!wikipedia "
"Mozilla_Corporation_software_rebranded_by_the_Debian_project "
"desc=\"trademark reasons\"]],\n"
-"<span class=\"application\">Icedove</span> is the name of\n"
+"<span class=\"application\">Thunderbird</span> is the name of\n"
"<span class=\"application\">Mozilla Thunderbird</span> in Tails and they\n"
"are otherwise the same program.</p>\n"
msgstr ""
diff --git a/wiki/src/doc/anonymous_internet/icedove/name.inline.fr.po b/wiki/src/doc/anonymous_internet/thunderbird/name.inline.fr.po
index b536f98..406d29a 100644
--- a/wiki/src/doc/anonymous_internet/icedove/name.inline.fr.po
+++ b/wiki/src/doc/anonymous_internet/thunderbird/name.inline.fr.po
@@ -25,12 +25,12 @@ msgstr "<div class=\"tip\">\n"
#, no-wrap
msgid ""
"<p>For [[!wikipedia Mozilla_Corporation_software_rebranded_by_the_Debian_project desc=\"trademark reasons\"]],\n"
-"<span class=\"application\">Icedove</span> is the name of\n"
+"<span class=\"application\">Thunderbird</span> is the name of\n"
"<span class=\"application\">Mozilla Thunderbird</span> in Tails and they\n"
"are otherwise the same program.</p>\n"
msgstr ""
"<p>Pour des [[!wikipedia_fr Renommage_des_applications_de_Mozilla_par_Debian desc=\"raisons de droit des marques\"]],\n"
-"<span class=\"application\">Icedove</span> est le nom de\n"
+"<span class=\"application\">Thunderbird</span> est le nom de\n"
"<span class=\"application\">Mozilla Thunderbird</span> dans Tails mais sinon il\n"
"s'agit bien du même programme.</p>\n"
diff --git a/wiki/src/doc/anonymous_internet/icedove/name.inline.it.po b/wiki/src/doc/anonymous_internet/thunderbird/name.inline.it.po
index f66e613..6950d39 100644
--- a/wiki/src/doc/anonymous_internet/icedove/name.inline.it.po
+++ b/wiki/src/doc/anonymous_internet/thunderbird/name.inline.it.po
@@ -27,7 +27,7 @@ msgid ""
"<p>For [[!wikipedia "
"Mozilla_Corporation_software_rebranded_by_the_Debian_project "
"desc=\"trademark reasons\"]],\n"
-"<span class=\"application\">Icedove</span> is the name of\n"
+"<span class=\"application\">Thunderbird</span> is the name of\n"
"<span class=\"application\">Mozilla Thunderbird</span> in Tails and they\n"
"are otherwise the same program.</p>\n"
msgstr ""
diff --git a/wiki/src/doc/anonymous_internet/icedove/name.inline.mdwn b/wiki/src/doc/anonymous_internet/thunderbird/name.inline.mdwn
index c4eb8ff..8af59f3 100644
--- a/wiki/src/doc/anonymous_internet/icedove/name.inline.mdwn
+++ b/wiki/src/doc/anonymous_internet/thunderbird/name.inline.mdwn
@@ -1,7 +1,7 @@
<div class="tip">
<p>For [[!wikipedia Mozilla_Corporation_software_rebranded_by_the_Debian_project desc="trademark reasons"]],
-<span class="application">Icedove</span> is the name of
+<span class="application">Thunderbird</span> is the name of
<span class="application">Mozilla Thunderbird</span> in Tails and they
are otherwise the same program.</p>
diff --git a/wiki/src/doc/anonymous_internet/icedove/name.inline.pt.po b/wiki/src/doc/anonymous_internet/thunderbird/name.inline.pt.po
index 50287e1..41ce12c 100644
--- a/wiki/src/doc/anonymous_internet/icedove/name.inline.pt.po
+++ b/wiki/src/doc/anonymous_internet/thunderbird/name.inline.pt.po
@@ -27,7 +27,7 @@ msgid ""
"<p>For [[!wikipedia "
"Mozilla_Corporation_software_rebranded_by_the_Debian_project "
"desc=\"trademark reasons\"]],\n"
-"<span class=\"application\">Icedove</span> is the name of\n"
+"<span class=\"application\">Thunderbird</span> is the name of\n"
"<span class=\"application\">Mozilla Thunderbird</span> in Tails and they\n"
"are otherwise the same program.</p>\n"
msgstr ""
diff --git a/wiki/src/doc/encryption_and_privacy/gpgapplet.warning.de.po b/wiki/src/doc/encryption_and_privacy/gpgapplet.warning.de.po
index f93106a..982cfe1 100644
--- a/wiki/src/doc/encryption_and_privacy/gpgapplet.warning.de.po
+++ b/wiki/src/doc/encryption_and_privacy/gpgapplet.warning.de.po
@@ -63,7 +63,7 @@ msgstr ""
#, no-wrap
msgid ""
"<p>If you are going to encrypt emails often, we recommend you to set up\n"
-"[[Icedove|doc/anonymous_internet/icedove]] instead.</p>\n"
+"[[Thunderbird|doc/anonymous_internet/thunderbird]] instead.</p>\n"
msgstr ""
"<p>Wenn Sie Ihre E-Mails oft verschlüsseln werden, empfehlen wir, dass\n"
-"Sie stattdessen [[Icedove|doc/anonymous_internet/icedove]] konfigurieren.</p>\n"
+"Sie stattdessen [[Thunderbird|doc/anonymous_internet/thunderbird]] konfigurieren.</p>\n"
diff --git a/wiki/src/doc/encryption_and_privacy/gpgapplet.warning.fa.po b/wiki/src/doc/encryption_and_privacy/gpgapplet.warning.fa.po
index 3c12218..50a1f60 100644
--- a/wiki/src/doc/encryption_and_privacy/gpgapplet.warning.fa.po
+++ b/wiki/src/doc/encryption_and_privacy/gpgapplet.warning.fa.po
@@ -69,7 +69,7 @@ msgstr ""
#| "[[Claws Mail|doc/anonymous_internet/claws_mail/]] instead.</p>\n"
msgid ""
"<p>If you are going to encrypt emails often, we recommend you to set up\n"
-"[[Icedove|doc/anonymous_internet/icedove]] instead.</p>\n"
+"[[Thunderbird|doc/anonymous_internet/thunderbird]] instead.</p>\n"
msgstr ""
"<p>اگر رایانامه‌های خود را مرتب رمزگذاری می‌کنید، توصیه می‌کنیم به جای این کار\n"
"[[Claws Mail|doc/anonymous_internet/claws_mail/]] را تنظیم کنید.</p>\n"
diff --git a/wiki/src/doc/encryption_and_privacy/gpgapplet.warning.fr.po b/wiki/src/doc/encryption_and_privacy/gpgapplet.warning.fr.po
index 290bfb5..31874b0 100644
--- a/wiki/src/doc/encryption_and_privacy/gpgapplet.warning.fr.po
+++ b/wiki/src/doc/encryption_and_privacy/gpgapplet.warning.fr.po
@@ -62,7 +62,7 @@ msgstr ""
#, no-wrap
msgid ""
"<p>If you are going to encrypt emails often, we recommend you to set up\n"
-"[[Icedove|doc/anonymous_internet/icedove]] instead.</p>\n"
+"[[Thunderbird|doc/anonymous_internet/thunderbird]] instead.</p>\n"
msgstr ""
"<p>Si vous êtes amenés à souvent chiffrer des courriers électroniques, nous vous\n"
-"recommandons de plutôt configurer [[Icedove|doc/anonymous_internet/icedove]].</p>\n"
+"recommandons de plutôt configurer [[Thunderbird|doc/anonymous_internet/thunderbird]].</p>\n"
diff --git a/wiki/src/doc/encryption_and_privacy/gpgapplet.warning.it.po b/wiki/src/doc/encryption_and_privacy/gpgapplet.warning.it.po
index 3af611f..3d3f58d 100644
--- a/wiki/src/doc/encryption_and_privacy/gpgapplet.warning.it.po
+++ b/wiki/src/doc/encryption_and_privacy/gpgapplet.warning.it.po
@@ -54,5 +54,5 @@ msgstr ""
#, no-wrap
msgid ""
"<p>If you are going to encrypt emails often, we recommend you to set up\n"
-"[[Icedove|doc/anonymous_internet/icedove]] instead.</p>\n"
+"[[Thunderbird|doc/anonymous_internet/thunderbird]] instead.</p>\n"
msgstr ""
diff --git a/wiki/src/doc/encryption_and_privacy/gpgapplet.warning.mdwn b/wiki/src/doc/encryption_and_privacy/gpgapplet.warning.mdwn
index 40c4527..db72ee9 100644
--- a/wiki/src/doc/encryption_and_privacy/gpgapplet.warning.mdwn
+++ b/wiki/src/doc/encryption_and_privacy/gpgapplet.warning.mdwn
@@ -16,6 +16,6 @@ with accents) might not display correctly to the recipients of
the email.</p>
<p>If you are going to encrypt emails often, we recommend you to set up
-[[Icedove|doc/anonymous_internet/icedove]] instead.</p>
+[[Thunderbird|doc/anonymous_internet/thunderbird]] instead.</p>
</div>
diff --git a/wiki/src/doc/encryption_and_privacy/gpgapplet.warning.pt.po b/wiki/src/doc/encryption_and_privacy/gpgapplet.warning.pt.po
index 743788e..d26fef7 100644
--- a/wiki/src/doc/encryption_and_privacy/gpgapplet.warning.pt.po
+++ b/wiki/src/doc/encryption_and_privacy/gpgapplet.warning.pt.po
@@ -54,5 +54,5 @@ msgstr ""
#, no-wrap
msgid ""
"<p>If you are going to encrypt emails often, we recommend you to set up\n"
-"[[Icedove|doc/anonymous_internet/icedove]] instead.</p>\n"
+"[[Thunderbird|doc/anonymous_internet/thunderbird]] instead.</p>\n"
msgstr ""
diff --git a/wiki/src/doc/encryption_and_privacy/manage_passwords.de.po b/wiki/src/doc/encryption_and_privacy/manage_passwords.de.po
index cfa7f48..dd9aca3 100644
--- a/wiki/src/doc/encryption_and_privacy/manage_passwords.de.po
+++ b/wiki/src/doc/encryption_and_privacy/manage_passwords.de.po
@@ -274,7 +274,7 @@ msgstr ""
#~ msgid ""
#~ "When using <span class=\"application\">OpenPGP</span> with <span\n"
-#~ "class=\"application\">Icedove</span> or <span class=\"application"
+#~ "class=\"application\">Thunderbird</span> or <span class=\"application"
#~ "\">OpenPGP\n"
#~ "Applet</span> for example, you need to enter a password in a <span\n"
#~ "class=\"application\">Pinentry</span> dialog box. But you cannot copy "
@@ -287,7 +287,7 @@ msgstr ""
#~ msgstr ""
#~ "Wenn Sie <span class=\"application\">OpenPGP</span> beispielsweise mit "
#~ "<span\n"
-#~ "class=\"application\">Icedove</span> oder dem <span class=\"application"
+#~ "class=\"application\">Thunderbird</span> oder dem <span class=\"application"
#~ "\">OpenPGP\n"
#~ "Applet</span> verwenden, müssen Sie Ihr Passwort in das <span\n"
#~ "class=\"application\">Pinentry</span>-Eingabefenster eingeben. Sie können "
@@ -322,14 +322,14 @@ msgstr ""
#~ msgid ""
#~ "0. Use <span class=\"application\">OpenPGP</span> with <span\n"
-#~ "class=\"application\">Icedove</span> or <span class=\"application"
+#~ "class=\"application\">Thunderbird</span> or <span class=\"application"
#~ "\">OpenPGP\n"
#~ "Applet</span> until the <span class=\"application\">Pinentry</span> "
#~ "dialog\n"
#~ "box appears.\n"
#~ msgstr ""
#~ "0. Verwenden Sie <span class=\"application\">OpenPGP</span> mit <span\n"
-#~ "class=\"application\">Icedove</span> oder dem <span class=\"application"
+#~ "class=\"application\">Thunderbird</span> oder dem <span class=\"application"
#~ "\">\n"
#~ "OpenPGP Applet</span>, bis der <span class=\"application\">Pinentry</"
#~ "span>-Dialog\n"
diff --git a/wiki/src/doc/encryption_and_privacy/manage_passwords.fa.po b/wiki/src/doc/encryption_and_privacy/manage_passwords.fa.po
index 2590d5f..bfd3e8d 100644
--- a/wiki/src/doc/encryption_and_privacy/manage_passwords.fa.po
+++ b/wiki/src/doc/encryption_and_privacy/manage_passwords.fa.po
@@ -284,7 +284,7 @@ msgstr ""
#~| "your will.\n"
#~ msgid ""
#~ "When using <span class=\"application\">OpenPGP</span> with <span\n"
-#~ "class=\"application\">Icedove</span> or <span class=\"application"
+#~ "class=\"application\">Thunderbird</span> or <span class=\"application"
#~ "\">OpenPGP\n"
#~ "Applet</span> for example, you need to enter a password in a <span\n"
#~ "class=\"application\">Pinentry</span> dialog box. But you cannot copy "
@@ -336,7 +336,7 @@ msgstr ""
#~| "box appears.\n"
#~ msgid ""
#~ "0. Use <span class=\"application\">OpenPGP</span> with <span\n"
-#~ "class=\"application\">Icedove</span> or <span class=\"application"
+#~ "class=\"application\">Thunderbird</span> or <span class=\"application"
#~ "\">OpenPGP\n"
#~ "Applet</span> until the <span class=\"application\">Pinentry</span> "
#~ "dialog\n"
diff --git a/wiki/src/doc/encryption_and_privacy/manage_passwords.fr.po b/wiki/src/doc/encryption_and_privacy/manage_passwords.fr.po
index fc60022..b6bcb9b 100644
--- a/wiki/src/doc/encryption_and_privacy/manage_passwords.fr.po
+++ b/wiki/src/doc/encryption_and_privacy/manage_passwords.fr.po
@@ -291,7 +291,7 @@ msgstr ""
#~| "your will.\n"
#~ msgid ""
#~ "When using <span class=\"application\">OpenPGP</span> with <span\n"
-#~ "class=\"application\">Icedove</span> or <span class=\"application"
+#~ "class=\"application\">Thunderbird</span> or <span class=\"application"
#~ "\">OpenPGP\n"
#~ "Applet</span> for example, you need to enter a password in a <span\n"
#~ "class=\"application\">Pinentry</span> dialog box. But you cannot copy "
@@ -346,7 +346,7 @@ msgstr ""
#~| "box appears.\n"
#~ msgid ""
#~ "0. Use <span class=\"application\">OpenPGP</span> with <span\n"
-#~ "class=\"application\">Icedove</span> or <span class=\"application"
+#~ "class=\"application\">Thunderbird</span> or <span class=\"application"
#~ "\">OpenPGP\n"
#~ "Applet</span> until the <span class=\"application\">Pinentry</span> "
#~ "dialog\n"
diff --git a/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.de.po b/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.de.po
index 2d57183..7508929 100644
--- a/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.de.po
+++ b/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2016-02-05 15:09+0100\n"
+"POT-Creation-Date: 2017-05-05 13:08+0000\n"
"PO-Revision-Date: 2015-12-02 14:27+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -146,31 +146,6 @@ msgid "<div class=\"note\">\n"
msgstr "<div class=\"note\">\n"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<p>If your disks use LVM (Logical Volume Manager), you can start the\n"
-#| "volume groups on the disks and mount logical volumes using\n"
-#| "<span class=\"application\">GNOME Disk Utility</span>.</p>\n"
-msgid ""
-"<p>If your disks use LVM (Logical Volume Manager), for example if you\n"
-"use the full disk encryption of many Linux distributions, you can:</p>\n"
-msgstr ""
-"<p>Wenn Ihre Speichermedien LVM (Logical Volume Manager) benutzen, können\n"
-"Sie mithilfe der <span class=\"application\">GNOME Laufwerksverwaltung</span>\n"
-"Laufwerksgruppen auf den Speichermedien starten und die logischen Laufwerke einhängen.</p>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<ol>\n"
-"<li>Start the volume group by executing <span class=\"command\">vgchange\n"
-"-ay</span> in a root terminal.</li>\n"
-"<li>Mount logical volumes using <span class=\"application\">GNOME\n"
-"Disks</span>.</li>\n"
-"</ol>\n"
-msgstr ""
-
-#. type: Plain text
#, no-wrap
msgid ""
"<p>If you have a GNU/Linux system on your disks, you can only access\n"
@@ -189,3 +164,16 @@ msgstr ""
"<p>In allen Fällen könnten Berechtigungsprobleme auftreten. Um\n"
"Einschränkungen durch Berechtigungen zu umgehen, können Sie <span class=\"application\">Nautilus</span>\n"
"mit Administrationsrechten ausführen.</p>\n"
+
+#, fuzzy
+#~| msgid ""
+#~| "<p>If your disks use LVM (Logical Volume Manager), you can start the\n"
+#~| "volume groups on the disks and mount logical volumes using\n"
+#~| "<span class=\"application\">GNOME Disk Utility</span>.</p>\n"
+#~ msgid ""
+#~ "<p>If your disks use LVM (Logical Volume Manager), for example if you\n"
+#~ "use the full disk encryption of many Linux distributions, you can:</p>\n"
+#~ msgstr ""
+#~ "<p>Wenn Ihre Speichermedien LVM (Logical Volume Manager) benutzen, können\n"
+#~ "Sie mithilfe der <span class=\"application\">GNOME Laufwerksverwaltung</span>\n"
+#~ "Laufwerksgruppen auf den Speichermedien starten und die logischen Laufwerke einhängen.</p>\n"
diff --git a/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.fa.po b/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.fa.po
index 76f6ecb..06e7592 100644
--- a/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.fa.po
+++ b/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.fa.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2016-02-05 15:09+0100\n"
+"POT-Creation-Date: 2017-05-05 13:08+0000\n"
"PO-Revision-Date: 2015-10-14 19:35+0000\n"
"Last-Translator: sprint5 <translation5@451f.org>\n"
"Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/"
@@ -151,31 +151,6 @@ msgid "<div class=\"note\">\n"
msgstr "<div class=\"note\">\n"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<p>If your disks use LVM (Logical Volume Manager), you can start the\n"
-#| "volume groups on the disks and mount logical volumes using\n"
-#| "<span class=\"application\">GNOME Disk Utility</span>.</p>\n"
-msgid ""
-"<p>If your disks use LVM (Logical Volume Manager), for example if you\n"
-"use the full disk encryption of many Linux distributions, you can:</p>\n"
-msgstr ""
-"<p>اگر دیسک‌های شما از ال‌وی‌ام (Logical Volume Manager) استفاده می‌کنند\n"
-"می‌توانید با استفاده از <span class=\"application\">ابزار دیسک گنوم</span>\n"
-"گروه‌های درایوهای دیسک‌ها را راه‌اندازی کرده و درایوهای منطقی را مشخص کنید.</p>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<ol>\n"
-"<li>Start the volume group by executing <span class=\"command\">vgchange\n"
-"-ay</span> in a root terminal.</li>\n"
-"<li>Mount logical volumes using <span class=\"application\">GNOME\n"
-"Disks</span>.</li>\n"
-"</ol>\n"
-msgstr ""
-
-#. type: Plain text
#, no-wrap
msgid ""
"<p>If you have a GNU/Linux system on your disks, you can only access\n"
@@ -194,3 +169,16 @@ msgstr ""
"<p>در تمام موارد ممکن است دچار مشکلات مرتبط با اجازه‌ها شوید. برای \n"
"خلاص شدن از محدودیت‌های اجازه‌ها می‌توانید <span class=\"application\">ناتیلوس</span>\n"
"را با حقوق مدیریتی اجرا کنید.</p>\n"
+
+#, fuzzy
+#~| msgid ""
+#~| "<p>If your disks use LVM (Logical Volume Manager), you can start the\n"
+#~| "volume groups on the disks and mount logical volumes using\n"
+#~| "<span class=\"application\">GNOME Disk Utility</span>.</p>\n"
+#~ msgid ""
+#~ "<p>If your disks use LVM (Logical Volume Manager), for example if you\n"
+#~ "use the full disk encryption of many Linux distributions, you can:</p>\n"
+#~ msgstr ""
+#~ "<p>اگر دیسک‌های شما از ال‌وی‌ام (Logical Volume Manager) استفاده می‌کنند\n"
+#~ "می‌توانید با استفاده از <span class=\"application\">ابزار دیسک گنوم</span>\n"
+#~ "گروه‌های درایوهای دیسک‌ها را راه‌اندازی کرده و درایوهای منطقی را مشخص کنید.</p>\n"
diff --git a/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.fr.po b/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.fr.po
index 134686d..fe3bc68 100644
--- a/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.fr.po
+++ b/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2016-02-05 15:09+0100\n"
+"POT-Creation-Date: 2017-05-05 13:08+0000\n"
"PO-Revision-Date: 2016-06-11 09:34+0100\n"
"Last-Translator: Chre <tor@renaudineau.org>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -149,32 +149,6 @@ msgstr "<div class=\"note\">\n"
#. type: Plain text
#, no-wrap
msgid ""
-"<p>If your disks use LVM (Logical Volume Manager), for example if you\n"
-"use the full disk encryption of many Linux distributions, you can:</p>\n"
-msgstr ""
-"<p>Si vos disques utilisent LVM (Logical Volume Manager ou gestionnaire de volumes logiques en français), par exemple si vous\n"
-"utilisez le chiffrement complet de disque que propose beaucoup de distributions Linux, vous pouvez :</p>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<ol>\n"
-"<li>Start the volume group by executing <span class=\"command\">vgchange\n"
-"-ay</span> in a root terminal.</li>\n"
-"<li>Mount logical volumes using <span class=\"application\">GNOME\n"
-"Disks</span>.</li>\n"
-"</ol>\n"
-msgstr ""
-"<ol>\n"
-"<li>Démarrer le groupe de volumes en exécutant <span class=\"command\">vgchange\n"
-"-ay</span> dans un terminal administrateur.</li>\n"
-"<li>Monter les volumes logiques en utilisant l'utilitaire <span class=\"application\">Disques\n"
-"de GNOME</span>.</li>\n"
-"</ol>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
"<p>If you have a GNU/Linux system on your disks, you can only access\n"
"files owned by the first user (<code>uid=1000</code>) on that system.</p>\n"
msgstr ""
@@ -192,6 +166,28 @@ msgstr ""
"ces limitations dues aux permissions, vous pouvez lancer <span class=\"application\">Nautilus</span>\n"
"avec les droits d'administration.</p>\n"
+#~ msgid ""
+#~ "<p>If your disks use LVM (Logical Volume Manager), for example if you\n"
+#~ "use the full disk encryption of many Linux distributions, you can:</p>\n"
+#~ msgstr ""
+#~ "<p>Si vos disques utilisent LVM (Logical Volume Manager ou gestionnaire de volumes logiques en français), par exemple si vous\n"
+#~ "utilisez le chiffrement complet de disque que propose beaucoup de distributions Linux, vous pouvez :</p>\n"
+
+#~ msgid ""
+#~ "<ol>\n"
+#~ "<li>Start the volume group by executing <span class=\"command\">vgchange\n"
+#~ "-ay</span> in a root terminal.</li>\n"
+#~ "<li>Mount logical volumes using <span class=\"application\">GNOME\n"
+#~ "Disks</span>.</li>\n"
+#~ "</ol>\n"
+#~ msgstr ""
+#~ "<ol>\n"
+#~ "<li>Démarrer le groupe de volumes en exécutant <span class=\"command\">vgchange\n"
+#~ "-ay</span> dans un terminal administrateur.</li>\n"
+#~ "<li>Monter les volumes logiques en utilisant l'utilitaire <span class=\"application\">Disques\n"
+#~ "de GNOME</span>.</li>\n"
+#~ "</ol>\n"
+
#~ msgid "Open the *Nautilus* file manager."
#~ msgstr "Ouvrir le gestionnaire de fichier *Nautilus*."
diff --git a/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.it.po b/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.it.po
index 7bb380f..551d1f4 100644
--- a/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.it.po
+++ b/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.it.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-02-13 03:03+0100\n"
+"POT-Creation-Date: 2017-05-05 13:08+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: ita <transitails@inventati.org>\n"
@@ -121,24 +121,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"<p>If your disks use LVM (Logical Volume Manager), for example if you\n"
-"use the full disk encryption of many Linux distributions, you can:</p>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<ol>\n"
-"<li>Start the volume group by executing <span class=\"command\">vgchange\n"
-"-ay</span> in a root terminal.</li>\n"
-"<li>Mount logical volumes using <span class=\"application\">GNOME\n"
-"Disks</span>.</li>\n"
-"</ol>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
"<p>If you have a GNU/Linux system on your disks, you can only access\n"
"files owned by the first user (<code>uid=1000</code>) on that system.</p>\n"
msgstr ""
diff --git a/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.mdwn b/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.mdwn
index acf049f..a130eaf 100644
--- a/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.mdwn
+++ b/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.mdwn
@@ -52,16 +52,6 @@ if your system was shut down properly.</p>
<div class="note">
-<p>If your disks use LVM (Logical Volume Manager), for example if you
-use the full disk encryption of many Linux distributions, you can:</p>
-
-<ol>
-<li>Start the volume group by executing <span class="command">vgchange
--ay</span> in a root terminal.</li>
-<li>Mount logical volumes using <span class="application">GNOME
-Disks</span>.</li>
-</ol>
-
<p>If you have a GNU/Linux system on your disks, you can only access
files owned by the first user (<code>uid=1000</code>) on that system.</p>
diff --git a/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.pt.po b/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.pt.po
index bf60060..240090b 100644
--- a/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.pt.po
+++ b/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-02-05 15:09+0100\n"
+"POT-Creation-Date: 2017-05-05 13:08+0000\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"
@@ -121,24 +121,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"<p>If your disks use LVM (Logical Volume Manager), for example if you\n"
-"use the full disk encryption of many Linux distributions, you can:</p>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<ol>\n"
-"<li>Start the volume group by executing <span class=\"command\">vgchange\n"
-"-ay</span> in a root terminal.</li>\n"
-"<li>Mount logical volumes using <span class=\"application\">GNOME\n"
-"Disks</span>.</li>\n"
-"</ol>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
"<p>If you have a GNU/Linux system on your disks, you can only access\n"
"files owned by the first user (<code>uid=1000</code>) on that system.</p>\n"
msgstr ""
diff --git a/wiki/src/doc/first_steps.index.mdwn b/wiki/src/doc/first_steps.index.mdwn
index 35a49dc..cb5b115 100644
--- a/wiki/src/doc/first_steps.index.mdwn
+++ b/wiki/src/doc/first_steps.index.mdwn
@@ -2,9 +2,7 @@
- [[!traillink Startup_options|first_steps/startup_options]]
- [[!traillink Administration_password|first_steps/startup_options/administration_password]]
- [[!traillink MAC_address_spoofing|first_steps/startup_options/mac_spoofing]]
- - [[!traillink Network_configuration|first_steps/startup_options/network_configuration]]
- - [[!traillink Tor_bridge_mode|first_steps/startup_options/bridge_mode]]
- - [[!traillink Disabling_all_networking_(offline_mode)|first_steps/startup_options/offline_mode]]
+ - [[!traillink Tor_bridge_mode|first_steps/startup_options/bridge_mode]]
- [[!traillink Introduction_to_GNOME_and_the_Tails_desktop|first_steps/introduction_to_gnome_and_the_tails_desktop]]
- [[!traillink Accessibility|first_steps/accessibility]]
- [[!traillink Encrypted_persistence|first_steps/persistence]]
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 2a1af27..185dcb8 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
@@ -252,19 +252,19 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!img doc/first_steps/persistence/icedove.png link=no]]\n"
-msgstr "[[!img doc/first_steps/persistence/icedove.png link=no]]\n"
+msgid "[[!img doc/first_steps/persistence/thunderbird.png link=no]]\n"
+msgstr "[[!img doc/first_steps/persistence/thunderbird.png link=no]]\n"
#. type: Plain text
#, no-wrap
msgid ""
-"<div class=\"text\"><strong>Icedove</strong>: email client<br />\n"
-"[[See the corresponding documentation|anonymous_internet/icedove]]\n"
+"<div class=\"text\"><strong>Thunderbird</strong>: email client<br />\n"
+"[[See the corresponding documentation|anonymous_internet/thunderbird]]\n"
"</div>\n"
"</div>\n"
msgstr ""
-"<div class=\"text\"><strong>Icedove</strong>: E-Mail-Programm<br />\n"
-"[[Lesen Sie die entsprechende Dokumentation|anonymous_internet/icedove]]\n"
+"<div class=\"text\"><strong>Thunderbird</strong>: E-Mail-Programm<br />\n"
+"[[Lesen Sie die entsprechende Dokumentation|anonymous_internet/thunderbird]]\n"
"</div>\n"
"</div>\n"
@@ -663,8 +663,8 @@ msgstr ""
"Um sich mit einem FTP- oder SFTP-Server zu verbinden, wählen Sie\n"
"<span class=\"guilabel\">Mit Server verbinden</span></span>.\n"
-#~ msgid "<a id=\"icedove\"></a>\n"
-#~ msgstr "<a id=\"icedove\"></a>\n"
+#~ msgid "<a id=\"thunderbird\"></a>\n"
+#~ msgstr "<a id=\"thunderbird\"></a>\n"
#, fuzzy
#~| msgid "<a id=\"terminal\"></a>\n"
diff --git a/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fa.po b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fa.po
index abce34c..158e665 100644
--- a/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fa.po
+++ b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fa.po
@@ -252,7 +252,7 @@ msgstr ""
#. type: Plain text
#, fuzzy, no-wrap
#| msgid "[[!img florence.png link=no]]\n"
-msgid "[[!img doc/first_steps/persistence/icedove.png link=no]]\n"
+msgid "[[!img doc/first_steps/persistence/thunderbird.png link=no]]\n"
msgstr "[[!img florence.png link=no]]\n"
#. type: Plain text
@@ -263,8 +263,8 @@ msgstr "[[!img florence.png link=no]]\n"
#| "</div>\n"
#| "</div>\n"
msgid ""
-"<div class=\"text\"><strong>Icedove</strong>: email client<br />\n"
-"[[See the corresponding documentation|anonymous_internet/icedove]]\n"
+"<div class=\"text\"><strong>Thunderbird</strong>: email client<br />\n"
+"[[See the corresponding documentation|anonymous_internet/thunderbird]]\n"
"</div>\n"
"</div>\n"
msgstr ""
@@ -687,7 +687,7 @@ msgstr ""
#, fuzzy
#~| msgid "<a id=\"help\"></a>\n"
-#~ msgid "<a id=\"icedove\"></a>\n"
+#~ msgid "<a id=\"thunderbird\"></a>\n"
#~ msgstr "<a id=\"help\"></a>\n"
#, fuzzy
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 9122aa4..13d57a9 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
@@ -252,19 +252,19 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!img doc/first_steps/persistence/icedove.png link=no]]\n"
-msgstr "[[!img doc/first_steps/persistence/icedove.png link=no]]\n"
+msgid "[[!img doc/first_steps/persistence/thunderbird.png link=no]]\n"
+msgstr "[[!img doc/first_steps/persistence/thunderbird.png link=no]]\n"
#. type: Plain text
#, no-wrap
msgid ""
-"<div class=\"text\"><strong>Icedove</strong>: email client<br />\n"
-"[[See the corresponding documentation|anonymous_internet/icedove]]\n"
+"<div class=\"text\"><strong>Thunderbird</strong>: email client<br />\n"
+"[[See the corresponding documentation|anonymous_internet/thunderbird]]\n"
"</div>\n"
"</div>\n"
msgstr ""
-"<div class=\"text\"><strong>Icedove</strong> : client email<br />\n"
-"[[Voir la documentation correspondante|anonymous_internet/icedove]]\n"
+"<div class=\"text\"><strong>Thunderbird</strong> : client email<br />\n"
+"[[Voir la documentation correspondante|anonymous_internet/thunderbird]]\n"
"</div>\n"
"</div>\n"
@@ -663,7 +663,7 @@ msgstr ""
#, fuzzy
#~| msgid "<a id=\"help\"></a>\n"
-#~ msgid "<a id=\"icedove\"></a>\n"
+#~ msgid "<a id=\"thunderbird\"></a>\n"
#~ msgstr "<a id=\"help\"></a>\n"
#, fuzzy
diff --git a/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.it.po b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.it.po
index 5f911fe..83b8c7e 100644
--- a/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.it.po
+++ b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.it.po
@@ -285,7 +285,7 @@ msgstr ""
#. type: Plain text
#, fuzzy, no-wrap
#| msgid "[[!img tor-stopping.png link=no]]\n"
-msgid "[[!img doc/first_steps/persistence/icedove.png link=no]]\n"
+msgid "[[!img doc/first_steps/persistence/thunderbird.png link=no]]\n"
msgstr "[[!img tor-stopping.png link=no]]\n"
#. type: Plain text
@@ -296,8 +296,8 @@ msgstr "[[!img tor-stopping.png link=no]]\n"
#| "</div>\n"
#| "</div>\n"
msgid ""
-"<div class=\"text\"><strong>Icedove</strong>: email client<br />\n"
-"[[See the corresponding documentation|anonymous_internet/icedove]]\n"
+"<div class=\"text\"><strong>Thunderbird</strong>: email client<br />\n"
+"[[See the corresponding documentation|anonymous_internet/thunderbird]]\n"
"</div>\n"
"</div>\n"
msgstr ""
@@ -748,7 +748,7 @@ msgstr ""
#, fuzzy
#~| msgid "<a id=\"help\"></a>\n"
-#~ msgid "<a id=\"icedove\"></a>\n"
+#~ msgid "<a id=\"thunderbird\"></a>\n"
#~ msgstr "<a id=\"help\"></a>\n"
#, fuzzy
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 40e0ccc..bb7a47e 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
@@ -92,9 +92,9 @@ shortcuts allow you to launch the most frequently used applications:
</div>
<div class="icon">
-[[!img doc/first_steps/persistence/icedove.png link=no]]
-<div class="text"><strong>Icedove</strong>: email client<br />
-[[See the corresponding documentation|anonymous_internet/icedove]]
+[[!img doc/first_steps/persistence/thunderbird.png link=no]]
+<div class="text"><strong>Thunderbird</strong>: email client<br />
+[[See the corresponding documentation|anonymous_internet/thunderbird]]
</div>
</div>
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 5d0bc75..429cac8 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
@@ -284,7 +284,7 @@ msgstr ""
#. type: Plain text
#, fuzzy, no-wrap
#| msgid "[[!img florence.png link=no]]\n"
-msgid "[[!img doc/first_steps/persistence/icedove.png link=no]]\n"
+msgid "[[!img doc/first_steps/persistence/thunderbird.png link=no]]\n"
msgstr "[[!img florence.png link=no]]\n"
#. type: Plain text
@@ -296,8 +296,8 @@ msgstr "[[!img florence.png link=no]]\n"
#| "</div>\n"
#| "</div>\n"
msgid ""
-"<div class=\"text\"><strong>Icedove</strong>: email client<br />\n"
-"[[See the corresponding documentation|anonymous_internet/icedove]]\n"
+"<div class=\"text\"><strong>Thunderbird</strong>: email client<br />\n"
+"[[See the corresponding documentation|anonymous_internet/thunderbird]]\n"
"</div>\n"
"</div>\n"
msgstr ""
@@ -742,7 +742,7 @@ msgstr ""
#, fuzzy
#~| msgid "<a id=\"terminal\"></a>\n"
-#~ msgid "<a id=\"icedove\"></a>\n"
+#~ msgid "<a id=\"thunderbird\"></a>\n"
#~ msgstr "<a id=\"terminal\"></a>\n"
#, fuzzy
diff --git a/wiki/src/doc/first_steps/persistence/configure.de.po b/wiki/src/doc/first_steps/persistence/configure.de.po
index a72c0b3..caf461a 100644
--- a/wiki/src/doc/first_steps/persistence/configure.de.po
+++ b/wiki/src/doc/first_steps/persistence/configure.de.po
@@ -351,21 +351,21 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<a id=\"icedove\"></a>\n"
-msgstr "<a id=\"icedove\"></a>\n"
+msgid "<a id=\"thunderbird\"></a>\n"
+msgstr "<a id=\"thunderbird\"></a>\n"
#. type: Plain text
#, no-wrap
-msgid "[[!img icedove.png link=no]]\n"
-msgstr "[[!img icedove.png link=no]]\n"
+msgid "[[!img thunderbird.png link=no]]\n"
+msgstr "[[!img thunderbird.png link=no]]\n"
#. type: Plain text
#, no-wrap
msgid ""
-"<div class=\"text\"><h2>Icedove</h2></div>\n"
+"<div class=\"text\"><h2>Thunderbird</h2></div>\n"
"</div>\n"
msgstr ""
-"<div class=\"text\"><h2>Icedove</h2></div>\n"
+"<div class=\"text\"><h2>Thunderbird</h2></div>\n"
"</div>\n"
#. type: Plain text
@@ -373,11 +373,11 @@ msgstr ""
msgid ""
"When this feature is activated, the configuration and emails stored\n"
"by the\n"
-"[[<span class=\"application\">Icedove</span> email client|doc/anonymous_internet/icedove]]\n"
+"[[<span class=\"application\">Thunderbird</span> email client|doc/anonymous_internet/thunderbird]]\n"
"are saved in the persistent volume.\n"
msgstr ""
"Wenn diese Funktion aktiviert ist, werden die Konfigurationen und E-Mails, die vom\n"
-"[[<span class=\"application\">Icedove</span> E-Mail-Client|doc/anonymous_internet/icedove]]\n"
+"[[<span class=\"application\">Thunderbird</span> E-Mail-Client|doc/anonymous_internet/thunderbird]]\n"
"lokal gespeichert werden, im beständigen Speicherbereich gesichert.\n"
#. type: Plain text
diff --git a/wiki/src/doc/first_steps/persistence/configure.fa.po b/wiki/src/doc/first_steps/persistence/configure.fa.po
index 629c115..8dbd555 100644
--- a/wiki/src/doc/first_steps/persistence/configure.fa.po
+++ b/wiki/src/doc/first_steps/persistence/configure.fa.po
@@ -352,13 +352,13 @@ msgstr ""
#. type: Plain text
#, fuzzy, no-wrap
-msgid "<a id=\"icedove\"></a>\n"
+msgid "<a id=\"thunderbird\"></a>\n"
msgstr "<a id=\"bitcoin\"></a>\n"
#. type: Plain text
#, fuzzy, no-wrap
#| msgid "[[!img pidgin.png link=no]]\n"
-msgid "[[!img icedove.png link=no]]\n"
+msgid "[[!img thunderbird.png link=no]]\n"
msgstr "[[!img pidgin.png link=no]]\n"
#. type: Plain text
@@ -367,7 +367,7 @@ msgstr "[[!img pidgin.png link=no]]\n"
#| "<div class=\"text\"><h2>Dotfiles</h2></div>\n"
#| "</div>\n"
msgid ""
-"<div class=\"text\"><h2>Icedove</h2></div>\n"
+"<div class=\"text\"><h2>Thunderbird</h2></div>\n"
"</div>\n"
msgstr ""
"<div class=\"text\"><h2>دات‌فایلز</h2></div>\n"
@@ -383,7 +383,7 @@ msgstr ""
msgid ""
"When this feature is activated, the configuration and emails stored\n"
"by the\n"
-"[[<span class=\"application\">Icedove</span> email client|doc/anonymous_internet/icedove]]\n"
+"[[<span class=\"application\">Thunderbird</span> email client|doc/anonymous_internet/thunderbird]]\n"
"are saved in the persistent volume.\n"
msgstr ""
"وقتی این ویژگی فعال باشد، تنظیمات و رایانامه‌هایی \n"
diff --git a/wiki/src/doc/first_steps/persistence/configure.fr.po b/wiki/src/doc/first_steps/persistence/configure.fr.po
index c8c7234..d8eb226 100644
--- a/wiki/src/doc/first_steps/persistence/configure.fr.po
+++ b/wiki/src/doc/first_steps/persistence/configure.fr.po
@@ -354,21 +354,21 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<a id=\"icedove\"></a>\n"
-msgstr "<a id=\"icedove\"></a>\n"
+msgid "<a id=\"thunderbird\"></a>\n"
+msgstr "<a id=\"thunderbird\"></a>\n"
#. type: Plain text
#, no-wrap
-msgid "[[!img icedove.png link=no]]\n"
-msgstr "[[!img icedove.png link=no]]\n"
+msgid "[[!img thunderbird.png link=no]]\n"
+msgstr "[[!img thunderbird.png link=no]]\n"
#. type: Plain text
#, no-wrap
msgid ""
-"<div class=\"text\"><h2>Icedove</h2></div>\n"
+"<div class=\"text\"><h2>Thunderbird</h2></div>\n"
"</div>\n"
msgstr ""
-"<div class=\"text\"><h2>Icedove</h2></div>\n"
+"<div class=\"text\"><h2>Thunderbird</h2></div>\n"
"</div>\n"
#. type: Plain text
@@ -376,11 +376,11 @@ msgstr ""
msgid ""
"When this feature is activated, the configuration and emails stored\n"
"by the\n"
-"[[<span class=\"application\">Icedove</span> email client|doc/anonymous_internet/icedove]]\n"
+"[[<span class=\"application\">Thunderbird</span> email client|doc/anonymous_internet/thunderbird]]\n"
"are saved in the persistent volume.\n"
msgstr ""
"Lorsque cette option est activée, tous les fichiers de configuration relatifs\n"
-"au [[client de messagerie <span class=\"application\">Icedove</span>|doc/anonymous_internet/icedove]]\n"
+"au [[client de messagerie <span class=\"application\">Thunderbird</span>|doc/anonymous_internet/thunderbird]]\n"
"ainsi que les courriers électroniques stockés localement sont sauvegardés sur le volume persistant.\n"
#. type: Plain text
diff --git a/wiki/src/doc/first_steps/persistence/configure.it.po b/wiki/src/doc/first_steps/persistence/configure.it.po
index f1fac11..8f648e1 100644
--- a/wiki/src/doc/first_steps/persistence/configure.it.po
+++ b/wiki/src/doc/first_steps/persistence/configure.it.po
@@ -357,13 +357,13 @@ msgstr ""
#. type: Plain text
#, fuzzy, no-wrap
#| msgid "<a id=\"bitcoin\"></a>\n"
-msgid "<a id=\"icedove\"></a>\n"
+msgid "<a id=\"thunderbird\"></a>\n"
msgstr "<a id=\"bitcoin\"></a>\n"
#. type: Plain text
#, fuzzy, no-wrap
#| msgid "[[!img pidgin.png link=no]]\n"
-msgid "[[!img icedove.png link=no]]\n"
+msgid "[[!img thunderbird.png link=no]]\n"
msgstr "[[!img pidgin.png link=no]]\n"
#. type: Plain text
@@ -372,7 +372,7 @@ msgstr "[[!img pidgin.png link=no]]\n"
#| "<div class=\"text\"><h2>Dotfiles</h2></div>\n"
#| "</div>\n"
msgid ""
-"<div class=\"text\"><h2>Icedove</h2></div>\n"
+"<div class=\"text\"><h2>Thunderbird</h2></div>\n"
"</div>\n"
msgstr ""
"<div class=\"text\"><h2>Dotfiles</h2></div>\n"
@@ -383,7 +383,7 @@ msgstr ""
msgid ""
"When this feature is activated, the configuration and emails stored\n"
"by the\n"
-"[[<span class=\"application\">Icedove</span> email client|doc/anonymous_internet/icedove]]\n"
+"[[<span class=\"application\">Thunderbird</span> email client|doc/anonymous_internet/thunderbird]]\n"
"are saved in the persistent volume.\n"
msgstr ""
"Quando questa opzione è attivata, la configurazione e le email memorizzate localmente\n"
diff --git a/wiki/src/doc/first_steps/persistence/configure.mdwn b/wiki/src/doc/first_steps/persistence/configure.mdwn
index a0a4588..06bfe53 100644
--- a/wiki/src/doc/first_steps/persistence/configure.mdwn
+++ b/wiki/src/doc/first_steps/persistence/configure.mdwn
@@ -135,16 +135,16 @@ are saved in the persistent volume:
All the configuration options are available from the graphical interface. There
is no need to manually edit or overwrite the configuration files.
-<a id="icedove"></a>
+<a id="thunderbird"></a>
<div class="icon">
-[[!img icedove.png link=no]]
-<div class="text"><h2>Icedove</h2></div>
+[[!img thunderbird.png link=no]]
+<div class="text"><h2>Thunderbird</h2></div>
</div>
When this feature is activated, the configuration and emails stored
by the
-[[<span class="application">Icedove</span> email client|doc/anonymous_internet/icedove]]
+[[<span class="application">Thunderbird</span> email client|doc/anonymous_internet/thunderbird]]
are saved in the persistent volume.
<a id="gnome_keyring"></a>
diff --git a/wiki/src/doc/first_steps/persistence/configure.pt.po b/wiki/src/doc/first_steps/persistence/configure.pt.po
index c3e576a..aff4731 100644
--- a/wiki/src/doc/first_steps/persistence/configure.pt.po
+++ b/wiki/src/doc/first_steps/persistence/configure.pt.po
@@ -349,13 +349,13 @@ msgstr ""
#. type: Plain text
#, fuzzy, no-wrap
#| msgid "<a id=\"pidgin\"></a>\n"
-msgid "<a id=\"icedove\"></a>\n"
+msgid "<a id=\"thunderbird\"></a>\n"
msgstr "<a id=\"pidgin\"></a>\n"
#. type: Plain text
#, fuzzy, no-wrap
#| msgid "[[!img pidgin.png link=no]]\n"
-msgid "[[!img icedove.png link=no]]\n"
+msgid "[[!img thunderbird.png link=no]]\n"
msgstr "[[!img pidgin.png link=no]]\n"
#. type: Plain text
@@ -364,7 +364,7 @@ msgstr "[[!img pidgin.png link=no]]\n"
#| "<div class=\"text\"><h2>Dotfiles</h2></div>\n"
#| "</div>\n"
msgid ""
-"<div class=\"text\"><h2>Icedove</h2></div>\n"
+"<div class=\"text\"><h2>Thunderbird</h2></div>\n"
"</div>\n"
msgstr ""
"<div class=\"text\"><h2>Dotfiles</h2></div>\n"
@@ -379,7 +379,7 @@ msgstr ""
msgid ""
"When this feature is activated, the configuration and emails stored\n"
"by the\n"
-"[[<span class=\"application\">Icedove</span> email client|doc/anonymous_internet/icedove]]\n"
+"[[<span class=\"application\">Thunderbird</span> email client|doc/anonymous_internet/thunderbird]]\n"
"are saved in the persistent volume.\n"
msgstr ""
"Quando esta funcionalidade é ativada, a configuração e as mensagens armazenadas\n"
diff --git a/wiki/src/doc/first_steps/persistence/copy.de.po b/wiki/src/doc/first_steps/persistence/copy.de.po
index 7cd658f..d019012 100644
--- a/wiki/src/doc/first_steps/persistence/copy.de.po
+++ b/wiki/src/doc/first_steps/persistence/copy.de.po
@@ -202,7 +202,7 @@ msgstr ""
msgid ""
"1. In the titlebar, choose\n"
" <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">[[!img lib/menu.png alt=\"Menu\" class=\"symbolic\" link=\"no\"]]</span>&nbsp;▸\n"
+" <span class=\"guimenu\">[[!img lib/open-menu.png alt=\"Menu\" class=\"symbolic\" link=\"no\"]]</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">New Tab</span>\n"
" </span>\n"
" and navigate to\n"
@@ -211,7 +211,7 @@ msgid ""
msgstr ""
"1. Wählen Sie in der Titelleiste\n"
" <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">[[!img lib/menu.png alt=\"Menü\" class=\"symbolic\" link=\"no\"]]</span>&nbsp;▸\n"
+" <span class=\"guimenu\">[[!img lib/open-menu.png alt=\"Menü\" class=\"symbolic\" link=\"no\"]]</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Neuer Reiter</span>\n"
" </span>\n"
" aus und navigieren Sie in diesem neuen Reiter zu dem Ordner\n"
@@ -333,12 +333,12 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
-"The <span class=\"filename\">icedove</span> folder corresponds to the <span "
-"class=\"guilabel\">[[Icedove|configure#icedove]]</span> persistence feature."
+"The <span class=\"filename\">thunderbird</span> folder corresponds to the <span "
+"class=\"guilabel\">[[Thunderbird|configure#thunderbird]]</span> persistence feature."
msgstr ""
-"Der <span class=\"filename\">icedove</span>-Ordner entspricht der Funktion "
-"des beständigen Speicherbereichs für <span class=\"guilabel\">[[Icedove|"
-"configure#icedove]]</span>."
+"Der <span class=\"filename\">thunderbird</span>-Ordner entspricht der Funktion "
+"des beständigen Speicherbereichs für <span class=\"guilabel\">[[Thunderbird|"
+"configure#thunderbird]]</span>."
#. type: Bullet: ' - '
msgid ""
diff --git a/wiki/src/doc/first_steps/persistence/copy.fa.po b/wiki/src/doc/first_steps/persistence/copy.fa.po
index 57ce494..9ff22da 100644
--- a/wiki/src/doc/first_steps/persistence/copy.fa.po
+++ b/wiki/src/doc/first_steps/persistence/copy.fa.po
@@ -232,7 +232,7 @@ msgstr ""
msgid ""
"1. In the titlebar, choose\n"
" <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">[[!img lib/menu.png alt=\"Menu\" class=\"symbolic\" link=\"no\"]]</span>&nbsp;▸\n"
+" <span class=\"guimenu\">[[!img lib/open-menu.png alt=\"Menu\" class=\"symbolic\" link=\"no\"]]</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">New Tab</span>\n"
" </span>\n"
" and navigate to\n"
@@ -371,8 +371,8 @@ msgstr ""
#| "<span class=\"guilabel\">[[Dotfiles|configure#dotfiles]]</span> "
#| "persistence feature."
msgid ""
-"The <span class=\"filename\">icedove</span> folder corresponds to the <span "
-"class=\"guilabel\">[[Icedove|configure#icedove]]</span> persistence feature."
+"The <span class=\"filename\">thunderbird</span> folder corresponds to the <span "
+"class=\"guilabel\">[[Thunderbird|configure#thunderbird]]</span> persistence feature."
msgstr ""
"پوشهٔ <span class=\"filename\">dotfiles</span> مرتبط با ویژگی <span class="
"\"guilabel\">[[دات‌فایلز|configure#dotfiles]]</span> مانا است."
diff --git a/wiki/src/doc/first_steps/persistence/copy.fr.po b/wiki/src/doc/first_steps/persistence/copy.fr.po
index b100de5..4f434ed 100644
--- a/wiki/src/doc/first_steps/persistence/copy.fr.po
+++ b/wiki/src/doc/first_steps/persistence/copy.fr.po
@@ -202,7 +202,7 @@ msgstr ""
msgid ""
"1. In the titlebar, choose\n"
" <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">[[!img lib/menu.png alt=\"Menu\" class=\"symbolic\" link=\"no\"]]</span>&nbsp;▸\n"
+" <span class=\"guimenu\">[[!img lib/open-menu.png alt=\"Menu\" class=\"symbolic\" link=\"no\"]]</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">New Tab</span>\n"
" </span>\n"
" and navigate to\n"
@@ -211,7 +211,7 @@ msgid ""
msgstr ""
"1. Dans la barre de titre, choisissez\n"
" <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">[[!img lib/menu.png alt=\"Menu\" class=\"symbolic\" link=\"no\"]]</span>&nbsp;▸\n"
+" <span class=\"guimenu\">[[!img lib/open-menu.png alt=\"Menu\" class=\"symbolic\" link=\"no\"]]</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Nouvel onglet</span>\n"
" </span>\n"
" et naviguez jusqu'au dossier\n"
@@ -332,11 +332,11 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
-"The <span class=\"filename\">icedove</span> folder corresponds to the <span "
-"class=\"guilabel\">[[Icedove|configure#icedove]]</span> persistence feature."
+"The <span class=\"filename\">thunderbird</span> folder corresponds to the <span "
+"class=\"guilabel\">[[Thunderbird|configure#thunderbird]]</span> persistence feature."
msgstr ""
-"Le dossier <span class=\"filename\">icedove</span> correspond à l'option de "
-"persistance <span class=\"guilabel\">[[Icedove|configure#icedove]]</span>."
+"Le dossier <span class=\"filename\">thunderbird</span> correspond à l'option de "
+"persistance <span class=\"guilabel\">[[Thunderbird|configure#thunderbird]]</span>."
#. type: Bullet: ' - '
msgid ""
diff --git a/wiki/src/doc/first_steps/persistence/copy.it.po b/wiki/src/doc/first_steps/persistence/copy.it.po
index 9822f13..9fccab2 100644
--- a/wiki/src/doc/first_steps/persistence/copy.it.po
+++ b/wiki/src/doc/first_steps/persistence/copy.it.po
@@ -151,7 +151,7 @@ msgstr ""
msgid ""
"1. In the titlebar, choose\n"
" <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">[[!img lib/menu.png alt=\"Menu\" class=\"symbolic\" link=\"no\"]]</span>&nbsp;▸\n"
+" <span class=\"guimenu\">[[!img lib/open-menu.png alt=\"Menu\" class=\"symbolic\" link=\"no\"]]</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">New Tab</span>\n"
" </span>\n"
" and navigate to\n"
@@ -240,8 +240,8 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
-"The <span class=\"filename\">icedove</span> folder corresponds to the <span "
-"class=\"guilabel\">[[Icedove|configure#icedove]]</span> persistence feature."
+"The <span class=\"filename\">thunderbird</span> folder corresponds to the <span "
+"class=\"guilabel\">[[Thunderbird|configure#thunderbird]]</span> persistence feature."
msgstr ""
#. type: Bullet: ' - '
diff --git a/wiki/src/doc/first_steps/persistence/copy.mdwn b/wiki/src/doc/first_steps/persistence/copy.mdwn
index ed3470a..1426871 100644
--- a/wiki/src/doc/first_steps/persistence/copy.mdwn
+++ b/wiki/src/doc/first_steps/persistence/copy.mdwn
@@ -71,18 +71,30 @@ Copy your old files to the new persistent volume
1. Execute the <span class="code">nautilus</span> command to open the
file browser with administration rights.
-1. In the file browser, navigate to
- <span class="filename">/media/amnesia/TailsData</span>
+1. In the left pane, click on <span class="guilabel">Other Locations</span>.
+
+1. In the right pane, navigate to
+ <span class="guilabel">Computer</span>&nbsp;▸
+ <span class="guilabel">media</span>&nbsp;▸
+ <span class="guilabel">amnesia</span>&nbsp;▸
+ <span class="guilabel">TailsData</span>
to open the old persistent volume.
1. In the titlebar, choose
<span class="menuchoice">
- <span class="guimenu">[[!img lib/menu.png alt="Menu" class="symbolic" link="no"]]</span>&nbsp;▸
- <span class="guimenuitem">New Tab</span>
+ <span class="guimenu">[[!img lib/open-menu.png alt="Menu" class="symbolic" link="no"]]</span>&nbsp;▸
+ <span class="guimenuitem">[[!img lib/tab-new.png alt="New tab" class="symbolic" link="no"]]</span>
</span>
- and navigate to
- <span class="filename">/live/persistence/TailsData_unlocked</span> in
- this new tab.
+ to open a new tab.
+
+1. In the left pane, click on <span class="guilabel">Other Locations</span>.
+
+1. In the right pane, navigate to
+ <span class="guilabel">Computer</span>&nbsp;▸
+ <span class="guilabel">live</span>&nbsp;▸
+ <span class="guilabel">persistence</span>&nbsp;▸
+ <span class="guilabel">TailsData_unlocked</span>
+ to open the new persistent volume.
1. Click on the <span class="guilabel">TailsData</span> tab.
@@ -124,8 +136,8 @@ Copy your old files to the new persistent volume
- The <span class="filename">gnupg</span> folder corresponds to the
<span class="guilabel">[[GnuPG|configure#gnupg]]</span>
persistence feature.
- - The <span class="filename">icedove</span> folder corresponds to the
- <span class="guilabel">[[Icedove|configure#icedove]]</span>
+ - The <span class="filename">thunderbird</span> folder corresponds to the
+ <span class="guilabel">[[Thunderbird|configure#thunderbird]]</span>
persistence feature.
- The <span class="filename">nm-connections</span> folder corresponds to the
<span class="guilabel">[[Network Connections|configure#network_connections]]</span>
diff --git a/wiki/src/doc/first_steps/persistence/copy.pt.po b/wiki/src/doc/first_steps/persistence/copy.pt.po
index 66779c6..cfa18e6 100644
--- a/wiki/src/doc/first_steps/persistence/copy.pt.po
+++ b/wiki/src/doc/first_steps/persistence/copy.pt.po
@@ -250,7 +250,7 @@ msgstr ""
msgid ""
"1. In the titlebar, choose\n"
" <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">[[!img lib/menu.png alt=\"Menu\" class=\"symbolic\" link=\"no\"]]</span>&nbsp;▸\n"
+" <span class=\"guimenu\">[[!img lib/open-menu.png alt=\"Menu\" class=\"symbolic\" link=\"no\"]]</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">New Tab</span>\n"
" </span>\n"
" and navigate to\n"
@@ -395,8 +395,8 @@ msgstr ""
#| "<span class=\"guilabel\">[[Dotfiles|configure#dotfiles]]</span> "
#| "persistence feature."
msgid ""
-"The <span class=\"filename\">icedove</span> folder corresponds to the <span "
-"class=\"guilabel\">[[Icedove|configure#icedove]]</span> persistence feature."
+"The <span class=\"filename\">thunderbird</span> folder corresponds to the <span "
+"class=\"guilabel\">[[Thunderbird|configure#thunderbird]]</span> persistence feature."
msgstr ""
"A pasta <span class=\"filename\">dotfiles</span> corresponde à "
"funcionalidade de persistência dos <span class=\"guilabel\">[[Dotfiles|"
diff --git a/wiki/src/doc/first_steps/persistence/use.mdwn b/wiki/src/doc/first_steps/persistence/use.mdwn
index 0b8d9e4..b089730 100644
--- a/wiki/src/doc/first_steps/persistence/use.mdwn
+++ b/wiki/src/doc/first_steps/persistence/use.mdwn
@@ -7,13 +7,12 @@
Enable the persistent volume
============================
-1. When starting Tails, in the
-<span class="guilabel">Use persistence?</span> dialog of [[Tails
-Greeter|startup_options#tails_greeter]], choose <span class="guilabel">Yes</span> to
-enable the persistent volume for the current working session.
+When starting Tails, in the
+<span class="guilabel">Encrypted Persistent Storage</span> section of
+[[<span class="application">Tails Greeter</span>|startup_options#tails_greeter]], enter your passphrase and click
+<span class="button">Unlock</span>.
-2. Enter the passphrase of the persistent volume in the
-<span class="guilabel">Passphrase</span> text box.
+[[!img startup_options/persistence.png link="no" alt=""]]
Use the persistent volume
=========================
diff --git a/wiki/src/doc/first_steps/startup_options.mdwn b/wiki/src/doc/first_steps/startup_options.mdwn
index 6ff7077..8230375 100644
--- a/wiki/src/doc/first_steps/startup_options.mdwn
+++ b/wiki/src/doc/first_steps/startup_options.mdwn
@@ -3,7 +3,7 @@
When starting Tails, you can specify startup options to alter some of its basic
functioning. The two ways of specifying startup options are the following:
-[[!toc levels=1]]
+[[!toc levels=2]]
<a id="boot_loader_menu"></a>
<a id="boot_menu"></a> <!-- for backward compatibility -->
@@ -50,27 +50,125 @@ appear after the <span class="application">Boot Loader Menu</span>, but before t
<span class="application">GNOME Desktop</span> appears. This is how to first
screen of <span class="application">Tails Greeter</span> looks like:
-[[!img tails-greeter-welcome-to-tails.png link=no alt="Welcome to Tails. More
-options? Yes, and No toggle button, and Login button."]]
+[[!img tails-greeter-welcome-to-tails.png link=no alt="Welcome to Tails!"]]
-**To start Tails without options**, click on the
-<span class="button">Login</span> button, or just press
-<span class="keycap">Enter</span>.
+You can activate assistive technologies, like a screen reader or large
+text, from the universal access menu (the
+[[!img lib/preferences-desktop-accessibility.png alt="Universal Access" class="symbolic" link="no"]]
+icon which looks like a person) in the top bar.
-**To start Tails in languages other than English**, select the one you
-want from the menu at the bottom of the screen. You can also adapt
-your country and keyboard layout. When you do that, <span class="application">Tails Greeter</span> itself
-switches language.
+To start Tails without options, click on the
+<span class="button">Start Tails</span> button.
-**To set more options**, click on the <span class="button">Yes</span> button.
-Then click on the <span class="button">Forward</span> button.
+<a id="locale"></a>
-Here is a list of options that you can set using <span class="application">Tails
-Greeter</span>:
+Language & region
+-----------------
- - [[Administration password|administration_password]]
- - [[MAC address spoofing|mac_spoofing]]
- - [[Network configuration|network_configuration]]
- - [[Tor bridge mode|bridge_mode]]
- - [[Disabling all networking (offline_mode)|offline_mode]]
- - [[Encrypted persistence|doc/first_steps/persistence/use]]
+You can configure Tails depending on your language and location from
+<span class="application">Tails Greeter</span>.
+
+[[!img locale.png link="no" alt="Language & Region section of Tails Greeter"]]
+
+* The <span class="guilabel">Language</span> option allows you to change
+ the main language of the interface.
+
+ Text that is not translated yet will appear in English. You can [[help
+ to translate more text|contribute/how/translate]].
+
+* The <span class="guilabel">Keyboard Layout</span> option allows you to
+ change the layout of the keyboard. For example to switch to an
+ *AZERTY* keyboard which is common in France.
+
+ You will still be able to switch between different keyboard layouts from the
+ desktop after starting Tails.
+
+ [[!img introduction_to_gnome_and_the_tails_desktop/keyboard.png size="267x" link="no" alt="Menu in the top-right corner of the desktop to switch between different keyboard layouts"]]
+
+* The <span class="guilabel">Formats</span> option allows you to change
+ the date and time format, first day of the week, measurement units,
+ and default paper size according to the standards in use in a country.
+
+ For example, the USA and the United Kingdom, two English-speaking countries,
+ have different standards:
+
+ <table>
+ <tr><td></td><td>USA</td><td>United Kingdom</td></tr>
+ <tr><td>Date & time</td><td>3/17/2017 3:56 PM</td><td>17/03/2017 15:56</td></tr>
+ <tr><td>First day of the week</td><td>Sunday</td><td>Monday</td></tr>
+ <tr><td>Unit system</td><td>Imperial</td><td>Metric</td></tr>
+ <tr><td>Paper size</td><td>Letter</td><td>A4</td></tr>
+ </table>
+
+ With this option you can also display the calendar in a different language
+ than the main language. For example, to display a US calendar, with weeks
+ starting on Sunday, when the main language is Russian.
+
+ [[!img US_calendar_in_Russian.png link="no" alt=""]]
+
+<a id="persistence"></a>
+
+Encrypted persistence storage
+-----------------------------
+
+If an [[encrypted persistence storage]] is detected on the USB stick, an
+additional section appears in <span class="application">Tails
+Greeter</span> below the <span class="guilabel">Language & Region</span>
+section:
+
+[[!img persistence.png link="no" alt=""]]
+
+<a id="additional"></a>
+
+Additional settings
+-------------------
+
+Tails is configured with care to be as safe as possible by default. But,
+depending on your situation, you can change one of the following
+settings from <span class="application">Tails Greeter</span>.
+
+[[!img additional.png link="no" alt="Additional settings of Tails Greeter"]]
+
+- Set an <span class="guilabel">Administration Password</span> to be
+ able to perform administrative tasks like installing additional
+ software or accessing the internal hard disks of the computer.
+
+ [[See our documentation about the administration password.|administration_password]]
+
+- Disable <span class="guilabel">MAC Address Spoofing</span> to prevent
+ connectivity problems with your network interfaces.
+
+ [[See our documentation about MAC address spoofing.|mac_spoofing]]
+
+- Change the <span class="guilabel">Network Configuration</span> to either:
+
+ - Connect directly to the Tor network (default).
+
+ - Configure a Tor bridge or local proxy:
+
+ - If you want to use Tor bridges because your Internet connection is
+ censored or you want to hide the fact that you are using Tor.
+ - If you need to use a local proxy to access the Internet.
+
+ After starting Tails and connecting to a network, an assistant will
+ guide you through the configuration of Tor.
+
+ [[See our documentation about Tor bridges.|bridge_mode]]
+
+ - Disable all networking if you want to work completely offline with
+ additional security.
+
+Keyboard shortcuts
+------------------
+
+<table>
+<tr><td><span class="keycap">Alt+L</span></td><td><span class="guilabel">Language</td></tr>
+<tr><td><span class="keycap">Alt+K</span></td><td><span class="guilabel">Keyboard Layout</td></tr>
+<tr><td><span class="keycap">Alt+F</span></td><td><span class="guilabel">Formats</td></tr>
+<tr><td><span class="keycap">Alt+P</span></td><td><span class="guilabel">Encrypted Persistent Storage</td></tr>
+<tr><td><span class="keycap">Alt+A</span></td><td><span class="guilabel">Additional Settings</td></tr>
+<tr><td><span class="keycap">Ctrl+Shift+A</span></td><td><span class="guilabel">Administration Password</td></tr>
+<tr><td><span class="keycap">Ctrl+Shift+M</span></td><td><span class="guilabel">MAC Address Spoofing</td></tr>
+<tr><td><span class="keycap">Ctrl+Shift+N</span></td><td><span class="guilabel">Network Configuration</td></tr>
+<tr><td><span class="keycap">Alt+S</td><td><span class="guilabel">Start Tails</td></tr>
+</table>
diff --git a/wiki/src/doc/first_steps/startup_options/US_calendar_in_Russian.png b/wiki/src/doc/first_steps/startup_options/US_calendar_in_Russian.png
new file mode 100644
index 0000000..3306750
--- /dev/null
+++ b/wiki/src/doc/first_steps/startup_options/US_calendar_in_Russian.png
Binary files differ
diff --git a/wiki/src/doc/first_steps/startup_options/additional.png b/wiki/src/doc/first_steps/startup_options/additional.png
new file mode 100644
index 0000000..fd011f6
--- /dev/null
+++ b/wiki/src/doc/first_steps/startup_options/additional.png
Binary files differ
diff --git a/wiki/src/doc/first_steps/startup_options/locale.png b/wiki/src/doc/first_steps/startup_options/locale.png
new file mode 100644
index 0000000..6f81ebb
--- /dev/null
+++ b/wiki/src/doc/first_steps/startup_options/locale.png
Binary files differ
diff --git a/wiki/src/doc/first_steps/startup_options/network_configuration.de.po b/wiki/src/doc/first_steps/startup_options/network_configuration.de.po
deleted file mode 100644
index 31a710b..0000000
--- a/wiki/src/doc/first_steps/startup_options/network_configuration.de.po
+++ /dev/null
@@ -1,89 +0,0 @@
-# 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.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2016-03-14 17:54+0000\n"
-"PO-Revision-Date: 2015-10-28 18:16+0100\n"
-"Last-Translator: Tails translators <tails@boum.org>\n"
-"Language-Team: Tails translators <tails@boum.oef>\n"
-"Language: de\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.10\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"Network configuration\"]]\n"
-msgstr "[[!meta title=\"Netzwerkkonfiguration\"]]\n"
-
-#. type: Plain text
-msgid ""
-"Depending on your Internet connection, you might need to configure the way "
-"Tor connects to the Internet. For example:"
-msgstr ""
-"Je nachdem, was Sie für eine Internetverbindung haben, könnte es "
-"erforderlich sein, die Art und Weise, wie sich Tor ins Internet verbindet, "
-"anzupassen. Zum Beispiel:"
-
-#. type: Bullet: '- '
-msgid "If you need to use a proxy to access the Internet."
-msgstr ""
-"Wenn Sie einen Proxy benötigen, um eine Internetverbindung herzustellen."
-
-#. type: Bullet: '- '
-msgid ""
-"If your Internet connection goes through a firewall that only allows "
-"connections to certain ports."
-msgstr ""
-"Falls Ihre Internetverbindung eine Firewall passieren muss, die nur "
-"Verbindungen durch bestimmte Ports zulässt."
-
-#. type: Bullet: '- '
-msgid ""
-"If you want to use Tor bridges because your Internet connection is censored "
-"or you want to hide the fact that you are using Tor. See also our "
-"documentation on [[what are bridges and when to use them|bridge_mode]]."
-msgstr ""
-"Falls Sie Tor Bridges verwenden wollen, weil Ihre Internetverbindung "
-"zensiert ist oder Sie verschleiern wollen, dass Sie Tor nutzen. Lesen Sie "
-"hierzu auch die Dokumentation über [[Bridges, was sie sind und wann sie "
-"verwendet werden sollten|bridge_mode]]."
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"In these cases, choose to configure bridge, firewall, or proxy settings from\n"
-"<span class=\"application\">Tails Greeter</span>:\n"
-msgstr ""
-"Falls einer dieser Fälle auf Sie zutrifft, wählen Sie die Option zur Konfiguration \n"
-"von Bridges, der Firewall oder Proxyeinstellungen im \n"
-"<span class=\"application\">Tails Greeter</span>:\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"doc/first_steps/startup_options/bridge_mode.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"doc/first_steps/startup_options/bridge_mode.inline.de\" raw=\"yes\" sort=\"age\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"tip\">\n"
-msgstr "<div class=\"tip\">\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>If, on the contrary, you want to work completely offline, you can choose to\n"
-"[[disable all networking|offline_mode]].</p>\n"
-msgstr ""
-"<p>Wenn Sie im Gegensatz dazu komplett Offline arbeiten möchten, können Sie sich dazu entscheiden\n"
-"[[alle Netzwerkfunktionen zu deaktivieren|offline_mode]].</p>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
-msgstr "</div>\n"
diff --git a/wiki/src/doc/first_steps/startup_options/network_configuration.fa.po b/wiki/src/doc/first_steps/startup_options/network_configuration.fa.po
deleted file mode 100644
index 6be41fa..0000000
--- a/wiki/src/doc/first_steps/startup_options/network_configuration.fa.po
+++ /dev/null
@@ -1,86 +0,0 @@
-# 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.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-03-14 17:54+0000\n"
-"PO-Revision-Date: 2015-09-30 14:18+0000\n"
-"Last-Translator: sprint5 <translation5@451f.org>\n"
-"Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/"
-"startup_network_configuration/fa/>\n"
-"Language: fa\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 2.4-dev\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"Network configuration\"]]\n"
-msgstr "[[!meta title=\"پیکربندی شبکه\"]]\n"
-
-#. type: Plain text
-msgid ""
-"Depending on your Internet connection, you might need to configure the way "
-"Tor connects to the Internet. For example:"
-msgstr ""
-"بسته به اتصال اینترنتتان، ممکن است مجبور باشید نحوهٔ اتصال تور به اینترنت را "
-"تنظیم کنید. برای نمونه:"
-
-#. type: Bullet: '- '
-msgid "If you need to use a proxy to access the Internet."
-msgstr "اگر نیاز دارید برای دسترسی به اینترنت یک از پروکسی استفاده کنید."
-
-#. type: Bullet: '- '
-msgid ""
-"If your Internet connection goes through a firewall that only allows "
-"connections to certain ports."
-msgstr ""
-"اگر اتصال اینترنت شما دیوار آتشی دارد که تنها اجازه می‌دهد به پورت‌های خاصی "
-"دسترسی داشته باشید."
-
-#. type: Bullet: '- '
-msgid ""
-"If you want to use Tor bridges because your Internet connection is censored "
-"or you want to hide the fact that you are using Tor. See also our "
-"documentation on [[what are bridges and when to use them|bridge_mode]]."
-msgstr ""
-"اگر می‌خواهید از پل‌های تور استفاده کنید چون اتصال اینترنتتان به خاطر سانسور "
-"محدود شده یا می‌خواهید استفاده کردنتان از تور را مخفی کنید. سندهای ما در مورد "
-"این که [[پل‌ها چیستند و چه زمانی از آن‌ها استفاده کنیم|bridge_mode]] را نیز "
-"مشاهده کنید."
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"In these cases, choose to configure bridge, firewall, or proxy settings from\n"
-"<span class=\"application\">Tails Greeter</span>:\n"
-msgstr ""
-"در این موارد، پل، دیوار آتش یا تنظیمات پروکسی خود را از\n"
-"<span class=\"application\">خوشامدگوی تیلز</span> پیکربندی کنید:\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"doc/first_steps/startup_options/bridge_mode.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"tip\">\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>If, on the contrary, you want to work completely offline, you can choose to\n"
-"[[disable all networking|offline_mode]].</p>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
-msgstr ""
diff --git a/wiki/src/doc/first_steps/startup_options/network_configuration.fr.po b/wiki/src/doc/first_steps/startup_options/network_configuration.fr.po
deleted file mode 100644
index aeeb7d9..0000000
--- a/wiki/src/doc/first_steps/startup_options/network_configuration.fr.po
+++ /dev/null
@@ -1,114 +0,0 @@
-# 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.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2016-04-25 15:51+0200\n"
-"PO-Revision-Date: 2016-03-26 22:19+0100\n"
-"Last-Translator: Chre <tor@renaudineau.org>\n"
-"Language-Team: Tails translators <tails@boum.org>\n"
-"Language: fr\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.10\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"Network configuration\"]]\n"
-msgstr "[[!meta title=\"Configuration réseau\"]]\n"
-
-#. type: Plain text
-msgid ""
-"Depending on your Internet connection, you might need to configure the way "
-"Tor connects to the Internet. For example:"
-msgstr ""
-"En fonction de votre connexion Internet, vous allez peut-être avoir besoin "
-"de configurer la manière dont Tor se connecte à Internet. Par exemple :"
-
-#. type: Bullet: '- '
-msgid "If you need to use a proxy to access the Internet."
-msgstr "Si vous utilisez un proxy pour accéder à Internet."
-
-#. type: Bullet: '- '
-msgid ""
-"If your Internet connection goes through a firewall that only allows "
-"connections to certain ports."
-msgstr ""
-"Si votre connexion Internet passe par une pare-feu autorisant uniquement des "
-"connexions vers certains ports."
-
-#. type: Bullet: '- '
-msgid ""
-"If you want to use Tor bridges because your Internet connection is censored "
-"or you want to hide the fact that you are using Tor. See also our "
-"documentation on [[what are bridges and when to use them|bridge_mode]]."
-msgstr ""
-"Si vous voulez utilisez des bridges Tor car votre connexion Internet est "
-"censurée ou si vous voulez cacher le fait que vous utilisez Tor. Voir "
-"également notre documentation sur [[les bridges et sur quand les utiliser|"
-"bridge_mode]]."
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"In these cases, choose to configure bridge, firewall, or proxy settings from\n"
-"<span class=\"application\">Tails Greeter</span>:\n"
-msgstr ""
-"Dans ces cas, choisir de configurer bridge, pare-feu, ou proxy depuis\n"
-"<span class=\"application\">Tails Greeter</span>:\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"doc/first_steps/startup_options/bridge_mode.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"doc/first_steps/startup_options/bridge_mode.inline.fr\" raw=\"yes\" sort=\"age\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"tip\">\n"
-msgstr "<div class=\"tip\">\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>If, on the contrary, you want to work completely offline, you can choose to\n"
-"[[disable all networking|offline_mode]].</p>\n"
-msgstr ""
-"<p>Si au contraire, vous souhaitez travailler complètement hors ligne, vous pouvez\n"
-"[[désactiver toutes les connexions réseaux|offline_mode]].</p>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
-msgstr "</div>\n"
-
-#~ msgid ""
-#~ "When <span class=\"application\">Tails Greeter</span> appears, in the "
-#~ "<span class=\"guilabel\">Welcome to Tails</span> window, click on the "
-#~ "<span class=\"button\">Yes</span> button. Then click on the <span class="
-#~ "\"button\">Forward</span> button."
-#~ msgstr ""
-#~ "Quand <span class=\"application\">Tails Greeter</span> apparaît dans la "
-#~ "fenêtre <span class=\"guilabel\">Bienvenue dans Tails</span> cliquer sur "
-#~ "le bouton <span class=\"button\">Oui</span>. Puis cliquer sur le bouton "
-#~ "<span class=\"button\">Suivant</span>."
-
-#~ msgid ""
-#~ "In the <span class=\"guilabel\">Network configuration</span> section, "
-#~ "select the following option: <span class=\"guilabel\">This computer's "
-#~ "Internet connection is censored, filtered, or proxied.</span>"
-#~ msgstr ""
-#~ "Dans la section <span class=\"guilabel\">Configuration réseau</span> "
-#~ "choisir l'option suivante : <span class=\"guilabel\">La connexion "
-#~ "Internet de cet ordinateur est censurée, filtrée ou passe par un proxy.</"
-#~ "span>"
-
-#~ msgid ""
-#~ "Then, after starting the working session and connecting to the network, "
-#~ "an assistant will guide you through the configuration of Tor."
-#~ msgstr ""
-#~ "Ensuite, après démarrage de la session de travail et connexion au réseau, "
-#~ "un assistant vous guidera à travers la configuration de Tor."
diff --git a/wiki/src/doc/first_steps/startup_options/network_configuration.it.po b/wiki/src/doc/first_steps/startup_options/network_configuration.it.po
deleted file mode 100644
index a64f485..0000000
--- a/wiki/src/doc/first_steps/startup_options/network_configuration.it.po
+++ /dev/null
@@ -1,123 +0,0 @@
-# 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.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Tails italiano\n"
-"POT-Creation-Date: 2016-05-17 09:40+0200\n"
-"PO-Revision-Date: 2016-04-03 21:14-0000\n"
-"Last-Translator: Zeyev <tbd@tbd.com>\n"
-"Language-Team: ita <transitails@inventati.org>\n"
-"Language: it\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.10\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"Network configuration\"]]\n"
-msgstr "[[!meta title=\"Configurazione della rete\"]]\n"
-
-#. type: Plain text
-msgid ""
-"Depending on your Internet connection, you might need to configure the way "
-"Tor connects to the Internet. For example:"
-msgstr ""
-"A seconda del tuo tipo di connessione internet, potresti avere bisogno di "
-"configurare il modo in cui Tor si connette alla rete. Per esempio:"
-
-#. type: Bullet: '- '
-msgid "If you need to use a proxy to access the Internet."
-msgstr "Se utilizzi un proxy per accedere a Internet."
-
-#. type: Bullet: '- '
-msgid ""
-"If your Internet connection goes through a firewall that only allows "
-"connections to certain ports."
-msgstr ""
-"Se la tua connessione Internet passa attraverso un firewall che permette "
-"solo connessioni a determinate porte."
-
-#. type: Bullet: '- '
-msgid ""
-"If you want to use Tor bridges because your Internet connection is censored "
-"or you want to hide the fact that you are using Tor. See also our "
-"documentation on [[what are bridges and when to use them|bridge_mode]]."
-msgstr ""
-"Se vuoi usare i bridge Tor perché la tua connessione Internet è censurata o "
-"vuoi nascondere il fatto che stai usando Tor. Vedi anche la nostra "
-"documentazione su [[cosa sono i bridge e quando utilizzarli|bridge_model]]."
-
-#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "In these cases, choose to configure bridge, firewall, or proxy settings from\n"
-#| "[[<span class=\"application\">Tails\n"
-#| "Greeter</span>|startup_options#tails_greeter]]:\n"
-msgid ""
-"In these cases, choose to configure bridge, firewall, or proxy settings from\n"
-"<span class=\"application\">Tails Greeter</span>:\n"
-msgstr ""
-"In questi casi, scegli di configurare le impostazioni bridge, firewall o proxy da\n"
-"[[<span class=\"application\">Tails\n"
-"Greeter</span>|startup_options#tails_greeter]]:\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"doc/first_steps/startup_options/bridge_mode.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"tip\">\n"
-msgstr "<div class=\"tip\">\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>If, on the contrary, you want to work completely offline, you can choose to\n"
-"[[disable all networking|offline_mode]].</p>\n"
-msgstr ""
-"<p>Se, al contrario vuoi che lavori completamente offline, puoi scegliere\n"
-"[[disabilita tutte le connessioni di rete|offline_mode]].</p>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
-msgstr "</div>\n"
-
-#~ msgid ""
-#~ "When <span class=\"application\">Tails Greeter</span> appears, in the "
-#~ "<span class=\"guilabel\">Welcome to Tails</span> window, click on the "
-#~ "<span class=\"button\">Yes</span> button. Then click on the <span class="
-#~ "\"button\">Forward</span> button."
-#~ msgstr ""
-#~ "Quando <span class=\"application\">Tails Greeter</span> appare nella "
-#~ "finestra <span class=\"guilabel\">Benvenuto su Tails</span> clicca sul "
-#~ "pulsante <span class=\"button\">Sì</span>. Poi clicca sul pulsante <span "
-#~ "class=\"button\">Invio</span>."
-
-#~ msgid ""
-#~ "In the <span class=\"guilabel\">Network configuration</span> section, "
-#~ "select the following option: <span class=\"guilabel\">This computer's "
-#~ "Internet connection is censored, filtered, or proxied.</span>"
-#~ msgstr ""
-#~ "Nella sezione <span class=\"guilabel\">Configurazione di rete</span> "
-#~ "scegli la seguente opzione:: <span class=\"guilabel\">La connessione "
-#~ "Internet di questo computer è censurata, filtrata o passa attraverso un "
-#~ "proxy.</span>"
-
-#, fuzzy
-#~| msgid ""
-#~| "Then, after starting the working session and connecting to the Internet, "
-#~| "an assistant will guide you through the configuration of Tor."
-#~ msgid ""
-#~ "Then, after starting the working session and connecting to the network, "
-#~ "an assistant will guide you through the configuration of Tor."
-#~ msgstr ""
-#~ "Fatto questo, dopo aver iniziato la sessione di lavoro ed esserti "
-#~ "connesso a Internet, un assistente ti guiderà attraverso la "
-#~ "configurazione di Tor."
diff --git a/wiki/src/doc/first_steps/startup_options/network_configuration.mdwn b/wiki/src/doc/first_steps/startup_options/network_configuration.mdwn
deleted file mode 100644
index 911aa1e..0000000
--- a/wiki/src/doc/first_steps/startup_options/network_configuration.mdwn
+++ /dev/null
@@ -1,23 +0,0 @@
-[[!meta title="Network configuration"]]
-
-Depending on your Internet connection, you might need to configure the way Tor
-connects to the Internet. For example:
-
-- If you need to use a proxy to access the Internet.
-- If your Internet connection goes through a firewall that only allows
- connections to certain ports.
-- If you want to use Tor bridges because your Internet connection is censored or
- you want to hide the fact that you are using Tor. See also our documentation
- on [[what are bridges and when to use them|bridge_mode]].
-
-In these cases, choose to configure bridge, firewall, or proxy settings from
-<span class="application">Tails Greeter</span>:
-
-[[!inline pages="doc/first_steps/startup_options/bridge_mode.inline" raw="yes" sort="age"]]
-
-<div class="tip">
-
-<p>If, on the contrary, you want to work completely offline, you can choose to
-[[disable all networking|offline_mode]].</p>
-
-</div>
diff --git a/wiki/src/doc/first_steps/startup_options/network_configuration.pt.po b/wiki/src/doc/first_steps/startup_options/network_configuration.pt.po
deleted file mode 100644
index f3c7ea9..0000000
--- a/wiki/src/doc/first_steps/startup_options/network_configuration.pt.po
+++ /dev/null
@@ -1,94 +0,0 @@
-# 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.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-03-14 17:54+0000\n"
-"PO-Revision-Date: 2014-06-21 19:18-0300\n"
-"Last-Translator: Tails Developers <amnesia@boum.org>\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=\"Network configuration\"]]\n"
-msgstr "[[!meta title=\"Configuração de rede\"]]\n"
-
-#. type: Plain text
-msgid ""
-"Depending on your Internet connection, you might need to configure the way "
-"Tor connects to the Internet. For example:"
-msgstr ""
-"Dependendo de sua conexão à Internet, pode ser que você precise configurar a "
-"forma como o Tor se conecta à Internet. Por exemplo:"
-
-#. type: Bullet: '- '
-msgid "If you need to use a proxy to access the Internet."
-msgstr "Se você usa um proxy para acessar a Intenet."
-
-#. type: Bullet: '- '
-msgid ""
-"If your Internet connection goes through a firewall that only allows "
-"connections to certain ports."
-msgstr ""
-"Se sua conexão à Internet passa através de um firewall que somente permite "
-"conexões a determinadas portas."
-
-#. type: Bullet: '- '
-msgid ""
-"If you want to use Tor bridges because your Internet connection is censored "
-"or you want to hide the fact that you are using Tor. See also our "
-"documentation on [[what are bridges and when to use them|bridge_mode]]."
-msgstr ""
-"Se você quer usar pontes Tor (Tor bridges) porque sua conexão à Internet é "
-"censurada, ou se você quer esconder o fato de que você está usando Tor. Veja "
-"também nossa documentação sobre [[o que são pontes e quando usá-las|"
-"bridge_mode]]."
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"In these cases, choose to configure bridge, firewall, or proxy settings from\n"
-"<span class=\"application\">Tails Greeter</span>:\n"
-msgstr ""
-"Nestes casos, escolha para configurar as configurações de bridge, firewall\n"
-"ou proxy a partir do <span class=\"application\">Tails Greeter</span>:\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"doc/first_steps/startup_options/bridge_mode.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"doc/first_steps/startup_options/bridge_mode.inline.pt\" raw=\"yes\" sort=\"age\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"tip\">\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>If, on the contrary, you want to work completely offline, you can choose to\n"
-"[[disable all networking|offline_mode]].</p>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
-msgstr ""
-
-#, fuzzy
-#~| msgid ""
-#~| "Then, after starting the working session and connecting to the Internet, "
-#~| "an assistant will guide you through the configuration of Tor."
-#~ msgid ""
-#~ "Then, after starting the working session and connecting to the network, "
-#~ "an assistant will guide you through the configuration of Tor."
-#~ msgstr ""
-#~ "Então, depois de iniciar a sessão de trabalho e conectar à Internet, um "
-#~ "assistente vai te guiar através da configuração do Tor."
diff --git a/wiki/src/doc/first_steps/startup_options/offline_mode.de.po b/wiki/src/doc/first_steps/startup_options/offline_mode.de.po
deleted file mode 100644
index e92cb9a..0000000
--- a/wiki/src/doc/first_steps/startup_options/offline_mode.de.po
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2015-10-26 23:57+0100\n"
-"PO-Revision-Date: 2015-11-12 19:45+0100\n"
-"Last-Translator: Tails translators <tails@boum.org>\n"
-"Language-Team: Tails translators <tails@boum.org>\n"
-"Language: de\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.10\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"Disabling all networking (offline mode)\"]]\n"
-msgstr "[[!meta title=\"Alle Netzwerkfunktionen deaktivieren (Offline-Modus)\"]]\n"
-
-#. type: Plain text
-msgid ""
-"If you want to work completely offline, you can disable all networking when "