summaryrefslogtreecommitdiffstats
path: root/wiki
diff options
context:
space:
mode:
Diffstat (limited to 'wiki')
-rw-r--r--wiki/src/about.it.po2
-rw-r--r--wiki/src/about/contact.de.po67
-rw-r--r--wiki/src/about/contact.es.po89
-rw-r--r--wiki/src/about/contact.fa.po33
-rw-r--r--wiki/src/about/contact.fr.po67
-rw-r--r--wiki/src/about/contact.it.po55
-rw-r--r--wiki/src/about/contact.mdwn20
-rw-r--r--wiki/src/about/contact.pt.po84
-rw-r--r--wiki/src/blueprint/Endless_upgrades.mdwn1
-rw-r--r--wiki/src/blueprint/Tails_research.mdwn6
-rw-r--r--wiki/src/blueprint/backups.mdwn48
-rw-r--r--wiki/src/blueprint/bootstrapping/assistant.mdwn10
-rw-r--r--wiki/src/blueprint/bootstrapping/assistant/mac.mdwn176
-rw-r--r--wiki/src/blueprint/handheld.mdwn19
-rw-r--r--wiki/src/blueprint/hardware_for_automated_tests_take3.mdwn23
-rw-r--r--wiki/src/blueprint/interviews.mdwn139
-rw-r--r--wiki/src/blueprint/l10n_Catalan.mdwn2
-rw-r--r--wiki/src/blueprint/l10n_Italian.mdwn34
-rw-r--r--wiki/src/blueprint/l10n_Portuguese.mdwn2
-rw-r--r--wiki/src/blueprint/l10n_Spanish.mdwn4
-rw-r--r--wiki/src/blueprint/mobile_messaging.mdwn10
-rw-r--r--wiki/src/blueprint/monthly_meeting.mdwn13
-rw-r--r--wiki/src/blueprint/monthly_report.mdwn48
-rw-r--r--wiki/src/blueprint/monthly_report/report_2018_11.mdwn118
-rw-r--r--wiki/src/blueprint/monthly_report/report_2018_12.mdwn118
-rw-r--r--wiki/src/blueprint/monthly_report/report_2019_01.mdwn157
-rw-r--r--wiki/src/blueprint/wi-fi_adapters.mdwn18
-rw-r--r--wiki/src/contribute.fr.po17
-rw-r--r--wiki/src/contribute/APT_repository/time-based_snapshots.mdwn7
-rw-r--r--wiki/src/contribute/Linux_kernel.mdwn5
-rw-r--r--wiki/src/contribute/build.mdwn9
-rw-r--r--wiki/src/contribute/build/reproducible.mdwn51
-rw-r--r--wiki/src/contribute/calendar.mdwn80
-rw-r--r--wiki/src/contribute/design/Time_syncing.mdwn14
-rw-r--r--wiki/src/contribute/design/application_isolation.mdwn2
-rw-r--r--wiki/src/contribute/design/incremental_upgrades.mdwn2
-rw-r--r--wiki/src/contribute/design/installation_assistant.mdwn54
-rw-r--r--wiki/src/contribute/design/memory_erasure.mdwn10
-rw-r--r--wiki/src/contribute/design/verification_extension.mdwn169
-rw-r--r--wiki/src/contribute/how/code.mdwn2
-rwxr-xr-xwiki/src/contribute/how/documentation/qrcode-encode.sh2
-rw-r--r--wiki/src/contribute/how/documentation/release_notes.mdwn10
-rw-r--r--wiki/src/contribute/how/documentation/release_notes/template.mdwn30
-rw-r--r--wiki/src/contribute/how/documentation/style_guide.mdwn221
-rw-r--r--wiki/src/contribute/how/translate/tails-l10n.inline.mdwn4
-rw-r--r--wiki/src/contribute/how/translate/team/de.mdwn2
-rw-r--r--wiki/src/contribute/how/translate/team/es.mdwn2
-rw-r--r--wiki/src/contribute/how/translate/team/fa.mdwn2
-rw-r--r--wiki/src/contribute/how/translate/team/pt.mdwn2
-rw-r--r--wiki/src/contribute/how/translate/team/zh.mdwn2
-rw-r--r--wiki/src/contribute/l10n_tricks/core_po_files.txt18
-rw-r--r--wiki/src/contribute/merge_policy/review.mdwn2
-rw-r--r--wiki/src/contribute/release_process.mdwn233
-rw-r--r--wiki/src/contribute/release_process/persistence-setup.mdwn6
-rw-r--r--wiki/src/contribute/release_process/tails-iuk.mdwn6
-rw-r--r--wiki/src/contribute/release_process/test.mdwn71
-rw-r--r--wiki/src/contribute/release_process/test/automated_tests.mdwn12
-rw-r--r--wiki/src/contribute/release_process/test/reproducibility.mdwn50
-rw-r--r--wiki/src/contribute/release_process/test/setup.mdwn19
-rw-r--r--wiki/src/contribute/release_process/tor-browser_AppArmor_patch.mdwn49
-rw-r--r--wiki/src/contribute/working_together/roles/foundations_team.mdwn4
-rw-r--r--wiki/src/contribute/working_together/roles/help_desk.mdwn10
-rw-r--r--wiki/src/contribute/working_together/roles/sysadmins.mdwn44
-rw-r--r--wiki/src/contribute/working_together/roles/sysadmins/adding_icinga2_checks.mdwn18
-rw-r--r--wiki/src/doc.de.po55
-rw-r--r--wiki/src/doc.es.po59
-rw-r--r--wiki/src/doc.fa.po20
-rw-r--r--wiki/src/doc.fr.po58
-rw-r--r--wiki/src/doc.it.po49
-rw-r--r--wiki/src/doc.mdwn8
-rw-r--r--wiki/src/doc.pt.po58
-rw-r--r--wiki/src/doc/about/acknowledgments_and_similar_projects.fr.po4
-rw-r--r--wiki/src/doc/about/license.de.po438
-rw-r--r--wiki/src/doc/about/license.es.po413
-rw-r--r--wiki/src/doc/about/license.fa.po353
-rw-r--r--wiki/src/doc/about/license.fr.po445
-rw-r--r--wiki/src/doc/about/license.it.po377
-rw-r--r--wiki/src/doc/about/license.mdwn117
-rw-r--r--wiki/src/doc/about/license.pt.po365
-rw-r--r--wiki/src/doc/about/openpgp_keys/signing_key_revocation.de.po14
-rw-r--r--wiki/src/doc/about/openpgp_keys/signing_key_revocation.es.po55
-rw-r--r--wiki/src/doc/about/openpgp_keys/signing_key_revocation.fa.po14
-rw-r--r--wiki/src/doc/about/openpgp_keys/signing_key_revocation.fr.po18
-rw-r--r--wiki/src/doc/about/openpgp_keys/signing_key_revocation.it.po14
-rw-r--r--wiki/src/doc/about/openpgp_keys/signing_key_revocation.mdwn4
-rw-r--r--wiki/src/doc/about/openpgp_keys/signing_key_revocation.pt.po14
-rw-r--r--wiki/src/doc/about/trust.de.po16
-rw-r--r--wiki/src/doc/about/trust.es.po16
-rw-r--r--wiki/src/doc/about/trust.fa.po4
-rw-r--r--wiki/src/doc/about/trust.fr.po24
-rw-r--r--wiki/src/doc/about/trust.it.po16
-rw-r--r--wiki/src/doc/about/trust.mdwn2
-rw-r--r--wiki/src/doc/about/trust.pt.po4
-rw-r--r--wiki/src/doc/anonymous_internet/networkmanager.de.po226
-rw-r--r--wiki/src/doc/anonymous_internet/networkmanager.es.po222
-rw-r--r--wiki/src/doc/anonymous_internet/networkmanager.fa.po219
-rw-r--r--wiki/src/doc/anonymous_internet/networkmanager.fr.po217
-rw-r--r--wiki/src/doc/anonymous_internet/networkmanager.it.po148
-rw-r--r--wiki/src/doc/anonymous_internet/networkmanager.mdwn83
-rw-r--r--wiki/src/doc/anonymous_internet/networkmanager.pt.po215
-rw-r--r--wiki/src/doc/anonymous_internet/networkmanager/mac-spoofing-disabled.pngbin0 -> 9060 bytes
-rw-r--r--wiki/src/doc/anonymous_internet/networkmanager/no-wifi.inline.de.po92
-rw-r--r--wiki/src/doc/anonymous_internet/networkmanager/no-wifi.inline.es.po92
-rw-r--r--wiki/src/doc/anonymous_internet/networkmanager/no-wifi.inline.fa.po92
-rw-r--r--wiki/src/doc/anonymous_internet/networkmanager/no-wifi.inline.fr.po118
-rw-r--r--wiki/src/doc/anonymous_internet/networkmanager/no-wifi.inline.it.po92
-rw-r--r--wiki/src/doc/anonymous_internet/networkmanager/no-wifi.inline.mdwn42
-rw-r--r--wiki/src/doc/anonymous_internet/networkmanager/no-wifi.inline.pt.po92
-rw-r--r--wiki/src/doc/anonymous_internet/networkmanager/system-without-wi-fi.pngbin0 -> 9674 bytes
-rw-r--r--wiki/src/doc/anonymous_internet/onionshare.de.po4
-rw-r--r--wiki/src/doc/anonymous_internet/onionshare.es.po25
-rw-r--r--wiki/src/doc/anonymous_internet/onionshare.fa.po4
-rw-r--r--wiki/src/doc/anonymous_internet/onionshare.fr.po11
-rw-r--r--wiki/src/doc/anonymous_internet/onionshare.it.po34
-rw-r--r--wiki/src/doc/anonymous_internet/onionshare.mdwn2
-rw-r--r--wiki/src/doc/anonymous_internet/onionshare.pt.po4
-rw-r--r--wiki/src/doc/encryption_and_privacy/manage_passwords.de.po2
-rw-r--r--wiki/src/doc/encryption_and_privacy/manage_passwords.es.po2
-rw-r--r--wiki/src/doc/encryption_and_privacy/manage_passwords.fa.po2
-rw-r--r--wiki/src/doc/encryption_and_privacy/manage_passwords.fr.po2
-rw-r--r--wiki/src/doc/encryption_and_privacy/manage_passwords.it.po2
-rw-r--r--wiki/src/doc/encryption_and_privacy/manage_passwords.mdwn2
-rw-r--r--wiki/src/doc/encryption_and_privacy/manage_passwords.pt.po2
-rw-r--r--wiki/src/doc/first_steps/additional_software.de.po6
-rw-r--r--wiki/src/doc/first_steps/additional_software.es.po6
-rw-r--r--wiki/src/doc/first_steps/additional_software.fa.po6
-rw-r--r--wiki/src/doc/first_steps/additional_software.fr.po6
-rw-r--r--wiki/src/doc/first_steps/additional_software.it.po12
-rw-r--r--wiki/src/doc/first_steps/additional_software.mdwn2
-rw-r--r--wiki/src/doc/first_steps/additional_software.pt.po12
-rw-r--r--wiki/src/doc/first_steps/bug_reporting.de.po44
-rw-r--r--wiki/src/doc/first_steps/bug_reporting.es.po50
-rw-r--r--wiki/src/doc/first_steps/bug_reporting.fa.po17
-rw-r--r--wiki/src/doc/first_steps/bug_reporting.fr.po36
-rw-r--r--wiki/src/doc/first_steps/bug_reporting.it.po57
-rw-r--r--wiki/src/doc/first_steps/bug_reporting.mdwn9
-rw-r--r--wiki/src/doc/first_steps/bug_reporting.pt.po20
-rw-r--r--wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.de.po22
-rw-r--r--wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.es.po22
-rw-r--r--wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fa.po22
-rw-r--r--wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fr.po32
-rw-r--r--wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.it.po22
-rw-r--r--wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.mdwn9
-rw-r--r--wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.pt.po22
-rw-r--r--wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/system.pngbin10197 -> 11848 bytes
-rw-r--r--wiki/src/doc/first_steps/start_tails.de.po15
-rw-r--r--wiki/src/doc/first_steps/start_tails.es.po21
-rw-r--r--wiki/src/doc/first_steps/start_tails.fa.po10
-rw-r--r--wiki/src/doc/first_steps/start_tails.fr.po15
-rw-r--r--wiki/src/doc/first_steps/start_tails.it.po14
-rw-r--r--wiki/src/doc/first_steps/start_tails.mdwn5
-rw-r--r--wiki/src/doc/first_steps/start_tails.pt.po10
-rw-r--r--wiki/src/doc/first_steps/upgrade.de.po12
-rw-r--r--wiki/src/doc/first_steps/upgrade.es.po12
-rw-r--r--wiki/src/doc/first_steps/upgrade.fa.po12
-rw-r--r--wiki/src/doc/first_steps/upgrade.fr.po34
-rw-r--r--wiki/src/doc/first_steps/upgrade.it.po12
-rw-r--r--wiki/src/doc/first_steps/upgrade.mdwn4
-rw-r--r--wiki/src/doc/first_steps/upgrade.pt.po12
-rw-r--r--wiki/src/donate-banner.css137
-rw-r--r--wiki/src/donate-banner.js22
-rw-r--r--wiki/src/donate-banner/accounts.fods5209
-rw-r--r--wiki/src/donate-banner/give-love.svg59
-rw-r--r--wiki/src/donate.css14
-rw-r--r--wiki/src/donate.html2
-rw-r--r--wiki/src/home.css5
-rw-r--r--wiki/src/home.de.po72
-rw-r--r--wiki/src/home.es.po74
-rw-r--r--wiki/src/home.fa.po32
-rw-r--r--wiki/src/home.fr.po80
-rw-r--r--wiki/src/home.html19
-rw-r--r--wiki/src/home.it.po32
-rw-r--r--wiki/src/home.pt.po28
-rw-r--r--wiki/src/inc/stable_amd64_date.html2
-rw-r--r--wiki/src/inc/stable_amd64_gpg_verify.html1
-rw-r--r--wiki/src/inc/stable_amd64_img_gpg_signature_output.html (renamed from wiki/src/inc/stable_amd64_gpg_signature_output.html)6
-rw-r--r--wiki/src/inc/stable_amd64_img_gpg_verify.html1
-rw-r--r--wiki/src/inc/stable_amd64_img_sig_url.html1
-rw-r--r--wiki/src/inc/stable_amd64_img_size.html1
-rw-r--r--wiki/src/inc/stable_amd64_img_torrent_url.html1
-rw-r--r--wiki/src/inc/stable_amd64_img_url.html1
-rw-r--r--wiki/src/inc/stable_amd64_iso_gpg_signature_output.html4
-rw-r--r--wiki/src/inc/stable_amd64_iso_gpg_verify.html1
-rw-r--r--wiki/src/inc/stable_amd64_iso_sig_url.html2
-rw-r--r--wiki/src/inc/stable_amd64_iso_torrent_url.html1
-rw-r--r--wiki/src/inc/stable_amd64_iso_url.html2
-rw-r--r--wiki/src/inc/stable_amd64_torrent_url.html1
-rw-r--r--wiki/src/inc/stable_amd64_version.html2
-rw-r--r--wiki/src/inc/trace2
-rw-r--r--wiki/src/install.de.po41
-rw-r--r--wiki/src/install.es.po53
-rw-r--r--wiki/src/install.fa.po31
-rw-r--r--wiki/src/install.fr.po55
-rw-r--r--wiki/src/install.html23
-rw-r--r--wiki/src/install.it.po52
-rw-r--r--wiki/src/install.pt.po31
-rw-r--r--wiki/src/install/check.de.po (renamed from wiki/src/install/inc/tails-installation-assistant.inline.fa.po)9
-rw-r--r--wiki/src/install/check.es.po (renamed from wiki/src/install/inc/router/why_two.inline.fa.po)17
-rw-r--r--wiki/src/install/check.fa.po27
-rw-r--r--wiki/src/install/check.fr.po27
-rw-r--r--wiki/src/install/check.it.po27
-rw-r--r--wiki/src/install/check.mdwn2
-rw-r--r--wiki/src/install/check.pt.po27
-rw-r--r--wiki/src/install/clone.de.po4
-rwxr-xr-xwiki/src/install/clone.es.po4
-rw-r--r--wiki/src/install/clone.fa.po4
-rw-r--r--wiki/src/install/clone.fr.po4
-rw-r--r--wiki/src/install/clone.it.po4
-rw-r--r--wiki/src/install/clone.mdwn2
-rw-r--r--wiki/src/install/clone.pt.po4
-rw-r--r--wiki/src/install/debian.de.po117
-rw-r--r--wiki/src/install/debian.es.po117
-rw-r--r--wiki/src/install/debian.fa.po96
-rw-r--r--wiki/src/install/debian.fr.po113
-rw-r--r--wiki/src/install/debian.html56
-rw-r--r--wiki/src/install/debian.it.po119
-rw-r--r--wiki/src/install/debian.pt.po113
-rw-r--r--wiki/src/install/debian/clone-overview.de.po56
-rwxr-xr-xwiki/src/install/debian/clone-overview.es.po46
-rw-r--r--wiki/src/install/debian/clone-overview.fa.po36
-rw-r--r--wiki/src/install/debian/clone-overview.fr.po43
-rw-r--r--wiki/src/install/debian/clone-overview.html17
-rw-r--r--wiki/src/install/debian/clone-overview.it.po54
-rw-r--r--wiki/src/install/debian/clone-overview.pt.po37
-rw-r--r--wiki/src/install/debian/usb-download.de.po65
-rw-r--r--wiki/src/install/debian/usb-download.es.po67
-rw-r--r--wiki/src/install/debian/usb-download.fr.po65
-rw-r--r--wiki/src/install/debian/usb-download.it.po67
-rw-r--r--wiki/src/install/debian/usb-download.mdwn11
-rw-r--r--wiki/src/install/debian/usb-download.pt.po64
-rw-r--r--wiki/src/install/debian/usb-overview.de.po60
-rw-r--r--wiki/src/install/debian/usb-overview.es.po60
-rw-r--r--wiki/src/install/debian/usb-overview.fa.po36
-rw-r--r--wiki/src/install/debian/usb-overview.fr.po43
-rw-r--r--wiki/src/install/debian/usb-overview.html17
-rw-r--r--wiki/src/install/debian/usb-overview.it.po58
-rw-r--r--wiki/src/install/debian/usb-overview.pt.po37
-rw-r--r--wiki/src/install/debian/usb.de.po646
-rw-r--r--wiki/src/install/debian/usb.es.po546
-rw-r--r--wiki/src/install/debian/usb.fa.po352
-rw-r--r--wiki/src/install/debian/usb.fr.po592
-rw-r--r--wiki/src/install/debian/usb.it.po528
-rw-r--r--wiki/src/install/debian/usb.mdwn158
-rw-r--r--wiki/src/install/debian/usb.pt.po351
-rw-r--r--wiki/src/install/download-iso.de.po84
-rw-r--r--wiki/src/install/download-iso.es.po (renamed from wiki/src/install/debian/usb-download.fa.po)39
-rw-r--r--wiki/src/install/download-iso.fa.po94
-rw-r--r--wiki/src/install/download-iso.fr.po72
-rw-r--r--wiki/src/install/download-iso.it.po (renamed from wiki/src/install/mac/dvd-download.fa.po)34
-rw-r--r--wiki/src/install/download-iso.mdwn12
-rw-r--r--wiki/src/install/download-iso.pt.po80
-rw-r--r--wiki/src/install/download.de.po12
-rw-r--r--wiki/src/install/download.es.po12
-rw-r--r--wiki/src/install/download.fa.po6
-rw-r--r--wiki/src/install/download.fr.po12
-rw-r--r--wiki/src/install/download.it.po12
-rw-r--r--wiki/src/install/download.mdwn4
-rw-r--r--wiki/src/install/download.pt.po11
-rw-r--r--wiki/src/install/expert/usb.de.po286
-rw-r--r--wiki/src/install/expert/usb.es.po292
-rw-r--r--wiki/src/install/expert/usb.fa.po158
-rw-r--r--wiki/src/install/expert/usb.fr.po304
-rw-r--r--wiki/src/install/expert/usb.it.po265
-rw-r--r--wiki/src/install/expert/usb.mdwn94
-rw-r--r--wiki/src/install/expert/usb.pt.po174
-rw-r--r--wiki/src/install/inc/icons/1-dvd.pngbin2460 -> 0 bytes
-rw-r--r--wiki/src/install/inc/icons/2-usb.pngbin1504 -> 0 bytes
-rw-r--r--wiki/src/install/inc/icons/pc.pngbin1420 -> 0 bytes
-rw-r--r--wiki/src/install/inc/icons/tails-installer.pngbin2876 -> 0 bytes
-rw-r--r--wiki/src/install/inc/icons/usb.png (renamed from wiki/src/install/inc/icons/1-usb.png)bin1158 -> 1158 bytes
-rw-r--r--wiki/src/install/inc/infography/clone-dvd.pngbin3532 -> 0 bytes
-rw-r--r--wiki/src/install/inc/infography/clone-tails.png (renamed from wiki/src/install/inc/infography/clone-intermediary-tails.png)bin4011 -> 4011 bytes
-rw-r--r--wiki/src/install/inc/infography/download-and-verify-in-tails.pngbin2655 -> 2795 bytes
-rw-r--r--wiki/src/install/inc/infography/download-and-verify.pngbin2558 -> 2584 bytes
-rw-r--r--wiki/src/install/inc/infography/final-tails-with-persistence.fr.pngbin6604 -> 0 bytes
-rw-r--r--wiki/src/install/inc/infography/final-tails-with-persistence.pngbin6294 -> 0 bytes
-rw-r--r--wiki/src/install/inc/infography/final-tails.pngbin6516 -> 0 bytes
-rw-r--r--wiki/src/install/inc/infography/infography.svg4192
-rw-r--r--wiki/src/install/inc/infography/insert-dvd.pngbin2124 -> 0 bytes
-rw-r--r--wiki/src/install/inc/infography/install-intermediary-tails.pngbin3415 -> 0 bytes
-rw-r--r--wiki/src/install/inc/infography/install-tails.pngbin3298 -> 3243 bytes
-rw-r--r--wiki/src/install/inc/infography/install-upgrade-usb.pngbin3370 -> 3628 bytes
-rw-r--r--wiki/src/install/inc/infography/intermediary-tails-on-dvd.fr.pngbin4619 -> 0 bytes
-rw-r--r--wiki/src/install/inc/infography/intermediary-tails-on-dvd.pngbin4437 -> 0 bytes
-rw-r--r--wiki/src/install/inc/infography/intermediary-tails.fr.pngbin5874 -> 0 bytes
-rw-r--r--wiki/src/install/inc/infography/intermediary-tails.pngbin5614 -> 0 bytes
-rw-r--r--wiki/src/install/inc/infography/new-tails.pngbin3503 -> 0 bytes
-rw-r--r--wiki/src/install/inc/infography/os-debian-ubuntu.pngbin2538 -> 0 bytes
-rw-r--r--wiki/src/install/inc/infography/plug-first-usb.pngbin3452 -> 0 bytes
-rw-r--r--wiki/src/install/inc/infography/plug-other-tails.pngbin0 -> 2632 bytes
-rw-r--r--wiki/src/install/inc/infography/plug-second-usb.pngbin4212 -> 4859 bytes
-rw-r--r--wiki/src/install/inc/infography/plug-source-usb.pngbin2846 -> 0 bytes
-rw-r--r--wiki/src/install/inc/infography/plug-tails-usb.pngbin3396 -> 0 bytes
-rw-r--r--wiki/src/install/inc/infography/plug-upgrade-usb.pngbin3252 -> 3395 bytes
-rw-r--r--wiki/src/install/inc/infography/plug-upgraded-usb.pngbin3289 -> 0 bytes
-rw-r--r--wiki/src/install/inc/infography/plug-usb.pngbin2983 -> 2865 bytes
-rw-r--r--wiki/src/install/inc/infography/restart-on-dvd.pngbin2415 -> 0 bytes
-rw-r--r--wiki/src/install/inc/infography/restart-on-new-tails.png (renamed from wiki/src/install/inc/infography/restart-on-final-tails.png)bin3774 -> 3774 bytes
-rw-r--r--wiki/src/install/inc/infography/restart-on-other-tails.png (renamed from wiki/src/install/inc/infography/restart-on-intermediary-tails.png)bin3156 -> 3156 bytes
-rw-r--r--wiki/src/install/inc/infography/restart-on-tails-usb.pngbin3662 -> 0 bytes
-rw-r--r--wiki/src/install/inc/infography/upgrade-upgrade-usb.pngbin3502 -> 0 bytes
-rw-r--r--wiki/src/install/inc/js/download.js35
-rw-r--r--wiki/src/install/inc/overview.de.po385
-rw-r--r--wiki/src/install/inc/overview.es.po372
-rw-r--r--wiki/src/install/inc/overview.fa.po149
-rw-r--r--wiki/src/install/inc/overview.fr.po332
-rw-r--r--wiki/src/install/inc/overview.html253
-rw-r--r--wiki/src/install/inc/overview.it.po280
-rw-r--r--wiki/src/install/inc/overview.pt.po378
-rw-r--r--wiki/src/install/inc/qrcodes/tails_boum_org_install_clone.pngbin410 -> 0 bytes
-rw-r--r--wiki/src/install/inc/qrcodes/tails_boum_org_install_clone_back_1.pngbin0 -> 409 bytes
-rw-r--r--wiki/src/install/inc/qrcodes/tails_boum_org_install_debian_usb.pngbin404 -> 0 bytes
-rw-r--r--wiki/src/install/inc/qrcodes/tails_boum_org_install_debian_usb_back_1.pngbin0 -> 404 bytes
-rw-r--r--wiki/src/install/inc/qrcodes/tails_boum_org_install_expert_usb.pngbin402 -> 0 bytes
-rw-r--r--wiki/src/install/inc/qrcodes/tails_boum_org_install_expert_usb_back_1.pngbin0 -> 404 bytes
-rw-r--r--wiki/src/install/inc/qrcodes/tails_boum_org_install_linux_usb.pngbin404 -> 0 bytes
-rw-r--r--wiki/src/install/inc/qrcodes/tails_boum_org_install_linux_usb_back_1.pngbin0 -> 403 bytes
-rw-r--r--wiki/src/install/inc/qrcodes/tails_boum_org_install_mac_clone.pngbin410 -> 0 bytes
-rw-r--r--wiki/src/install/inc/qrcodes/tails_boum_org_install_mac_clone_back_1.pngbin0 -> 406 bytes
-rw-r--r--wiki/src/install/inc/qrcodes/tails_boum_org_install_mac_dvd.pngbin407 -> 0 bytes
-rw-r--r--wiki/src/install/inc/qrcodes/tails_boum_org_install_mac_usb.pngbin405 -> 0 bytes
-rw-r--r--wiki/src/install/inc/qrcodes/tails_boum_org_install_mac_usb_back_1.pngbin0 -> 407 bytes
-rw-r--r--wiki/src/install/inc/qrcodes/tails_boum_org_install_win_usb.pngbin403 -> 0 bytes
-rw-r--r--wiki/src/install/inc/qrcodes/tails_boum_org_install_win_usb_back_1.pngbin0 -> 405 bytes
-rw-r--r--wiki/src/install/inc/qrcodes/tails_boum_org_upgrade_clone.pngbin409 -> 0 bytes
-rw-r--r--wiki/src/install/inc/qrcodes/tails_boum_org_upgrade_clone_back_1.pngbin0 -> 408 bytes
-rw-r--r--wiki/src/install/inc/qrcodes/tails_boum_org_upgrade_tails.pngbin408 -> 0 bytes
-rw-r--r--wiki/src/install/inc/qrcodes/tails_boum_org_upgrade_tails_back_1.pngbin0 -> 414 bytes
-rw-r--r--wiki/src/install/inc/router/why_two.inline.de.po32
-rw-r--r--wiki/src/install/inc/router/why_two.inline.es.po32
-rw-r--r--wiki/src/install/inc/router/why_two.inline.fr.po32
-rw-r--r--wiki/src/install/inc/router/why_two.inline.html6
-rw-r--r--wiki/src/install/inc/router/why_two.inline.it.po31
-rw-r--r--wiki/src/install/inc/router/why_two.inline.pt.po31
-rw-r--r--wiki/src/install/inc/screenshots/eject_etcher_dmg.pngbin0 -> 81114 bytes
-rw-r--r--wiki/src/install/inc/screenshots/etcher_in_mac.pngbin0 -> 86775 bytes
-rw-r--r--wiki/src/install/inc/screenshots/etcher_in_windows.pngbin0 -> 35689 bytes
-rw-r--r--wiki/src/install/inc/screenshots/install_etcher_in_mac.pngbin0 -> 87436 bytes
-rw-r--r--wiki/src/install/inc/screenshots/mac_startup_dvd.pngbin27585 -> 0 bytes
-rw-r--r--wiki/src/install/inc/screenshots/notification_in_tails.pngbin5516 -> 0 bytes
-rw-r--r--wiki/src/install/inc/screenshots/software_sources_update.pngbin13486 -> 0 bytes
-rw-r--r--wiki/src/install/inc/screenshots/tails_installer.png (renamed from wiki/src/install/inc/screenshots/tails_installer_in_tails.png)bin20642 -> 20642 bytes
-rw-r--r--wiki/src/install/inc/screenshots/tails_installer_in_debian.pngbin20702 -> 0 bytes
-rw-r--r--wiki/src/install/inc/screenshots/tails_installer_upgrade.png (renamed from wiki/src/install/inc/screenshots/tails_installer_upgrade_in_tails.png)bin21270 -> 21270 bytes
-rw-r--r--wiki/src/install/inc/screenshots/uui.pngbin43275 -> 0 bytes
-rw-r--r--wiki/src/install/inc/screenshots/uui_format.gifbin39730 -> 0 bytes
-rw-r--r--wiki/src/install/inc/screenshots/uui_format.pngbin2945 -> 0 bytes
-rw-r--r--wiki/src/install/inc/screenshots/uui_tails.pngbin2470 -> 0 bytes
-rw-r--r--wiki/src/install/inc/screenshots/verifying_in_tails.pngbin6339 -> 5804 bytes
-rw-r--r--wiki/src/install/inc/screenshots/verifying_in_tails_img_notification.pngbin0 -> 6678 bytes
-rw-r--r--wiki/src/install/inc/screenshots/verifying_in_tails_iso_notification.pngbin0 -> 6495 bytes
-rw-r--r--wiki/src/install/inc/steps/clone.inline.de.po450
-rw-r--r--wiki/src/install/inc/steps/clone.inline.es.po438
-rw-r--r--wiki/src/install/inc/steps/clone.inline.fa.po176
-rw-r--r--wiki/src/install/inc/steps/clone.inline.fr.po370
-rw-r--r--wiki/src/install/inc/steps/clone.inline.it.po364
-rw-r--r--wiki/src/install/inc/steps/clone.inline.mdwn77
-rw-r--r--wiki/src/install/inc/steps/clone.inline.pt.po374
-rw-r--r--wiki/src/install/inc/steps/create_persistence.inline.de.po159
-rw-r--r--wiki/src/install/inc/steps/create_persistence.inline.es.po136
-rw-r--r--wiki/src/install/inc/steps/create_persistence.inline.fa.po72
-rw-r--r--wiki/src/install/inc/steps/create_persistence.inline.fr.po150
-rw-r--r--wiki/src/install/inc/steps/create_persistence.inline.it.po141
-rw-r--r--wiki/src/install/inc/steps/create_persistence.inline.mdwn46
-rw-r--r--wiki/src/install/inc/steps/create_persistence.inline.pt.po161
-rw-r--r--wiki/src/install/inc/steps/debian_requirements.inline.de.po132
-rw-r--r--wiki/src/install/inc/steps/debian_requirements.inline.es.po94
-rw-r--r--wiki/src/install/inc/steps/debian_requirements.inline.fa.po82
-rw-r--r--wiki/src/install/inc/steps/debian_requirements.inline.fr.po121
-rw-r--r--wiki/src/install/inc/steps/debian_requirements.inline.it.po145
-rw-r--r--wiki/src/install/inc/steps/debian_requirements.inline.mdwn30
-rw-r--r--wiki/src/install/inc/steps/debian_requirements.inline.pt.po141
-rw-r--r--wiki/src/install/inc/steps/download.inline.de.po298
-rw-r--r--wiki/src/install/inc/steps/download.inline.es.po434
-rw-r--r--wiki/src/install/inc/steps/download.inline.fa.po217
-rw-r--r--wiki/src/install/inc/steps/download.inline.fr.po467
-rw-r--r--wiki/src/install/inc/steps/download.inline.html141
-rw-r--r--wiki/src/install/inc/steps/download.inline.it.po345
-rw-r--r--wiki/src/install/inc/steps/download.inline.pt.po217
-rw-r--r--wiki/src/install/inc/steps/install_final.inline.de.po418
-rw-r--r--wiki/src/install/inc/steps/install_final.inline.es.po390
-rw-r--r--wiki/src/install/inc/steps/install_final.inline.fa.po296
-rw-r--r--wiki/src/install/inc/steps/install_final.inline.fr.po381
-rw-r--r--wiki/src/install/inc/steps/install_final.inline.it.po389
-rw-r--r--wiki/src/install/inc/steps/install_final.inline.mdwn138
-rw-r--r--wiki/src/install/inc/steps/install_final.inline.pt.po356
-rw-r--r--wiki/src/install/inc/steps/install_intermediary_intro.inline.de.po75
-rw-r--r--wiki/src/install/inc/steps/install_intermediary_intro.inline.es.po74
-rw-r--r--wiki/src/install/inc/steps/install_intermediary_intro.inline.fa.po61
-rw-r--r--wiki/src/install/inc/steps/install_intermediary_intro.inline.fr.po69
-rw-r--r--wiki/src/install/inc/steps/install_intermediary_intro.inline.it.po70
-rw-r--r--wiki/src/install/inc/steps/install_intermediary_intro.inline.mdwn22
-rw-r--r--wiki/src/install/inc/steps/install_intermediary_intro.inline.pt.po76
-rw-r--r--wiki/src/install/inc/steps/install_intermediary_outro.inline.de.po48
-rw-r--r--wiki/src/install/inc/steps/install_intermediary_outro.inline.es.po50
-rw-r--r--wiki/src/install/inc/steps/install_intermediary_outro.inline.fa.po42
-rw-r--r--wiki/src/install/inc/steps/install_intermediary_outro.inline.fr.po47
-rw-r--r--wiki/src/install/inc/steps/install_intermediary_outro.inline.it.po54
-rw-r--r--wiki/src/install/inc/steps/install_intermediary_outro.inline.mdwn11
-rw-r--r--wiki/src/install/inc/steps/install_intermediary_outro.inline.pt.po48
-rw-r--r--wiki/src/install/inc/steps/install_with_etcher.inline.de.po139
-rw-r--r--wiki/src/install/inc/steps/install_with_etcher.inline.es.po139
-rw-r--r--wiki/src/install/inc/steps/install_with_etcher.inline.fa.po139
-rw-r--r--wiki/src/install/inc/steps/install_with_etcher.inline.fr.po163
-rw-r--r--wiki/src/install/inc/steps/install_with_etcher.inline.it.po139
-rw-r--r--wiki/src/install/inc/steps/install_with_etcher.inline.mdwn57
-rw-r--r--wiki/src/install/inc/steps/install_with_etcher.inline.pt.po139
-rw-r--r--wiki/src/install/inc/steps/install_with_gnome_disks.inline.de.po200
-rw-r--r--wiki/src/install/inc/steps/install_with_gnome_disks.inline.es.po200
-rw-r--r--wiki/src/install/inc/steps/install_with_gnome_disks.inline.fa.po200
-rw-r--r--wiki/src/install/inc/steps/install_with_gnome_disks.inline.fr.po243
-rw-r--r--wiki/src/install/inc/steps/install_with_gnome_disks.inline.it.po200
-rw-r--r--wiki/src/install/inc/steps/install_with_gnome_disks.inline.mdwn82
-rw-r--r--wiki/src/install/inc/steps/install_with_gnome_disks.inline.pt.po200
-rw-r--r--wiki/src/install/inc/steps/mac_startup_disks.inline.de.po18
-rw-r--r--wiki/src/install/inc/steps/mac_startup_disks.inline.es.po14
-rw-r--r--wiki/src/install/inc/steps/mac_startup_disks.inline.fa.po8
-rw-r--r--wiki/src/install/inc/steps/mac_startup_disks.inline.fr.po16
-rw-r--r--wiki/src/install/inc/steps/mac_startup_disks.inline.it.po18
-rw-r--r--wiki/src/install/inc/steps/mac_startup_disks.inline.mdwn8
-rw-r--r--wiki/src/install/inc/steps/mac_startup_disks.inline.pt.po18
-rw-r--r--wiki/src/install/inc/steps/not_at_all.inline.de.po431
-rw-r--r--wiki/src/install/inc/steps/not_at_all.inline.es.po429
-rw-r--r--wiki/src/install/inc/steps/not_at_all.inline.fa.po372
-rw-r--r--wiki/src/install/inc/steps/not_at_all.inline.fr.po469
-rw-r--r--wiki/src/install/inc/steps/not_at_all.inline.it.po450
-rw-r--r--wiki/src/install/inc/steps/not_at_all.inline.mdwn158
-rw-r--r--wiki/src/install/inc/steps/not_at_all.inline.pt.po371
-rw-r--r--wiki/src/install/inc/steps/restart_first_time.inline.de.po759
-rwxr-xr-xwiki/src/install/inc/steps/restart_first_time.inline.es.po809
-rw-r--r--wiki/src/install/inc/steps/restart_first_time.inline.fa.po456
-rw-r--r--wiki/src/install/inc/steps/restart_first_time.inline.fr.po828
-rw-r--r--wiki/src/install/inc/steps/restart_first_time.inline.it.po897
-rw-r--r--wiki/src/install/inc/steps/restart_first_time.inline.mdwn289
-rw-r--r--wiki/src/install/inc/steps/restart_first_time.inline.pt.po474
-rw-r--r--wiki/src/install/inc/steps/restart_second_time.inline.de.po250
-rw-r--r--wiki/src/install/inc/steps/restart_second_time.inline.es.po263
-rw-r--r--wiki/src/install/inc/steps/restart_second_time.inline.fa.po95
-rw-r--r--wiki/src/install/inc/steps/restart_second_time.inline.fr.po244
-rw-r--r--wiki/src/install/inc/steps/restart_second_time.inline.it.po244
-rw-r--r--wiki/src/install/inc/steps/restart_second_time.inline.mdwn52
-rw-r--r--wiki/src/install/inc/steps/restart_second_time.inline.pt.po101
-rw-r--r--wiki/src/install/inc/steps/verify_up-to-date.inline.fr.po20
-rw-r--r--wiki/src/install/inc/stylesheets/assistant.css18
-rw-r--r--wiki/src/install/inc/stylesheets/debian.css17
-rw-r--r--wiki/src/install/inc/stylesheets/download-only-img.css11
-rw-r--r--wiki/src/install/inc/stylesheets/download-only-iso.css11
-rw-r--r--wiki/src/install/inc/stylesheets/download-only.css11
-rw-r--r--wiki/src/install/inc/stylesheets/download.css2
-rw-r--r--wiki/src/install/inc/stylesheets/dvd.css2
-rw-r--r--wiki/src/install/inc/stylesheets/expert.css3
-rw-r--r--wiki/src/install/inc/stylesheets/linux.css2
-rw-r--r--wiki/src/install/inc/stylesheets/mac-clone.css1
-rw-r--r--wiki/src/install/inc/stylesheets/mac-dvd.css18
-rw-r--r--wiki/src/install/inc/stylesheets/mac-usb.css18
-rw-r--r--wiki/src/install/inc/stylesheets/mac.css6
-rw-r--r--wiki/src/install/inc/stylesheets/overview.css20
-rw-r--r--wiki/src/install/inc/stylesheets/router-mac.css30
-rw-r--r--wiki/src/install/inc/stylesheets/steps.css3
-rw-r--r--wiki/src/install/inc/stylesheets/windows.css6
-rw-r--r--wiki/src/install/inc/tails-installation-assistant.inline.de.po22
-rw-r--r--wiki/src/install/inc/tails-installation-assistant.inline.es.po24
-rw-r--r--wiki/src/install/inc/tails-installation-assistant.inline.fr.po22
-rw-r--r--wiki/src/install/inc/tails-installation-assistant.inline.it.po22
-rw-r--r--wiki/src/install/inc/tails-installation-assistant.inline.mdwn1
-rw-r--r--wiki/src/install/inc/tails-installation-assistant.inline.pt.po22
-rw-r--r--wiki/src/install/linux.de.po81
-rw-r--r--wiki/src/install/linux.es.po65
-rw-r--r--wiki/src/install/linux.fa.po35
-rw-r--r--wiki/src/install/linux.fr.po54
-rw-r--r--wiki/src/install/linux.html17
-rw-r--r--wiki/src/install/linux.it.po73
-rw-r--r--wiki/src/install/linux.pt.po50
-rw-r--r--wiki/src/install/linux/usb.de.po504
-rwxr-xr-xwiki/src/install/linux/usb.es.po509
-rw-r--r--wiki/src/install/linux/usb.fa.po244
-rw-r--r--wiki/src/install/linux/usb.fr.po497
-rw-r--r--wiki/src/install/linux/usb.it.po551
-rw-r--r--wiki/src/install/linux/usb.mdwn121
-rw-r--r--wiki/src/install/linux/usb.pt.po234
-rw-r--r--wiki/src/install/mac.de.po198
-rw-r--r--wiki/src/install/mac.es.po190
-rw-r--r--wiki/src/install/mac.fa.po98
-rw-r--r--wiki/src/install/mac.fr.po188
-rw-r--r--wiki/src/install/mac.html88
-rw-r--r--wiki/src/install/mac.it.po210
-rw-r--r--wiki/src/install/mac.pt.po98
-rw-r--r--wiki/src/install/mac/clone-overview.de.po4
-rw-r--r--wiki/src/install/mac/clone-overview.es.po4
-rw-r--r--wiki/src/install/mac/clone-overview.fa.po2
-rw-r--r--wiki/src/install/mac/clone-overview.fr.po4
-rw-r--r--wiki/src/install/mac/clone-overview.html2
-rw-r--r--wiki/src/install/mac/clone-overview.it.po17
-rw-r--r--wiki/src/install/mac/clone-overview.pt.po2
-rw-r--r--wiki/src/install/mac/clone.de.po4
-rwxr-xr-xwiki/src/install/mac/clone.es.po4
-rw-r--r--wiki/src/install/mac/clone.fa.po4
-rw-r--r--wiki/src/install/mac/clone.fr.po4
-rw-r--r--wiki/src/install/mac/clone.it.po4
-rw-r--r--wiki/src/install/mac/clone.mdwn2
-rw-r--r--wiki/src/install/mac/clone.pt.po4
-rw-r--r--wiki/src/install/mac/dvd-download.de.po66
-rw-r--r--wiki/src/install/mac/dvd-download.es.po67
-rw-r--r--wiki/src/install/mac/dvd-download.fr.po65
-rw-r--r--wiki/src/install/mac/dvd-download.it.po67
-rw-r--r--wiki/src/install/mac/dvd-download.mdwn11
-rw-r--r--wiki/src/install/mac/dvd-download.pt.po64
-rw-r--r--wiki/src/install/mac/dvd-overview.de.po43
-rwxr-xr-xwiki/src/install/mac/dvd-overview.es.po59
-rw-r--r--wiki/src/install/mac/dvd-overview.fa.po36
-rw-r--r--wiki/src/install/mac/dvd-overview.fr.po60
-rw-r--r--wiki/src/install/mac/dvd-overview.html17
-rw-r--r--wiki/src/install/mac/dvd-overview.it.po56
-rw-r--r--wiki/src/install/mac/dvd-overview.pt.po37
-rw-r--r--wiki/src/install/mac/dvd.de.po241
-rwxr-xr-xwiki/src/install/mac/dvd.es.po223
-rw-r--r--wiki/src/install/mac/dvd.fa.po200
-rw-r--r--wiki/src/install/mac/dvd.fr.po237
-rw-r--r--wiki/src/install/mac/dvd.it.po266
-rw-r--r--wiki/src/install/mac/dvd.mdwn81
-rw-r--r--wiki/src/install/mac/dvd.pt.po194
-rw-r--r--wiki/src/install/mac/usb-download.de.po19
-rw-r--r--wiki/src/install/mac/usb-download.es.po19
-rw-r--r--wiki/src/install/mac/usb-download.fa.po6
-rw-r--r--wiki/src/install/mac/usb-download.fr.po15
-rw-r--r--wiki/src/install/mac/usb-download.it.po19
-rw-r--r--wiki/src/install/mac/usb-download.mdwn4
-rw-r--r--wiki/src/install/mac/usb-download.pt.po6
-rw-r--r--wiki/src/install/mac/usb-overview.de.po24
-rw-r--r--wiki/src/install/mac/usb-overview.es.po36
-rw-r--r--wiki/src/install/mac/usb-overview.fa.po15
-rw-r--r--wiki/src/install/mac/usb-overview.fr.po30
-rw-r--r--wiki/src/install/mac/usb-overview.html4
-rw-r--r--wiki/src/install/mac/usb-overview.it.po35
-rw-r--r--wiki/src/install/mac/usb-overview.pt.po15
-rw-r--r--wiki/src/install/mac/usb.de.po416
-rwxr-xr-xwiki/src/install/mac/usb.es.po444
-rw-r--r--wiki/src/install/mac/usb.fa.po270
-rw-r--r--wiki/src/install/mac/usb.fr.po437
-rw-r--r--wiki/src/install/mac/usb.it.po374
-rw-r--r--wiki/src/install/mac/usb.mdwn189
-rw-r--r--wiki/src/install/mac/usb.pt.po258
-rw-r--r--wiki/src/install/v1/Tails/amd64/stable/latest.yml9
-rw-r--r--wiki/src/install/v2/Tails/amd64/stable/latest.json18
-rw-r--r--wiki/src/install/win.de.po29
-rw-r--r--wiki/src/install/win.es.po35
-rw-r--r--wiki/src/install/win.fa.po12
-rw-r--r--wiki/src/install/win.fr.po31
-rw-r--r--wiki/src/install/win.html9
-rw-r--r--wiki/src/install/win.it.po29
-rw-r--r--wiki/src/install/win.pt.po27
-rw-r--r--wiki/src/install/win/usb.de.po301
-rwxr-xr-xwiki/src/install/win/usb.es.po297
-rw-r--r--wiki/src/install/win/usb.fa.po160
-rw-r--r--wiki/src/install/win/usb.fr.po294
-rw-r--r--wiki/src/install/win/usb.it.po300
-rw-r--r--wiki/src/install/win/usb.mdwn67
-rw-r--r--wiki/src/install/win/usb.pt.po144
-rw-r--r--wiki/src/local.css12
-rw-r--r--wiki/src/news.html2
-rw-r--r--wiki/src/news/new_cryptocurrencies.de.po12
-rw-r--r--wiki/src/news/new_cryptocurrencies.es.po12
-rw-r--r--wiki/src/news/new_cryptocurrencies.fa.po12
-rw-r--r--wiki/src/news/new_cryptocurrencies.fr.po9
-rw-r--r--wiki/src/news/new_cryptocurrencies.it.po12
-rw-r--r--wiki/src/news/new_cryptocurrencies.mdwn2
-rw-r--r--wiki/src/news/new_cryptocurrencies.pt.po12
-rw-r--r--wiki/src/news/plans_for_2019.de.po158
-rw-r--r--wiki/src/news/plans_for_2019.es.po158
-rw-r--r--wiki/src/news/plans_for_2019.fa.po158
-rw-r--r--wiki/src/news/plans_for_2019.fr.po205
-rw-r--r--wiki/src/news/plans_for_2019.it.po158
-rw-r--r--wiki/src/news/plans_for_2019.mdwn73
-rw-r--r--wiki/src/news/plans_for_2019.pt.po158
-rw-r--r--wiki/src/news/report_2017_04.mdwn4
-rw-r--r--wiki/src/news/report_2018_11.mdwn143
-rw-r--r--wiki/src/news/report_2018_12.mdwn122
-rw-r--r--wiki/src/news/test_3.12-rc1.mdwn126
-rw-r--r--wiki/src/news/test_usb_images.de.po188
-rw-r--r--wiki/src/news/test_usb_images.es.po188
-rw-r--r--wiki/src/news/test_usb_images.fa.po188
-rw-r--r--wiki/src/news/test_usb_images.fr.po188
-rw-r--r--wiki/src/news/test_usb_images.it.po188
-rw-r--r--wiki/src/news/test_usb_images.mdwn84
-rw-r--r--wiki/src/news/test_usb_images.pt.po188
-rw-r--r--wiki/src/news/version_2.0.de.po7
-rw-r--r--wiki/src/news/version_2.0.es.po7
-rw-r--r--wiki/src/news/version_2.0.fa.po7
-rw-r--r--wiki/src/news/version_2.0.fr.po7
-rw-r--r--wiki/src/news/version_2.0.it.po13
-rw-r--r--wiki/src/news/version_2.0.mdwn2
-rw-r--r--wiki/src/news/version_2.0.pt.po7
-rw-r--r--wiki/src/news/version_3.11.de.po235
-rw-r--r--wiki/src/news/version_3.11.es.po235
-rw-r--r--wiki/src/news/version_3.11.fa.po235
-rw-r--r--wiki/src/news/version_3.11.fr.po275
-rw-r--r--wiki/src/news/version_3.11.it.po235
-rw-r--r--wiki/src/news/version_3.11.mdwn91
-rw-r--r--wiki/src/news/version_3.11.pt.po235
-rw-r--r--wiki/src/news/version_3.11/upgrade.pngbin0 -> 17480 bytes
-rw-r--r--wiki/src/news/version_3.11/virtualization-warning.pngbin0 -> 20702 bytes
-rw-r--r--wiki/src/news/version_3.12.1.de.po218
-rw-r--r--wiki/src/news/version_3.12.1.es.po218
-rw-r--r--wiki/src/news/version_3.12.1.fa.po218
-rw-r--r--wiki/src/news/version_3.12.1.fr.po218
-rw-r--r--wiki/src/news/version_3.12.1.it.po218
-rw-r--r--wiki/src/news/version_3.12.1.mdwn93
-rw-r--r--wiki/src/news/version_3.12.1.pt.po218
-rw-r--r--wiki/src/news/version_3.12.de.po321
-rw-r--r--wiki/src/news/version_3.12.es.po321
-rw-r--r--wiki/src/news/version_3.12.fa.po321
-rw-r--r--wiki/src/news/version_3.12.fr.po351
-rw-r--r--wiki/src/news/version_3.12.it.po321
-rw-r--r--wiki/src/news/version_3.12.mdwn141
-rw-r--r--wiki/src/news/version_3.12.pt.po321
-rw-r--r--wiki/src/news/version_3.2.de.po2
-rw-r--r--wiki/src/news/version_3.2.es.po2
-rw-r--r--wiki/src/news/version_3.2.fa.po2
-rw-r--r--wiki/src/news/version_3.2.fr.po4
-rw-r--r--wiki/src/news/version_3.2.it.po2
-rw-r--r--wiki/src/news/version_3.2.mdwn2
-rw-r--r--wiki/src/news/version_3.2.pt.po2
-rw-r--r--wiki/src/partners.de.po167
-rw-r--r--wiki/src/partners.es.po145
-rw-r--r--wiki/src/partners.fa.po104
-rw-r--r--wiki/src/partners.fr.po143
-rw-r--r--wiki/src/partners.html40
-rw-r--r--wiki/src/partners.it.po106
-rw-r--r--wiki/src/partners.pt.po106
-rw-r--r--wiki/src/press.de.po38
-rw-r--r--wiki/src/press.es.po56
-rw-r--r--wiki/src/press.fa.po53
-rw-r--r--wiki/src/press.fr.po52
-rw-r--r--wiki/src/press.it.po53
-rw-r--r--wiki/src/press.mdwn17
-rw-r--r--wiki/src/press.pt.po38
-rw-r--r--wiki/src/press/media_appearances_2018.mdwn8
-rw-r--r--wiki/src/press/media_appearances_2019.mdwn7
-rw-r--r--wiki/src/security/Numerous_security_holes_in_3.10.1.de.po80
-rw-r--r--wiki/src/security/Numerous_security_holes_in_3.10.1.es.po80
-rw-r--r--wiki/src/security/Numerous_security_holes_in_3.10.1.fa.po80
-rw-r--r--wiki/src/security/Numerous_security_holes_in_3.10.1.fr.po108
-rw-r--r--wiki/src/security/Numerous_security_holes_in_3.10.1.it.po80
-rw-r--r--wiki/src/security/Numerous_security_holes_in_3.10.1.mdwn37
-rw-r--r--wiki/src/security/Numerous_security_holes_in_3.10.1.pt.po80
-rw-r--r--wiki/src/security/Numerous_security_holes_in_3.11.de.po97
-rw-r--r--wiki/src/security/Numerous_security_holes_in_3.11.es.po97
-rw-r--r--wiki/src/security/Numerous_security_holes_in_3.11.fa.po97
-rw-r--r--wiki/src/security/Numerous_security_holes_in_3.11.fr.po97
-rw-r--r--wiki/src/security/Numerous_security_holes_in_3.11.it.po97
-rw-r--r--wiki/src/security/Numerous_security_holes_in_3.11.mdwn54
-rw-r--r--wiki/src/security/Numerous_security_holes_in_3.11.pt.po97
-rw-r--r--wiki/src/security/Numerous_security_holes_in_3.12.de.po62
-rw-r--r--wiki/src/security/Numerous_security_holes_in_3.12.es.po62
-rw-r--r--wiki/src/security/Numerous_security_holes_in_3.12.fa.po62
-rw-r--r--wiki/src/security/Numerous_security_holes_in_3.12.fr.po62
-rw-r--r--wiki/src/security/Numerous_security_holes_in_3.12.it.po62
-rw-r--r--wiki/src/security/Numerous_security_holes_in_3.12.mdwn16
-rw-r--r--wiki/src/security/Numerous_security_holes_in_3.12.pt.po62
-rw-r--r--wiki/src/shortcuts.mdwn2
-rw-r--r--wiki/src/support/faq.de.po18
-rw-r--r--wiki/src/support/faq.es.po32
-rw-r--r--wiki/src/support/faq.fa.po30
-rw-r--r--wiki/src/support/faq.fr.po48
-rw-r--r--wiki/src/support/faq.it.po34
-rw-r--r--wiki/src/support/faq.mdwn9
-rw-r--r--wiki/src/support/faq.pt.po34
-rw-r--r--wiki/src/support/known_issues.de.po148
-rw-r--r--wiki/src/support/known_issues.es.po191
-rw-r--r--wiki/src/support/known_issues.fa.po225
-rw-r--r--wiki/src/support/known_issues.fr.po244
-rw-r--r--wiki/src/support/known_issues.it.po148
-rw-r--r--wiki/src/support/known_issues.mdwn95
-rw-r--r--wiki/src/support/known_issues.pt.po245
-rw-r--r--wiki/src/support/known_issues/graphics.de.po29
-rw-r--r--wiki/src/support/known_issues/graphics.es.po57
-rw-r--r--wiki/src/support/known_issues/graphics.fa.po35
-rw-r--r--wiki/src/support/known_issues/graphics.fr.po42
-rw-r--r--wiki/src/support/known_issues/graphics.it.po38
-rw-r--r--wiki/src/support/known_issues/graphics.mdwn16
-rw-r--r--wiki/src/support/known_issues/graphics.pt.po35
-rw-r--r--wiki/src/templates/page.tmpl81
-rw-r--r--wiki/src/torrents/files/tails-amd64-3.10.1.iso.sig16
-rw-r--r--wiki/src/torrents/files/tails-amd64-3.10.1.torrentbin93906 -> 0 bytes
-rw-r--r--wiki/src/torrents/files/tails-amd64-3.12.1.build-manifest (renamed from wiki/src/torrents/files/tails-amd64-3.10.1.build-manifest)531
-rw-r--r--wiki/src/torrents/files/tails-amd64-3.12.1.img.sig16
-rw-r--r--wiki/src/torrents/files/tails-amd64-3.12.1.img.torrentbin0 -> 95290 bytes
-rw-r--r--wiki/src/torrents/files/tails-amd64-3.12.1.iso.sig16
-rw-r--r--wiki/src/torrents/files/tails-amd64-3.12.1.iso.torrentbin0 -> 94530 bytes
-rw-r--r--wiki/src/torrents/files/tails-amd64-3.12.1.packages (renamed from wiki/src/torrents/files/tails-amd64-3.10.1.packages)463
-rw-r--r--wiki/src/upgrade/clone.de.po4
-rw-r--r--wiki/src/upgrade/clone.es.po4
-rw-r--r--wiki/src/upgrade/clone.fa.po2
-rw-r--r--wiki/src/upgrade/clone.fr.po4
-rw-r--r--wiki/src/upgrade/clone.it.po4
-rw-r--r--wiki/src/upgrade/clone.mdwn2
-rw-r--r--wiki/src/upgrade/clone.pt.po4
-rw-r--r--wiki/src/upgrade/tails.de.po212
-rwxr-xr-xwiki/src/upgrade/tails.es.po215
-rw-r--r--wiki/src/upgrade/tails.fa.po99
-rw-r--r--wiki/src/upgrade/tails.fr.po218
-rw-r--r--wiki/src/upgrade/tails.it.po211
-rw-r--r--wiki/src/upgrade/tails.mdwn46
-rw-r--r--wiki/src/upgrade/tails.pt.po215
-rw-r--r--wiki/src/upgrade/v1/Tails/3.10.1/amd64/alpha/upgrades.yml15
-rw-r--r--wiki/src/upgrade/v1/Tails/3.10.1/amd64/alpha/upgrades.yml.pgp26
-rw-r--r--wiki/src/upgrade/v1/Tails/3.10.1/amd64/stable/upgrades.yml15
-rw-r--r--wiki/src/upgrade/v1/Tails/3.10.1/amd64/stable/upgrades.yml.pgp26
-rw-r--r--wiki/src/upgrade/v1/Tails/3.10.1/amd64/test/upgrades.yml20
-rw-r--r--wiki/src/upgrade/v1/Tails/3.10.1/amd64/test/upgrades.yml.pgp16
-rw-r--r--wiki/src/upgrade/v1/Tails/3.10.2/amd64/alpha/upgrades.yml.pgp16
-rw-r--r--wiki/src/upgrade/v1/Tails/3.10.2/amd64/stable/upgrades.yml.pgp16
-rw-r--r--wiki/src/upgrade/v1/Tails/3.10/amd64/stable/upgrades.yml16
-rw-r--r--wiki/src/upgrade/v1/Tails/3.10/amd64/stable/upgrades.yml.pgp26
-rw-r--r--wiki/src/upgrade/v1/Tails/3.10/amd64/test/upgrades.yml16
-rw-r--r--wiki/src/upgrade/v1/Tails/3.10/amd64/test/upgrades.yml.pgp26
-rw-r--r--wiki/src/upgrade/v1/Tails/3.11/amd64/alpha/upgrades.yml15
-rw-r--r--wiki/src/upgrade/v1/Tails/3.11/amd64/alpha/upgrades.yml.pgp17
-rw-r--r--wiki/src/upgrade/v1/Tails/3.11/amd64/stable/upgrades.yml15
-rw-r--r--wiki/src/upgrade/v1/Tails/3.11/amd64/stable/upgrades.yml.pgp17
-rw-r--r--wiki/src/upgrade/v1/Tails/3.11/amd64/test/upgrades.yml20
-rw-r--r--wiki/src/upgrade/v1/Tails/3.11/amd64/test/upgrades.yml.pgp16
-rw-r--r--wiki/src/upgrade/v1/Tails/3.12.1/amd64/alpha/upgrades.yml (renamed from wiki/src/upgrade/v1/Tails/3.10.2/amd64/alpha/upgrades.yml)2
-rw-r--r--wiki/src/upgrade/v1/Tails/3.12.1/amd64/alpha/upgrades.yml.pgp16
-rw-r--r--wiki/src/upgrade/v1/Tails/3.12.1/amd64/stable/upgrades.yml (renamed from wiki/src/upgrade/v1/Tails/3.10.2/amd64/stable/upgrades.yml)2
-rw-r--r--wiki/src/upgrade/v1/Tails/3.12.1/amd64/stable/upgrades.yml.pgp16
-rw-r--r--wiki/src/upgrade/v1/Tails/3.12.2/amd64/alpha/upgrades.yml5
-rw-r--r--wiki/src/upgrade/v1/Tails/3.12.2/amd64/alpha/upgrades.yml.pgp16
-rw-r--r--wiki/src/upgrade/v1/Tails/3.12.2/amd64/stable/upgrades.yml5
-rw-r--r--wiki/src/upgrade/v1/Tails/3.12.2/amd64/stable/upgrades.yml.pgp16
-rw-r--r--wiki/src/upgrade/v1/Tails/3.12/amd64/stable/upgrades.yml15
-rw-r--r--wiki/src/upgrade/v1/Tails/3.12/amd64/stable/upgrades.yml.pgp17
-rw-r--r--wiki/src/upgrade/v1/Tails/3.12/amd64/test/upgrades.yml20
-rw-r--r--wiki/src/upgrade/v1/Tails/3.12/amd64/test/upgrades.yml.pgp16
-rw-r--r--wiki/src/upgrade/v1/Tails/3.12~rc1/amd64/stable/upgrades.yml15
-rw-r--r--wiki/src/upgrade/v1/Tails/3.12~rc1/amd64/stable/upgrades.yml.pgp17
-rw-r--r--wiki/src/upgrade/v1/Tails/3.12~rc1/amd64/test/upgrades.yml20
-rw-r--r--wiki/src/upgrade/v1/Tails/3.12~rc1/amd64/test/upgrades.yml.pgp16
-rw-r--r--wiki/src/upgrade/v1/Tails/3.13/amd64/alpha/upgrades.yml5
-rw-r--r--wiki/src/upgrade/v1/Tails/3.13/amd64/alpha/upgrades.yml.pgp16
-rw-r--r--wiki/src/upgrade/v1/Tails/3.13/amd64/stable/upgrades.yml5
-rw-r--r--wiki/src/upgrade/v1/Tails/3.13/amd64/stable/upgrades.yml.pgp16
-rw-r--r--wiki/src/upgrade/v1/Tails/3.14/amd64/alpha/upgrades.yml5
-rw-r--r--wiki/src/upgrade/v1/Tails/3.14/amd64/alpha/upgrades.yml.pgp16
-rw-r--r--wiki/src/upgrade/v1/Tails/3.14/amd64/stable/upgrades.yml5
-rw-r--r--wiki/src/upgrade/v1/Tails/3.14/amd64/stable/upgrades.yml.pgp16
-rw-r--r--wiki/src/upgrade/v1/Tails/3.14~rc1/amd64/alpha/upgrades.yml5
-rw-r--r--wiki/src/upgrade/v1/Tails/3.14~rc1/amd64/alpha/upgrades.yml.pgp16
-rw-r--r--wiki/src/upgrade/v1/Tails/3.14~rc1/amd64/stable/upgrades.yml5
-rw-r--r--wiki/src/upgrade/v1/Tails/3.14~rc1/amd64/stable/upgrades.yml.pgp16
-rw-r--r--wiki/src/upgrade/v1/Tails/3.9.1/amd64/stable/upgrades.yml14
-rw-r--r--wiki/src/upgrade/v1/Tails/3.9.1/amd64/stable/upgrades.yml.pgp26
-rw-r--r--wiki/src/upgrade/v1/Tails/3.9.1/amd64/test/upgrades.yml14
-rw-r--r--wiki/src/upgrade/v1/Tails/3.9.1/amd64/test/upgrades.yml.pgp26
-rw-r--r--wiki/src/upgrade/v1/Tails/3.9/amd64/stable/upgrades.yml14
-rw-r--r--wiki/src/upgrade/v1/Tails/3.9/amd64/stable/upgrades.yml.pgp26
-rw-r--r--wiki/src/upgrade/v1/Tails/3.9/amd64/test/upgrades.yml14
-rw-r--r--wiki/src/upgrade/v1/Tails/3.9/amd64/test/upgrades.yml.pgp26
758 files changed, 37281 insertions, 37087 deletions
diff --git a/wiki/src/about.it.po b/wiki/src/about.it.po
index 0dd03ea..ea9532e 100644
--- a/wiki/src/about.it.po
+++ b/wiki/src/about.it.po
@@ -412,7 +412,7 @@ msgstr "Stampa ed altri media\n"
#. type: Plain text
msgid "See [[Press and media information|press]]."
-msgstr "Guarda [[informazioni dalla stampa e dai media|press]."
+msgstr "Guarda [[informazioni dalla stampa e dai media|press]]."
#. type: Title =
#, no-wrap
diff --git a/wiki/src/about/contact.de.po b/wiki/src/about/contact.de.po
index d7267f9..83b381b 100644
--- a/wiki/src/about/contact.de.po
+++ b/wiki/src/about/contact.de.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2017-06-07 17:03+0000\n"
-"PO-Revision-Date: 2016-12-01 21:31+0100\n"
+"POT-Creation-Date: 2018-12-23 19:38+0100\n"
+"PO-Revision-Date: 2018-12-23 20:10+0100\n"
"Last-Translator: spriver <spriver@autistici.org>\n"
"Language-Team: \n"
"Language: de\n"
@@ -86,21 +86,19 @@ msgstr ""
#. type: Plain text
msgid ""
-"Public archive of amnesia-news: <https://mailman.boum.org/pipermail/amnesia-"
-"news/>."
-msgstr ""
-"Öffentliches Archiv von amnesia-news: <https://mailman.boum.org/pipermail/"
-"amnesia-news/>."
+"Public archive of amnesia-news: <https://lists.autistici.org/list/amnesia-"
+"news.html>."
+msgstr "Öffentliches Archiv von amnesia-news: <https://lists.autistici.org/list/amnesia-news.html/>."
#. type: Plain text
#, no-wrap
msgid ""
-"<form method=\"POST\" action=\"https://mailman.boum.org/subscribe/amnesia-news\">\n"
+"<form method=\"POST\" action=\"https://www.autistici.org/mailman/subscribe/amnesia-news\">\n"
"\t<input class=\"text\" name=\"email\" value=\"\"/>\n"
"\t<input class=\"button\" type=\"submit\" value=\"Subscribe\"/>\n"
"</form>\n"
msgstr ""
-"<form method=\"POST\" action=\"https://mailman.boum.org/subscribe/amnesia-news\">\n"
+"<form method=\"POST\" action=\"https://www.autistici.org/mailman/subscribe/amnesia-news\">\n"
"\t<input class=\"text\" name=\"email\" value=\"\"/>\n"
"\t<input class=\"button\" type=\"submit\" value=\"Abonnieren\"/>\n"
"</form>\n"
@@ -126,21 +124,19 @@ msgstr ""
#. type: Plain text
msgid ""
-"Public archive of tails-project: <https://mailman.boum.org/pipermail/tails-"
-"project/>."
-msgstr ""
-"Öffentliches Archiv von tails-project: <https://mailman.boum.org/pipermail/"
-"tails-project/>."
+"Public archive of tails-project: <https://lists.autistici.org/list/tails-"
+"project.html>."
+msgstr "Öffentliches Archiv von tails-project: <https://lists.autistici.org/list/tails-project.html/>."
#. type: Plain text
#, no-wrap
msgid ""
-"<form method=\"POST\" action=\"https://mailman.boum.org/subscribe/tails-project\">\n"
+"<form method=\"POST\" action=\"https://www.autistici.org/mailman/subscribe/tails-project\">\n"
"\t<input class=\"text\" name=\"email\" value=\"\"/>\n"
"\t<input class=\"button\" type=\"submit\" value=\"Subscribe\"/>\n"
"</form>\n"
msgstr ""
-"<form method=\"POST\" action=\"https://mailman.boum.org/subscribe/tails-project\">\n"
+"<form method=\"POST\" action=\"https://www.autistici.org/mailman/subscribe/tails-project\">\n"
"\t<input class=\"text\" name=\"email\" value=\"\"/>\n"
"\t<input class=\"button\" type=\"submit\" value=\"Abonnieren\"/>\n"
"</form>\n"
@@ -167,20 +163,19 @@ msgstr ""
#. type: Plain text
msgid ""
-"Public archive of tails-dev: <https://mailman.boum.org/pipermail/tails-dev/>."
-msgstr ""
-"Öffentliches Archiv von tails-dev: <https://mailman.boum.org/pipermail/tails-"
-"dev/>."
+"Public archive of tails-dev: <https://lists.autistici.org/list/tails-dev."
+"html>."
+msgstr "Öffentliches Archiv von tails-dev: <https://lists.autistici.org/list/tails-dev.html/>."
#. type: Plain text
#, no-wrap
msgid ""
-"<form method=\"POST\" action=\"https://mailman.boum.org/subscribe/tails-dev\">\n"
+"<form method=\"POST\" action=\"https://www.autistici.org/mailman/subscribe/tails-dev\">\n"
"\t<input class=\"text\" name=\"email\" value=\"\"/>\n"
"\t<input class=\"button\" type=\"submit\" value=\"Subscribe\"/>\n"
"</form>\n"
msgstr ""
-"<form method=\"POST\" action=\"https://mailman.boum.org/subscribe/tails-dev\">\n"
+"<form method=\"POST\" action=\"https://www.autistici.org/mailman/subscribe/tails-dev\">\n"
"\t<input class=\"text\" name=\"email\" value=\"\"/>\n"
"\t<input class=\"button\" type=\"submit\" value=\"Abonnieren\"/>\n"
"</form>\n"
@@ -205,21 +200,19 @@ msgstr ""
#. type: Plain text
msgid ""
-"Public archive of tails-testers: <https://mailman.boum.org/pipermail/tails-"
-"testers/>."
-msgstr ""
-"Öffentliches Archiv von tails-testers: <https://mailman.boum.org/pipermail/"
-"tails-testers/>."
+"Public archive of tails-testers: <https://lists.autistici.org/list/tails-"
+"testers.html>."
+msgstr "Öffentliches Archiv von tails-testers: <https://lists.autistici.org/list/tails-testers.html/>."
#. type: Plain text
#, no-wrap
msgid ""
-"<form method=\"POST\" action=\"https://mailman.boum.org/subscribe/tails-testers\">\n"
+"<form method=\"POST\" action=\"https://www.autistici.org/mailman/subscribe/tails-testers\">\n"
"\t<input class=\"text\" name=\"email\" value=\"\"/>\n"
"\t<input class=\"button\" type=\"submit\" value=\"Subscribe\"/>\n"
"</form>\n"
msgstr ""
-"<form method=\"POST\" action=\"https://mailman.boum.org/subscribe/tails-testers\">\n"
+"<form method=\"POST\" action=\"https://www.autistici.org/mailman/subscribe/tails-testers\">\n"
"\t<input class=\"text\" name=\"email\" value=\"\"/>\n"
"\t<input class=\"button\" type=\"submit\" value=\"Abonnieren\"/>\n"
"</form>\n"
@@ -245,20 +238,18 @@ msgstr ""
#. type: Plain text
msgid ""
-"Public archive of tails-ux: <https://mailman.boum.org/pipermail/tails-ux/>."
-msgstr ""
-"Öffentliches Archiv von tails-ux: <https://mailman.boum.org/pipermail/tails-"
-"ux/>."
+"Public archive of tails-ux: <https://lists.autistici.org/list/tails-ux.html>."
+msgstr "Öffentliches Archiv von tails-ux: <https://lists.autistici.org/list/tails-ux.html/>."
#. type: Plain text
#, no-wrap
msgid ""
-"<form method=\"POST\" action=\"https://mailman.boum.org/subscribe/tails-ux\">\n"
+"<form method=\"POST\" action=\"https://www.autistici.org/mailman/subscribe/tails-ux\">\n"
"\t<input class=\"text\" name=\"email\" value=\"\"/>\n"
"\t<input class=\"button\" type=\"submit\" value=\"Subscribe\"/>\n"
"</form>\n"
msgstr ""
-"<form method=\"POST\" action=\"https://mailman.boum.org/subscribe/tails-ux\">\n"
+"<form method=\"POST\" action=\"https://www.autistici.org/mailman/subscribe/tails-ux\">\n"
"\t<input class=\"text\" name=\"email\" value=\"\"/>\n"
"\t<input class=\"button\" type=\"submit\" value=\"Abonnieren\"/>\n"
"</form>\n"
@@ -483,5 +474,7 @@ msgstr ""
#~ "[[tails-support@boum.org|support/tails-support]] ist die Mailingliste für "
#~ "die Unterstützung von Anwenderinnen und Anwendern von Tails."
-#~ msgid "[[!inline pages=\"support/tails-support\" raw=\"yes\" sort=\"age\"]]\n"
-#~ msgstr "[[!inline pages=\"support/tails-support.de\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgid ""
+#~ "[[!inline pages=\"support/tails-support\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgstr ""
+#~ "[[!inline pages=\"support/tails-support.de\" raw=\"yes\" sort=\"age\"]]\n"
diff --git a/wiki/src/about/contact.es.po b/wiki/src/about/contact.es.po
index 8cfd8f5..0340e2a 100644
--- a/wiki/src/about/contact.es.po
+++ b/wiki/src/about/contact.es.po
@@ -5,11 +5,11 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-01-17 16:52+0000\n"
-"PO-Revision-Date: 2017-11-15 11:41+0000\n"
+"POT-Creation-Date: 2018-12-23 19:38+0100\n"
+"PO-Revision-Date: 2018-12-23 20:09+0100\n"
"Last-Translator: victorhck <victorhck@opensuse.org>\n"
-"Language-Team: Spanish "
-"<http://translate.tails.boum.org/projects/tails/contact/es/>\n"
+"Language-Team: Spanish <http://translate.tails.boum.org/projects/tails/"
+"contact/es/>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -86,21 +86,19 @@ msgstr ""
#. type: Plain text
msgid ""
-"Public archive of amnesia-news: <https://mailman.boum.org/pipermail/amnesia-"
-"news/>."
-msgstr ""
-"Archivo público de amnesia-news: <https://mailman.boum.org/pipermail/amnesia-"
-"news/>."
+"Public archive of amnesia-news: <https://lists.autistici.org/list/amnesia-"
+"news.html>."
+msgstr "Archivo público de amnesia-news: <https://lists.autistici.org/list/amnesia-news.html/>."
#. type: Plain text
#, no-wrap
msgid ""
-"<form method=\"POST\" action=\"https://mailman.boum.org/subscribe/amnesia-news\">\n"
+"<form method=\"POST\" action=\"https://www.autistici.org/mailman/subscribe/amnesia-news\">\n"
"\t<input class=\"text\" name=\"email\" value=\"\"/>\n"
"\t<input class=\"button\" type=\"submit\" value=\"Subscribe\"/>\n"
"</form>\n"
msgstr ""
-"<form method=\"POST\" action=\"https://mailman.boum.org/subscribe/amnesia-news\">\n"
+"<form method=\"POST\" action=\"https://www.autistici.org/mailman/subscribe/amnesia-news\">\n"
"\t<input class=\"text\" name=\"email\" value=\"\"/>\n"
"\t<input class=\"button\" type=\"submit\" value=\"Suscribirse\"/>\n"
"</form>\n"
@@ -125,21 +123,19 @@ msgstr ""
#. type: Plain text
msgid ""
-"Public archive of tails-project: <https://mailman.boum.org/pipermail/tails-"
-"project/>."
-msgstr ""
-"Archivo pública de tails-project: <https://mailman.boum.org/pipermail/tails-"
-"project/>."
+"Public archive of tails-project: <https://lists.autistici.org/list/tails-"
+"project.html>."
+msgstr "Archivo pública de tails-project: <https://lists.autistici.org/list/tails-project.html/>."
#. type: Plain text
#, no-wrap
msgid ""
-"<form method=\"POST\" action=\"https://mailman.boum.org/subscribe/tails-project\">\n"
+"<form method=\"POST\" action=\"https://www.autistici.org/mailman/subscribe/tails-project\">\n"
"\t<input class=\"text\" name=\"email\" value=\"\"/>\n"
"\t<input class=\"button\" type=\"submit\" value=\"Subscribe\"/>\n"
"</form>\n"
msgstr ""
-"<form method=\"POST\" action=\"https://mailman.boum.org/subscribe/tails-project\">\n"
+"<form method=\"POST\" action=\"https://www.autistici.org/mailman/subscribe/tails-project\">\n"
"\t<input class=\"text\" name=\"email\" value=\"\"/>\n"
"\t<input class=\"button\" type=\"submit\" value=\"Suscribirse\"/>\n"
"</form>\n"
@@ -166,20 +162,21 @@ msgstr ""
#. type: Plain text
msgid ""
-"Public archive of tails-dev: <https://mailman.boum.org/pipermail/tails-dev/>."
+"Public archive of tails-dev: <https://lists.autistici.org/list/tails-dev."
+"html>."
msgstr ""
-"Archivo público de tails-dev: <https://mailman.boum.org/pipermail/tails-dev/"
+"Archivo público de tails-dev: <https://lists.autistici.org/list/tails-dev.html/"
">."
#. type: Plain text
#, no-wrap
msgid ""
-"<form method=\"POST\" action=\"https://mailman.boum.org/subscribe/tails-dev\">\n"
+"<form method=\"POST\" action=\"https://www.autistici.org/mailman/subscribe/tails-dev\">\n"
"\t<input class=\"text\" name=\"email\" value=\"\"/>\n"
"\t<input class=\"button\" type=\"submit\" value=\"Subscribe\"/>\n"
"</form>\n"
msgstr ""
-"<form method=\"POST\" action=\"https://mailman.boum.org/subscribe/tails-dev\">\n"
+"<form method=\"POST\" action=\"https://www.autistici.org/mailman/subscribe/tails-dev\">\n"
"\t<input class=\"text\" name=\"email\" value=\"\"/>\n"
"\t<input class=\"button\" type=\"submit\" value=\"Suscribirse\"/>\n"
"</form>\n"
@@ -204,21 +201,19 @@ msgstr ""
#. type: Plain text
msgid ""
-"Public archive of tails-testers: <https://mailman.boum.org/pipermail/tails-"
-"testers/>."
-msgstr ""
-"Archivo público de tails-testers: <https://mailman.boum.org/pipermail/tails-"
-"testers/>."
+"Public archive of tails-testers: <https://lists.autistici.org/list/tails-"
+"testers.html>."
+msgstr "Archivo público de tails-testers: <https://lists.autistici.org/list/tails-testers.html/>."
#. type: Plain text
#, no-wrap
msgid ""
-"<form method=\"POST\" action=\"https://mailman.boum.org/subscribe/tails-testers\">\n"
+"<form method=\"POST\" action=\"https://www.autistici.org/mailman/subscribe/tails-testers\">\n"
"\t<input class=\"text\" name=\"email\" value=\"\"/>\n"
"\t<input class=\"button\" type=\"submit\" value=\"Subscribe\"/>\n"
"</form>\n"
msgstr ""
-"<form method=\"POST\" action=\"https://mailman.boum.org/subscribe/tails-testers\">\n"
+"<form method=\"POST\" action=\"https://www.autistici.org/mailman/subscribe/tails-testers\">\n"
"\t<input class=\"text\" name=\"email\" value=\"\"/>\n"
"\t<input class=\"button\" type=\"submit\" value=\"Suscribirse\"/>\n"
"</form>\n"
@@ -244,19 +239,19 @@ msgstr ""
#. type: Plain text
msgid ""
-"Public archive of tails-ux: <https://mailman.boum.org/pipermail/tails-ux/>."
+"Public archive of tails-ux: <https://lists.autistici.org/list/tails-ux.html>."
msgstr ""
-"Archivo público de tails-ux: <https://mailman.boum.org/pipermail/tails-ux/>."
+"Archivo público de tails-ux: <https://lists.autistici.org/list/tails-ux.html/>."
#. type: Plain text
#, no-wrap
msgid ""
-"<form method=\"POST\" action=\"https://mailman.boum.org/subscribe/tails-ux\">\n"
+"<form method=\"POST\" action=\"https://www.autistici.org/mailman/subscribe/tails-ux\">\n"
"\t<input class=\"text\" name=\"email\" value=\"\"/>\n"
"\t<input class=\"button\" type=\"submit\" value=\"Subscribe\"/>\n"
"</form>\n"
msgstr ""
-"<form method=\"POST\" action=\"https://mailman.boum.org/subscribe/tails-ux\">\n"
+"<form method=\"POST\" action=\"https://www.autistici.org/mailman/subscribe/tails-ux\">\n"
"\t<input class=\"text\" name=\"email\" value=\"\"/>\n"
"\t<input class=\"button\" type=\"submit\" value=\"Suscribirse\"/>\n"
"</form>\n"
@@ -274,9 +269,7 @@ msgstr "tails-l10n\n"
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"contribute/how/translate/tails-l10n.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr ""
-"[[!inline pages=\"contribute/how/translate/tails-l10n.inline.es\" raw=\"yes\""
-" sort=\"age\"]]\n"
+msgstr "[[!inline pages=\"contribute/how/translate/tails-l10n.inline.es\" raw=\"yes\" sort=\"age\"]]\n"
#. type: Title =
#, no-wrap
@@ -366,8 +359,8 @@ msgid ""
"[[OpenPGP key|tails-accounting.key]] ([[details|doc/about/"
"openpgp_keys#accounting]])."
msgstr ""
-"[[OpenPGP key|tails-accounting.key]] "
-"([[details|doc/about/openpgp_keys#accounting]])."
+"[[OpenPGP key|tails-accounting.key]] ([[details|doc/about/"
+"openpgp_keys#accounting]])."
#. type: Plain text
#, no-wrap
@@ -386,16 +379,15 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid "If you want to operate a Tails mirror, write to <tails-mirrors@boum.org>.\n"
-msgstr ""
-"Si quieres montar un mirror de Tails, escribe a <tails-mirrors@boum.org>.\n"
+msgstr "Si quieres montar un mirror de Tails, escribe a <tails-mirrors@boum.org>.\n"
#. type: Plain text
msgid ""
"[[OpenPGP key|tails-mirrors.key]] ([[details|doc/about/"
"openpgp_keys#mirrors]])."
msgstr ""
-"[[OpenPGP key|tails-mirrors.key]] "
-"([[details|doc/about/openpgp_keys#mirrors]])."
+"[[OpenPGP key|tails-mirrors.key]] ([[details|doc/about/"
+"openpgp_keys#mirrors]])."
#. type: Plain text
#, no-wrap
@@ -413,8 +405,7 @@ msgid ""
"To talk about our infrastructure (servers, test suite, repositories,\n"
"mirrors, etc.), write to <tails-sysadmins@boum.org>.\n"
msgstr ""
-"Para hablar sobre nuestra infraestructura (servidores, conjunto de pruebas, "
-"repositorios,\n"
+"Para hablar sobre nuestra infraestructura (servidores, conjunto de pruebas, repositorios,\n"
"mirrors, etc.), escribe a <tails-sysadmins@boum.org>.\n"
#. type: Plain text
@@ -422,8 +413,8 @@ msgid ""
"[[OpenPGP key|tails-sysadmins.key]] ([[details|doc/about/"
"openpgp_keys#sysadmins]])."
msgstr ""
-"[[OpenPGP key|tails-sysadmins.key]] "
-"([[details|doc/about/openpgp_keys#sysadmins]])."
+"[[OpenPGP key|tails-sysadmins.key]] ([[details|doc/about/"
+"openpgp_keys#sysadmins]])."
#. type: Plain text
#, no-wrap
@@ -485,5 +476,7 @@ msgstr ""
#~ "[[tails-support@boum.org|support/tails-support]] es la lista de correo "
#~ "dedicada al soporte de usuarios de Tails."
-#~ msgid "[[!inline pages=\"support/tails-support\" raw=\"yes\" sort=\"age\"]]\n"
-#~ msgstr "[[!inline pages=\"support/tails-support.es\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgid ""
+#~ "[[!inline pages=\"support/tails-support\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgstr ""
+#~ "[[!inline pages=\"support/tails-support.es\" raw=\"yes\" sort=\"age\"]]\n"
diff --git a/wiki/src/about/contact.fa.po b/wiki/src/about/contact.fa.po
index 00645fa..fd9144a 100644
--- a/wiki/src/about/contact.fa.po
+++ b/wiki/src/about/contact.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-06-07 17:03+0000\n"
+"POT-Creation-Date: 2018-12-23 19:38+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"
@@ -77,14 +77,14 @@ msgstr ""
#. type: Plain text
msgid ""
-"Public archive of amnesia-news: <https://mailman.boum.org/pipermail/amnesia-"
-"news/>."
+"Public archive of amnesia-news: <https://lists.autistici.org/list/amnesia-"
+"news.html>."
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"<form method=\"POST\" action=\"https://mailman.boum.org/subscribe/amnesia-news\">\n"
+"<form method=\"POST\" action=\"https://www.autistici.org/mailman/subscribe/amnesia-news\">\n"
"\t<input class=\"text\" name=\"email\" value=\"\"/>\n"
"\t<input class=\"button\" type=\"submit\" value=\"Subscribe\"/>\n"
"</form>\n"
@@ -108,14 +108,14 @@ msgstr ""
#. type: Plain text
msgid ""
-"Public archive of tails-project: <https://mailman.boum.org/pipermail/tails-"
-"project/>."
+"Public archive of tails-project: <https://lists.autistici.org/list/tails-"
+"project.html>."
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"<form method=\"POST\" action=\"https://mailman.boum.org/subscribe/tails-project\">\n"
+"<form method=\"POST\" action=\"https://www.autistici.org/mailman/subscribe/tails-project\">\n"
"\t<input class=\"text\" name=\"email\" value=\"\"/>\n"
"\t<input class=\"button\" type=\"submit\" value=\"Subscribe\"/>\n"
"</form>\n"
@@ -140,13 +140,14 @@ msgstr ""
#. type: Plain text
msgid ""
-"Public archive of tails-dev: <https://mailman.boum.org/pipermail/tails-dev/>."
+"Public archive of tails-dev: <https://lists.autistici.org/list/tails-dev."
+"html>."
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"<form method=\"POST\" action=\"https://mailman.boum.org/subscribe/tails-dev\">\n"
+"<form method=\"POST\" action=\"https://www.autistici.org/mailman/subscribe/tails-dev\">\n"
"\t<input class=\"text\" name=\"email\" value=\"\"/>\n"
"\t<input class=\"button\" type=\"submit\" value=\"Subscribe\"/>\n"
"</form>\n"
@@ -170,14 +171,14 @@ msgstr ""
#. type: Plain text
msgid ""
-"Public archive of tails-testers: <https://mailman.boum.org/pipermail/tails-"
-"testers/>."
+"Public archive of tails-testers: <https://lists.autistici.org/list/tails-"
+"testers.html>."
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"<form method=\"POST\" action=\"https://mailman.boum.org/subscribe/tails-testers\">\n"
+"<form method=\"POST\" action=\"https://www.autistici.org/mailman/subscribe/tails-testers\">\n"
"\t<input class=\"text\" name=\"email\" value=\"\"/>\n"
"\t<input class=\"button\" type=\"submit\" value=\"Subscribe\"/>\n"
"</form>\n"
@@ -201,13 +202,13 @@ msgstr ""
#. type: Plain text
msgid ""
-"Public archive of tails-ux: <https://mailman.boum.org/pipermail/tails-ux/>."
+"Public archive of tails-ux: <https://lists.autistici.org/list/tails-ux.html>."
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"<form method=\"POST\" action=\"https://mailman.boum.org/subscribe/tails-ux\">\n"
+"<form method=\"POST\" action=\"https://www.autistici.org/mailman/subscribe/tails-ux\">\n"
"\t<input class=\"text\" name=\"email\" value=\"\"/>\n"
"\t<input class=\"button\" type=\"submit\" value=\"Subscribe\"/>\n"
"</form>\n"
@@ -258,9 +259,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"support/talk/languages.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr ""
-"[[!inline pages=\"support/talk/languages.inline.fa\" raw=\"yes\" sort=\"age\""
-"]]\n"
+msgstr "[[!inline pages=\"support/talk/languages.inline.fa\" raw=\"yes\" sort=\"age\"]]\n"
#. type: Plain text
#, no-wrap
diff --git a/wiki/src/about/contact.fr.po b/wiki/src/about/contact.fr.po
index ef76134..9457123 100644
--- a/wiki/src/about/contact.fr.po
+++ b/wiki/src/about/contact.fr.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2017-06-07 17:03+0000\n"
-"PO-Revision-Date: 2016-07-16 09:08-0000\n"
+"POT-Creation-Date: 2018-12-23 19:38+0100\n"
+"PO-Revision-Date: 2018-12-23 20:08+0100\n"
"Last-Translator: AtomiKe <tails@atomike.ninja>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
"Language: fr\n"
@@ -86,21 +86,19 @@ msgstr ""
#. type: Plain text
msgid ""
-"Public archive of amnesia-news: <https://mailman.boum.org/pipermail/amnesia-"
-"news/>."
-msgstr ""
-"Archives publiques de la liste amnesia-news : <https://mailman.boum.org/"
-"pipermail/amnesia-news/>."
+"Public archive of amnesia-news: <https://lists.autistici.org/list/amnesia-"
+"news.html>."
+msgstr "Archives publiques de la liste amnesia-news : <https://lists.autistici.org/list/amnesia-news.html/>."
#. type: Plain text
#, no-wrap
msgid ""
-"<form method=\"POST\" action=\"https://mailman.boum.org/subscribe/amnesia-news\">\n"
+"<form method=\"POST\" action=\"https://www.autistici.org/mailman/subscribe/amnesia-news\">\n"
"\t<input class=\"text\" name=\"email\" value=\"\"/>\n"
"\t<input class=\"button\" type=\"submit\" value=\"Subscribe\"/>\n"
"</form>\n"
msgstr ""
-"<form method=\"POST\" action=\"https://mailman.boum.org/subscribe/amnesia-news\">\n"
+"<form method=\"POST\" action=\"https://www.autistici.org/mailman/subscribe/amnesia-news\">\n"
"\t<input class=\"text\" name=\"email\" value=\"\"/>\n"
"\t<input class=\"button\" type=\"submit\" value=\"S'abonner\"/>\n"
"</form>\n"
@@ -125,21 +123,19 @@ msgstr ""
#. type: Plain text
msgid ""
-"Public archive of tails-project: <https://mailman.boum.org/pipermail/tails-"
-"project/>."
-msgstr ""
-"Archives publiques de la liste tails-project : <https://mailman.boum.org/"
-"pipermail/tails-project/>."
+"Public archive of tails-project: <https://lists.autistici.org/list/tails-"
+"project.html>."
+msgstr "Archives publiques de la liste tails-project : <https://lists.autistici.org/list/tails-project.html/>."
#. type: Plain text
#, no-wrap
msgid ""
-"<form method=\"POST\" action=\"https://mailman.boum.org/subscribe/tails-project\">\n"
+"<form method=\"POST\" action=\"https://www.autistici.org/mailman/subscribe/tails-project\">\n"
"\t<input class=\"text\" name=\"email\" value=\"\"/>\n"
"\t<input class=\"button\" type=\"submit\" value=\"Subscribe\"/>\n"
"</form>\n"
msgstr ""
-"<form method=\"POST\" action=\"https://mailman.boum.org/subscribe/tails-project\">\n"
+"<form method=\"POST\" action=\"https://www.autistici.org/mailman/subscribe/tails-project\">\n"
"\t<input class=\"text\" name=\"email\" value=\"\"/>\n"
"\t<input class=\"button\" type=\"submit\" value=\"S'abonner\"/>\n"
"</form>\n"
@@ -166,20 +162,19 @@ msgstr ""
#. type: Plain text
msgid ""
-"Public archive of tails-dev: <https://mailman.boum.org/pipermail/tails-dev/>."
-msgstr ""
-"Archives publiques de la liste tails-dev : <https://mailman.boum.org/"
-"pipermail/tails-dev/>."
+"Public archive of tails-dev: <https://lists.autistici.org/list/tails-dev."
+"html>."
+msgstr "Archives publiques de la liste tails-dev : <https://lists.autistici.org/list/tails-dev.html/>."
#. type: Plain text
#, no-wrap
msgid ""
-"<form method=\"POST\" action=\"https://mailman.boum.org/subscribe/tails-dev\">\n"
+"<form method=\"POST\" action=\"https://www.autistici.org/mailman/subscribe/tails-dev\">\n"
"\t<input class=\"text\" name=\"email\" value=\"\"/>\n"
"\t<input class=\"button\" type=\"submit\" value=\"Subscribe\"/>\n"
"</form>\n"
msgstr ""
-"<form method=\"POST\" action=\"https://mailman.boum.org/subscribe/tails-dev\">\n"
+"<form method=\"POST\" action=\"https://www.autistici.org/mailman/subscribe/tails-dev\">\n"
"\t<input class=\"text\" name=\"email\" value=\"\"/>\n"
"\t<input class=\"button\" type=\"submit\" value=\"S'abonner\"/>\n"
"</form>\n"
@@ -204,21 +199,19 @@ msgstr ""
#. type: Plain text
msgid ""
-"Public archive of tails-testers: <https://mailman.boum.org/pipermail/tails-"
-"testers/>."
-msgstr ""
-"Archives publiques de la liste tails-testers : <https://mailman.boum.org/"
-"pipermail/tails-testers/>."
+"Public archive of tails-testers: <https://lists.autistici.org/list/tails-"
+"testers.html>."
+msgstr "Archives publiques de la liste tails-testers : <https://lists.autistici.org/list/tails-testers.html/>."
#. type: Plain text
#, no-wrap
msgid ""
-"<form method=\"POST\" action=\"https://mailman.boum.org/subscribe/tails-testers\">\n"
+"<form method=\"POST\" action=\"https://www.autistici.org/mailman/subscribe/tails-testers\">\n"
"\t<input class=\"text\" name=\"email\" value=\"\"/>\n"
"\t<input class=\"button\" type=\"submit\" value=\"Subscribe\"/>\n"
"</form>\n"
msgstr ""
-"<form method=\"POST\" action=\"https://mailman.boum.org/subscribe/tails-testers\">\n"
+"<form method=\"POST\" action=\"https://www.autistici.org/mailman/subscribe/tails-testers\">\n"
"\t<input class=\"text\" name=\"email\" value=\"\"/>\n"
"\t<input class=\"button\" type=\"submit\" value=\"S'abonner\"/>\n"
"</form>\n"
@@ -243,20 +236,18 @@ msgstr ""
#. type: Plain text
msgid ""
-"Public archive of tails-ux: <https://mailman.boum.org/pipermail/tails-ux/>."
-msgstr ""
-"Archives publiques de la liste tails-ux : <https://mailman.boum.org/"
-"pipermail/tails-ux/>."
+"Public archive of tails-ux: <https://lists.autistici.org/list/tails-ux.html>."
+msgstr "Archives publiques de la liste tails-ux : <https://lists.autistici.org/list/tails-ux.html/>."
#. type: Plain text
#, no-wrap
msgid ""
-"<form method=\"POST\" action=\"https://mailman.boum.org/subscribe/tails-ux\">\n"
+"<form method=\"POST\" action=\"https://www.autistici.org/mailman/subscribe/tails-ux\">\n"
"\t<input class=\"text\" name=\"email\" value=\"\"/>\n"
"\t<input class=\"button\" type=\"submit\" value=\"Subscribe\"/>\n"
"</form>\n"
msgstr ""
-"<form method=\"POST\" action=\"https://mailman.boum.org/subscribe/tails-ux\">\n"
+"<form method=\"POST\" action=\"https://www.autistici.org/mailman/subscribe/tails-ux\">\n"
"\t<input class=\"text\" name=\"email\" value=\"\"/>\n"
"\t<input class=\"button\" type=\"submit\" value=\"S'abonner\"/>\n"
"</form>\n"
@@ -477,5 +468,7 @@ msgstr ""
#~ "[[tails-support@boum.org|support/tails-support]] est la liste dédiée au "
#~ "support des utilisateurs de Tails."
-#~ msgid "[[!inline pages=\"support/tails-support\" raw=\"yes\" sort=\"age\"]]\n"
-#~ msgstr "[[!inline pages=\"support/tails-support.fr\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgid ""
+#~ "[[!inline pages=\"support/tails-support\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgstr ""
+#~ "[[!inline pages=\"support/tails-support.fr\" raw=\"yes\" sort=\"age\"]]\n"
diff --git a/wiki/src/about/contact.it.po b/wiki/src/about/contact.it.po
index e4eb523..062304d 100644
--- a/wiki/src/about/contact.it.po
+++ b/wiki/src/about/contact.it.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2017-08-05 14:00+0200\n"
-"PO-Revision-Date: 2017-06-30 18:01+0000\n"
+"POT-Creation-Date: 2018-12-23 19:38+0100\n"
+"PO-Revision-Date: 2018-12-23 20:11+0100\n"
"Last-Translator: \n"
"Language-Team: ita <transitails@inventati.org>\n"
"Language: it\n"
@@ -84,21 +84,21 @@ msgstr ""
#. type: Plain text
msgid ""
-"Public archive of amnesia-news: <https://mailman.boum.org/pipermail/amnesia-"
-"news/>."
+"Public archive of amnesia-news: <https://lists.autistici.org/list/amnesia-"
+"news.html>."
msgstr ""
"È possibile consultare l'archivio pubblico di amnesia-news al seguente "
-"indirizzo: <https://mailman.boum.org/pipermail/amnesia-news/>."
+"indirizzo: <https://lists.autistici.org/list/amnesia-news.html/>."
#. type: Plain text
#, no-wrap
msgid ""
-"<form method=\"POST\" action=\"https://mailman.boum.org/subscribe/amnesia-news\">\n"
+"<form method=\"POST\" action=\"https://www.autistici.org/mailman/subscribe/amnesia-news\">\n"
"\t<input class=\"text\" name=\"email\" value=\"\"/>\n"
"\t<input class=\"button\" type=\"submit\" value=\"Subscribe\"/>\n"
"</form>\n"
msgstr ""
-"<form method=\"POST\" action=\"https://mailman.boum.org/subscribe/amnesia-news\">\n"
+"<form method=\"POST\" action=\"https://www.autistici.org/mailman/subscribe/amnesia-news\">\n"
"\t<input class=\"text\" name=\"email\" value=\"\"/>\n"
"\t<input class=\"button\" type=\"submit\" value=\"Subscribe\"/>\n"
"</form>\n"
@@ -123,21 +123,21 @@ msgstr ""
#. type: Plain text
msgid ""
-"Public archive of tails-project: <https://mailman.boum.org/pipermail/tails-"
-"project/>."
+"Public archive of tails-project: <https://lists.autistici.org/list/tails-"
+"project.html>."
msgstr ""
"È possibile consultare l'archivio pubblico di tails-project al seguente "
-"indirizzo: <https://mailman.boum.org/pipermail/tails-project/>."
+"indirizzo: <https://lists.autistici.org/list/tails-project.html/>."
#. type: Plain text
#, no-wrap
msgid ""
-"<form method=\"POST\" action=\"https://mailman.boum.org/subscribe/tails-project\">\n"
+"<form method=\"POST\" action=\"https://www.autistici.org/mailman/subscribe/tails-project\">\n"
"\t<input class=\"text\" name=\"email\" value=\"\"/>\n"
"\t<input class=\"button\" type=\"submit\" value=\"Subscribe\"/>\n"
"</form>\n"
msgstr ""
-"<form method=\"POST\" action=\"https://mailman.boum.org/subscribe/tails-project\">\n"
+"<form method=\"POST\" action=\"https://www.autistici.org/mailman/subscribe/tails-project\">\n"
"\t<input class=\"text\" name=\"email\" value=\"\"/>\n"
"\t<input class=\"button\" type=\"submit\" value=\"Subscribe\"/>\n"
"</form>\n"
@@ -164,20 +164,21 @@ msgstr ""
#. type: Plain text
msgid ""
-"Public archive of tails-dev: <https://mailman.boum.org/pipermail/tails-dev/>."
+"Public archive of tails-dev: <https://lists.autistici.org/list/tails-dev."
+"html>."
msgstr ""
"È possibile consultare l'archivio pubblico di tails-dev al seguente "
-"indirizzo: <https://mailman.boum.org/pipermail/tails-dev/>."
+"indirizzo: <https://lists.autistici.org/list/tails-dev.html/>."
#. type: Plain text
#, no-wrap
msgid ""
-"<form method=\"POST\" action=\"https://mailman.boum.org/subscribe/tails-dev\">\n"
+"<form method=\"POST\" action=\"https://www.autistici.org/mailman/subscribe/tails-dev\">\n"
"\t<input class=\"text\" name=\"email\" value=\"\"/>\n"
"\t<input class=\"button\" type=\"submit\" value=\"Subscribe\"/>\n"
"</form>\n"
msgstr ""
-"<form method=\"POST\" action=\"https://mailman.boum.org/subscribe/tails-dev\">\n"
+"<form method=\"POST\" action=\"https://www.autistici.org/mailman/subscribe/tails-dev\">\n"
"\t<input class=\"text\" name=\"email\" value=\"\"/>\n"
"\t<input class=\"button\" type=\"submit\" value=\"Subscribe\"/>\n"
"</form>\n"
@@ -202,21 +203,21 @@ msgstr ""
#. type: Plain text
msgid ""
-"Public archive of tails-testers: <https://mailman.boum.org/pipermail/tails-"
-"testers/>."
+"Public archive of tails-testers: <https://lists.autistici.org/list/tails-"
+"testers.html>."
msgstr ""
"È possibile consultare l'archivio pubblico di tails-testers al seguente "
-"indirizzo: <https://mailman.boum.org/pipermail/tails-testers/>."
+"indirizzo: <https://lists.autistici.org/list/tails-testers.html/>."
#. type: Plain text
#, no-wrap
msgid ""
-"<form method=\"POST\" action=\"https://mailman.boum.org/subscribe/tails-testers\">\n"
+"<form method=\"POST\" action=\"https://www.autistici.org/mailman/subscribe/tails-testers\">\n"
"\t<input class=\"text\" name=\"email\" value=\"\"/>\n"
"\t<input class=\"button\" type=\"submit\" value=\"Subscribe\"/>\n"
"</form>\n"
msgstr ""
-"<form method=\"POST\" action=\"https://mailman.boum.org/subscribe/tails-testers\">\n"
+"<form method=\"POST\" action=\"https://www.autistici.org/mailman/subscribe/tails-testers\">\n"
"\t<input class=\"text\" name=\"email\" value=\"\"/>\n"
"\t<input class=\"button\" type=\"submit\" value=\"Subscribe\"/>\n"
"</form>\n"
@@ -241,20 +242,20 @@ msgstr ""
#. type: Plain text
msgid ""
-"Public archive of tails-ux: <https://mailman.boum.org/pipermail/tails-ux/>."
+"Public archive of tails-ux: <https://lists.autistici.org/list/tails-ux.html>."
msgstr ""
"È possibile consultare l'archivio pubblico di tails-ux al seguente "
-"indirizzo: <https://mailman.boum.org/pipermail/tails-ux/>."
+"indirizzo: <https://lists.autistici.org/list/tails-ux.html/>."
#. type: Plain text
#, no-wrap
msgid ""
-"<form method=\"POST\" action=\"https://mailman.boum.org/subscribe/tails-ux\">\n"
+"<form method=\"POST\" action=\"https://www.autistici.org/mailman/subscribe/tails-ux\">\n"
"\t<input class=\"text\" name=\"email\" value=\"\"/>\n"
"\t<input class=\"button\" type=\"submit\" value=\"Subscribe\"/>\n"
"</form>\n"
msgstr ""
-"<form method=\"POST\" action=\"https://mailman.boum.org/subscribe/tails-ux\">\n"
+"<form method=\"POST\" action=\"https://www.autistici.org/mailman/subscribe/tails-ux\">\n"
"\t<input class=\"text\" name=\"email\" value=\"\"/>\n"
"\t<input class=\"button\" type=\"submit\" value=\"Subscribe\"/>\n"
"</form>\n"
@@ -308,9 +309,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"support/talk/languages.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr ""
-"[[!inline pages=\"support/talk/languages.inline.it\" raw=\"yes\" sort=\"age\""
-"]]\n"
+msgstr "[[!inline pages=\"support/talk/languages.inline.it\" raw=\"yes\" sort=\"age\"]]\n"
#. type: Plain text
#, no-wrap
diff --git a/wiki/src/about/contact.mdwn b/wiki/src/about/contact.mdwn
index 2b86bda..6b485ca 100644
--- a/wiki/src/about/contact.mdwn
+++ b/wiki/src/about/contact.mdwn
@@ -27,9 +27,9 @@ amnesia-news@boum.org is the mailing list where we send our [[news]] by
email. It has a low traffic and it is the right place to stay
up-to-date with the releases and security announcements.
-Public archive of amnesia-news: <https://mailman.boum.org/pipermail/amnesia-news/>.
+Public archive of amnesia-news: <https://lists.autistici.org/list/amnesia-news.html>.
-<form method="POST" action="https://mailman.boum.org/subscribe/amnesia-news">
+<form method="POST" action="https://www.autistici.org/mailman/subscribe/amnesia-news">
<input class="text" name="email" value=""/>
<input class="button" type="submit" value="Subscribe"/>
</form>
@@ -42,9 +42,9 @@ tails-project
tails-project@boum.org is the mailing list where we discuss upcoming
events, monthly reports, and other non-technical matters.
-Public archive of tails-project: <https://mailman.boum.org/pipermail/tails-project/>.
+Public archive of tails-project: <https://lists.autistici.org/list/tails-project.html>.
-<form method="POST" action="https://mailman.boum.org/subscribe/tails-project">
+<form method="POST" action="https://www.autistici.org/mailman/subscribe/tails-project">
<input class="text" name="email" value=""/>
<input class="button" type="submit" value="Subscribe"/>
</form>
@@ -58,9 +58,9 @@ tails-dev@boum.org is the mailing list where the development work is
coordinated and technical design questions are discussed. Subscribe if
you want to [[contribute code|contribute/how/code]].
-Public archive of tails-dev: <https://mailman.boum.org/pipermail/tails-dev/>.
+Public archive of tails-dev: <https://lists.autistici.org/list/tails-dev.html>.
-<form method="POST" action="https://mailman.boum.org/subscribe/tails-dev">
+<form method="POST" action="https://www.autistici.org/mailman/subscribe/tails-dev">
<input class="text" name="email" value=""/>
<input class="button" type="submit" value="Subscribe"/>
</form>
@@ -73,9 +73,9 @@ tails-testers
tails-testers@boum.org is the mailing list for people who want to help
[[test|contribute/how/testing]] new releases or features.
-Public archive of tails-testers: <https://mailman.boum.org/pipermail/tails-testers/>.
+Public archive of tails-testers: <https://lists.autistici.org/list/tails-testers.html>.
-<form method="POST" action="https://mailman.boum.org/subscribe/tails-testers">
+<form method="POST" action="https://www.autistici.org/mailman/subscribe/tails-testers">
<input class="text" name="email" value=""/>
<input class="button" type="submit" value="Subscribe"/>
</form>
@@ -88,9 +88,9 @@ tails-ux
tails-ux@boum.org is the list for matters related to
[[user experience and user interface|contribute/how/user_experience]].
-Public archive of tails-ux: <https://mailman.boum.org/pipermail/tails-ux/>.
+Public archive of tails-ux: <https://lists.autistici.org/list/tails-ux.html>.
-<form method="POST" action="https://mailman.boum.org/subscribe/tails-ux">
+<form method="POST" action="https://www.autistici.org/mailman/subscribe/tails-ux">
<input class="text" name="email" value=""/>
<input class="button" type="submit" value="Subscribe"/>
</form>
diff --git a/wiki/src/about/contact.pt.po b/wiki/src/about/contact.pt.po
index b555e36..b3309ba 100644
--- a/wiki/src/about/contact.pt.po
+++ b/wiki/src/about/contact.pt.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-03-27 21:52+0300\n"
-"PO-Revision-Date: 2018-03-17 14:25-0300\n"
+"POT-Creation-Date: 2018-12-23 19:38+0100\n"
+"PO-Revision-Date: 2018-12-23 20:11+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: \n"
"Language: pt\n"
@@ -87,22 +87,19 @@ msgstr ""
#. type: Plain text
msgid ""
-"Public archive of amnesia-news: <https://mailman.boum.org/pipermail/amnesia-"
-"news/>."
-msgstr ""
-"Arquivo público da lista amnesia-news: <https://mailman.boum.org/pipermail/"
-"amnesia-news/>."
+"Public archive of amnesia-news: <https://lists.autistici.org/list/amnesia-"
+"news.html>."
+msgstr "Arquivo público da lista amnesia-news: <https://lists.autistici.org/list/amnesia-news.html/>."
#. type: Plain text
#, no-wrap
msgid ""
-"<form method=\"POST\" action=\"https://mailman.boum.org/subscribe/amnesia-news\">\n"
+"<form method=\"POST\" action=\"https://www.autistici.org/mailman/subscribe/amnesia-news\">\n"
"\t<input class=\"text\" name=\"email\" value=\"\"/>\n"
"\t<input class=\"button\" type=\"submit\" value=\"Subscribe\"/>\n"
"</form>\n"
msgstr ""
-"<form method=\"POST\" action=\"https://mailman.boum.org/subscribe/amnesia-"
-"news\">\n"
+"<form method=\"POST\" action=\"https://www.autistici.org/mailman/subscribe/amnesia-news\">\n"
"\t<input class=\"text\" name=\"email\" value=\"\"/>\n"
"\t<input class=\"button\" type=\"submit\" value=\"Inscreva-se\"/>\n"
"</form>\n"
@@ -127,22 +124,19 @@ msgstr ""
#. type: Plain text
msgid ""
-"Public archive of tails-project: <https://mailman.boum.org/pipermail/tails-"
-"project/>."
-msgstr ""
-"Arquivo público da lista tails-project: <https://mailman.boum.org/pipermail/"
-"tails-project/>."
+"Public archive of tails-project: <https://lists.autistici.org/list/tails-"
+"project.html>."
+msgstr "Arquivo público da lista tails-project: <https://lists.autistici.org/list/tails-project.html/>."
#. type: Plain text
#, no-wrap
msgid ""
-"<form method=\"POST\" action=\"https://mailman.boum.org/subscribe/tails-project\">\n"
+"<form method=\"POST\" action=\"https://www.autistici.org/mailman/subscribe/tails-project\">\n"
"\t<input class=\"text\" name=\"email\" value=\"\"/>\n"
"\t<input class=\"button\" type=\"submit\" value=\"Subscribe\"/>\n"
"</form>\n"
msgstr ""
-"<form method=\"POST\" action=\"https://mailman.boum.org/subscribe/tails-"
-"project\">\n"
+"<form method=\"POST\" action=\"https://www.autistici.org/mailman/subscribe/tails-project\">\n"
"\t<input class=\"text\" name=\"email\" value=\"\"/>\n"
"\t<input class=\"button\" type=\"submit\" value=\"Inscreva-se\"/>\n"
"</form>\n"
@@ -169,21 +163,19 @@ msgstr ""
#. type: Plain text
msgid ""
-"Public archive of tails-dev: <https://mailman.boum.org/pipermail/tails-dev/>."
-msgstr ""
-"Arquivo público da lista tails-dev: <https://mailman.boum.org/pipermail/"
-"tails-dev/>."
+"Public archive of tails-dev: <https://lists.autistici.org/list/tails-dev."
+"html>."
+msgstr "Arquivo público da lista tails-dev: <https://lists.autistici.org/list/tails-dev.html/>."
#. type: Plain text
#, no-wrap
msgid ""
-"<form method=\"POST\" action=\"https://mailman.boum.org/subscribe/tails-dev\">\n"
+"<form method=\"POST\" action=\"https://www.autistici.org/mailman/subscribe/tails-dev\">\n"
"\t<input class=\"text\" name=\"email\" value=\"\"/>\n"
"\t<input class=\"button\" type=\"submit\" value=\"Subscribe\"/>\n"
"</form>\n"
msgstr ""
-"<form method=\"POST\" action=\"https://mailman.boum.org/subscribe/tails-dev\""
-">\n"
+"<form method=\"POST\" action=\"https://www.autistici.org/mailman/subscribe/tails-dev\">\n"
"\t<input class=\"text\" name=\"email\" value=\"\"/>\n"
"\t<input class=\"button\" type=\"submit\" value=\"Inscreva-se\"/>\n"
"</form>\n"
@@ -208,22 +200,19 @@ msgstr ""
#. type: Plain text
msgid ""
-"Public archive of tails-testers: <https://mailman.boum.org/pipermail/tails-"
-"testers/>."
-msgstr ""
-"Arquivo público da lista tails-testers: <https://mailman.boum.org/pipermail/"
-"tails-testers/>."
+"Public archive of tails-testers: <https://lists.autistici.org/list/tails-"
+"testers.html>."
+msgstr "Arquivo público da lista tails-testers: <https://lists.autistici.org/list/tails-testers.html/>."
#. type: Plain text
#, no-wrap
msgid ""
-"<form method=\"POST\" action=\"https://mailman.boum.org/subscribe/tails-testers\">\n"
+"<form method=\"POST\" action=\"https://www.autistici.org/mailman/subscribe/tails-testers\">\n"
"\t<input class=\"text\" name=\"email\" value=\"\"/>\n"
"\t<input class=\"button\" type=\"submit\" value=\"Subscribe\"/>\n"
"</form>\n"
msgstr ""
-"<form method=\"POST\" action=\"https://mailman.boum.org/subscribe/tails-"
-"testers\">\n"
+"<form method=\"POST\" action=\"https://www.autistici.org/mailman/subscribe/tails-testers\">\n"
"\t<input class=\"text\" name=\"email\" value=\"\"/>\n"
"\t<input class=\"button\" type=\"submit\" value=\"Inscreva-se\"/>\n"
"</form>\n"
@@ -243,27 +232,24 @@ msgid ""
"tails-ux@boum.org is the list for matters related to [[user experience and "
"user interface|contribute/how/user_experience]]."
msgstr ""
-"tails-ux@boum.org é a lista de e-mails para assuntos relacionados à [["
-"experência de usuário e interface de usuário|contribute/how/"
+"tails-ux@boum.org é a lista de e-mails para assuntos relacionados à "
+"[[experência de usuário e interface de usuário|contribute/how/"
"user_experience]]."
#. type: Plain text
msgid ""
-"Public archive of tails-ux: <https://mailman.boum.org/pipermail/tails-ux/>."
-msgstr ""
-"Arquivo público da lista tails-ux: <https://mailman.boum.org/pipermail/"
-"tails-ux/>."
+"Public archive of tails-ux: <https://lists.autistici.org/list/tails-ux.html>."
+msgstr "Arquivo público da lista tails-ux: <https://lists.autistici.org/list/tails-ux.html/>."
#. type: Plain text
#, no-wrap
msgid ""
-"<form method=\"POST\" action=\"https://mailman.boum.org/subscribe/tails-ux\">\n"
+"<form method=\"POST\" action=\"https://www.autistici.org/mailman/subscribe/tails-ux\">\n"
"\t<input class=\"text\" name=\"email\" value=\"\"/>\n"
"\t<input class=\"button\" type=\"submit\" value=\"Subscribe\"/>\n"
"</form>\n"
msgstr ""
-"<form method=\"POST\" action=\"https://mailman.boum.org/subscribe/tails-ux\">"
-"\n"
+"<form method=\"POST\" action=\"https://www.autistici.org/mailman/subscribe/tails-ux\">\n"
"\t<input class=\"text\" name=\"email\" value=\"\"/>\n"
"\t<input class=\"button\" type=\"submit\" value=\"Inscreva-se\"/>\n"
"</form>\n"
@@ -315,9 +301,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"support/talk/languages.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr ""
-"[[!inline pages=\"support/talk/languages.inline.pt\" raw=\"yes\" sort=\"age\""
-"]]\n"
+msgstr "[[!inline pages=\"support/talk/languages.inline.pt\" raw=\"yes\" sort=\"age\"]]\n"
#. type: Plain text
#, no-wrap
@@ -336,8 +320,7 @@ msgid ""
"send us links to [[press articles|press]] about Tails, write to\n"
"<tails-press@boum.org>.\n"
msgstr ""
-"Se você é jornalista e quer escrever sobre Tails, ou se quer nos enviar "
-"links para [[artigos publicados|press]] sobre Tails, escreva para\n"
+"Se você é jornalista e quer escrever sobre Tails, ou se quer nos enviar links para [[artigos publicados|press]] sobre Tails, escreva para\n"
"<tails-press@boum.org>.\n"
#. type: Plain text
@@ -363,8 +346,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid "If you want to fund Tails, write to <tails-accounting@boum.org>.\n"
-msgstr ""
-"Se você quer financiar o Tails, escreva para <tails-accounting@boum.org>.\n"
+msgstr "Se você quer financiar o Tails, escreva para <tails-accounting@boum.org>.\n"
#. type: Plain text
msgid ""
@@ -391,9 +373,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid "If you want to operate a Tails mirror, write to <tails-mirrors@boum.org>.\n"
-msgstr ""
-"Se você quer operar um espelho do Tails, escreva para <tails-"
-"mirrors@boum.org>.\n"
+msgstr "Se você quer operar um espelho do Tails, escreva para <tails-mirrors@boum.org>.\n"
#. type: Plain text
msgid ""
diff --git a/wiki/src/blueprint/Endless_upgrades.mdwn b/wiki/src/blueprint/Endless_upgrades.mdwn
index 7d0926f..87ececd 100644
--- a/wiki/src/blueprint/Endless_upgrades.mdwn
+++ b/wiki/src/blueprint/Endless_upgrades.mdwn
@@ -115,6 +115,7 @@ This survey will be updated in a while with [[!tails_ticket 15277]].
a [RFC for casync support](https://github.com/rauc/rauc/pull/217)
which downloads only missing bits and downloads/applies with
streaming (no intermediate download of images)
+ - ITP: [[!debbug 916210]]
* [Qt's Over-The-Air Update](https://doc.qt.io/QtOTA/) aka. QtOTA,
that uses OSTree
* XXX: other OSTree based designs/implementations?
diff --git a/wiki/src/blueprint/Tails_research.mdwn b/wiki/src/blueprint/Tails_research.mdwn
index 1fa7295..4d27ade 100644
--- a/wiki/src/blueprint/Tails_research.mdwn
+++ b/wiki/src/blueprint/Tails_research.mdwn
@@ -10,7 +10,7 @@ When you are working on a research problem that you think is interesting for the
When you worked on a problem, please let us know and we'll list your work on a page on our website.
-The best way to reach us is through the [tails-dev](https://mailman.boum.org/listinfo/tails-dev/) mailing list.
+The best way to reach us is through the [tails-dev](https://www.autistici.org/mailman/listinfo/tails-dev/) mailing list.
## Research ideas
@@ -22,7 +22,7 @@ If you have an idea yourself and would like to propose it, please write to us th
## User interface
-If you're an user interface designer you might be delighted to hear that we have a full [mailing list](https://mailman.boum.org/listinfo/tails-ux) about UX!
+If you're an user interface designer you might be delighted to hear that we have a full [mailing list](https://www.autistici.org/mailman/listinfo/tails-ux) about UX!
Our page on [improving](https://tails.boum.org/contribute/how/user_experience/) the Tails user interface might also be of interest to you.
@@ -39,7 +39,7 @@ You picked your project, you're ready to go, now, what do you do?
Now would be the right time to create an account on the [bug tracker](labs.riseup.net/code/projects/tails) so you can update the ticket and assign it to yourself.
-Sent an email to the [tails-dev](https://mailman.boum.org/listinfo/tails-dev/) mailing list with who you are, what you're going to work on. This is also the best medium to ask questions when you're stuck or to start discussions.
+Sent an email to the [tails-dev](https://www.autistici.org/mailman/listinfo/tails-dev/) mailing list with who you are, what you're going to work on. This is also the best medium to ask questions when you're stuck or to start discussions.
Here's an handy link with a start on how to start [hacking on Tails](https://tails.boum.org/contribute/how/code/#index6h1).
diff --git a/wiki/src/blueprint/backups.mdwn b/wiki/src/blueprint/backups.mdwn
index 4b1b98a..1b6c86a 100644
--- a/wiki/src/blueprint/backups.mdwn
+++ b/wiki/src/blueprint/backups.mdwn
@@ -176,7 +176,7 @@ the command line options in a graphical way.
### Misc
-* some files are normally not readable by rsync (for example persistence.conf, apt/*)
+* some files are normally not readable by rsync (for example `persistence.conf`, `apt/*`)
Grsync can bypass that with the option "Run as superuser", we should investigate the consequences of using such an option.
We still have the possibility to ignore those files: we just have then to add `--exclude="apt"` in the preconfiguration file.
* decide if we activate the option `--delete` by default.
@@ -334,3 +334,49 @@ Script by a2
- [[Duplicate.desktop]]
- [[duplicate.bash]]
+
+User research
+=============
+
+Vietnam
+-------
+
+From [Understanding Internet Freedom: Vietnam's Digital
+Activists](http://internetfreedom.secondmuse.com/wp-content/uploads/2015/08/if_vietnam_v1.1.pdf)
+by *SecondMuse*:
+
+- Bloggers are more focused on mitigating risk around the storage of
+ data rather than the transmission of that data. All of the bloggers
+ have experienced harassment or arrest by police and security
+ officials, and many of them have had their devices taken away as a
+ result. They view the confiscation of devices as the highest point of
+ risk associated with their work.
+
+- Tool security design must assume the likelihood of a device being
+ confiscated by authorities as an essential part of the threat model.
+ Physical devices are commonly confiscated by authorities, and bloggers
+ have widely cited the risks posed by confiscation due to the
+ information they keep on their devices. Carefully consider this aspect
+ of the threat model when designing security features for a tool.
+
+- Protection of devices and hardware: The bloggers were unanimously
+ concerned about the possibility that arrest might result in the
+ confiscation of their computers or mobile devices, making any
+ information saved on those devices vulnerable. Notwithstanding, only
+ a few bloggers mentioned behaviors addressing this potential
+ vulnerability, including [...]. Just one blogger discussed putting
+ sensitive information on an encrypted hard disk that he stored in a
+ safe place.
+
+From [Understanding Internet Freedom: Tunisia's Journalists and
+Bloggers](http://internetfreedom.secondmuse.com/wp-content/uploads/2015/03/if_tunis_low-Final.pdf):
+
+- Backing up documents to protect the data and themselves: Preventing
+ data loss was one primary motivation for backing up information, and
+ particularly sensitive documents. One group of journalists also
+ highlighted the practice of making physical copies of sensitive
+ documents and keeping them in many different places. In presenting
+ their security strategy for a blogger releasing sensitive information,
+ that group emphasized “contacting other acquaintances to [let them]
+ know that if anything happens to the blogger, they will be publishing
+ [the information] all over the internet and making a big scandal.”
diff --git a/wiki/src/blueprint/bootstrapping/assistant.mdwn b/wiki/src/blueprint/bootstrapping/assistant.mdwn
index 555c048..79e38ee 100644
--- a/wiki/src/blueprint/bootstrapping/assistant.mdwn
+++ b/wiki/src/blueprint/bootstrapping/assistant.mdwn
@@ -92,16 +92,6 @@ would require lobbying both Mozilla and Chrome. An alternative could be
to rewrite the checksum calculation in
[WebAssembly](https://developer.mozilla.org/en-US/docs/WebAssembly).
-Mac compatibility list
-----------------------
-
-Mac users still face the most complicated situation, with no graphical
-technique for USB and unpredictable hardware. If no
-[[!tails_ticket 11682 desc="graphical installation method for macOS"]]
-can be found, this could be improved by
-[[maintaining a list of Mac models and their compatibility with Tails
-and our different installation techniques|assistant/mac]].
-
Better booting instructions
---------------------------
diff --git a/wiki/src/blueprint/bootstrapping/assistant/mac.mdwn b/wiki/src/blueprint/bootstrapping/assistant/mac.mdwn
deleted file mode 100644
index ebaf3c7..0000000
--- a/wiki/src/blueprint/bootstrapping/assistant/mac.mdwn
+++ /dev/null
@@ -1,176 +0,0 @@
-[[!meta title="Mac compatibility list"]]
-
-As part of the initial implementation of the [[installation assistant
-for Mac|install/mac]] we based our work on generic installation
-instructions that should work in all cases. But depending on the Mac
-model, these can imply try and error, and being much more complex than
-they would be if we knew in advance the model of the Mac and which
-techniques work for it.
-
-While working on this first implementation, we proposed maintaining
-and guiding people through a list of Mac models and their compatibility
-with Tails and our different installation techniques.
-
-[[!toc levels=3]]
-
-Truths about Mac (in 2015)
-==========================
-
- - DVD
- - No DVD on some model
- - DVD works on 32-bit UEFI
- - Reported to fail very rarely (cf. known issues)
- - MacBookPro (early 2011) fails to boot from DVD since Tails 1.1
- - dd
- - Not working on:
- - Macbook Air 1.1: 32-bit UEFI
- - Macbook Air 3.1: 64-bit UEFI
- - 32-bit might work with next version (#8471)
- - Tails Installer
- - 32-bit doesn't work with Tails Installer
- - 64-bit work sometimes yes and sometimes no
- - rEFInd
- - Don't ask people to do that
- - Bootcamp
- - No good
-
-List of compatibility with Mac
-==============================
-
-Redmine ticket: [[!tails_ticket 9150]]
-
-Roadmap
--------
-
-### Bootstrap
-
-- Specifying the data type.
-- Know the precise models. ([[!tails_ticket 9322]])
-- Setup a git repo.
-
-### Start to fill it
-
-- Frontdesk starts to fill it
-
-### Have it on the website
-
-- Full list in markdown thanks to a routine
- - In the web installation assistant
- - In/linked in the troubleshooting section
-- Maybe later an interactive app in the assistant
-
-Data type
----------
-
-The data could be stored in a YAML file, in the git repo. See [[!tails_ticket 9892]] for work in progress.
-
-- Fields ("strings", boolean?):
-
- "model id"
- - "Tails version" | DVD? | dd ? | tails installer? | SD? | wifi? | gaphic card? | mac address?
- - ... (an other user reports on this model)
-
-Writing the report after the summit, I would add :
-
-- Anonymised uniq identifier per users
-- Timestemp
-- Comments (if there is non anticipated things to keep)
-- Explicit say if the device type and if it boot or not (I feel it's easiest to write and read)
-
-Trying a yaml type (optional or not):
-
- model_id: (required)
- reports:
- - date: (required)
- user: (optional)
- tails_version:(required)
- media: (required)
- boot: (required)
- install: (required)
- wifi: (optional)
- mac_spoofing (optional)
- graphic_card (optional)
- comments: (optional)
-
-And some samples :
-
- model_id: MacBookAir3.2
- reports:
-
- - date: 2012-08-06
- user: Oothai1iu6iefaiy
- tails_version:1.5
- media: usb
- boot: true
- install: tails_installer
- comments:
- Touchpad not working.
-
- - date: 2012-07-26
- user: seyuo4daiChei3Oo
- tails_version:1.4
- media: sd
- boot: true
- install: tails_installer
- wifi: true
- mac_spoofing: false
-
- - date: 2012-06-12
- user: aif0ueveeb0Ahkii
- tails_version:1.2
- media: dvd
- boot: false
- comments:
- Tried to boot on external DVD. Tails is on not on the Mac boot menu.
-
-
-
-* "model id": [[!tails_ticket 9322]]. For one model id, there is one or several reports. (note that there is not realy the "state" for one model: the is different reports who can help to guess the state.)
-* "Tails version": can be useful to:
- - Have a better view of how the support Mac evolves.
- - Let the user or frontdesk know when the compatibility got broken.
-* "mac_spoofing": Is mac spoofing working with this computer
-* "graphic_card": Is the graphic card working on this computer.
-
-* We want to keep history of compatibility (with older Tails
- versions) in this file, maybe we will have to show to the user only
- the last relevant informations.
-* "Comments" is raw information on harward issues (touchpad, bluetooth). The most common issues are fields (wifi, mac spoofing, graphic card)
-
-How to feed the list
---------------------
-
-- Call to heavily test sometimes
-- Ask to people doing Tails trainings
-- Update from frontdesk
-- Maybe something editable by users
-
-Later implementation
---------------------
-
-In the Mac page of the router, we could implement this in two ways, that
-could be two iterations.
-
-### All information (without form)
-
-- Raw data is transformed server-side into an HTML table with links to
- the available scenarios for each model (maybe using
- <https://ikiwiki.info/plugins/contrib/ymlfront/>).
-- The full list is included in the HTML page sent to the user by hidden
- in toggle by default.
-- Some information is displayed to help the user identify his type of
- Mac (maybe simplifying <https://fr.ifixit.com/Info/ID-your-Mac>).
-- The user can toggle to display the sublist corresponding to her type
- of Mac (iMac, Macbook, MacBook Air, etc.)
-- If JavaScript is disabled, the full list is displayed.
-
-### Only relevant information (with form)
-
-- Some information is displayed to know easily what kind of mac is
- working
-- The user types in a form the serial number of her Mac or clicks in a
- dedicated tiny wizard like <https://fr.ifixit.com/Info/ID-your-Mac>.
-- Some server-side code (Ruby?) or client-side code (JavaScript) gets
- the relevant model and displays the possible scenarios.
-- If implemented in JavaScript, it would fallback on the "without form"
- version described earlier.
diff --git a/wiki/src/blueprint/handheld.mdwn b/wiki/src/blueprint/handheld.mdwn
index f4390aa..fe8a673 100644
--- a/wiki/src/blueprint/handheld.mdwn
+++ b/wiki/src/blueprint/handheld.mdwn
@@ -19,6 +19,11 @@ Toshiba Encore 2 WT8-B
the Power button, until the boot selection menu appears.
Select the desired boot device and press the Windows key.
+### Tails `feature/buster`, early 2019-01, Linux 4.19
+
+Similar to previous tests apart of improvements reported in the "Works
+fine" section below.
+
### Tails pre-3.9 devel branch (Stretch) + feature/15763-linux-4.17
* MAC spoofing fails
@@ -54,6 +59,11 @@ Works fine
Toshiba Encore 2
----------------
+### Tails `feature/buster`, early 2019-01, Linux 4.19
+
+* Boots fine without custom boot loader options.
+* Sound works out-of-the-box.
+
### Tails pre-3.9 devel branch (Stretch) + feature/15763-linux-4.17
* _sometimes_ boots fine after:
@@ -72,6 +82,15 @@ Toshiba Encore 2
* touchscreen
* USB
+Misc reports
+============
+
+* We've been reported that except Wi-Fi, Tails 3.11 works fine
+ on the Microsoft Surface Go 10 inch. According to
+ [this post](https://www.reddit.com/r/SurfaceLinux/comments/9t53gq/wifi_fixed_on_surface_go_ubuntu_1810/)
+ a update of the firmware file (shipped by [[!debpkg firmware-atheros]])
+ fixes that.
+
Resources
=========
diff --git a/wiki/src/blueprint/hardware_for_automated_tests_take3.mdwn b/wiki/src/blueprint/hardware_for_automated_tests_take3.mdwn
index e1a9382..3f34da5 100644
--- a/wiki/src/blueprint/hardware_for_automated_tests_take3.mdwn
+++ b/wiki/src/blueprint/hardware_for_automated_tests_take3.mdwn
@@ -78,9 +78,10 @@ area:
* The Tails community keeps needing new services; some of them need
to be hosted on hardware we control for security/privacy reasons
(which is not the case for our CI system):
- - Added already: self-host our website
+ - Added already:
+ - self-host our website
+ - Schleuder
- Will be added soon:
- - [[!tails_ticket 16121 desc="Schleuder"]]
- [[!tails_ticket 15919 desc="Redmine"]]
- Under consideration:
- [[!tails_ticket 14601 desc="Matomo"]] will require huge amounts
@@ -209,6 +210,24 @@ Availability:
factors"]] would be worth investigating, e.g. there are plenty of
[[!wikipedia Mini-ITX]] options on the market that could give us
the high density we need.
+ - [Supermicro X11SCL-IF](https://www.supermicro.com/products/motherboard/X11/X11SCL-iF.cfm), $200
+ + https://www.intel.com/content/www/us/en/products/processors/xeon/e-processors.html?Intel+Technology=900393 300€
+ + 2 × 16GB RAM Unbuffered ECC UDIMM, DDR4-2666MHz (e.g. CT16G4WFD8266) $400
+ + CPU heatsink SNK-P0049A4 $50
+ + mini-ITX case with power supply (e.g. Antec ISK310-150) 95€
+ + SSD M.2 PCI-E 3.0 x4 250GB 90€
+ - ASRock mini-ITX motherboards with IPMI that support suitable CPUs:
+ E3C226D2I, E3C236D4I-44E85, EPC612D4I
+ - Supermicro X10SDV series are affordable but support only too slow CPUs
+ - nicer Supermicro options, e.g. X11SSV-M4F, are too expensive (1000€ for the motherboard only)
+* Supermicro SuperServer E300-9D is very tempting (IPMI) but more
+ expensive than a NUC.
+
+Remote management:
+
+ * AMT (vPro) can be a pain as it shares the Ethernet interface
+ with the OS. IPMI would be a big plus as it integrates well
+ into the colo's existing setup.
## Run builds and/or tests in the cloud
diff --git a/wiki/src/blueprint/interviews.mdwn b/wiki/src/blueprint/interviews.mdwn
index bbea109..5b35dd8 100644
--- a/wiki/src/blueprint/interviews.mdwn
+++ b/wiki/src/blueprint/interviews.mdwn
@@ -9,7 +9,7 @@ that are designed to increase understanding and dialogue through a series of
quick questions that take no more than 10 to 15 minutes of dialogue.
The email address of the interviewees are stored in the internal Git
-repo: `contacts/intercept_interviews.mdwn`.
+repo: `contacts/ux_interviews.mdwn`.
The names of the interviewees are changed but loosely related in terms
of gender, language, and age. For list of popular given names see:
@@ -59,7 +59,7 @@ Intercept interview script
Resources on interviewing users
-------------------------------
-- [Steve Portial, _Interviewing Users_](http://gen.lib.rus.ec/search.php?req=steve+portigal+interviewing+users)
+- [Steve Portigal, _Interviewing Users_](http://gen.lib.rus.ec/search.php?req=steve+portigal+interviewing+users)
Tips when taking notes
----------------------
@@ -85,6 +85,141 @@ Template email for validating the output
Interviews
==========
+<a id="Bea"></a>
+
+Bea, August 2018
+----------------
+
+Bea is from North America but lives in Latin America where she does
+political work as a volunteer in a grassroots organization.
+
+Her organization is very diverse and includes peasants associations,
+student's groups, women's groups, human-rights defenders, environmental
+struggles, struggles against the mining industry, etc. During their
+national gathering, tens of thousands of people come together and,
+during other national events like general strikes, they mobilize
+hundreds of thousands of people in the streets.
+
+In the organization, she is part of a small group in charge of
+international relations: answering emails from people outside the
+country who want to know about the organization and communicating with
+other grassroots organizations around the world.
+
+Her small group really got started with Tails after reading a digital
+security guide by a European activist group. Their started using
+*portable* systems as a simple way of protecting themselves from all
+kinds of digital threats.
+
+Before using Tails they also used another custom live system built by
+some friends of them and also based on Debian. As of today, many people
+in her organization are still using this custom system. They are pushing
+them to migrate to Tails because the kind of community behind Tails
+makes it look safer to them.
+
+Bea uses Tails for 2 main reasons:
+
+- For the sake of learning and being able to teach others.
+
+ By using tools like Ubuntu, Linux Mint, Debian, or Tails herself, she
+ knows better how they work and she can analyze digital threats better.
+ People are often scared of many things but she feels the need to
+ analyze what are the real threats and the data they manipulate.
+
+- For personal use.
+
+ She uses her computer for her work within the organization, to handle
+ the web and the social media of the organization as well as of another
+ NGO in North America that struggles against the mining industry.
+
+ Even though her laptop is running Mint, is encrypted, and has Tor,
+ Bitmask, GPG, and everything, she knows that her activism, her
+ computer, and her online life is monitored, for example by companies
+ from the mining industry.
+
+ So she sometimes turns to Tails to have an extra "window of privacy"
+ and do more personal stuff that she doesn't want to be linked to her
+ political life, like access a secure personal email account, or
+ use the Internet without leaving traces and risking to get spyware or
+ malware on her computer.
+
+Only a few people were using Tails in her organization until now because
+the website was not translated into Spanish. This year, they started to
+give workshops on Tails within the organization. As people from the
+international relations group all speak several languages, "hacking" on
+digital security tools was more accessible to them and they ended up
+being the ones giving workshops and teaching others.
+
+Bea are her group are recommending Tails mostly to 2 kind of people:
+
+- People who don't have a computer and always use shared computers.
+
+ Sometimes the people reporting human-rights violations in their
+ community work on a shared computer, that runs Windows and is the same
+ as the ones that the kids use to play online or watch movies, it's
+ full of viruses, a real catastrophe.
+
+ They try to convince them to use Tails with a persistent memory to
+ manipulate the data on human-rights violations and keep it out of
+ their Windows. Even though these people might still use GMail...
+
+ Using GMail from Tails is a bit more complicated but it's possible.
+ You only get more security checks. So it's important to have another
+ email account as a backup in case they block your account.
+
+- People who want to have more secure communications.
+
+ They teach them Thunder, GPG, and how to replace their GMail with a
+ secure email. For example, when the human-rights reporter from a
+ community communicates with the regional and national reporters, to
+ avoid sending the reports and the names of the victims to GMail.
+
+But until now maybe around 10 people are really working like this
+because people are not so aware of digital threats and how to mitigate
+them. Apart from digital-rights defenders, it's most popular amongst
+young people in bigger cities. Feminist groups are also working on
+digital security.
+
+### What she likes
+
+- She's really excited about the upcoming support for *VeraCrypt*.
+
+ Many people here are using *VeraCrypt* and it was a big limitation
+ when trying to convince them to use Tails.
+
+ Human-rights defenders, lawyers, and journalists are using *VeraCrypt*
+ a lot to protect information that can be sensitive for them or for
+ their testimonies.
+
+- She really likes cloning. If you have a USB stick, I can make you a
+ Tails!
+
+- She likes the persistent memory and finds it easy to use.
+
+### What she dislikes
+
+- She misses *Bitmask*.
+
+ *Bitmask* is sometimes faster than Tor and you don't get that many
+ "*Prove that you're not a robot*" that drive you crazy.
+
+ With *Bitmask* I can decide to always appear as coming from North
+ America whereas with Tor I always appear as coming from a different
+ country. Some websites, like Google, don't like that.
+
+- She misses the ability to install additional software:
+
+ - *Bitmask*.
+
+ - Some people are used to their Windows applications and using it with
+ *Wine*.
+
+ - Some specific audio and video applications.
+
+- In recent versions, she had troubles cloning when running in Spanish.
+
+- In recent versions, she had troubles using *Enigmail* with *Thunder*
+ and had to import her GPG keys manually every time.
+
<a id="additional_software"></a>
Additional Software UX sprint, January 2018
diff --git a/wiki/src/blueprint/l10n_Catalan.mdwn b/wiki/src/blueprint/l10n_Catalan.mdwn
index 9538b50..17c8188 100644
--- a/wiki/src/blueprint/l10n_Catalan.mdwn
+++ b/wiki/src/blueprint/l10n_Catalan.mdwn
@@ -6,7 +6,7 @@ Documentació per a la traducció del Tails al Català
Com puc ajudar a traduir el Tails al català?
--------------------------------------------------
1. Si voleu ajudar a traduir el Tails, el primer que hauríeu de fer és subscriure-us a la llista de correu dels traductors al Català del Tails:
- - <https://mailman.boum.org/listinfo/tails-l10n-ca>
+ - <https://www.autistici.org/mailman/listinfo/tails-l10n-ca>
- Presenteu-vos a la llista i us posarem al dia de l'estat de la traducció.
2. En segon lloc us hauríeu de familiaritzar amb els [recursos per a traductors de Softcatalà](https://www.softcatala.org/recursos/), especialment:
diff --git a/wiki/src/blueprint/l10n_Italian.mdwn b/wiki/src/blueprint/l10n_Italian.mdwn
index 6fb7cc0..7d1697b 100644
--- a/wiki/src/blueprint/l10n_Italian.mdwn
+++ b/wiki/src/blueprint/l10n_Italian.mdwn
@@ -21,30 +21,50 @@ Qualche informazione sui file po:
IL weblate è raggiungibile qui:
-Ha questi link utili:
-
<https://translate.tails.boum.org/languages/it/tails/>
-you can order the component by:
+Puoi ordinare i componenti secondo:
* Translated Words Review
* Checks
* Suggestions
+
+In questo modo puoi trovare i file da revisionare. Conviene cercare quelli che hanno la barra verde più "piena" ed il minor numero di Suggestions/suggerimenti.
+Significa che la pagina arriverà più rapidamente ad essere pubblicata, perchè un requisito per la pubblicazione è che raggiunga la barra verde al 100%.
+(attenzione non esiste più il meccanismo barra blu... sapevatelo!)
+__________
+
+## Alcune cose a cui fare attenzione:
+
+* non sostituire gli spazi con i tre puntini. Ovvero anche se il weblate ti fa vedere che mancano tre puntini rossi, significa che bisogna mettere uno "space".
+
__________
+## Revisioni e sito compilato:
+
+
+Le versioni proposte di una frase tradotta sono in basso, quasi in fondo alla pagina e puoi vederne un link nella colonna di destra. Nella colonna di destra ci sono anche degli avvertimenti in caso di alcuni "test" non passati da quella frase, come.. manca il punto alla fine, o va a capo in modo strano,...
+
+Per revisionare bisogna dare un voto ad un suggerimento di un altr* traduttor*.
+Se abbiam dei dubbi scriviamo in mailinglist.
+Quello che fa fede è sempre l'inglese, come testo di riferimento.
+Il suggerimento deve ricevere due voti per essere approvato e quindi messo in "staging", ovvero la pagina con il sito compilato. E' possibile che il server voglia un po di tempo per farlo, quindi magari non si trova subito la frase modificata.
+
+Nelle revisioni è importante andare a vedere anche che la pagina funzioni prima di comunicare in lista che è pronta!
+Infatti ci sono parti di html che NON vanno tradotte: come i link, le class="applications", alcune liste con le parentesi quadre, ...
-Il wiki compilato per vedere se la pagina funziona:
+Il wiki compilato per vedere se la pagina funziona si trova qui:
<https://translate.tails.boum.org/staging/>
-a questo link ci aggiungi il nome della pagina che vuoi controllare (copiandola dall'URL del weblate), per esempio:
+a questo link ci aggiungi il nome della pagina che vuoi controllare (copiandola dal nome della pagina wiki del weblate), per esempio:
voglio controllare la pagina:
<https://translate.tails.boum.org/translate/tails/acknowledgments_and_similar_projects/it/?type=suggestions#suggestions>
-aggiungo al link /staging: "acknowledgments_and_similar_projects/it/"
+aggiungo al link /staging: "/doc/about/acknowledgments_and_similar_projects.*.po"
-cambio "/it/" in ".it.html" e avro':
+cambio ".*.po" in ".it.html" e avro':
<https://translate.tails.boum.org/staging/doc/about/acknowledgments_and_similar_projects.it.html>
diff --git a/wiki/src/blueprint/l10n_Portuguese.mdwn b/wiki/src/blueprint/l10n_Portuguese.mdwn
index 9204a8b..f3b2cde 100644
--- a/wiki/src/blueprint/l10n_Portuguese.mdwn
+++ b/wiki/src/blueprint/l10n_Portuguese.mdwn
@@ -4,7 +4,7 @@ Esta página documenta os processos de tradução do Tails para o português.
# Lista de e-mails
-A tradução do Tails para português do Brasil é organizada em uma lista de e-mails. Para inscrever-se, acesse [[a página da lista|https://mailman.boum.org/listinfo/tails-l10n-pt-br]].
+A tradução do Tails para português do Brasil é organizada em uma lista de e-mails. Para inscrever-se, acesse [[a página da lista|https://www.autistici.org/mailman/listinfo/tails-l10n-pt-br]].
# Tradução online usando Weblate (experimental!)
diff --git a/wiki/src/blueprint/l10n_Spanish.mdwn b/wiki/src/blueprint/l10n_Spanish.mdwn
index 8ed6a47..91b7ab1 100644
--- a/wiki/src/blueprint/l10n_Spanish.mdwn
+++ b/wiki/src/blueprint/l10n_Spanish.mdwn
@@ -7,8 +7,8 @@ Si quiero traducir al español ¿cómo puedo empezar?
--------------------------------------------------
1. Suscribirte a la lista de correos: Tenemos la lista de todos los traductores de Tails a todos los idiomas, y la de traducción al español:
- - <https://mailman.boum.org/listinfo/tails-l10n>
- - <https://mailman.boum.org/listinfo/tails-l10n-spanish>
+ - <https://www.autistici.org/mailman/listinfo/tails-l10n>
+ - <https://www.autistici.org/mailman/listinfo/tails-l10n-spanish>
2. Puedes traducir con git (un poco más complicado), o hacer una cuenta en la plataforma de traducción en pruebas (Ver abajo)
diff --git a/wiki/src/blueprint/mobile_messaging.mdwn b/wiki/src/blueprint/mobile_messaging.mdwn
index 5aaf5bc..9c5a9d2 100644
--- a/wiki/src/blueprint/mobile_messaging.mdwn
+++ b/wiki/src/blueprint/mobile_messaging.mdwn
@@ -52,6 +52,16 @@ Corresponding ticket: [[!tails_ticket 14567]]
## Possible candidates:
+### Tox
+
+- [Tox website](https://tox.chat)
+- [[!tails_ticket 10071]]
+- client (qtox) available in Debian Buster
+- decentralized
+- it is possible to set it to work with Tor as a SOCKS5 proxy
+- end-to-end encryption
+- it is possible to opt-out IPV6 and UDP in the client settings
+
### Briar
- decentralized
diff --git a/wiki/src/blueprint/monthly_meeting.mdwn b/wiki/src/blueprint/monthly_meeting.mdwn
index 1daaeb9..0835d0c 100644
--- a/wiki/src/blueprint/monthly_meeting.mdwn
+++ b/wiki/src/blueprint/monthly_meeting.mdwn
@@ -23,15 +23,10 @@ Discussions
[[Prepare a discussion|contribute/meetings#preparing-a-discussion]]
and add your topic here:
-- FOSDEM. Aybody attending? Booth?
-
-<!-- I'll miss the November meeting as well...
-
- [[!tails_ticket 15895 desc="#15895: Remove some of our predefined bookmarks"]]
-
- sajolida: I'll be at Tor meeting on October 3, so please postpone this
- discussion if I'm not at the meeting.
--->
+- Replace monthly meeting by weekly standup meeting. [u: I can't attend
+ the meeting today, but all my ideas are in the email you've seen and
+ I'd be happy to read your thoughts.]
Roles
=====
@@ -43,7 +38,7 @@ designate themselves beforehand.
| Month | Notetaker | Facilitator |
| -------------- | -------------- |------------ |
-| January 2019 | | |
+| January 2019 | canceled | canceled |
| February 2019 | | |
| March 2019 | | |
| April 2019 | | |
diff --git a/wiki/src/blueprint/monthly_report.mdwn b/wiki/src/blueprint/monthly_report.mdwn
index 712f2ec..a65dc53 100644
--- a/wiki/src/blueprint/monthly_report.mdwn
+++ b/wiki/src/blueprint/monthly_report.mdwn
@@ -16,45 +16,33 @@ The month in the list corresponds to the month to be reported about. For
example, the report about April in the list will be written at the
beginning of May.
- - January 2018: sajolida
- - February 2018: u
- - March 2018: intrigeri
- - April 2018: emmapeel
- - May 2018: spriver
- - June 2018: sajolida
- - July 2018: pablonatalino & emmapeel
- - August 2018: intrigeri
- - September 2018: sajolida
- - October 2018: u
- - November 2018: muri
- December 2018: spriver
- - January 2019:
+ - January 2019: emmapeel
- February 2019: intrigeri
- March 2019:
- April 2019:
- May 2019:
- - June 2019:
- - July 2019:
+ - June 2019:
+ - July 2019: u
- August 2019: intrigeri
- September 2019:
- October 2019:
- November 2019:
- December 2019:
-### 2017
-
- - January 2017: u
- - February 2017:emmapeel
- - March 2017: intrigeri
- - April 2017: spriver
- - May 2017: u
- - June 2017: intrigeri
- - July 2017: sajolida
- - August 2017: spriver
- - September 2017: emmapeel
- - October 2017: sajolida
- - November 2017:muri
- - December 2017: muri
+### 2018
+
+ - January 2018: sajolida
+ - February 2018: u
+ - March 2018: intrigeri
+ - April 2018: emmapeel
+ - May 2018: spriver
+ - June 2018: sajolida
+ - July 2018: pablonatalino & emmapeel
+ - August 2018: intrigeri
+ - September 2018: sajolida
+ - October 2018: u
+ - November 2018: muri
Checklist
=========
@@ -144,7 +132,7 @@ Template
XXX: If you feel like it and the UX team does not do it
themselves, check the archives of tails-ux:
- <https://mailman.boum.org/pipermail/tails-ux/>
+ <https://lists.autistici.org/list/tails-XXX.html>
Hot topics on our help desk
===========================
@@ -181,7 +169,7 @@ Template
On-going discussions
====================
- XXX: Link to the thread on <https://mailman.boum.org/pipermail/tails-XXX/>.
+ XXX: Link to the thread on <https://lists.autistici.org/list/tails-XXX.html>.
Press and testimonials
======================
diff --git a/wiki/src/blueprint/monthly_report/report_2018_11.mdwn b/wiki/src/blueprint/monthly_report/report_2018_11.mdwn
deleted file mode 100644
index 028e177..0000000
--- a/wiki/src/blueprint/monthly_report/report_2018_11.mdwn
+++ /dev/null
@@ -1,118 +0,0 @@
-[[!meta title="Tails report for November, 2018"]]
-[[!meta date="Tue, 10 Apr 2018 01:23:45 +0000"]] XXX: adjust date
-[[!pagetemplate template="news.tmpl"]]
-
-[[!toc]]
-
-Upcoming releases
-=================
-
-* Very soon, we will drastically simplify the installation for Windows
- and macOS and improve support for UEFI computers! To this aim, with
- the Tails 3.12 release [[scheduled for January
- 29|contribute/calendar]], we will start distributing *USB images* in
- addition to *ISO images*.
-
-* Tails 3.11, [[scheduled for December 11|contribute/calendar]],
- will fix a great number of long-standing problems and recent
- regressions.
-
-Code
-====
-
-XXX: If you feel like it and developers don't do it themselves,
- list important code work that is not covered already by the
- Release section (for example, the changes being worked on for
- the next version).
-
-* We've been working hard since a few months on our USB image project
- ([[!tails_ticket 15292]]) and will soon send a call for testing.
- The main remaining challenge is to build the USB image reproducibly
- ([[!tails_ticket 15985]]).
-
-* We resumed work on porting Tails to Debian 10 (Buster).
- Our Foundations Team will have a sprint focused on this topic next
- month and should publish a first beta release by the end of April.
-
-* We identified and fixed one root cause for a major problem some
- users face when upgrading Tails: part of the user interface that
- provided feedback about the progress of the upgrade was broken,
- which lead users to restart Tails before the upgrade was fully
- applied. While we were at it, we improved the user experience of the
- upgrade process, which will now require user confirmation before
- shutting down the network connection. ([[!tails_ticket 14754]],
- [[!tails_ticket 15282]])
-
-Hot topics on our help desk
-===========================
-
-XXX: Ask tails-bugs@boum.org to list hot topics for the last month.
-
-1.
-
-1.
-
-1.
-
-Infrastructure
-==============
-
-We made good progress on adjusting our infrastructure to upcoming
-changes at our previous providers:
-
-* We now host our website on our own infrastructure. An unintended but
- welcome side-effect is that browsing our website is snappier than it
- used to. ([[!tails_ticket 14588]])
-* We renamed our Redmine instance from <https://labs.riseup.net/> to
- <https://redmine.tails.boum.org/>. This avoids confusion about who
- is responsible for this service and it will allow our Riseup friends
- to set up *single sign-on* (SSO) for their own services.
-* We built a plan to migrate our Schleuder mailing lists to different
- servers, depending on their privacy, security and availability
- requirements. We will implement it in December.
-
-Funding
-=======
-
-We continued working on our yearly donation campaign:
-
-* We added to our donation banner a counter for the total amount. We
- reached 23% of our fundraising goal in the first half of the campaign.
-
-* We got 64% more donors, which is amazing! Thanks a lot for your
- support :) But so far we raised 51% less in amount compared to last
- year. More people are donating but we are missing the big donors
- that we had in the past.
-
-Outreach
-========
-
-Past events
------------
-
-Upcoming events
----------------
-
-On-going discussions
-====================
-
-XXX: Link to the thread on <https://mailman.boum.org/pipermail/tails-XXX/>.
-
-Translation
-===========
-
-XXX: Add the output of `contribute/l10n_tricks/language_statistics.sh`
-XXX: Add the output of (adjust month!):
-
- git checkout $(git rev-list -n 1 --before="September 1" origin/master) && \
- git submodule update --init && \
- ./wiki/src/contribute/l10n_tricks/language_statistics.sh
-
-Metrics
-=======
-
-* Tails has been started more than 695 882 times this month. This makes BOOTS/DAY boots a day on average.
-* 7 668 downloads of the OpenPGP signature of Tails ISO from our website.
-* 66 bug reports were received through WhisperBack.
-
-[[How do we know this?|support/faq#boot_statistics]]
diff --git a/wiki/src/blueprint/monthly_report/report_2018_12.mdwn b/wiki/src/blueprint/monthly_report/report_2018_12.mdwn
deleted file mode 100644
index 550999c..0000000
--- a/wiki/src/blueprint/monthly_report/report_2018_12.mdwn
+++ /dev/null
@@ -1,118 +0,0 @@
-[[!meta title="Tails report for December, 2018"]]
-[[!meta date="Tue, 10 Apr 2018 01:23:45 +0000"]] XXX: adjust date
-[[!pagetemplate template="news.tmpl"]]
-
-[[!toc]]
-
-Releases
-========
-
-* [[Tails VERSION was released on MONTH DAY|news/version_VERSION]] ([major|bugfix] release).
-
-* Tails VERSION+1 is [[scheduled for MONTH DAY|contribute/calendar]].
-
-The following changes were introduced in Tails VERSION:
-
-XXX: Copy the "Changes" section of the release notes, and compact a bit:
-
-* Remove lines about software upgrade (that's not Tails itself).
-* Remove screenshots.
-* Remove "New features" and "Upgrades and changes" headlines.
-* Remove line about Changelog.
-
-Code
-====
-
-XXX: If you feel like it and developers don't do it themselves,
- list important code work that is not covered already by the
- Release section (for example, the changes being worked on for
- the next version).
-
-Documentation and website
-=========================
-
-XXX: If you feel like it and technical writers don't do it
- themselves, explore the Git history:
-
- git log --patch --since='1 October' --until='1 November' origin/master -- "*.*m*"
-
-User experience
-===============
-
-XXX: If you feel like it and the UX team does not do it
- themselves, check the archives of tails-ux:
- <https://mailman.boum.org/pipermail/tails-ux/>
-
-Hot topics on our help desk
-===========================
-
-XXX: Ask tails-bugs@boum.org to list hot topics for the last month.
-
-1.
-
-1.
-
-1.
-
-Infrastructure
-==============
-
-XXX: Count the number of tests in /features at the beginning of next month
-
- git checkout `git rev-list -n 1 --before="June 1" origin/devel`
- git grep --extended-regexp '^\s*Scenario:' -- features/*.feature | wc -l
-
-XXX: Report only if more scenarios have been written and add the diff from the previous month, for example:
-
- - Our test suite covers SCENARIOS scenarios, DIFF more that in May.
-
-Funding
-=======
-
-XXX: The fundraising team should look at the fundraising Git.
-
- git log --patch --since='1 December' --until='1 January' origin/master
-
-XXX: The fundraising and accounting teams should look at the archives of <tails-fundraising@boum.org> and <tails-accounting@boum.org>.
-
-Outreach
-========
-
-Past events
------------
-
-Upcoming events
----------------
-
-On-going discussions
-====================
-
-XXX: Link to the thread on <https://mailman.boum.org/pipermail/tails-XXX/>.
-
-Press and testimonials
-======================
-
-XXX: Copy content from press/media_appearances_2018.mdwn
- This page is continuously updated by tails-press@boum.org, so if
- it's empty there might be nothing special to report.
-
-Translation
-===========
-
-XXX: Add the output of `contribute/l10n_tricks/language_statistics.sh`
-XXX: Add the output of (adjust month!):
-
- git checkout $(git rev-list -n 1 --before="September 1" origin/master) && \
- git submodule update --init && \
- ./wiki/src/contribute/l10n_tricks/language_statistics.sh
-
-Metrics
-=======
-
-* Tails has been started more than BOOTS/MONTH times this month. This makes BOOTS/DAY boots a day on average.
-* SIGS downloads of the OpenPGP signature of Tails ISO from our website.
-* WHISPERBACK bug reports were received through WhisperBack.
-
-[[How do we know this?|support/faq#boot_statistics]]
-
-XXX: Ask <tails@boum.org> for these numbers.
diff --git a/wiki/src/blueprint/monthly_report/report_2019_01.mdwn b/wiki/src/blueprint/monthly_report/report_2019_01.mdwn
new file mode 100644
index 0000000..6f0a246
--- /dev/null
+++ b/wiki/src/blueprint/monthly_report/report_2019_01.mdwn
@@ -0,0 +1,157 @@
+[[!meta title="Tails report for January, 2019"]]
+[[!meta date="`date --rfc-2822` eg. Thu, 08 Feb 2018 07:21:15 +0000"]]
+[[!pagetemplate template="news.tmpl"]]
+
+[[!toc ]]
+
+Releases
+========
+
+* [[Tails 3.12 was released on January 29|news/version_3.12]] (major release).
+
+* Tails 3.13 is [[scheduled for March 19|contribute/calendar]].
+
+The following changes were introduced in Tails 3.12:
+
+* New installation methods
+ * [[For macOS|https://tails.boum.org/install/mac/usb-overview/index.en.html]], the new method is much simpler as it uses a graphical tool [[(Etcher)|https://www.balena.io/etcher/]] instead of the command line.
+ * [[For Windows|https://tails.boum.org/install/win/usb-overview/index.en.html]], the new method is much faster as it doesn't require 2 USB sticks and an intermediary Tails anymore. The resulting USB stick also works better on newer computers with UEFI.
+ * [[For Debian and Ubuntu|https://tails.boum.org/install/linux/usb-overview/index.en.html]], the new method uses a native application (GNOME Disks) and you don't have to install Tails Installer anymore.
+ * [[For other Linux distributions|https://tails.boum.org/install/linux/usb-overview/index.en.html]], the new method is faster as it doesn't require 2 USB sticks and an intermediary Tails anymore.
+* Starting Tails should be a bit faster on most machines. ([[#15915|https://redmine.tails.boum.org/code/issues/15915]])
+* Tell users to use `sudo` when they try to use `su` on the command line.
+* Fix the black screen when starting Tails with some Intel graphics cards. ([[#16224|https://redmine.tails.boum.org/code/issues/16224]])
+
+Code
+====
+
+XXX: If you feel like it and developers, foundation team, and RMs don't do it themselves,
+ list important code work that is not covered already by the
+ Release section (for example, the changes being worked on for
+ the next version).
+
+- A bunch of Foundations Team members had a sprint focused on porting
+ Tails to Debian 10 (Buster). For details, see the
+ [full report](https://lists.autistici.org/message/20190112.093556.b591a963.en.html).
+
+Documentation and website
+=========================
+
+- We wrote brand new installation instructions using:
+
+ - [[*Etcher* for Windows|install/win/usb]]
+ - [[*Etcher* for macOS|install/mac/usb]]
+ - [[*GNOME Disks* for Linux|install/linux/usb]]
+
+- We wrote how to [[troubleshooting Wi-Fi not
+ working|doc/anonymous_internet/networkmanager]] and which USB Wi-Fi adapters
+ work in Tails.
+
+- We documented how to [[disable the automatic screen
+ locker|doc/first_steps/introduction_to_gnome_and_the_tails_desktop#screen-locker]]
+ if you configure an administration password.
+
+- We added several entries to our writing style guide:
+
+ - [[*vulnerability*|contribute/how/documentation/style_guide#vulnerability]]
+ - [[*HTML anchors*|contribute/how/documentation/style_guide#anchors]]
+ - [[*update* vs *upgrade*|contribute/how/documentation/style_guide#update]]
+ - [[*boot* vs *start*|contribute/how/documentation/style_guide#boot]]
+ - [[*network interface*|contribute/how/documentation/style_guide#network-interface]]
+ - [[*media*|contribute/how/documentation/style_guide#media]]
+ - [[*administration password*|contribute/how/documentation/style_guide#administration-password]]
+ - [[*future tense*|contribute/how/documentation/style_guide#future-tense]]
+ - [[*earlier* and *later*|contribute/how/documentation/style_guide#earlier]]
+
+User experience
+===============
+
+- We published an [[interview with Bea|blueprint/interviews#Bea]] who is
+ spreading the use of Tails in a grassroots political organization in Latin
+ America.
+
+- We added visual feedback upstream when opening
+ [KeePassXC](https://github.com/keepassxreboot/keepassxc/pull/2593),
+ [Electrum](https://github.com/spesmilo/electrum/pull/4997), and
+ [OnionShare](https://github.com/micahflee/onionshare/pull/867).
+
+- We [evaluated the cost/benefit of solving many small UX
+ improvements](https://redmine.tails.boum.org/code/issues/14544#note-75).
+
+Hot topics on our help desk
+===========================
+
+XXX: Ask tails-bugs@boum.org to list hot topics for the last month.
+
+1.
+
+1.
+
+1.
+
+Infrastructure
+==============
+
+- Our infrastructure was targeted by a distributed denial-of-service
+ (DDoS) attack that caused a couple of temporary outages. We're
+ discussing ways to protect ourselves in the future.
+
+- We kept polishing the automated test suite for Additional Software
+ and hope it will be merged in time for the next Tails release.
+
+- We kept investigating options to make our CI faster, shorten the
+ development feedback loop, and thus make our developers' work more
+ efficient and pleasurable. We will soon be able to benchmark our
+ currently preferred option.
+
+- We dealt with the fallout of the big infrastructure changes done in
+ December. A few issues remain but things are starting to run more
+ smoothly again :)
+
+Funding
+=======
+
+- We close our end-of-year donation campaign. We don't have the final numbers
+ yet.
+
+- We submitted 2 applications to the NLnet [NGI Zero
+ PET](https://nlnet.nl/PET/) project.
+
+Outreach
+========
+
+Past events
+-----------
+
+Upcoming events
+---------------
+
+On-going discussions
+====================
+
+XXX: Link to the thread on <https://lists.autistici.org/list/tails-XXX.html>.
+
+Press and testimonials
+======================
+
+* 2019-01-21: [[Tails 3.12 fait évoluer sa méthode d'installation : quels changements concrets|https://www.nextinpact.com/news/107525-tails-3-12-fait-evoluer-sa-methode-dinstallation-quels-changements-concrets.htm]] by David Legrand in Next INpact.
+* 2019-01-30: [[Want a bit of privacy? Got a USB stick? Welcome to TAILS 3.12|https://www.theregister.co.uk/2019/01/30/tails_3_12/]] by Richard Speed in The Register
+
+Translations
+============
+
+XXX: Add the output of (adjust month!):
+
+ sudo apt-get install intltool
+ git checkout $(git rev-list -n 1 --before="September 1" origin/master) && \
+ git submodule update --init && \
+ ./wiki/src/contribute/l10n_tricks/language_statistics.sh
+
+Metrics
+=======
+
+* Tails has been started more than 749 304 times this month. This makes 24 171 boots a day on average.
+* 7 403 downloads of the OpenPGP signature of Tails ISO from our website.
+* 88 bug reports were received through WhisperBack.
+
+[[How do we know this?|support/faq#boot_statistics]]
diff --git a/wiki/src/blueprint/wi-fi_adapters.mdwn b/wiki/src/blueprint/wi-fi_adapters.mdwn
new file mode 100644
index 0000000..4e2f73a
--- /dev/null
+++ b/wiki/src/blueprint/wi-fi_adapters.mdwn
@@ -0,0 +1,18 @@
+USB Wi-Fi adapters that don't work in Tails
+===========================================
+
+Related tickets: [[!tails_ticket 15131]]
+
+<table>
+<tr><th>Vendor</th><th>Model</th><th>Year</th><th>Size</th><th>lsusb ID</th><th>Latest test</th><th>Module</th><th>Firmware</th><th>Note</th></tr>
+<tr><td>D-Link</td><td>DWA-171</td><td>Late 2017</td><td>Small</td><td>2001:3314</td><td>3.10.1</td><td>None</td><td>None</td><td></td></tr>
+<tr><td>D-Link</td><td>DWA-131E1</td><td>Early 2018</td><td>Small</td><td>2001:3319</td><td>3.10.1</td><td>rtl8xxxu</td><td>rtl8192eu_nic.bin</td><td>Authentication failures</td></tr>
+<tr><td>Linksys</td><td>WUSB6100M</td><td>Late 2017</td><td>Small</td><td>13b1:0042</td><td>3.10.1</td><td>None</td><td>None</td><td></td></tr>
+<tr><td>TP-Link</td><td>TL-WN725N</td><td>Early 2017</td><td>Nano</td><td>0bda:8179</td><td>3.10.1</td><td>r8188eu</td><td>???</td><td></td></tr>
+<tr><td>TP-Link</td><td>TL-WN823N</td><td>Late 2017</td><td>Small</td><td>2357:0109</td><td>3.10.1</td><td>rtl8xxxu</td><td>rtl8192eu_nic.bin</td><td>Authentication failures</td></tr>
+<tr><td>TP-Link</td><td>T2U</td><td>Late 2017</td><td>Small</td><td>148f:761a</td><td>3.10.1</td><td>None</td><td>None</td><td></td></tr>
+<tr><td>TP-Link</td><td>TL-WN821N</td><td>Early 2018</td><td>Long</td><td>2357:0107</td><td>3.10.1</td><td>None</td><td>None</td><td></td></tr>
+<!--
+<tr><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+-->
+</table>
diff --git a/wiki/src/contribute.fr.po b/wiki/src/contribute.fr.po
index 80731b8..e56235c 100644
--- a/wiki/src/contribute.fr.po
+++ b/wiki/src/contribute.fr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
"POT-Creation-Date: 2018-11-07 13:45+0100\n"
-"PO-Revision-Date: 2018-08-07 13:08+0000\n"
+"PO-Revision-Date: 2019-02-03 13:45+0000\n"
"Last-Translator: \n"
"Language-Team: Tails translators <tails@boum.org>\n"
"Language: fr\n"
@@ -381,19 +381,7 @@ msgid "[[!tails_roadmap desc=\"Roadmap\"]]"
msgstr "[[!tails_roadmap desc=\"Roadmap\"]]"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| " - [[Redmine bug tracker|contribute/working_together/Redmine]]\n"
-#| " - [[Starter tasks|starter_tasks]] for new contributors\n"
-#| " - [Tasks](https://redmine.tails.boum.org/code/projects/tails/issues)\n"
-#| " can be filtered by type of work (see links in the sidebar)\n"
-#| " - [[Building a Tails image|contribute/build]]\n"
-#| " - [[Build a local copy of the website|contribute/build/website]]\n"
-#| " - [[Customize Tails|contribute/customize]]\n"
-#| " - [Nightly ISO builds](http://nightly.tails.boum.org)\n"
-#| " - Debian packages\n"
-#| " - [[APT repository|contribute/APT_repository]], to store our custom Debian packages\n"
-#| " - [[Glossary for contributors|contribute/glossary]]\n"
+#, no-wrap
msgid ""
" - [[Redmine bug tracker|contribute/working_together/Redmine]]\n"
" - [[Starter tasks|starter_tasks]] for new contributors\n"
@@ -418,6 +406,7 @@ msgstr ""
" - [Nightly ISO builds](http://nightly.tails.boum.org)\n"
" - Debian packages\n"
" - [[APT repository|contribute/APT_repository]], to store our custom Debian packages\n"
+" - How we manage and upgrade the [[Linux kernel|contribute/Linux_kernel]].\n"
" - [[Glossary for contributors|contribute/glossary]]\n"
#. type: Plain text
diff --git a/wiki/src/contribute/APT_repository/time-based_snapshots.mdwn b/wiki/src/contribute/APT_repository/time-based_snapshots.mdwn
index 98839f1..f6fd94a 100644
--- a/wiki/src/contribute/APT_repository/time-based_snapshots.mdwn
+++ b/wiki/src/contribute/APT_repository/time-based_snapshots.mdwn
@@ -232,9 +232,10 @@ Freeze exception
### Post-release
-Thaw the packages that were granted freeze exceptions, now that they
-can be fetched from a newer time-based snapshot of the repository
-we've initially pulled it from.
+Thaw the packages that were granted freeze exceptions on the branches
+where they can be fetched from a newer time-based snapshot of the repository
+we've initially pulled it from. Usually that's only the case on the `devel`
+branch since the `stable` branch still uses older time-based snapshots.
1. For each entry in `config/chroot_apt/preferences` that has
`Explanation: freeze exception`: set `Pin-Priority` to `-1`.
diff --git a/wiki/src/contribute/Linux_kernel.mdwn b/wiki/src/contribute/Linux_kernel.mdwn
index 6ceda84..dc5ceb9 100644
--- a/wiki/src/contribute/Linux_kernel.mdwn
+++ b/wiki/src/contribute/Linux_kernel.mdwn
@@ -85,6 +85,11 @@ To learn how the new kernel works for us:
run our entire test suite (`+force-all-tests`). But since this
branch has no commit on top of `devel`, Jenkins will ignore it, so
you need to create a dummy commit.
+2. Adjust the `aufs` submodule: in the `submodules/aufs4-standalone`
+ directory, use `git fetch` and `git branch -a` to find the most
+ suitable branch for this kernel version, check it out, then move
+ back to the top level directory. `git diff` should show an updated
+ `Subproject commit` accordingly, and that can be committed.
3. Push this new branch to our CI.
4. Set the _Feature Branch_ field on the ticket to the name of your
new branch.
diff --git a/wiki/src/contribute/build.mdwn b/wiki/src/contribute/build.mdwn
index 8692415..dfc277c 100644
--- a/wiki/src/contribute/build.mdwn
+++ b/wiki/src/contribute/build.mdwn
@@ -106,6 +106,15 @@ You can customize the build system using two environment variables:
ARTIFACTS='/path/to/directory'
+ * `APT_SNAPSHOTS_SERIALS` can be set to specify which [[time-based APT
+ snapshots|contribute/APT_repository/time-based_snapshots]]
+ repositories will be used as 'latest' during the build, and will set
+ it accordingly in the resulting ISO image if necessary. This can be
+ useful to reproduce an ISO build that did not use tagged APT
+ snapshots. The value must be JSON, for example:
+
+ APT_SNAPSHOTS_SERIALS='{"torproject":"2017120803","debian-security":"2017120902","debian":"2017120903"}'
+
* To tweak other build settings, use `TAILS_BUILD_OPTIONS`,
a space-separated list of build options documented below.
diff --git a/wiki/src/contribute/build/reproducible.mdwn b/wiki/src/contribute/build/reproducible.mdwn
index 6bc1fa8..55553fc 100644
--- a/wiki/src/contribute/build/reproducible.mdwn
+++ b/wiki/src/contribute/build/reproducible.mdwn
@@ -19,8 +19,8 @@ What are reproducible builds?
(Quoted from <https://reproducible-builds.org>)
-Tails ISO images should be reproducible: everybody who
-builds the ISO should be able to obtain the exact same resulting ISO
+Tails ISO and USB images should be reproducible: everybody who
+builds one of them should be able to obtain the exact same resulting
image from a given Git tag.
Why is it important?
@@ -28,8 +28,8 @@ Why is it important?
Reproducibility increases confidence in the value of our continuous
quality assurance processes as well as the trust that users, and anyone
-interested can put into our released build products (such as ISO images)
-and our development and release process.
+interested can put into our released build products (such as ISO and USB
+images) and our development and release process.
Reproducible builds help [detect
bugs](https://reproducible-builds.org/docs/buy-in/) and ensure that
@@ -43,54 +43,57 @@ developers](https://reproducible-builds.org/docs/buy-in/), improves
users' security, and allows developers to sleep better at night (as the
incentive for an attacker to compromise developers' systems, or to
compromise developers themselves, is lowered). In turn, this avoids the
-need to trust people (or software) who build the ISO we release, which
-in turn allows more people to get involved in release management work.
+need to trust people (or software) who build the ISO and USB images we
+release, which in turn allows more people to get involved in release
+management work.
-Release managers do not have to upload the ISO image anymore when they
+Release managers do not have to upload the ISO and USB images anymore when they
do a release: they can instead build it both on our infrastructure
(Jenkins) and locally and compare the outputs: if they match, one can
-publish the ISO built by Jenkins. Uploading an ISO can take many hours
+publish the ISO and USB images built by Jenkins. Uploading the ISO and USB
+images can take many hours
with some commonly found means of accessing the Internet, so removing
the need to go through this step decreases our time to remediation for
fixing security issues, and makes it easier for developers with poor
access to the Internet to take care of a release.
-Build and compare a Tails ISO image
-===================================
+Build and compare Tails ISO and USB images
+==========================================
-Build a Tails ISO image
------------------------
+Build Tails ISO and USB images
+------------------------------
See the [[build instructions|contribute/build]].
<a id="verify-iso"></a>
-How do I verify the ISO I have built against the official one?
---------------------------------------------------------------
+How do I verify the image I have built against the official one?
+----------------------------------------------------------------
-You can verify that the ISO image you have built is identical to the
+You can verify that the image you have built is identical to the
official one we published either with OpenPGP or with a checksum.
### Verify with OpenPGP
-When you reproducibly build our ISO you should obtain a file that is
-exactly the same as the official Tails ISO image, thus, *our* signature
-should be able to verify *your* ISO for you.
+When you reproducibly build our image you should obtain a file that is
+exactly the same as the official Tails image, thus, *our* signature
+should be able to verify *your* image for you.
[[Download and verify our OpenPGP signature|/install/download#openpgp]]
-against your own ISO image.
+against your own ISO or USB image.
### Verify with a checksum
-To verify that the ISO image you have built is identical as the
+To verify that the ISO or USB image you have built is identical as the
official one:
-1. Compute the checksum of your ISO image by executing the following
- command on it:
+1. Compute the checksum of your image by executing one of the following
+ commands on it:
sha256sum yourimage.iso
+ sha256sum yourimage.img
-2. Compare the SHA-256 checksum of your ISO image with the one found
- in the official [ISO description file](https://tails.boum.org/install/v2/Tails/amd64/stable/latest.json).
+2. Compare the SHA-256 checksum of your images with the ones found
+ in the official [image description file](https://tails.boum.org/install/v2/Tails/amd64/stable/latest.json).
Build and compare a Tails upgrade (IUK)
=======================================
diff --git a/wiki/src/contribute/calendar.mdwn b/wiki/src/contribute/calendar.mdwn
index 9085a06..84c3b7d 100644
--- a/wiki/src/contribute/calendar.mdwn
+++ b/wiki/src/contribute/calendar.mdwn
@@ -2,39 +2,81 @@
All times are referenced to Berlin and Paris time.
-## 2018Q3
+## 2019Q1
-## 2018Q4
+* 2019-02-13: Test and **release Tails 3.12.1** (intrigeri is the RM)
-* 2018-12-03, 16:00: [[Foundations Team|contribute/working_together/roles/foundations_team]] meeting
+* 2019-03-06, 19:00: [[Contributors meeting|contribute/meetings]]
-* 2018-12-03, 19:00: [[Contributors meeting|contribute/meetings]]
+* 2019-03-12, 16:00: [[Foundations Team|contribute/working_together/roles/foundations_team]] meeting
+ - [smallish UX improvements](https://redmine.tails.boum.org/code/issues/14544#note-75)
-* 2018-12-04: 10:00: USB Image meeting
+* 2019-03-12: Debian Buster full freeze
-* 2018-12-11: **Release 3.11** (Firefox 60.4, bugfix release)
+* 2019-03-17:
+ - Feature Freeze: Unless I have told you otherwise, all feature branches
+ targeting Tails 3.13 should be merged into the `stable` branch by
+ noon, CET. Ask if you need an exception!
+ - Start preparing Tails 3.13.
-## 2019Q1
+* 2019-03-18:
+ - Build and upload Tails 3.13.
+ - Start testing Tails 3.13.
+
+* 2019-03-19:
+ - Finish testing Tails 3.13.
+ - **Release Tails 3.13**.
+ - Note: anonym is the RM; intrigeri in is the TR.
+
+* 2019-03-20 to 2019-03-22: [[!wikipedia Pwn2Own]], which often triggers an emergency Firefox release
+
+* 2019-04-02 to 2019-04-05: [[Foundations Team|contribute/working_together/roles/foundations_team]] sprint
+ - Port Tails to Debian 10 (Buster)
+
+* 2019-04-03, 16:00: [[Foundations Team|contribute/working_together/roles/foundations_team]] meeting
+
+* 2019-04-03, 19:00: [[Contributors meeting|contribute/meetings]]
+
+* 2019-05-06, 16:00: [[Foundations Team|contribute/working_together/roles/foundations_team]] meeting
+
+* 2019-05-06, 19:00: [[Contributors meeting|contribute/meetings]]
+
+* 2019-05-14: **Release 3.14** (Firefox 60.7, Tor Browser 8.5; bugfix release — kibi is the RM)
+
+* 2019-06-03, 16:00: [[Foundations Team|contribute/working_together/roles/foundations_team]] meeting
+
+* 2019-06-03, 19:00: [[Contributors meeting|contribute/meetings]]
+
+* 2019-06-25 to 2019-06-27: Translation platform sprint
+
+* 2019-07-03, 16:00: [[Foundations Team|contribute/working_together/roles/foundations_team]] meeting
+
+* 2019-07-03, 19:00: [[Contributors meeting|contribute/meetings]]
+
+* 2019-07-09: **Release 3.15** (Firefox 60.8, bugfix release — kibi is the RM)
+
+* 2019-08-06, 16:00: [[Foundations Team|contribute/working_together/roles/foundations_team]] meeting
+
+* 2019-08-06, 19:00: [[Contributors meeting|contribute/meetings]]
-* 2019-01-03, 16:00: [[Foundations Team|contribute/working_together/roles/foundations_team]] meeting
+* 2019-09-03, 16:00: [[Foundations Team|contribute/working_together/roles/foundations_team]] meeting
-* 2019-01-03, 19:00: [[Contributors meeting|contribute/meetings]]
+* 2019-09-03, 19:00: [[Contributors meeting|contribute/meetings]]
-* 2019-01-29: **Release 3.12** (Firefox 60.5, major release)
- - [[!tails_ticket 15292 desc="USB image"]]
+* 2019-09-03: **Release 3.16** (Firefox 60.9, bugfix release — intrigeri is the RM)
-* 2019-02-06, 16:00: [[Foundations Team|contribute/working_together/roles/foundations_team]] meeting
+* 2019-10-03, 16:00: [[Foundations Team|contribute/working_together/roles/foundations_team]] meeting
-* 2019-02-06, 19:00: [[Contributors meeting|contribute/meetings]]
+* 2019-10-03, 19:00: [[Contributors meeting|contribute/meetings]]
-* 2019-03-19: **Release 3.13** (Firefox 60.6; Tor Browser 8.5 ⇒ major release?)
+* 2019-10-22: **Release 3.17 or 4.0** (Firefox 68.2, major release)
-* 2019-05-14: **Release 3.14** (Firefox 60.7)
+* 2019-11-06, 16:00: [[Foundations Team|contribute/working_together/roles/foundations_team]] meeting
-* 2019-07-09: **Release** (Firefox 60.8)
+* 2019-11-06, 19:00: [[Contributors meeting|contribute/meetings]]
-* 2019-09-03: **Release** (Firefox 60.9)
+* 2019-12-03, 16:00: [[Foundations Team|contribute/working_together/roles/foundations_team]] meeting
-* 2019-10-22: **Release** (Firefox 68.2, major release)
+* 2019-12-03, 19:00: [[Contributors meeting|contribute/meetings]]
-* 2019-12-10: **Release** (Firefox 68.3)
+* 2019-12-10: **Release** (Firefox 68.3, bugfix release)
diff --git a/wiki/src/contribute/design/Time_syncing.mdwn b/wiki/src/contribute/design/Time_syncing.mdwn
index 57b6c48..021b3c6 100644
--- a/wiki/src/contribute/design/Time_syncing.mdwn
+++ b/wiki/src/contribute/design/Time_syncing.mdwn
@@ -154,13 +154,17 @@ into three different pools according to their members' relationship to
the members in the other pools; any member in a one pool should be
unlikely to share logs (or other identifying data), or to agree to
send fake time information, with a member from
-the the other pools. The pools are as follows:
+the other pools. The pools are as follows:
-* The "pal" pool are run by groups that are likely to take great care
+* The first pool lists websites run by groups that are likely to take great care
of their visitors' privacy.
-* The "foe" pool are managed by adversaries of the "pal" pool.
-* The "neutral" pool members have a neutral raltionship to both the
- "pal" and "foe" pool.
+* The second pool lists websites run by entities which have a neutral relationship
+ to both the members of the other pools.
+* The third pool lists websites run by adversaries of the first pool members.
+
+This design does not require that we particularly trust even members
+of the first pool: what we need is to minimize the chance members of
+different pools conspire together against Tails users.
The pools are listed in [[!tails_gitweb config/chroot_local-includes/etc/default/htpdate.pools]].
diff --git a/wiki/src/contribute/design/application_isolation.mdwn b/wiki/src/contribute/design/application_isolation.mdwn
index 5518b99..ad49f35 100644
--- a/wiki/src/contribute/design/application_isolation.mdwn
+++ b/wiki/src/contribute/design/application_isolation.mdwn
@@ -327,6 +327,8 @@ To generate a valid binary policy cache at ISO build time:
4.18 is still valid and used when booting on Linux 4.19 with the
same `features-file` setting.
+This work is tracked on [[!tails_ticket 16138]].
+
Resources: `apparmor_parser(8)`, `apparmor_parser --help`,
examples in `parser/tst/features_files/*`, and `parser.conf`.
diff --git a/wiki/src/contribute/design/incremental_upgrades.mdwn b/wiki/src/contribute/design/incremental_upgrades.mdwn
index 3cfe52d..bbdb330 100644
--- a/wiki/src/contribute/design/incremental_upgrades.mdwn
+++ b/wiki/src/contribute/design/incremental_upgrades.mdwn
@@ -19,7 +19,7 @@ should provide an automated way of doing the upgrade.
* **Incremental Upgrade Kit (IUK)**: a file that contains everything
needed to upgrade from.
* **full image**: a file that is sufficient to install and run Tails
- (currently, that means an ISO image).
+ (currently, that means an ISO or USB image).
* **target files**: the whole set of files included by reference into
an upgrade; e.g. this may be an IUK or a full image.
diff --git a/wiki/src/contribute/design/installation_assistant.mdwn b/wiki/src/contribute/design/installation_assistant.mdwn
index 0a66ea8..3e16791 100644
--- a/wiki/src/contribute/design/installation_assistant.mdwn
+++ b/wiki/src/contribute/design/installation_assistant.mdwn
@@ -21,16 +21,15 @@ being usable by expert users.
The following scenarios are proposed:
- - [[Install from another Tails (for PC)|install/win/clone-overview]]
- - [[Install from another Tails (for Mac)|install/mac/clone-overview]]
+ - [[Clone from another Tails (for PC)|install/win/clone-overview]]
+ - [[Clone from another Tails (for Mac)|install/mac/clone-overview]]
- [[Install from Windows|install/win/usb-overview]]
- - [[Install from Debian, Ubuntu, or Mint|install/debian/usb-overview]]
+ - [[Install from macOS|install/mac/usb-overview]]
+ - [[Install from Linux (all distributions)|install/linux/usb-overview]]
- [[Install from Debian, Ubuntu, or Mint using the command line and GnuPG|install/expert/usb-overview]]
- - [[Install from other Linux distributions|install/linux/usb-overview]]
- - [[Install from macOS by burning a DVD first|install/mac/dvd-overview]]
- - [[Install from macOS and the command line|install/mac/usb-overview]]
- [[Burn a DVD|install/dvd]]
- - [[Download without installing|install/download]]
+ - [[Download only for USB sticks|install/download]]
+ - [[Download only for DVDs and virtual machines|install/download-iso]]
The installation assistant is also adapted to cover two [[manual upgrade
scenarios|upgrade]]:
@@ -71,8 +70,7 @@ massive amount of content in ikiwiki.
The [inline directive](https://ikiwiki.info/ikiwiki/directive/inline/) of
ikiwiki allows embedding a file into another file to avoid duplicating content.
It is quite limited and brittle, especially when used together with the PO
-plugin. See [[!tails_ticket 6907]]. Many inlines also slow down the build
-process quite a lot.
+plugin. See [[!tails_ticket 6907]].
### Conditional CSS content
@@ -82,7 +80,7 @@ program used to install an intermediary Tails on Windows and Linux we
wrote:
<pre>
-&lt;span class="windows"&gt;a program called Universal USB Installer.&lt;/span&gt;
+&lt;span class="windows"&gt;a program called Etcher.&lt;/span&gt;
&lt;span class="linux"&gt;a program called GNOME Disks.&lt;/span&gt;
</pre>
@@ -92,25 +90,20 @@ scenario and elements with the
- Classes for elements potentially displayed on different pages:
- `clone` for content involving cloning
+ - `download` for all download pages
- `usb` for content with a USB stick as destination device
- - `windows` for content for Windows
- - `mac` for content for macOS
- - `debian` for content for Debian, Ubuntu, or Mint
- - `expert` for content for Debian, Ubuntu, or Mint on the command line
- - `linux` for content for other Linux
- `upgrade` for content for manual upgrade
- Classes for elements displayed only on one scenario:
+ - `windows` for [[/install/win/usb|/install/win/usb]]
+ - `mac` for [[/install/mac/usb|/install/mac/usb]]
+ - `linux` for [[/install/linux/usb|/install/linux/usb]]
+ - `expert` for [[/install/expert/usb|/install/expert/usb]]
- `dvd` for [[/install/dvd-download|/install/dvd-download]]
- - `vm` for [[/doc/advanced_topics/virtualization|/doc/advanced_topics/virtualization]]
- - `download-only` for [[/install/download|/install/download]]
+ - `vm` for [[/install/vm-download|/install/vm-download]]
+ - `download-only-img` for [[/install/download|/install/download]]
+ - `download-only-iso` for [[/install/download|/install/download-iso]]
- `install-clone` for [[/install/clone|/install/clone]]
- - `windows-usb` for [[/install/win/usb|/install/win/usb]]
- - `mac-usb` for [[/install/mac/usb|/install/mac/usb]]
- - `mac-dvd` for [[/install/mac/dvd|/install/mac/dvd]]
- `mac-clone` for [[/install/mac/clone|/install/mac/clone]]
- - `debian-usb` for [[/install/debian/usb|/install/debian/usb]]
- - `expert-usb` for [[/install/expert/usb|/install/expert/usb]]
- - `linux-usb` for [[/install/linux/usb|/install/linux/usb]]
- `upgrade-clone` for [[/upgrade/clone|/upgrade/clone]]
- `upgrade-tails` for [[/upgrade/tails|/upgrade/tails]]
@@ -124,8 +117,7 @@ installation scenario to follow. It is divided by operating systems:
- Windows
- macOS
- - Linux with `APT` and `tails-installer`: Debian, Ubuntu, or Mint
- - Other Linux distributions
+ - Linux
Notes:
@@ -180,9 +172,9 @@ The *overview* is a single page summarizing graphically:
next and how complex it is. This is particularly important as the
*steps* are a single and very long page.
-For example, the content of the overview for installing from Debian is
-stored in [[!tails_gitweb wiki/src/install/debian/usb-overview.html]] which includes a common block of
-HTML stored in [[!tails_gitweb wiki/src/install/inc/overview.html]] and uses the `debian` CSS
+For example, the content of the overview for installing from Windows is
+stored in [[!tails_gitweb wiki/src/install/win/usb-overview.html]] which includes a common block of
+HTML stored in [[!tails_gitweb wiki/src/install/inc/overview.html]] and uses the `windows` CSS
class to adapt to the scenario.
<a id="download"></a>
@@ -191,7 +183,7 @@ Download
========
The download of the ISO image comes as a dedicated page between the
-overview and steps (except for `clone`, `upgrade-clone`, and `expert`). It
+overview and steps (except for `install-clone`, `mac-clone`, `upgrade-clone`, and `expert`). It
is also available as a [[standalone page|install/download]].
The download is split as a dedicated page (while still labeled as "Step
@@ -199,6 +191,10 @@ The download is split as a dedicated page (while still labeled as "Step
possible to skip the download or even the verification but the link to
do so is labeled as a warning.
+Depending on the installation scenario, the download page points to the
+download of the ISO image (on `dvd` and `vm`) or the USB image (on all
+other scenarios).
+
We propose two download techniques displayed in equal weight and combined
with two verification techniques that have a level of verification at least as
good as HTTPS:
diff --git a/wiki/src/contribute/design/memory_erasure.mdwn b/wiki/src/contribute/design/memory_erasure.mdwn
index 95f2403..f125d25 100644
--- a/wiki/src/contribute/design/memory_erasure.mdwn
+++ b/wiki/src/contribute/design/memory_erasure.mdwn
@@ -29,6 +29,16 @@ in the initramfs. That one will unmount all filesystems, run
that helps us automatically test this behavior, and finally perform
the requested poweroff/reboot action.
+To make this work, a dedicated `tmpfs` filesystem is [[!tails_gitweb
+config/chroot_local-includes/lib/systemd/system/run-initramfs.mount
+desc="mounted"]] on `/run/initramfs`: `/run` is mounted with the
+`noexec` option and while our attempts to remount it with `exec`
+worked for clean shutdown, they failed for emergency shutdown, i.e.
+when the boot medium is physically removed.
+
+For details about the underlying systemd mechanisms, see `bootup(7)`
+and `systemd-shutdown(8)`.
+
#### Triggers
Different kinds of events trigger the memory erasure process. All lead
diff --git a/wiki/src/contribute/design/verification_extension.mdwn b/wiki/src/contribute/design/verification_extension.mdwn
index b030ca1..bfba294 100644
--- a/wiki/src/contribute/design/verification_extension.mdwn
+++ b/wiki/src/contribute/design/verification_extension.mdwn
@@ -18,10 +18,15 @@ elsewhere through HTTPS (and possibly with stronger authentication
mechanisms such as public key pinning from browser vendors).
We use for that a browser extension, called
-*Tails Verification* which is available for:
+*Tails Verification* which is available for
-* Firefox 45+ (and Tor Browser 6+)
-* Chrome 22+
+* Firefox 52+ (and Tor Browser 7+)
+* Chrome 57+
+
+i.e. browsers that support WebAPIs, in particular
+[FileReader](https://developer.mozilla.org/en-US/docs/Web/API/FileReader),
+[Fetch](https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API), and
+[async/await](https://caniuse.com/#feat=async-functions).
The code of *Tails Verification* is available in `git clone https://git-tails.immerda.ch/verification-extension`.
@@ -38,22 +43,22 @@ Scope
Goals
-----
-Provide a simple, automated, and cross-platform technique to verify the ISO
-image of the current version.
+Provide a simple, automated, and cross-platform technique to verify installable
+Tails images of the current version, in ISO and disk image format.
Non goals
---------
- - Verify deprecated ISO images.
- - Verify ISO images downloaded from nightly.tails.boum.org.
- - Verify ISO images downloaded through BitTorrent. If we can rely on
+ - Verify deprecated Tails images.
+ - Verify Tails images downloaded from nightly.tails.boum.org.
+ - Verify Tails images downloaded through BitTorrent. If we can rely on
our website to provide a correct cryptographic description of the
- ISO image then we can rely on it as well to provide a correct
+ Tails image then we can rely on it as well to provide a correct
BitTorrent file. Then we rely on the BitTorrent client to verify the integrity of
the download ([[!tails_ticket 9043]]).
- Any current ISO image (downloaded over BitTorrent, copied from a
- friend, downloaded from one of our mirrors) can be verified by the
- extension though.
+
+However, any current Tails image (downloaded over BitTorrent, copied from a
+friend, downloaded from one of our mirrors) can be verified by the extension.
<a id="verification"></a>
@@ -67,7 +72,7 @@ Threat model
We are considering here an attacker who can:
- - [A] Provide a malicious ISO image to the user for example by
+ - [A] Provide a malicious Tails image to the user for example by
operating a rogue Tails mirror.
- [H] Operate a website that is loaded in a different tab in the same
@@ -78,21 +83,20 @@ We are not considering an attacker who can:
- [B] Do a man-in-the-middle attack by providing a rogue HTTPS certificate
for https://tails.boum.org/ signed by a certificate authority
- trusted by the
- browser but under the control of the attacker.
+ trusted by the browser but under the control of the attacker.
Since the extension is targeted at new users, a MitM or exploit on
our website could defeat any verification technique by providing
- simplified instructions or by faking ISO verification.
+ simplified instructions or by faking Tails image verification.
Note that our website is already in the HSTS preload list of Firefox
and Chrome which forces HTTPS connections to our website, even for
first time visitors.
- [C] Insert malicious content on https://tails.boum.org/ through an
- exploit on our website as this could trick new users to skip the ISO
- verification all the way. To prevent this kind of attack we should
- instead:
+ exploit on our website as this could trick new users to skip the Tails
+ image verification all the way. To prevent this kind of attack we
+ should instead:
- Monitor externally the most relevant parts of our website.
- Work on integrating full upgrades in Tails Upgrader to limit the
@@ -120,7 +124,7 @@ We are not considering an attacker who can:
- Encourage external documentation (screencasts on YouTube, printed
forms, etc.). But those would be vulnerable to other kind of
attacks.
- - Not rely on the website to perform the ISO verification and rely
+ - Not rely on the website to perform the Tails image verification and rely
on a native interface accessible from the add-ons menu.
But the cost/benefit of such a technique is not very appealing…
@@ -142,7 +146,7 @@ browser (and the proper coding of the extension).
### Cross-origin communication
-The extension uses cross-origin communication to modify the download
+The extension uses cross-origin communication to send messages to the download
page.
- To ensure that messages from the extension are only sent to pages on
@@ -160,21 +164,31 @@ page.
See [[!tails_gitweb wiki/src/install/inc/js/download.js
desc="`receiveMessage()` in *download.js*"]].
-- The code of the extension is only injected in tabs on
- `https://tails.boum.org/` (with a trailing slash). See `permissions`
- in *manifest.js* and `matches` in *scripts/background/background.js*.
+- The code of the extension is loaded via content scripts and targets only tabs
+ with locations `https://tails.boum.org/install/*` and
+ `https://tails.boum.org/upgrade/*`. See `permissions` in *manifest.json*.
-- The communication is unidirectional: only the extension sends messages
- and the extension does not listen to messages.
+- On Chrome browsers, a background script reloads tabs with matching URL
+ schemes (`https://tails.boum.org/install/*` and
+ `https://tails.boum.org/upgrade/*`) only after the first installation of the
+ extension, in order to make the extension usable right away. This is
+ automatically happening in Firefox based browsers, therefore the background
+ script does not apply.
+
+- The communication is unidirectional: the extension only sends messages
+ but it does not listen to messages.
### Content Security Policy
-Instead of the default Content Security Policy, the extension uses the
-strictest policy: `default-src 'none'`.
+The extension uses a Content Security Policy with `default-src 'none'`
+and `script-src 'self'`. The latter part has been added because
+background scripts are needed by the extension, and require a slightly
+less strict CSP. However, this CSP also applies to the content scripts
+shipped in the extension.
<a id="update"></a>
-Updates mechanism
+Update mechanisms
-----------------
### Automatic update from browsers
@@ -188,10 +202,10 @@ Updates mechanism
### Enforce version check on our download page
On top of this, the HTML code of our download page includes a tag to
-force a version of the extension. For example:
+force a minimum version of the extension. For example:
<pre>
-&lt;div id="extension-version"&gt;1.0&lt;/div&gt;
+&lt;div id="extension-version"&gt;2.0&lt;/div&gt;
</pre>
*Tails Verification* checks the value of this tag and asks for an
@@ -210,48 +224,85 @@ Extension technology
The extension is written as a *Web Extension* and the same exact code
works on both Firefox and Chrome.
+
+Future plans include abandoning the extension and integrating the code directly
+into our website, with the aim of supporting more browsers. [[!tails_ticket
+16128]].
+
<a id="data_source">
Data source
-----------
-Building up on the format specified for [[upgrade description
+Building upon the format specified for [[upgrade description
files|contribute/design/incremental_upgrades#upgrade-description-files]],
-the verification extension fetches an [[!tails_gitweb wiki/src/install/v1/Tails/i386/stable/latest.yml desc="ISO description file"]] from our
-server to retrieve all the information it needs about the ISO image
-(URL, size, checksum, etc.). As a beginning, this ISO description file
-is not signed using OpenPGP.
-
-### Example of an ISO description file
-
- ---
- build-target: i386
- channel: stable
- product-name: Tails
- version: '0.23'
- target-files:
- - sha256: 359d104737f1a448375d2030f938dea3d529468b8218485998ab893c1f7509eb
- size: 939571200
- url: http://dl.amnesia.boum.org/tails/stable/tails-i386-0.23/tails-i386-0.23.iso
+the verification extension fetches an [[!tails_gitweb
+wiki/src/install/v2/Tails/amd64/stable/latest.json desc="image description
+file"]] from our server to retrieve all the information it needs about
+available Tails images (URL, size, checksum, etc.).
+
+The file format allows to publish several target files, and formats, such as
+ISO and IMG.
+
+It currently publishes only information about the current stable supported
+Tails release. A more fine grained approach is planned [[!tails_ticket 16200]].
+
+Currently, this image description file is not signed using OpenPGP.
+
+### Example of an image description file
+
+<pre>
+{
+ "build_target": "amd64",
+ "channel": "stable",
+ "installations": [
+ {
+ "installation-paths": [
+ {
+ "target-files": [
+ {
+ "sha256": "2ffeacab6ad74671a9eb15b560f47bae7d22e1bcbd9735342ee6d7dfe3c5706e",
+ "size": 1225568256,
+ "url": "http://dl.amnesia.boum.org/tails/stable/tails-amd64-3.11/tails-amd64-3.11.iso"
+ }
+ ],
+ "type": "iso"
+ },
+ {
+ "target-files": [
+ {
+ "sha256": "cafedeadbeaf67213970783432cafe0dead9beefbd9735342ee6d7dfe3c5706e",
+ "size": 1225765432,
+ "url": "http://dl.amnesia.boum.org/tails/stable/tails-amd64-3.11/tails-amd64-3.11.img"
+ }
+ ],
+ "type": "img"
+ }
+ ],
+ "version": "3.11"
+ }
+ ],
+ "product-name": "Tails"
+}
+</pre>
Checksum verification
---------------------
-When verifying an ISO image, the extension:
+When verifying a Tails image, the extension:
- - Downloads the ISO description document (size, checksum) from:
+ - Downloads the image description document (url, size, checksum) from:
- <https://tails.boum.org/v1/Tails/amd64/stable/latest.yml>
+ <https://tails.boum.org/v2/Tails/amd64/stable/latest.json>
- - Verifies the ISO image against the document (first its size, then
- its checksum).
+ - Verifies the image downloaded (ISO or IMG) against the document (first its
+ size, then its checksum).
Security properties:
- - This technique would defeat attack [A] (malicious ISO).
+ - This technique would defeat attack [A] (malicious Tails image).
-More complex verification mechanisms could be gradually [[built into
-Tails Installer|blueprint/bootstrapping/installer]] where we can
+More complex verification mechanisms could be gradually built in to
defeat attacks [B], [C], [D], [F], and [G].
Embedded *Forge* library
@@ -264,7 +315,7 @@ checksum. So it embeds the *Forge* library:
<https://github.com/digitalbazaar/forge/>
-We choose *Forge* because it was reported as being the fastest in this
+We chose *Forge* because it was reported as being the fastest in this
benchmark:
<https://github.com/brillout/test-javascript-hash-implementations>
@@ -285,10 +336,6 @@ mechanisms:
to some CSS declarations, to indicate whether the extension is
up-to-date or outdated.
-- If the extension gets installed on a page, through a background script
- that injects the JavaScript of the extension on the page. See commit
- d80b322.
-
This decouples the code of the extension from the implementation of the
display on the HTML page (ids, classes, etc.).
diff --git a/wiki/src/contribute/how/code.mdwn b/wiki/src/contribute/how/code.mdwn
index 6833aed..8cd2411 100644
--- a/wiki/src/contribute/how/code.mdwn
+++ b/wiki/src/contribute/how/code.mdwn
@@ -103,7 +103,7 @@ implement. At this point, we advise you to:
1. **Gather results of previous research and discussions** on the
topic you are interested in. Search this website, [[!tails_redmine ""
desc="tickets on Redmine"]] and the [tails-dev@boum.org mailing list
- archive](https://mailman.boum.org/pipermail/tails-dev/).
+ archive](https://lists.autistici.org/list/tails-dev.html).
2. **[[Tell us on tails-dev@boum.org|about/contact#tails-dev]] about your plans** to make sure your
idea fits nicely into the [[big picture|contribute/design]], and
nobody is currently working on the same task.
diff --git a/wiki/src/contribute/how/documentation/qrcode-encode.sh b/wiki/src/contribute/how/documentation/qrcode-encode.sh
index 03798f5..b8a0027 100755
--- a/wiki/src/contribute/how/documentation/qrcode-encode.sh
+++ b/wiki/src/contribute/how/documentation/qrcode-encode.sh
@@ -9,7 +9,7 @@ if [ ! -x /usr/bin/qrencode ]; then
fi
for code in "${@}" ; do
- file="$(echo "${code}" | sed -r "s#http(s)?://##;s#/\$##;s#[/\.]#_#g")"
+ file="$(echo "${code}" | sed -r "s#^http(s)?://##;s#/\$##;s#[/.?=]#_#g;s#_+#_#g")"
qrencode -o "${file}.png" -s 5 "${code}"
"$(dirname "${0}")/compress-image.sh" "${file}.png"
done
diff --git a/wiki/src/contribute/how/documentation/release_notes.mdwn b/wiki/src/contribute/how/documentation/release_notes.mdwn
index a7dd44c..a3b171a 100644
--- a/wiki/src/contribute/how/documentation/release_notes.mdwn
+++ b/wiki/src/contribute/how/documentation/release_notes.mdwn
@@ -14,9 +14,9 @@
for QA" and "Fix committed" on Redmine.
- If a release candidate was announced, read the call for testing
- Analyze the diff of packages
- - in testing for a major release: `wget http://nightly.tails.boum.org/build_Tails_ISO_testing/lastSuccessful/archive/latest.iso.packages`
- - in stable for a bugfix release: `wget http://nightly.tails.boum.org/build_Tails_ISO_stable/lastSuccessful/archive/latest.iso.packages`
- - `diff -u ~/Persistent/master/wiki/src/torrents/files/tails-amd64-*.packages latest.iso.packages | wdiff --diff-input --terminal --auto-pager`
+ - in testing for a major release: `wget http://nightly.tails.boum.org/build_Tails_ISO_testing/lastSuccessful/archive/latest.packages`
+ - in stable for a bugfix release: `wget http://nightly.tails.boum.org/build_Tails_ISO_stable/lastSuccessful/archive/latest.packages`
+ - `diff -u ~/Persistent/master/wiki/src/torrents/files/tails-amd64-*.packages latest.packages | wdiff --diff-input --terminal --auto-pager`
- If an important application was updated to a new upstream release, read its Changelog to find relevant highlights:
- Tor: <https://blog.torproject.org/>
- Tor: <https://gitweb.torproject.org/tor.git/tree/ChangeLog>
@@ -60,7 +60,7 @@
- Use full sentences for major changes ("*We installed*", "*You can*")
- Use present tense without subject for minor changes ("*Upgrade*", "*Fix*")
- Mention updates as "Update *Xyz* to [1.2.4]."
- - Mention previous version if we skipped some "Update Xyz from 1.0.0 to [1.2.3]."
+ - Mention previous version if we skipped some "Update *Xyz* from 1.0.0 to [1.2.3]."
- Link to release notes if any, or changelog
- For Linux upgrades add "*This should improve the support for newer hardware (graphics, Wi-Fi, etc.)*"
- Order items to put the most visible, less technical, and most popular
@@ -77,5 +77,5 @@
- Put the period before ticket number
- "Bla bla. ([!tails_ticket 1234])"
- Prepare a tweet with highlights:
- - Tails x.y is out: https://tails.boum.org/news/version_x.y, bla bla bla, and more.
+ - Tails x.y is out: https://tails.boum.org/news/version_x.y/, bla bla bla, and more.
- Add it as a comment to the ticket for the release notes.
diff --git a/wiki/src/contribute/how/documentation/release_notes/template.mdwn b/wiki/src/contribute/how/documentation/release_notes/template.mdwn
index f8067f1..a5301d7 100644
--- a/wiki/src/contribute/how/documentation/release_notes/template.mdwn
+++ b/wiki/src/contribute/how/documentation/release_notes/template.mdwn
@@ -6,16 +6,15 @@
<!--
This release fixes [[many security
-vulnerabilities|security/Numerous_security_holes_in_$VERSION-1]].
-
-You should upgrade as soon as possible.
+vulnerabilities|security/Numerous_security_holes_in_$VERSION-1]]. You should upgrade as soon as possible.
OR
-This release is an emergency release to fix a [[critical security
-vulnerability in $APPLICATION|security/Numerous_security_holes_in_$VERSION-1.
+This release is an emergency release to fix a critical security
+vulnerability in $APPLICATION.
-You should upgrade as soon as possible.
+It also fixes [[other security
+vulnerabilities|security/Numerous_security_holes_in_$VERSION-1]]. You should upgrade as soon as possible.
-->
@@ -31,6 +30,13 @@ You should upgrade as soon as possible.
### Included software
+- Update *Xyz* to [1.2.3].
+
+- Update *Xyz* from 1.0.0 to [1.2.3].
+
+- Update Linux to 1.2.3. This should improve the support for newer
+ hardware (graphics, Wi-Fi, etc.).
+
### Hardware support
The following updates make Tails work better on recent hardware (graphics,
@@ -46,6 +52,13 @@ For more details, read our [[!tails_gitweb debian/changelog desc="changelog"]].
# Known issues
+<!--
+
+Copy the known issues from the previous version if they haven't been
+solved or move them to /support/known_issues if more appropriate.
+
+-->
+
None specific to this release.
See the list of [[long-standing issues|support/known_issues]].
@@ -63,7 +76,10 @@ See the list of [[long-standing issues|support/known_issues]].
If you cannot do an automatic upgrade or if Tails fails to start after an
automatic upgrade, please try to do a [[manual upgrade|upgrade]].
-- [[Download Tails $VERSION.|install/download]]
+- Download Tails $VERSION:
+
+ - [[For USB sticks (USB image)|install/download]]
+ - [[For DVDs and virtual machines (ISO image)|install/download-iso]]
# What's coming up?
diff --git a/wiki/src/contribute/how/documentation/style_guide.mdwn b/wiki/src/contribute/how/documentation/style_guide.mdwn
index 76954f1..7151d0a 100644
--- a/wiki/src/contribute/how/documentation/style_guide.mdwn
+++ b/wiki/src/contribute/how/documentation/style_guide.mdwn
@@ -1,33 +1,133 @@
[[!meta title="Documentation style guide"]]
+<a id="administration-password"></a>
+
+- **administration password** vs **root password**
+
+ Use *administration password*. Avoid *root password* even though many
+ Linux users would use it.
+
+ - *For example:*
+
+ - [[Set up an administration password
+ |doc/first_steps/startup_options/administration_password]] when
+ you start Tails.
+
+ - Start Tails and [[set up an administration
+ password|doc/first_steps/startup_options/administration_password]].
+
+<a id="anchors"></a>
+
+- **anchors** (HTML anchors)
+
+ Use HTML anchors to provide shortcuts when pointing people to sections
+ inside a page.
+
+ - *For example*:
+
+ - `<a id="2014">` in `doc/about/finances` to be able to point to
+ `https://tails.boum.org/finances#2014`.
+
+ - Keep them as short as possible as they appear in the URL.
+
+ - Use hyphens instead of underscores to separate words.
+
+<a id="boot"></a>
+
+- **boot** vs **start**
+
+ - Use *start* and *restart* as much as possible to refer to starting a
+ computer on Tails; *boot* is almost always unecessary jargon.
+
+ - You might use *boot* when the word is displayed to the user by the
+ computer or when writing for a technical audience, like in our
+ design documentation.
+
+ - Use *boot* when referring to *boot options*, which are only
+ documented for workarounds or a technical audience.
+
+ - *For example*:
+
+ - Most computers do not start on Tails by default.
+
+ - The following instructions explain how to display the boot menu
+ and start on the USB stick.
+
+ - When starting Tails, add the <span class="command">toram</span>
+ boot option in the <span class="application">Boot Loader
+ Menu</span>. For detailed instructions, see the documentation on
+ [[using the <span class="application">Boot Loader
+ Menu</span>|doc/first_steps/startup_options#boot_loader_menu]].
+
+<a id="bulleted-lists"></a>
+
- **bulleted lists**
Refer to this article from NN/g on [presenting bulleted
lists](https://www.nngroup.com/articles/presenting-bulleted-lists/).
+ Always add empty lines between list items to:
+
+ - Make them easier to read.
+
+ - Make them easier to translate. Each item from the list will be put
+ in a separate PO string in PO files by the PO plugin when building
+ the website.
+
+<a id="debian-versions"></a>
+
- **Debian and Ubuntu versions**
Refer to Debian and Ubuntu versions primarily by their numbers, and additionally
by their codenames.
- * *For example*:
+ - *For example*:
+
- Tails 3.0 is based on Debian 9 (Stretch)
+
- *Tails Installer* is available on Ubuntu 15.10 (Wily Werewolf) or later.
-<a id="digit_grouping"></a>
+<a id="earlier"></a>
+
+- **earlier** and **later**
+
+ Use to refer to versions of software.
+
+ Don't use *lower* and *higher* or *newer* and *older*.
+
+ Don't use "regular expressions" like *Tails 2.1.&#42;*.
+
+ - *For example:*
+
+ - If you are running macOS 10.10 (Yosemite) or earlier
+
+<a id="future-tense"></a>
+
+- **future tense**
+
+Whenever possible, use present, not future, tense. Don't switch
+unnecessarily from present to future tense when present tense is
+sufficient to express a sequence of steps or events.
+
+Present tense is easier to read than past or future tense. Simple verbs
+are easier to read and understand than complex verbs, such as verbs in
+the progressive or perfect tense.
+
+<a id="digit-grouping"></a>
- **digit grouping**
Use a non-breaking thin space (HTML entity: `&#8239;`) or a space to separate
groups of three digits.
- * *For example*:
+ - *For example*:
+
- $50&#8239;000
See [[!wikipedia Decimal_separator#Digit_grouping]] and [[!wikipedia
ISO_31-0#Numbers]].
-<a id="gnome_application"></a>
+<a id="gnome-application"></a>
- **GNOME applications: <i>Files</i>, <i>Disks</i>, etc.**
@@ -40,30 +140,84 @@
not, for example, a set of files or disks):
- *For example*:
+
- In the title of sections
+
- When first referring to the application in a section
- *Use*:
+
- The <span class="application">Files</span> browser
+
- The <span class="application">Disks</span> utility
Otherwise, use the short name of the application as it appears in the menus when giving
instructions to be executed inside Tails.
- *For example*:
+
- Open */live/persistence/TailsData_unlocked/dotfiles* in *Files*.
Prepend "*GNOME*" when giving instructions to be executed outside of
Tails.
- *For example*:
+
- Install <span class="application">GNOME Disks</span> in Debian.
+<a id="graphics-card"></a>
+
- **graphics card**
And not *graphics adapters*, *graphics*, *graphical hardware*, or
*video card*.
+<a id="media"></a>
+
+- **media** and **installation media**
+
+ Use only in rare occasions where it is especially relevant to mention
+ both USB sticks and DVDs.
+
+ Tails is now primarily advertised for USB sticks. We prefer making our
+ text easy to read for the majority of people using USB sticks than to
+ be exhaustive and always mention DVDs, implicitly or explicitly.
+
+ - *For example*:
+
+ - Tails runs on a USB stick that you can plug in and use on almost
+ any computer.
+
+ - It is not possible to install Tails on a hard disk. Tails is
+ designed to be a live system running from a removable media: USB
+ stick or DVD.
+
+<a id="network-interface"></a>
+
+- **network interface**, **Wi-Fi interface**
+
+ And not *card*, *device*, or *adapter*.
+
+ Still, **USB Wi-Fi adapters** are USB dongles that provide a Wi-Fi interface.
+
+<a id="persistence-feature"></a>
+
+- **persistence feature**
+
+ To refer to the features available in the configuration of the
+ *persistent storage*.
+
+ - *For example*:
+
+ - [&hellip;] when the [[<span class="guilabel">Additional Software</span>
+ persistence feature|doc/first_steps/persistence/configure#additional_software]]
+ is activated.
+
+ The word *persistence* can be omitted if it is redundant from the context
+ (for example on [[doc/first_steps/persistence/configure]]).
+
+<a id="procedures"></a>
+
- **procedures** (a series of steps)
- Keep the number of steps low within a procedure (for example, below
@@ -78,7 +232,7 @@
See also the *Microsoft Manual of Style: Procedures and technical
content*.
- *For example*:
+ - *For example*:
<pre>
1. Make sure that you are connected to the Internet.
@@ -88,22 +242,14 @@
1. Click on the <span class="guilabel">PPAs</span> button and then choose to <span class="button">Add a new PPA&hellip;</span>.
</pre>
-- **network interface**, **Wi-Fi interface**
+<a id="secure-boot"></a>
- And not *card*, *device*, or *adapter*.
+- **Secure Boot**
- Still, **USB Wi-Fi adapters** are USB dongles that provide a Wi-Fi interface.
+ Capitalize as a brand or feature. Writing *secure boot* would make it
+ sound more like a magic security feature (which it is not).
-- **persistence feature**
-
- To refer to the features available in the configuration of the
- *persistent storage*.
-
- - *For example*: when the [[<span class="guilabel">Additional
- Software</span> persistence feature|doc/first_steps/persistence/configure#additional_software]] is activated.
-
- The word *persistence* can be omitted if it is redundant from the context
- (for example on [[doc/first_steps/persistence/configure]]).
+<a id="serial-comma"></a>
- **serial comma**
@@ -111,14 +257,49 @@
coordinating conjunction (usually *and* or *or*) in a series of three
or more terms.
+<a id="startup-options"></a>
+
- **startup options**
To refer to the kernel command line options that can be specified from
the *Boot Loader Menu*.
- * *For example:* Adding `radeon.dpm=0` to the [[startup
- options|/doc/first_steps/startup_options#boot_menu]].
+ - *For example:*
+
+ - Adding `radeon.dpm=0` to the [[startup
+ options|/doc/first_steps/startup_options#boot_menu]].
+
+<a id="tails-greeter"></a>
- **<span class="application">Tails Greeter</span>**
Without an article. Not *the Greeter*. Note the formatting as an application.
+
+<a id="update"></a>
+
+- **update** vs **upgrade**
+
+ - Use **upgrade** to refer to the replacement of a previous version of
+ Tails by another.
+
+ - *For example:*
+
+ - If you know someone you trust who already did the upgrade, you can
+ upgrade your Tails by cloning from their Tails.</p>
+
+ - You might use **update** to refer to other operations that update
+ some data or software outside of Tails releases.
+
+ - *For example:*
+
+ - Make sure to update your *dotfiles* each time you use the **init**
+ command of *keyringer*.
+
+ - The packages from your list of additional software will be updated
+ automatically when you connect to the Internet.
+
+<a id="vulnerability"></a>
+
+- **vulnerability** or **security vulnerability**
+
+ And not *hole* or *issue*.
diff --git a/wiki/src/contribute/how/translate/tails-l10n.inline.mdwn b/wiki/src/contribute/how/translate/tails-l10n.inline.mdwn
index ad2459f..6c24a6f 100644
--- a/wiki/src/contribute/how/translate/tails-l10n.inline.mdwn
+++ b/wiki/src/contribute/how/translate/tails-l10n.inline.mdwn
@@ -5,9 +5,9 @@ This is where important changes to translatable strings are announced.
So, please subscribe to the list if you want to become a regular
translator:
-Public archive of tails-l10n: <https://mailman.boum.org/pipermail/tails-l10n/>.
+Public archive of tails-l10n: <https://lists.autistici.org/list/tails-l10n.html>.
-<form method="POST" action="https://mailman.boum.org/subscribe/tails-l10n">
+<form method="POST" action="https://www.autistici.org/mailman/subscribe/tails-l10n">
<input class="text" name="email" value=""/>
<input class="button" type="submit" value="Subscribe"/>
</form>
diff --git a/wiki/src/contribute/how/translate/team/de.mdwn b/wiki/src/contribute/how/translate/team/de.mdwn
index cc8ebba..b273477 100644
--- a/wiki/src/contribute/how/translate/team/de.mdwn
+++ b/wiki/src/contribute/how/translate/team/de.mdwn
@@ -29,7 +29,7 @@ For words not in these lists it is helpful to see
how they are translated (or not translated) in Wikipedia.
Often, we simply discuss on the [[mailing list for
-translators|https://mailman.boum.org/pipermail/tails-l10n/]] if
+translators|https://www.autistici.org/mailman/listinfo/tails-l10n/]] if
unsure which term applies best.
# Contributors' repositories
diff --git a/wiki/src/contribute/how/translate/team/es.mdwn b/wiki/src/contribute/how/translate/team/es.mdwn
index d382a8c..6734d05 100644
--- a/wiki/src/contribute/how/translate/team/es.mdwn
+++ b/wiki/src/contribute/how/translate/team/es.mdwn
@@ -4,7 +4,7 @@
* We try to translate using Tails itself so we get familiarised with the
software we are translating.
-* We have one main communication channel: A [mailing list](https://mailman.boum.org/listinfo/tails-l10n-spanish)
+* We have one main communication channel: A [mailing list](https://www.autistici.org/mailman/listinfo/tails-l10n-spanish)
(<tails-l10n-spanish@boum.org>).
* We have [[a wiki|blueprint/l10n_Spanish]].
* We use [Poedit](https://poedit.net/) for the translations (comes with Tails).
diff --git a/wiki/src/contribute/how/translate/team/fa.mdwn b/wiki/src/contribute/how/translate/team/fa.mdwn
index 8ed6d2d..bb3a3e6 100644
--- a/wiki/src/contribute/how/translate/team/fa.mdwn
+++ b/wiki/src/contribute/how/translate/team/fa.mdwn
@@ -1,4 +1,4 @@
[[!meta title="Translate Tails into Farsi"]]
The Farsi translation team uses its [[own mailing
-list|https://mailman.boum.org/listinfo/tails-l10n-fa/]].
+list|https://www.autistici.org/mailman/listinfo/tails-l10n-fa/]].
diff --git a/wiki/src/contribute/how/translate/team/pt.mdwn b/wiki/src/contribute/how/translate/team/pt.mdwn
index a183f8c..7cd2d55 100644
--- a/wiki/src/contribute/how/translate/team/pt.mdwn
+++ b/wiki/src/contribute/how/translate/team/pt.mdwn
@@ -1,4 +1,4 @@
[[!meta title="Translate Tails into Portuguese"]]
The Portuguese translation team uses its [[own mailing
-list|https://mailman.boum.org/listinfo/tails-l10n-pt-br/]].
+list|https://www.autistici.org/mailman/listinfo/tails-l10n-pt-br/]].
diff --git a/wiki/src/contribute/how/translate/team/zh.mdwn b/wiki/src/contribute/how/translate/team/zh.mdwn
index 2569357..ad035d5 100644
--- a/wiki/src/contribute/how/translate/team/zh.mdwn
+++ b/wiki/src/contribute/how/translate/team/zh.mdwn
@@ -5,7 +5,7 @@
# How to join the Chinese translation team?
New contributors should first subscribe to the [[mailing list for
-translators|https://mailman.boum.org/pipermail/tails-l10n/]] and
+translators|https://www.autistici.org/mailman/listinfo/tails-l10n/]] and
introduce themselves to the Chinese team on the list.
We currently work in both Simplified and Traditional Chinese and use
diff --git a/wiki/src/contribute/l10n_tricks/core_po_files.txt b/wiki/src/contribute/l10n_tricks/core_po_files.txt
index cbe26fe..778fb76 100644
--- a/wiki/src/contribute/l10n_tricks/core_po_files.txt
+++ b/wiki/src/contribute/l10n_tricks/core_po_files.txt
@@ -42,12 +42,8 @@
./index
./install
./install/clone
-./install/debian/clone-overview
-./install/debian
-./install/debian/usb
-./install/debian/usb-overview
-./install/debian/usb-download
./install/download
+./install/download-iso
./install/dvd
./install/dvd-download
./install/expert/usb
@@ -56,15 +52,12 @@
./install/inc/overview/vm
./install/inc/router/clone
./install/inc/router/why_extra.inline
-./install/inc/router/why_two.inline
./install/inc/steps/create_persistence.inline
-./install/inc/steps/debian_requirements.inline
./install/inc/steps/download.inline
-./install/inc/steps/install_final.inline
-./install/inc/steps/install_intermediary_intro.inline
-./install/inc/steps/install_intermediary_outro.inline
+./install/inc/steps/clone.inline
+./install/inc/steps/install_with_etcher.inline
+./install/inc/steps/install_with_gnome_disks.inline
./install/inc/steps/mac_startup_disks.inline
-./install/inc/steps/not_at_all.inline
./install/inc/steps/restart_first_time.inline
./install/inc/steps/restart_second_time.inline
./install/inc/steps/verify_up-to-date.inline
@@ -75,9 +68,6 @@
./install/linux/usb-download
./install/mac/clone
./install/mac/clone-overview
-./install/mac/dvd
-./install/mac/dvd-overview
-./install/mac/dvd-download
./install/mac
./install/mac/usb
./install/mac/usb-overview
diff --git a/wiki/src/contribute/merge_policy/review.mdwn b/wiki/src/contribute/merge_policy/review.mdwn
index be8fd29..3b74023 100644
--- a/wiki/src/contribute/merge_policy/review.mdwn
+++ b/wiki/src/contribute/merge_policy/review.mdwn
@@ -28,7 +28,7 @@
to note the good parts, be constructive and precise in your
comments, and never use reviews to make personal attacks. You can
read these blog posts on review and feedback:
- - [Kate Heddleston: Criticism and ineffective feedback](blog post on how to do a good review](https://www.kateheddleston.com/blog/criticism-and-ineffective-feedback)
+ - [Kate Heddleston: Criticism and ineffective feedback](https://www.kateheddleston.com/blog/criticism-and-ineffective-feedback) (blog post on how to do a good review)
- [Liane Davey: Maybe you shouldn't give feedback](http://www.3coze.com/2016/07/17/bite-your-tongue/)
## Merge
diff --git a/wiki/src/contribute/release_process.mdwn b/wiki/src/contribute/release_process.mdwn
index 247a464..6b50149 100644
--- a/wiki/src/contribute/release_process.mdwn
+++ b/wiki/src/contribute/release_process.mdwn
@@ -37,8 +37,6 @@ the scripts snippets found on this page:
export PREVIOUS_VERSION=$(dpkg-parsechangelog --offset 1 --count 1 -SVersion)
export PREVIOUS_TAG=$(echo "${PREVIOUS_VERSION:?}" | sed -e 's,~,-,')
-* `NEXT_PLANNED_VERSION`: set to the version number of the next Tails release
- (e.g. 0.23 when releasing 0.22.1, and 1.3 when releasing 1.2)
* `NEXT_PLANNED_MAJOR_VERSION`: set to the version number of the next
*major* Tails release; if you're preparing a RC for a major release,
use that major release; otherwise, use whatever the next planned
@@ -318,12 +316,21 @@ Then, launch an editor for the needed cleanup of the result:
dch -e
+Changelog entries can be dispatched into those usual sections:
+
+ * Major changes
+ * Security fixes
+ * Bugfixes
+ * Minor improvements and updates
+ * Build system
+ * Test suite
+
Then, gather other useful information from:
* every custom bundled package's own Changelog (Greeter, Persistent
Volume Assistant, etc.);
* the diff between the previous version's `.packages` file and the one
- from the to-be-released ISO; look for:
+ from the to-be-released images; look for:
- security fixes
- new upstream releases of applications mentioned in [[doc/about/features]]
- new upstream releases of other important components such as the
@@ -362,7 +369,18 @@ matches the date of the future signature.
echo "${VERSION:?}" > wiki/src/inc/stable_amd64_version.html
echo -n "${RELEASE_DATE:?}" > wiki/src/inc/stable_amd64_date.html
- ${EDITOR:?} wiki/src/inc/*.html
+ for type in img iso; do
+ basename="tails-amd64-${VERSION:?}"
+ filename="${basename:?}.${type:?}"
+ echo "TZ=UTC gpg --no-options --keyid-format long --verify ${filename:?}.sig ${filename:?}" \
+ > wiki/src/inc/stable_amd64_${type:?}_gpg_verify.html && \
+ echo "http://dl.amnesia.boum.org/tails/stable/${basename:?}/${filename:?}" \
+ > wiki/src/inc/stable_amd64_${type:?}_url.html
+ echo "https://tails.boum.org/torrents/files/${filename:?}.sig" \
+ > wiki/src/inc/stable_amd64_${type:?}_sig_url.html
+ echo "https://tails.boum.org/torrents/files/${filename:?}.torrent" \
+ > wiki/src/inc/stable_amd64_${type:?}_torrent_url.html
+ done
./build-website
git commit wiki/src/inc/ -m "Update version and date for ${VERSION:?}."
@@ -432,10 +450,9 @@ signatures, like the defaults we set in Tails:
Build the almost-final image
============================
-1. [[Build an ISO image|contribute/build]] from the release branch.
+1. [[Build ISO and USB images|contribute/build]] from the release branch.
2. Carefully read the build logs to make sure nothing bad happened.
-3. Keep at least the resulting ISO image and the manifest of needed
- packages until the end of this release process.
+3. Keep the resulting build artifacts until the end of this release process.
4. Record where the manifest of needed packages is stored:
export PACKAGES_MANIFEST=XXX ; \
@@ -501,8 +518,8 @@ Better catch this before people spend time doing manual tests.
SquashFS file order
-------------------
-1. Burn the almost final ISO image to a DVD.
-1. Boot this DVD **on bare metal**.
+1. Install the almost final USB image to a USB stick.
+1. Boot this USB stick **on bare metal**.
1. Add `profile` to the kernel command-line.
1. Login.
1. Wait for the "Tor is ready" notification.
@@ -570,18 +587,18 @@ suite should be ready, so it is time to:
1. <a id="reproducibility-sanity-check-iso"></a>
- Let's sanity check that Jenkins reproduced your image.
+ Let's sanity check that Jenkins reproduced your images.
Visit the URL printed by this command:
echo "https://jenkins.tails.boum.org/job/build_Tails_ISO_${RELEASE_BRANCH}/"
Find the job (probably the last one)
- and make sure the image built by Jenkins:
+ and make sure the ISO and USB images built by Jenkins:
- - was built from the correct Git commit
- - has the same file size as the image you built
- - has the same hash (in the `.shasum` file) as the image you built
+ - were built from the correct Git commit
+ - have the same file size as the images you built
+ - have the same hash (in the `.shasum` file) as the images you built
Then:
@@ -604,6 +621,8 @@ suite should be ready, so it is time to:
path/to/your/tails-amd64-${VERSION:?}.iso \
path/to/jenkins/tails-amd64-${VERSION:?}.iso
+ Do the same for the USB image as well.
+
Then carefully investigate the `diffoscope` report:
- If you cannot rule out that the difference is harmful: let's take
@@ -646,7 +665,7 @@ suite should be ready, so it is time to:
git checkout -b "${WEBSITE_RELEASE_BRANCH:?}" "${TAG:?}" && \
git push -u origin "${WEBSITE_RELEASE_BRANCH:?}"
- (as soon as a new commit is created on `$RELEASE_BRANCH`, its ISO
+ (as soon as a new commit is created on `$RELEASE_BRANCH`, its
build will start failing until a new changelog entry is created,
which we don't want to do on `$RELEASE_BRANCH` before it's merged
into `master` at release time)
@@ -661,24 +680,28 @@ image and with a `.sig` extension), then go up to the parent
directory, create a `.torrent` file and check the generated `.torrent`
files metadata:
- mkdir "${ISOS:?}/tails-amd64-${VERSION:?}" && \
- cd "${ISOS:?}/tails-amd64-${VERSION:?}" && \
- mv "${ARTIFACTS:?}/tails-amd64-${VERSION:?}.iso" \
- "${ISOS:?}/tails-amd64-${VERSION:?}/" && \
- gpg --armor --default-key "${TAILS_SIGNATURE_KEY:?}" --detach-sign *.iso && \
- rename 's,\.asc$,.sig,' *.asc && \
- cd .. && \
- mktorrent \
- -a 'udp://tracker.torrent.eu.org:451' \
- -a 'udp://tracker.coppersurfer.tk:6969' \
- "tails-amd64-${VERSION:?}" && \
- transmission-show tails-amd64-${VERSION:?}.torrent
+ for type in iso img ; do
+ mkdir "${ISOS:?}/tails-amd64-${VERSION:?}.${type:?}" && \
+ cd "${ISOS:?}/tails-amd64-${VERSION:?}.${type:?}" && \
+ mv "${ARTIFACTS:?}/tails-amd64-${VERSION:?}.${type:?}" . && \
+ gpg --armor --default-key "${TAILS_SIGNATURE_KEY:?}" --detach-sign *".${type:?}" && \
+ rename 's,\.asc$,.sig,' *.asc && \
+ cd .. && \
+ mktorrent \
+ -a 'udp://tracker.torrent.eu.org:451' \
+ -a 'udp://tracker.coppersurfer.tk:6969' \
+ "tails-amd64-${VERSION:?}.${type:?}" && \
+ transmission-show tails-amd64-${VERSION:?}.${type:?}.torrent
+ done
Lastly, let's set some variables to be used later:
- ISO_PATH="${ISOS:?}/tails-amd64-${VERSION:?}/tails-amd64-${VERSION:?}.iso"
+ ISO_PATH="${ISOS:?}/tails-amd64-${VERSION:?}.iso/tails-amd64-${VERSION:?}.iso"
ISO_SHA256SUM="$(sha256sum "${ISO_PATH:?}" | cut -f 1 -d ' ' | tr -d '\n')"
ISO_SIZE_IN_BYTES="$(stat -c %s "${ISO_PATH:?}")"
+ IMG_PATH="${ISOS:?}/tails-amd64-${VERSION:?}.img/tails-amd64-${VERSION:?}.img"
+ IMG_SHA256SUM="$(sha256sum "${IMG_PATH:?}" | cut -f 1 -d ' ' | tr -d '\n')"
+ IMG_SIZE_IN_BYTES="$(stat -c %s "${IMG_PATH:?}")"
<a id="prepare-iuk"></a>
@@ -706,7 +729,7 @@ Use `tails-create-iuk` to build the following IUKs:
next version.
Include each such version in a white-space separated list called
-`IUK_SOURCE_VERSIONS`, (e.g. `IUK_SOURCE_VERSIONS="2.8 2.9 2.9.1 2.10~rc1"`)
+`IUK_SOURCE_VERSIONS`, (e.g. `IUK_SOURCE_VERSIONS="2.8 2.9 2.9.1 2.10~rc1"`), optionally setting `TMPDIR` to an existing absolute path where disk space is available,
and run the following:
for source_version in $(echo ${IUK_SOURCE_VERSIONS:?}); do
@@ -714,20 +737,23 @@ and run the following:
echo 'ERROR! Your squashfs-tools probably does not honor SOURCE_DATE_EPOCH so any generated IUKs will *not* be reproducible!'
break
fi
+ echo "Generating IUK file from ${source_version:?} to ${VERSION:?}"
sudo su -c "cd ${IUK_CHECKOUT:?} && \
SOURCE_DATE_EPOCH=$SOURCE_DATE_EPOCH \
LC_ALL=C \
+ TMPDIR=\"${TMPDIR:-/tmp}\" \
PERL5LIB=\"${PERL5LIB_CHECKOUT:?}/lib\" \
./bin/tails-create-iuk \
--squashfs-diff-name \"${VERSION:?}.squashfs\" \
- --old-iso \"${ISOS:?}/tails-amd64-${source_version:?}/tails-amd64-${source_version:?}.iso\" \
- --new-iso \"${ISOS:?}/tails-amd64-${VERSION:?}/tails-amd64-${VERSION:?}.iso\" \
+ --old-iso \"${ISOS:?}/tails-amd64-${source_version:?}.iso/tails-amd64-${source_version:?}.iso\" \
+ --new-iso \"${ISOS:?}/tails-amd64-${VERSION:?}.iso/tails-amd64-${VERSION:?}.iso\" \
--outfile \"${ISOS:?}/Tails_amd64_${source_version:?}_to_${VERSION:?}.iuk\""
done
Note that developer tools for creating IUK and upgrade-description
-files were only tested on Debian sid. It should hopefully work well on
-Debian stable too.
+files are primarily developed and tested on Debian sid. They may
+therefore occasionally be broken on Debian stable. As of December 2018
+they work fine on Debian Stretch.
<a id="reproducibility-sanity-check-iuk"></a>
@@ -801,6 +827,7 @@ Prepare upgrade-description files
1. Create an armoured detached signature for each created or modified
upgrade-description file.
+ cd "${RELEASE_CHECKOUT:?}" && \
find "${RELEASE_CHECKOUT:?}/wiki/src/upgrade/" \
-type f -name upgrades.yml | \
while read udf; do
@@ -836,6 +863,7 @@ Prepare upgrade-description files
( \
cd ${MASTER_CHECKOUT:?} && \
git fetch && \
+ git merge origin/master && \
for old_version in $(echo ${IUK_SOURCE_VERSIONS:?}); do
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" && \
@@ -872,8 +900,8 @@ Prepare upgrade-description files
)
-Prepare the ISO description file for *Tails Verification*
----------------------------------------------------------
+Prepare the image description file for *Tails Verification*
+-----------------------------------------------------------
If preparing a RC, skip this part.
@@ -882,20 +910,10 @@ Update the image description file (IDF) used by the browser extension:
./bin/idf-content \
--version "${VERSION:?}" \
--iso "${ISO_PATH:?}" \
+ --img "${IMG_PATH:?}" \
> "${RELEASE_CHECKOUT:?}"/wiki/src/install/v2/Tails/amd64/stable/latest.json && \
- cat > "${RELEASE_CHECKOUT:?}"/wiki/src/install/v1/Tails/amd64/stable/latest.yml <<EOF
- ---
- build-target: amd64
- channel: stable
- product-name: Tails
- version: '${VERSION:?}'
- target-files:
- - sha256: ${ISO_SHA256SUM}
- size: ${ISO_SIZE_IN_BYTES:?}
- url: http://dl.amnesia.boum.org/tails/stable/tails-amd64-${VERSION:?}/tails-amd64-${VERSION:?}.iso
- EOF
( cd "${RELEASE_CHECKOUT:?}" && \
- git add wiki/src/install/v{1,2}/Tails/amd64/stable/latest.* && \
+ git add wiki/src/install/v2/Tails/amd64/stable/latest.json && \
git commit -m "Update IDF file for Tails Verification." )
Done with OpenPGP signing
@@ -927,8 +945,8 @@ above).
<a id="publish-iuk"></a>
-Publish the ISO and IUKs over HTTP
-----------------------------------
+Publish the ISO, IMG, and IUKs over HTTP
+----------------------------------------
Upload the IUKs to our rsync server:
@@ -940,17 +958,17 @@ Upload the IUKs to our rsync server:
While waiting for the IUKs to be uploaded, you can proceed with the next steps.
-Upload the ISO signature to our rsync server:
+Upload the ISO and USB image signatures to our rsync server:
- scp "${ISO_PATH:?}.sig" rsync.lizard:
+ scp "${ISO_PATH:?}.sig" "${IMG_PATH:?}.sig" rsync.lizard:
-Pick a build from `$RELEASE_BRANCH` that produced an ISO identical to
-the one you've built locally (`XXX` must be the job ID, i.e.
+Pick a build from `$RELEASE_BRANCH` that produced identical ISO and USB images
+to the ones you've built locally (`XXX` must be the job ID, i.e.
an integer):
MATCHING_JENKINS_BUILD_ID=XXX
-Copy the ISO to our rsync server, verify its signature,
+Copy the ISO and USB images to our rsync server, verify their signature,
move them in place with proper ownership and permissions
and update the time in `project/trace` file on our rsync server
and on the live website (even for a release candidate):
@@ -959,16 +977,18 @@ and on the live website (even for a release candidate):
| ssh rsync.lizard gpg --import
ssh rsync.lizard << EOF
wget \
- "https://nightly.tails.boum.org/build_Tails_ISO_${RELEASE_BRANCH:?}/builds/${MATCHING_JENKINS_BUILD_ID:?}/archive/build-artifacts/tails-amd64-${VERSION:?}.iso" && \
- gpg --verify tails-amd64-${VERSION:?}.iso{.sig,}
+ "https://nightly.tails.boum.org/build_Tails_ISO_${RELEASE_BRANCH:?}/builds/${MATCHING_JENKINS_BUILD_ID:?}/archive/build-artifacts/tails-amd64-${VERSION:?}.iso" \
+ "https://nightly.tails.boum.org/build_Tails_ISO_${RELEASE_BRANCH:?}/builds/${MATCHING_JENKINS_BUILD_ID:?}/archive/build-artifacts/tails-amd64-${VERSION:?}.img" && \
+ gpg --verify tails-amd64-${VERSION:?}.iso{.sig,} && \
+ gpg --verify tails-amd64-${VERSION:?}.img{.sig,}
EOF
ssh rsync.lizard << EOF
sudo install -o root -g rsync_tails -m 0755 -d \
/srv/rsync/tails/tails/${DIST:?}/tails-amd64-${VERSION:?} && \
- sudo chown root:rsync_tails tails-amd64-${VERSION:?}.iso* && \
- sudo chmod u=rwX,go=rX tails-amd64-${VERSION:?}.iso* && \
- sudo mv tails-amd64-${VERSION:?}.iso* \
+ sudo chown root:rsync_tails tails-amd64-${VERSION:?}.{iso,img}* && \
+ sudo chmod u=rwX,go=rX tails-amd64-${VERSION:?}.{iso,img}* && \
+ sudo mv tails-amd64-${VERSION:?}.{iso,img}* \
/srv/rsync/tails/tails/${DIST:?}/tails-amd64-${VERSION:?}
EOF
@@ -1009,7 +1029,7 @@ candidate):
## Announce, seed and test the Torrent
Check if there's enough space on our Bittorrent seed to import the new
-ISO:
+ISO and USB images:
ssh bittorrent.lizard df -h /var/lib/transmission-daemon/downloads
@@ -1029,51 +1049,54 @@ Now you can announce and seed the Torrent for the release you're preparing:
cat "${RELEASE_CHECKOUT:?}/wiki/src/tails-signing.key" \
| ssh bittorrent.lizard gpg --import
- scp \
- "${ISOS:?}/tails-amd64-${VERSION:?}.torrent" \
- "${ISO_PATH:?}.sig" \
- bittorrent.lizard: && \
- ssh bittorrent.lizard << EOF
- mkdir --mode 0755 "tails-amd64-${VERSION:?}" && \
- mv "tails-amd64-${VERSION:?}.iso.sig" \
- "tails-amd64-${VERSION:?}/" && \
- cd "tails-amd64-${VERSION:?}" && \
- wget \
- "https://nightly.tails.boum.org/build_Tails_ISO_${RELEASE_BRANCH:?}/builds/${MATCHING_JENKINS_BUILD_ID:?}/archive/build-artifacts/tails-amd64-${VERSION:?}.iso" && \
- gpg --verify tails-amd64-${VERSION:?}.iso{.sig,} && \
- cd && \
- chgrp -R debian-transmission "tails-amd64-${VERSION:?}" && \
- chmod -R go+rX,g+w "tails-amd64-${VERSION:?}" && \
- mv \
- "tails-amd64-${VERSION:?}" \
- /var/lib/transmission-daemon/downloads/ && \
- transmission-remote --add tails-amd64-${VERSION:?}.torrent \
- --find /var/lib/transmission-daemon/downloads/
+ for type in iso img ; do
+ image_filename="tails-amd64-${VERSION:?}.${type:?}"
+ scp \
+ "${ISOS:?}/${image_filename:?}.torrent" \
+ "${ISOS:?}/${image_filename:?}/${image_filename:?}.sig" \
+ bittorrent.lizard: && \
+ ssh bittorrent.lizard << EOF
+ mkdir --mode 0755 "${image_filename:?}" && \
+ mv "${image_filename:?}.sig" \
+ "${image_filename:?}/" && \
+ cd "${image_filename:?}" && \
+ wget \
+ "https://nightly.tails.boum.org/build_Tails_ISO_${RELEASE_BRANCH:?}/builds/${MATCHING_JENKINS_BUILD_ID:?}/archive/build-artifacts/${image_filename:?}" && \
+ gpg --verify ${image_filename:?}{.sig,} && \
+ cd && \
+ chgrp -R debian-transmission "${image_filename:?}" && \
+ chmod -R go+rX,g+w "${image_filename:?}" && \
+ mv \
+ "${image_filename:?}" \
+ /var/lib/transmission-daemon/downloads/ && \
+ transmission-remote --add ${image_filename:?}.torrent \
+ --find /var/lib/transmission-daemon/downloads/
EOF
+ done
-Test that you can start downloading the ISO with a BitTorrent client.
+Test that you can start downloading the ISO and USB images with a BitTorrent client.
ISO history
-----------
-Push the released ISO and its artifacts (`.iso.buildlog`, `.build-manifest`, and `.packages` files) to our Tails ISO history git-annex repo, so that
-our isotesters can fetch it from there for their testing. How to do so
+Push the released ISO and USB images and their artifacts (`.buildlog`, `.build-manifest`, and `.packages` files) to our Tails ISO history git-annex repo, so that
+our isotesters can fetch them from there for their testing. How to do so
is described in the `ISO_history.mdwn` document in the RM team's Git repo.
Testing
=======
1. Using `check-mirrors`, choose a fast mirror that already has the
- tentative ISO. E.g. <https://mirrors.kernel.org/tails/> or
+ tentative ISO and USB images. E.g. <https://mirrors.kernel.org/tails/> or
<https://mirrors.wikimedia.org/tails/> are reliable and have plenty
of bandwidth.
- ./check-mirrors.rb --allow-multiple --channel ${DIST:?} \
+ ./check-mirrors.rb --allow-multiple --fast --channel ${DIST:?} \
--ip $(dig +short mirrors.kernel.org | tail -n1) \
tails-amd64-${VERSION:?}
1. Email <tails-testers@boum.org> to ask them to test the tentative
- ISO, pointing them to the up-to-date mirror you've found previously.
+ ISO and USB images, pointing them to the up-to-date mirror you've found previously.
1. Email <tails@boum.org> and potential contributors (see
`manual_testers.mdwn` in the internal Git repository) that tests
may start:
@@ -1086,8 +1109,9 @@ Testing
1. Make sure that enough people are here to run the tests, that they
report their results in due time, and that they make it clear when
they're leaving for good.
-1. Fill the holes and make sure that the manual test suite is done in
- due time.
+1. Fill the holes and make sure that the automated and manual test
+ suites are done in due time. Clock and report this work separately
+ from your RM'ing work.
1. Triage test results, reproduce bugs as needed, decide what the next
step is and make sure it happens: add to known issues? file ticket?
release blocker? improve the test description (steps, expected outcome)?
@@ -1109,19 +1133,26 @@ Skip this part if preparing a RC.
Rename, copy, garbage collect and update various files:
cp "${ISO_PATH:?}.sig" \
+ "${IMG_PATH:?}.sig" \
"${ARTIFACTS:?}/tails-amd64-${VERSION:?}.build-manifest" \
"${ARTIFACTS:?}/tails-amd64-${VERSION:?}.packages" \
- "${ISOS:?}/tails-amd64-${VERSION:?}.torrent" \
+ "${ISOS:?}/tails-amd64-${VERSION:?}".{iso,img}.torrent \
"${RELEASE_CHECKOUT:?}/wiki/src/torrents/files/" && \
git rm \
- "${RELEASE_CHECKOUT:?}/wiki/src/torrents/files/tails-amd64-${PREVIOUS_VERSION:?}."{build-manifest,iso.sig,packages,torrent} && \
+ "${RELEASE_CHECKOUT:?}/wiki/src/torrents/files/tails-amd64-${PREVIOUS_VERSION:?}."{build-manifest,iso.sig,img.sig,packages,iso.torrent,img.torrent} && \
LC_NUMERIC=C ls -l -h ${ISO_PATH:?} | \
cut -f 5 -d ' ' | sed -r 's/(.+)([MG])/\1 \2B/' \
> "${RELEASE_CHECKOUT:?}/wiki/src/inc/stable_amd64_iso_size.html" && \
+ LC_NUMERIC=C ls -l -h ${IMG_PATH:?} | \
+ cut -f 5 -d ' ' | sed -r 's/(.+)([MG])/\1 \2B/' \
+ > "${RELEASE_CHECKOUT:?}/wiki/src/inc/stable_amd64_img_size.html" && \
gpg --check-trustdb && \
LANG=C TZ=UTC gpg --no-options --keyid-format long --verify "${ISO_PATH:?}.sig" "${ISO_PATH:?}" 2>&1 | \
sed 's/ /\&nbsp;/g;s/</\&lt;/;s/>/\&gt;/;s/$/<br\/>/g' > \
- "${RELEASE_CHECKOUT:?}/wiki/src/inc/stable_amd64_gpg_signature_output.html"
+ "${RELEASE_CHECKOUT:?}/wiki/src/inc/stable_amd64_iso_gpg_signature_output.html" && \
+ LANG=C TZ=UTC gpg --no-options --keyid-format long --verify "${IMG_PATH:?}.sig" "${IMG_PATH:?}" 2>&1 | \
+ sed 's/ /\&nbsp;/g;s/</\&lt;/;s/>/\&gt;/;s/$/<br\/>/g' > \
+ "${RELEASE_CHECKOUT:?}/wiki/src/inc/stable_amd64_img_gpg_signature_output.html"
Ensure our [[contribute/working_together/roles/technical_writer]] has
[[written|contribute/how/documentation/release_notes]] the
@@ -1131,8 +1162,8 @@ Write an announcement listing the security bugs affecting the previous
version in
`wiki/src/security/Numerous_security_holes_in_${PREVIOUS_VERSION:?}.mdwn`
in order to let the users of the old versions
-know that they have to upgrade. Date it a few days before the ISO
-image to be released was *built*. Including:
+know that they have to upgrade. Date it a few days before the
+images to be released were *built*. Including:
- if we are not shipping Linux from Debian stable, the list of
CVE fixed in Linux since the one shipped in the previous release of
@@ -1153,11 +1184,12 @@ If preparing a release candidate
Skip this part if preparing a final release.
-Copy the signature and the Torrent into the website repository:
+Copy the signatures and the Torrent into the website repository:
cp "${ISO_PATH:?}.sig" \
- "${ISOS:?}/tails-amd64-${VERSION:?}.torrent" \
- "${RELEASE_CHECKOUT:?}/wiki/src/torrents/files/"
+ "${IMG_PATH:?}.sig" \
+ "${ISOS:?}/tails-amd64-${VERSION:?}".{iso,img}.torrent \
+ "${RELEASE_CHECKOUT:?}/wiki/src/torrents/files/"
Write the announcement for the release in
`${RELEASE_CHECKOUT:?}/wiki/src/news/test_${TAG:?}.mdwn`, including:
@@ -1195,7 +1227,7 @@ Go wild!
Wait for the HTTP mirrors to catch up
-------------------------------------
-Test downloading the ISO and IUK over HTTP.
+Test downloading the ISO, USB image, and IUK over HTTP.
Make sure every active mirror in the pool has the new version:
@@ -1370,7 +1402,7 @@ Amnesia news
The release announcement are automatically sent to `amnesia-news@`
(thanks to the `announce` flag) on an hourly basis, but it will be
stuck in the moderation
-queue. [Log in](https://mailman.boum.org/admindb/amnesia-news) and
+queue. [Log in](https://www.autistici.org/mailman/admindb/amnesia-news) and
accept it.
Prepare for the next development cycle
@@ -1431,8 +1463,9 @@ this, and skip what does not make sense for a RC.
--repo "${bare_repo:?}" && \
rm -rf "${bare_repo:?}"
-1. Remove all old versions in `wiki/src/upgrade/v1/Tails` and
- `debian/changelog` that were never released. Explanation: the
+1. On the `stable` and `devel` branches, remove all old versions in
+ that were never released from `wiki/src/upgrade/v1/Tails` and
+ `debian/changelog`. Explanation: the
post-release APT repository steps from the previous stable release
will usually have had us prepare for an emergency release that was
never made.
diff --git a/wiki/src/contribute/release_process/persistence-setup.mdwn b/wiki/src/contribute/release_process/persistence-setup.mdwn
index 25a6664..42127c4 100644
--- a/wiki/src/contribute/release_process/persistence-setup.mdwn
+++ b/wiki/src/contribute/release_process/persistence-setup.mdwn
@@ -16,7 +16,9 @@ Install build and test dependencies
sudo apt install \
devscripts \
dh-make-perl \
- libdist-zilla-app-command-authordebs-perl && \
+ libdist-zilla-app-command-authordebs-perl \
+ libfunction-parameters-perl \
+ libuuid-tiny-perl && \
dzil authordebs --install && \
git checkout debian && \
mk-build-deps -i -r --root-cmd sudo
@@ -75,7 +77,7 @@ Update `debian/changelog`:
Commit `debian/changelog`:
git commit debian/changelog \
- -m "$(echo "$(dpkg-parsechangelog -SSource) ($(dpkg-parsechangelog -SVersion))\n\nGit-Dch: Ignore\n")"
+ -m "$(echo -e "$(dpkg-parsechangelog -SSource) ($(dpkg-parsechangelog -SVersion))\n\nGit-Dch: Ignore\n")"
Build a Debian package (use a Stretch/amd64 chroot, that has
`stretch-backports` enabled and on top of that: either tails-perl5lib
diff --git a/wiki/src/contribute/release_process/tails-iuk.mdwn b/wiki/src/contribute/release_process/tails-iuk.mdwn
index d9bb326..507febc 100644
--- a/wiki/src/contribute/release_process/tails-iuk.mdwn
+++ b/wiki/src/contribute/release_process/tails-iuk.mdwn
@@ -31,8 +31,8 @@ Update POT and PO files
=======================
git checkout master && \
- "${RELEASE_CHECKOUT:?}"/import-translations && \
- "${RELEASE_CHECKOUT:?}"/submodules/jenkins-tools/slaves/check_po && \
+ "${TAILS_GIT_CHECKOUT:?}"/import-translations && \
+ "${TAILS_GIT_CHECKOUT:?}"/submodules/jenkins-tools/slaves/check_po && \
git add po && \
git commit -m 'Update POT and PO files, pull updated translations from Transifex.'
@@ -100,7 +100,7 @@ and then update `debian/changelog` again if needed.
Commit `debian/changelog`:
git commit debian/changelog \
- -m "$(echo "$(dpkg-parsechangelog -SSource) ($(dpkg-parsechangelog -SVersion))\n\nGit-Dch: Ignore\n")"
+ -m "$(echo -e "$(dpkg-parsechangelog -SSource) ($(dpkg-parsechangelog -SVersion))\n\nGit-Dch: Ignore\n")"
Build a Debian package (use a Stretch/amd64 chroot, that has
`stretch-backports` enabled and on top of that: either tails-perl5lib
diff --git a/wiki/src/contribute/release_process/test.mdwn b/wiki/src/contribute/release_process/test.mdwn
index 8c7253d..46373fa 100644
--- a/wiki/src/contribute/release_process/test.mdwn
+++ b/wiki/src/contribute/release_process/test.mdwn
@@ -18,19 +18,19 @@ many safeguards against releasing crap.
Compare the to-be-released source code with previous version's one e.g.:
-Boot the candidate ISO and find the commit it was build from with the
+Boot the candidate image and find the commit it was build from with the
`tails-version` command.
Then, from the source tree, see the diff:
- git diff --find-renames <old ISO commit>..<ISO commit>
+ git diff --find-renames <old image commit>..<candidate image commit>
e.g. `git diff --find-renames 334e1c485a3a79be9fff899d4dc9d2db89cdc9e1..cfbde80925fdd0af008f10bc90c8a91a578c58e3`
## Result
Compare the list of bundled packages and versions with the one shipped last
-time. `.packages` are usually attached to the email announcing the ISO is ready.
+time. `.packages` are usually attached to the email announcing the image is ready.
/usr/bin/diff -u \
wiki/src/torrents/files/tails-amd64-3.1.packages \
@@ -48,11 +48,12 @@ Check the output for:
## Image size
-Check the image size has not changed much since the last release.
+Check the images size has not changed much since the last release.
-In a directory with many Tails ISO images:
+In a directory with many Tails ISO and USB images:
- find -iname "tails*.iso" -exec ls -lh '{}' \; | sort -rhk 5
+ find \( -iname "tails*.iso" -o -iname "tails*.img" \) \
+ -type f -exec ls -l --block-size=M '{}' \; | sort -rhk 5
<a id="reproducibility-final-check"></a>
@@ -60,31 +61,46 @@ In a directory with many Tails ISO images:
This section can **not** be done by the RM.
-1. Download the ISO and all the
- [IUKs](https://mirrors.wikimedia.org/tails/stable/iuk/) that
- upgrade to the version you are testing.
+1. Download the ISO and USB images.
-2. Clear-sign the hashes of all products using your OpenPGP key:
+2. Clear-sign the hashes of all products using your OpenPGP key
+ and gzip the output (otherwise the signed text could be mangled
+ at some point in the email chain):
- sha512sum tails-amd64-${VERSION:?}/tails-amd64-${VERSION:?}.iso \
- | gpg --clear-sign
+ DEST_DIR=$(mktemp -d)
+ sha512sum *.iso *.img \
+ | gpg --clear-sign \
+ | gzip \
+ > "$DEST_DIR/TR-bits.gz"
-3. Send the output of the previous command to the _Trusted Reproducer_,
- whose name is on the
+3. Locate the file generated by the command above. To display its location,
+ execute the following command:
+
+ echo "$DEST_DIR/TR-bits.gz"
+
+4. Send the aforementioned generated file as an attachment
+ to the _Trusted Reproducer_, whose name is on the
[release calendar](https://tails.boum.org/contribute/calendar/).
+5. If the _Trusted Reproducer_ is around, ask them:
+
+ - if they've received your email
+ - if they could successfully decompress the attachment
+ - if they could check the inline signature of the attachment once decompressed
+ - if the signed text contains all the information they need
+
# Automated test suite
Our long term goal is to eliminate the manual test suite (except the
parts which require real hardware) and have the automated test suite
-run all our tests. It's design, and how to write new tests, are
+run all our tests. Its design, and how to write new tests, are
documented on a [[dedicated page|test/automated_tests]].
## Running the automated test suite
See [[test/setup]] and [[test/usage]].
-Do point `--old-iso` to the ISO of the previous stable release.
+Do point `--old-iso` to the ISO image of the previous stable release.
## Automated test suite migration progress
@@ -100,7 +116,7 @@ tracked by tickets prefixed with `todo/test_suite:`.
* Test if _uBlock_ works:
- The _uBlock_ icon must be visible.
- - Visit a website that normally displays ads, such is
+ - Visit a website that normally displays ads, such as
<https://www.nytimes.com/>. The ads should not be displayed and
the uBlock icon should display a strictly positive number of
blocked elements.
@@ -131,7 +147,7 @@ tracked by tickets prefixed with `todo/test_suite:`.
- <http://mozilla.github.io/webrtc-landing/>, especially the `getUserMedia`
test. It's expected that the audio test works if you agree to share a
microphone with the remote website; anything else should fail.
- - <http://net.ipcalf.com/> should display
+ - <http://net.ipcalf.com/> should display _literally_
`ifconfig | grep inet | grep -v inet6 | cut -d" " -f2 | tail -n1`
* The content of `/etc/default/htpdate.user-agent` should match should produce
the User-Agent used in the Tor Browser. (automate: [[!tails_ticket 10268]])
@@ -152,7 +168,7 @@ tracked by tickets prefixed with `todo/test_suite:`.
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.
+ `Received:` ones.
* Also check that the EHLO/HELO SMTP message is not leaking anything
at the application level:
1. Start Thunderbird using the GNOME Applications menu.
@@ -185,7 +201,7 @@ tracked by tickets prefixed with `todo/test_suite:`.
# Root access control
-* Check you cannot login as root with `su` neither with the `amnesia` password nor
+* Check you cannot login as root with `/bin/su` neither with the `amnesia` password nor
with the `live` one. (automate: [[!tails_ticket 10274]])
# Virtualization support
@@ -234,8 +250,9 @@ tracked by tickets prefixed with `todo/test_suite:`.
then:
- echo 'TAILS_CHANNEL="test"' | sudo tee --append /etc/os-release && \
- tails-upgrade-frontend-wrapper
+ sudo sh -c 'sed -i /^TAILS_CHANNEL=/d /etc/os-release &&
+ echo TAILS_CHANNEL=\"test\" >> /etc/os-release' && \
+ tails-upgrade-frontend-wrapper --no-wait
Else, use a local test setup:
@@ -260,7 +277,7 @@ tracked by tickets prefixed with `todo/test_suite:`.
-e 's,/usr/bin/tails-upgrade-frontend ""$,/usr/bin/tails-upgrade-frontend,' \
/etc/sudoers.d/zzz_upgrade
- * Call the upgrader must be called, from inside the system to upgrade,
+ * Run the upgrader. It must be called, from inside the system to upgrade,
with every needed option to use the local web server rather than the
online one, for example:
@@ -274,11 +291,11 @@ tracked by tickets prefixed with `todo/test_suite:`.
# Tails Verification
-* The goal is is to check that *Tails Verification* works in *Tor
+* The goal is to check that *Tails Verification* works in *Tor
Browser* in the version of Tails we are testing here. *Tails
Verification* only supports verifying the current release so for
- example, when doing tests for the Tails 3.9 release, we use it in
- the tentative Tails 3.9 to verify the Tails 3.8 ISO image.
+ example, when doing tests for the Tails 3.13 release, we use it in
+ the tentative Tails 3.13 to verify the Tails 3.12 ISO and USB images.
1. Start the Tails that you are testing.
@@ -298,6 +315,8 @@ tracked by tickets prefixed with `todo/test_suite:`.
7. The verification should be successful.
+ 8. Repeat for the USB image.
+
# Real (non-VM) hardware
`[can't-automate]`
diff --git a/wiki/src/contribute/release_process/test/automated_tests.mdwn b/wiki/src/contribute/release_process/test/automated_tests.mdwn
index fef9ecb..933f913 100644
--- a/wiki/src/contribute/release_process/test/automated_tests.mdwn
+++ b/wiki/src/contribute/release_process/test/automated_tests.mdwn
@@ -89,7 +89,7 @@ sets the correct environment up:
This started out as a hack, and while it has evolved it largely
remains so. A proper, reliable, established replacement would be
-welcome, but seems unlikely given the requirements:
+welcome, but seems unlikely given the requirements.
Requirements on the host (the remote shell client):
@@ -269,7 +269,7 @@ make note of:
`:temporary` field is set to `true`, then the snapshot
will be cleared after the feature it was created in finishes. This
is a way to reduce the disk space needed for running the test suite,
- and is encouraged to use for features where a very perticular state
+ and is encouraged to use for features where a very particular state
is set up, that isn't reused in any other feature.
* Debugging snapshot creation is made a lot easier by enabling the
@@ -285,7 +285,7 @@ feature for a simple example of how to do it.
### The tools and some guidelines for their usage
-In essense, the tools we have for interacting with the Tails instance
+In essence, the tools we have for interacting with the Tails instance
are:
* the VM helper class,
@@ -319,7 +319,7 @@ The remote shell:
depending on user interaction (which should use Sikuli!).
* It is acceptable (but not encouraged) to use the remote shell for
simulating user terminal interaction when we need to analyze the
- commands output. This is because of Sikuli's OCR capabilities are
+ commands output. This is because Sikuli's OCR capabilities are
poor, and cannot be depended on.
# Limitations and issues
@@ -340,7 +340,7 @@ The remote shells have a few surprises in store:
These are the currently known oddities of the remote shell, but there
may be more, so beware, and make sure to verify that any commands sent
-through it does what you want them to do.
+through it do what you want them to do.
### Remote shell instability
@@ -362,7 +362,7 @@ When creating snapshots, anything stored in a variable in any of those
steps will only be available in subsequent steps in that scenario, not
in other scenarios restoring from that snapshot. The exception is when
global variables are used, which is an acceptable workaround, but it
-requires minute control to get right, and is hard to follow. Please
+is very hard to get right, and to follow. Please
try to avoid this until [[!tails_ticket 5847]] is solved.
## Disabling scenarios that are known to fail
diff --git a/wiki/src/contribute/release_process/test/reproducibility.mdwn b/wiki/src/contribute/release_process/test/reproducibility.mdwn
index 59837ac..9f26382 100644
--- a/wiki/src/contribute/release_process/test/reproducibility.mdwn
+++ b/wiki/src/contribute/release_process/test/reproducibility.mdwn
@@ -80,7 +80,7 @@ called `SHA512SUMS.txt`.
Set these environment variables accordingly:
-* `ISOS_CHECKOUT`: path to your Tails ISO history repo checout.
+* `ISOS_CHECKOUT`: path to your Tails ISO history repo checkout.
<!-- * `PACKAGES_FILE="${ISOS:?}/tails-amd64-${VERSION:?}/tails-amd64-${VERSION:?}.iso.packages"` -->
* `PUBLISHED_ARTIFACTS`: some _new_ directory where you can download
gigabytes of data to.
@@ -95,11 +95,11 @@ Set these environment variables accordingly:
TAG_COMMIT="$(git rev-parse --verify ${TAG:?})" && \
git fetch && \
git checkout "${RELEASE_BRANCH:?}" && \
- git merge "origin/${RELEASE_BRANCH:?}" && \
+ git merge "origin/${RELEASE_BRANCH:?}"
# Build your own products
-## Build your own ISO image
+## Build your own images
1. Fetch and verify the Git tag:
@@ -113,7 +113,7 @@ Set these environment variables accordingly:
contact the RM and <tails@boum.org>! Proceeding with the rest of the steps
are pointless in this case, so await instruction.
-2. Build an ISO image:
+2. Build ISO and USB images:
cd "${TAILS_CHECKOUT:?}" && \
git checkout "${TAG:?}" && \
@@ -121,7 +121,7 @@ Set these environment variables accordingly:
export SOURCE_DATE_EPOCH=$(date --utc --date="$(dpkg-parsechangelog --show-field=Date)" '+%s') && \
rake build && \
mkdir "${ISOS:?}/tails-amd64-${VERSION:?}" && \
- mv "${ARTIFACTS:?}/tails-amd64-${VERSION:?}.iso*" \
+ mv "${ARTIFACTS:?}/tails-amd64-${VERSION:?}.*" \
"${ISOS:?}/tails-amd64-${VERSION:?}/"
<!-- ## Build your own IUKs -->
@@ -169,7 +169,7 @@ potentially reporting multiple different issues.
## Verify that your products match what was tested
- cd "${ISOS:?}" && \
+ cd "${ISOS:?}/tails-amd64-${VERSION:?}" && \
sha512sum -c "${SHA512SUMS:?}"
## Wait for the release to be published
@@ -183,22 +183,50 @@ the following steps have to be done only after the release has been made public.
cd "${PUBLISHED_ARTIFACTS:?}" && \
mkdir tails-amd64-${VERSION:?} && \
cd tails-amd64-${VERSION:?} && \
- wget http://dl.amnesia.boum.org/tails/${DIST:?}/tails-amd64-${VERSION:?}/tails-amd64-${VERSION:?}.iso && \
+ wget http://dl.amnesia.boum.org/tails/${DIST:?}/tails-amd64-${VERSION:?}/tails-amd64-${VERSION:?}.{img,iso}
## Verify that your products match what was published
-### ISO
+### ISO and USB images
- cd "${PUBLISHED_ARTIFACTS:?}" && \
+ cd "${PUBLISHED_ARTIFACTS:?}/tails-amd64-${VERSION:?}" && \
sha512sum -c "${SHA512SUMS:?}"
### IDF
-Examine the IDF by running:
+Download the IDF by running:
wget https://tails.boum.org/install/v2/Tails/amd64/${DIST:?}/latest.json
-and checking that the hashes and sizes match what you have built.
+Then check that the hashes and sizes match what you have built:
+
+ sudo apt install jq && \
+ for type in iso usb ; do
+ published_dir="${PUBLISHED_ARTIFACTS:?}/tails-amd64-${VERSION:?}"
+ case "$type" in
+ iso)
+ ext=iso
+ ;;
+ usb)
+ ext=img
+ ;;
+ esac
+ published_file="${published_dir}/tails-amd64-${VERSION:?}.$ext"
+ idf_size=$(cat latest.json | jq ".installations[0].\"installation-paths\" | map(select(.type == \"$ext\"))[0].\"target-files\"[0].size")
+ published_size=$(stat --format='%s' "$published_file")
+ if [ "$idf_size" = "$published_size" ]; then
+ echo "OK: $type size matches"
+ else
+ echo "FAIL: $type size does not match"
+ fi
+ idf_sha256=$(cat latest.json | jq --raw-output ".installations[0].\"installation-paths\" | map(select(.type == \"$ext\"))[0].\"target-files\"[0].sha256")
+ published_sha256=$(sha256sum "$published_file" | cut -f 1 -d ' ' | tr -d '\n')
+ if [ "$idf_sha256" = "$published_sha256" ]; then
+ echo "OK: $type sha256 matches"
+ else
+ echo "FAIL: $type sha256 does not match"
+ fi
+ done
<!-- ### UDFs -->
diff --git a/wiki/src/contribute/release_process/test/setup.mdwn b/wiki/src/contribute/release_process/test/setup.mdwn
index 2d9a1e6..6e711f4 100644
--- a/wiki/src/contribute/release_process/test/setup.mdwn
+++ b/wiki/src/contribute/release_process/test/setup.mdwn
@@ -13,8 +13,7 @@ Install dependencies
First of all, one needs a Debian Stretch system with:
- * the `non-free` APT component enabled;
- * the official backports repository configured.
+ * the `non-free` APT component enabled.
The following packages are necessary on Debian Stretch:
@@ -97,6 +96,22 @@ If you have AppArmor enabled:
If you use a custom `TMPDIR` to run the test suite,
replace `/tmp/TailsToaster` with the value of that `$TMPDIR`.
+Known issues
+============
+
+## System under test freezes when creating a persistent volume
+
+If the host system runs Debian Stretch, due to [[!tails_ticket 12142]]
+aka. [[!debbug 851694]], any test scenario that creates a persistent
+volume will fail. To work around this problem, rebuild [[!debpts
+qemu]] locally with the upstream fix applied. For example, the `qemu`
+source package in this APT suite has the fix:
+
+ deb-src http://deb.tails.boum.org/ isotester-stretch main
+
+This problem does not affect host systems that run Debian Buster
+or newer.
+
Special use cases
=================
diff --git a/wiki/src/contribute/release_process/tor-browser_AppArmor_patch.mdwn b/wiki/src/contribute/release_process/tor-browser_AppArmor_patch.mdwn
index b4e9308..6ad3fc2 100644
--- a/wiki/src/contribute/release_process/tor-browser_AppArmor_patch.mdwn
+++ b/wiki/src/contribute/release_process/tor-browser_AppArmor_patch.mdwn
@@ -1,17 +1,13 @@
-[[!meta title="Upstream our changes to Tor Browser's AppArmor policy"]]
+[[!meta title="Update Tor Browser's AppArmor policy and upstream our changes"]]
# Preparation (first time)
-If you don't have our `torbrowser-launcher` Git repo, clone it:
-
- git clone tails@git.tails.boum.org:torbrowser-launcher
-
-and add a remote for Debian, which is our immediate upstream:
-
- git remote add debian https://anonscm.debian.org/git/pkg-privacy/packages/torbrowser-launcher.git
-
-and add a remote for the final upstream:
+If you don't have our `torbrowser-launcher` Git repo, clone it
+and add a remote for upstream and Debian:
+ git clone tails@git.tails.boum.org:torbrowser-launcher &&
+ cd torbrowser-launcher && \
+ git remote add salsa https://salsa.debian.org/pkg-privacy-team/torbrowser-launcher.git && \
git remote add upstream-repo https://github.com/micahflee/torbrowser-launcher
# Make our repo up-to-date
@@ -20,17 +16,42 @@ Fetch:
git checkout master && \
git pull && \
- git fetch debian && \
+ git fetch salsa && \
git fetch upstream-repo
-Finally, make our repo up-to-date:
+Compute the last version uploaded to Debian unstable:
LATEST_TAG="$(git tag --list 'debian/*' --sort=version:refname | grep -v -E '_bpo[0-9]' | tail -n1)"
- git merge --no-ff "${LATEST_TAG}"
-Just pay attention that you didn't merge some unwanted version from
+… and make sure it is not an unwanted version from
Debian experimental!
+Then update our own branch:
+
+ git checkout debian/sid && \
+ git reset --hard "${LATEST_TAG}" && \
+ gbp pq drop && \
+ gbp pq import && \
+ git checkout master && \
+ git merge --no-ff patch-queue/debian/sid
+
+If needed, resolve merge conflicts and commit.
+
+Finally, make sure the diff looks OK:
+
+ git diff ORIG_HEAD.. -- apparmor/
+
+# Export the diff to the main Tails Git repository
+
+ git diff \
+ --relative=apparmor \
+ --src-prefix=a/etc/apparmor.d/ \
+ --dst-prefix=b/etc/apparmor.d/ \
+ patch-queue/debian/sid.. \
+ -- \
+ apparmor \
+ > ~/path/to/your/tails/git/config/chroot_local-includes/usr/share/tails/torbrowser-AppArmor-profile.patch
+
# Prepare a branch for upstream
Prepare a branch, e.g.:
diff --git a/wiki/src/contribute/working_together/roles/foundations_team.mdwn b/wiki/src/contribute/working_together/roles/foundations_team.mdwn
index 94322da..100312f 100644
--- a/wiki/src/contribute/working_together/roles/foundations_team.mdwn
+++ b/wiki/src/contribute/working_together/roles/foundations_team.mdwn
@@ -45,7 +45,9 @@ The Tails Foundations Team is responsible for:
sponsor deliverables), leading this discussion to a conclusion,
updating the [[contribute/calendar]] accordingly, and asking
<tails-rm@boum.org> to decide between themselves how they will share
- the [[roles/release_manager]] shifts;
+ the [[roles/release_manager]] shifts; things to keep in mind:
+
+ - An emergency release is often needed shortly after [[!wikipedia Pwn2Own]].
* reviewing'n'merging proposed branches in a timely manner (1 week in
general, up to 2 weeks if needed in exceptional cases). If a ticket
diff --git a/wiki/src/contribute/working_together/roles/help_desk.mdwn b/wiki/src/contribute/working_together/roles/help_desk.mdwn
index 44e5843..286870f 100644
--- a/wiki/src/contribute/working_together/roles/help_desk.mdwn
+++ b/wiki/src/contribute/working_together/roles/help_desk.mdwn
@@ -52,8 +52,8 @@ General communication watchdog
a Foundations Team member. An Atom feed is available for easier
monitoring, see the link at the bottom of that page.
- Administer and moderate our general purpose public mailing lists:
- - [tails-dev@boum.org](https://mailman.boum.org/admin/tails-dev)
- - [tails-l10n@boum.org](https://mailman.boum.org/admin/tails-l10n)
- - [tails-project@boum.org](https://mailman.boum.org/admin/tails-project)
- - [tails-testers@boum.org](https://mailman.boum.org/admin/tails-testers)
- - [tails-ux@boum.org](https://mailman.boum.org/admin/tails-ux)
+ - [tails-dev@boum.org](https://www.autistici.org/mailman/admin/tails-dev)
+ - [tails-l10n@boum.org](https://www.autistici.org/mailman/admin/tails-l10n)
+ - [tails-project@boum.org](https://www.autistici.org/mailman/admin/tails-project)
+ - [tails-testers@boum.org](https://www.autistici.org/mailman/admin/tails-testers)
+ - [tails-ux@boum.org](https://www.autistici.org/mailman/admin/tails-ux)
diff --git a/wiki/src/contribute/working_together/roles/sysadmins.mdwn b/wiki/src/contribute/working_together/roles/sysadmins.mdwn
index 16aa8c0..e1a557b 100644
--- a/wiki/src/contribute/working_together/roles/sysadmins.mdwn
+++ b/wiki/src/contribute/working_together/roles/sysadmins.mdwn
@@ -197,10 +197,29 @@ Below, importance level is evaluated based on:
* configuration: done by hand ([[!tails_ticket 6926]])
* importance: low
+## DNS
+
+* purpose: authoritative nameserver for the `tails.boum.org` and
+ `amnesia.boum.org` zones
+* access:
+ - anyone can query this nameserver
+ - members of the mirrors team control some of the content of the
+ `dl.amnesia.boum.org` sub-zone
+ - Tails sysadmins can edit the zones with `pdnsutil edit-zone`
+* tools: [[!debpts pdns]] with its MySQL backend
+* configuration:
+ - `tails::pdns` and `tails::pdns::*` resources in
+ [[!tails_gitweb_repo puppet-tails]]
+ - [[!tails_gitweb_repo puppet-powerdns]]
+* importance: critical (most of our other services are not available
+ if this one is not working)
+
## Gitolite
-* purpose: host Git repositories used by the puppetmaster and other
- services; mostly useless for humans
+* purpose:
+ - host Git repositories used by the puppetmaster and other services
+ - host the Tails [[main repository|contribute/git#main-repo]]
+ and our website's underlays
* access: Tails core developers only
* tools: [[!debpts gitolite]]
* configuration: `tails::gitolite` class in [[!tails_gitweb_repo
@@ -294,6 +313,16 @@ Below, importance level is evaluated based on:
- [[sysadmins/automated_tests_in_Jenkins]]
* importance: critical (as a key component of our development process)
+## Mail
+
+* purpose: handle incoming and outgoing email for some of our
+ [[Schleuder lists|sysadmins#schleuder]]
+* access: public MTA listening on `mail.tails.boum.org`
+* tools: [[!debpts postfix]], [[!debpts amavisd-new]], [[!debpts spamassassin]]
+* configuration: `tails::postfix`, `tails::amavisd_new` and
+ `tails::spamassassin` classes in [[!tails_gitweb_repo puppet-tails]]
+* importance: high (at least because WhisperBack bug reports go through this MTA)
+
<a id="mumble"></a>
## Mumble
@@ -321,6 +350,17 @@ Below, importance level is evaluated based on:
Puppet module
* importance: critical (needed to release Tails)
+<a id="schleuder"></a>
+
+## Schleuder
+
+* purpose: host some of our Schleuder mailing lists
+* access: anyone can send email to these lists
+* tools: [[!debpts schleuder]]
+* configuration: `tails::schleuder` class in [[!tails_gitweb_repo
+ puppet-tails]]
+* importance: high (at least because WhisperBack bug reports go through this service)
+
## Tor bridge
* purpose: provide a Tor bridge that Tails contributors can easily use
diff --git a/wiki/src/contribute/working_together/roles/sysadmins/adding_icinga2_checks.mdwn b/wiki/src/contribute/working_together/roles/sysadmins/adding_icinga2_checks.mdwn
index 7216c7b..e83c6ea 100644
--- a/wiki/src/contribute/working_together/roles/sysadmins/adding_icinga2_checks.mdwn
+++ b/wiki/src/contribute/working_together/roles/sysadmins/adding_icinga2_checks.mdwn
@@ -3,21 +3,21 @@
First, see the
[[description of our Icinga2 setup|contribute/working_together/roles/sysadmins#icinga2]].
-The [upstream Icinga2 Puppet
-module](https://git.icinga.org/?p=icinga2.git), which may help in
-simplifying our Puppet manifest, requires to use the puppetdb backend to
-support its complex exported resources. In Debian Jessie, exported
-resources are only supported through the Active Records backend, so we
-can't use this Puppet module right now. Until PuppetDB can be
-used (possibly in Stretch), we have to write more Puppet code to add
-new checks.
+<!-- The [upstream Icinga2 Puppet -->
+<!-- module](https://git.icinga.org/?p=icinga2.git), which may help in -->
+<!-- simplifying our Puppet manifest, requires to use the puppetdb backend to -->
+<!-- support its complex exported resources. In Debian Jessie, exported -->
+<!-- resources are only supported through the Active Records backend, so we -->
+<!-- can't use this Puppet module right now. Until PuppetDB can be -->
+<!-- used (possibly in Stretch), we have to write more Puppet code to add -->
+<!-- new checks. -->
# Plugins
Icinga2 *plugins* are scripts or software executed by Icinga2 to
retrieve services data. Icinga2 natively ships a bunch of them. Have a
look [at the
-documentation](http://docs.icinga.org/icinga2/latest/doc/module/icinga2/chapter/plugin-check-commands)
+documentation](https://icinga.com/docs/icinga2/latest/doc/10-icinga-template-library/#plugin-check-commands)
if one fits our needs. If not, you'll have to install your custom
plugin. Example: the `tails::monitoring::plugin::check_torbrowser_archive`
class in [[!tails_gitweb_repo puppet-tails]].
diff --git a/wiki/src/doc.de.po b/wiki/src/doc.de.po
index 6ccac94..6c27bc8 100644
--- a/wiki/src/doc.de.po
+++ b/wiki/src/doc.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails website\n"
-"POT-Creation-Date: 2017-12-23 09:04+0100\n"
+"POT-Creation-Date: 2018-12-29 23:52+0000\n"
"PO-Revision-Date: 2018-03-21 15:59+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: Tails translators <tails-l10n@boum.org>\n"
@@ -84,32 +84,30 @@ msgid "[[Install from Windows|install/win/usb-overview]]"
msgstr "[[Installation unter Windows|install/win/usb-overview]]"
#. type: Bullet: ' - '
-msgid "[[Install from Debian, Ubuntu, or Mint|install/debian/usb-overview]]"
-msgstr "[[Von Debian, Ubuntu oder Mint aus installieren|install/debian/usb-overview]]"
-
-#. type: Bullet: ' - '
-msgid ""
-"[[Install from Debian, Ubuntu, or Mint using the command line and GnuPG|"
-"install/expert/usb-overview]]"
-msgstr "[[Installation von Debian, Ubuntu oder Mint aus unter Nutzung der Kommandozeile und GnuPG|install/expert/usb-overview]]"
-
-#. type: Bullet: ' - '
-msgid "[[Install from other Linux distributions|install/linux/usb-overview]]"
+#, fuzzy
+#| msgid "[[Install from macOS and the command line|install/mac/usb-overview]]"
+msgid "[[Install from macOS|install/mac/usb-overview]]"
msgstr ""
-"[[Von anderen Linux-Distributionen aus installieren|install/linux/usb-"
+"[[Installation von Mac aus unter Nutzung der Kommandozeile|install/mac/usb-"
"overview]]"
#. type: Bullet: ' - '
-msgid "[[Install from macOS by burning a DVD first|install/mac/dvd-overview]]"
-msgstr ""
-"[[Von macOS aus eine DVD brennen und anschließend installieren|install/mac/"
-"dvd-overview]]"
+#, fuzzy
+#| msgid "[[Install from Windows|install/win/usb-overview]]"
+msgid "[[Install from Linux (recommended)|install/linux/usb-overview]]"
+msgstr "[[Installation unter Windows|install/win/usb-overview]]"
#. type: Bullet: ' - '
-msgid "[[Install from macOS and the command line|install/mac/usb-overview]]"
+#, fuzzy
+#| msgid ""
+#| "[[Install from Debian, Ubuntu, or Mint using the command line and GnuPG|"
+#| "install/expert/usb-overview]]"
+msgid ""
+"[[Install from Debian, Ubuntu, or Mint using the command line and GnuPG "
+"(experts)|install/expert/usb-overview]]"
msgstr ""
-"[[Installation von Mac aus unter Nutzung der Kommandozeile|install/mac/usb-"
-"overview]]"
+"[[Installation von Debian, Ubuntu oder Mint aus unter Nutzung der "
+"Kommandozeile und GnuPG|install/expert/usb-overview]]"
#. type: Bullet: ' - '
msgid "[[Burn a DVD|install/dvd]]"
@@ -168,3 +166,20 @@ msgstr "Fortgeschrittene Themen"
#, no-wrap
msgid "[[!inline pages=\"doc/advanced_topics.index\" raw=\"yes\" sort=\"age\"]]\n"
msgstr "[[!inline pages=\"doc/advanced_topics.index.de\" raw=\"yes\" sort=\"age\"]]\n"
+
+#~ msgid "[[Install from Debian, Ubuntu, or Mint|install/debian/usb-overview]]"
+#~ msgstr ""
+#~ "[[Von Debian, Ubuntu oder Mint aus installieren|install/debian/usb-"
+#~ "overview]]"
+
+#~ msgid ""
+#~ "[[Install from other Linux distributions|install/linux/usb-overview]]"
+#~ msgstr ""
+#~ "[[Von anderen Linux-Distributionen aus installieren|install/linux/usb-"
+#~ "overview]]"
+
+#~ msgid ""
+#~ "[[Install from macOS by burning a DVD first|install/mac/dvd-overview]]"
+#~ msgstr ""
+#~ "[[Von macOS aus eine DVD brennen und anschließend installieren|install/"
+#~ "mac/dvd-overview]]"
diff --git a/wiki/src/doc.es.po b/wiki/src/doc.es.po
index 010035a..392b1a1 100644
--- a/wiki/src/doc.es.po
+++ b/wiki/src/doc.es.po
@@ -6,11 +6,11 @@ msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2018-01-30 12:41+0000\n"
+"POT-Creation-Date: 2018-12-29 23:52+0000\n"
"PO-Revision-Date: 2018-03-13 09:18+0000\n"
"Last-Translator: emmapeel <emma.peel@riseup.net>\n"
-"Language-Team: Spanish "
-"<http://translate.tails.boum.org/projects/tails/doc/es/>\n"
+"Language-Team: Spanish <http://translate.tails.boum.org/projects/tails/doc/"
+"es/>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -47,8 +47,8 @@ msgid ""
"Read about how you can help [[improving Tails documentation|/contribute/how/"
"documentation]]."
msgstr ""
-"Lee como ayudar a [[mejorar la documentación de "
-"Tails|/contribute/how/documentation]]."
+"Lee como ayudar a [[mejorar la documentación de Tails|/contribute/how/"
+"documentation]]."
#. type: Plain text
msgid "- [[Introduction to this documentation|introduction]]"
@@ -82,31 +82,29 @@ msgid "[[Install from Windows|install/win/usb-overview]]"
msgstr "[[Instala desde Windows|install/win/usb-overview]]"
#. type: Bullet: ' - '
-msgid "[[Install from Debian, Ubuntu, or Mint|install/debian/usb-overview]]"
-msgstr "[[Instala desde Debian, Ubuntu o Mint|install/debian/usb-overview]]"
-
-#. type: Bullet: ' - '
-msgid ""
-"[[Install from Debian, Ubuntu, or Mint using the command line and GnuPG|"
-"install/expert/usb-overview]]"
+#, fuzzy
+#| msgid "[[Install from macOS and the command line|install/mac/usb-overview]]"
+msgid "[[Install from macOS|install/mac/usb-overview]]"
msgstr ""
-"[[Instala desde Debian, Ubuntu o Mint usando la línea de comandos y "
-"GnuPG|install/expert/usb-overview]]"
-
-#. type: Bullet: ' - '
-msgid "[[Install from other Linux distributions|install/linux/usb-overview]]"
-msgstr ""
-"[[Instala desde otras distribuciones de Linux|install/linux/usb-overview]]"
+"[[Instala desde macOS con la línea de comandos|install/mac/usb-overview]]"
#. type: Bullet: ' - '
-msgid "[[Install from macOS by burning a DVD first|install/mac/dvd-overview]]"
-msgstr ""
-"[[Instala desde macOS grabando primero un DVD|install/mac/dvd-overview]]"
+#, fuzzy
+#| msgid "[[Install from Windows|install/win/usb-overview]]"
+msgid "[[Install from Linux (recommended)|install/linux/usb-overview]]"
+msgstr "[[Instala desde Windows|install/win/usb-overview]]"
#. type: Bullet: ' - '
-msgid "[[Install from macOS and the command line|install/mac/usb-overview]]"
+#, fuzzy
+#| msgid ""
+#| "[[Install from Debian, Ubuntu, or Mint using the command line and GnuPG|"
+#| "install/expert/usb-overview]]"
+msgid ""
+"[[Install from Debian, Ubuntu, or Mint using the command line and GnuPG "
+"(experts)|install/expert/usb-overview]]"
msgstr ""
-"[[Instala desde macOS con la línea de comandos|install/mac/usb-overview]]"
+"[[Instala desde Debian, Ubuntu o Mint usando la línea de comandos y GnuPG|"
+"install/expert/usb-overview]]"
#. type: Bullet: ' - '
msgid "[[Burn a DVD|install/dvd]]"
@@ -166,6 +164,19 @@ msgstr "Temas avanzados"
msgid "[[!inline pages=\"doc/advanced_topics.index\" raw=\"yes\" sort=\"age\"]]\n"
msgstr "[[!inline pages=\"doc/advanced_topics.index.es\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgid "[[Install from Debian, Ubuntu, or Mint|install/debian/usb-overview]]"
+#~ msgstr "[[Instala desde Debian, Ubuntu o Mint|install/debian/usb-overview]]"
+
+#~ msgid ""
+#~ "[[Install from other Linux distributions|install/linux/usb-overview]]"
+#~ msgstr ""
+#~ "[[Instala desde otras distribuciones de Linux|install/linux/usb-overview]]"
+
+#~ msgid ""
+#~ "[[Install from macOS by burning a DVD first|install/mac/dvd-overview]]"
+#~ msgstr ""
+#~ "[[Instala desde macOS grabando primero un DVD|install/mac/dvd-overview]]"
+
#~ msgid "[[Download and verify using OpenPGP|install/download/openpgp]]"
#~ msgstr "[[Baja y verifica usando OpenPGP|install/download/openpgp]]"
diff --git a/wiki/src/doc.fa.po b/wiki/src/doc.fa.po
index 926f9b6..e294794 100644
--- a/wiki/src/doc.fa.po
+++ b/wiki/src/doc.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: 2017-12-23 09:04+0100\n"
+"POT-Creation-Date: 2018-12-29 23:52+0000\n"
"PO-Revision-Date: 2015-10-20 21:45+0000\n"
"Last-Translator: Weblate Admin <admin@example.com>\n"
"Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/doc/fa/"
@@ -82,25 +82,17 @@ msgid "[[Install from Windows|install/win/usb-overview]]"
msgstr ""
#. type: Bullet: ' - '
-msgid "[[Install from Debian, Ubuntu, or Mint|install/debian/usb-overview]]"
+msgid "[[Install from macOS|install/mac/usb-overview]]"
msgstr ""
#. type: Bullet: ' - '
-msgid ""
-"[[Install from Debian, Ubuntu, or Mint using the command line and GnuPG|"
-"install/expert/usb-overview]]"
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid "[[Install from other Linux distributions|install/linux/usb-overview]]"
+msgid "[[Install from Linux (recommended)|install/linux/usb-overview]]"
msgstr ""
#. type: Bullet: ' - '
-msgid "[[Install from macOS by burning a DVD first|install/mac/dvd-overview]]"
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid "[[Install from macOS and the command line|install/mac/usb-overview]]"
+msgid ""
+"[[Install from Debian, Ubuntu, or Mint using the command line and GnuPG "
+"(experts)|install/expert/usb-overview]]"
msgstr ""
#. type: Bullet: ' - '
diff --git a/wiki/src/doc.fr.po b/wiki/src/doc.fr.po
index 29cb9e0..20aea08 100644
--- a/wiki/src/doc.fr.po
+++ b/wiki/src/doc.fr.po
@@ -6,15 +6,15 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2017-12-23 09:04+0100\n"
-"PO-Revision-Date: 2016-11-06 15:18-0000\n"
+"POT-Creation-Date: 2019-01-18 14:46+0100\n"
+"PO-Revision-Date: 2019-01-09 07:34+0000\n"
"Last-Translator: AtomiKe <tails@atomike.ninja>\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"
+"X-Generator: Poedit 1.8.11\n"
#. type: Plain text
#, no-wrap
@@ -78,38 +78,23 @@ msgstr ""
#. type: Bullet: ' - '
msgid "[[Install from Windows|install/win/usb-overview]]"
-msgstr "[[Installation à partir de Windows|install/win/usb-overview]]"
+msgstr "[[Installation depuis Windows|install/win/usb-overview]]"
#. type: Bullet: ' - '
-msgid "[[Install from Debian, Ubuntu, or Mint|install/debian/usb-overview]]"
-msgstr ""
-"[[Installation à partir de Debian, Ubuntu ou Mint|install/debian/usb-"
-"overview]]"
-
-#. type: Bullet: ' - '
-msgid ""
-"[[Install from Debian, Ubuntu, or Mint using the command line and GnuPG|"
-"install/expert/usb-overview]]"
-msgstr ""
-"[[Installation à partir de Debian, Ubuntu ou Mint avec la ligne de commande "
-"et GnuPG|install/expert/usb-overview]]"
+msgid "[[Install from macOS|install/mac/usb-overview]]"
+msgstr "[[Installation depuis macOS|install/mac/usb-overview]]"
#. type: Bullet: ' - '
-msgid "[[Install from other Linux distributions|install/linux/usb-overview]]"
-msgstr ""
-"[[Installation à partir d'une autre distribution Linux|install/linux/usb-"
-"overview]]"
-
-#. type: Bullet: ' - '
-msgid "[[Install from macOS by burning a DVD first|install/mac/dvd-overview]]"
-msgstr ""
-"[[Installation à partir de macOS en gravant d'abord un DVD|install/mac/dvd-"
-"overview]]"
+msgid "[[Install from Linux (recommended)|install/linux/usb-overview]]"
+msgstr "[[Installation depuis Linux (recommandé)|install/linux/usb-overview]]"
#. type: Bullet: ' - '
-msgid "[[Install from macOS and the command line|install/mac/usb-overview]]"
+msgid ""
+"[[Install from Debian, Ubuntu, or Mint using the command line and GnuPG "
+"(experts)|install/expert/usb-overview]]"
msgstr ""
-"[[Installation depuis macOS en ligne de commande|install/mac/usb-overview]]"
+"[[Installation depuis Debian, Ubuntu ou Mint avec la ligne de commande et "
+"GnuPG (experts)|install/expert/usb-overview]]"
#. type: Bullet: ' - '
msgid "[[Burn a DVD|install/dvd]]"
@@ -169,6 +154,23 @@ msgstr "Sujets avancés"
msgid "[[!inline pages=\"doc/advanced_topics.index\" raw=\"yes\" sort=\"age\"]]\n"
msgstr "[[!inline pages=\"doc/advanced_topics.index.fr\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgid "[[Install from Debian, Ubuntu, or Mint|install/debian/usb-overview]]"
+#~ msgstr ""
+#~ "[[Installation à partir de Debian, Ubuntu ou Mint|install/debian/usb-"
+#~ "overview]]"
+
+#~ msgid ""
+#~ "[[Install from other Linux distributions|install/linux/usb-overview]]"
+#~ msgstr ""
+#~ "[[Installation à partir d'une autre distribution Linux|install/linux/usb-"
+#~ "overview]]"
+
+#~ msgid ""
+#~ "[[Install from macOS by burning a DVD first|install/mac/dvd-overview]]"
+#~ msgstr ""
+#~ "[[Installation à partir de macOS en gravant d'abord un DVD|install/mac/"
+#~ "dvd-overview]]"
+
#~ msgid "[[Download and verify using OpenPGP|install/download/openpgp]]"
#~ msgstr ""
#~ "[[Télécharger et vérifier en utilisant OpenPGP|install/download/openpgp]]"
diff --git a/wiki/src/doc.it.po b/wiki/src/doc.it.po
index de27215..0ddeb7c 100644
--- a/wiki/src/doc.it.po
+++ b/wiki/src/doc.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2017-12-23 09:04+0100\n"
+"POT-Creation-Date: 2018-12-29 23:52+0000\n"
"PO-Revision-Date: 2017-06-29 09:56+0000\n"
"Last-Translator: \n"
"Language-Team: ita <transitails@inventati.org>\n"
@@ -80,31 +80,30 @@ msgid "[[Install from Windows|install/win/usb-overview]]"
msgstr "[[Installa da Windows|install/win/usb-overview]]"
#. type: Bullet: ' - '
-msgid "[[Install from Debian, Ubuntu, or Mint|install/debian/usb-overview]]"
-msgstr "[[Installa da Debian, Ubuntu o Mint|install/debian/usb-overview]]"
+#, fuzzy
+#| msgid "[[Install from macOS and the command line|install/mac/usb-overview]]"
+msgid "[[Install from macOS|install/mac/usb-overview]]"
+msgstr "[[Installa da macOS e utilizza il terminale|install/mac/usb-overview]]"
#. type: Bullet: ' - '
+#, fuzzy
+#| msgid "[[Install from Windows|install/win/usb-overview]]"
+msgid "[[Install from Linux (recommended)|install/linux/usb-overview]]"
+msgstr "[[Installa da Windows|install/win/usb-overview]]"
+
+#. type: Bullet: ' - '
+#, fuzzy
+#| msgid ""
+#| "[[Install from Debian, Ubuntu, or Mint using the command line and GnuPG|"
+#| "install/expert/usb-overview]]"
msgid ""
-"[[Install from Debian, Ubuntu, or Mint using the command line and GnuPG|"
-"install/expert/usb-overview]]"
+"[[Install from Debian, Ubuntu, or Mint using the command line and GnuPG "
+"(experts)|install/expert/usb-overview]]"
msgstr ""
"[[Installa da Debian, Ubuntu o Mint usando il terminale e GnuPG|install/"
"expert/usb-overview]]"
#. type: Bullet: ' - '
-msgid "[[Install from other Linux distributions|install/linux/usb-overview]]"
-msgstr ""
-"[[Installa da un'altra distribuzione GNU/Linux|install/linux/usb-overview]]"
-
-#. type: Bullet: ' - '
-msgid "[[Install from macOS by burning a DVD first|install/mac/dvd-overview]]"
-msgstr "[[Installa da macOS masterizzandoti un DVD|install/mac/dvd-overview]]"
-
-#. type: Bullet: ' - '
-msgid "[[Install from macOS and the command line|install/mac/usb-overview]]"
-msgstr "[[Installa da macOS e utilizza il terminale|install/mac/usb-overview]]"
-
-#. type: Bullet: ' - '
msgid "[[Burn a DVD|install/dvd]]"
msgstr "[[Masterizza un DVD|install/dvd]]"
@@ -162,6 +161,20 @@ msgstr "Argomenti avanzati"
msgid "[[!inline pages=\"doc/advanced_topics.index\" raw=\"yes\" sort=\"age\"]]\n"
msgstr "[[!inline pages=\"doc/advanced_topics.index.it\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgid "[[Install from Debian, Ubuntu, or Mint|install/debian/usb-overview]]"
+#~ msgstr "[[Installa da Debian, Ubuntu o Mint|install/debian/usb-overview]]"
+
+#~ msgid ""
+#~ "[[Install from other Linux distributions|install/linux/usb-overview]]"
+#~ msgstr ""
+#~ "[[Installa da un'altra distribuzione GNU/Linux|install/linux/usb-"
+#~ "overview]]"
+
+#~ msgid ""
+#~ "[[Install from macOS by burning a DVD first|install/mac/dvd-overview]]"
+#~ msgstr ""
+#~ "[[Installa da macOS masterizzandoti un DVD|install/mac/dvd-overview]]"
+
#~ msgid "[[Download and verify using OpenPGP|install/download/openpgp]]"
#~ msgstr "[[Scarica e verifica con OpenPGP|install/download/openpgp]]"
diff --git a/wiki/src/doc.mdwn b/wiki/src/doc.mdwn
index d77ff41..e9cbd02 100644
--- a/wiki/src/doc.mdwn
+++ b/wiki/src/doc.mdwn
@@ -21,11 +21,9 @@ documentation|/contribute/how/documentation]].
- [[Install from another Tails (for PC)|install/win/clone-overview]]
- [[Install from another Tails (for Mac)|install/mac/clone-overview]]
- [[Install from Windows|install/win/usb-overview]]
- - [[Install from Debian, Ubuntu, or Mint|install/debian/usb-overview]]
- - [[Install from Debian, Ubuntu, or Mint using the command line and GnuPG|install/expert/usb-overview]]
- - [[Install from other Linux distributions|install/linux/usb-overview]]
- - [[Install from macOS by burning a DVD first|install/mac/dvd-overview]]
- - [[Install from macOS and the command line|install/mac/usb-overview]]
+ - [[Install from macOS|install/mac/usb-overview]]
+ - [[Install from Linux (recommended)|install/linux/usb-overview]]
+ - [[Install from Debian, Ubuntu, or Mint using the command line and GnuPG (experts)|install/expert/usb-overview]]
- [[Burn a DVD|install/dvd]]
- [[Download without installing|install/download]]
diff --git a/wiki/src/doc.pt.po b/wiki/src/doc.pt.po
index 2ec854e..b214113 100644
--- a/wiki/src/doc.pt.po
+++ b/wiki/src/doc.pt.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2017-12-23 09:04+0100\n"
+"POT-Creation-Date: 2018-12-29 23:52+0000\n"
"PO-Revision-Date: 2018-04-08 15:01-0300\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: Portuguese <LL@li.org>\n"
@@ -85,35 +85,30 @@ msgid "[[Install from Windows|install/win/usb-overview]]"
msgstr "[[Instale a partir de um Windows|install/win/usb-overview]]"
#. type: Bullet: ' - '
-msgid "[[Install from Debian, Ubuntu, or Mint|install/debian/usb-overview]]"
-msgstr ""
-"[[Instale a partir de um Debian, Ubuntu ou Mint|install/debian/usb-overview]]"
-
-#. type: Bullet: ' - '
-msgid ""
-"[[Install from Debian, Ubuntu, or Mint using the command line and GnuPG|"
-"install/expert/usb-overview]]"
-msgstr ""
-"[[Instale a partir de um Debian, Ubuntu ou Mint usando a linha de "
-"comando|install/expert/usb-overview]]"
-
-#. type: Bullet: ' - '
-msgid "[[Install from other Linux distributions|install/linux/usb-overview]]"
+#, fuzzy
+#| msgid "[[Install from macOS and the command line|install/mac/usb-overview]]"
+msgid "[[Install from macOS|install/mac/usb-overview]]"
msgstr ""
-"[[Instale a partir de outras distribuições de Linux|install/linux/usb-"
+"[[Instale a partir de um macOS usando a linha de comando|install/mac/usb-"
"overview]]"
#. type: Bullet: ' - '
-msgid "[[Install from macOS by burning a DVD first|install/mac/dvd-overview]]"
-msgstr ""
-"[[Instale a partir de um macOS gravando um DVD primeiro|install/mac/dvd-"
-"overview]]"
+#, fuzzy
+#| msgid "[[Install from Windows|install/win/usb-overview]]"
+msgid "[[Install from Linux (recommended)|install/linux/usb-overview]]"
+msgstr "[[Instale a partir de um Windows|install/win/usb-overview]]"
#. type: Bullet: ' - '
-msgid "[[Install from macOS and the command line|install/mac/usb-overview]]"
+#, fuzzy
+#| msgid ""
+#| "[[Install from Debian, Ubuntu, or Mint using the command line and GnuPG|"
+#| "install/expert/usb-overview]]"
+msgid ""
+"[[Install from Debian, Ubuntu, or Mint using the command line and GnuPG "
+"(experts)|install/expert/usb-overview]]"
msgstr ""
-"[[Instale a partir de um macOS usando a linha de comando|install/mac/usb-"
-"overview]]"
+"[[Instale a partir de um Debian, Ubuntu ou Mint usando a linha de comando|"
+"install/expert/usb-overview]]"
#. type: Bullet: ' - '
msgid "[[Burn a DVD|install/dvd]]"
@@ -173,6 +168,23 @@ msgstr "Tópicos avançados"
msgid "[[!inline pages=\"doc/advanced_topics.index\" raw=\"yes\" sort=\"age\"]]\n"
msgstr "[[!inline pages=\"doc/advanced_topics.index.pt\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgid "[[Install from Debian, Ubuntu, or Mint|install/debian/usb-overview]]"
+#~ msgstr ""
+#~ "[[Instale a partir de um Debian, Ubuntu ou Mint|install/debian/usb-"
+#~ "overview]]"
+
+#~ msgid ""
+#~ "[[Install from other Linux distributions|install/linux/usb-overview]]"
+#~ msgstr ""
+#~ "[[Instale a partir de outras distribuições de Linux|install/linux/usb-"
+#~ "overview]]"
+
+#~ msgid ""
+#~ "[[Install from macOS by burning a DVD first|install/mac/dvd-overview]]"
+#~ msgstr ""
+#~ "[[Instale a partir de um macOS gravando um DVD primeiro|install/mac/dvd-"
+#~ "overview]]"
+
#, fuzzy
#~| msgid "[[Download the ISO image|download#index2h1]]"
#~ msgid "[[Download and verify using OpenPGP|install/download/openpgp]]"
diff --git a/wiki/src/doc/about/acknowledgments_and_similar_projects.fr.po b/wiki/src/doc/about/acknowledgments_and_similar_projects.fr.po
index 4135e8f..83e68d7 100644
--- a/wiki/src/doc/about/acknowledgments_and_similar_projects.fr.po
+++ b/wiki/src/doc/about/acknowledgments_and_similar_projects.fr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
"POT-Creation-Date: 2018-11-07 11:24+0100\n"
-"PO-Revision-Date: 2018-03-22 02:36+0000\n"
+"PO-Revision-Date: 2019-02-03 14:13+0000\n"
"Last-Translator: \n"
"Language-Team: Tails translators <tails@boum.org>\n"
"Language: fr\n"
@@ -96,7 +96,7 @@ msgstr "Projets actifs"
#. type: Plain text
#, no-wrap
msgid "<!-- We degrade projects to 'discontinued' if they don't release a new version in at least 1 year. -->\n"
-msgstr ""
+msgstr "<!-- We degrade projects to 'discontinued' if they don't release a new version in at least 1 year. -->\n"
#. type: Bullet: '* '
msgid "[Heads](https://heads.dyne.org/)"
diff --git a/wiki/src/doc/about/license.de.po b/wiki/src/doc/about/license.de.po
index 6a0a5ce..b10ee7e 100644
--- a/wiki/src/doc/about/license.de.po
+++ b/wiki/src/doc/about/license.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails Translation\n"
-"POT-Creation-Date: 2018-11-02 10:56+0100\n"
+"POT-Creation-Date: 2019-02-05 19:15+0000\n"
"PO-Revision-Date: 2018-03-21 16:36+0100\n"
"Last-Translator: Tails translators\n"
"Language-Team: Tails Translation <tails-l10n@boum.org>\n"
@@ -94,145 +94,299 @@ msgstr ""
"Auf dieser Website werden diverse Bilddateien verwendet, die urheber-, "
"lizenz- oder markenrechtlich geschützt sind:"
+#. type: Bullet: '- '
+msgid ""
+"The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]] "
+"by Ilsur Aptukov from the Noun Project."
+msgstr ""
+
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| " - The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]]\n"
-#| " by Ilsur Aptukov from the Noun Project.\n"
-#| " - Debian logo: Copyright (c) 1999 Software in the Public Interest.\n"
-#| " - Onion logo: registered trademark of The Tor Project, Inc.; the Tails\n"
-#| "project is authorized to use it under certain conditions; licensed under\n"
-#| "Creative Commons Attribution 3.0 United States License.\n"
-#| " - Icons from [[The Noun Project|http://thenounproject.com/]]:\n"
-#| " - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
-#| " Creative Commons - Attribution, by Olivier Guin.\n"
-#| " - [[Code|http://thenounproject.com/term/code/18033/]]:\n"
-#| " Creative Commons — Attribution, by Azis.\n"
-#| " - [[Pen|http://thenounproject.com/term/pen/18907/]]:\n"
-#| " Creative Commons — Attribution, by factor[e] design initiative.\n"
-#| " - [[Loan|http://thenounproject.com/term/loan/19538/]]:\n"
-#| " Public Domain, by Rohith M S.\n"
-#| " - [[User|http://thenounproject.com/term/user/419/]]:\n"
-#| " Creative Commons — Attribution, by Edward Boatman.\n"
-#| " - [[Translation|http://thenounproject.com/term/translation/5735/]]:\n"
-#| " Creative Commons — Attribution, by Joe Mortell.\n"
-#| " - [[Gears|http://thenounproject.com/term/gears/8949/]]:\n"
-#| " Creative Commons — Attribution, by Cris Dobbins.\n"
-#| " - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
-#| " Creative Commons — Attribution, by Cornelius Danger.\n"
-#| " - [[Check Mark|https://thenounproject.com/term/check/4489/]]:\n"
-#| " Public Domain, by Julian Norton.\n"
-#| " - [[Delete|https://thenounproject.com/term/delete/49691/]]:\n"
-#| " Creative Commons — Attribution, by Kervin Markle.\n"
-#| " - [[Play|https://thenounproject.com/term/play/152052]]:\n"
-#| " Creative Commons — Attribution, by Zech Nelson.\n"
-#| " - [[Pause|https://thenounproject.com/term/pause/152046]]:\n"
-#| " Creative Commons — Attribution, by Zech Nelson.\n"
-#| " - [[USB|https://thenounproject.com/term/usb/28901]]:\n"
-#| " Creative Commons — Attribution, by Wilson Joseph.\n"
-#| " - [[Time|https://thenounproject.com/term/time/6732]]:\n"
-#| " Creative Commons — Attribution, by Richard de Vos.\n"
-#| " - [[Printer|https://thenounproject.com/term/printer/146674]]:\n"
-#| " Creative Commons — Attribution, by Diego Naive.\n"
-#| " - [[Smart Phones|https://thenounproject.com/term/smartphone/25790]]:\n"
-#| " Creative Commons — Attribution, by Pham Thi Dieu Linh.\n"
-#| " - [[Laptop|https://thenounproject.com/term/laptop/6729]]:\n"
-#| " Public Domain, by Jean Yashu.\n"
-#| " - [[Love|https://thenounproject.com/term/love/218846/]]:\n"
-#| " Creative Commons — Attribution, by Thomas Helbig.\n"
-#| " - [[Survey|https://thenounproject.com/term/survey/1296072]]:\n"
-#| " Creative Commons — Attribution, by unlimicon.\n"
-msgid ""
-" - The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]]\n"
-" by Ilsur Aptukov from the Noun Project.\n"
-" - Debian logo: Copyright (c) 1999 Software in the Public Interest.\n"
-" - Onion logo: registered trademark of The Tor Project, Inc.; the Tails\n"
-"project is authorized to use it under certain conditions; licensed under\n"
-"Creative Commons Attribution 3.0 United States License.\n"
-" - Icons from [[The Noun Project|http://thenounproject.com/]]:\n"
-" - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
-" Creative Commons - Attribution, by Olivier Guin.\n"
-" - [[Code|http://thenounproject.com/term/code/18033/]]:\n"
-" Creative Commons — Attribution, by Azis.\n"
-" - [[Pen|http://thenounproject.com/term/pen/18907/]]:\n"
-" Creative Commons — Attribution, by factor[e] design initiative.\n"
-" - [[Loan|http://thenounproject.com/term/loan/19538/]]:\n"
-" Public Domain, by Rohith M S.\n"
-" - [[User|http://thenounproject.com/term/user/419/]]:\n"
-" Creative Commons — Attribution, by Edward Boatman.\n"
-" - [[Translation|http://thenounproject.com/term/translation/5735/]]:\n"
-" Creative Commons — Attribution, by Joe Mortell.\n"
-" - [[Gears|http://thenounproject.com/term/gears/8949/]]:\n"
-" Creative Commons — Attribution, by Cris Dobbins.\n"
-" - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
-" Creative Commons — Attribution, by Cornelius Danger.\n"
-" - [[Check Mark|https://thenounproject.com/term/check/4489/]]:\n"
-" Public Domain, by Julian Norton.\n"
-" - [[Delete|https://thenounproject.com/term/delete/49691/]]:\n"
-" Creative Commons — Attribution, by Kervin Markle.\n"
-" - [[Play|https://thenounproject.com/term/play/152052]]:\n"
-" Creative Commons — Attribution, by Zech Nelson.\n"
-" - [[Pause|https://thenounproject.com/term/pause/152046]]:\n"
-" Creative Commons — Attribution, by Zech Nelson.\n"
-" - [[USB|https://thenounproject.com/term/usb/28901]]:\n"
-" Creative Commons — Attribution, by Wilson Joseph.\n"
-" - [[Time|https://thenounproject.com/term/time/6732]]:\n"
-" Creative Commons — Attribution, by Richard de Vos.\n"
-" - [[Printer|https://thenounproject.com/term/printer/146674]]:\n"
-" Creative Commons — Attribution, by Diego Naive.\n"
-" - [[Smart Phones|https://thenounproject.com/term/smartphone/25790]]:\n"
-" Creative Commons — Attribution, by Pham Thi Dieu Linh.\n"
-" - [[Laptop|https://thenounproject.com/term/laptop/6729]]:\n"
-" Public Domain, by Jean Yashu.\n"
-" - [[Love|https://thenounproject.com/term/love/218846/]]:\n"
-" Creative Commons — Attribution, by Thomas Helbig.\n"
-" - [[Survey|https://thenounproject.com/term/survey/1296072]]:\n"
-" Creative Commons — Attribution, by unlimicon.\n"
-" - [[Info|https://thenounproject.com/term/info/808461]]:\n"
-" Creative Commons — Attribution, by icongeek]].\n"
-msgstr ""
-" - Das Tails-Logo basiert auf [[USB|http://thenounproject.com/term/usb/23873/]]\n"
-" von Ilsur Aptukov von The Noun Project.\n"
-" - Debian-Logo: Copyright (c) 1999 Software in the Public Interest.\n"
-" - Onion-Logo: eingetragenes Markenzeichen von The Tor Project, Inc.; das Tails\n"
-"Project ist autorisiert, es unter bestimmten Bedingungen zu verwenden; lizenziert unter\n"
-"Creative Commons Attribution 3.0 United States License.\n"
-" - Icons von [[The Noun Project|http://thenounproject.com/]]:\n"
-" - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
-" Creative Commons - Attribution, von Olivier Guin.\n"
-" - [[Code|http://thenounproject.com/term/code/18033/]]:\n"
-" Creative Commons — Attribution, von Azis.\n"
-" - [[Pen|http://thenounproject.com/term/pen/18907/]]:\n"
-" Creative Commons — Attribution, von factor[e] design initiative.\n"
-" - [[Loan|http://thenounproject.com/term/loan/19538/]]:\n"
-" Public Domain, von Rohith M S.\n"
-" - [[User|http://thenounproject.com/term/user/419/]]:\n"
-" Creative Commons — Attribution, von Edward Boatman.\n"
-" - [[Translation|http://thenounproject.com/term/translation/5735/]]:\n"
-" Creative Commons — Attribution, von Joe Mortell.\n"
-" - [[Gears|http://thenounproject.com/term/gears/8949/]]:\n"
-" Creative Commons — Attribution, von Cris Dobbins.\n"
-" - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
-" Creative Commons — Attribution, von Cornelius Danger.\n"
-" - [[Check Mark|https://thenounproject.com/term/check/4489/]]:\n"
-" Public Domain, von Julian Norton.\n"
-" - [[Delete|https://thenounproject.com/term/delete/49691/]]:\n"
-" Creative Commons — Attribution, von Kervin Markle.\n"
-" - [[Play|https://thenounproject.com/term/play/152052]]:\n"
-" Creative Commons — Attribution, von Zech Nelson.\n"
-" - [[Pause|https://thenounproject.com/term/pause/152046]]:\n"
-" Creative Commons — Attribution, von Zech Nelson.\n"
-" - [[USB|https://thenounproject.com/term/usb/28901]]:\n"
-" Creative Commons — Attribution, von Wilson Joseph.\n"
-" - [[Time|https://thenounproject.com/term/time/6732]]:\n"
-" Creative Commons — Attribution, von Richard de Vos.\n"
-" - [[Printer|https://thenounproject.com/term/printer/146674]]:\n"
-" Creative Commons — Attribution, von Diego Naive.\n"
-" - [[Smart Phones|https://thenounproject.com/term/smartphone/25790]]:\n"
-" Creative Commons — Attribution, von Pham Thi Dieu Linh.\n"
-" - [[Laptop|https://thenounproject.com/term/laptop/6729]]:\n"
-" Public Domain, von Jean Yashu.\n"
-" - [[Love|https://thenounproject.com/term/love/218846/]]:\n"
-" Creative Commons — Attribution, von Thomas Helbig.\n"
-" - [[Survey|https://thenounproject.com/term/survey/1296072]]:\n"
-" Creative Commons — Attribution, von unlimicon.\n"
+msgid "- Debian logo: Copyright (c) 1999 Software in the Public Interest."
+msgstr ""
+
+#. type: Bullet: '- '
+msgid ""
+"Onion logo: registered trademark of The Tor Project, Inc.; the Tails project "
+"is authorized to use it under certain conditions; licensed under Creative "
+"Commons Attribution 3.0 United States License."
+msgstr ""
+
+#. type: Plain text
+msgid "- Icons from [[The Noun Project|http://thenounproject.com/]]:"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Announcement|http://thenounproject.com/term/announcement/1186/]]: Creative "
+"Commons - Attribution, by Olivier Guin."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Code|http://thenounproject.com/term/code/18033/]]: Creative Commons — "
+"Attribution, by Azis."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Pen|http://thenounproject.com/term/pen/18907/]]: Creative Commons — "
+"Attribution, by factor[e] design initiative."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Loan|http://thenounproject.com/term/loan/19538/]]: Public Domain, by "
+"Rohith M S."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[User|http://thenounproject.com/term/user/419/]]: Creative Commons — "
+"Attribution, by Edward Boatman."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Translation|http://thenounproject.com/term/translation/5735/]]: Creative "
+"Commons — Attribution, by Joe Mortell."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Gears|http://thenounproject.com/term/gears/8949/]]: Creative Commons — "
+"Attribution, by Cris Dobbins."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]: "
+"Creative Commons — Attribution, by Cornelius Danger."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Check Mark|https://thenounproject.com/term/check/4489/]]: Public Domain, "
+"by Julian Norton."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Delete|https://thenounproject.com/term/delete/49691/]]: Creative Commons — "
+"Attribution, by Kervin Markle."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Play|https://thenounproject.com/term/play/152052]]: Creative Commons — "
+"Attribution, by Zech Nelson."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Pause|https://thenounproject.com/term/pause/152046]]: Creative Commons — "
+"Attribution, by Zech Nelson."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[USB|https://thenounproject.com/term/usb/28901]]: Creative Commons — "
+"Attribution, by Wilson Joseph."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Time|https://thenounproject.com/term/time/6732]]: Creative Commons — "
+"Attribution, by Richard de Vos."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Printer|https://thenounproject.com/term/printer/146674]]: Creative Commons "
+"— Attribution, by Diego Naive."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Smart Phones|https://thenounproject.com/term/smartphone/25790]]: Creative "
+"Commons — Attribution, by Pham Thi Dieu Linh."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Laptop|https://thenounproject.com/term/laptop/6729]]: Public Domain, by "
+"Jean Yashu."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Love|https://thenounproject.com/term/love/218846/]]: Creative Commons — "
+"Attribution, by Thomas Helbig."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Survey|https://thenounproject.com/term/survey/1296072]]: Creative Commons "
+"— Attribution, by unlimicon."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Info|https://thenounproject.com/term/info/808461]]: Creative Commons — "
+"Attribution, by icongeek."
+msgstr ""
+
+#, fuzzy
+#~| msgid ""
+#~| " - The Tails logo is based on [[USB|http://thenounproject.com/term/"
+#~| "usb/23873/]]\n"
+#~| " by Ilsur Aptukov from the Noun Project.\n"
+#~| " - Debian logo: Copyright (c) 1999 Software in the Public Interest.\n"
+#~| " - Onion logo: registered trademark of The Tor Project, Inc.; the "
+#~| "Tails\n"
+#~| "project is authorized to use it under certain conditions; licensed "
+#~| "under\n"
+#~| "Creative Commons Attribution 3.0 United States License.\n"
+#~| " - Icons from [[The Noun Project|http://thenounproject.com/]]:\n"
+#~| " - [[Announcement|http://thenounproject.com/term/"
+#~| "announcement/1186/]]:\n"
+#~| " Creative Commons - Attribution, by Olivier Guin.\n"
+#~| " - [[Code|http://thenounproject.com/term/code/18033/]]:\n"
+#~| " Creative Commons — Attribution, by Azis.\n"
+#~| " - [[Pen|http://thenounproject.com/term/pen/18907/]]:\n"
+#~| " Creative Commons — Attribution, by factor[e] design initiative.\n"
+#~| " - [[Loan|http://thenounproject.com/term/loan/19538/]]:\n"
+#~| " Public Domain, by Rohith M S.\n"
+#~| " - [[User|http://thenounproject.com/term/user/419/]]:\n"
+#~| " Creative Commons — Attribution, by Edward Boatman.\n"
+#~| " - [[Translation|http://thenounproject.com/term/translation/5735/]]:\n"
+#~| " Creative Commons — Attribution, by Joe Mortell.\n"
+#~| " - [[Gears|http://thenounproject.com/term/gears/8949/]]:\n"
+#~| " Creative Commons — Attribution, by Cris Dobbins.\n"
+#~| " - [[Graphic Design|http://thenounproject.com/term/"
+#~| "graphic_design/9198/]]:\n"
+#~| " Creative Commons — Attribution, by Cornelius Danger.\n"
+#~| " - [[Check Mark|https://thenounproject.com/term/check/4489/]]:\n"
+#~| " Public Domain, by Julian Norton.\n"
+#~| " - [[Delete|https://thenounproject.com/term/delete/49691/]]:\n"
+#~| " Creative Commons — Attribution, by Kervin Markle.\n"
+#~| " - [[Play|https://thenounproject.com/term/play/152052]]:\n"
+#~| " Creative Commons — Attribution, by Zech Nelson.\n"
+#~| " - [[Pause|https://thenounproject.com/term/pause/152046]]:\n"
+#~| " Creative Commons — Attribution, by Zech Nelson.\n"
+#~| " - [[USB|https://thenounproject.com/term/usb/28901]]:\n"
+#~| " Creative Commons — Attribution, by Wilson Joseph.\n"
+#~| " - [[Time|https://thenounproject.com/term/time/6732]]:\n"
+#~| " Creative Commons — Attribution, by Richard de Vos.\n"
+#~| " - [[Printer|https://thenounproject.com/term/printer/146674]]:\n"
+#~| " Creative Commons — Attribution, by Diego Naive.\n"
+#~| " - [[Smart Phones|https://thenounproject.com/term/"
+#~| "smartphone/25790]]:\n"
+#~| " Creative Commons — Attribution, by Pham Thi Dieu Linh.\n"
+#~| " - [[Laptop|https://thenounproject.com/term/laptop/6729]]:\n"
+#~| " Public Domain, by Jean Yashu.\n"
+#~| " - [[Love|https://thenounproject.com/term/love/218846/]]:\n"
+#~| " Creative Commons — Attribution, by Thomas Helbig.\n"
+#~| " - [[Survey|https://thenounproject.com/term/survey/1296072]]:\n"
+#~| " Creative Commons — Attribution, by unlimicon.\n"
+#~ msgid ""
+#~ " - The Tails logo is based on [[USB|http://thenounproject.com/term/"
+#~ "usb/23873/]]\n"
+#~ " by Ilsur Aptukov from the Noun Project.\n"
+#~ " - Debian logo: Copyright (c) 1999 Software in the Public Interest.\n"
+#~ " - Onion logo: registered trademark of The Tor Project, Inc.; the Tails\n"
+#~ "project is authorized to use it under certain conditions; licensed under\n"
+#~ "Creative Commons Attribution 3.0 United States License.\n"
+#~ " - Icons from [[The Noun Project|http://thenounproject.com/]]:\n"
+#~ " - [[Announcement|http://thenounproject.com/term/"
+#~ "announcement/1186/]]:\n"
+#~ " Creative Commons - Attribution, by Olivier Guin.\n"
+#~ " - [[Code|http://thenounproject.com/term/code/18033/]]:\n"
+#~ " Creative Commons — Attribution, by Azis.\n"
+#~ " - [[Pen|http://thenounproject.com/term/pen/18907/]]:\n"
+#~ " Creative Commons — Attribution, by factor[e] design initiative.\n"
+#~ " - [[Loan|http://thenounproject.com/term/loan/19538/]]:\n"
+#~ " Public Domain, by Rohith M S.\n"
+#~ " - [[User|http://thenounproject.com/term/user/419/]]:\n"
+#~ " Creative Commons — Attribution, by Edward Boatman.\n"
+#~ " - [[Translation|http://thenounproject.com/term/translation/5735/]]:\n"
+#~ " Creative Commons — Attribution, by Joe Mortell.\n"
+#~ " - [[Gears|http://thenounproject.com/term/gears/8949/]]:\n"
+#~ " Creative Commons — Attribution, by Cris Dobbins.\n"
+#~ " - [[Graphic Design|http://thenounproject.com/term/"
+#~ "graphic_design/9198/]]:\n"
+#~ " Creative Commons — Attribution, by Cornelius Danger.\n"
+#~ " - [[Check Mark|https://thenounproject.com/term/check/4489/]]:\n"
+#~ " Public Domain, by Julian Norton.\n"
+#~ " - [[Delete|https://thenounproject.com/term/delete/49691/]]:\n"
+#~ " Creative Commons — Attribution, by Kervin Markle.\n"
+#~ " - [[Play|https://thenounproject.com/term/play/152052]]:\n"
+#~ " Creative Commons — Attribution, by Zech Nelson.\n"
+#~ " - [[Pause|https://thenounproject.com/term/pause/152046]]:\n"
+#~ " Creative Commons — Attribution, by Zech Nelson.\n"
+#~ " - [[USB|https://thenounproject.com/term/usb/28901]]:\n"
+#~ " Creative Commons — Attribution, by Wilson Joseph.\n"
+#~ " - [[Time|https://thenounproject.com/term/time/6732]]:\n"
+#~ " Creative Commons — Attribution, by Richard de Vos.\n"
+#~ " - [[Printer|https://thenounproject.com/term/printer/146674]]:\n"
+#~ " Creative Commons — Attribution, by Diego Naive.\n"
+#~ " - [[Smart Phones|https://thenounproject.com/term/smartphone/25790]]:\n"
+#~ " Creative Commons — Attribution, by Pham Thi Dieu Linh.\n"
+#~ " - [[Laptop|https://thenounproject.com/term/laptop/6729]]:\n"
+#~ " Public Domain, by Jean Yashu.\n"
+#~ " - [[Love|https://thenounproject.com/term/love/218846/]]:\n"
+#~ " Creative Commons — Attribution, by Thomas Helbig.\n"
+#~ " - [[Survey|https://thenounproject.com/term/survey/1296072]]:\n"
+#~ " Creative Commons — Attribution, by unlimicon.\n"
+#~ " - [[Info|https://thenounproject.com/term/info/808461]]:\n"
+#~ " Creative Commons — Attribution, by icongeek]].\n"
+#~ msgstr ""
+#~ " - Das Tails-Logo basiert auf [[USB|http://thenounproject.com/term/"
+#~ "usb/23873/]]\n"
+#~ " von Ilsur Aptukov von The Noun Project.\n"
+#~ " - Debian-Logo: Copyright (c) 1999 Software in the Public Interest.\n"
+#~ " - Onion-Logo: eingetragenes Markenzeichen von The Tor Project, Inc.; "
+#~ "das Tails\n"
+#~ "Project ist autorisiert, es unter bestimmten Bedingungen zu verwenden; "
+#~ "lizenziert unter\n"
+#~ "Creative Commons Attribution 3.0 United States License.\n"
+#~ " - Icons von [[The Noun Project|http://thenounproject.com/]]:\n"
+#~ " - [[Announcement|http://thenounproject.com/term/"
+#~ "announcement/1186/]]:\n"
+#~ " Creative Commons - Attribution, von Olivier Guin.\n"
+#~ " - [[Code|http://thenounproject.com/term/code/18033/]]:\n"
+#~ " Creative Commons — Attribution, von Azis.\n"
+#~ " - [[Pen|http://thenounproject.com/term/pen/18907/]]:\n"
+#~ " Creative Commons — Attribution, von factor[e] design initiative.\n"
+#~ " - [[Loan|http://thenounproject.com/term/loan/19538/]]:\n"
+#~ " Public Domain, von Rohith M S.\n"
+#~ " - [[User|http://thenounproject.com/term/user/419/]]:\n"
+#~ " Creative Commons — Attribution, von Edward Boatman.\n"
+#~ " - [[Translation|http://thenounproject.com/term/translation/5735/]]:\n"
+#~ " Creative Commons — Attribution, von Joe Mortell.\n"
+#~ " - [[Gears|http://thenounproject.com/term/gears/8949/]]:\n"
+#~ " Creative Commons — Attribution, von Cris Dobbins.\n"
+#~ " - [[Graphic Design|http://thenounproject.com/term/"
+#~ "graphic_design/9198/]]:\n"
+#~ " Creative Commons — Attribution, von Cornelius Danger.\n"
+#~ " - [[Check Mark|https://thenounproject.com/term/check/4489/]]:\n"
+#~ " Public Domain, von Julian Norton.\n"
+#~ " - [[Delete|https://thenounproject.com/term/delete/49691/]]:\n"
+#~ " Creative Commons — Attribution, von Kervin Markle.\n"
+#~ " - [[Play|https://thenounproject.com/term/play/152052]]:\n"
+#~ " Creative Commons — Attribution, von Zech Nelson.\n"
+#~ " - [[Pause|https://thenounproject.com/term/pause/152046]]:\n"
+#~ " Creative Commons — Attribution, von Zech Nelson.\n"
+#~ " - [[USB|https://thenounproject.com/term/usb/28901]]:\n"
+#~ " Creative Commons — Attribution, von Wilson Joseph.\n"
+#~ " - [[Time|https://thenounproject.com/term/time/6732]]:\n"
+#~ " Creative Commons — Attribution, von Richard de Vos.\n"
+#~ " - [[Printer|https://thenounproject.com/term/printer/146674]]:\n"
+#~ " Creative Commons — Attribution, von Diego Naive.\n"
+#~ " - [[Smart Phones|https://thenounproject.com/term/smartphone/25790]]:\n"
+#~ " Creative Commons — Attribution, von Pham Thi Dieu Linh.\n"
+#~ " - [[Laptop|https://thenounproject.com/term/laptop/6729]]:\n"
+#~ " Public Domain, von Jean Yashu.\n"
+#~ " - [[Love|https://thenounproject.com/term/love/218846/]]:\n"
+#~ " Creative Commons — Attribution, von Thomas Helbig.\n"
+#~ " - [[Survey|https://thenounproject.com/term/survey/1296072]]:\n"
+#~ " Creative Commons — Attribution, von unlimicon.\n"
diff --git a/wiki/src/doc/about/license.es.po b/wiki/src/doc/about/license.es.po
index 627b8f2..cbf2976 100644
--- a/wiki/src/doc/about/license.es.po
+++ b/wiki/src/doc/about/license.es.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2018-11-02 10:56+0100\n"
+"POT-Creation-Date: 2019-02-05 19:15+0000\n"
"PO-Revision-Date: 2018-01-30 14:29+0000\n"
"Last-Translator: Weblate Admin <admin@example.com>\n"
"Language-Team: Spanish <http://translate.tails.boum.org/projects/tails/"
@@ -94,136 +94,289 @@ msgstr ""
"Esta página web usa varias imágenes con distintos derechos de autor, "
"licencias, marcas y términos de distribución:"
+#. type: Bullet: '- '
+msgid ""
+"The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]] "
+"by Ilsur Aptukov from the Noun Project."
+msgstr ""
+
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| " - The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]]\n"
-#| " by Ilsur Aptukov from the Noun Project.\n"
-#| " - Debian logo: Copyright (c) 1999 Software in the Public Interest.\n"
-#| " - Onion logo: registered trademark of The Tor Project, Inc.; the Tails\n"
-#| "project is authorized to use it under certain conditions; licensed under\n"
-#| "Creative Commons Attribution 3.0 United States License.\n"
-#| " - Icons from [[The Noun Project|http://thenounproject.com/]]:\n"
-#| " - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
-#| " Creative Commons - Attribution, by Olivier Guin.\n"
-#| " - [[Code|http://thenounproject.com/term/code/18033/]]:\n"
-#| " Creative Commons — Attribution, by Azis.\n"
-#| " - [[Pen|http://thenounproject.com/term/pen/18907/]]:\n"
-#| " Creative Commons — Attribution, by factor[e] design initiative.\n"
-#| " - [[Loan|http://thenounproject.com/term/loan/19538/]]:\n"
-#| " Public Domain, by Rohith M S.\n"
-#| " - [[User|http://thenounproject.com/term/user/419/]]:\n"
-#| " Creative Commons — Attribution, by Edward Boatman.\n"
-#| " - [[Translation|http://thenounproject.com/term/translation/5735/]]:\n"
-#| " Creative Commons — Attribution, by Joe Mortell.\n"
-#| " - [[Gears|http://thenounproject.com/term/gears/8949/]]:\n"
-#| " Creative Commons — Attribution, by Cris Dobbins.\n"
-#| " - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
-#| " Creative Commons — Attribution, by Cornelius Danger.\n"
-#| " - [[Check Mark|https://thenounproject.com/term/check/4489/]]:\n"
-#| " Public Domain, by Julian Norton.\n"
-#| " - [[Delete|https://thenounproject.com/term/delete/49691/]]:\n"
-#| " Creative Commons — Attribution, by Kervin Markle.\n"
-#| " - [[Play|https://thenounproject.com/term/play/152052]]:\n"
-#| " Creative Commons — Attribution, by Zech Nelson.\n"
-#| " - [[Pause|https://thenounproject.com/term/pause/152046]]:\n"
-#| " Creative Commons — Attribution, by Zech Nelson.\n"
-#| " - [[USB|https://thenounproject.com/term/usb/28901]]:\n"
-#| " Creative Commons — Attribution, by Wilson Joseph.\n"
-#| " - [[Time|https://thenounproject.com/term/time/6732]]:\n"
-#| " Creative Commons — Attribution, by Richard de Vos.\n"
-#| " - [[Printer|https://thenounproject.com/term/printer/146674]]:\n"
-#| " Creative Commons — Attribution, by Diego Naive.\n"
-#| " - [[Smart Phones|https://thenounproject.com/term/smartphone/25790]]:\n"
-#| " Creative Commons — Attribution, by Pham Thi Dieu Linh.\n"
-#| " - [[Laptop|https://thenounproject.com/term/laptop/6729]]:\n"
-#| " Public Domain, by Jean Yashu.\n"
-#| " - [[Love|https://thenounproject.com/term/love/218846/]]:\n"
-#| " Creative Commons — Attribution, by Thomas Helbig.\n"
-#| " - [[Survey|https://thenounproject.com/term/survey/1296072]]:\n"
-#| " Creative Commons — Attribution, by unlimicon.\n"
-msgid ""
-" - The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]]\n"
-" by Ilsur Aptukov from the Noun Project.\n"
-" - Debian logo: Copyright (c) 1999 Software in the Public Interest.\n"
-" - Onion logo: registered trademark of The Tor Project, Inc.; the Tails\n"
-"project is authorized to use it under certain conditions; licensed under\n"
-"Creative Commons Attribution 3.0 United States License.\n"
-" - Icons from [[The Noun Project|http://thenounproject.com/]]:\n"
-" - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
-" Creative Commons - Attribution, by Olivier Guin.\n"
-" - [[Code|http://thenounproject.com/term/code/18033/]]:\n"
-" Creative Commons — Attribution, by Azis.\n"
-" - [[Pen|http://thenounproject.com/term/pen/18907/]]:\n"
-" Creative Commons — Attribution, by factor[e] design initiative.\n"
-" - [[Loan|http://thenounproject.com/term/loan/19538/]]:\n"
-" Public Domain, by Rohith M S.\n"
-" - [[User|http://thenounproject.com/term/user/419/]]:\n"
-" Creative Commons — Attribution, by Edward Boatman.\n"
-" - [[Translation|http://thenounproject.com/term/translation/5735/]]:\n"
-" Creative Commons — Attribution, by Joe Mortell.\n"
-" - [[Gears|http://thenounproject.com/term/gears/8949/]]:\n"
-" Creative Commons — Attribution, by Cris Dobbins.\n"
-" - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
-" Creative Commons — Attribution, by Cornelius Danger.\n"
-" - [[Check Mark|https://thenounproject.com/term/check/4489/]]:\n"
-" Public Domain, by Julian Norton.\n"
-" - [[Delete|https://thenounproject.com/term/delete/49691/]]:\n"
-" Creative Commons — Attribution, by Kervin Markle.\n"
-" - [[Play|https://thenounproject.com/term/play/152052]]:\n"
-" Creative Commons — Attribution, by Zech Nelson.\n"
-" - [[Pause|https://thenounproject.com/term/pause/152046]]:\n"
-" Creative Commons — Attribution, by Zech Nelson.\n"
-" - [[USB|https://thenounproject.com/term/usb/28901]]:\n"
-" Creative Commons — Attribution, by Wilson Joseph.\n"
-" - [[Time|https://thenounproject.com/term/time/6732]]:\n"
-" Creative Commons — Attribution, by Richard de Vos.\n"
-" - [[Printer|https://thenounproject.com/term/printer/146674]]:\n"
-" Creative Commons — Attribution, by Diego Naive.\n"
-" - [[Smart Phones|https://thenounproject.com/term/smartphone/25790]]:\n"
-" Creative Commons — Attribution, by Pham Thi Dieu Linh.\n"
-" - [[Laptop|https://thenounproject.com/term/laptop/6729]]:\n"
-" Public Domain, by Jean Yashu.\n"
-" - [[Love|https://thenounproject.com/term/love/218846/]]:\n"
-" Creative Commons — Attribution, by Thomas Helbig.\n"
-" - [[Survey|https://thenounproject.com/term/survey/1296072]]:\n"
-" Creative Commons — Attribution, by unlimicon.\n"
-" - [[Info|https://thenounproject.com/term/info/808461]]:\n"
-" Creative Commons — Attribution, by icongeek]].\n"
-msgstr ""
-" - El logo de Tails está basado en [[USB|http://thenounproject.com/term/usb/23873/]]\n"
-" por Ilsur Aptukov del Proyecto Noun.\n"
-"- Logo de Debian: Copyright (c) 1999 Software en Public Interest.\n"
-"- Logo de la cebolla: marca registrada para el Proyecto Tor; el proyecto Tails está autorizado\n"
-"para utilizarlo bajo ciertas condiciones; licenciado bajo\n"
-"Creative Commons Attribution 3.0 licenciado en Estados Unidos.\n"
-" - Iconos de [Proyecto Noun|http://thenounproject.com/]]:\n"
-" - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
-"Creative Commons - Atribución, por Olivier Guin.\n"
-" - [[Code|http://thenounproject.com/term/code/18033/]]:\n"
-" Creative Commons — Atribución, por Azis.\n"
-" - [[Pen|http://thenounproject.com/term/pen/18907/]]:\n"
-" Creative Commons — Atribución, por factor[e] design initiative.\n"
-" - [[Loan|http://thenounproject.com/term/loan/19538/]]:\n"
-" Dominio Público, por Rohith M S.\n"
-" - [[User|http://thenounproject.com/term/user/419/]]:\n"
-" Creative Commons — Atribución, por Edward Boatman.\n"
-" - [[Translation|http://thenounproject.com/term/translation/5735/]]:\n"
-" Creative Commons — Atribución, por Joe Mortell.\n"
-" - [[Gears|http://thenounproject.com/term/gears/8949/]]:\n"
-" Creative Commons — Atribución, por Cris Dobbins.\n"
-" - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
-" Creative Commons — Atribución, por Cornelius Danger.\n"
-" - [[Check Mark|https://thenounproject.com/term/check/4489/]]:\n"
-" Domino Público, por Julian Norton.\n"
-" - [[Delete|https://thenounproject.com/term/delete/49691/]]:\n"
-" Creative Commons — Atribución, por Kervin Markle.\n"
-" - [[Play|https://thenounproject.com/term/play/152052]]:\n"
-" Creative Commons — Atribución, por Zech Nelson.\n"
-" - [[Pause|https://thenounproject.com/term/pause/152046]]:\n"
-" Creative Commons — Atribución, por Zech Nelson.\n"
-" - [[Survey|https://thenounproject.com/term/survey/1296072]]:\n"
-" Creative Commons — Attribution, by unlimicon.\n"
+msgid "- Debian logo: Copyright (c) 1999 Software in the Public Interest."
+msgstr ""
+
+#. type: Bullet: '- '
+msgid ""
+"Onion logo: registered trademark of The Tor Project, Inc.; the Tails project "
+"is authorized to use it under certain conditions; licensed under Creative "
+"Commons Attribution 3.0 United States License."
+msgstr ""
+
+#. type: Plain text
+msgid "- Icons from [[The Noun Project|http://thenounproject.com/]]:"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Announcement|http://thenounproject.com/term/announcement/1186/]]: Creative "
+"Commons - Attribution, by Olivier Guin."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Code|http://thenounproject.com/term/code/18033/]]: Creative Commons — "
+"Attribution, by Azis."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Pen|http://thenounproject.com/term/pen/18907/]]: Creative Commons — "
+"Attribution, by factor[e] design initiative."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Loan|http://thenounproject.com/term/loan/19538/]]: Public Domain, by "
+"Rohith M S."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[User|http://thenounproject.com/term/user/419/]]: Creative Commons — "
+"Attribution, by Edward Boatman."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Translation|http://thenounproject.com/term/translation/5735/]]: Creative "
+"Commons — Attribution, by Joe Mortell."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Gears|http://thenounproject.com/term/gears/8949/]]: Creative Commons — "
+"Attribution, by Cris Dobbins."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]: "
+"Creative Commons — Attribution, by Cornelius Danger."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Check Mark|https://thenounproject.com/term/check/4489/]]: Public Domain, "
+"by Julian Norton."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Delete|https://thenounproject.com/term/delete/49691/]]: Creative Commons — "
+"Attribution, by Kervin Markle."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Play|https://thenounproject.com/term/play/152052]]: Creative Commons — "
+"Attribution, by Zech Nelson."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Pause|https://thenounproject.com/term/pause/152046]]: Creative Commons — "
+"Attribution, by Zech Nelson."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[USB|https://thenounproject.com/term/usb/28901]]: Creative Commons — "
+"Attribution, by Wilson Joseph."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Time|https://thenounproject.com/term/time/6732]]: Creative Commons — "
+"Attribution, by Richard de Vos."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Printer|https://thenounproject.com/term/printer/146674]]: Creative Commons "
+"— Attribution, by Diego Naive."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Smart Phones|https://thenounproject.com/term/smartphone/25790]]: Creative "
+"Commons — Attribution, by Pham Thi Dieu Linh."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Laptop|https://thenounproject.com/term/laptop/6729]]: Public Domain, by "
+"Jean Yashu."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Love|https://thenounproject.com/term/love/218846/]]: Creative Commons — "
+"Attribution, by Thomas Helbig."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Survey|https://thenounproject.com/term/survey/1296072]]: Creative Commons "
+"— Attribution, by unlimicon."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Info|https://thenounproject.com/term/info/808461]]: Creative Commons — "
+"Attribution, by icongeek."
+msgstr ""
+
+#, fuzzy
+#~| msgid ""
+#~| " - The Tails logo is based on [[USB|http://thenounproject.com/term/"
+#~| "usb/23873/]]\n"
+#~| " by Ilsur Aptukov from the Noun Project.\n"
+#~| " - Debian logo: Copyright (c) 1999 Software in the Public Interest.\n"
+#~| " - Onion logo: registered trademark of The Tor Project, Inc.; the "
+#~| "Tails\n"
+#~| "project is authorized to use it under certain conditions; licensed "
+#~| "under\n"
+#~| "Creative Commons Attribution 3.0 United States License.\n"
+#~| " - Icons from [[The Noun Project|http://thenounproject.com/]]:\n"
+#~| " - [[Announcement|http://thenounproject.com/term/"
+#~| "announcement/1186/]]:\n"
+#~| " Creative Commons - Attribution, by Olivier Guin.\n"
+#~| " - [[Code|http://thenounproject.com/term/code/18033/]]:\n"
+#~| " Creative Commons — Attribution, by Azis.\n"
+#~| " - [[Pen|http://thenounproject.com/term/pen/18907/]]:\n"
+#~| " Creative Commons — Attribution, by factor[e] design initiative.\n"
+#~| " - [[Loan|http://thenounproject.com/term/loan/19538/]]:\n"
+#~| " Public Domain, by Rohith M S.\n"
+#~| " - [[User|http://thenounproject.com/term/user/419/]]:\n"
+#~| " Creative Commons — Attribution, by Edward Boatman.\n"
+#~| " - [[Translation|http://thenounproject.com/term/translation/5735/]]:\n"
+#~| " Creative Commons — Attribution, by Joe Mortell.\n"
+#~| " - [[Gears|http://thenounproject.com/term/gears/8949/]]:\n"
+#~| " Creative Commons — Attribution, by Cris Dobbins.\n"
+#~| " - [[Graphic Design|http://thenounproject.com/term/"
+#~| "graphic_design/9198/]]:\n"
+#~| " Creative Commons — Attribution, by Cornelius Danger.\n"
+#~| " - [[Check Mark|https://thenounproject.com/term/check/4489/]]:\n"
+#~| " Public Domain, by Julian Norton.\n"
+#~| " - [[Delete|https://thenounproject.com/term/delete/49691/]]:\n"
+#~| " Creative Commons — Attribution, by Kervin Markle.\n"
+#~| " - [[Play|https://thenounproject.com/term/play/152052]]:\n"
+#~| " Creative Commons — Attribution, by Zech Nelson.\n"
+#~| " - [[Pause|https://thenounproject.com/term/pause/152046]]:\n"
+#~| " Creative Commons — Attribution, by Zech Nelson.\n"
+#~| " - [[USB|https://thenounproject.com/term/usb/28901]]:\n"
+#~| " Creative Commons — Attribution, by Wilson Joseph.\n"
+#~| " - [[Time|https://thenounproject.com/term/time/6732]]:\n"
+#~| " Creative Commons — Attribution, by Richard de Vos.\n"
+#~| " - [[Printer|https://thenounproject.com/term/printer/146674]]:\n"
+#~| " Creative Commons — Attribution, by Diego Naive.\n"
+#~| " - [[Smart Phones|https://thenounproject.com/term/"
+#~| "smartphone/25790]]:\n"
+#~| " Creative Commons — Attribution, by Pham Thi Dieu Linh.\n"
+#~| " - [[Laptop|https://thenounproject.com/term/laptop/6729]]:\n"
+#~| " Public Domain, by Jean Yashu.\n"
+#~| " - [[Love|https://thenounproject.com/term/love/218846/]]:\n"
+#~| " Creative Commons — Attribution, by Thomas Helbig.\n"
+#~| " - [[Survey|https://thenounproject.com/term/survey/1296072]]:\n"
+#~| " Creative Commons — Attribution, by unlimicon.\n"
+#~ msgid ""
+#~ " - The Tails logo is based on [[USB|http://thenounproject.com/term/"
+#~ "usb/23873/]]\n"
+#~ " by Ilsur Aptukov from the Noun Project.\n"
+#~ " - Debian logo: Copyright (c) 1999 Software in the Public Interest.\n"
+#~ " - Onion logo: registered trademark of The Tor Project, Inc.; the Tails\n"
+#~ "project is authorized to use it under certain conditions; licensed under\n"
+#~ "Creative Commons Attribution 3.0 United States License.\n"
+#~ " - Icons from [[The Noun Project|http://thenounproject.com/]]:\n"
+#~ " - [[Announcement|http://thenounproject.com/term/"
+#~ "announcement/1186/]]:\n"
+#~ " Creative Commons - Attribution, by Olivier Guin.\n"
+#~ " - [[Code|http://thenounproject.com/term/code/18033/]]:\n"
+#~ " Creative Commons — Attribution, by Azis.\n"
+#~ " - [[Pen|http://thenounproject.com/term/pen/18907/]]:\n"
+#~ " Creative Commons — Attribution, by factor[e] design initiative.\n"
+#~ " - [[Loan|http://thenounproject.com/term/loan/19538/]]:\n"
+#~ " Public Domain, by Rohith M S.\n"
+#~ " - [[User|http://thenounproject.com/term/user/419/]]:\n"
+#~ " Creative Commons — Attribution, by Edward Boatman.\n"
+#~ " - [[Translation|http://thenounproject.com/term/translation/5735/]]:\n"
+#~ " Creative Commons — Attribution, by Joe Mortell.\n"
+#~ " - [[Gears|http://thenounproject.com/term/gears/8949/]]:\n"
+#~ " Creative Commons — Attribution, by Cris Dobbins.\n"
+#~ " - [[Graphic Design|http://thenounproject.com/term/"
+#~ "graphic_design/9198/]]:\n"
+#~ " Creative Commons — Attribution, by Cornelius Danger.\n"
+#~ " - [[Check Mark|https://thenounproject.com/term/check/4489/]]:\n"
+#~ " Public Domain, by Julian Norton.\n"
+#~ " - [[Delete|https://thenounproject.com/term/delete/49691/]]:\n"
+#~ " Creative Commons — Attribution, by Kervin Markle.\n"
+#~ " - [[Play|https://thenounproject.com/term/play/152052]]:\n"
+#~ " Creative Commons — Attribution, by Zech Nelson.\n"
+#~ " - [[Pause|https://thenounproject.com/term/pause/152046]]:\n"
+#~ " Creative Commons — Attribution, by Zech Nelson.\n"
+#~ " - [[USB|https://thenounproject.com/term/usb/28901]]:\n"
+#~ " Creative Commons — Attribution, by Wilson Joseph.\n"
+#~ " - [[Time|https://thenounproject.com/term/time/6732]]:\n"
+#~ " Creative Commons — Attribution, by Richard de Vos.\n"
+#~ " - [[Printer|https://thenounproject.com/term/printer/146674]]:\n"
+#~ " Creative Commons — Attribution, by Diego Naive.\n"
+#~ " - [[Smart Phones|https://thenounproject.com/term/smartphone/25790]]:\n"
+#~ " Creative Commons — Attribution, by Pham Thi Dieu Linh.\n"
+#~ " - [[Laptop|https://thenounproject.com/term/laptop/6729]]:\n"
+#~ " Public Domain, by Jean Yashu.\n"
+#~ " - [[Love|https://thenounproject.com/term/love/218846/]]:\n"
+#~ " Creative Commons — Attribution, by Thomas Helbig.\n"
+#~ " - [[Survey|https://thenounproject.com/term/survey/1296072]]:\n"
+#~ " Creative Commons — Attribution, by unlimicon.\n"
+#~ " - [[Info|https://thenounproject.com/term/info/808461]]:\n"
+#~ " Creative Commons — Attribution, by icongeek]].\n"
+#~ msgstr ""
+#~ " - El logo de Tails está basado en [[USB|http://thenounproject.com/term/"
+#~ "usb/23873/]]\n"
+#~ " por Ilsur Aptukov del Proyecto Noun.\n"
+#~ "- Logo de Debian: Copyright (c) 1999 Software en Public Interest.\n"
+#~ "- Logo de la cebolla: marca registrada para el Proyecto Tor; el proyecto "
+#~ "Tails está autorizado\n"
+#~ "para utilizarlo bajo ciertas condiciones; licenciado bajo\n"
+#~ "Creative Commons Attribution 3.0 licenciado en Estados Unidos.\n"
+#~ " - Iconos de [Proyecto Noun|http://thenounproject.com/]]:\n"
+#~ " - [[Announcement|http://thenounproject.com/term/"
+#~ "announcement/1186/]]:\n"
+#~ "Creative Commons - Atribución, por Olivier Guin.\n"
+#~ " - [[Code|http://thenounproject.com/term/code/18033/]]:\n"
+#~ " Creative Commons — Atribución, por Azis.\n"
+#~ " - [[Pen|http://thenounproject.com/term/pen/18907/]]:\n"
+#~ " Creative Commons — Atribución, por factor[e] design initiative.\n"
+#~ " - [[Loan|http://thenounproject.com/term/loan/19538/]]:\n"
+#~ " Dominio Público, por Rohith M S.\n"
+#~ " - [[User|http://thenounproject.com/term/user/419/]]:\n"
+#~ " Creative Commons — Atribución, por Edward Boatman.\n"
+#~ " - [[Translation|http://thenounproject.com/term/translation/5735/]]:\n"
+#~ " Creative Commons — Atribución, por Joe Mortell.\n"
+#~ " - [[Gears|http://thenounproject.com/term/gears/8949/]]:\n"
+#~ " Creative Commons — Atribución, por Cris Dobbins.\n"
+#~ " - [[Graphic Design|http://thenounproject.com/term/"
+#~ "graphic_design/9198/]]:\n"
+#~ " Creative Commons — Atribución, por Cornelius Danger.\n"
+#~ " - [[Check Mark|https://thenounproject.com/term/check/4489/]]:\n"
+#~ " Domino Público, por Julian Norton.\n"
+#~ " - [[Delete|https://thenounproject.com/term/delete/49691/]]:\n"
+#~ " Creative Commons — Atribución, por Kervin Markle.\n"
+#~ " - [[Play|https://thenounproject.com/term/play/152052]]:\n"
+#~ " Creative Commons — Atribución, por Zech Nelson.\n"
+#~ " - [[Pause|https://thenounproject.com/term/pause/152046]]:\n"
+#~ " Creative Commons — Atribución, por Zech Nelson.\n"
+#~ " - [[Survey|https://thenounproject.com/term/survey/1296072]]:\n"
+#~ " Creative Commons — Attribution, by unlimicon.\n"
#~ msgid "Tails is released under the GNU/GPL (version 3 or above)."
#~ msgstr "Tails se publica bajo la licencia GNU/GPL (versión 3 o superior)."
diff --git a/wiki/src/doc/about/license.fa.po b/wiki/src/doc/about/license.fa.po
index 6c51ee2..9c7d0ca 100644
--- a/wiki/src/doc/about/license.fa.po
+++ b/wiki/src/doc/about/license.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: 2018-11-02 10:56+0100\n"
+"POT-Creation-Date: 2019-02-05 19:15+0000\n"
"PO-Revision-Date: 2015-10-21 10:59+0000\n"
"Last-Translator: sprint5 <translation5@451f.org>\n"
"Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/license/"
@@ -91,101 +91,264 @@ msgstr ""
"این تارنما از عکس‌های زیادی استفاده می‌کند که داری حق نشر، پروانه، نشان‌ تجاری "
"و شرایط توزیع گوناگونی هستند:"
+#. type: Bullet: '- '
+msgid ""
+"The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]] "
+"by Ilsur Aptukov from the Noun Project."
+msgstr ""
+
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| " - The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]]\n"
-#| " by Ilsur Aptukov from the Noun Project.\n"
-#| " - Debian logo: Copyright (c) 1999 Software in the Public Interest.\n"
-#| " - Onion logo: registered trademark of The Tor Project, Inc.; the Tails\n"
-#| "project is authorized to use it under certain conditions; licensed under\n"
-#| "Creative Commons Attribution 3.0 United States License.\n"
-#| " - Icons from [[The Noun Project|http://thenounproject.com/]]:\n"
-#| " - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
-#| " Creative Commons - Attribution, by Olivier Guin.\n"
-#| " - [[Code|http://thenounproject.com/term/code/18033/]]: Creative Commons —\n"
-#| " Attribution, by Azis.\n"
-#| " - [[Pen|http://thenounproject.com/term/pen/18907/]]: Creative Commons —\n"
-#| " Attribution, by factor[e] design initiative.\n"
-#| " - [[Loan|http://thenounproject.com/term/loan/19538/]]: Public Domain, by\n"
-#| " Rohith M S.\n"
-#| " - [[User|http://thenounproject.com/term/user/419/]]: Creative Commons —\n"
-#| " Attribution, by Edward Boatman.\n"
-#| " - [[Translation|http://thenounproject.com/term/translation/5735/]]: Creative\n"
-#| " Commons — Attribution, by Joe Mortell.\n"
-#| " - [[Gears|http://thenounproject.com/term/gears/8949/]]: Creative Commons —\n"
-#| " Attribution, by Cris Dobbins.\n"
-#| " - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
-#| " Creative Commons — Attribution, by Cornelius Danger.\n"
-msgid ""
-" - The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]]\n"
-" by Ilsur Aptukov from the Noun Project.\n"
-" - Debian logo: Copyright (c) 1999 Software in the Public Interest.\n"
-" - Onion logo: registered trademark of The Tor Project, Inc.; the Tails\n"
-"project is authorized to use it under certain conditions; licensed under\n"
-"Creative Commons Attribution 3.0 United States License.\n"
-" - Icons from [[The Noun Project|http://thenounproject.com/]]:\n"
-" - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
-" Creative Commons - Attribution, by Olivier Guin.\n"
-" - [[Code|http://thenounproject.com/term/code/18033/]]:\n"
-" Creative Commons — Attribution, by Azis.\n"
-" - [[Pen|http://thenounproject.com/term/pen/18907/]]:\n"
-" Creative Commons — Attribution, by factor[e] design initiative.\n"
-" - [[Loan|http://thenounproject.com/term/loan/19538/]]:\n"
-" Public Domain, by Rohith M S.\n"
-" - [[User|http://thenounproject.com/term/user/419/]]:\n"
-" Creative Commons — Attribution, by Edward Boatman.\n"
-" - [[Translation|http://thenounproject.com/term/translation/5735/]]:\n"
-" Creative Commons — Attribution, by Joe Mortell.\n"
-" - [[Gears|http://thenounproject.com/term/gears/8949/]]:\n"
-" Creative Commons — Attribution, by Cris Dobbins.\n"
-" - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
-" Creative Commons — Attribution, by Cornelius Danger.\n"
-" - [[Check Mark|https://thenounproject.com/term/check/4489/]]:\n"
-" Public Domain, by Julian Norton.\n"
-" - [[Delete|https://thenounproject.com/term/delete/49691/]]:\n"
-" Creative Commons — Attribution, by Kervin Markle.\n"
-" - [[Play|https://thenounproject.com/term/play/152052]]:\n"
-" Creative Commons — Attribution, by Zech Nelson.\n"
-" - [[Pause|https://thenounproject.com/term/pause/152046]]:\n"
-" Creative Commons — Attribution, by Zech Nelson.\n"
-" - [[USB|https://thenounproject.com/term/usb/28901]]:\n"
-" Creative Commons — Attribution, by Wilson Joseph.\n"
-" - [[Time|https://thenounproject.com/term/time/6732]]:\n"
-" Creative Commons — Attribution, by Richard de Vos.\n"
-" - [[Printer|https://thenounproject.com/term/printer/146674]]:\n"
-" Creative Commons — Attribution, by Diego Naive.\n"
-" - [[Smart Phones|https://thenounproject.com/term/smartphone/25790]]:\n"
-" Creative Commons — Attribution, by Pham Thi Dieu Linh.\n"
-" - [[Laptop|https://thenounproject.com/term/laptop/6729]]:\n"
-" Public Domain, by Jean Yashu.\n"
-" - [[Love|https://thenounproject.com/term/love/218846/]]:\n"
-" Creative Commons — Attribution, by Thomas Helbig.\n"
-" - [[Survey|https://thenounproject.com/term/survey/1296072]]:\n"
-" Creative Commons — Attribution, by unlimicon.\n"
-" - [[Info|https://thenounproject.com/term/info/808461]]:\n"
-" Creative Commons — Attribution, by icongeek]].\n"
-msgstr ""
-" - نشان‌وارهٔ تیلز بر اساس [[USB|http://thenounproject.com/term/usb/23873/]]\n"
-" و توسط ایلسور آبتوکف از پروژهٔ Noun طراحی شده‌است.\n"
-" - نشان‌وارهٔ دبیان: حق نشر (c) 1999 Software in the Public Interest.\n"
-" - نشان‌وارهٔ پیاز تور: نشان تجاری ثبت‌شدهٔ پروژهٔ تور, Inc.; پروژهٔ تیلز، تحت پروانهٔ\n"
-"Creative Commons Attribution 3.0 United States License اجازه دارد در شرایط خاصی از این نشان‌واره استفاده کند.\n"
-" - نمایه‌های [[پروژهٔ Noun|http://thenounproject.com/]]:\n"
-" - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
-" Creative Commons - ارجاع, توسط الیویه گویین.\n"
-" - [[Code|http://thenounproject.com/term/code/18033/]]: کریتیو کامنز —\n"
-" ارجاع, توسط آزیس.\n"
-" - [[Pen|http://thenounproject.com/term/pen/18907/]]: کریتیو کامنز —\n"
-" ارجاع, by factor[e] design initiative.\n"
-" - [[Loan|http://thenounproject.com/term/loan/19538/]]: پروانهٔ مالکیت عمومی,توسط روهیس م.س..\n"
-" - [[User|http://thenounproject.com/term/user/419/]]: کریتیو کامنز —\n"
-" ارجاع, توسط ادوارد بوتمن.\n"
-" - [[Translation|http://thenounproject.com/term/translation/5735/]]: کریتیو کامنز — ارجاع, توسط جو مورتل.\n"
-" - [[Gears|http://thenounproject.com/term/gears/8949/]]: کریتیو کامنز —\n"
-" ارجاع, توسط کریس دابینز.\n"
-" - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
-" کریتیو کامنز — ارجاع, توسط کورنلیوس دنجر.\n"
+msgid "- Debian logo: Copyright (c) 1999 Software in the Public Interest."
+msgstr ""
+
+#. type: Bullet: '- '
+msgid ""
+"Onion logo: registered trademark of The Tor Project, Inc.; the Tails project "
+"is authorized to use it under certain conditions; licensed under Creative "
+"Commons Attribution 3.0 United States License."
+msgstr ""
+
+#. type: Plain text
+msgid "- Icons from [[The Noun Project|http://thenounproject.com/]]:"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Announcement|http://thenounproject.com/term/announcement/1186/]]: Creative "
+"Commons - Attribution, by Olivier Guin."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Code|http://thenounproject.com/term/code/18033/]]: Creative Commons — "
+"Attribution, by Azis."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Pen|http://thenounproject.com/term/pen/18907/]]: Creative Commons — "
+"Attribution, by factor[e] design initiative."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Loan|http://thenounproject.com/term/loan/19538/]]: Public Domain, by "
+"Rohith M S."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[User|http://thenounproject.com/term/user/419/]]: Creative Commons — "
+"Attribution, by Edward Boatman."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Translation|http://thenounproject.com/term/translation/5735/]]: Creative "
+"Commons — Attribution, by Joe Mortell."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Gears|http://thenounproject.com/term/gears/8949/]]: Creative Commons — "
+"Attribution, by Cris Dobbins."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]: "
+"Creative Commons — Attribution, by Cornelius Danger."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Check Mark|https://thenounproject.com/term/check/4489/]]: Public Domain, "
+"by Julian Norton."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Delete|https://thenounproject.com/term/delete/49691/]]: Creative Commons — "
+"Attribution, by Kervin Markle."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Play|https://thenounproject.com/term/play/152052]]: Creative Commons — "
+"Attribution, by Zech Nelson."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Pause|https://thenounproject.com/term/pause/152046]]: Creative Commons — "
+"Attribution, by Zech Nelson."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[USB|https://thenounproject.com/term/usb/28901]]: Creative Commons — "
+"Attribution, by Wilson Joseph."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Time|https://thenounproject.com/term/time/6732]]: Creative Commons — "
+"Attribution, by Richard de Vos."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Printer|https://thenounproject.com/term/printer/146674]]: Creative Commons "
+"— Attribution, by Diego Naive."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Smart Phones|https://thenounproject.com/term/smartphone/25790]]: Creative "
+"Commons — Attribution, by Pham Thi Dieu Linh."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Laptop|https://thenounproject.com/term/laptop/6729]]: Public Domain, by "
+"Jean Yashu."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Love|https://thenounproject.com/term/love/218846/]]: Creative Commons — "
+"Attribution, by Thomas Helbig."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Survey|https://thenounproject.com/term/survey/1296072]]: Creative Commons "
+"— Attribution, by unlimicon."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Info|https://thenounproject.com/term/info/808461]]: Creative Commons — "
+"Attribution, by icongeek."
+msgstr ""
+
+#, fuzzy
+#~| msgid ""
+#~| " - The Tails logo is based on [[USB|http://thenounproject.com/term/"
+#~| "usb/23873/]]\n"
+#~| " by Ilsur Aptukov from the Noun Project.\n"
+#~| " - Debian logo: Copyright (c) 1999 Software in the Public Interest.\n"
+#~| " - Onion logo: registered trademark of The Tor Project, Inc.; the "
+#~| "Tails\n"
+#~| "project is authorized to use it under certain conditions; licensed "
+#~| "under\n"
+#~| "Creative Commons Attribution 3.0 United States License.\n"
+#~| " - Icons from [[The Noun Project|http://thenounproject.com/]]:\n"
+#~| " - [[Announcement|http://thenounproject.com/term/"
+#~| "announcement/1186/]]:\n"
+#~| " Creative Commons - Attribution, by Olivier Guin.\n"
+#~| " - [[Code|http://thenounproject.com/term/code/18033/]]: Creative "
+#~| "Commons —\n"
+#~| " Attribution, by Azis.\n"
+#~| " - [[Pen|http://thenounproject.com/term/pen/18907/]]: Creative "
+#~| "Commons —\n"
+#~| " Attribution, by factor[e] design initiative.\n"
+#~| " - [[Loan|http://thenounproject.com/term/loan/19538/]]: Public "
+#~| "Domain, by\n"
+#~| " Rohith M S.\n"
+#~| " - [[User|http://thenounproject.com/term/user/419/]]: Creative "
+#~| "Commons —\n"
+#~| " Attribution, by Edward Boatman.\n"
+#~| " - [[Translation|http://thenounproject.com/term/translation/5735/]]: "
+#~| "Creative\n"
+#~| " Commons — Attribution, by Joe Mortell.\n"
+#~| " - [[Gears|http://thenounproject.com/term/gears/8949/]]: Creative "
+#~| "Commons —\n"
+#~| " Attribution, by Cris Dobbins.\n"
+#~| " - [[Graphic Design|http://thenounproject.com/term/"
+#~| "graphic_design/9198/]]:\n"
+#~| " Creative Commons — Attribution, by Cornelius Danger.\n"
+#~ msgid ""
+#~ " - The Tails logo is based on [[USB|http://thenounproject.com/term/"
+#~ "usb/23873/]]\n"
+#~ " by Ilsur Aptukov from the Noun Project.\n"
+#~ " - Debian logo: Copyright (c) 1999 Software in the Public Interest.\n"
+#~ " - Onion logo: registered trademark of The Tor Project, Inc.; the Tails\n"
+#~ "project is authorized to use it under certain conditions; licensed under\n"
+#~ "Creative Commons Attribution 3.0 United States License.\n"
+#~ " - Icons from [[The Noun Project|http://thenounproject.com/]]:\n"
+#~ " - [[Announcement|http://thenounproject.com/term/"
+#~ "announcement/1186/]]:\n"
+#~ " Creative Commons - Attribution, by Olivier Guin.\n"
+#~ " - [[Code|http://thenounproject.com/term/code/18033/]]:\n"
+#~ " Creative Commons — Attribution, by Azis.\n"
+#~ " - [[Pen|http://thenounproject.com/term/pen/18907/]]:\n"
+#~ " Creative Commons — Attribution, by factor[e] design initiative.\n"
+#~ " - [[Loan|http://thenounproject.com/term/loan/19538/]]:\n"
+#~ " Public Domain, by Rohith M S.\n"
+#~ " - [[User|http://thenounproject.com/term/user/419/]]:\n"
+#~ " Creative Commons — Attribution, by Edward Boatman.\n"
+#~ " - [[Translation|http://thenounproject.com/term/translation/5735/]]:\n"
+#~ " Creative Commons — Attribution, by Joe Mortell.\n"
+#~ " - [[Gears|http://thenounproject.com/term/gears/8949/]]:\n"
+#~ " Creative Commons — Attribution, by Cris Dobbins.\n"
+#~ " - [[Graphic Design|http://thenounproject.com/term/"
+#~ "graphic_design/9198/]]:\n"
+#~ " Creative Commons — Attribution, by Cornelius Danger.\n"
+#~ " - [[Check Mark|https://thenounproject.com/term/check/4489/]]:\n"
+#~ " Public Domain, by Julian Norton.\n"
+#~ " - [[Delete|https://thenounproject.com/term/delete/49691/]]:\n"
+#~ " Creative Commons — Attribution, by Kervin Markle.\n"
+#~ " - [[Play|https://thenounproject.com/term/play/152052]]:\n"
+#~ " Creative Commons — Attribution, by Zech Nelson.\n"
+#~ " - [[Pause|https://thenounproject.com/term/pause/152046]]:\n"
+#~ " Creative Commons — Attribution, by Zech Nelson.\n"
+#~ " - [[USB|https://thenounproject.com/term/usb/28901]]:\n"
+#~ " Creative Commons — Attribution, by Wilson Joseph.\n"
+#~ " - [[Time|https://thenounproject.com/term/time/6732]]:\n"
+#~ " Creative Commons — Attribution, by Richard de Vos.\n"
+#~ " - [[Printer|https://thenounproject.com/term/printer/146674]]:\n"
+#~ " Creative Commons — Attribution, by Diego Naive.\n"
+#~ " - [[Smart Phones|https://thenounproject.com/term/smartphone/25790]]:\n"
+#~ " Creative Commons — Attribution, by Pham Thi Dieu Linh.\n"
+#~ " - [[Laptop|https://thenounproject.com/term/laptop/6729]]:\n"
+#~ " Public Domain, by Jean Yashu.\n"
+#~ " - [[Love|https://thenounproject.com/term/love/218846/]]:\n"
+#~ " Creative Commons — Attribution, by Thomas Helbig.\n"
+#~ " - [[Survey|https://thenounproject.com/term/survey/1296072]]:\n"
+#~ " Creative Commons — Attribution, by unlimicon.\n"
+#~ " - [[Info|https://thenounproject.com/term/info/808461]]:\n"
+#~ " Creative Commons — Attribution, by icongeek]].\n"
+#~ msgstr ""
+#~ " - نشان‌وارهٔ تیلز بر اساس [[USB|http://thenounproject.com/term/"
+#~ "usb/23873/]]\n"
+#~ " و توسط ایلسور آبتوکف از پروژهٔ Noun طراحی شده‌است.\n"
+#~ " - نشان‌وارهٔ دبیان: حق نشر (c) 1999 Software in the Public Interest.\n"
+#~ " - نشان‌وارهٔ پیاز تور: نشان تجاری ثبت‌شدهٔ پروژهٔ تور, Inc.; پروژهٔ تیلز، تحت "
+#~ "پروانهٔ\n"
+#~ "Creative Commons Attribution 3.0 United States License اجازه دارد در "
+#~ "شرایط خاصی از این نشان‌واره استفاده کند.\n"
+#~ " - نمایه‌های [[پروژهٔ Noun|http://thenounproject.com/]]:\n"
+#~ " - [[Announcement|http://thenounproject.com/term/"
+#~ "announcement/1186/]]:\n"
+#~ " Creative Commons - ارجاع, توسط الیویه گویین.\n"
+#~ " - [[Code|http://thenounproject.com/term/code/18033/]]: کریتیو کامنز "
+#~ "—\n"
+#~ " ارجاع, توسط آزیس.\n"
+#~ " - [[Pen|http://thenounproject.com/term/pen/18907/]]: کریتیو کامنز —\n"
+#~ " ارجاع, by factor[e] design initiative.\n"
+#~ " - [[Loan|http://thenounproject.com/term/loan/19538/]]: پروانهٔ مالکیت "
+#~ "عمومی,توسط روهیس م.س..\n"
+#~ " - [[User|http://thenounproject.com/term/user/419/]]: کریتیو کامنز —\n"
+#~ " ارجاع, توسط ادوارد بوتمن.\n"
+#~ " - [[Translation|http://thenounproject.com/term/translation/5735/]]: "
+#~ "کریتیو کامنز — ارجاع, توسط جو مورتل.\n"
+#~ " - [[Gears|http://thenounproject.com/term/gears/8949/]]: کریتیو کامنز "
+#~ "—\n"
+#~ " ارجاع, توسط کریس دابینز.\n"
+#~ " - [[Graphic Design|http://thenounproject.com/term/"
+#~ "graphic_design/9198/]]:\n"
+#~ " کریتیو کامنز — ارجاع, توسط کورنلیوس دنجر.\n"
#, fuzzy
#~| msgid ""
diff --git a/wiki/src/doc/about/license.fr.po b/wiki/src/doc/about/license.fr.po
index 77028e38..a437036 100644
--- a/wiki/src/doc/about/license.fr.po
+++ b/wiki/src/doc/about/license.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2018-11-02 10:56+0100\n"
+"POT-Creation-Date: 2019-02-05 19:15+0000\n"
"PO-Revision-Date: 2018-01-18 13:40+0000\n"
"Last-Translator: AtomiKe <tails@atomike.ninja>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -93,148 +93,306 @@ msgstr ""
"Ce site utilise plusieurs images aux copyrights, licences, marques déposées "
"et termes de distribution distincts :"
+#. type: Bullet: '- '
+msgid ""
+"The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]] "
+"by Ilsur Aptukov from the Noun Project."
+msgstr ""
+
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| " - The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]]\n"
-#| " by Ilsur Aptukov from the Noun Project.\n"
-#| " - Debian logo: Copyright (c) 1999 Software in the Public Interest.\n"
-#| " - Onion logo: registered trademark of The Tor Project, Inc.; the Tails\n"
-#| "project is authorized to use it under certain conditions; licensed under\n"
-#| "Creative Commons Attribution 3.0 United States License.\n"
-#| " - Icons from [[The Noun Project|http://thenounproject.com/]]:\n"
-#| " - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
-#| " Creative Commons - Attribution, by Olivier Guin.\n"
-#| " - [[Code|http://thenounproject.com/term/code/18033/]]:\n"
-#| " Creative Commons — Attribution, by Azis.\n"
-#| " - [[Pen|http://thenounproject.com/term/pen/18907/]]:\n"
-#| " Creative Commons — Attribution, by factor[e] design initiative.\n"
-#| " - [[Loan|http://thenounproject.com/term/loan/19538/]]:\n"
-#| " Public Domain, by Rohith M S.\n"
-#| " - [[User|http://thenounproject.com/term/user/419/]]:\n"
-#| " Creative Commons — Attribution, by Edward Boatman.\n"
-#| " - [[Translation|http://thenounproject.com/term/translation/5735/]]:\n"
-#| " Creative Commons — Attribution, by Joe Mortell.\n"
-#| " - [[Gears|http://thenounproject.com/term/gears/8949/]]:\n"
-#| " Creative Commons — Attribution, by Cris Dobbins.\n"
-#| " - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
-#| " Creative Commons — Attribution, by Cornelius Danger.\n"
-#| " - [[Check Mark|https://thenounproject.com/term/check/4489/]]:\n"
-#| " Public Domain, by Julian Norton.\n"
-#| " - [[Delete|https://thenounproject.com/term/delete/49691/]]:\n"
-#| " Creative Commons — Attribution, by Kervin Markle.\n"
-#| " - [[Play|https://thenounproject.com/term/play/152052]]:\n"
-#| " Creative Commons — Attribution, by Zech Nelson.\n"
-#| " - [[Pause|https://thenounproject.com/term/pause/152046]]:\n"
-#| " Creative Commons — Attribution, by Zech Nelson.\n"
-#| " - [[USB|https://thenounproject.com/term/usb/28901]]:\n"
-#| " Creative Commons — Attribution, by Wilson Joseph.\n"
-#| " - [[Time|https://thenounproject.com/term/time/6732]]:\n"
-#| " Creative Commons — Attribution, by Richard de Vos.\n"
-#| " - [[Printer|https://thenounproject.com/term/printer/146674]]:\n"
-#| " Creative Commons — Attribution, by Diego Naive.\n"
-#| " - [[Smart Phones|https://thenounproject.com/term/smartphone/25790]]:\n"
-#| " Creative Commons — Attribution, by Pham Thi Dieu Linh.\n"
-#| " - [[Laptop|https://thenounproject.com/term/laptop/6729]]:\n"
-#| " Public Domain, by Jean Yashu.\n"
-#| " - [[Love|https://thenounproject.com/term/love/218846/]]:\n"
-#| " Creative Commons — Attribution, by Thomas Helbig.\n"
-#| " - [[Survey|https://thenounproject.com/term/survey/1296072]]:\n"
-#| " Creative Commons — Attribution, by unlimicon.\n"
+#, fuzzy
+#| msgid "Debian logo: Copyright (c) 1999 Software in the Public Interest."
+msgid "- Debian logo: Copyright (c) 1999 Software in the Public Interest."
+msgstr ""
+"Logo Debian : Copyright (c) 1999 Software in the public Interest (\"Logiciel "
+"dans l'intérêt public\")."
+
+#. type: Bullet: '- '
+msgid ""
+"Onion logo: registered trademark of The Tor Project, Inc.; the Tails project "
+"is authorized to use it under certain conditions; licensed under Creative "
+"Commons Attribution 3.0 United States License."
+msgstr ""
+
+#. type: Plain text
+msgid "- Icons from [[The Noun Project|http://thenounproject.com/]]:"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Announcement|http://thenounproject.com/term/announcement/1186/]]: Creative "
+"Commons - Attribution, by Olivier Guin."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Code|http://thenounproject.com/term/code/18033/]]: Creative Commons — "
+"Attribution, by Azis."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Pen|http://thenounproject.com/term/pen/18907/]]: Creative Commons — "
+"Attribution, by factor[e] design initiative."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Loan|http://thenounproject.com/term/loan/19538/]]: Public Domain, by "
+"Rohith M S."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[User|http://thenounproject.com/term/user/419/]]: Creative Commons — "
+"Attribution, by Edward Boatman."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Translation|http://thenounproject.com/term/translation/5735/]]: Creative "
+"Commons — Attribution, by Joe Mortell."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Gears|http://thenounproject.com/term/gears/8949/]]: Creative Commons — "
+"Attribution, by Cris Dobbins."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]: "
+"Creative Commons — Attribution, by Cornelius Danger."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Check Mark|https://thenounproject.com/term/check/4489/]]: Public Domain, "
+"by Julian Norton."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Delete|https://thenounproject.com/term/delete/49691/]]: Creative Commons — "
+"Attribution, by Kervin Markle."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Play|https://thenounproject.com/term/play/152052]]: Creative Commons — "
+"Attribution, by Zech Nelson."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Pause|https://thenounproject.com/term/pause/152046]]: Creative Commons — "
+"Attribution, by Zech Nelson."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[USB|https://thenounproject.com/term/usb/28901]]: Creative Commons — "
+"Attribution, by Wilson Joseph."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Time|https://thenounproject.com/term/time/6732]]: Creative Commons — "
+"Attribution, by Richard de Vos."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Printer|https://thenounproject.com/term/printer/146674]]: Creative Commons "
+"— Attribution, by Diego Naive."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Smart Phones|https://thenounproject.com/term/smartphone/25790]]: Creative "
+"Commons — Attribution, by Pham Thi Dieu Linh."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Laptop|https://thenounproject.com/term/laptop/6729]]: Public Domain, by "
+"Jean Yashu."
+msgstr ""
+
+#. type: Bullet: ' - '
msgid ""
-" - The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]]\n"
-" by Ilsur Aptukov from the Noun Project.\n"
-" - Debian logo: Copyright (c) 1999 Software in the Public Interest.\n"
-" - Onion logo: registered trademark of The Tor Project, Inc.; the Tails\n"
-"project is authorized to use it under certain conditions; licensed under\n"
-"Creative Commons Attribution 3.0 United States License.\n"
-" - Icons from [[The Noun Project|http://thenounproject.com/]]:\n"
-" - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
-" Creative Commons - Attribution, by Olivier Guin.\n"
-" - [[Code|http://thenounproject.com/term/code/18033/]]:\n"
-" Creative Commons — Attribution, by Azis.\n"
-" - [[Pen|http://thenounproject.com/term/pen/18907/]]:\n"
-" Creative Commons — Attribution, by factor[e] design initiative.\n"
-" - [[Loan|http://thenounproject.com/term/loan/19538/]]:\n"
-" Public Domain, by Rohith M S.\n"
-" - [[User|http://thenounproject.com/term/user/419/]]:\n"
-" Creative Commons — Attribution, by Edward Boatman.\n"
-" - [[Translation|http://thenounproject.com/term/translation/5735/]]:\n"
-" Creative Commons — Attribution, by Joe Mortell.\n"
-" - [[Gears|http://thenounproject.com/term/gears/8949/]]:\n"
-" Creative Commons — Attribution, by Cris Dobbins.\n"
-" - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
-" Creative Commons — Attribution, by Cornelius Danger.\n"
-" - [[Check Mark|https://thenounproject.com/term/check/4489/]]:\n"
-" Public Domain, by Julian Norton.\n"
-" - [[Delete|https://thenounproject.com/term/delete/49691/]]:\n"
-" Creative Commons — Attribution, by Kervin Markle.\n"
-" - [[Play|https://thenounproject.com/term/play/152052]]:\n"
-" Creative Commons — Attribution, by Zech Nelson.\n"
-" - [[Pause|https://thenounproject.com/term/pause/152046]]:\n"
-" Creative Commons — Attribution, by Zech Nelson.\n"
-" - [[USB|https://thenounproject.com/term/usb/28901]]:\n"
-" Creative Commons — Attribution, by Wilson Joseph.\n"
-" - [[Time|https://thenounproject.com/term/time/6732]]:\n"
-" Creative Commons — Attribution, by Richard de Vos.\n"
-" - [[Printer|https://thenounproject.com/term/printer/146674]]:\n"
-" Creative Commons — Attribution, by Diego Naive.\n"
-" - [[Smart Phones|https://thenounproject.com/term/smartphone/25790]]:\n"
-" Creative Commons — Attribution, by Pham Thi Dieu Linh.\n"
-" - [[Laptop|https://thenounproject.com/term/laptop/6729]]:\n"
-" Public Domain, by Jean Yashu.\n"
-" - [[Love|https://thenounproject.com/term/love/218846/]]:\n"
-" Creative Commons — Attribution, by Thomas Helbig.\n"
-" - [[Survey|https://thenounproject.com/term/survey/1296072]]:\n"
-" Creative Commons — Attribution, by unlimicon.\n"
-" - [[Info|https://thenounproject.com/term/info/808461]]:\n"
-" Creative Commons — Attribution, by icongeek]].\n"
-msgstr ""
-" - Le logo Tails est basé sur [[USB|http://thenounproject.com/term/usb/23873/]]\n"
-" par Ilsur Aptukov du Noun Project.\n"
-" - Logo Debian : Copyright (c) 1999 Software in the Public Interest.\n"
-" - Logo Onion : marque déposée par The Tor Project, Inc. ; le projet Tails\n"
-"est autorisé à l'utiliser sous certaines conditions ; sous licence\n"
-"Creative Commons Attribution 3.0 États-Unis.\n"
-" - Icônes de [[The Noun Project|http://thenounproject.com/]] :\n"
-" - [[Announcement|http://thenounproject.com/term/announcement/1186/]] :\n"
-" Creative Commons - Attribution, par Olivier Guin.\n"
-" - [[Code|http://thenounproject.com/term/code/18033/]] :\n"
-" Creative Commons — Attribution, par Azis.\n"
-" - [[Pen|http://thenounproject.com/term/pen/18907/]] :\n"
-" Creative Commons — Attribution, par factor[e] design initiative.\n"
-" - [[Loan|http://thenounproject.com/term/loan/19538/]] :\n"
-" Domaine public, par Rohith M S.\n"
-" - [[User|http://thenounproject.com/term/user/419/]] :\n"
-" Creative Commons — Attribution, par Edward Boatman.\n"
-" - [[Translation|http://thenounproject.com/term/translation/5735/]] :\n"
-" Creative Commons — Attribution, par Joe Mortell.\n"
-" - [[Gears|http://thenounproject.com/term/gears/8949/]] :\n"
-" Creative Commons — Attribution, par Cris Dobbins.\n"
-" - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]] :\n"
-" Creative Commons — Attribution, par Cornelius Danger.\n"
-" - [[Check Mark|https://thenounproject.com/term/check/4489/]] :\n"
-" Domaine public, par Julian Norton.\n"
-" - [[Delete|https://thenounproject.com/term/delete/49691/]] :\n"
-" Creative Commons — Attribution, par Kervin Markle.\n"
-" - [[Play|https://thenounproject.com/term/play/152052]] :\n"
-" Creative Commons — Attribution, par Zech Nelson.\n"
-" - [[Pause|https://thenounproject.com/term/pause/152046]] :\n"
-" Creative Commons — Attribution, par Zech Nelson.\n"
-" - [[USB|https://thenounproject.com/term/usb/28901]] :\n"
-" Creative Commons — Attribution, par Wilson Joseph.\n"
-" - [[Time|https://thenounproject.com/term/time/6732]] :\n"
-" Creative Commons — Attribution, par Richard de Vos.\n"
-" - [[Printer|https://thenounproject.com/term/printer/146674]] :\n"
-" Creative Commons — Attribution, par Diego Naive.\n"
-" - [[Smart Phones|https://thenounproject.com/term/smartphone/25790]] :\n"
-" Creative Commons — Attribution, par Pham Thi Dieu Linh.\n"
-" - [[Laptop|https://thenounproject.com/term/laptop/6729]] :\n"
-" Domaine public, par Jean Yashu.\n"
-" - [[Love|https://thenounproject.com/term/love/218846/]] :\n"
-" Creative Commons — Attribution, par Thomas Helbig.\n"
-" - [[Survey|https://thenounproject.com/term/survey/1296072]] :\n"
-" Creative Commons — Attribution, par unlimicon.\n"
+"[[Love|https://thenounproject.com/term/love/218846/]]: Creative Commons — "
+"Attribution, by Thomas Helbig."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Survey|https://thenounproject.com/term/survey/1296072]]: Creative Commons "
+"— Attribution, by unlimicon."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Info|https://thenounproject.com/term/info/808461]]: Creative Commons — "
+"Attribution, by icongeek."
+msgstr ""
+
+#, fuzzy
+#~| msgid ""
+#~| " - The Tails logo is based on [[USB|http://thenounproject.com/term/"
+#~| "usb/23873/]]\n"
+#~| " by Ilsur Aptukov from the Noun Project.\n"
+#~| " - Debian logo: Copyright (c) 1999 Software in the Public Interest.\n"
+#~| " - Onion logo: registered trademark of The Tor Project, Inc.; the "
+#~| "Tails\n"
+#~| "project is authorized to use it under certain conditions; licensed "
+#~| "under\n"
+#~| "Creative Commons Attribution 3.0 United States License.\n"
+#~| " - Icons from [[The Noun Project|http://thenounproject.com/]]:\n"
+#~| " - [[Announcement|http://thenounproject.com/term/"
+#~| "announcement/1186/]]:\n"
+#~| " Creative Commons - Attribution, by Olivier Guin.\n"
+#~| " - [[Code|http://thenounproject.com/term/code/18033/]]:\n"
+#~| " Creative Commons — Attribution, by Azis.\n"
+#~| " - [[Pen|http://thenounproject.com/term/pen/18907/]]:\n"
+#~| " Creative Commons — Attribution, by factor[e] design initiative.\n"
+#~| " - [[Loan|http://thenounproject.com/term/loan/19538/]]:\n"
+#~| " Public Domain, by Rohith M S.\n"
+#~| " - [[User|http://thenounproject.com/term/user/419/]]:\n"
+#~| " Creative Commons — Attribution, by Edward Boatman.\n"
+#~| " - [[Translation|http://thenounproject.com/term/translation/5735/]]:\n"
+#~| " Creative Commons — Attribution, by Joe Mortell.\n"
+#~| " - [[Gears|http://thenounproject.com/term/gears/8949/]]:\n"
+#~| " Creative Commons — Attribution, by Cris Dobbins.\n"
+#~| " - [[Graphic Design|http://thenounproject.com/term/"
+#~| "graphic_design/9198/]]:\n"
+#~| " Creative Commons — Attribution, by Cornelius Danger.\n"
+#~| " - [[Check Mark|https://thenounproject.com/term/check/4489/]]:\n"
+#~| " Public Domain, by Julian Norton.\n"
+#~| " - [[Delete|https://thenounproject.com/term/delete/49691/]]:\n"
+#~| " Creative Commons — Attribution, by Kervin Markle.\n"
+#~| " - [[Play|https://thenounproject.com/term/play/152052]]:\n"
+#~| " Creative Commons — Attribution, by Zech Nelson.\n"
+#~| " - [[Pause|https://thenounproject.com/term/pause/152046]]:\n"
+#~| " Creative Commons — Attribution, by Zech Nelson.\n"
+#~| " - [[USB|https://thenounproject.com/term/usb/28901]]:\n"
+#~| " Creative Commons — Attribution, by Wilson Joseph.\n"
+#~| " - [[Time|https://thenounproject.com/term/time/6732]]:\n"
+#~| " Creative Commons — Attribution, by Richard de Vos.\n"
+#~| " - [[Printer|https://thenounproject.com/term/printer/146674]]:\n"
+#~| " Creative Commons — Attribution, by Diego Naive.\n"
+#~| " - [[Smart Phones|https://thenounproject.com/term/"
+#~| "smartphone/25790]]:\n"
+#~| " Creative Commons — Attribution, by Pham Thi Dieu Linh.\n"
+#~| " - [[Laptop|https://thenounproject.com/term/laptop/6729]]:\n"
+#~| " Public Domain, by Jean Yashu.\n"
+#~| " - [[Love|https://thenounproject.com/term/love/218846/]]:\n"
+#~| " Creative Commons — Attribution, by Thomas Helbig.\n"
+#~| " - [[Survey|https://thenounproject.com/term/survey/1296072]]:\n"
+#~| " Creative Commons — Attribution, by unlimicon.\n"
+#~ msgid ""
+#~ " - The Tails logo is based on [[USB|http://thenounproject.com/term/"
+#~ "usb/23873/]]\n"
+#~ " by Ilsur Aptukov from the Noun Project.\n"
+#~ " - Debian logo: Copyright (c) 1999 Software in the Public Interest.\n"
+#~ " - Onion logo: registered trademark of The Tor Project, Inc.; the Tails\n"
+#~ "project is authorized to use it under certain conditions; licensed under\n"
+#~ "Creative Commons Attribution 3.0 United States License.\n"
+#~ " - Icons from [[The Noun Project|http://thenounproject.com/]]:\n"
+#~ " - [[Announcement|http://thenounproject.com/term/"
+#~ "announcement/1186/]]:\n"
+#~ " Creative Commons - Attribution, by Olivier Guin.\n"
+#~ " - [[Code|http://thenounproject.com/term/code/18033/]]:\n"
+#~ " Creative Commons — Attribution, by Azis.\n"
+#~ " - [[Pen|http://thenounproject.com/term/pen/18907/]]:\n"
+#~ " Creative Commons — Attribution, by factor[e] design initiative.\n"
+#~ " - [[Loan|http://thenounproject.com/term/loan/19538/]]:\n"
+#~ " Public Domain, by Rohith M S.\n"
+#~ " - [[User|http://thenounproject.com/term/user/419/]]:\n"
+#~ " Creative Commons — Attribution, by Edward Boatman.\n"
+#~ " - [[Translation|http://thenounproject.com/term/translation/5735/]]:\n"
+#~ " Creative Commons — Attribution, by Joe Mortell.\n"
+#~ " - [[Gears|http://thenounproject.com/term/gears/8949/]]:\n"
+#~ " Creative Commons — Attribution, by Cris Dobbins.\n"
+#~ " - [[Graphic Design|http://thenounproject.com/term/"
+#~ "graphic_design/9198/]]:\n"
+#~ " Creative Commons — Attribution, by Cornelius Danger.\n"
+#~ " - [[Check Mark|https://thenounproject.com/term/check/4489/]]:\n"
+#~ " Public Domain, by Julian Norton.\n"
+#~ " - [[Delete|https://thenounproject.com/term/delete/49691/]]:\n"
+#~ " Creative Commons — Attribution, by Kervin Markle.\n"
+#~ " - [[Play|https://thenounproject.com/term/play/152052]]:\n"
+#~ " Creative Commons — Attribution, by Zech Nelson.\n"
+#~ " - [[Pause|https://thenounproject.com/term/pause/152046]]:\n"
+#~ " Creative Commons — Attribution, by Zech Nelson.\n"
+#~ " - [[USB|https://thenounproject.com/term/usb/28901]]:\n"
+#~ " Creative Commons — Attribution, by Wilson Joseph.\n"
+#~ " - [[Time|https://thenounproject.com/term/time/6732]]:\n"
+#~ " Creative Commons — Attribution, by Richard de Vos.\n"
+#~ " - [[Printer|https://thenounproject.com/term/printer/146674]]:\n"
+#~ " Creative Commons — Attribution, by Diego Naive.\n"
+#~ " - [[Smart Phones|https://thenounproject.com/term/smartphone/25790]]:\n"
+#~ " Creative Commons — Attribution, by Pham Thi Dieu Linh.\n"
+#~ " - [[Laptop|https://thenounproject.com/term/laptop/6729]]:\n"
+#~ " Public Domain, by Jean Yashu.\n"
+#~ " - [[Love|https://thenounproject.com/term/love/218846/]]:\n"
+#~ " Creative Commons — Attribution, by Thomas Helbig.\n"
+#~ " - [[Survey|https://thenounproject.com/term/survey/1296072]]:\n"
+#~ " Creative Commons — Attribution, by unlimicon.\n"
+#~ " - [[Info|https://thenounproject.com/term/info/808461]]:\n"
+#~ " Creative Commons — Attribution, by icongeek]].\n"
+#~ msgstr ""
+#~ " - Le logo Tails est basé sur [[USB|http://thenounproject.com/term/"
+#~ "usb/23873/]]\n"
+#~ " par Ilsur Aptukov du Noun Project.\n"
+#~ " - Logo Debian : Copyright (c) 1999 Software in the Public Interest.\n"
+#~ " - Logo Onion : marque déposée par The Tor Project, Inc. ; le projet "
+#~ "Tails\n"
+#~ "est autorisé à l'utiliser sous certaines conditions ; sous licence\n"
+#~ "Creative Commons Attribution 3.0 États-Unis.\n"
+#~ " - Icônes de [[The Noun Project|http://thenounproject.com/]] :\n"
+#~ " - [[Announcement|http://thenounproject.com/term/"
+#~ "announcement/1186/]] :\n"
+#~ " Creative Commons - Attribution, par Olivier Guin.\n"
+#~ " - [[Code|http://thenounproject.com/term/code/18033/]] :\n"
+#~ " Creative Commons — Attribution, par Azis.\n"
+#~ " - [[Pen|http://thenounproject.com/term/pen/18907/]] :\n"
+#~ " Creative Commons — Attribution, par factor[e] design initiative.\n"
+#~ " - [[Loan|http://thenounproject.com/term/loan/19538/]] :\n"
+#~ " Domaine public, par Rohith M S.\n"
+#~ " - [[User|http://thenounproject.com/term/user/419/]] :\n"
+#~ " Creative Commons — Attribution, par Edward Boatman.\n"
+#~ " - [[Translation|http://thenounproject.com/term/translation/5735/]] :\n"
+#~ " Creative Commons — Attribution, par Joe Mortell.\n"
+#~ " - [[Gears|http://thenounproject.com/term/gears/8949/]] :\n"
+#~ " Creative Commons — Attribution, par Cris Dobbins.\n"
+#~ " - [[Graphic Design|http://thenounproject.com/term/"
+#~ "graphic_design/9198/]] :\n"
+#~ " Creative Commons — Attribution, par Cornelius Danger.\n"
+#~ " - [[Check Mark|https://thenounproject.com/term/check/4489/]] :\n"
+#~ " Domaine public, par Julian Norton.\n"
+#~ " - [[Delete|https://thenounproject.com/term/delete/49691/]] :\n"
+#~ " Creative Commons — Attribution, par Kervin Markle.\n"
+#~ " - [[Play|https://thenounproject.com/term/play/152052]] :\n"
+#~ " Creative Commons — Attribution, par Zech Nelson.\n"
+#~ " - [[Pause|https://thenounproject.com/term/pause/152046]] :\n"
+#~ " Creative Commons — Attribution, par Zech Nelson.\n"
+#~ " - [[USB|https://thenounproject.com/term/usb/28901]] :\n"
+#~ " Creative Commons — Attribution, par Wilson Joseph.\n"
+#~ " - [[Time|https://thenounproject.com/term/time/6732]] :\n"
+#~ " Creative Commons — Attribution, par Richard de Vos.\n"
+#~ " - [[Printer|https://thenounproject.com/term/printer/146674]] :\n"
+#~ " Creative Commons — Attribution, par Diego Naive.\n"
+#~ " - [[Smart Phones|https://thenounproject.com/term/"
+#~ "smartphone/25790]] :\n"
+#~ " Creative Commons — Attribution, par Pham Thi Dieu Linh.\n"
+#~ " - [[Laptop|https://thenounproject.com/term/laptop/6729]] :\n"
+#~ " Domaine public, par Jean Yashu.\n"
+#~ " - [[Love|https://thenounproject.com/term/love/218846/]] :\n"
+#~ " Creative Commons — Attribution, par Thomas Helbig.\n"
+#~ " - [[Survey|https://thenounproject.com/term/survey/1296072]] :\n"
+#~ " Creative Commons — Attribution, par unlimicon.\n"
#~ msgid "Tails is released under the GNU/GPL (version 3 or above)."
#~ msgstr "Tails est publié sous la licence GNU/GPL (version 3 ou supérieure)."
@@ -275,8 +433,3 @@ msgstr ""
#~ "courrier postal, pour un coût modique. Si vous avez seulement besoin d'un "
#~ "ou deux paquets source, Tails peut vous envoyer une copie électronique "
#~ "des paquets individuels."
-
-#~ msgid "Debian logo: Copyright (c) 1999 Software in the Public Interest."
-#~ msgstr ""
-#~ "Logo Debian : Copyright (c) 1999 Software in the public Interest "
-#~ "(\"Logiciel dans l'intérêt public\")."
diff --git a/wiki/src/doc/about/license.it.po b/wiki/src/doc/about/license.it.po
index a9ffe5c..f2705bd 100644
--- a/wiki/src/doc/about/license.it.po
+++ b/wiki/src/doc/about/license.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION it\n"
-"POT-Creation-Date: 2018-11-02 10:56+0100\n"
+"POT-Creation-Date: 2019-02-05 19:15+0000\n"
"PO-Revision-Date: 2017-07-09 14:39+0000\n"
"Last-Translator: Zeyev <zeyev@autistici.org>\n"
"Language-Team: ita <transitails@inventati.org>\n"
@@ -88,110 +88,274 @@ msgstr ""
"Questo sito web utilizza parecchie immagini con differenti copyright, "
"licenze, trademark e termini di distribuzione:"
+#. type: Bullet: '- '
+msgid ""
+"The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]] "
+"by Ilsur Aptukov from the Noun Project."
+msgstr ""
+
+#. type: Plain text
+#, fuzzy
+#| msgid "Debian logo: Copyright (c) 1999 Software in the Public Interest."
+msgid "- Debian logo: Copyright (c) 1999 Software in the Public Interest."
+msgstr ""
+"Logo Debian : Copyright (c) 1999 Software in the public Interest (\"Logiciel "
+"dans l'intérêt public\")."
+
+#. type: Bullet: '- '
+msgid ""
+"Onion logo: registered trademark of The Tor Project, Inc.; the Tails project "
+"is authorized to use it under certain conditions; licensed under Creative "
+"Commons Attribution 3.0 United States License."
+msgstr ""
+
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| " - The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]]\n"
-#| " by Ilsur Aptukov from the Noun Project.\n"
-#| " - Debian logo: Copyright (c) 1999 Software in the Public Interest.\n"
-#| " - Onion logo: registered trademark of The Tor Project, Inc.; the Tails\n"
-#| "project is authorized to use it under certain conditions; licensed under\n"
-#| "Creative Commons Attribution 3.0 United States License.\n"
-#| " - Icons from [[The Noun Project|http://thenounproject.com/]]:\n"
-#| " - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
-#| " Creative Commons - Attribution, by Olivier Guin.\n"
-#| " - [[Code|http://thenounproject.com/term/code/18033/]]:\n"
-#| " Creative Commons — Attribution, by Azis.\n"
-#| " - [[Pen|http://thenounproject.com/term/pen/18907/]]:\n"
-#| " Creative Commons — Attribution, by factor[e] design initiative.\n"
-#| " - [[Loan|http://thenounproject.com/term/loan/19538/]]:\n"
-#| " Public Domain, by Rohith M S.\n"
-#| " - [[User|http://thenounproject.com/term/user/419/]]:\n"
-#| " Creative Commons — Attribution, by Edward Boatman.\n"
-#| " - [[Translation|http://thenounproject.com/term/translation/5735/]]:\n"
-#| " Creative Commons — Attribution, by Joe Mortell.\n"
-#| " - [[Gears|http://thenounproject.com/term/gears/8949/]]:\n"
-#| " Creative Commons — Attribution, by Cris Dobbins.\n"
-#| " - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
-#| " Creative Commons — Attribution, by Cornelius Danger.\n"
-#| " - [[Check Mark|https://thenounproject.com/term/check/4489/]]:\n"
-#| " Public Domain, by Julian Norton.\n"
-#| " - [[Delete|https://thenounproject.com/term/delete/49691/]]:\n"
-#| " Creative Commons — Attribution, by Kervin Markle.\n"
-#| " - [[Play|https://thenounproject.com/term/play/152052]]:\n"
-#| " Creative Commons — Attribution, by Zech Nelson.\n"
-#| " - [[Pause|https://thenounproject.com/term/pause/152046]]:\n"
-#| " Creative Commons — Attribution, by Zech Nelson.\n"
-msgid ""
-" - The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]]\n"
-" by Ilsur Aptukov from the Noun Project.\n"
-" - Debian logo: Copyright (c) 1999 Software in the Public Interest.\n"
-" - Onion logo: registered trademark of The Tor Project, Inc.; the Tails\n"
-"project is authorized to use it under certain conditions; licensed under\n"
-"Creative Commons Attribution 3.0 United States License.\n"
-" - Icons from [[The Noun Project|http://thenounproject.com/]]:\n"
-" - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
-" Creative Commons - Attribution, by Olivier Guin.\n"
-" - [[Code|http://thenounproject.com/term/code/18033/]]:\n"
-" Creative Commons — Attribution, by Azis.\n"
-" - [[Pen|http://thenounproject.com/term/pen/18907/]]:\n"
-" Creative Commons — Attribution, by factor[e] design initiative.\n"
-" - [[Loan|http://thenounproject.com/term/loan/19538/]]:\n"
-" Public Domain, by Rohith M S.\n"
-" - [[User|http://thenounproject.com/term/user/419/]]:\n"
-" Creative Commons — Attribution, by Edward Boatman.\n"
-" - [[Translation|http://thenounproject.com/term/translation/5735/]]:\n"
-" Creative Commons — Attribution, by Joe Mortell.\n"
-" - [[Gears|http://thenounproject.com/term/gears/8949/]]:\n"
-" Creative Commons — Attribution, by Cris Dobbins.\n"
-" - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
-" Creative Commons — Attribution, by Cornelius Danger.\n"
-" - [[Check Mark|https://thenounproject.com/term/check/4489/]]:\n"
-" Public Domain, by Julian Norton.\n"
-" - [[Delete|https://thenounproject.com/term/delete/49691/]]:\n"
-" Creative Commons — Attribution, by Kervin Markle.\n"
-" - [[Play|https://thenounproject.com/term/play/152052]]:\n"
-" Creative Commons — Attribution, by Zech Nelson.\n"
-" - [[Pause|https://thenounproject.com/term/pause/152046]]:\n"
-" Creative Commons — Attribution, by Zech Nelson.\n"
-" - [[USB|https://thenounproject.com/term/usb/28901]]:\n"
-" Creative Commons — Attribution, by Wilson Joseph.\n"
-" - [[Time|https://thenounproject.com/term/time/6732]]:\n"
-" Creative Commons — Attribution, by Richard de Vos.\n"
-" - [[Printer|https://thenounproject.com/term/printer/146674]]:\n"
-" Creative Commons — Attribution, by Diego Naive.\n"
-" - [[Smart Phones|https://thenounproject.com/term/smartphone/25790]]:\n"
-" Creative Commons — Attribution, by Pham Thi Dieu Linh.\n"
-" - [[Laptop|https://thenounproject.com/term/laptop/6729]]:\n"
-" Public Domain, by Jean Yashu.\n"
-" - [[Love|https://thenounproject.com/term/love/218846/]]:\n"
-" Creative Commons — Attribution, by Thomas Helbig.\n"
-" - [[Survey|https://thenounproject.com/term/survey/1296072]]:\n"
-" Creative Commons — Attribution, by unlimicon.\n"
-" - [[Info|https://thenounproject.com/term/info/808461]]:\n"
-" Creative Commons — Attribution, by icongeek]].\n"
-msgstr ""
-" - Il logo di Tails è basato su [[USB|http://thenounproject.com/term/usb/23873/]]\n"
-" di Ilsur Aptukov pubblicato su the Noun Project.\n"
-" - il logo di Debian è Copyright (c) 1999 Software in the Public Interest.\n"
-" - il logo Onion: è un trademark registrato da The Tor Project, Inc.; il progettoTails è autorizzato ad usarlo sotto certe condizioni; Creative Commons Attribution 3.0 United States License.\n"
-" - Icone da [[The Noun Project|http://thenounproject.com/]]:\n"
-" - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
-" Creative Commons - Attribution, di Olivier Guin.\n"
-" - [[Code|http://thenounproject.com/term/code/18033/]]: Creative Commons —\n"
-" Attribution, di Azis.\n"
-" - [[Pen|http://thenounproject.com/term/pen/18907/]]: Creative Commons —\n"
-" Attribution, di factor[e] design initiative.\n"
-" - [[Loan|http://thenounproject.com/term/loan/19538/]]: Public Domain, di\n"
-" Rohith M S.\n"
-" - [[User|http://thenounproject.com/term/user/419/]]: Creative Commons —\n"
-" Attribution, di Edward Boatman.\n"
-" - [[Translation|http://thenounproject.com/term/translation/5735/]]: Creative\n"
-" Commons — Attribution, di Joe Mortell.\n"
-" - [[Gears|http://thenounproject.com/term/gears/8949/]]: Creative Commons —\n"
-" Attribution, di Cris Dobbins.\n"
-" - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
-" Creative Commons — Attribution, di Cornelius Danger.\n"
+msgid "- Icons from [[The Noun Project|http://thenounproject.com/]]:"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Announcement|http://thenounproject.com/term/announcement/1186/]]: Creative "
+"Commons - Attribution, by Olivier Guin."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Code|http://thenounproject.com/term/code/18033/]]: Creative Commons — "
+"Attribution, by Azis."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Pen|http://thenounproject.com/term/pen/18907/]]: Creative Commons — "
+"Attribution, by factor[e] design initiative."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Loan|http://thenounproject.com/term/loan/19538/]]: Public Domain, by "
+"Rohith M S."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[User|http://thenounproject.com/term/user/419/]]: Creative Commons — "
+"Attribution, by Edward Boatman."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Translation|http://thenounproject.com/term/translation/5735/]]: Creative "
+"Commons — Attribution, by Joe Mortell."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Gears|http://thenounproject.com/term/gears/8949/]]: Creative Commons — "
+"Attribution, by Cris Dobbins."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]: "
+"Creative Commons — Attribution, by Cornelius Danger."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Check Mark|https://thenounproject.com/term/check/4489/]]: Public Domain, "
+"by Julian Norton."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Delete|https://thenounproject.com/term/delete/49691/]]: Creative Commons — "
+"Attribution, by Kervin Markle."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Play|https://thenounproject.com/term/play/152052]]: Creative Commons — "
+"Attribution, by Zech Nelson."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Pause|https://thenounproject.com/term/pause/152046]]: Creative Commons — "
+"Attribution, by Zech Nelson."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[USB|https://thenounproject.com/term/usb/28901]]: Creative Commons — "
+"Attribution, by Wilson Joseph."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Time|https://thenounproject.com/term/time/6732]]: Creative Commons — "
+"Attribution, by Richard de Vos."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Printer|https://thenounproject.com/term/printer/146674]]: Creative Commons "
+"— Attribution, by Diego Naive."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Smart Phones|https://thenounproject.com/term/smartphone/25790]]: Creative "
+"Commons — Attribution, by Pham Thi Dieu Linh."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Laptop|https://thenounproject.com/term/laptop/6729]]: Public Domain, by "
+"Jean Yashu."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Love|https://thenounproject.com/term/love/218846/]]: Creative Commons — "
+"Attribution, by Thomas Helbig."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Survey|https://thenounproject.com/term/survey/1296072]]: Creative Commons "
+"— Attribution, by unlimicon."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Info|https://thenounproject.com/term/info/808461]]: Creative Commons — "
+"Attribution, by icongeek."
+msgstr ""
+
+#, fuzzy
+#~| msgid ""
+#~| " - The Tails logo is based on [[USB|http://thenounproject.com/term/"
+#~| "usb/23873/]]\n"
+#~| " by Ilsur Aptukov from the Noun Project.\n"
+#~| " - Debian logo: Copyright (c) 1999 Software in the Public Interest.\n"
+#~| " - Onion logo: registered trademark of The Tor Project, Inc.; the "
+#~| "Tails\n"
+#~| "project is authorized to use it under certain conditions; licensed "
+#~| "under\n"
+#~| "Creative Commons Attribution 3.0 United States License.\n"
+#~| " - Icons from [[The Noun Project|http://thenounproject.com/]]:\n"
+#~| " - [[Announcement|http://thenounproject.com/term/"
+#~| "announcement/1186/]]:\n"
+#~| " Creative Commons - Attribution, by Olivier Guin.\n"
+#~| " - [[Code|http://thenounproject.com/term/code/18033/]]:\n"
+#~| " Creative Commons — Attribution, by Azis.\n"
+#~| " - [[Pen|http://thenounproject.com/term/pen/18907/]]:\n"
+#~| " Creative Commons — Attribution, by factor[e] design initiative.\n"
+#~| " - [[Loan|http://thenounproject.com/term/loan/19538/]]:\n"
+#~| " Public Domain, by Rohith M S.\n"
+#~| " - [[User|http://thenounproject.com/term/user/419/]]:\n"
+#~| " Creative Commons — Attribution, by Edward Boatman.\n"
+#~| " - [[Translation|http://thenounproject.com/term/translation/5735/]]:\n"
+#~| " Creative Commons — Attribution, by Joe Mortell.\n"
+#~| " - [[Gears|http://thenounproject.com/term/gears/8949/]]:\n"
+#~| " Creative Commons — Attribution, by Cris Dobbins.\n"
+#~| " - [[Graphic Design|http://thenounproject.com/term/"
+#~| "graphic_design/9198/]]:\n"
+#~| " Creative Commons — Attribution, by Cornelius Danger.\n"
+#~| " - [[Check Mark|https://thenounproject.com/term/check/4489/]]:\n"
+#~| " Public Domain, by Julian Norton.\n"
+#~| " - [[Delete|https://thenounproject.com/term/delete/49691/]]:\n"
+#~| " Creative Commons — Attribution, by Kervin Markle.\n"
+#~| " - [[Play|https://thenounproject.com/term/play/152052]]:\n"
+#~| " Creative Commons — Attribution, by Zech Nelson.\n"
+#~| " - [[Pause|https://thenounproject.com/term/pause/152046]]:\n"
+#~| " Creative Commons — Attribution, by Zech Nelson.\n"
+#~ msgid ""
+#~ " - The Tails logo is based on [[USB|http://thenounproject.com/term/"
+#~ "usb/23873/]]\n"
+#~ " by Ilsur Aptukov from the Noun Project.\n"
+#~ " - Debian logo: Copyright (c) 1999 Software in the Public Interest.\n"
+#~ " - Onion logo: registered trademark of The Tor Project, Inc.; the Tails\n"
+#~ "project is authorized to use it under certain conditions; licensed under\n"
+#~ "Creative Commons Attribution 3.0 United States License.\n"
+#~ " - Icons from [[The Noun Project|http://thenounproject.com/]]:\n"
+#~ " - [[Announcement|http://thenounproject.com/term/"
+#~ "announcement/1186/]]:\n"
+#~ " Creative Commons - Attribution, by Olivier Guin.\n"
+#~ " - [[Code|http://thenounproject.com/term/code/18033/]]:\n"
+#~ " Creative Commons — Attribution, by Azis.\n"
+#~ " - [[Pen|http://thenounproject.com/term/pen/18907/]]:\n"
+#~ " Creative Commons — Attribution, by factor[e] design initiative.\n"
+#~ " - [[Loan|http://thenounproject.com/term/loan/19538/]]:\n"
+#~ " Public Domain, by Rohith M S.\n"
+#~ " - [[User|http://thenounproject.com/term/user/419/]]:\n"
+#~ " Creative Commons — Attribution, by Edward Boatman.\n"
+#~ " - [[Translation|http://thenounproject.com/term/translation/5735/]]:\n"
+#~ " Creative Commons — Attribution, by Joe Mortell.\n"
+#~ " - [[Gears|http://thenounproject.com/term/gears/8949/]]:\n"
+#~ " Creative Commons — Attribution, by Cris Dobbins.\n"
+#~ " - [[Graphic Design|http://thenounproject.com/term/"
+#~ "graphic_design/9198/]]:\n"
+#~ " Creative Commons — Attribution, by Cornelius Danger.\n"
+#~ " - [[Check Mark|https://thenounproject.com/term/check/4489/]]:\n"
+#~ " Public Domain, by Julian Norton.\n"
+#~ " - [[Delete|https://thenounproject.com/term/delete/49691/]]:\n"
+#~ " Creative Commons — Attribution, by Kervin Markle.\n"
+#~ " - [[Play|https://thenounproject.com/term/play/152052]]:\n"
+#~ " Creative Commons — Attribution, by Zech Nelson.\n"
+#~ " - [[Pause|https://thenounproject.com/term/pause/152046]]:\n"
+#~ " Creative Commons — Attribution, by Zech Nelson.\n"
+#~ " - [[USB|https://thenounproject.com/term/usb/28901]]:\n"
+#~ " Creative Commons — Attribution, by Wilson Joseph.\n"
+#~ " - [[Time|https://thenounproject.com/term/time/6732]]:\n"
+#~ " Creative Commons — Attribution, by Richard de Vos.\n"
+#~ " - [[Printer|https://thenounproject.com/term/printer/146674]]:\n"
+#~ " Creative Commons — Attribution, by Diego Naive.\n"
+#~ " - [[Smart Phones|https://thenounproject.com/term/smartphone/25790]]:\n"
+#~ " Creative Commons — Attribution, by Pham Thi Dieu Linh.\n"
+#~ " - [[Laptop|https://thenounproject.com/term/laptop/6729]]:\n"
+#~ " Public Domain, by Jean Yashu.\n"
+#~ " - [[Love|https://thenounproject.com/term/love/218846/]]:\n"
+#~ " Creative Commons — Attribution, by Thomas Helbig.\n"
+#~ " - [[Survey|https://thenounproject.com/term/survey/1296072]]:\n"
+#~ " Creative Commons — Attribution, by unlimicon.\n"
+#~ " - [[Info|https://thenounproject.com/term/info/808461]]:\n"
+#~ " Creative Commons — Attribution, by icongeek]].\n"
+#~ msgstr ""
+#~ " - Il logo di Tails è basato su [[USB|http://thenounproject.com/term/"
+#~ "usb/23873/]]\n"
+#~ " di Ilsur Aptukov pubblicato su the Noun Project.\n"
+#~ " - il logo di Debian è Copyright (c) 1999 Software in the Public "
+#~ "Interest.\n"
+#~ " - il logo Onion: è un trademark registrato da The Tor Project, Inc.; il "
+#~ "progettoTails è autorizzato ad usarlo sotto certe condizioni; Creative "
+#~ "Commons Attribution 3.0 United States License.\n"
+#~ " - Icone da [[The Noun Project|http://thenounproject.com/]]:\n"
+#~ " - [[Announcement|http://thenounproject.com/term/"
+#~ "announcement/1186/]]:\n"
+#~ " Creative Commons - Attribution, di Olivier Guin.\n"
+#~ " - [[Code|http://thenounproject.com/term/code/18033/]]: Creative "
+#~ "Commons —\n"
+#~ " Attribution, di Azis.\n"
+#~ " - [[Pen|http://thenounproject.com/term/pen/18907/]]: Creative Commons "
+#~ "—\n"
+#~ " Attribution, di factor[e] design initiative.\n"
+#~ " - [[Loan|http://thenounproject.com/term/loan/19538/]]: Public Domain, "
+#~ "di\n"
+#~ " Rohith M S.\n"
+#~ " - [[User|http://thenounproject.com/term/user/419/]]: Creative Commons "
+#~ "—\n"
+#~ " Attribution, di Edward Boatman.\n"
+#~ " - [[Translation|http://thenounproject.com/term/translation/5735/]]: "
+#~ "Creative\n"
+#~ " Commons — Attribution, di Joe Mortell.\n"
+#~ " - [[Gears|http://thenounproject.com/term/gears/8949/]]: Creative "
+#~ "Commons —\n"
+#~ " Attribution, di Cris Dobbins.\n"
+#~ " - [[Graphic Design|http://thenounproject.com/term/"
+#~ "graphic_design/9198/]]:\n"
+#~ " Creative Commons — Attribution, di Cornelius Danger.\n"
#~ msgid "Tails is released under the GNU/GPL (version 3 or above)."
#~ msgstr ""
@@ -232,8 +396,3 @@ msgstr ""
#~ "postale, per il solo prezzo di spedizione. Se necessiti soltanto uno o "
#~ "due pacchetti di sorgenti, Tails può organizzarsi con te e inviarti "
#~ "elettronicamente una copia dei singoli pacchetti."
-
-#~ msgid "Debian logo: Copyright (c) 1999 Software in the Public Interest."
-#~ msgstr ""
-#~ "Logo Debian : Copyright (c) 1999 Software in the public Interest "
-#~ "(\"Logiciel dans l'intérêt public\")."
diff --git a/wiki/src/doc/about/license.mdwn b/wiki/src/doc/about/license.mdwn
index dcee1f1..359c56e 100644
--- a/wiki/src/doc/about/license.mdwn
+++ b/wiki/src/doc/about/license.mdwn
@@ -30,50 +30,73 @@ Website
This website uses several images with distinct copyright, licenses, trademarks
and distribution terms:
- - The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]]
- by Ilsur Aptukov from the Noun Project.
- - Debian logo: Copyright (c) 1999 Software in the Public Interest.
- - Onion logo: registered trademark of The Tor Project, Inc.; the Tails
-project is authorized to use it under certain conditions; licensed under
-Creative Commons Attribution 3.0 United States License.
- - Icons from [[The Noun Project|http://thenounproject.com/]]:
- - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:
- Creative Commons - Attribution, by Olivier Guin.
- - [[Code|http://thenounproject.com/term/code/18033/]]:
- Creative Commons — Attribution, by Azis.
- - [[Pen|http://thenounproject.com/term/pen/18907/]]:
- Creative Commons — Attribution, by factor[e] design initiative.
- - [[Loan|http://thenounproject.com/term/loan/19538/]]:
- Public Domain, by Rohith M S.
- - [[User|http://thenounproject.com/term/user/419/]]:
- Creative Commons — Attribution, by Edward Boatman.
- - [[Translation|http://thenounproject.com/term/translation/5735/]]:
- Creative Commons — Attribution, by Joe Mortell.
- - [[Gears|http://thenounproject.com/term/gears/8949/]]:
- Creative Commons — Attribution, by Cris Dobbins.
- - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:
- Creative Commons — Attribution, by Cornelius Danger.
- - [[Check Mark|https://thenounproject.com/term/check/4489/]]:
- Public Domain, by Julian Norton.
- - [[Delete|https://thenounproject.com/term/delete/49691/]]:
- Creative Commons — Attribution, by Kervin Markle.
- - [[Play|https://thenounproject.com/term/play/152052]]:
- Creative Commons — Attribution, by Zech Nelson.
- - [[Pause|https://thenounproject.com/term/pause/152046]]:
- Creative Commons — Attribution, by Zech Nelson.
- - [[USB|https://thenounproject.com/term/usb/28901]]:
- Creative Commons — Attribution, by Wilson Joseph.
- - [[Time|https://thenounproject.com/term/time/6732]]:
- Creative Commons — Attribution, by Richard de Vos.
- - [[Printer|https://thenounproject.com/term/printer/146674]]:
- Creative Commons — Attribution, by Diego Naive.
- - [[Smart Phones|https://thenounproject.com/term/smartphone/25790]]:
- Creative Commons — Attribution, by Pham Thi Dieu Linh.
- - [[Laptop|https://thenounproject.com/term/laptop/6729]]:
- Public Domain, by Jean Yashu.
- - [[Love|https://thenounproject.com/term/love/218846/]]:
- Creative Commons — Attribution, by Thomas Helbig.
- - [[Survey|https://thenounproject.com/term/survey/1296072]]:
- Creative Commons — Attribution, by unlimicon.
- - [[Info|https://thenounproject.com/term/info/808461]]:
- Creative Commons — Attribution, by icongeek]].
+- The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]]
+ by Ilsur Aptukov from the Noun Project.
+
+- Debian logo: Copyright (c) 1999 Software in the Public Interest.
+
+- Onion logo: registered trademark of The Tor Project, Inc.; the Tails
+ project is authorized to use it under certain conditions; licensed under
+ Creative Commons Attribution 3.0 United States License.
+
+- Icons from [[The Noun Project|http://thenounproject.com/]]:
+
+ - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:
+ Creative Commons - Attribution, by Olivier Guin.
+
+ - [[Code|http://thenounproject.com/term/code/18033/]]:
+ Creative Commons — Attribution, by Azis.
+
+ - [[Pen|http://thenounproject.com/term/pen/18907/]]:
+ Creative Commons — Attribution, by factor[e] design initiative.
+
+ - [[Loan|http://thenounproject.com/term/loan/19538/]]:
+ Public Domain, by Rohith M S.
+
+ - [[User|http://thenounproject.com/term/user/419/]]:
+ Creative Commons — Attribution, by Edward Boatman.
+
+ - [[Translation|http://thenounproject.com/term/translation/5735/]]:
+ Creative Commons — Attribution, by Joe Mortell.
+
+ - [[Gears|http://thenounproject.com/term/gears/8949/]]:
+ Creative Commons — Attribution, by Cris Dobbins.
+
+ - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:
+ Creative Commons — Attribution, by Cornelius Danger.
+
+ - [[Check Mark|https://thenounproject.com/term/check/4489/]]:
+ Public Domain, by Julian Norton.
+
+ - [[Delete|https://thenounproject.com/term/delete/49691/]]:
+ Creative Commons — Attribution, by Kervin Markle.
+
+ - [[Play|https://thenounproject.com/term/play/152052]]:
+ Creative Commons — Attribution, by Zech Nelson.
+
+ - [[Pause|https://thenounproject.com/term/pause/152046]]:
+ Creative Commons — Attribution, by Zech Nelson.
+
+ - [[USB|https://thenounproject.com/term/usb/28901]]:
+ Creative Commons — Attribution, by Wilson Joseph.
+
+ - [[Time|https://thenounproject.com/term/time/6732]]:
+ Creative Commons — Attribution, by Richard de Vos.
+
+ - [[Printer|https://thenounproject.com/term/printer/146674]]:
+ Creative Commons — Attribution, by Diego Naive.
+
+ - [[Smart Phones|https://thenounproject.com/term/smartphone/25790]]:
+ Creative Commons — Attribution, by Pham Thi Dieu Linh.
+
+ - [[Laptop|https://thenounproject.com/term/laptop/6729]]:
+ Public Domain, by Jean Yashu.
+
+ - [[Love|https://thenounproject.com/term/love/218846/]]:
+ Creative Commons — Attribution, by Thomas Helbig.
+
+ - [[Survey|https://thenounproject.com/term/survey/1296072]]:
+ Creative Commons — Attribution, by unlimicon.
+
+ - [[Info|https://thenounproject.com/term/info/808461]]:
+ Creative Commons — Attribution, by icongeek.
diff --git a/wiki/src/doc/about/license.pt.po b/wiki/src/doc/about/license.pt.po
index 5e979b1..be29201 100644
--- a/wiki/src/doc/about/license.pt.po
+++ b/wiki/src/doc/about/license.pt.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: 2018-11-02 10:56+0100\n"
+"POT-Creation-Date: 2019-02-05 19:15+0000\n"
"PO-Revision-Date: 2014-05-23 12:05-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -81,104 +81,270 @@ msgstr ""
"Este site usa várias imagens com distintos direitos de cópia, licenças, "
"marcas e termos de distribuição:"
+#. type: Bullet: '- '
+msgid ""
+"The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]] "
+"by Ilsur Aptukov from the Noun Project."
+msgstr ""
+
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| " - The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]]\n"
-#| " by Ilsur Aptukov from the Noun Project.\n"
-#| " - Debian logo: Copyright (c) 1999 Software in the Public Interest.\n"
-#| " - Onion logo: registered trademark of The Tor Project, Inc.; the Tails\n"
-#| "project is authorized to use it under certain conditions; licensed under\n"
-#| "Creative Commons Attribution 3.0 United States License.\n"
-#| " - Icons from [[The Noun Project|http://thenounproject.com/]]:\n"
-#| " - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
-#| " Creative Commons - Attribution, by Olivier Guin.\n"
-#| " - [[Code|http://thenounproject.com/term/code/18033/]]: Creative Commons —\n"
-#| " Attribution, by Azis.\n"
-#| " - [[Pen|http://thenounproject.com/term/pen/18907/]]: Creative Commons —\n"
-#| " Attribution, by factor[e] design initiative.\n"
-#| " - [[Loan|http://thenounproject.com/term/loan/19538/]]: Public Domain, by\n"
-#| " Rohith M S.\n"
-#| " - [[User|http://thenounproject.com/term/user/419/]]: Creative Commons —\n"
-#| " Attribution, by Edward Boatman.\n"
-#| " - [[Translation|http://thenounproject.com/term/translation/5735/]]: Creative\n"
-#| " Commons — Attribution, by Joe Mortell.\n"
-#| " - [[Gears|http://thenounproject.com/term/gears/8949/]]: Creative Commons —\n"
-#| " Attribution, by Cris Dobbins.\n"
-#| " - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
-#| " Creative Commons — Attribution, by Cornelius Danger.\n"
-msgid ""
-" - The Tails logo is based on [[USB|http://thenounproject.com/term/usb/23873/]]\n"
-" by Ilsur Aptukov from the Noun Project.\n"
-" - Debian logo: Copyright (c) 1999 Software in the Public Interest.\n"
-" - Onion logo: registered trademark of The Tor Project, Inc.; the Tails\n"
-"project is authorized to use it under certain conditions; licensed under\n"
-"Creative Commons Attribution 3.0 United States License.\n"
-" - Icons from [[The Noun Project|http://thenounproject.com/]]:\n"
-" - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
-" Creative Commons - Attribution, by Olivier Guin.\n"
-" - [[Code|http://thenounproject.com/term/code/18033/]]:\n"
-" Creative Commons — Attribution, by Azis.\n"
-" - [[Pen|http://thenounproject.com/term/pen/18907/]]:\n"
-" Creative Commons — Attribution, by factor[e] design initiative.\n"
-" - [[Loan|http://thenounproject.com/term/loan/19538/]]:\n"
-" Public Domain, by Rohith M S.\n"
-" - [[User|http://thenounproject.com/term/user/419/]]:\n"
-" Creative Commons — Attribution, by Edward Boatman.\n"
-" - [[Translation|http://thenounproject.com/term/translation/5735/]]:\n"
-" Creative Commons — Attribution, by Joe Mortell.\n"
-" - [[Gears|http://thenounproject.com/term/gears/8949/]]:\n"
-" Creative Commons — Attribution, by Cris Dobbins.\n"
-" - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
-" Creative Commons — Attribution, by Cornelius Danger.\n"
-" - [[Check Mark|https://thenounproject.com/term/check/4489/]]:\n"
-" Public Domain, by Julian Norton.\n"
-" - [[Delete|https://thenounproject.com/term/delete/49691/]]:\n"
-" Creative Commons — Attribution, by Kervin Markle.\n"
-" - [[Play|https://thenounproject.com/term/play/152052]]:\n"
-" Creative Commons — Attribution, by Zech Nelson.\n"
-" - [[Pause|https://thenounproject.com/term/pause/152046]]:\n"
-" Creative Commons — Attribution, by Zech Nelson.\n"
-" - [[USB|https://thenounproject.com/term/usb/28901]]:\n"
-" Creative Commons — Attribution, by Wilson Joseph.\n"
-" - [[Time|https://thenounproject.com/term/time/6732]]:\n"
-" Creative Commons — Attribution, by Richard de Vos.\n"
-" - [[Printer|https://thenounproject.com/term/printer/146674]]:\n"
-" Creative Commons — Attribution, by Diego Naive.\n"
-" - [[Smart Phones|https://thenounproject.com/term/smartphone/25790]]:\n"
-" Creative Commons — Attribution, by Pham Thi Dieu Linh.\n"
-" - [[Laptop|https://thenounproject.com/term/laptop/6729]]:\n"
-" Public Domain, by Jean Yashu.\n"
-" - [[Love|https://thenounproject.com/term/love/218846/]]:\n"
-" Creative Commons — Attribution, by Thomas Helbig.\n"
-" - [[Survey|https://thenounproject.com/term/survey/1296072]]:\n"
-" Creative Commons — Attribution, by unlimicon.\n"
-" - [[Info|https://thenounproject.com/term/info/808461]]:\n"
-" Creative Commons — Attribution, by icongeek]].\n"
-msgstr ""
-" - O logotipo do Tails logo é baseado em [[USB|http://thenounproject.com/term/usb/23873/]]\n"
-" por Ilsur Aptukov do Noun Project.\n"
-" - Logotipo Debian: Copyright (c) 1999 Software de interesse público.\n"
-" - Logotipo Onion: marca registrada do The Tor Project, Inc.; o projeto Tails\n"
-"está autorizado a usá-lo sob certas condições; licenciado sob\n"
-"Creative Commons Attribution 3.0 United States License.\n"
-" - Ícones do [[The Noun Project|http://thenounproject.com/]]:\n"
-" - [[Announcement|http://thenounproject.com/term/announcement/1186/]]:\n"
-" Creative Commons - Attribution, por Olivier Guin.\n"
-" - [[Code|http://thenounproject.com/term/code/18033/]]: Creative Commons —\n"
-" Attribution, por Azis.\n"
-" - [[Pen|http://thenounproject.com/term/pen/18907/]]: Creative Commons —\n"
-" Attribution, por factor[e] design initiative.\n"
-" - [[Loan|http://thenounproject.com/term/loan/19538/]]: Public Domain, por\n"
-" Rohith M S.\n"
-" - [[User|http://thenounproject.com/term/user/419/]]: Creative Commons —\n"
-" Attribution, por Edward Boatman.\n"
-" - [[Translation|http://thenounproject.com/term/translation/5735/]]: Creative\n"
-" Commons — Attribution, por Joe Mortell.\n"
-" - [[Gears|http://thenounproject.com/term/gears/8949/]]: Creative Commons —\n"
-" Attribution, por Cris Dobbins.\n"
-" - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
-" Creative Commons — Attribution, por Cornelius Danger.\n"
+#, fuzzy
+#| msgid "Debian logo: Copyright (c) 1999 Software in the Public Interest."
+msgid "- Debian logo: Copyright (c) 1999 Software in the Public Interest."
+msgstr "Logo do Debian: Copyright (c) 1999 Software no Interesse Público"
+
+#. type: Bullet: '- '
+msgid ""
+"Onion logo: registered trademark of The Tor Project, Inc.; the Tails project "
+"is authorized to use it under certain conditions; licensed under Creative "
+"Commons Attribution 3.0 United States License."
+msgstr ""
+
+#. type: Plain text
+msgid "- Icons from [[The Noun Project|http://thenounproject.com/]]:"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Announcement|http://thenounproject.com/term/announcement/1186/]]: Creative "
+"Commons - Attribution, by Olivier Guin."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Code|http://thenounproject.com/term/code/18033/]]: Creative Commons — "
+"Attribution, by Azis."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Pen|http://thenounproject.com/term/pen/18907/]]: Creative Commons — "
+"Attribution, by factor[e] design initiative."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Loan|http://thenounproject.com/term/loan/19538/]]: Public Domain, by "
+"Rohith M S."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[User|http://thenounproject.com/term/user/419/]]: Creative Commons — "
+"Attribution, by Edward Boatman."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Translation|http://thenounproject.com/term/translation/5735/]]: Creative "
+"Commons — Attribution, by Joe Mortell."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Gears|http://thenounproject.com/term/gears/8949/]]: Creative Commons — "
+"Attribution, by Cris Dobbins."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]: "
+"Creative Commons — Attribution, by Cornelius Danger."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Check Mark|https://thenounproject.com/term/check/4489/]]: Public Domain, "
+"by Julian Norton."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Delete|https://thenounproject.com/term/delete/49691/]]: Creative Commons — "
+"Attribution, by Kervin Markle."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Play|https://thenounproject.com/term/play/152052]]: Creative Commons — "
+"Attribution, by Zech Nelson."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Pause|https://thenounproject.com/term/pause/152046]]: Creative Commons — "
+"Attribution, by Zech Nelson."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[USB|https://thenounproject.com/term/usb/28901]]: Creative Commons — "
+"Attribution, by Wilson Joseph."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Time|https://thenounproject.com/term/time/6732]]: Creative Commons — "
+"Attribution, by Richard de Vos."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Printer|https://thenounproject.com/term/printer/146674]]: Creative Commons "
+"— Attribution, by Diego Naive."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Smart Phones|https://thenounproject.com/term/smartphone/25790]]: Creative "
+"Commons — Attribution, by Pham Thi Dieu Linh."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Laptop|https://thenounproject.com/term/laptop/6729]]: Public Domain, by "
+"Jean Yashu."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Love|https://thenounproject.com/term/love/218846/]]: Creative Commons — "
+"Attribution, by Thomas Helbig."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Survey|https://thenounproject.com/term/survey/1296072]]: Creative Commons "
+"— Attribution, by unlimicon."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"[[Info|https://thenounproject.com/term/info/808461]]: Creative Commons — "
+"Attribution, by icongeek."
+msgstr ""
+
+#, fuzzy
+#~| msgid ""
+#~| " - The Tails logo is based on [[USB|http://thenounproject.com/term/"
+#~| "usb/23873/]]\n"
+#~| " by Ilsur Aptukov from the Noun Project.\n"
+#~| " - Debian logo: Copyright (c) 1999 Software in the Public Interest.\n"
+#~| " - Onion logo: registered trademark of The Tor Project, Inc.; the "
+#~| "Tails\n"
+#~| "project is authorized to use it under certain conditions; licensed "
+#~| "under\n"
+#~| "Creative Commons Attribution 3.0 United States License.\n"
+#~| " - Icons from [[The Noun Project|http://thenounproject.com/]]:\n"
+#~| " - [[Announcement|http://thenounproject.com/term/"
+#~| "announcement/1186/]]:\n"
+#~| " Creative Commons - Attribution, by Olivier Guin.\n"
+#~| " - [[Code|http://thenounproject.com/term/code/18033/]]: Creative "
+#~| "Commons —\n"
+#~| " Attribution, by Azis.\n"
+#~| " - [[Pen|http://thenounproject.com/term/pen/18907/]]: Creative "
+#~| "Commons —\n"
+#~| " Attribution, by factor[e] design initiative.\n"
+#~| " - [[Loan|http://thenounproject.com/term/loan/19538/]]: Public "
+#~| "Domain, by\n"
+#~| " Rohith M S.\n"
+#~| " - [[User|http://thenounproject.com/term/user/419/]]: Creative "
+#~| "Commons —\n"
+#~| " Attribution, by Edward Boatman.\n"
+#~| " - [[Translation|http://thenounproject.com/term/translation/5735/]]: "
+#~| "Creative\n"
+#~| " Commons — Attribution, by Joe Mortell.\n"
+#~| " - [[Gears|http://thenounproject.com/term/gears/8949/]]: Creative "
+#~| "Commons —\n"
+#~| " Attribution, by Cris Dobbins.\n"
+#~| " - [[Graphic Design|http://thenounproject.com/term/"
+#~| "graphic_design/9198/]]:\n"
+#~| " Creative Commons — Attribution, by Cornelius Danger.\n"
+#~ msgid ""
+#~ " - The Tails logo is based on [[USB|http://thenounproject.com/term/"
+#~ "usb/23873/]]\n"
+#~ " by Ilsur Aptukov from the Noun Project.\n"
+#~ " - Debian logo: Copyright (c) 1999 Software in the Public Interest.\n"
+#~ " - Onion logo: registered trademark of The Tor Project, Inc.; the Tails\n"
+#~ "project is authorized to use it under certain conditions; licensed under\n"
+#~ "Creative Commons Attribution 3.0 United States License.\n"
+#~ " - Icons from [[The Noun Project|http://thenounproject.com/]]:\n"
+#~ " - [[Announcement|http://thenounproject.com/term/"
+#~ "announcement/1186/]]:\n"
+#~ " Creative Commons - Attribution, by Olivier Guin.\n"
+#~ " - [[Code|http://thenounproject.com/term/code/18033/]]:\n"
+#~ " Creative Commons — Attribution, by Azis.\n"
+#~ " - [[Pen|http://thenounproject.com/term/pen/18907/]]:\n"
+#~ " Creative Commons — Attribution, by factor[e] design initiative.\n"
+#~ " - [[Loan|http://thenounproject.com/term/loan/19538/]]:\n"
+#~ " Public Domain, by Rohith M S.\n"
+#~ " - [[User|http://thenounproject.com/term/user/419/]]:\n"
+#~ " Creative Commons — Attribution, by Edward Boatman.\n"
+#~ " - [[Translation|http://thenounproject.com/term/translation/5735/]]:\n"
+#~ " Creative Commons — Attribution, by Joe Mortell.\n"
+#~ " - [[Gears|http://thenounproject.com/term/gears/8949/]]:\n"
+#~ " Creative Commons — Attribution, by Cris Dobbins.\n"
+#~ " - [[Graphic Design|http://thenounproject.com/term/"
+#~ "graphic_design/9198/]]:\n"
+#~ " Creative Commons — Attribution, by Cornelius Danger.\n"
+#~ " - [[Check Mark|https://thenounproject.com/term/check/4489/]]:\n"
+#~ " Public Domain, by Julian Norton.\n"
+#~ " - [[Delete|https://thenounproject.com/term/delete/49691/]]:\n"
+#~ " Creative Commons — Attribution, by Kervin Markle.\n"
+#~ " - [[Play|https://thenounproject.com/term/play/152052]]:\n"
+#~ " Creative Commons — Attribution, by Zech Nelson.\n"
+#~ " - [[Pause|https://thenounproject.com/term/pause/152046]]:\n"
+#~ " Creative Commons — Attribution, by Zech Nelson.\n"
+#~ " - [[USB|https://thenounproject.com/term/usb/28901]]:\n"
+#~ " Creative Commons — Attribution, by Wilson Joseph.\n"
+#~ " - [[Time|https://thenounproject.com/term/time/6732]]:\n"
+#~ " Creative Commons — Attribution, by Richard de Vos.\n"
+#~ " - [[Printer|https://thenounproject.com/term/printer/146674]]:\n"
+#~ " Creative Commons — Attribution, by Diego Naive.\n"
+#~ " - [[Smart Phones|https://thenounproject.com/term/smartphone/25790]]:\n"
+#~ " Creative Commons — Attribution, by Pham Thi Dieu Linh.\n"
+#~ " - [[Laptop|https://thenounproject.com/term/laptop/6729]]:\n"
+#~ " Public Domain, by Jean Yashu.\n"
+#~ " - [[Love|https://thenounproject.com/term/love/218846/]]:\n"
+#~ " Creative Commons — Attribution, by Thomas Helbig.\n"
+#~ " - [[Survey|https://thenounproject.com/term/survey/1296072]]:\n"
+#~ " Creative Commons — Attribution, by unlimicon.\n"
+#~ " - [[Info|https://thenounproject.com/term/info/808461]]:\n"
+#~ " Creative Commons — Attribution, by icongeek]].\n"
+#~ msgstr ""
+#~ " - O logotipo do Tails logo é baseado em [[USB|http://thenounproject.com/"
+#~ "term/usb/23873/]]\n"
+#~ " por Ilsur Aptukov do Noun Project.\n"
+#~ " - Logotipo Debian: Copyright (c) 1999 Software de interesse público.\n"
+#~ " - Logotipo Onion: marca registrada do The Tor Project, Inc.; o projeto "
+#~ "Tails\n"
+#~ "está autorizado a usá-lo sob certas condições; licenciado sob\n"
+#~ "Creative Commons Attribution 3.0 United States License.\n"
+#~ " - Ícones do [[The Noun Project|http://thenounproject.com/]]:\n"
+#~ " - [[Announcement|http://thenounproject.com/term/"
+#~ "announcement/1186/]]:\n"
+#~ " Creative Commons - Attribution, por Olivier Guin.\n"
+#~ " - [[Code|http://thenounproject.com/term/code/18033/]]: Creative "
+#~ "Commons —\n"
+#~ " Attribution, por Azis.\n"
+#~ " - [[Pen|http://thenounproject.com/term/pen/18907/]]: Creative Commons "
+#~ "—\n"
+#~ " Attribution, por factor[e] design initiative.\n"
+#~ " - [[Loan|http://thenounproject.com/term/loan/19538/]]: Public Domain, "
+#~ "por\n"
+#~ " Rohith M S.\n"
+#~ " - [[User|http://thenounproject.com/term/user/419/]]: Creative Commons "
+#~ "—\n"
+#~ " Attribution, por Edward Boatman.\n"
+#~ " - [[Translation|http://thenounproject.com/term/translation/5735/]]: "
+#~ "Creative\n"
+#~ " Commons — Attribution, por Joe Mortell.\n"
+#~ " - [[Gears|http://thenounproject.com/term/gears/8949/]]: Creative "
+#~ "Commons —\n"
+#~ " Attribution, por Cris Dobbins.\n"
+#~ " - [[Graphic Design|http://thenounproject.com/term/"
+#~ "graphic_design/9198/]]:\n"
+#~ " Creative Commons — Attribution, por Cornelius Danger.\n"
#, fuzzy
#~| msgid ""
@@ -206,9 +372,6 @@ msgstr ""
#~ "fonte, podemos combinar com você de enviar uma cópia dos pacotes "
#~ "individuais por meios eletrônicos."
-#~ msgid "Debian logo: Copyright (c) 1999 Software in the Public Interest."
-#~ msgstr "Logo do Debian: Copyright (c) 1999 Software no Interesse Público"
-
#~ msgid ""
#~ " - USB stick icon: [[source|http://www.openclipart.org/detail/29129]]; "
#~ "waived\n"
diff --git a/wiki/src/doc/about/openpgp_keys/signing_key_revocation.de.po b/wiki/src/doc/about/openpgp_keys/signing_key_revocation.de.po
index 5e4e8da..e707f19 100644
--- a/wiki/src/doc/about/openpgp_keys/signing_key_revocation.de.po
+++ b/wiki/src/doc/about/openpgp_keys/signing_key_revocation.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-11-01 13:32+0100\n"
+"POT-Creation-Date: 2019-01-18 14:46+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"
@@ -109,8 +109,8 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
-"Two people from tails@boum.org and one person not from tails@boum.org: A"
-"{2}+(B|C|D)"
+"Two people from tails@boum.org and one person not from tails@boum.org: "
+"A{2}+(B|C|D)"
msgstr ""
#. type: Bullet: ' - '
@@ -291,15 +291,15 @@ msgstr ""
#. type: Plain text
msgid ""
"A. The signing key is not revoked while it should be. This could allow "
-"possible attackers to distribute malicious Tails ISO images or publish "
-"malicious information on our name."
+"possible attackers to distribute malicious Tails images or publish malicious "
+"information on our name."
msgstr ""
#. type: Plain text
msgid ""
"B. The signing key is revoked when it should not have been. This would "
-"prevent people from verifying our ISO images with OpenPGP until we publish a "
-"new signing key."
+"prevent people from verifying our images with OpenPGP until we publish a new "
+"signing key."
msgstr ""
#. type: Title =
diff --git a/wiki/src/doc/about/openpgp_keys/signing_key_revocation.es.po b/wiki/src/doc/about/openpgp_keys/signing_key_revocation.es.po
index ac4519d..217e6bc 100644
--- a/wiki/src/doc/about/openpgp_keys/signing_key_revocation.es.po
+++ b/wiki/src/doc/about/openpgp_keys/signing_key_revocation.es.po
@@ -6,11 +6,11 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2018-01-30 12:41+0000\n"
+"POT-Creation-Date: 2019-01-18 14:46+0100\n"
"PO-Revision-Date: 2018-05-16 18:11+0000\n"
"Last-Translator: cacukin <cacukin@cryptolab.net>\n"
-"Language-Team: Spanish "
-"<http://translate.tails.boum.org/projects/tails/signing_key_revocation/es/>\n"
+"Language-Team: Spanish <http://translate.tails.boum.org/projects/tails/"
+"signing_key_revocation/es/>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -57,27 +57,19 @@ msgid ""
" F. People in possession of a share of the revocation certificate\n"
" of the signing key should have instructions on how to use it if needed.\n"
msgstr ""
-" A. Prevenir que ninguna persona pueda unilateralmente revocar nuestra "
-"clave de firmado.\n"
-" B. Permitir a una coalición de miembros de tails@boum.org revocar nuestra "
-"clave de firmado\n"
-" en caso de que la mayoría de la gente de tails@boum.org no se encuentre "
-"disponible.\n"
-" C. Permitir que un grupo de gente, no necesariamente de tails@boum.org, "
-"revoque nuestra\n"
+" A. Prevenir que ninguna persona pueda unilateralmente revocar nuestra clave de firmado.\n"
+" B. Permitir a una coalición de miembros de tails@boum.org revocar nuestra clave de firmado\n"
+" en caso de que la mayoría de la gente de tails@boum.org no se encuentre disponible.\n"
+" C. Permitir que un grupo de gente, no necesariamente de tails@boum.org, revoque nuestra\n"
" clave de firmado en caso de que todos los miembros de\n"
" tails@boum.org devenga no disponible.\n"
-" D. Hacer difícil que un grupo de gente que no sea de tails@boum.org "
-"revoque nuestra clave de\n"
-" firmado a menos que todos o casi todos los miembros de tails@boum.org "
-"devengan no\n"
+" D. Hacer difícil que un grupo de gente que no sea de tails@boum.org revoque nuestra clave de\n"
+" firmado a menos que todos o casi todos los miembros de tails@boum.org devengan no\n"
" disponibles.\n"
-" E. Gente que no sea de tails@boum.org no debería saber cómo son repartidas "
-"las partes\n"
+" E. Gente que no sea de tails@boum.org no debería saber cómo son repartidas las partes\n"
" y quién las tiene.\n"
" F. Gente en posesión de una parte del certificado de revocación\n"
-" de la la llave de firmado debería tener instrucciones sobre cómo usarlo "
-"si fuera necesario.\n"
+" de la la llave de firmado debería tener instrucciones sobre cómo usarlo si fuera necesario.\n"
#. type: Title =
#, no-wrap
@@ -208,7 +200,8 @@ msgstr "Infraestructura\n"
#. type: Bullet: ' - '
msgid "Everybody who owns a share is subscribed to a mailing list."
-msgstr "Toda persona que tenga una porción está suscrita a una lista de correo."
+msgstr ""
+"Toda persona que tenga una porción está suscrita a una lista de correo."
#. type: Bullet: ' - '
msgid ""
@@ -325,8 +318,8 @@ msgstr "Puedes leer una descripción completa del mecanismo de distribución en:
#. type: Plain text
msgid "https://tails.boum.org/doc/about/openpgp_keys/signing_key_revocation."
msgstr ""
-"https://tails.boum.org/doc/about/openpgp_keys/signing_key_revocation/index.es"
-".html."
+"https://tails.boum.org/doc/about/openpgp_keys/signing_key_revocation/index."
+"es.html."
#. type: Plain text
msgid ""
@@ -354,20 +347,30 @@ msgid "The bad things that could happen if the mechanism fails are:"
msgstr "Las cosas malas que podrían pasar si el mecanismo falla son:"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "A. The signing key is not revoked while it should be. This could allow "
+#| "possible attackers to distribute malicious Tails ISO images or publish "
+#| "malicious information on our name."
msgid ""
"A. The signing key is not revoked while it should be. This could allow "
-"possible attackers to distribute malicious Tails ISO images or publish "
-"malicious information on our name."
+"possible attackers to distribute malicious Tails images or publish malicious "
+"information on our name."
msgstr ""
"A. La clave de firmado no se revocan cuando deberían. Esto podría permitir a "
"posibles atacantes distribuir imágenes ISO maliciosas de Tails o publicar "
"información maliciosa en nuestro nombre."
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "B. The signing key is revoked when it should not have been. This would "
+#| "prevent people from verifying our ISO images with OpenPGP until we "
+#| "publish a new signing key."
msgid ""
"B. The signing key is revoked when it should not have been. This would "
-"prevent people from verifying our ISO images with OpenPGP until we publish a "
-"new signing key."
+"prevent people from verifying our images with OpenPGP until we publish a new "
+"signing key."
msgstr ""
"B. La clave de firmado es revocada cuando no debería revocarse. Esto "
"prevendría que la gente pueda verificar nuestras imágenes ISO con OpenPGP "
diff --git a/wiki/src/doc/about/openpgp_keys/signing_key_revocation.fa.po b/wiki/src/doc/about/openpgp_keys/signing_key_revocation.fa.po
index 5e4e8da..e707f19 100644
--- a/wiki/src/doc/about/openpgp_keys/signing_key_revocation.fa.po
+++ b/wiki/src/doc/about/openpgp_keys/signing_key_revocation.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-11-01 13:32+0100\n"
+"POT-Creation-Date: 2019-01-18 14:46+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"
@@ -109,8 +109,8 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
-"Two people from tails@boum.org and one person not from tails@boum.org: A"
-"{2}+(B|C|D)"
+"Two people from tails@boum.org and one person not from tails@boum.org: "
+"A{2}+(B|C|D)"
msgstr ""
#. type: Bullet: ' - '
@@ -291,15 +291,15 @@ msgstr ""
#. type: Plain text
msgid ""
"A. The signing key is not revoked while it should be. This could allow "
-"possible attackers to distribute malicious Tails ISO images or publish "
-"malicious information on our name."
+"possible attackers to distribute malicious Tails images or publish malicious "
+"information on our name."
msgstr ""
#. type: Plain text
msgid ""
"B. The signing key is revoked when it should not have been. This would "
-"prevent people from verifying our ISO images with OpenPGP until we publish a "
-"new signing key."
+"prevent people from verifying our images with OpenPGP until we publish a new "
+"signing key."
msgstr ""
#. type: Title =
diff --git a/wiki/src/doc/about/openpgp_keys/signing_key_revocation.fr.po b/wiki/src/doc/about/openpgp_keys/signing_key_revocation.fr.po
index 1ba75b6..18acb98 100644
--- a/wiki/src/doc/about/openpgp_keys/signing_key_revocation.fr.po
+++ b/wiki/src/doc/about/openpgp_keys/signing_key_revocation.fr.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2018-01-08 15:38+0100\n"
-"PO-Revision-Date: 2017-11-23 11:30+0000\n"
+"POT-Creation-Date: 2019-01-18 14:46+0100\n"
+"PO-Revision-Date: 2019-01-19 19:10+0000\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: \n"
"Language: fr\n"
@@ -365,22 +365,22 @@ msgstr "Les pires choses qui pourraient arriver si le mécanisme échoue sont :"
#. type: Plain text
msgid ""
"A. The signing key is not revoked while it should be. This could allow "
-"possible attackers to distribute malicious Tails ISO images or publish "
-"malicious information on our name."
+"possible attackers to distribute malicious Tails images or publish malicious "
+"information on our name."
msgstr ""
"A. La clé de signature n'est pas révoquée alors qu'elle le devrait. Cela "
-"pourrait rendre possible à des attaquants de distribuer des images ISO Tails "
+"pourrait rendre possible à des attaquants de distribuer des images Tails "
"malveillantes ou de publier des informations malveillantes en notre nom."
#. type: Plain text
msgid ""
"B. The signing key is revoked when it should not have been. This would "
-"prevent people from verifying our ISO images with OpenPGP until we publish a "
-"new signing key."
+"prevent people from verifying our images with OpenPGP until we publish a new "
+"signing key."
msgstr ""
"B. La clé de signature est révoquée alors qu'elle n'aurait pas dû. Cela "
-"pourrait empêcher des personnes de vérifier nos images ISO avec OpenPGP "
-"jusqu'à la publication d'une nouvelle clé de signature."
+"pourrait empêcher des personnes de vérifier nos images avec OpenPGP jusqu'à "
+"la publication d'une nouvelle clé de signature."
#. type: Title =
#, no-wrap
diff --git a/wiki/src/doc/about/openpgp_keys/signing_key_revocation.it.po b/wiki/src/doc/about/openpgp_keys/signing_key_revocation.it.po
index 5e4e8da..e707f19 100644
--- a/wiki/src/doc/about/openpgp_keys/signing_key_revocation.it.po
+++ b/wiki/src/doc/about/openpgp_keys/signing_key_revocation.it.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-11-01 13:32+0100\n"
+"POT-Creation-Date: 2019-01-18 14:46+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"
@@ -109,8 +109,8 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
-"Two people from tails@boum.org and one person not from tails@boum.org: A"
-"{2}+(B|C|D)"
+"Two people from tails@boum.org and one person not from tails@boum.org: "
+"A{2}+(B|C|D)"
msgstr ""
#. type: Bullet: ' - '
@@ -291,15 +291,15 @@ msgstr ""
#. type: Plain text
msgid ""
"A. The signing key is not revoked while it should be. This could allow "
-"possible attackers to distribute malicious Tails ISO images or publish "
-"malicious information on our name."
+"possible attackers to distribute malicious Tails images or publish malicious "
+"information on our name."
msgstr ""
#. type: Plain text
msgid ""
"B. The signing key is revoked when it should not have been. This would "
-"prevent people from verifying our ISO images with OpenPGP until we publish a "
-"new signing key."
+"prevent people from verifying our images with OpenPGP until we publish a new "
+"signing key."
msgstr ""
#. type: Title =
diff --git a/wiki/src/doc/about/openpgp_keys/signing_key_revocation.mdwn b/wiki/src/doc/about/openpgp_keys/signing_key_revocation.mdwn
index 1a1779d..0a1d672 100644
--- a/wiki/src/doc/about/openpgp_keys/signing_key_revocation.mdwn
+++ b/wiki/src/doc/about/openpgp_keys/signing_key_revocation.mdwn
@@ -133,11 +133,11 @@ interest of Tails.
The bad things that could happen if the mechanism fails are:
A. The signing key is not revoked while it should be. This could allow
-possible attackers to distribute malicious Tails ISO images or publish
+possible attackers to distribute malicious Tails images or publish
malicious information on our name.
B. The signing key is revoked when it should not have been. This would
-prevent people from verifying our ISO images with OpenPGP until we
+prevent people from verifying our images with OpenPGP until we
publish a new signing key.
Distribution of the shares
diff --git a/wiki/src/doc/about/openpgp_keys/signing_key_revocation.pt.po b/wiki/src/doc/about/openpgp_keys/signing_key_revocation.pt.po
index a5c23f8..46ccb30 100644
--- a/wiki/src/doc/about/openpgp_keys/signing_key_revocation.pt.po
+++ b/wiki/src/doc/about/openpgp_keys/signing_key_revocation.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-11-01 13:32+0100\n"
+"POT-Creation-Date: 2019-01-18 14:46+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"
@@ -108,8 +108,8 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
-"Two people from tails@boum.org and one person not from tails@boum.org: A"
-"{2}+(B|C|D)"
+"Two people from tails@boum.org and one person not from tails@boum.org: "
+"A{2}+(B|C|D)"
msgstr ""
#. type: Bullet: ' - '
@@ -290,15 +290,15 @@ msgstr ""
#. type: Plain text
msgid ""
"A. The signing key is not revoked while it should be. This could allow "
-"possible attackers to distribute malicious Tails ISO images or publish "
-"malicious information on our name."
+"possible attackers to distribute malicious Tails images or publish malicious "
+"information on our name."
msgstr ""
#. type: Plain text
msgid ""
"B. The signing key is revoked when it should not have been. This would "
-"prevent people from verifying our ISO images with OpenPGP until we publish a "
-"new signing key."
+"prevent people from verifying our images with OpenPGP until we publish a new "
+"signing key."
msgstr ""
#. type: Title =
diff --git a/wiki/src/doc/about/trust.de.po b/wiki/src/doc/about/trust.de.po
index c8b8d5d..50894a5 100644
--- a/wiki/src/doc/about/trust.de.po
+++ b/wiki/src/doc/about/trust.de.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2018-08-16 18:12+0200\n"
+"POT-Creation-Date: 2019-01-18 14:47+0100\n"
"PO-Revision-Date: 2016-03-28 15:41+0200\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: \n"
@@ -75,6 +75,18 @@ msgid "Free software and public scrutiny\n"
msgstr "Freie Software und öffentliche Überprüfung\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "Free software, [[like Tails|about/license]], enables its users to check "
+#| "exactly what the software distribution consists of and how it functions, "
+#| "since the source code must be made available to all who receive it. Hence "
+#| "a thorough audit of the code can reveal if any malicious code, like a "
+#| "backdoor, is present. Furthermore, with the source code it is possible to "
+#| "build the software, and then compare the result against any version that "
+#| "is already built and being distributed, like the Tails ISO images that "
+#| "you can download from us. That way it can be determined whether the "
+#| "distributed version actually was built with the source code, or if any "
+#| "malicious changes have been made."
msgid ""
"Free software, [[like Tails|about/license]], enables its users to check "
"exactly what the software distribution consists of and how it functions, "
@@ -82,7 +94,7 @@ msgid ""
"thorough audit of the code can reveal if any malicious code, like a "
"backdoor, is present. Furthermore, with the source code it is possible to "
"build the software, and then compare the result against any version that is "
-"already built and being distributed, like the Tails ISO images that you can "
+"already built and being distributed, like the Tails images that you can "
"download from us. That way it can be determined whether the distributed "
"version actually was built with the source code, or if any malicious changes "
"have been made."
diff --git a/wiki/src/doc/about/trust.es.po b/wiki/src/doc/about/trust.es.po
index 31b0c4d..02f5f26 100644
--- a/wiki/src/doc/about/trust.es.po
+++ b/wiki/src/doc/about/trust.es.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2018-08-16 18:12+0200\n"
+"POT-Creation-Date: 2019-01-18 14:47+0100\n"
"PO-Revision-Date: 2018-03-17 12:09+0000\n"
"Last-Translator: emmapeel <emma.peel@riseup.net>\n"
"Language-Team: Spanish <https://translate.tails.boum.org/projects/tails/"
@@ -74,6 +74,18 @@ msgid "Free software and public scrutiny\n"
msgstr "Software Libre y escrutinio público\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "Free software, [[like Tails|about/license]], enables its users to check "
+#| "exactly what the software distribution consists of and how it functions, "
+#| "since the source code must be made available to all who receive it. Hence "
+#| "a thorough audit of the code can reveal if any malicious code, like a "
+#| "backdoor, is present. Furthermore, with the source code it is possible to "
+#| "build the software, and then compare the result against any version that "
+#| "is already built and being distributed, like the Tails ISO images that "
+#| "you can download from us. That way it can be determined whether the "
+#| "distributed version actually was built with the source code, or if any "
+#| "malicious changes have been made."
msgid ""
"Free software, [[like Tails|about/license]], enables its users to check "
"exactly what the software distribution consists of and how it functions, "
@@ -81,7 +93,7 @@ msgid ""
"thorough audit of the code can reveal if any malicious code, like a "
"backdoor, is present. Furthermore, with the source code it is possible to "
"build the software, and then compare the result against any version that is "
-"already built and being distributed, like the Tails ISO images that you can "
+"already built and being distributed, like the Tails images that you can "
"download from us. That way it can be determined whether the distributed "
"version actually was built with the source code, or if any malicious changes "
"have been made."
diff --git a/wiki/src/doc/about/trust.fa.po b/wiki/src/doc/about/trust.fa.po
index ca9d50b..be4fe17 100644
--- a/wiki/src/doc/about/trust.fa.po
+++ b/wiki/src/doc/about/trust.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: 2018-08-16 18:12+0200\n"
+"POT-Creation-Date: 2019-01-18 14:47+0100\n"
"PO-Revision-Date: 2015-10-12 09:16+0000\n"
"Last-Translator: sprint5 <translation5@451f.org>\n"
"Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/trust/fa/"
@@ -110,7 +110,7 @@ msgid ""
"thorough audit of the code can reveal if any malicious code, like a "
"backdoor, is present. Furthermore, with the source code it is possible to "
"build the software, and then compare the result against any version that is "
-"already built and being distributed, like the Tails ISO images that you can "
+"already built and being distributed, like the Tails images that you can "
"download from us. That way it can be determined whether the distributed "
"version actually was built with the source code, or if any malicious changes "
"have been made."
diff --git a/wiki/src/doc/about/trust.fr.po b/wiki/src/doc/about/trust.fr.po
index ef8562f..26bbf9f 100644
--- a/wiki/src/doc/about/trust.fr.po
+++ b/wiki/src/doc/about/trust.fr.po
@@ -6,15 +6,15 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2018-09-04 12:52+0200\n"
-"PO-Revision-Date: 2016-03-23 22:03+0100\n"
+"POT-Creation-Date: 2019-01-18 14:47+0100\n"
+"PO-Revision-Date: 2019-01-19 19:57+0000\n"
"Last-Translator: AtomiKe <tails@atomike.ninja>\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"
+"X-Generator: Poedit 1.8.11\n"
#. type: Plain text
#, no-wrap
@@ -80,20 +80,20 @@ msgid ""
"thorough audit of the code can reveal if any malicious code, like a "
"backdoor, is present. Furthermore, with the source code it is possible to "
"build the software, and then compare the result against any version that is "
-"already built and being distributed, like the Tails ISO images that you can "
+"already built and being distributed, like the Tails images that you can "
"download from us. That way it can be determined whether the distributed "
"version actually was built with the source code, or if any malicious changes "
"have been made."
msgstr ""
-"Un logiciel libre, [[comme Tails|about/license]], permet à ceux qui "
-"l'utilisent de regarder précisément en quoi consiste ce système "
-"d'exploitation et comment il fonctionne, à partir du code source, qui doit "
-"être disponible pour tous. Ainsi un audit approfondi du code peut révéler la "
-"présence de code malveillant, comme une porte dérobée par exemple. De plus, "
-"il est possible de construire le logiciel depuis le code source, et de "
+"Un logiciel libre, [[comme Tails|about/license]], permet aux personnes qui "
+"l'utilisent de regarder précisément en quoi il consiste et comment il "
+"fonctionne, à partir du code source, qui doit être disponible pour toutes "
+"les personnes qui l'on reçu. Ainsi un audit approfondi du code peut révéler "
+"la présence de code malveillant, comme une porte dérobée par exemple. De "
+"plus, il est possible de construire le logiciel depuis le code source, et de "
"comparer le résultat obtenu avec n'importe quelle version déjà existante et "
-"publiée, telles que les images ISO de Tails que vous pouvez télécharger.Il "
-"est ainsi possible de savoir si la version distribuée est celle provenant du "
+"publiée, telles que les images de Tails que vous pouvez télécharger. Il est "
+"ainsi possible de savoir si la version distribuée est celle provenant du "
"code source, ou bien si des changements ont été effectués subrepticement au "
"passage."
diff --git a/wiki/src/doc/about/trust.it.po b/wiki/src/doc/about/trust.it.po
index 3f1cf98..753bc15 100644
--- a/wiki/src/doc/about/trust.it.po
+++ b/wiki/src/doc/about/trust.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2018-08-16 18:12+0200\n"
+"POT-Creation-Date: 2019-01-18 14:47+0100\n"
"PO-Revision-Date: 2017-08-02 15:36+0200\n"
"Last-Translator: \n"
"Language-Team: ita <transitails@inventati.org>\n"
@@ -74,6 +74,18 @@ msgid "Free software and public scrutiny\n"
msgstr "Il Software Libero e l'osservazione pubblica\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "Free software, [[like Tails|about/license]], enables its users to check "
+#| "exactly what the software distribution consists of and how it functions, "
+#| "since the source code must be made available to all who receive it. Hence "
+#| "a thorough audit of the code can reveal if any malicious code, like a "
+#| "backdoor, is present. Furthermore, with the source code it is possible to "
+#| "build the software, and then compare the result against any version that "
+#| "is already built and being distributed, like the Tails ISO images that "
+#| "you can download from us. That way it can be determined whether the "
+#| "distributed version actually was built with the source code, or if any "
+#| "malicious changes have been made."
msgid ""
"Free software, [[like Tails|about/license]], enables its users to check "
"exactly what the software distribution consists of and how it functions, "
@@ -81,7 +93,7 @@ msgid ""
"thorough audit of the code can reveal if any malicious code, like a "
"backdoor, is present. Furthermore, with the source code it is possible to "
"build the software, and then compare the result against any version that is "
-"already built and being distributed, like the Tails ISO images that you can "
+"already built and being distributed, like the Tails images that you can "
"download from us. That way it can be determined whether the distributed "
"version actually was built with the source code, or if any malicious changes "
"have been made."
diff --git a/wiki/src/doc/about/trust.mdwn b/wiki/src/doc/about/trust.mdwn
index 649a739..79d3735 100644
--- a/wiki/src/doc/about/trust.mdwn
+++ b/wiki/src/doc/about/trust.mdwn
@@ -30,7 +30,7 @@ receive it. Hence a thorough audit of the code can reveal if any
malicious code, like a backdoor, is present. Furthermore, with the
source code it is possible to build the software, and then compare the
result against any version that is already built and being
-distributed, like the Tails ISO images that you can download from
+distributed, like the Tails images that you can download from
us. That way it can be determined whether the distributed
version actually was built with the source code, or if any malicious
changes have been made.
diff --git a/wiki/src/doc/about/trust.pt.po b/wiki/src/doc/about/trust.pt.po
index 09ac416..790ae26 100644
--- a/wiki/src/doc/about/trust.pt.po
+++ b/wiki/src/doc/about/trust.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: 1\n"
-"POT-Creation-Date: 2018-08-16 18:12+0200\n"
+"POT-Creation-Date: 2019-01-18 14:47+0100\n"
"PO-Revision-Date: 2012-07-03 16:55-0300\n"
"Last-Translator: drebs <drebs@riseup.net>\n"
"Language-Team: Portuguese <LL@li.org>\n"
@@ -112,7 +112,7 @@ msgid ""
"thorough audit of the code can reveal if any malicious code, like a "
"backdoor, is present. Furthermore, with the source code it is possible to "
"build the software, and then compare the result against any version that is "
-"already built and being distributed, like the Tails ISO images that you can "
+"already built and being distributed, like the Tails images that you can "
"download from us. That way it can be determined whether the distributed "
"version actually was built with the source code, or if any malicious changes "
"have been made."
diff --git a/wiki/src/doc/anonymous_internet/networkmanager.de.po b/wiki/src/doc/anonymous_internet/networkmanager.de.po
index 4ebf557..024fd02 100644
--- a/wiki/src/doc/anonymous_internet/networkmanager.de.po
+++ b/wiki/src/doc/anonymous_internet/networkmanager.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2018-06-10 15:35+0200\n"
+"POT-Creation-Date: 2019-01-02 19:07+0000\n"
"PO-Revision-Date: 2017-02-09 20:10+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: Tails Translations <tails-l10n@boum.org>\n"
@@ -22,6 +22,17 @@ msgid "[[!meta title=\"Connecting to a network\"]]\n"
msgstr "[[!meta title=\"Eine Netzwerkverbindung herstellen\"]]\n"
#. type: Plain text
+#, no-wrap
+msgid "[[!toc levels=2]]\n"
+msgstr ""
+
+#. type: Title =
+#, fuzzy, no-wrap
+#| msgid "[[!meta title=\"Connecting to a network\"]]\n"
+msgid "Connecting to a network\n"
+msgstr "[[!meta title=\"Eine Netzwerkverbindung herstellen\"]]\n"
+
+#. type: Plain text
msgid ""
"You can connect to a network using a wired, Wi-Fi, or mobile broadband "
"connection:"
@@ -29,57 +40,84 @@ msgstr ""
"Sie können sich mit einem kabelgebundenen Netzwerk, Wi-Fi- oder einem "
"mobilen Breitbandnetzwerk (Mobile Broadband) verbinden:"
-#. type: Bullet: ' - '
-msgid "If a wired connection is detected, Tails automatically connects to it."
-msgstr ""
-"Wenn eine kabelgebundene Verbindung erkannt wird, verbindet sich Tails "
-"automatisch mit dieser."
-
-#. type: Bullet: ' - '
-msgid "To connect to a Wi-Fi network:"
-msgstr "Um eine Verbindung mit einem Wi-Fi-Netzwerk herzustellen:"
-
#. type: Bullet: '1. '
msgid "Open the system menu in the top-right corner."
msgstr "Öffnen Sie das Systemmenü in der oberen, rechten Ecke."
-#. type: Bullet: ' 1. '
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "[[!img doc/first_steps/introduction_to_gnome_and_the_tails_desktop/system.png link=\"no\"]]\n"
+msgid " [[!img doc/first_steps/introduction_to_gnome_and_the_tails_desktop/system.png link=\"no\"]]\n"
+msgstr "[[!img doc/first_steps/introduction_to_gnome_and_the_tails_desktop/system.png link=\"no\"]]\n"
+
+#. type: Bullet: ' - '
+#, fuzzy
+#| msgid ""
+#| "If a wired connection is detected, Tails automatically connects to it."
+msgid ""
+"If a wired connection is detected, Tails automatically connects to the "
+"network."
+msgstr ""
+"Wenn eine kabelgebundene Verbindung erkannt wird, verbindet sich Tails "
+"automatisch mit dieser."
+
+#. type: Bullet: ' - '
+#, fuzzy
+#| msgid ""
+#| "Choose <span class=\"guilabel\">Wi-Fi</span> and then <span class="
+#| "\"guilabel\">Select Network</span>."
msgid ""
-"Choose <span class=\"guilabel\">Wi-Fi</span> and then <span class=\"guilabel"
-"\">Select Network</span>."
+"To connect to a Wi-Fi network, choose <span class=\"guilabel\">Wi-Fi Not "
+"Connected</span> and then <span class=\"guilabel\">Select Network</span>."
msgstr ""
"Wählen Sie <span class=\"guilabel\">Wi-Fi</span> und anschließend <span "
"class=\"guilabel\">Wählen Sie ein Netzwerk aus</span>."
-#. type: Bullet: ' - '
-msgid "To connect to a mobile broadband network:"
-msgstr "Um sich mit einem mobilen Breitbandnetzwerk zu verbinden:"
-
-#. type: Bullet: ' 1. '
-msgid "Choose <span class=\"guilabel\">Mobile Broadband</span>."
+#. type: Bullet: ' - '
+#, fuzzy
+#| msgid "Choose <span class=\"guilabel\">Mobile Broadband</span>."
+msgid ""
+"To connect to a mobile broadband network, choose <span class=\"guilabel"
+"\">Mobile Broadband</span>."
msgstr "Wählen Sie <span class=\"guilabel\">Mobile Broadband</span> aus."
#. type: Plain text
-#, no-wrap
-msgid "[[!img doc/first_steps/introduction_to_gnome_and_the_tails_desktop/system.png link=\"no\"]]\n"
-msgstr "[[!img doc/first_steps/introduction_to_gnome_and_the_tails_desktop/system.png link=\"no\"]]\n"
+#, fuzzy, no-wrap
+#| msgid "<p>It is currently impossible to connect using:</p>\n"
+msgid ""
+" <div class=\"note\">\n"
+" <p>It is currently impossible to connect to a network using:</p>\n"
+msgstr "<p>Es ist momentan nicht möglich, eine Verbindung herzustellen mit:</p>\n"
#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<ul>\n"
+#| "<li>Dial-up modems, see [[!tails_ticket 5913]].</li>\n"
+#| "<li>VPNs, see [[the corresponding FAQ|support/faq#vpn]].</li>\n"
+#| "</ul>\n"
msgid ""
-"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#additional]]."
+" <ul>\n"
+" <li>Dial-up modems.</li>\n"
+" <li>VPNs, see [[the corresponding FAQ|support/faq#vpn]].</li>\n"
+" </ul>\n"
msgstr ""
-"Um sich mit Hilfe von Bridges mit Tor zu verbinden oder einen Proxy für den "
-"Internetzugriff zu konfigurieren, ist es nötig [[beim Start von Tails "
-"zusätzliche Konfigurationen für Tor zu aktivieren|first_steps/"
-"startup_options#additional]]."
+"<ul>\n"
+"<li>Einwahlmodems, lesen Sie [[!tails_ticket 5913]].</li>\n"
+"<li>VPNs, lesen Sie [[die zugehörigen FAQ.|support/faq#vpn]]</li>\n"
+"</ul>\n"
#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "</div>\n"
+msgid " </div>\n"
+msgstr "</div>\n"
+
+#. type: Bullet: '1. '
msgid "After establishing a connection to a network:"
msgstr "Nachdem eine Verbindung mit einem Netzwerk hergestellt wurde:"
-#. type: Bullet: ' - '
+#. type: Bullet: ' - '
#, fuzzy
#| msgid ""
#| " a. If you can already access the Internet, Tor is automatically "
@@ -89,7 +127,7 @@ msgstr ""
" a. Wenn Sie bereits Internetzugriff haben, wird Tor automatisch "
"gestartet.\n"
-#. type: Bullet: ' - '
+#. type: Bullet: ' - '
#, fuzzy
#| msgid ""
#| " b. If you need to log in to a captive portal before being granted "
@@ -98,7 +136,8 @@ msgstr ""
#| "unsafe_browser]].\n"
msgid ""
"If you need to log in to a captive portal before being granted access to the "
-"Internet, then [[see the corresponding documentation|unsafe_browser]]."
+"Internet, see our documentation on [[logging in to captive portals|doc/"
+"anonymous_internet/unsafe_browser]]."
msgstr ""
" b. Falls Sie sich in ein Captive Portal einloggen müssen, bevor Ihnen "
"Zugang\n"
@@ -106,6 +145,70 @@ msgstr ""
"unsafe_browser]].\n"
#. type: Plain text
+#, no-wrap
+msgid ""
+"For more information, open\n"
+"<span class=\"application\">[[GNOME Help|first_steps/introduction_to_gnome_and_the_tails_desktop#help]]</span>\n"
+"and choose <span class=\"guilabel\">Networking, web, email & chat</span>.\n"
+msgstr ""
+"Öffnen Sie für ausführlichere Informationen die\n"
+"<span class=\"application\">[[GNOME Hilfe|first_steps/introduction_to_gnome_and_the_tails_desktop#help]]</span>\n"
+"und wählen Sie <span class=\"guilabel\">Netzwerk, Web, E-Mail und Chat</span> aus.\n"
+
+#. type: Plain text
+msgid ""
+"If you are concerned about being identified as a Tails user on your network, "
+"read our documentation about [[network fingerprinting|doc/about/"
+"fingerprint]]."
+msgstr ""
+"Falls Sie Bedenken haben, als Nutzer von Tails in Ihrem Netzwerk "
+"identifiziert zu werden, lesen Sie unsere Dokumentation zu [[Netzwerk-"
+"Fingerabdrücken|doc/about/fingerprint]]."
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"no-wi-fi\"></a>\n"
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Troubleshooting Wi-Fi not working\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!inline pages=\"doc/anonymous_internet/networkmanager/no-wifi.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"Check in our list of [[known Wi-Fi issues|support/known_issues#wi-fi-"
+"workarounds]] if there is a workaround to get your Wi-Fi interface to work "
+"in Tails."
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Using Tor bridges or a local proxy\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"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#additional]]."
+msgstr ""
+"Um sich mit Hilfe von Bridges mit Tor zu verbinden oder einen Proxy für den "
+"Internetzugriff zu konfigurieren, ist es nötig [[beim Start von Tails "
+"zusätzliche Konfigurationen für Tor zu aktivieren|first_steps/"
+"startup_options#additional]]."
+
+#. type: Title =
+#, no-wrap
+msgid "Modifying and saving your network settings\n"
+msgstr ""
+
+#. type: Plain text
msgid ""
"To modify your network settings, for example to configure whether or not to "
"automatically connect to a Wi-Fi network, do the following:"
@@ -141,56 +244,11 @@ msgstr ""
"<span class=\"guilabel\">Netzwerkverbindungen</span> des beständigen Speicherbereichs|first_steps/persistence/configure#network_connections]]\n"
" aktivieren.\n"
-#. type: Plain text
-msgid ""
-"If you are concerned about being identified as a Tails user on your network, "
-"read our documentation about [[network fingerprinting|doc/about/"
-"fingerprint]]."
-msgstr ""
-"Falls Sie Bedenken haben, als Nutzer von Tails in Ihrem Netzwerk "
-"identifiziert zu werden, lesen Sie unsere Dokumentation zu [[Netzwerk-"
-"Fingerabdrücken|doc/about/fingerprint]]."
+#~ msgid "To connect to a Wi-Fi network:"
+#~ msgstr "Um eine Verbindung mit einem Wi-Fi-Netzwerk herzustellen:"
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"note\">\n"
-msgstr "<div class=\"note\">\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "<p>It is currently impossible to connect using:</p>\n"
-msgstr "<p>Es ist momentan nicht möglich, eine Verbindung herzustellen mit:</p>\n"
+#~ msgid "To connect to a mobile broadband network:"
+#~ msgstr "Um sich mit einem mobilen Breitbandnetzwerk zu verbinden:"
-#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<ul>\n"
-#| "<li>Dial-up modems, see [[!tails_ticket 5913]].</li>\n"
-#| "<li>VPNs, see [[the corresponding FAQ|support/faq#vpn]].</li>\n"
-#| "</ul>\n"
-msgid ""
-"<ul>\n"
-"<li>Dial-up modems.</li>\n"
-"<li>VPNs, see [[the corresponding FAQ|support/faq#vpn]].</li>\n"
-"</ul>\n"
-msgstr ""
-"<ul>\n"
-"<li>Einwahlmodems, lesen Sie [[!tails_ticket 5913]].</li>\n"
-"<li>VPNs, lesen Sie [[die zugehörigen FAQ.|support/faq#vpn]]</li>\n"
-"</ul>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
-msgstr "</div>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"For more information, open\n"
-"<span class=\"application\">[[GNOME Help|first_steps/introduction_to_gnome_and_the_tails_desktop#help]]</span>\n"
-"and choose <span class=\"guilabel\">Networking, web, email & chat</span>.\n"
-msgstr ""
-"Öffnen Sie für ausführlichere Informationen die\n"
-"<span class=\"application\">[[GNOME Hilfe|first_steps/introduction_to_gnome_and_the_tails_desktop#help]]</span>\n"
-"und wählen Sie <span class=\"guilabel\">Netzwerk, Web, E-Mail und Chat</span> aus.\n"
+#~ msgid "<div class=\"note\">\n"
+#~ msgstr "<div class=\"note\">\n"
diff --git a/wiki/src/doc/anonymous_internet/networkmanager.es.po b/wiki/src/doc/anonymous_internet/networkmanager.es.po
index 5c53ee4..35773e9 100644
--- a/wiki/src/doc/anonymous_internet/networkmanager.es.po
+++ b/wiki/src/doc/anonymous_internet/networkmanager.es.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2018-06-10 15:35+0200\n"
+"POT-Creation-Date: 2019-01-02 19:07+0000\n"
"PO-Revision-Date: 2018-03-19 07:26+0000\n"
"Last-Translator: cacukin <cacukin@cryptolab.net>\n"
"Language-Team: Spanish <https://translate.tails.boum.org/projects/tails/"
@@ -24,73 +24,180 @@ msgid "[[!meta title=\"Connecting to a network\"]]\n"
msgstr "[[!meta title=\"Conectar a una red\"]]\n"
#. type: Plain text
+#, no-wrap
+msgid "[[!toc levels=2]]\n"
+msgstr ""
+
+#. type: Title =
+#, fuzzy, no-wrap
+#| msgid "[[!meta title=\"Connecting to a network\"]]\n"
+msgid "Connecting to a network\n"
+msgstr "[[!meta title=\"Conectar a una red\"]]\n"
+
+#. type: Plain text
msgid ""
"You can connect to a network using a wired, Wi-Fi, or mobile broadband "
"connection:"
msgstr ""
"Puedes conectar a una red usando una conexión por cable, Wi-Fi o banda móvil:"
-#. type: Bullet: ' - '
-msgid "If a wired connection is detected, Tails automatically connects to it."
-msgstr ""
-"Si se detecta una conexión por cable, Tails se conecta automáticamente."
-
-#. type: Bullet: ' - '
-msgid "To connect to a Wi-Fi network:"
-msgstr "Para conectar a una red Wi-Fi:"
-
#. type: Bullet: '1. '
msgid "Open the system menu in the top-right corner."
msgstr "Abre el menú del sistema en la esquina superior derecha."
-#. type: Bullet: ' 1. '
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "[[!img doc/first_steps/introduction_to_gnome_and_the_tails_desktop/system.png link=\"no\"]]\n"
+msgid " [[!img doc/first_steps/introduction_to_gnome_and_the_tails_desktop/system.png link=\"no\"]]\n"
+msgstr "[[!img doc/first_steps/introduction_to_gnome_and_the_tails_desktop/system.png link=\"no\"]]\n"
+
+#. type: Bullet: ' - '
+#, fuzzy
+#| msgid ""
+#| "If a wired connection is detected, Tails automatically connects to it."
+msgid ""
+"If a wired connection is detected, Tails automatically connects to the "
+"network."
+msgstr ""
+"Si se detecta una conexión por cable, Tails se conecta automáticamente."
+
+#. type: Bullet: ' - '
+#, fuzzy
+#| msgid ""
+#| "Choose <span class=\"guilabel\">Wi-Fi</span> and then <span class="
+#| "\"guilabel\">Select Network</span>."
msgid ""
-"Choose <span class=\"guilabel\">Wi-Fi</span> and then <span class=\"guilabel"
-"\">Select Network</span>."
+"To connect to a Wi-Fi network, choose <span class=\"guilabel\">Wi-Fi Not "
+"Connected</span> and then <span class=\"guilabel\">Select Network</span>."
msgstr ""
"Elige <span class=\"guilabel\">Wi-Fi</span> y luego <span class=\"guilabel"
"\">Seleccionar Red</span>."
-#. type: Bullet: ' - '
-msgid "To connect to a mobile broadband network:"
-msgstr "Para conectar a una red de móvil:"
-
-#. type: Bullet: ' 1. '
-msgid "Choose <span class=\"guilabel\">Mobile Broadband</span>."
+#. type: Bullet: ' - '
+#, fuzzy
+#| msgid "Choose <span class=\"guilabel\">Mobile Broadband</span>."
+msgid ""
+"To connect to a mobile broadband network, choose <span class=\"guilabel"
+"\">Mobile Broadband</span>."
msgstr "Elige <span class=\"guilabel\">Mobile Broadband</span>."
#. type: Plain text
-#, no-wrap
-msgid "[[!img doc/first_steps/introduction_to_gnome_and_the_tails_desktop/system.png link=\"no\"]]\n"
-msgstr "[[!img doc/first_steps/introduction_to_gnome_and_the_tails_desktop/system.png link=\"no\"]]\n"
+#, fuzzy, no-wrap
+#| msgid "<p>It is currently impossible to connect using:</p>\n"
+msgid ""
+" <div class=\"note\">\n"
+" <p>It is currently impossible to connect to a network using:</p>\n"
+msgstr "<p>Por el momento es imposible conectarse usando:</p>\n"
#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<ul>\n"
+#| "<li>Dial-up modems.</li>\n"
+#| "<li>VPNs, see [[the corresponding FAQ|support/faq#vpn]].</li>\n"
+#| "</ul>\n"
msgid ""
-"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#additional]]."
+" <ul>\n"
+" <li>Dial-up modems.</li>\n"
+" <li>VPNs, see [[the corresponding FAQ|support/faq#vpn]].</li>\n"
+" </ul>\n"
msgstr ""
-"Para conectarte a Tor a través de puentes o configurar un proxy de acceso a "
-"Internet, necesitas [[activar la configuración adicional de Tor cuando "
-"arrancas Tails|first_steps/startup_options#additional]]."
+"<ul>\n"
+"<li>Modems de teléfono.</li>\n"
+"<li>VPNs, ver [[la Pregunta Frecuente correspondiente|support/faq#vpn]].</li>\n"
+"</ul>\n"
#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "</div>\n"
+msgid " </div>\n"
+msgstr "</div>\n"
+
+#. type: Bullet: '1. '
msgid "After establishing a connection to a network:"
msgstr "Luego de establecer una conexión a la red:"
-#. type: Bullet: ' - '
+#. type: Bullet: ' - '
msgid "If you can already access the Internet, Tor is automatically started."
msgstr "Si ya puedes acceder a Internet, Tor arranca automáticamente."
-#. type: Bullet: ' - '
+#. type: Bullet: ' - '
+#, fuzzy
+#| msgid ""
+#| "If you need to log in to a captive portal before being granted access to "
+#| "the Internet, then [[see the corresponding documentation|unsafe_browser]]."
msgid ""
"If you need to log in to a captive portal before being granted access to the "
-"Internet, then [[see the corresponding documentation|unsafe_browser]]."
+"Internet, see our documentation on [[logging in to captive portals|doc/"
+"anonymous_internet/unsafe_browser]]."
msgstr ""
"Si necesitas loguearte a un portal cautivo para poder acceder a Internet, "
"lee [[la documentación correspondiente|unsafe_browser]]."
#. type: Plain text
+#, no-wrap
+msgid ""
+"For more information, open\n"
+"<span class=\"application\">[[GNOME Help|first_steps/introduction_to_gnome_and_the_tails_desktop#help]]</span>\n"
+"and choose <span class=\"guilabel\">Networking, web, email & chat</span>.\n"
+msgstr ""
+"Para más información abre la\n"
+"<span class=\"application\">[[ayuda de GNOME|first_steps/introduction_to_gnome_and_the_tails_desktop#help]]</span>\n"
+"y elige <span class=\"guilabel\">Red, web, correo-e y chat</span>.\n"
+
+#. type: Plain text
+msgid ""
+"If you are concerned about being identified as a Tails user on your network, "
+"read our documentation about [[network fingerprinting|doc/about/"
+"fingerprint]]."
+msgstr ""
+"Si tienes miedo a ser identificado como usuario de Tails en tu red, lee "
+"nuestra documentación sobre [[huella digital en la red|doc/about/"
+"fingerprint]]."
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"no-wi-fi\"></a>\n"
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Troubleshooting Wi-Fi not working\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!inline pages=\"doc/anonymous_internet/networkmanager/no-wifi.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"Check in our list of [[known Wi-Fi issues|support/known_issues#wi-fi-"
+"workarounds]] if there is a workaround to get your Wi-Fi interface to work "
+"in Tails."
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Using Tor bridges or a local proxy\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"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#additional]]."
+msgstr ""
+"Para conectarte a Tor a través de puentes o configurar un proxy de acceso a "
+"Internet, necesitas [[activar la configuración adicional de Tor cuando "
+"arrancas Tails|first_steps/startup_options#additional]]."
+
+#. type: Title =
+#, no-wrap
+msgid "Modifying and saving your network settings\n"
+msgstr ""
+
+#. type: Plain text
msgid ""
"To modify your network settings, for example to configure whether or not to "
"automatically connect to a Wi-Fi network, do the following:"
@@ -122,52 +229,11 @@ msgstr ""
"o las contraseñas de las redes wireless en tus próximas sesiones\n"
"puedes activar la [[funcionalidad persistente <span class=\"guilabel\">Conexiones de Red</span>|first_steps/persistence/configure#network_connections]].\n"
-#. type: Plain text
-msgid ""
-"If you are concerned about being identified as a Tails user on your network, "
-"read our documentation about [[network fingerprinting|doc/about/"
-"fingerprint]]."
-msgstr ""
-"Si tienes miedo a ser identificado como usuario de Tails en tu red, lee "
-"nuestra documentación sobre [[huella digital en la red|doc/about/"
-"fingerprint]]."
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"note\">\n"
-msgstr "<div class=\"note\">\n"
+#~ msgid "To connect to a Wi-Fi network:"
+#~ msgstr "Para conectar a una red Wi-Fi:"
-#. type: Plain text
-#, no-wrap
-msgid "<p>It is currently impossible to connect using:</p>\n"
-msgstr "<p>Por el momento es imposible conectarse usando:</p>\n"
+#~ msgid "To connect to a mobile broadband network:"
+#~ msgstr "Para conectar a una red de móvil:"
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<ul>\n"
-"<li>Dial-up modems.</li>\n"
-"<li>VPNs, see [[the corresponding FAQ|support/faq#vpn]].</li>\n"
-"</ul>\n"
-msgstr ""
-"<ul>\n"
-"<li>Modems de teléfono.</li>\n"
-"<li>VPNs, ver [[la Pregunta Frecuente correspondiente|support/faq#vpn]].</li>"
-"\n"
-"</ul>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
-msgstr "</div>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"For more information, open\n"
-"<span class=\"application\">[[GNOME Help|first_steps/introduction_to_gnome_and_the_tails_desktop#help]]</span>\n"
-"and choose <span class=\"guilabel\">Networking, web, email & chat</span>.\n"
-msgstr ""
-"Para más información abre la\n"
-"<span class=\"application\">[[ayuda de GNOME|first_steps/introduction_to_gnome_and_the_tails_desktop#help]]</span>\n"
-"y elige <span class=\"guilabel\">Red, web, correo-e y chat</span>.\n"
+#~ msgid "<div class=\"note\">\n"
+#~ msgstr "<div class=\"note\">\n"
diff --git a/wiki/src/doc/anonymous_internet/networkmanager.fa.po b/wiki/src/doc/anonymous_internet/networkmanager.fa.po
index 4c44bf8..115d9a7 100644
--- a/wiki/src/doc/anonymous_internet/networkmanager.fa.po
+++ b/wiki/src/doc/anonymous_internet/networkmanager.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: 2018-06-10 15:35+0200\n"
+"POT-Creation-Date: 2019-01-02 19:07+0000\n"
"PO-Revision-Date: 2015-10-14 19:26+0000\n"
"Last-Translator: sprint5 <translation5@451f.org>\n"
"Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/"
@@ -26,61 +26,96 @@ msgid "[[!meta title=\"Connecting to a network\"]]\n"
msgstr "[[!meta title=\"متصل شدن به شبکه با استفاده از NetworkManager\"]]\n"
#. type: Plain text
+#, no-wrap
+msgid "[[!toc levels=2]]\n"
+msgstr ""
+
+#. type: Title =
+#, fuzzy, no-wrap
+#| msgid "[[!meta title=\"Connecting to the network with NetworkManager\"]]\n"
+msgid "Connecting to a network\n"
+msgstr "[[!meta title=\"متصل شدن به شبکه با استفاده از NetworkManager\"]]\n"
+
+#. type: Plain text
msgid ""
"You can connect to a network using a wired, Wi-Fi, or mobile broadband "
"connection:"
msgstr ""
-#. type: Bullet: ' - '
+#. type: Bullet: '1. '
+msgid "Open the system menu in the top-right corner."
+msgstr ""
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-idle.png link=no]]\n"
+msgid " [[!img doc/first_steps/introduction_to_gnome_and_the_tails_desktop/system.png link=\"no\"]]\n"
+msgstr "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-idle.png link=no]]\n"
+
+#. type: Bullet: ' - '
#, fuzzy
#| msgid ""
#| "If a wired connection is detected, <span class=\"application"
#| "\">NetworkManager</span> automatically connects to it."
-msgid "If a wired connection is detected, Tails automatically connects to it."
+msgid ""
+"If a wired connection is detected, Tails automatically connects to the "
+"network."
msgstr ""
"اگر یک اتصال باسیم شناسایی شود، <span class=\"application\">NetworkManager</"
"span> به طور خودکار به آن متصل می‌شود."
-#. type: Bullet: ' - '
-msgid "To connect to a Wi-Fi network:"
-msgstr ""
-
-#. type: Bullet: '1. '
-msgid "Open the system menu in the top-right corner."
-msgstr ""
-
-#. type: Bullet: ' 1. '
+#. type: Bullet: ' - '
msgid ""
-"Choose <span class=\"guilabel\">Wi-Fi</span> and then <span class=\"guilabel"
-"\">Select Network</span>."
+"To connect to a Wi-Fi network, choose <span class=\"guilabel\">Wi-Fi Not "
+"Connected</span> and then <span class=\"guilabel\">Select Network</span>."
msgstr ""
-#. type: Bullet: ' - '
-msgid "To connect to a mobile broadband network:"
+#. type: Bullet: ' - '
+msgid ""
+"To connect to a mobile broadband network, choose <span class=\"guilabel"
+"\">Mobile Broadband</span>."
msgstr ""
-#. type: Bullet: ' 1. '
-msgid "Choose <span class=\"guilabel\">Mobile Broadband</span>."
+#. type: Plain text
+#, no-wrap
+msgid ""
+" <div class=\"note\">\n"
+" <p>It is currently impossible to connect to a network using:</p>\n"
msgstr ""
#. type: Plain text
#, fuzzy, no-wrap
-#| msgid "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-idle.png link=no]]\n"
-msgid "[[!img doc/first_steps/introduction_to_gnome_and_the_tails_desktop/system.png link=\"no\"]]\n"
-msgstr "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-idle.png link=no]]\n"
-
-#. type: Plain text
+#| msgid ""
+#| "<ul>\n"
+#| "<li><span class=\"application\">NetworkManager</span> does not support dial-up\n"
+#| "modems. See [[!tails_ticket 5913]].</li>\n"
+#| "<li>It is currently not possible to use Tails with a VPN. [[See the\n"
+#| "corresponding FAQ.|support/faq#vpn]]</li>\n"
+#| "</ul>\n"
msgid ""
-"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#additional]]."
+" <ul>\n"
+" <li>Dial-up modems.</li>\n"
+" <li>VPNs, see [[the corresponding FAQ|support/faq#vpn]].</li>\n"
+" </ul>\n"
msgstr ""
+"<ul>\n"
+"<li><span class=\"application\">NetworkManager</span> از مودم‌های دایال‌آپ\n"
+"پشتیبانی نمی‌کند. رجوع کنید به [[!tails_ticket 5913]].</li>\n"
+"<li>در حال حاضر در تیلز امکان استفاده از وی‌پی‌ان وجود ندارد. [[سوالات متداول\n"
+"در این زمینه را ببینید.|support/faq#vpn]]</li>\n"
+"</ul>\n"
#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "</div>\n"
+msgid " </div>\n"
+msgstr "</div>\n"
+
+#. type: Bullet: '1. '
msgid "After establishing a connection to a network:"
msgstr "پس از برقراری اتصال به شبکه:"
-#. type: Bullet: ' - '
+#. type: Bullet: ' - '
#, fuzzy
#| msgid ""
#| " a. If you can already access the Internet, Tor and\n"
@@ -99,7 +134,7 @@ msgstr ""
"پورتال شوید،\n"
" [[سند مرتبط|unsafe_browser]] را ببینید.\n"
-#. type: Bullet: ' - '
+#. type: Bullet: ' - '
#, fuzzy
#| msgid ""
#| " a. If you can already access the Internet, Tor and\n"
@@ -111,7 +146,8 @@ msgstr ""
#| "unsafe_browser]].\n"
msgid ""
"If you need to log in to a captive portal before being granted access to the "
-"Internet, then [[see the corresponding documentation|unsafe_browser]]."
+"Internet, see our documentation on [[logging in to captive portals|doc/"
+"anonymous_internet/unsafe_browser]]."
msgstr ""
" الف. اگر امکان دسترسی به اینترنت دارید پس تور و \n"
" <span class=\"application\">[[ویدالیا]]</span> خودکار راه‌اندازی "
@@ -121,6 +157,69 @@ msgstr ""
" [[سند مرتبط|unsafe_browser]] را ببینید.\n"
#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "For more information about <span class=\"application\">NetworkManager</span>, open\n"
+#| "<span class=\"application\">[[GNOME Help|first_steps/introduction_to_gnome_and_the_tails_desktop#help]]</span>\n"
+#| "and choose <span class=\"guilabel\">Networking, web, email & chat</span>.\n"
+msgid ""
+"For more information, open\n"
+"<span class=\"application\">[[GNOME Help|first_steps/introduction_to_gnome_and_the_tails_desktop#help]]</span>\n"
+"and choose <span class=\"guilabel\">Networking, web, email & chat</span>.\n"
+msgstr ""
+"برای کسب اطلاعات بیشتر در مورد <span class=\"application\">NetworkManager</span>، \n"
+"<span class=\"application\">[[کمک گنوم|first_steps/introduction_to_gnome_and_the_tails_desktop#help]]</span> را باز کرده و\n"
+"<span class=\"guilabel\">شبکه، وب، رایانه و گفتگوهای آنلاین</span> را انتخاب کنید.\n"
+
+#. type: Plain text
+msgid ""
+"If you are concerned about being identified as a Tails user on your network, "
+"read our documentation about [[network fingerprinting|doc/about/"
+"fingerprint]]."
+msgstr ""
+"اگر نگران شناخته‌شدن به عنوان یک کاربر تیلز روی شبکهٔ خود هستید، سند ما راجع "
+"به [[اثر انگشت در شبکه|doc/about/fingerprint]] را بخوانید."
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"no-wi-fi\"></a>\n"
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Troubleshooting Wi-Fi not working\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!inline pages=\"doc/anonymous_internet/networkmanager/no-wifi.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"Check in our list of [[known Wi-Fi issues|support/known_issues#wi-fi-"
+"workarounds]] if there is a workaround to get your Wi-Fi interface to work "
+"in Tails."
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Using Tor bridges or a local proxy\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"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#additional]]."
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Modifying and saving your network settings\n"
+msgstr ""
+
+#. type: Plain text
msgid ""
"To modify your network settings, for example to configure whether or not to "
"automatically connect to a Wi-Fi network, do the following:"
@@ -154,66 +253,8 @@ msgstr ""
"[[ویژگی <span class=\"guilabel\">اتصالات شبکه</span> \n"
"مانا|first_steps/persistence/configure#network_connections]] را انتخاب کنید.\n"
-#. type: Plain text
-msgid ""
-"If you are concerned about being identified as a Tails user on your network, "
-"read our documentation about [[network fingerprinting|doc/about/"
-"fingerprint]]."
-msgstr ""
-"اگر نگران شناخته‌شدن به عنوان یک کاربر تیلز روی شبکهٔ خود هستید، سند ما راجع "
-"به [[اثر انگشت در شبکه|doc/about/fingerprint]] را بخوانید."
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"note\">\n"
-msgstr "<div class=\"note\">\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "<p>It is currently impossible to connect using:</p>\n"
-msgstr ""
-
-#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<ul>\n"
-#| "<li><span class=\"application\">NetworkManager</span> does not support dial-up\n"
-#| "modems. See [[!tails_ticket 5913]].</li>\n"
-#| "<li>It is currently not possible to use Tails with a VPN. [[See the\n"
-#| "corresponding FAQ.|support/faq#vpn]]</li>\n"
-#| "</ul>\n"
-msgid ""
-"<ul>\n"
-"<li>Dial-up modems.</li>\n"
-"<li>VPNs, see [[the corresponding FAQ|support/faq#vpn]].</li>\n"
-"</ul>\n"
-msgstr ""
-"<ul>\n"
-"<li><span class=\"application\">NetworkManager</span> از مودم‌های دایال‌آپ\n"
-"پشتیبانی نمی‌کند. رجوع کنید به [[!tails_ticket 5913]].</li>\n"
-"<li>در حال حاضر در تیلز امکان استفاده از وی‌پی‌ان وجود ندارد. [[سوالات متداول\n"
-"در این زمینه را ببینید.|support/faq#vpn]]</li>\n"
-"</ul>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
-msgstr "</div>\n"
-
-#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "For more information about <span class=\"application\">NetworkManager</span>, open\n"
-#| "<span class=\"application\">[[GNOME Help|first_steps/introduction_to_gnome_and_the_tails_desktop#help]]</span>\n"
-#| "and choose <span class=\"guilabel\">Networking, web, email & chat</span>.\n"
-msgid ""
-"For more information, open\n"
-"<span class=\"application\">[[GNOME Help|first_steps/introduction_to_gnome_and_the_tails_desktop#help]]</span>\n"
-"and choose <span class=\"guilabel\">Networking, web, email & chat</span>.\n"
-msgstr ""
-"برای کسب اطلاعات بیشتر در مورد <span class=\"application\">NetworkManager</span>، \n"
-"<span class=\"application\">[[کمک گنوم|first_steps/introduction_to_gnome_and_the_tails_desktop#help]]</span> را باز کرده و\n"
-"<span class=\"guilabel\">شبکه، وب، رایانه و گفتگوهای آنلاین</span> را انتخاب کنید.\n"
+#~ msgid "<div class=\"note\">\n"
+#~ msgstr "<div class=\"note\">\n"
#~ msgid ""
#~ "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-"
diff --git a/wiki/src/doc/anonymous_internet/networkmanager.fr.po b/wiki/src/doc/anonymous_internet/networkmanager.fr.po
index 0a1d5ec..af63218 100644
--- a/wiki/src/doc/anonymous_internet/networkmanager.fr.po
+++ b/wiki/src/doc/anonymous_internet/networkmanager.fr.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2018-06-10 15:35+0200\n"
-"PO-Revision-Date: 2018-06-25 09:07+0000\n"
+"POT-Creation-Date: 2019-01-30 09:49+0100\n"
+"PO-Revision-Date: 2019-01-19 21:01+0000\n"
"Last-Translator: AtomiKe <tails@atomike.ninja>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
"Language: fr\n"
@@ -22,6 +22,16 @@ msgid "[[!meta title=\"Connecting to a network\"]]\n"
msgstr "[[!meta title=\"Se connecter à un réseau\"]]\n"
#. type: Plain text
+#, no-wrap
+msgid "[[!toc levels=2]]\n"
+msgstr "[[!toc levels=2]]\n"
+
+#. type: Title =
+#, no-wrap
+msgid "Connecting to a network\n"
+msgstr "Se connecter à un réseau\n"
+
+#. type: Plain text
msgid ""
"You can connect to a network using a wired, Wi-Fi, or mobile broadband "
"connection:"
@@ -29,68 +39,151 @@ msgstr ""
"Vous pouvez vous connecter à un réseau via une connexion filaire, Wi-Fi, ou "
"un réseau mobile à large bande :"
-#. type: Bullet: ' - '
-msgid "If a wired connection is detected, Tails automatically connects to it."
-msgstr ""
-"Si une connexion filaire est détectée, Tails s'y connecte automatiquement."
-
-#. type: Bullet: ' - '
-msgid "To connect to a Wi-Fi network:"
-msgstr "Pour vous connecter à un réseau Wi-Fi :"
-
#. type: Bullet: '1. '
msgid "Open the system menu in the top-right corner."
msgstr "Ouvrez le menu système dans le coin en haut à droite."
-#. type: Bullet: ' 1. '
+#. type: Plain text
+#, no-wrap
+msgid " [[!img doc/first_steps/introduction_to_gnome_and_the_tails_desktop/system.png link=\"no\"]]\n"
+msgstr " [[!img doc/first_steps/introduction_to_gnome_and_the_tails_desktop/system.png link=\"no\"]]\n"
+
+#. type: Bullet: ' - '
msgid ""
-"Choose <span class=\"guilabel\">Wi-Fi</span> and then <span class=\"guilabel"
-"\">Select Network</span>."
+"If a wired connection is detected, Tails automatically connects to the "
+"network."
msgstr ""
-"Cliquez sur <span class=\"guilabel\">Wi-Fi</span> puis sur <span class="
-"\"guilabel\">Sélectionner un réseau</span>."
+"Si une connexion filaire est détectée, Tails s'y connecte automatiquement."
-#. type: Bullet: ' - '
-msgid "To connect to a mobile broadband network:"
-msgstr "Pour vous connecter à un réseau mobile à large bande :"
+#. type: Bullet: ' - '
+msgid ""
+"To connect to a Wi-Fi network, choose <span class=\"guilabel\">Wi-Fi Not "
+"Connected</span> and then <span class=\"guilabel\">Select Network</span>."
+msgstr ""
+"Pour se connecter à un réseau Wi-Fi, choisissez <span class=\"guilabel\">Wi-"
+"Fi non connecté</span> puis <span class=\"guilabel\">Sélectionner un réseau</"
+"span>."
-#. type: Bullet: ' 1. '
-msgid "Choose <span class=\"guilabel\">Mobile Broadband</span>."
-msgstr "Cliquez sur <span class=\"guilabel\">Mobile Broadband</span>."
+#. type: Bullet: ' - '
+msgid ""
+"To connect to a mobile broadband network, choose <span class=\"guilabel"
+"\">Mobile Broadband</span>."
+msgstr ""
+"Pour se connecter à un réseau mobile large bande, choisissez <span class="
+"\"guilabel\">Réseau mobile large bande</span>."
#. type: Plain text
#, no-wrap
-msgid "[[!img doc/first_steps/introduction_to_gnome_and_the_tails_desktop/system.png link=\"no\"]]\n"
-msgstr "[[!img doc/first_steps/introduction_to_gnome_and_the_tails_desktop/system.png link=\"no\"]]\n"
+msgid ""
+" <div class=\"note\">\n"
+" <p>It is currently impossible to connect to a network using:</p>\n"
+msgstr ""
+" <div class=\"note\">\n"
+" <p>Il est actuellement impossible de se connecter au réseau avec :</p>\n"
#. type: Plain text
+#, no-wrap
msgid ""
-"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#additional]]."
+" <ul>\n"
+" <li>Dial-up modems.</li>\n"
+" <li>VPNs, see [[the corresponding FAQ|support/faq#vpn]].</li>\n"
+" </ul>\n"
msgstr ""
-"Pour vous connecter à Tor en utilisant les bridges ou configurer un proxy "
-"pour accéder à internet, vous devez [[activer une configuration réseau "
-"supplémentaire au démarrage de Tails|first_steps/"
-"startup_options#additional]]."
+" <ul>\n"
+" <li>Un modem téléphonique.</li>\n"
+" <li>Un VPN, voir [[la FAQ correspondante|support/faq#vpn]].</li>\n"
+" </ul>\n"
#. type: Plain text
+#, no-wrap
+msgid " </div>\n"
+msgstr " </div>\n"
+
+#. type: Bullet: '1. '
msgid "After establishing a connection to a network:"
msgstr "Après établissement d'une connexion à un réseau :"
-#. type: Bullet: ' - '
+#. type: Bullet: ' - '
msgid "If you can already access the Internet, Tor is automatically started."
msgstr ""
"Si vous pouvez déjà accéder à Internet, Tor est démarré automatiquement."
-#. type: Bullet: ' - '
+#. type: Bullet: ' - '
msgid ""
"If you need to log in to a captive portal before being granted access to the "
-"Internet, then [[see the corresponding documentation|unsafe_browser]]."
+"Internet, see our documentation on [[logging in to captive portals|doc/"
+"anonymous_internet/unsafe_browser]]."
msgstr ""
"Si vous avez besoin de vous identifier à un portail captif afin d'obtenir "
-"accès à Internet, voyez [[notre documentation correspondante|"
-"unsafe_browser]]."
+"l'accès à Internet, consultez notre documentation sur [[l'identification "
+"auprès d'un portail captif|doc/anonymous_internet/unsafe_browser]]."
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"For more information, open\n"
+"<span class=\"application\">[[GNOME Help|first_steps/introduction_to_gnome_and_the_tails_desktop#help]]</span>\n"
+"and choose <span class=\"guilabel\">Networking, web, email & chat</span>.\n"
+msgstr ""
+"Pour plus d'information, ouvrez\n"
+"<span class=\"application\">[[l'aide de GNOME|first_steps/introduction_to_gnome_and_the_tails_desktop#help]]</span>\n"
+"et choisissez <span class=\"guilabel\">Réseau, Web, courriel et discussion</span>.\n"
+
+#. type: Plain text
+msgid ""
+"If you are concerned about being identified as a Tails user on your network, "
+"read our documentation about [[network fingerprinting|doc/about/"
+"fingerprint]]."
+msgstr ""
+"Si vous êtes préoccupé par le fait d'être identifié comme un utilisateur de "
+"Tails sur votre réseau, lisez notre documentation à propos de l'[[empreinte "
+"réseau|doc/about/fingerprint]]."
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"no-wi-fi\"></a>\n"
+msgstr "<a id=\"no-wi-fi\"></a>\n"
+
+#. type: Title =
+#, no-wrap
+msgid "Troubleshooting Wi-Fi not working\n"
+msgstr "Résoudre les problèmes de Wi-Fi\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!inline pages=\"doc/anonymous_internet/networkmanager/no-wifi.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr "[[!inline pages=\"doc/anonymous_internet/networkmanager/no-wifi.inline.fr\" raw=\"yes\" sort=\"age\"]]\n"
+
+#. type: Bullet: '* '
+msgid ""
+"Check in our list of [[known Wi-Fi issues|support/known_issues#wi-fi-"
+"workarounds]] if there is a workaround to get your Wi-Fi interface to work "
+"in Tails."
+msgstr ""
+"Vérifier dans la liste des [[problèmes Wi-FI connus|support/known_issues#wi-"
+"fi-workarounds]] s'il y a un coutournement pour faire fonctionner votre "
+"interface Wi-Fi dans Tails."
+
+#. type: Title =
+#, no-wrap
+msgid "Using Tor bridges or a local proxy\n"
+msgstr "Utiliser les bridges Tor ou un serveur proxy local\n"
+
+#. type: Plain text
+msgid ""
+"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#additional]]."
+msgstr ""
+"Pour vous connecter à Tor en utilisant les bridges ou configurer un proxy "
+"pour accéder à internet, vous devez [[activer une configuration réseau "
+"supplémentaire au démarrage de Tails|first_steps/"
+"startup_options#additional]]."
+
+#. type: Title =
+#, no-wrap
+msgid "Modifying and saving your network settings\n"
+msgstr "Modifier et enregistrer vos paramètres réseau\n"
#. type: Plain text
msgid ""
@@ -125,54 +218,14 @@ msgstr ""
"vous pouvez activer [[l'option <span class=\"guilabel\">Connexions Réseaux</span> de\n"
"la persistance|first_steps/persistence/configure#network_connections]].\n"
-#. type: Plain text
-msgid ""
-"If you are concerned about being identified as a Tails user on your network, "
-"read our documentation about [[network fingerprinting|doc/about/"
-"fingerprint]]."
-msgstr ""
-"Si vous êtes préoccupé par le fait d'être identifié comme un utilisateur de "
-"Tails sur votre réseau, lisez notre documentation à propos de l'[[empreinte "
-"réseau|doc/about/fingerprint]]."
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"note\">\n"
-msgstr "<div class=\"note\">\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "<p>It is currently impossible to connect using:</p>\n"
-msgstr "<p>Il est actuellement impossible de se connecter au réseau avec :</p>\n"
+#~ msgid "To connect to a Wi-Fi network:"
+#~ msgstr "Pour vous connecter à un réseau Wi-Fi :"
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<ul>\n"
-"<li>Dial-up modems.</li>\n"
-"<li>VPNs, see [[the corresponding FAQ|support/faq#vpn]].</li>\n"
-"</ul>\n"
-msgstr ""
-"<ul>\n"
-"<li>Un modem téléphonique.</li>\n"
-"<li>Un VPN, voir [[la FAQ correspondante|support/faq#vpn]].</li>\n"
-"</ul>\n"
+#~ msgid "To connect to a mobile broadband network:"
+#~ msgstr "Pour vous connecter à un réseau mobile à large bande :"
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
-msgstr "</div>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"For more information, open\n"
-"<span class=\"application\">[[GNOME Help|first_steps/introduction_to_gnome_and_the_tails_desktop#help]]</span>\n"
-"and choose <span class=\"guilabel\">Networking, web, email & chat</span>.\n"
-msgstr ""
-"Pour plus d'information, ouvrez\n"
-"<span class=\"application\">[[l'aide de GNOME|first_steps/introduction_to_gnome_and_the_tails_desktop#help]]</span>\n"
-"et choisissez <span class=\"guilabel\">Réseau, Web, courriel et discussion</span>.\n"
+#~ msgid "<div class=\"note\">\n"
+#~ msgstr "<div class=\"note\">\n"
#~ msgid ""
#~ "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-"
diff --git a/wiki/src/doc/anonymous_internet/networkmanager.it.po b/wiki/src/doc/anonymous_internet/networkmanager.it.po
index e6c4995..6fea55b 100644
--- a/wiki/src/doc/anonymous_internet/networkmanager.it.po
+++ b/wiki/src/doc/anonymous_internet/networkmanager.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-06-10 15:35+0200\n"
+"POT-Creation-Date: 2019-01-02 19:07+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"
@@ -21,123 +21,163 @@ msgid "[[!meta title=\"Connecting to a network\"]]\n"
msgstr ""
#. type: Plain text
-msgid ""
-"You can connect to a network using a wired, Wi-Fi, or mobile broadband "
-"connection:"
+#, no-wrap
+msgid "[[!toc levels=2]]\n"
msgstr ""
-#. type: Bullet: ' - '
-msgid "If a wired connection is detected, Tails automatically connects to it."
+#. type: Title =
+#, no-wrap
+msgid "Connecting to a network\n"
msgstr ""
-#. type: Bullet: ' - '
-msgid "To connect to a Wi-Fi network:"
+#. type: Plain text
+msgid ""
+"You can connect to a network using a wired, Wi-Fi, or mobile broadband "
+"connection:"
msgstr ""
#. type: Bullet: '1. '
msgid "Open the system menu in the top-right corner."
msgstr ""
-#. type: Bullet: ' 1. '
+#. type: Plain text
+#, no-wrap
+msgid " [[!img doc/first_steps/introduction_to_gnome_and_the_tails_desktop/system.png link=\"no\"]]\n"
+msgstr ""
+
+#. type: Bullet: ' - '
msgid ""
-"Choose <span class=\"guilabel\">Wi-Fi</span> and then <span class=\"guilabel"
-"\">Select Network</span>."
+"If a wired connection is detected, Tails automatically connects to the "
+"network."
msgstr ""
-#. type: Bullet: ' - '
-msgid "To connect to a mobile broadband network:"
+#. type: Bullet: ' - '
+msgid ""
+"To connect to a Wi-Fi network, choose <span class=\"guilabel\">Wi-Fi Not "
+"Connected</span> and then <span class=\"guilabel\">Select Network</span>."
msgstr ""
-#. type: Bullet: ' 1. '
-msgid "Choose <span class=\"guilabel\">Mobile Broadband</span>."
+#. type: Bullet: ' - '
+msgid ""
+"To connect to a mobile broadband network, choose <span class=\"guilabel"
+"\">Mobile Broadband</span>."
msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!img doc/first_steps/introduction_to_gnome_and_the_tails_desktop/system.png link=\"no\"]]\n"
+msgid ""
+" <div class=\"note\">\n"
+" <p>It is currently impossible to connect to a network using:</p>\n"
msgstr ""
#. type: Plain text
+#, no-wrap
msgid ""
-"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#additional]]."
+" <ul>\n"
+" <li>Dial-up modems.</li>\n"
+" <li>VPNs, see [[the corresponding FAQ|support/faq#vpn]].</li>\n"
+" </ul>\n"
msgstr ""
#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "</div>\n"
+msgid " </div>\n"
+msgstr "</div>\n"
+
+#. type: Bullet: '1. '
msgid "After establishing a connection to a network:"
msgstr ""
-#. type: Bullet: ' - '
+#. type: Bullet: ' - '
msgid "If you can already access the Internet, Tor is automatically started."
msgstr ""
-#. type: Bullet: ' - '
+#. type: Bullet: ' - '
msgid ""
"If you need to log in to a captive portal before being granted access to the "
-"Internet, then [[see the corresponding documentation|unsafe_browser]]."
+"Internet, see our documentation on [[logging in to captive portals|doc/"
+"anonymous_internet/unsafe_browser]]."
msgstr ""
#. type: Plain text
+#, no-wrap
msgid ""
-"To modify your network settings, for example to configure whether or not to "
-"automatically connect to a Wi-Fi network, do the following:"
+"For more information, open\n"
+"<span class=\"application\">[[GNOME Help|first_steps/introduction_to_gnome_and_the_tails_desktop#help]]</span>\n"
+"and choose <span class=\"guilabel\">Networking, web, email & chat</span>.\n"
msgstr ""
-#. type: Bullet: '1. '
+#. type: Plain text
msgid ""
-"Click on the [[!img lib/preferences-system.png alt=\"System\" class="
-"\"symbolic\" link=\"no\"]] button to open the system settings."
+"If you are concerned about being identified as a Tails user on your network, "
+"read our documentation about [[network fingerprinting|doc/about/"
+"fingerprint]]."
msgstr ""
-#. type: Bullet: '1. '
-msgid "Choose <span class=\"guilabel\">Network</span>."
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"no-wi-fi\"></a>\n"
msgstr ""
-#. type: Plain text
+#. type: Title =
#, no-wrap
-msgid ""
-"If you want to reuse your custom\n"
-"configuration or the passwords of encrypted wireless connections across separate\n"
-"working sessions, you can activate the [[<span class=\"guilabel\">Network connections</span> persistence\n"
-"feature|first_steps/persistence/configure#network_connections]].\n"
+msgid "Troubleshooting Wi-Fi not working\n"
msgstr ""
#. type: Plain text
+#, no-wrap
+msgid "[[!inline pages=\"doc/anonymous_internet/networkmanager/no-wifi.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr ""
+
+#. type: Bullet: '* '
msgid ""
-"If you are concerned about being identified as a Tails user on your network, "
-"read our documentation about [[network fingerprinting|doc/about/"
-"fingerprint]]."
+"Check in our list of [[known Wi-Fi issues|support/known_issues#wi-fi-"
+"workarounds]] if there is a workaround to get your Wi-Fi interface to work "
+"in Tails."
msgstr ""
-#. type: Plain text
+#. type: Title =
#, no-wrap
-msgid "<div class=\"note\">\n"
-msgstr "<div class=\"note\">\n"
+msgid "Using Tor bridges or a local proxy\n"
+msgstr ""
#. type: Plain text
+msgid ""
+"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#additional]]."
+msgstr ""
+
+#. type: Title =
#, no-wrap
-msgid "<p>It is currently impossible to connect using:</p>\n"
+msgid "Modifying and saving your network settings\n"
msgstr ""
#. type: Plain text
-#, no-wrap
msgid ""
-"<ul>\n"
-"<li>Dial-up modems.</li>\n"
-"<li>VPNs, see [[the corresponding FAQ|support/faq#vpn]].</li>\n"
-"</ul>\n"
+"To modify your network settings, for example to configure whether or not to "
+"automatically connect to a Wi-Fi network, do the following:"
msgstr ""
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
-msgstr "</div>\n"
+#. type: Bullet: '1. '
+msgid ""
+"Click on the [[!img lib/preferences-system.png alt=\"System\" class="
+"\"symbolic\" link=\"no\"]] button to open the system settings."
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid "Choose <span class=\"guilabel\">Network</span>."
+msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"For more information, open\n"
-"<span class=\"application\">[[GNOME Help|first_steps/introduction_to_gnome_and_the_tails_desktop#help]]</span>\n"
-"and choose <span class=\"guilabel\">Networking, web, email & chat</span>.\n"
+"If you want to reuse your custom\n"
+"configuration or the passwords of encrypted wireless connections across separate\n"
+"working sessions, you can activate the [[<span class=\"guilabel\">Network connections</span> persistence\n"
+"feature|first_steps/persistence/configure#network_connections]].\n"
msgstr ""
+
+#~ msgid "<div class=\"note\">\n"
+#~ msgstr "<div class=\"note\">\n"
diff --git a/wiki/src/doc/anonymous_internet/networkmanager.mdwn b/wiki/src/doc/anonymous_internet/networkmanager.mdwn
index eb1d8f9..624c222 100644
--- a/wiki/src/doc/anonymous_internet/networkmanager.mdwn
+++ b/wiki/src/doc/anonymous_internet/networkmanager.mdwn
@@ -1,33 +1,69 @@
[[!meta title="Connecting to a network"]]
+[[!toc levels=2]]
+
+Connecting to a network
+=======================
+
You can connect to a network using a wired, Wi-Fi, or mobile broadband
connection:
- - If a wired connection is detected, Tails automatically connects to it.
+1. Open the system menu in the top-right corner.
- - To connect to a Wi-Fi network:
+ [[!img doc/first_steps/introduction_to_gnome_and_the_tails_desktop/system.png link="no"]]
- 1. Open the system menu in the top-right corner.
+ - If a wired connection is detected, Tails automatically connects to the network.
- 1. Choose <span class="guilabel">Wi-Fi</span> and then <span class="guilabel">Select Network</span>.
+ - To connect to a Wi-Fi network, choose <span class="guilabel">Wi-Fi Not
+ Connected</span> and then <span class="guilabel">Select Network</span>.
- - To connect to a mobile broadband network:
+ - To connect to a mobile broadband network, choose
+ <span class="guilabel">Mobile Broadband</span>.
- 1. Open the system menu in the top-right corner.
+ <div class="note">
+ <p>It is currently impossible to connect to a network using:</p>
- 1. Choose <span class="guilabel">Mobile Broadband</span>.
+ <ul>
+ <li>Dial-up modems.</li>
+ <li>VPNs, see [[the corresponding FAQ|support/faq#vpn]].</li>
+ </ul>
-[[!img doc/first_steps/introduction_to_gnome_and_the_tails_desktop/system.png link="no"]]
+ </div>
-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#additional]].
+1. After establishing a connection to a network:
+
+ - If you can already access the Internet, Tor is automatically started.
+
+ - If you need to log in to a captive portal before being granted access to
+ the Internet, see our documentation on [[logging in to captive
+ portals|doc/anonymous_internet/unsafe_browser]].
+
+For more information, open
+<span class="application">[[GNOME Help|first_steps/introduction_to_gnome_and_the_tails_desktop#help]]</span>
+and choose <span class="guilabel">Networking, web, email & chat</span>.
+
+If you are concerned about being identified as a Tails user on your
+network, read our documentation about [[network
+fingerprinting|doc/about/fingerprint]].
+
+<a id="no-wi-fi"></a>
+
+Troubleshooting Wi-Fi not working
+=================================
-After establishing a connection to a network:
+[[!inline pages="doc/anonymous_internet/networkmanager/no-wifi.inline" raw="yes" sort="age"]]
- - If you can already access the Internet, Tor is automatically started.
+* Check in our list of [[known Wi-Fi issues|support/known_issues#wi-fi-workarounds]]
+ if there is a workaround to get your Wi-Fi interface to