summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorignifugo <ignifugo@insicuri.net>2017-08-03 11:40:24 +0200
committerignifugo <ignifugo@insicuri.net>2017-08-03 11:40:24 +0200
commit0b82735588b54f46e09daa5e715f6fc9d4ed1649 (patch)
tree859c8bb2d867e0b3d5698885b98f72d890087acf
parentb96ee5e9c2c8ed22bae3c8eafba0b9a317cf7d00 (diff)
parent7a61c843f84ab4306e9e8b931e5cce2b1ac20236 (diff)
mergiato in master C0D305TRANSLATION
-rwxr-xr-xbin/delete-merged-git-branches14
-rw-r--r--ikiwiki-cgi.setup2
-rw-r--r--ikiwiki.setup2
m---------submodules/pythonlib0
-rw-r--r--wiki/src/about.de.po30
-rw-r--r--wiki/src/about.fa.po38
-rw-r--r--wiki/src/about.fr.po38
-rw-r--r--wiki/src/about.it.po47
-rw-r--r--wiki/src/about.mdwn13
-rw-r--r--wiki/src/about.pt.po36
-rw-r--r--wiki/src/about/contact.it.po156
-rw-r--r--wiki/src/blueprint/Debian_Stretch.mdwn342
-rw-r--r--wiki/src/blueprint/intercept_interviews.mdwn316
-rw-r--r--wiki/src/blueprint/l10n_Italian.mdwn156
-rw-r--r--wiki/src/blueprint/monthly_meeting.mdwn5
-rw-r--r--wiki/src/blueprint/monthly_report.mdwn2
-rw-r--r--wiki/src/blueprint/reproducible_builds.mdwn2
-rw-r--r--wiki/src/bugs.it.po16
-rw-r--r--wiki/src/contribute.de.po9
-rw-r--r--wiki/src/contribute.fa.po8
-rw-r--r--wiki/src/contribute.fr.po6
-rw-r--r--wiki/src/contribute.it.po111
-rw-r--r--wiki/src/contribute.mdwn1
-rw-r--r--wiki/src/contribute.pt.po8
-rw-r--r--wiki/src/contribute/APT_repository/custom.mdwn23
-rw-r--r--wiki/src/contribute/build.mdwn6
-rw-r--r--wiki/src/contribute/calendar.mdwn18
-rw-r--r--wiki/src/contribute/design.mdwn10
-rw-r--r--wiki/src/contribute/design/persistence.mdwn4
-rw-r--r--wiki/src/contribute/how/documentation/release_notes.mdwn8
-rw-r--r--wiki/src/contribute/how/documentation/release_notes/template.mdwn2
-rw-r--r--wiki/src/contribute/how/donate.de.po416
-rw-r--r--wiki/src/contribute/how/donate.fa.po288
-rw-r--r--wiki/src/contribute/how/donate.fr.po415
-rw-r--r--wiki/src/contribute/how/donate.it.po288
-rw-r--r--wiki/src/contribute/how/donate.mdwn172
-rw-r--r--wiki/src/contribute/how/donate.pt.po498
-rw-r--r--wiki/src/contribute/how/mirror.mdwn61
-rw-r--r--wiki/src/contribute/how/translate.mdwn2
-rw-r--r--wiki/src/contribute/how/translate/team/es.mdwn14
-rw-r--r--wiki/src/contribute/l10n_tricks.mdwn14
-rw-r--r--wiki/src/contribute/release_process.mdwn369
-rw-r--r--wiki/src/contribute/release_process/test.mdwn29
-rw-r--r--wiki/src/contribute/release_process/test/setup.mdwn12
-rw-r--r--wiki/src/contribute/release_process/test/usage.mdwn2
-rw-r--r--wiki/src/contribute/release_process/thunderbird.mdwn111
-rw-r--r--wiki/src/contribute/working_together/roles/debian_maintainer.mdwn34
-rw-r--r--wiki/src/contribute/working_together/roles/sysadmins/adding_icinga2_checks.mdwn62
-rw-r--r--wiki/src/doc.it.po16
-rw-r--r--wiki/src/doc/about.index.it.po4
-rw-r--r--wiki/src/doc/about.index.it.po.orig69
-rw-r--r--wiki/src/doc/about/acknowledgments_and_similar_projects.de.po6
-rw-r--r--wiki/src/doc/about/acknowledgments_and_similar_projects.fa.po6
-rw-r--r--wiki/src/doc/about/acknowledgments_and_similar_projects.fr.po4
-rw-r--r--wiki/src/doc/about/acknowledgments_and_similar_projects.it.po86
-rw-r--r--wiki/src/doc/about/acknowledgments_and_similar_projects.mdwn2
-rw-r--r--wiki/src/doc/about/acknowledgments_and_similar_projects.pt.po6
-rw-r--r--wiki/src/doc/about/features.de.po40
-rw-r--r--wiki/src/doc/about/features.fa.po49
-rw-r--r--wiki/src/doc/about/features.fr.po42
-rw-r--r--wiki/src/doc/about/features.it.po68
-rw-r--r--wiki/src/doc/about/features.it.po.orig451
-rw-r--r--wiki/src/doc/about/features.mdwn20
-rw-r--r--wiki/src/doc/about/features.pt.po44
-rw-r--r--wiki/src/doc/about/finances.fr.po210
-rw-r--r--wiki/src/doc/about/finances.it.po207
-rw-r--r--wiki/src/doc/about/fingerprint.it.po30
-rw-r--r--wiki/src/doc/about/license.it.po113
-rw-r--r--wiki/src/doc/about/license.it.po.orig247
-rw-r--r--wiki/src/doc/about/openpgp_keys.de.po44
-rw-r--r--wiki/src/doc/about/openpgp_keys.fa.po80
-rw-r--r--wiki/src/doc/about/openpgp_keys.it.po102
-rw-r--r--wiki/src/doc/about/openpgp_keys.it.po.orig651
-rw-r--r--wiki/src/doc/about/requirements.de.po2
-rw-r--r--wiki/src/doc/about/requirements.fa.po9
-rw-r--r--wiki/src/doc/about/requirements.fr.po2
-rw-r--r--wiki/src/doc/about/requirements.it.po41
-rw-r--r--wiki/src/doc/about/requirements.mdwn2
-rw-r--r--wiki/src/doc/about/requirements.pt.po13
-rw-r--r--wiki/src/doc/about/tor.it.po26
-rw-r--r--wiki/src/doc/about/trust.de.po2
-rw-r--r--wiki/src/doc/about/trust.fa.po2
-rw-r--r--wiki/src/doc/about/trust.fr.po2
-rw-r--r--wiki/src/doc/about/trust.it.po52
-rw-r--r--wiki/src/doc/about/trust.it.po.orig242
-rw-r--r--wiki/src/doc/about/trust.pt.po2
-rw-r--r--wiki/src/doc/about/warning.it.po41
-rw-r--r--wiki/src/doc/about/warning.it.po.orig553
-rw-r--r--wiki/src/doc/about/warning.pt.po4
-rw-r--r--wiki/src/doc/advanced_topics.index.it.po21
-rw-r--r--wiki/src/doc/advanced_topics/virtualization/virtualbox.de.po117
-rw-r--r--wiki/src/doc/advanced_topics/virtualization/virtualbox.fa.po30
-rw-r--r--wiki/src/doc/advanced_topics/virtualization/virtualbox.fr.po130
-rw-r--r--wiki/src/doc/advanced_topics/virtualization/virtualbox.it.po30
-rw-r--r--wiki/src/doc/advanced_topics/virtualization/virtualbox.mdwn16
-rw-r--r--wiki/src/doc/advanced_topics/virtualization/virtualbox.pt.po30
-rw-r--r--wiki/src/doc/anonymous_internet.index.it.po19
-rw-r--r--wiki/src/doc/anonymous_internet.it.po14
-rw-r--r--wiki/src/doc/anonymous_internet/thunderbird.de.po38
-rw-r--r--wiki/src/doc/anonymous_internet/thunderbird.fa.po32
-rw-r--r--wiki/src/doc/anonymous_internet/thunderbird.fr.po38
-rw-r--r--wiki/src/doc/anonymous_internet/thunderbird.it.po32
-rw-r--r--wiki/src/doc/anonymous_internet/thunderbird.mdwn8
-rw-r--r--wiki/src/doc/anonymous_internet/thunderbird.pt.po32
-rw-r--r--wiki/src/doc/anonymous_internet/thunderbird/account_creation.inline.fr.po6
-rw-r--r--wiki/src/doc/anonymous_internet/thunderbird/name.inline.de.po40
-rw-r--r--wiki/src/doc/anonymous_internet/thunderbird/name.inline.fa.po38
-rw-r--r--wiki/src/doc/anonymous_internet/thunderbird/name.inline.fr.po40
-rw-r--r--wiki/src/doc/anonymous_internet/thunderbird/name.inline.it.po38
-rw-r--r--wiki/src/doc/anonymous_internet/thunderbird/name.inline.mdwn8
-rw-r--r--wiki/src/doc/anonymous_internet/thunderbird/name.inline.pt.po38
-rw-r--r--wiki/src/doc/anonymous_internet/unsafe_browser.fa.po2
-rw-r--r--wiki/src/doc/encryption_and_privacy.index.it.po31
-rw-r--r--wiki/src/doc/encryption_and_privacy.it.po14
-rw-r--r--wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po6
-rw-r--r--wiki/src/doc/encryption_and_privacy/keyringer.fr.po20
-rw-r--r--wiki/src/doc/encryption_and_privacy/manage_passwords.fr.po19
-rw-r--r--wiki/src/doc/encryption_and_privacy/virtual_keyboard.de.po34
-rw-r--r--wiki/src/doc/encryption_and_privacy/virtual_keyboard.fa.po54
-rw-r--r--wiki/src/doc/encryption_and_privacy/virtual_keyboard.fr.po36
-rw-r--r--wiki/src/doc/encryption_and_privacy/virtual_keyboard.it.po26
-rw-r--r--wiki/src/doc/encryption_and_privacy/virtual_keyboard.mdwn9
-rw-r--r--wiki/src/doc/encryption_and_privacy/virtual_keyboard.pt.po21
-rw-r--r--wiki/src/doc/first_steps.index.it.po66
-rw-r--r--wiki/src/doc/first_steps/bug_reporting.fa.po4
-rw-r--r--wiki/src/doc/first_steps/bug_reporting.it.po2
-rw-r--r--wiki/src/doc/first_steps/bug_reporting.pt.po2
-rw-r--r--wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop/applications.pngbin28276 -> 27122 bytes
-rw-r--r--wiki/src/doc/first_steps/persistence.fa.po4
-rw-r--r--wiki/src/doc/first_steps/persistence.it.po9
-rw-r--r--wiki/src/doc/first_steps/persistence/configure.fa.po14
-rw-r--r--wiki/src/doc/first_steps/persistence/configure.fr.po14
-rw-r--r--wiki/src/doc/first_steps/persistence/configure.it.po4
-rw-r--r--wiki/src/doc/first_steps/persistence/copy.fr.po8
-rw-r--r--wiki/src/doc/first_steps/persistence/icedove.pngbin4963 -> 0 bytes
-rw-r--r--wiki/src/doc/first_steps/persistence/thunderbird.pngbin0 -> 5398 bytes
-rw-r--r--wiki/src/doc/first_steps/persistence/upgrade.de.po326
-rw-r--r--wiki/src/doc/first_steps/persistence/upgrade.fa.po326
-rw-r--r--wiki/src/doc/first_steps/persistence/upgrade.fr.po734
-rw-r--r--wiki/src/doc/first_steps/persistence/upgrade.it.po326
-rw-r--r--wiki/src/doc/first_steps/persistence/upgrade.mdwn188
-rw-r--r--wiki/src/doc/first_steps/persistence/upgrade.pt.po452
-rw-r--r--wiki/src/doc/first_steps/shutdown.de.po28
-rw-r--r--wiki/src/doc/first_steps/shutdown.fa.po28
-rw-r--r--wiki/src/doc/first_steps/shutdown.fr.po28
-rw-r--r--wiki/src/doc/first_steps/shutdown.it.po28
-rw-r--r--wiki/src/doc/first_steps/shutdown.mdwn8
-rw-r--r--wiki/src/doc/first_steps/shutdown.pt.po22
-rw-r--r--wiki/src/doc/first_steps/startup_options/administration_password.fa.po2
-rw-r--r--wiki/src/doc/first_steps/upgrade.fa.po8
-rw-r--r--wiki/src/doc/first_steps/upgrade.fr.po6
-rw-r--r--wiki/src/doc/first_steps/upgrade.it.po14
-rw-r--r--wiki/src/doc/first_steps/upgrade.pt.po4
-rw-r--r--wiki/src/doc/introduction.it.po31
-rw-r--r--wiki/src/doc/sensitive_documents.index.it.po22
-rw-r--r--wiki/src/doc/sensitive_documents.it.po14
-rw-r--r--wiki/src/doc/sensitive_documents/graphics.de.po24
-rw-r--r--wiki/src/doc/sensitive_documents/graphics.fa.po24
-rw-r--r--wiki/src/doc/sensitive_documents/graphics.fr.po22
-rw-r--r--wiki/src/doc/sensitive_documents/graphics.it.po25
-rw-r--r--wiki/src/doc/sensitive_documents/graphics.mdwn12
-rw-r--r--wiki/src/doc/sensitive_documents/graphics.pt.po24
-rw-r--r--wiki/src/doc/sensitive_documents/office_suite.de.po4
-rw-r--r--wiki/src/doc/sensitive_documents/office_suite.fa.po4
-rw-r--r--wiki/src/doc/sensitive_documents/office_suite.fr.po4
-rw-r--r--wiki/src/doc/sensitive_documents/office_suite.it.po11
-rw-r--r--wiki/src/doc/sensitive_documents/office_suite.mdwn2
-rw-r--r--wiki/src/doc/sensitive_documents/office_suite.pt.po4
-rw-r--r--wiki/src/doc/sensitive_documents/sound_and_video.de.po30
-rw-r--r--wiki/src/doc/sensitive_documents/sound_and_video.fa.po28
-rw-r--r--wiki/src/doc/sensitive_documents/sound_and_video.fr.po31
-rw-r--r--wiki/src/doc/sensitive_documents/sound_and_video.it.po23
-rw-r--r--wiki/src/doc/sensitive_documents/sound_and_video.mdwn12
-rw-r--r--wiki/src/doc/sensitive_documents/sound_and_video.pt.po39
-rw-r--r--wiki/src/doc/upgrade/error.it.po8
-rw-r--r--wiki/src/doc/upgrade/error.it.po.orig44
-rw-r--r--wiki/src/doc/upgrade/error/check.it.po15
-rw-r--r--wiki/src/doc/upgrade/error/check.it.po.orig82
-rw-r--r--wiki/src/doc/upgrade/error/download.it.po15
-rw-r--r--wiki/src/doc/upgrade/error/download.it.po.orig80
-rw-r--r--wiki/src/doc/upgrade/error/install.it.po16
-rw-r--r--wiki/src/doc/upgrade/error/install.it.po.orig118
-rw-r--r--wiki/src/donate.de.po6
-rw-r--r--wiki/src/donate.fa.po6
-rw-r--r--wiki/src/donate.fr.po16
-rw-r--r--wiki/src/donate.html1
-rw-r--r--wiki/src/donate.it.po66
-rw-r--r--wiki/src/donate.pt.po6
-rw-r--r--wiki/src/donate/expenses.svg242
-rw-r--r--wiki/src/getting_started.it.po4
-rw-r--r--wiki/src/getting_started.it.po.orig131
-rw-r--r--wiki/src/home.it.po16
-rw-r--r--wiki/src/home.it.po.orig45
-rw-r--r--wiki/src/inc/stable_amd64_gpg_signature_output.html9
-rw-r--r--wiki/src/inc/stable_amd64_gpg_verify.html2
-rw-r--r--wiki/src/inc/stable_amd64_iso_sig_url.html2
-rw-r--r--wiki/src/inc/stable_amd64_iso_size.html2
-rw-r--r--wiki/src/inc/stable_amd64_iso_url.html2
-rw-r--r--wiki/src/inc/stable_amd64_torrent_url.html2
-rw-r--r--wiki/src/inc/trace2
-rw-r--r--wiki/src/index.de.po11
-rw-r--r--wiki/src/index.fa.po15
-rw-r--r--wiki/src/index.fr.po36
-rw-r--r--wiki/src/index.html6
-rw-r--r--wiki/src/index.it.po79
-rw-r--r--wiki/src/index.it.po.orig182
-rw-r--r--wiki/src/index.pt.po11
-rw-r--r--wiki/src/install.it.po6
-rw-r--r--wiki/src/install.it.po.orig78
-rw-r--r--wiki/src/install/debian.de.po6
-rw-r--r--wiki/src/install/debian.it.po53
-rw-r--r--wiki/src/install/debian.it.po.orig111
-rw-r--r--wiki/src/install/download.de.po5
-rw-r--r--wiki/src/install/dvd.de.po5
-rw-r--r--wiki/src/install/dvd.fr.po20
-rw-r--r--wiki/src/install/dvd.it.po9
-rw-r--r--wiki/src/install/dvd.it.po.orig103
-rw-r--r--wiki/src/install/inc/steps/bittorrent_verification.inline.fr.po10
-rw-r--r--wiki/src/install/inc/steps/download.inline.fr.po12
-rw-r--r--wiki/src/install/inc/steps/install_final.inline.it.po17
-rw-r--r--wiki/src/install/inc/steps/install_final.inline.pt.po15
-rw-r--r--wiki/src/install/inc/steps/restart_first_time.inline.de.po5
-rw-r--r--wiki/src/install/linux.de.po18
-rw-r--r--wiki/src/install/linux.it.po22
-rw-r--r--wiki/src/install/mac.de.po21
-rw-r--r--wiki/src/install/mac.it.po19
-rw-r--r--wiki/src/install/os.de.po23
-rw-r--r--wiki/src/install/os.it.po21
-rw-r--r--wiki/src/install/v1/Tails/amd64/stable/latest.yml9
-rw-r--r--wiki/src/install/v1/Tails/i386/stable/latest.yml10
-rw-r--r--wiki/src/install/vm.de.po5
-rw-r--r--wiki/src/install/vm.it.po11
-rw-r--r--wiki/src/install/win.de.po25
-rw-r--r--wiki/src/install/win.it.po27
-rw-r--r--wiki/src/install/win/clone/overview.de.po17
-rw-r--r--wiki/src/install/win/clone/overview.it.po17
-rw-r--r--wiki/src/install/win/usb/overview.de.po4
-rw-r--r--wiki/src/install/win/usb/overview.it.po2
-rw-r--r--wiki/src/misc/unsafe_browser_warning.it.po2
-rw-r--r--wiki/src/news.de.po35
-rw-r--r--wiki/src/news.fa.po29
-rw-r--r--wiki/src/news.fr.po40
-rw-r--r--wiki/src/news.html4
-rw-r--r--wiki/src/news.it.po35
-rw-r--r--wiki/src/news.pt.po35
-rw-r--r--wiki/src/news/IP_leakage_with_Icedove.fr.po33
-rw-r--r--wiki/src/news/Mac_and_PC_UEFI_hardware_needed.fa.po9
-rw-r--r--wiki/src/news/On_0days_exploits_and_disclosure.fa.po2
-rw-r--r--wiki/src/news/Tails_HackFest_2014.fa.po2
-rw-r--r--wiki/src/news/amnesia_may_now_work_on_the_Mac.fr.po23
-rw-r--r--wiki/src/news/closing_tails-support.fr.po78
-rw-r--r--wiki/src/news/fpf_campaign.fa.po2
-rw-r--r--wiki/src/news/improve_the_infrastructure_behind_Tails.fa.po2
-rw-r--r--wiki/src/news/new_SSL_certificate.fa.po2
-rw-r--r--wiki/src/news/new_project_name.fa.po2
-rw-r--r--wiki/src/news/report_2013_11.mdwn4
-rw-r--r--wiki/src/news/signing_key_transition.fa.po17
-rw-r--r--wiki/src/news/summit_2013.fa.po2
-rw-r--r--wiki/src/news/tails-support.fr.po42
-rw-r--r--wiki/src/news/test_incremental_upgrades.fa.po2
-rw-r--r--wiki/src/news/version_0.10.1.mdwn2
-rw-r--r--wiki/src/news/version_0.10.2.mdwn2
-rw-r--r--wiki/src/news/version_0.10.mdwn5
-rw-r--r--wiki/src/news/version_0.11.mdwn2
-rw-r--r--wiki/src/news/version_0.12.mdwn6
-rw-r--r--wiki/src/news/version_0.13.mdwn2
-rw-r--r--wiki/src/news/version_0.14.mdwn2
-rw-r--r--wiki/src/news/version_0.15.mdwn2
-rw-r--r--wiki/src/news/version_0.16.mdwn2
-rw-r--r--wiki/src/news/version_0.18.mdwn2
-rw-r--r--wiki/src/news/version_0.2.mdwn2
-rw-r--r--wiki/src/news/version_0.3.mdwn2
-rw-r--r--wiki/src/news/version_0.4.1.mdwn8
-rw-r--r--wiki/src/news/version_0.4.2.mdwn2
-rw-r--r--wiki/src/news/version_0.5.mdwn4
-rw-r--r--wiki/src/news/version_0.6.1.mdwn2
-rw-r--r--wiki/src/news/version_0.6.2.mdwn2
-rw-r--r--wiki/src/news/version_0.6.mdwn9
-rw-r--r--wiki/src/news/version_0.7.mdwn6
-rw-r--r--wiki/src/news/version_0.8.1.mdwn2
-rw-r--r--wiki/src/news/version_0.8.mdwn2
-rw-r--r--wiki/src/news/version_0.9.mdwn2
-rw-r--r--wiki/src/news/version_2.0.1.de.po7
-rw-r--r--wiki/src/news/version_2.0.de.po7
-rw-r--r--wiki/src/news/version_2.10.fr.po4
-rw-r--r--wiki/src/news/version_2.2.1.de.po7
-rw-r--r--wiki/src/news/version_2.2.de.po7
-rw-r--r--wiki/src/news/version_2.3.de.po7
-rw-r--r--wiki/src/news/version_2.4.de.po7
-rw-r--r--wiki/src/news/version_2.5.de.po7
-rw-r--r--wiki/src/news/version_3.0.de.po104
-rw-r--r--wiki/src/news/version_3.0.fa.po104
-rw-r--r--wiki/src/news/version_3.0.fr.po335
-rw-r--r--wiki/src/news/version_3.0.it.po.orig596
-rw-r--r--wiki/src/news/version_3.0.mdwn31
-rw-r--r--wiki/src/news/version_3.0.pt.po104
-rw-r--r--wiki/src/news/who_are_you_helping.de.po16
-rw-r--r--wiki/src/news/who_are_you_helping.fa.po10
-rw-r--r--wiki/src/news/windows_camouflage_jessie.fa.po2
-rw-r--r--wiki/src/press.fa.po12
-rw-r--r--wiki/src/press.it.po220
-rw-r--r--wiki/src/security.de.po14
-rw-r--r--wiki/src/security.fa.po4
-rw-r--r--wiki/src/security.fr.po24
-rw-r--r--wiki/src/security.it.po53
-rw-r--r--wiki/src/security.mdwn2
-rw-r--r--wiki/src/security.pt.po15
-rw-r--r--wiki/src/security/Iceweasel_exposes_a_rare_User-Agent.fa.po2
-rw-r--r--wiki/src/security/Numerous_security_holes_in_2.12.de.po95
-rw-r--r--wiki/src/security/Numerous_security_holes_in_2.12.fa.po95
-rw-r--r--wiki/src/security/Numerous_security_holes_in_2.12.fr.po128
-rw-r--r--wiki/src/security/Numerous_security_holes_in_2.12.it.po95
-rw-r--r--wiki/src/security/Numerous_security_holes_in_2.12.mdwn45
-rw-r--r--wiki/src/security/Numerous_security_holes_in_2.12.pt.po95
-rw-r--r--wiki/src/security/Numerous_security_holes_in_2.5.it.po4
-rw-r--r--wiki/src/security/claws_mail_leaks_plaintext_to_imap.de.po22
-rw-r--r--wiki/src/security/claws_mail_leaks_plaintext_to_imap.fa.po56
-rw-r--r--wiki/src/security/claws_mail_leaks_plaintext_to_imap.fr.po28
-rw-r--r--wiki/src/security/claws_mail_leaks_plaintext_to_imap.it.po22
-rw-r--r--wiki/src/security/claws_mail_leaks_plaintext_to_imap.mdwn6
-rw-r--r--wiki/src/security/claws_mail_leaks_plaintext_to_imap.pt.po22
-rw-r--r--wiki/src/shortcuts.mdwn13
-rw-r--r--wiki/src/sidebar.it.po14
-rw-r--r--wiki/src/support.fr.po24
-rw-r--r--wiki/src/support.it.po14
-rw-r--r--wiki/src/support/chat.it.po26
-rw-r--r--wiki/src/support/faq.de.po94
-rw-r--r--wiki/src/support/faq.fa.po197
-rw-r--r--wiki/src/support/faq.fr.po112
-rw-r--r--wiki/src/support/faq.it.po736
-rw-r--r--wiki/src/support/faq.mdwn47
-rw-r--r--wiki/src/support/faq.pt.po199
-rw-r--r--wiki/src/support/known_issues.de.po51
-rw-r--r--wiki/src/support/known_issues.fa.po106
-rw-r--r--wiki/src/support/known_issues.fr.po173
-rw-r--r--wiki/src/support/known_issues.it.po51
-rw-r--r--wiki/src/support/known_issues.mdwn30
-rw-r--r--wiki/src/support/known_issues.pt.po152
-rw-r--r--wiki/src/support/talk.fr.po21
-rw-r--r--wiki/src/support/talk.it.po34
-rw-r--r--wiki/src/torrents.it.po12
-rw-r--r--wiki/src/torrents/files/tails-amd64-3.0.build-manifest5847
-rw-r--r--wiki/src/torrents/files/tails-amd64-3.0.iso.sig16
-rw-r--r--wiki/src/torrents/files/tails-amd64-3.0.packages1872
-rw-r--r--wiki/src/torrents/files/tails-amd64-3.0.torrentbin0 -> 92637 bytes
-rw-r--r--wiki/src/torrents/files/tails-i386-2.12.build-manifest6018
-rw-r--r--wiki/src/torrents/files/tails-i386-2.12.iso.sig16
-rw-r--r--wiki/src/torrents/files/tails-i386-2.12.packages1873
-rw-r--r--wiki/src/torrents/files/tails-i386-2.12.torrentbin87617 -> 0 bytes
-rw-r--r--wiki/src/upgrade.de.po13
-rw-r--r--wiki/src/upgrade.it.po80
-rw-r--r--wiki/src/upgrade.pt.po15
-rw-r--r--wiki/src/upgrade/clone.de.po5
-rw-r--r--wiki/src/upgrade/clone.it.po13
-rw-r--r--wiki/src/upgrade/clone.pt.po13
-rw-r--r--wiki/src/upgrade/v1/Tails/2.10/i386/stable/upgrades.yml15
-rw-r--r--wiki/src/upgrade/v1/Tails/2.10/i386/stable/upgrades.yml.pgp26
-rw-r--r--wiki/src/upgrade/v1/Tails/2.10~rc1/i386/stable/upgrades.yml13
-rw-r--r--wiki/src/upgrade/v1/Tails/2.10~rc1/i386/stable/upgrades.yml.pgp26
-rw-r--r--wiki/src/upgrade/v1/Tails/2.11/i386/stable/upgrades.yml15
-rw-r--r--wiki/src/upgrade/v1/Tails/2.11/i386/stable/upgrades.yml.pgp26
-rw-r--r--wiki/src/upgrade/v1/Tails/2.12.1/i386/alpha/upgrades.yml5
-rw-r--r--wiki/src/upgrade/v1/Tails/2.12.1/i386/alpha/upgrades.yml.pgp16
-rw-r--r--wiki/src/upgrade/v1/Tails/2.12.1/i386/stable/upgrades.yml5
-rw-r--r--wiki/src/upgrade/v1/Tails/2.12.1/i386/stable/upgrades.yml.pgp16
-rw-r--r--wiki/src/upgrade/v1/Tails/2.12/i386/stable/upgrades.yml10
-rw-r--r--wiki/src/upgrade/v1/Tails/2.12/i386/stable/upgrades.yml.pgp26
-rw-r--r--wiki/src/upgrade/v1/Tails/2.12/i386/test/upgrades.yml15
-rw-r--r--wiki/src/upgrade/v1/Tails/2.12/i386/test/upgrades.yml.pgp16
-rw-r--r--wiki/src/upgrade/v1/Tails/2.12~rc1.1/i386/alpha/upgrades.yml5
-rw-r--r--wiki/src/upgrade/v1/Tails/2.12~rc1.1/i386/alpha/upgrades.yml.pgp16
-rw-r--r--wiki/src/upgrade/v1/Tails/2.12~rc1.1/i386/stable/upgrades.yml5
-rw-r--r--wiki/src/upgrade/v1/Tails/2.12~rc1.1/i386/stable/upgrades.yml.pgp16
-rw-r--r--wiki/src/upgrade/v1/Tails/2.12~rc1/i386/alpha/upgrades.yml15
-rw-r--r--wiki/src/upgrade/v1/Tails/2.12~rc1/i386/alpha/upgrades.yml.pgp26
-rw-r--r--wiki/src/upgrade/v1/Tails/2.12~rc1/i386/stable/upgrades.yml15
-rw-r--r--wiki/src/upgrade/v1/Tails/2.12~rc1/i386/stable/upgrades.yml.pgp26
-rw-r--r--wiki/src/upgrade/v1/Tails/2.7.1/i386/stable/upgrades.yml15
-rw-r--r--wiki/src/upgrade/v1/Tails/2.7.1/i386/stable/upgrades.yml.pgp26
-rw-r--r--wiki/src/upgrade/v1/Tails/2.7/i386/stable/upgrades.yml13
-rw-r--r--wiki/src/upgrade/v1/Tails/2.7/i386/stable/upgrades.yml.pgp26
-rw-r--r--wiki/src/upgrade/v1/Tails/2.9.1/i386/stable/upgrades.yml13
-rw-r--r--wiki/src/upgrade/v1/Tails/2.9.1/i386/stable/upgrades.yml.pgp26
-rw-r--r--wiki/src/upgrade/v1/Tails/2.9/i386/stable/upgrades.yml10
-rw-r--r--wiki/src/upgrade/v1/Tails/2.9/i386/stable/upgrades.yml.pgp26
-rw-r--r--wiki/src/upgrade/v1/Tails/3.0.1/amd64/alpha/upgrades.yml5
-rw-r--r--wiki/src/upgrade/v1/Tails/3.0.1/amd64/alpha/upgrades.yml.pgp16
-rw-r--r--wiki/src/upgrade/v1/Tails/3.0.1/amd64/stable/upgrades.yml5
-rw-r--r--wiki/src/upgrade/v1/Tails/3.0.1/amd64/stable/upgrades.yml.pgp16
-rw-r--r--wiki/src/upgrade/v1/Tails/3.0~beta1/amd64/alpha/upgrades.yml10
-rw-r--r--wiki/src/upgrade/v1/Tails/3.0~beta1/amd64/alpha/upgrades.yml.pgp26
-rw-r--r--wiki/src/upgrade/v1/Tails/3.0~beta1/amd64/stable/upgrades.yml10
-rw-r--r--wiki/src/upgrade/v1/Tails/3.0~beta1/amd64/stable/upgrades.yml.pgp26
-rw-r--r--wiki/src/upgrade/v1/Tails/3.0~beta2/amd64/alpha/upgrades.yml15
-rw-r--r--wiki/src/upgrade/v1/Tails/3.0~beta2/amd64/alpha/upgrades.yml.pgp26
-rw-r--r--wiki/src/upgrade/v1/Tails/3.0~beta2/amd64/stable/upgrades.yml10
-rw-r--r--wiki/src/upgrade/v1/Tails/3.0~beta2/amd64/stable/upgrades.yml.pgp26
-rw-r--r--wiki/src/upgrade/v1/Tails/3.0~beta3/amd64/alpha/upgrades.yml15
-rw-r--r--wiki/src/upgrade/v1/Tails/3.0~beta3/amd64/alpha/upgrades.yml.pgp26
-rw-r--r--wiki/src/upgrade/v1/Tails/3.0~beta3/amd64/stable/upgrades.yml10
-rw-r--r--wiki/src/upgrade/v1/Tails/3.0~beta3/amd64/stable/upgrades.yml.pgp26
-rw-r--r--wiki/src/upgrade/v1/Tails/3.0~beta4/amd64/alpha/upgrades.yml10
-rw-r--r--wiki/src/upgrade/v1/Tails/3.0~beta4/amd64/alpha/upgrades.yml.pgp26
-rw-r--r--wiki/src/upgrade/v1/Tails/3.0~beta4/amd64/stable/upgrades.yml15
-rw-r--r--wiki/src/upgrade/v1/Tails/3.0~beta4/amd64/stable/upgrades.yml.pgp26
-rw-r--r--wiki/src/upgrade/v1/Tails/3.0~rc1/amd64/alpha/upgrades.yml15
-rw-r--r--wiki/src/upgrade/v1/Tails/3.0~rc1/amd64/alpha/upgrades.yml.pgp26
-rw-r--r--wiki/src/upgrade/v1/Tails/3.0~rc1/amd64/stable/upgrades.yml15
-rw-r--r--wiki/src/upgrade/v1/Tails/3.0~rc1/amd64/stable/upgrades.yml.pgp26
-rw-r--r--wiki/src/upgrade/v1/Tails/3.0~rc1/amd64/test/upgrades.yml20
-rw-r--r--wiki/src/upgrade/v1/Tails/3.0~rc1/amd64/test/upgrades.yml.pgp16
-rw-r--r--wiki/src/upgrade/v1/Tails/3.1/amd64/alpha/upgrades.yml5
-rw-r--r--wiki/src/upgrade/v1/Tails/3.1/amd64/alpha/upgrades.yml.pgp16
-rw-r--r--wiki/src/upgrade/v1/Tails/3.1/amd64/stable/upgrades.yml5
-rw-r--r--wiki/src/upgrade/v1/Tails/3.1/amd64/stable/upgrades.yml.pgp16
-rw-r--r--wiki/src/upgrade/v1/Tails/3.1~rc1/amd64/alpha/upgrades.yml5
-rw-r--r--wiki/src/upgrade/v1/Tails/3.1~rc1/amd64/alpha/upgrades.yml.pgp16
-rw-r--r--wiki/src/upgrade/v1/Tails/3.1~rc1/amd64/stable/upgrades.yml5
-rw-r--r--wiki/src/upgrade/v1/Tails/3.1~rc1/amd64/stable/upgrades.yml.pgp16
-rw-r--r--wiki/src/upgrade/v1/Tails/3.2/amd64/alpha/upgrades.yml5
-rw-r--r--wiki/src/upgrade/v1/Tails/3.2/amd64/alpha/upgrades.yml.pgp16
-rw-r--r--wiki/src/upgrade/v1/Tails/3.2/amd64/stable/upgrades.yml5
-rw-r--r--wiki/src/upgrade/v1/Tails/3.2/amd64/stable/upgrades.yml.pgp16
-rw-r--r--wiki/src/upgrade/v1/Tails/3.2~rc1/amd64/alpha/upgrades.yml5
-rw-r--r--wiki/src/upgrade/v1/Tails/3.2~rc1/amd64/alpha/upgrades.yml.pgp16
-rw-r--r--wiki/src/upgrade/v1/Tails/3.2~rc1/amd64/stable/upgrades.yml5
-rw-r--r--wiki/src/upgrade/v1/Tails/3.2~rc1/amd64/stable/upgrades.yml.pgp16
427 files changed, 18453 insertions, 17364 deletions
diff --git a/bin/delete-merged-git-branches b/bin/delete-merged-git-branches
index 3f174d2..03ea380 100755
--- a/bin/delete-merged-git-branches
+++ b/bin/delete-merged-git-branches
@@ -7,7 +7,8 @@ import sys
from distutils.util import strtobool
from tailslib.git import Git
-### Functions
+# Functions
+
def yes_no_input(prompt, default=True):
if default:
@@ -25,7 +26,8 @@ def yes_no_input(prompt, default=True):
except ValueError:
print("Please respond with 'y' or 'n'.")
-### Parse command-line arguments
+
+# Parse command-line arguments
parser = argparse.ArgumentParser(description='Delete merged Git branches.')
parser.add_argument('--repo', type=str, dest='repo',
@@ -37,7 +39,8 @@ parser.add_argument('--batch', type=bool, dest='batch',
help='Assume "yes" as answer to all prompts.')
args = parser.parse_args()
-### Main
+
+# Main
pp = pprint.PrettyPrinter()
tailsgit = Git(args.repo)
@@ -48,8 +51,9 @@ if not branches_to_delete:
sys.exit(0)
print("The following branches will be deleted:")
-pp.pprint(branches_to_delete)
-if not args.batch and not yes_no_input("Remove these branches?", default=False):
+pp.pprint(sorted(branches_to_delete))
+if not args.batch \
+ and not yes_no_input("Remove these branches?", default=False):
sys.exit(0)
tailsgit.push(args.remote, [':%s' % branch for branch in branches_to_delete])
diff --git a/ikiwiki-cgi.setup b/ikiwiki-cgi.setup
index 3fb3865..110bd3c 100644
--- a/ikiwiki-cgi.setup
+++ b/ikiwiki-cgi.setup
@@ -236,7 +236,7 @@ po_slave_languages:
#
# When updating this list, refer to the checklist in
# https://tails.boum.org/contribute/how/website/po_translatable_pages/
-po_translatable_pages: '!security/audits and !security/audits/* and !news/report_2* and !news/version_0* and !news/version_1* and !news/test_0* and !news/test_1* and !news/test_*alpha? and !news/test_*-beta? and !news/test_*-rc? and !security/Numerous_security_holes_in_0* and !security/Numerous_security_holes_in_1* and (about or about/* or bugs or chat or contribute or contribute/how/donate or doc or doc/* or donate or donate/* or download or download.inline or getting_started or home or inc/stable_amd64_release_notes or index or news or news/* or press or security or security/* or sidebar or support or support/* or torrents or misc or misc/* or install or install/* or upgrade or upgrade/*)'
+po_translatable_pages: '!security/audits and !security/audits/* and !news/report_2* and !news/version_0* and !news/version_1* and !news/test_0* and !news/test_1* and !news/test_*alpha? and !news/test_*-beta? and !news/test_*-rc? and !security/Numerous_security_holes_in_0* and !security/Numerous_security_holes_in_1* and (about or about/* or bugs or chat or contribute or doc or doc/* or donate or donate/* or download or download.inline or getting_started or home or inc/stable_amd64_release_notes or index or news or news/* or press or security or security/* or sidebar or support or support/* or torrents or misc or misc/* or install or install/* or upgrade or upgrade/*)'
# internal linking behavior (default/current/negotiated)
po_link_to: current
diff --git a/ikiwiki.setup b/ikiwiki.setup
index aad546c..aac3978 100644
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -213,7 +213,7 @@ po_slave_languages:
#
# When updating this list, refer to the checklist in
# https://tails.boum.org/contribute/how/website/po_translatable_pages/
-po_translatable_pages: '!security/audits and !security/audits/* and !news/report_2* and !news/version_0* and !news/version_1* and !news/test_0* and !news/test_1* and !news/test_*alpha? and !news/test_*-beta? and !news/test_*-rc? and !security/Numerous_security_holes_in_0* and !security/Numerous_security_holes_in_1* and (about or about/* or bugs or chat or contribute or contribute/how/donate or doc or doc/* or donate or donate/* or download or download.inline or getting_started or home or inc/stable_amd64_release_notes or index or news or news/* or press or security or security/* or sidebar or support or support/* or torrents or misc or misc/* or install or install/* or upgrade or upgrade/*)'
+po_translatable_pages: '!security/audits and !security/audits/* and !news/report_2* and !news/version_0* and !news/version_1* and !news/test_0* and !news/test_1* and !news/test_*alpha? and !news/test_*-beta? and !news/test_*-rc? and !security/Numerous_security_holes_in_0* and !security/Numerous_security_holes_in_1* and (about or about/* or bugs or chat or contribute or doc or doc/* or donate or donate/* or download or download.inline or getting_started or home or inc/stable_amd64_release_notes or index or news or news/* or press or security or security/* or sidebar or support or support/* or torrents or misc or misc/* or install or install/* or upgrade or upgrade/*)'
# internal linking behavior (default/current/negotiated)
po_link_to: current
diff --git a/submodules/pythonlib b/submodules/pythonlib
-Subproject e65c7b2f72f46e5eae19a4e5a308816b435d2ad
+Subproject 9906322f76c0f323bc99090905c31add47cacce
diff --git a/wiki/src/about.de.po b/wiki/src/about.de.po
index f9eb2a9..1d7e278 100644
--- a/wiki/src/about.de.po
+++ b/wiki/src/about.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails i10n Team\n"
-"POT-Creation-Date: 2017-02-25 15:24+0100\n"
+"POT-Creation-Date: 2017-06-27 08:29+0300\n"
"PO-Revision-Date: 2016-05-30 16:00-0000\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: Tails translators <tails-l10n@boum.org>\n"
@@ -63,7 +63,8 @@ msgstr ""
"Tails ist ein vollständiges Betriebssystem, das direkt von einer DVD, einem "
"USB-Stick oder einer SD-Karte aus genutzt wird, unabhängig von dem auf dem "
"Computer installierten Betriebssystem. Tails ist [[Freie Software|doc/about/"
-"license]] und basiert auf [[Debian GNU/Linux|https://www.debian.org/]]."
+"license]] und basiert auf [[Debian GNU/Linux|https://www.debian.org/index.de."
+"html]]."
#. type: Plain text
msgid ""
@@ -288,13 +289,14 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
"[[Encrypt your USB sticks or external hard-disks|doc/encryption_and_privacy/"
-"encrypted_volumes]] using <span class=\"definition\">[[!wikipedia LUKS]]</"
-"span>, the Linux standard for disk-encryption."
+"encrypted_volumes]] using <span class=\"definition\">[[!wikipedia "
+"Linux_Unified_Key_Setup desc=\"LUKS\"]]</span>, the Linux standard for disk-"
+"encryption."
msgstr ""
"[[Verschlüsseln Sie Ihren USB-Stick oder externe Festplatten|doc/"
"encryption_and_privacy/encrypted_volumes]] mit <span class=\"definition\">[[!"
-"wikipedia_de Linux_Unified_Key_Setup#Erweiterung_mit_LUKS desc=\"LUKS\"]]</"
-"span>, dem Linux-Standardprogramm zur Festplattenverschlüsselung."
+"wikipedia_de Dm-crypt#Erweiterung_mit_LUKS desc=\"LUKS\"]]</span>, dem Linux-"
+"Standardprogramm zur Festplattenverschlüsselung."
#. type: Bullet: ' - '
msgid ""
@@ -312,8 +314,9 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
"Encrypt and sign your emails and documents using the *de facto* standard "
-"<span class=\"definition\">[[!wikipedia OpenPGP]]</span> either from Tails "
-"email client, text editor or file browser."
+"<span class=\"definition\">[[!wikipedia Pretty_Good_Privacy#OpenPGP desc="
+"\"OpenPGP\"]]</span> either from Tails email client, text editor or file "
+"browser."
msgstr ""
"Verschlüsseln und signieren Sie Dokumente und E-Mails mit dem *de facto* "
"Standard <span class=\"definition\">[[!wikipedia_de OpenPGP]]</span>, "
@@ -419,6 +422,17 @@ msgid "See [[Press and media information|press]]."
msgstr "Lesen Sie die [[Medien- und Presseinformationen|press]]."
#. type: Title =
+#, fuzzy, no-wrap
+#| msgid "Contact\n"
+msgid "Social Contract\n"
+msgstr "Kontakt\n"
+
+#. type: Plain text
+msgid ""
+"Read our [[Social Contract|contribute/working_together/social_contract]]."
+msgstr ""
+
+#. type: Title =
#, no-wrap
msgid "Acknowledgments and similar projects\n"
msgstr "Danksagungen und ähnliche Projekte\n"
diff --git a/wiki/src/about.fa.po b/wiki/src/about.fa.po
index 77b2c80..b33468d 100644
--- a/wiki/src/about.fa.po
+++ b/wiki/src/about.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-02-25 15:24+0100\n"
+"POT-Creation-Date: 2017-06-27 08:29+0300\n"
"PO-Revision-Date: 2015-10-21 10:58+0000\n"
"Last-Translator: sprint5 <translation5@451f.org>\n"
"Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/about/fa/"
@@ -63,7 +63,8 @@ msgid ""
msgstr ""
"این سیستم عامل، مستقل از سیستم عامل اولیهٔ رایانه طراحی شده و با دی‌وی‌دی، "
"درایو یو‌اس‌بی، و کارت اس‌دی قابل استفاده است. تیلز یک [[نرم‌افزار آزاد|doc/"
-"about/license]] و مبتنی بر [[دبیان گنو/لینوکس|https://www.debian.org/]] است."
+"about/license]] و مبتنی بر [[دبیان گنو/لینوکس|https://www.debian.org/index."
+"fa.html]] است."
#. type: Plain text
msgid ""
@@ -315,12 +316,14 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
"[[Encrypt your USB sticks or external hard-disks|doc/encryption_and_privacy/"
-"encrypted_volumes]] using <span class=\"definition\">[[!wikipedia LUKS]]</"
-"span>, the Linux standard for disk-encryption."
+"encrypted_volumes]] using <span class=\"definition\">[[!wikipedia "
+"Linux_Unified_Key_Setup desc=\"LUKS\"]]</span>, the Linux standard for disk-"
+"encryption."
msgstr ""
-"با استفاده از <span class=\"definition\">[[!wikipedia LUKS]]</span> یعنی "
-"استاندارد لینوکس برای رمزنگاری دیسک‌ها، [[درایوهای یواس‌بی یا سخت‌دیسک‌های خارجی "
-"خود را رمزگذاری کنید|doc/encryption_and_privacy/encrypted_volumes]]."
+"با استفاده از <span class=\"definition\">[[!wikipedia "
+"Linux_Unified_Key_Setup desc=\"LUKS\"]]</span> یعنی استاندارد لینوکس برای "
+"رمزنگاری دیسک‌ها، [[درایوهای یواس‌بی یا سخت‌دیسک‌های خارجی خود را رمزگذاری کنید|"
+"doc/encryption_and_privacy/encrypted_volumes]]."
#. type: Bullet: ' - '
#, fuzzy
@@ -343,13 +346,14 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
"Encrypt and sign your emails and documents using the *de facto* standard "
-"<span class=\"definition\">[[!wikipedia OpenPGP]]</span> either from Tails "
-"email client, text editor or file browser."
+"<span class=\"definition\">[[!wikipedia Pretty_Good_Privacy#OpenPGP desc="
+"\"OpenPGP\"]]</span> either from Tails email client, text editor or file "
+"browser."
msgstr ""
"رایانامه‌ها و مستندات خود را با استفاده از استاندارد *غیررسمی (دفاکتو)* <span "
-"class=\"definition\">[[!wikipedia OpenPGP]]</span> رمزگذاری کنید. برای این‌ "
-"کار می‌توانید از سرویس رایانامه، ویرایش‌گر متن و یا مرورگر فایل تیلز استفاده "
-"کنید."
+"class=\"definition\">[[!wikipedia Pretty_Good_Privacy#OpenPGP desc=\"OpenPGP"
+"\"]]</span> رمزگذاری کنید. برای این‌ کار می‌توانید از سرویس رایانامه، ویرایش‌گر "
+"متن و یا مرورگر فایل تیلز استفاده کنید."
#. type: Bullet: ' - '
msgid ""
@@ -455,6 +459,16 @@ msgstr "[[اطلاعات رسانه‌ها و خبرگزاری‌ها|press]] ر
#. type: Title =
#, no-wrap
+msgid "Social Contract\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Read our [[Social Contract|contribute/working_together/social_contract]]."
+msgstr ""
+
+#. type: Title =
+#, no-wrap
msgid "Acknowledgments and similar projects\n"
msgstr "قدردانی‌ها و پروژه‌های مشابه\n"
diff --git a/wiki/src/about.fr.po b/wiki/src/about.fr.po
index e60efcb..624dc318 100644
--- a/wiki/src/about.fr.po
+++ b/wiki/src/about.fr.po
@@ -6,15 +6,15 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2017-02-25 15:24+0100\n"
-"PO-Revision-Date: 2016-06-05 09:23-0000\n"
+"POT-Creation-Date: 2017-06-27 08:29+0300\n"
+"PO-Revision-Date: 2017-06-25 10:13+0000\n"
"Last-Translator: \n"
"Language-Team: Tails translators <tails@boum.org>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.10\n"
+"X-Generator: Poedit 1.8.11\n"
#. type: Plain text
#, no-wrap
@@ -62,7 +62,7 @@ msgstr ""
"Tails est un système d'exploitation complet destiné à être utilisé depuis un "
"DVD, une clef USB ou une carte SD indépendamment du système installé sur "
"l'ordinateur. C'est un [[logiciel libre|doc/about/license]] basé sur "
-"[[Debian GNU/Linux|https://www.debian.org/]]."
+"[[Debian GNU/Linux|https://www.debian.org/index.fr.html]]."
#. type: Plain text
msgid ""
@@ -285,12 +285,13 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
"[[Encrypt your USB sticks or external hard-disks|doc/encryption_and_privacy/"
-"encrypted_volumes]] using <span class=\"definition\">[[!wikipedia LUKS]]</"
-"span>, the Linux standard for disk-encryption."
+"encrypted_volumes]] using <span class=\"definition\">[[!wikipedia "
+"Linux_Unified_Key_Setup desc=\"LUKS\"]]</span>, the Linux standard for disk-"
+"encryption."
msgstr ""
"[[Chiffrez votre clé USB ou votre disque dur externe|doc/"
-"encryption_and_privacy/encrypted_volumes]] avec <span class=\"definition"
-"\">[[!wikipedia_fr LUKS]]</span>, le standard de Linux en matière de "
+"encryption_and_privacy/encrypted_volumes]] avec <span class=\"definition\">"
+"[[!wikipedia_fr LUKS]]</span>, le standard de Linux en matière de "
"chiffrement de volume."
#. type: Bullet: ' - '
@@ -308,8 +309,9 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
"Encrypt and sign your emails and documents using the *de facto* standard "
-"<span class=\"definition\">[[!wikipedia OpenPGP]]</span> either from Tails "
-"email client, text editor or file browser."
+"<span class=\"definition\">[[!wikipedia Pretty_Good_Privacy#OpenPGP desc="
+"\"OpenPGP\"]]</span> either from Tails email client, text editor or file "
+"browser."
msgstr ""
"Chiffrez et signez vos emails et documents depuis le client mail de Tails, "
"l'éditeur de texte ou le navigateur de fichiers grâce au standard *de facto* "
@@ -322,9 +324,9 @@ msgid ""
"cryptographic tool that provides encryption, authentication and deniability."
msgstr ""
"Protégez vos conversations par messagerie instantanée en utilisant <span "
-"class=\"definition\">[[!wikipedia_fr Off-the-Record Messaging desc=\"OTR"
-"\"]]</span>, un outil cryptographique qui fournit chiffrement, "
-"authentification ainsi que la possibilité du déni plausible."
+"class=\"definition\">[[!wikipedia_fr Off-the-Record Messaging desc=\"OTR\"]]"
+"</span>, un outil cryptographique qui fournit chiffrement, authentification "
+"ainsi que la possibilité du déni plausible."
#. type: Bullet: ' - '
msgid ""
@@ -413,6 +415,16 @@ msgstr "Voir [[la rubrique presse et médias|press]]."
#. type: Title =
#, no-wrap
+msgid "Social Contract\n"
+msgstr "Contrat social\n"
+
+#. type: Plain text
+msgid ""
+"Read our [[Social Contract|contribute/working_together/social_contract]]."
+msgstr "Lisez notre [[Contrat Social|news/social_contract]]"
+
+#. type: Title =
+#, no-wrap
msgid "Acknowledgments and similar projects\n"
msgstr "Remerciements et projets similaires\n"
diff --git a/wiki/src/about.it.po b/wiki/src/about.it.po
index 9e4ce82..67ebad7 100644
--- a/wiki/src/about.it.po
+++ b/wiki/src/about.it.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: 1\n"
-"POT-Creation-Date: 2017-02-25 15:24+0100\n"
-"PO-Revision-Date: 2016-06-11 18:33+0100\n"
+"POT-Creation-Date: 2017-06-27 08:29+0300\n"
+"PO-Revision-Date: 2017-06-29 17:14+0000\n"
"Last-Translator: Zeyev <zeyev@autistici.org>\n"
"Language-Team: ita <transitails@inventati.org>\n"
"Language: it\n"
@@ -15,7 +15,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Poedit-SourceCharset: utf-8\n"
-"X-Generator: Poedit 1.6.10\n"
+"X-Generator: Poedit 1.8.11\n"
#. type: Plain text
#, no-wrap
@@ -63,7 +63,8 @@ msgstr ""
"É un Sistema Operativo completo progettato per essere avviato da DVD, "
"memoria USB o scheda SD e funziona indipendentemente dal sistema operativo "
"originale installato sul computer. É un [[Software Libero|doc/about/"
-"license]] basato su [[Debian GNU/Linux|https://www.debian.org/]]."
+"license]] basato su [[Debian GNU/Linux|https://www.debian.org/index.it."
+"html]]."
#. type: Plain text
msgid ""
@@ -285,13 +286,14 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
"[[Encrypt your USB sticks or external hard-disks|doc/encryption_and_privacy/"
-"encrypted_volumes]] using <span class=\"definition\">[[!wikipedia LUKS]]</"
-"span>, the Linux standard for disk-encryption."
+"encrypted_volumes]] using <span class=\"definition\">[[!wikipedia "
+"Linux_Unified_Key_Setup desc=\"LUKS\"]]</span>, the Linux standard for disk-"
+"encryption."
msgstr ""
"[[Criptare una memoria USB o un disco fisso esterno|doc/"
"encryption_and_privacy/encrypted_volumes]] usando <span class=\"definition"
-"\">[[!wikipedia LUKS]]</span>, lo strumento standard per criptare un disco "
-"su Gnu-Linux."
+"\">[[!wikipedia_it Linux_Unified_Key_Setup desc=\"LUKS\"]]</span>, lo "
+"strumento standard per criptare un disco su Gnu-Linux."
#. type: Bullet: ' - '
msgid ""
@@ -308,13 +310,14 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
"Encrypt and sign your emails and documents using the *de facto* standard "
-"<span class=\"definition\">[[!wikipedia OpenPGP]]</span> either from Tails "
-"email client, text editor or file browser."
+"<span class=\"definition\">[[!wikipedia Pretty_Good_Privacy#OpenPGP desc="
+"\"OpenPGP\"]]</span> either from Tails email client, text editor or file "
+"browser."
msgstr ""
"Cripta e firma le tue email e documenti usando lo standard riconosciuto "
-"<span class=\"definition\">[[!wikipedia_en Pretty_Good_Privacy desc=\"OpenPGP"
-"\"]]</span>, entrambe le cose dal client emails di Tails, dall'editor di "
-"testo o dal gestore dei file."
+"<span class=\"definition\">[[!wikipedia Pretty_Good_Privacy#OpenPGP desc="
+"\"OpenPGP\"]]</span>, entrambe le cose dal client emails di Tails, "
+"dall'editor di testo o dal gestore dei file."
#. type: Bullet: ' - '
msgid ""
@@ -323,7 +326,7 @@ msgid ""
"cryptographic tool that provides encryption, authentication and deniability."
msgstr ""
"Proteggi le tue conversazioni online con <span class=\"definition\">[[!"
-"wikipedia Off-the-Record_Messaging desc=\"OTR\"]]</span> (Off-the-Record "
+"wikipedia_it Off-the-Record Messaging desc=\"OTR\"]]</span> (Off-the-Record "
"Messaging, pagina in inglese), uno strumento crittografico per la cifratura, "
"l'autenticazione e la plausibile smentita."
@@ -374,8 +377,8 @@ msgstr ""
msgid ""
"our [[installation instructions|install]] to download and install Tails,"
msgstr ""
-"le nostre [[istruzioni per l'installazione|install]] per scaricare e installare "
-"Tails,"
+"le nostre [[istruzioni per l'installazione|install]] per scaricare e "
+"installare Tails,"
#. type: Bullet: ' - '
msgid "our [[documentation|doc]] explaining in detail how to use Tails,"
@@ -413,6 +416,18 @@ msgstr "Guarda [[informazioni dalla stampa e dai media|press]."
#. type: Title =
#, no-wrap
+msgid "Social Contract\n"
+msgstr "Contratto sociale\n"
+
+#. type: Plain text
+msgid ""
+"Read our [[Social Contract|contribute/working_together/social_contract]]."
+msgstr ""
+"Leggi il nostro [[Contratto sociale|contribute/working_together/"
+"social_contract]]."
+
+#. type: Title =
+#, no-wrap
msgid "Acknowledgments and similar projects\n"
msgstr "Riconoscimenti e progetti simili\n"
diff --git a/wiki/src/about.mdwn b/wiki/src/about.mdwn
index 50c008d..3d9d114 100644
--- a/wiki/src/about.mdwn
+++ b/wiki/src/about.mdwn
@@ -97,8 +97,8 @@ encryption:
- [[Encrypt your USB sticks or external
hard-disks|doc/encryption_and_privacy/encrypted_volumes]] using <span
- class="definition">[[!wikipedia LUKS]]</span>, the Linux standard for
- disk-encryption.
+ class="definition">[[!wikipedia Linux_Unified_Key_Setup desc="LUKS"]]</span>,
+ the Linux standard for disk-encryption.
- Automatically use HTTPS to encrypt all your communications to a number of
major websites using [HTTPS
@@ -106,8 +106,8 @@ encryption:
developed by the [Electronic Frontier Foundation](https://www.eff.org).
- Encrypt and sign your emails and documents using the *de facto* standard
- <span class="definition">[[!wikipedia OpenPGP]]</span> either from Tails
- email client, text editor or file browser.
+ <span class="definition">[[!wikipedia Pretty_Good_Privacy#OpenPGP desc="OpenPGP"]]</span>
+ either from Tails email client, text editor or file browser.
- Protect your instant messaging conversations using <span
class="definition">[[!wikipedia Off-the-Record_Messaging
@@ -138,6 +138,11 @@ Press and media
See [[Press and media information|press]].
+Social Contract
+===============
+
+Read our [[Social Contract|contribute/working_together/social_contract]].
+
Acknowledgments and similar projects
====================================
diff --git a/wiki/src/about.pt.po b/wiki/src/about.pt.po
index 8ac8df4..b1c70be 100644
--- a/wiki/src/about.pt.po
+++ b/wiki/src/about.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: 1\n"
-"POT-Creation-Date: 2017-02-25 15:24+0100\n"
+"POT-Creation-Date: 2017-06-27 08:29+0300\n"
"PO-Revision-Date: 2016-03-28 09:14-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: Portuguese <LL@li.org>\n"
@@ -63,7 +63,8 @@ msgstr ""
"É um Sistema Operacional completo projetado para ser usado a partir de um "
"DVD, memória USB ou cartão SD e funciona de forma independente do sistema "
"operacional original do computador. É um [[Software Livre|doc/about/"
-"license]] baseado no [[Debian GNU/Linux|https://www.debian.org/]]."
+"license]] baseado no [[Debian GNU/Linux|https://www.debian.org/index.pt."
+"html]]."
#. type: Plain text
msgid ""
@@ -282,13 +283,14 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
"[[Encrypt your USB sticks or external hard-disks|doc/encryption_and_privacy/"
-"encrypted_volumes]] using <span class=\"definition\">[[!wikipedia LUKS]]</"
-"span>, the Linux standard for disk-encryption."
+"encrypted_volumes]] using <span class=\"definition\">[[!wikipedia "
+"Linux_Unified_Key_Setup desc=\"LUKS\"]]</span>, the Linux standard for disk-"
+"encryption."
msgstr ""
"[[Criptografe sua memória USB ou disco rígido externo|doc/"
-"encryption_and_privacy/encrypted_volumes]] usando <span class=\"definition"
-"\">[[!wikipedia LUKS]]</span>, a ferramenta padrão do Linux para "
-"criptografia de disco."
+"encryption_and_privacy/encrypted_volumes]] usando <span class=\"definition\">"
+"[[!wikipedia Linux_Unified_Key_Setup desc=\"LUKS\"]]</span>, a ferramenta "
+"padrão do Linux para criptografia de disco."
#. type: Bullet: ' - '
msgid ""
@@ -305,12 +307,13 @@ msgstr ""
#. type: Bullet: ' - '
msgid ""
"Encrypt and sign your emails and documents using the *de facto* standard "
-"<span class=\"definition\">[[!wikipedia OpenPGP]]</span> either from Tails "
-"email client, text editor or file browser."
+"<span class=\"definition\">[[!wikipedia Pretty_Good_Privacy#OpenPGP desc="
+"\"OpenPGP\"]]</span> either from Tails email client, text editor or file "
+"browser."
msgstr ""
"Criptografe e assine seus emails e documentos, usando o padrão *de facto* "
-"<span class=\"definition\">[[!wikipedia OpenPGP]]</span> a partir do cliente "
-"de emails do Tails, do editor de texto ou do navegador de arquivos."
+"<span class=\"definition\">[[!wikipedia_pt OpenPGP]]</span> a partir do "
+"cliente de emails do Tails, do editor de texto ou do navegador de arquivos."
#. type: Bullet: ' - '
msgid ""
@@ -406,6 +409,17 @@ msgid "See [[Press and media information|press]]."
msgstr "Veja as [[informações na imprensa e na mídia|press]."
#. type: Title =
+#, fuzzy, no-wrap
+#| msgid "Contact\n"
+msgid "Social Contract\n"
+msgstr "Contato\n"
+
+#. type: Plain text
+msgid ""
+"Read our [[Social Contract|contribute/working_together/social_contract]]."
+msgstr ""
+
+#. type: Title =
#, no-wrap
msgid "Acknowledgments and similar projects\n"
msgstr "Agradecimentos e projetos similares\n"
diff --git a/wiki/src/about/contact.it.po b/wiki/src/about/contact.it.po
index f6651cd..0a956cd 100644
--- a/wiki/src/about/contact.it.po
+++ b/wiki/src/about/contact.it.po
@@ -3,47 +3,48 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: \n"
"POT-Creation-Date: 2017-06-07 17:03+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2017-06-30 18:01+0000\n"
"Language-Team: ita <transitails@inventati.org>\n"
-"Language: \n"
+"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Last-Translator: \n"
+"X-Generator: Poedit 1.8.11\n"
#. type: Plain text
#, no-wrap
msgid "[[!meta title=\"Contact\"]]\n"
-msgstr ""
+msgstr "[[!meta title=\"Contatti\"]]\n"
#. type: Plain text
msgid ""
"There are many ways to contact us, depending on what you want to talk about."
msgstr ""
+"Ci sono molti modi per contattarci, dipende da ciò di cui si vuole parlare."
#. type: Plain text
msgid "All mailing lists are in English unless specified otherwise."
-msgstr ""
+msgstr "Tutte le mailing list sono in inglese se non specificato diversamente."
#. type: Plain text
#, no-wrap
msgid "[[!toc levels=2]]\n"
-msgstr ""
+msgstr "[[!toc levels=2]]\n"
#. type: Title =
#, no-wrap
msgid "Public mailing lists\n"
-msgstr ""
+msgstr "Mailing list pubbliche\n"
#. type: Plain text
#, no-wrap
msgid "<div class=\"caution\">\n"
-msgstr ""
+msgstr "<div class=\"caution\">\n"
#. type: Plain text
#, no-wrap
@@ -52,21 +53,24 @@ msgid ""
"send compromising information. Please respect the\n"
"[[code of conduct|contribute/working_together/code_of_conduct/]].</p>\n"
msgstr ""
+"<p>Queste mailing list sono pubbliche: le iscrizioni sono aperte a chiunque. Non\n"
+"inviare informazioni compromettenti. Ti invitiamo, inoltre, a prende visione e a rispettare il\n"
+"[[codice di condotta|contribute/working_together/code_of_conduct/]].</p>\n"
#. type: Plain text
#, no-wrap
msgid "</div>\n"
-msgstr ""
+msgstr "</div>\n"
#. type: Plain text
#, no-wrap
msgid "<a id=\"amnesia-news\"></a>\n"
-msgstr ""
+msgstr "<a id=\"amnesia-news\"></a>\n"
#. type: Title -
#, no-wrap
msgid "amnesia-news\n"
-msgstr ""
+msgstr "amnesia-news\n"
#. type: Plain text
msgid ""
@@ -74,12 +78,17 @@ msgid ""
"email. It has a low traffic and it is the right place to stay up-to-date "
"with the releases and security announcements."
msgstr ""
+"amnesia-news@boum.org è la mailing list in cui inviamo le nostre [[news]] "
+"per email. Ha un traffico ridotto ed è il posto giusto per rimanere "
+"aggiornati con le comunicazioni e gli annunci sulla sicurezza."
#. type: Plain text
msgid ""
"Public archive of amnesia-news: <https://mailman.boum.org/pipermail/amnesia-"
"news/>."
msgstr ""
+"È possibile consultare l'archivio pubblico di amnesia-news al seguente "
+"indirizzo: <https://mailman.boum.org/pipermail/amnesia-news/>."
#. type: Plain text
#, no-wrap
@@ -89,28 +98,36 @@ msgid ""
"\t<input class=\"button\" type=\"submit\" value=\"Subscribe\"/>\n"
"</form>\n"
msgstr ""
+"<form method=\"POST\" action=\"https://mailman.boum.org/subscribe/amnesia-news\">\n"
+"\t<input class=\"text\" name=\"email\" value=\"\"/>\n"
+"\t<input class=\"button\" type=\"submit\" value=\"Subscribe\"/>\n"
+"</form>\n"
#. type: Plain text
#, no-wrap
msgid "<a id=\"tails-project\"></a>\n"
-msgstr ""
+msgstr "<a id=\"tails-project\"></a>\n"
#. type: Title -
#, no-wrap
msgid "tails-project\n"
-msgstr ""
+msgstr "tails-project\n"
#. type: Plain text
msgid ""
"tails-project@boum.org is the mailing list where we discuss upcoming events, "
"monthly reports, and other non-technical matters."
msgstr ""
+"tails-project@boum.org è la mailing list in cui discutiamo i prossimi "
+"eventi, i rapporti mensili e di altre questioni non tecniche."
#. type: Plain text
msgid ""
"Public archive of tails-project: <https://mailman.boum.org/pipermail/tails-"
"project/>."
msgstr ""
+"È possibile consultare l'archivio pubblico di tails-project al seguente "
+"indirizzo: <https://mailman.boum.org/pipermail/tails-project/>."
#. type: Plain text
#, no-wrap
@@ -120,16 +137,20 @@ msgid ""
"\t<input class=\"button\" type=\"submit\" value=\"Subscribe\"/>\n"
"</form>\n"
msgstr ""
+"<form method=\"POST\" action=\"https://mailman.boum.org/subscribe/tails-project\">\n"
+"\t<input class=\"text\" name=\"email\" value=\"\"/>\n"
+"\t<input class=\"button\" type=\"submit\" value=\"Subscribe\"/>\n"
+"</form>\n"
#. type: Plain text
#, no-wrap
msgid "<a id=\"tails-dev\"></a>\n"
-msgstr ""
+msgstr "<a id=\"tails-dev\"></a>\n"
#. type: Title -
#, no-wrap
msgid "tails-dev\n"
-msgstr ""
+msgstr "tails-dev\n"
#. type: Plain text
msgid ""
@@ -137,11 +158,16 @@ msgid ""
"coordinated and technical design questions are discussed. Subscribe if you "
"want to [[contribute code|contribute/how/code]]."
msgstr ""
+"tails-dev@boum.org è la mailing list dove si coordina il lavoro di sviluppo "
+"e vengono discusse le questione tecniche di progettazione. Iscriviti se "
+"desideri dare il tuo [[contributo al codice|contribue/how/code]]."
#. type: Plain text
msgid ""
"Public archive of tails-dev: <https://mailman.boum.org/pipermail/tails-dev/>."
msgstr ""
+"È possibile consultare l'archivio pubblico di tails-dev al seguente "
+"indirizzo: <https://mailman.boum.org/pipermail/tails-dev/>."
#. type: Plain text
#, no-wrap
@@ -151,28 +177,36 @@ msgid ""
"\t<input class=\"button\" type=\"submit\" value=\"Subscribe\"/>\n"
"</form>\n"
msgstr ""
+"<form method=\"POST\" action=\"https://mailman.boum.org/subscribe/tails-dev\">\n"
+"\t<input class=\"text\" name=\"email\" value=\"\"/>\n"
+"\t<input class=\"button\" type=\"submit\" value=\"Subscribe\"/>\n"
+"</form>\n"
#. type: Plain text
#, no-wrap
msgid "<a id=\"tails-testers\"></a>\n"
-msgstr ""
+msgstr "<a id=\"tails-testers\"></a>\n"
#. type: Title -
#, no-wrap
msgid "tails-testers\n"
-msgstr ""
+msgstr "tails-testers\n"
#. type: Plain text
msgid ""
"tails-testers@boum.org is the mailing list for people who want to help "
"[[test|contribute/how/testing]] new releases or features."
msgstr ""
+"tails-testers@boum.org è la mailing list per le persone che vogliono aiutare "
+"[[testando|contribute/how/testing]] le nuove funzionalità o release."
#. type: Plain text
msgid ""
"Public archive of tails-testers: <https://mailman.boum.org/pipermail/tails-"
"testers/>."
msgstr ""
+"È possibile consultare l'archivio pubblico di tails-testers al seguente "
+"indirizzo: <https://mailman.boum.org/pipermail/tails-testers/>."
#. type: Plain text
#, no-wrap
@@ -182,27 +216,35 @@ msgid ""
"\t<input class=\"button\" type=\"submit\" value=\"Subscribe\"/>\n"
"</form>\n"
msgstr ""
+"<form method=\"POST\" action=\"https://mailman.boum.org/subscribe/tails-testers\">\n"
+"\t<input class=\"text\" name=\"email\" value=\"\"/>\n"
+"\t<input class=\"button\" type=\"submit\" value=\"Subscribe\"/>\n"
+"</form>\n"
#. type: Plain text
#, no-wrap
msgid "<a id=\"tails-ux\"></a>\n"
-msgstr ""
+msgstr "<a id=\"tails-ux\"></a>\n"
#. type: Title -
#, no-wrap
msgid "tails-ux\n"
-msgstr ""
+msgstr "tails-ux\n"
#. type: Plain text
msgid ""
"tails-ux@boum.org is the list for matters related to [[user experience and "
"user interface|contribute/how/user_interface]]."
msgstr ""
+"tails-ux@boum.org è la mailing list delle questioni relative a [[esperienza "
+"utente e interfaccia utente|contribute/how/user_interface]]."
#. type: Plain text
msgid ""
"Public archive of tails-ux: <https://mailman.boum.org/pipermail/tails-ux/>."
msgstr ""
+"È possibile consultare l'archivio pubblico di tails-ux al seguente "
+"indirizzo: <https://mailman.boum.org/pipermail/tails-ux/>."
#. type: Plain text
#, no-wrap
@@ -212,36 +254,40 @@ msgid ""
"\t<input class=\"button\" type=\"submit\" value=\"Subscribe\"/>\n"
"</form>\n"
msgstr ""
+"<form method=\"POST\" action=\"https://mailman.boum.org/subscribe/tails-ux\">\n"
+"\t<input class=\"text\" name=\"email\" value=\"\"/>\n"
+"\t<input class=\"button\" type=\"submit\" value=\"Subscribe\"/>\n"
+"</form>\n"
#. type: Plain text
#, no-wrap
msgid "<a id=\"tails-l10n\"></a>\n"
-msgstr ""
+msgstr "<a id=\"tails-l10n\"></a>\n"
#. type: Title -
#, no-wrap
msgid "tails-l10n\n"
-msgstr ""
+msgstr "tails-l10n\n"
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"contribute/how/translate/tails-l10n.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr ""
+msgstr "[[!inline pages=\"contribute/how/translate/tails-l10n.inline\" raw=\"yes\" sort=\"age\"]]\n"
#. type: Title =
#, no-wrap
msgid "Private email addresses\n"
-msgstr ""
+msgstr "Indirizzi email privati\n"
#. type: Plain text
#, no-wrap
msgid "<a id=\"tails-support-private\"></a>\n"
-msgstr ""
+msgstr "<a id=\"tails-support-private\"></a>\n"
#. type: Title -
#, no-wrap
msgid "tails-support-private\n"
-msgstr ""
+msgstr "tails-support-private\n"
#. type: Plain text
#, no-wrap
@@ -249,26 +295,30 @@ msgid ""
"You can write encrypted emails to <tails-support-private@boum.org> if\n"
"you need help in private.\n"
msgstr ""
+"Puoi scrivere email criptate a <tails-support-private@boum.org> se\n"
+"hai bisogno di aiuto in privato.\n"
#. type: Plain text
msgid ""
"[[OpenPGP key|tails-bugs.key]] ([[details|doc/about/openpgp_keys#support]])."
msgstr ""
+"[[chiavi pubbliche PGP|tails-bugs.key]] ([[dettagli|doc/about/"
+"openpgp_keys#support]])."
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"support/talk/languages.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr ""
+msgstr "[[!inline pages=\"support/talk/languages.inline\" raw=\"yes\" sort=\"age\"]]\n"
#. type: Plain text
#, no-wrap
msgid "<a id=\"tails-press\"></a>\n"
-msgstr ""
+msgstr "<a id=\"tails-press\"></a>\n"
#. type: Title -
#, no-wrap
msgid "tails-press\n"
-msgstr ""
+msgstr "tails-press\n"
#. type: Plain text
#, no-wrap
@@ -277,16 +327,21 @@ msgid ""
"send us links to [[press articles|press]] about Tails, write to\n"
"<tails-press@boum.org>.\n"
msgstr ""
+"Se sei un giornalista e vuoi scriviere di Tails, o se desideri inviarci\n"
+"dei link di [[articoli|press]] che riguardano Tails, scrivi a\n"
+"<tails-press@boum.org>.\n"
#. type: Plain text
msgid ""
"[[OpenPGP key|tails-press.key]] ([[details|doc/about/openpgp_keys#press]])."
msgstr ""
+"[[chiavi pubbliche PGP|tails-press.key]] ([[dettagli|doc/about/"
+"openpgp_keys#press]])."
#. type: Plain text
#, no-wrap
msgid "<a id=\"tails-accounting\"></a>\n"
-msgstr ""
+msgstr "<a id=\"tails-accounting\"></a>\n"
#. type: Plain text
#, no-wrap
@@ -294,22 +349,26 @@ msgid ""
"tails-accounting\n"
"-----------------\n"
msgstr ""
+"tails-accounting\n"
+"-----------------\n"
#. type: Plain text
#, no-wrap
msgid "If you want to fund Tails, write to <tails-accounting@boum.org>.\n"
-msgstr ""
+msgstr "Se desideri finanziare Tails, scrivici a tails-accounting@boum.org.\n"
#. type: Plain text
msgid ""
"[[OpenPGP key|tails-accounting.key]] ([[details|doc/about/"
"openpgp_keys#accounting]])."
msgstr ""
+"[[chiavi pubbliche PGP|tails-accounting.key]] ([[dettagli|doc/about/"
+"openpgp_keys#accounting]])."
#. type: Plain text
#, no-wrap
msgid "<a id=\"tails-mirrors\"></a>\n"
-msgstr ""
+msgstr "<a id=\"tails-mirrors\"></a>\n"
#. type: Plain text
#, no-wrap
@@ -317,27 +376,31 @@ msgid ""
"tails-mirrors\n"
"-----------------\n"
msgstr ""
+"tails-mirrors\n"
+"-----------------\n"
#. type: Plain text
#, no-wrap
msgid "If you want to operate a Tails mirror, write to <tails-mirrors@boum.org>.\n"
-msgstr ""
+msgstr "Se si desidera gestire un mirror per Tails, scrivere a <tails-mirrors@boum.org>.\n"
#. type: Plain text
msgid ""
"[[OpenPGP key|tails-mirrors.key]] ([[details|doc/about/"
"openpgp_keys#mirrors]])."
msgstr ""
+"[[chiavi pubbliche PGP|tails-mirrors.key]] ([[dettagli|doc/about/"
+"openpgp_keys#mirrors]])."
#. type: Plain text
#, no-wrap
msgid "<a id=\"tails-sysadmins\"></a>\n"
-msgstr ""
+msgstr "<a id=\"tails-sysadmins\"></a>\n"
#. type: Title -
#, no-wrap
msgid "tails-sysadmins\n"
-msgstr ""
+msgstr "tails-sysadmins\n"
#. type: Plain text
#, no-wrap
@@ -345,43 +408,52 @@ msgid ""
"To talk about our infrastructure (servers, test suite, repositories,\n"
"mirrors, etc.), write to <tails-sysadmins@boum.org>.\n"
msgstr ""
+"Per parlare della nostre infrastrutture (server, suite di test, repository,\n"
+"mirror, ecc.), scrivici a <tails-sysadmins@boum.org>.\n"
#. type: Plain text
msgid ""
"[[OpenPGP key|tails-sysadmins.key]] ([[details|doc/about/"
"openpgp_keys#sysadmins]])."
msgstr ""
+"[[chiave pubblica PGP|tails-sysadmins.key]] ([[dettagli|doc/about/"
+"openpgp_keys#sysadmins]])."
#. type: Plain text
#, no-wrap
msgid "<a id=\"tails\"></a>\n"
-msgstr ""
+msgstr "<a id=\"tails\"></a>\n"
#. type: Title -
#, no-wrap
msgid "tails\n"
-msgstr ""
+msgstr "tails\n"
#. type: Plain text
msgid ""
"For matters that are listed in none of the above and for vulnerabilities "
"disclosures, you can write encrypted emails to <tails@boum.org>."
msgstr ""
+"Per delle questioni che non sono elencate in nessuna delle precedenti "
+"sezioni o per maggiori informazioni sulle vulnerabilità, è possibile "
+"scrivere e-mail crittografate a <tails@boum.org>."
#. type: Plain text
msgid ""
"[[OpenPGP key|tails-email.key]] ([[details|doc/about/openpgp_keys#private]])."
msgstr ""
+"[[chiave pubblica PGP|tails-email.key]] ([[dettagli|doc/about/"
+"openpgp_keys#private]])."
#. type: Plain text
#, no-wrap
msgid "<a id=\"chat\"></a>\n"
-msgstr ""
+msgstr "<a id=\"chat\"></a>\n"
#. type: Title =
#, no-wrap
msgid "Chat rooms\n"
-msgstr ""
+msgstr "Chat\n"
#. type: Plain text
msgid ""
@@ -389,3 +461,7 @@ msgid ""
"contribute/chat]]. Only a few Tails developers hang out there, so email is "
"preferred for anything that might be of interest for the larger community."
msgstr ""
+"Puoi unirti alla chat degli utenti e alla chat degli sviluppatori. Solo "
+"pochi sviluppatori di Tails passano il tempo lì, per cui la mailing list è "
+"preferita per qualsiasi cosa che potrebbe essere di interesse per l'intera "
+"comunità."
diff --git a/wiki/src/blueprint/Debian_Stretch.mdwn b/wiki/src/blueprint/Debian_Stretch.mdwn
index ac906a9..ff5db8d 100644
--- a/wiki/src/blueprint/Debian_Stretch.mdwn
+++ b/wiki/src/blueprint/Debian_Stretch.mdwn
@@ -36,7 +36,7 @@ evaluate the idea of basing Tails on snapshots of Debian testing.
* 2016Q1 — Tails 2.0 is out
* August 2016 — start working on Tails 3.0 (1 week sprint with
- all involved people) :intrigeri:anonym:kytv:
+ all involved people) :intrigeri:anonym:
- get feature/stretch to build and boot
- update the automated test suite to test Tails/Stretch ISO images
* August 2016 to April 2017 — have one dedicated half-time, 1-week sprint
@@ -54,7 +54,8 @@ evaluate the idea of basing Tails on snapshots of Debian testing.
sprints, nor between them;
* we get a feeling of how "being based on snapshots of Debian
testing" would work.
-* November 14-18th: second sprint (in-person, organized by intrigeri)
+* November 14-18th: second sprint (in-person, organized by intrigeri),
+ release Tails 3.0~alpha1
* December 20-23: third sprint (remotely attended for everybody except
a couple of us)
* January 30 - February 3: fourth sprint (remotely attended); release
@@ -62,11 +63,13 @@ evaluate the idea of basing Tails on snapshots of Debian testing.
* February 2017 to Tails 3.0 release: keep 3.0~beta as up-to-date,
wrt. security vulnerabilities, as our 2.x channel is
* February 5 2017 — Debian Stretch freeze starts
-* March 17-19th: fifth sprint (in-person, organized by intrigeri)
+* March 8: release Tails 3.0~beta2
+* March 17-19th: fifth sprint (in-person, organized by intrigeri),
+ release Tails 3.0~beta3
+* April 19: release Tails 3.0~beta4
* May 16-19: sixth sprint (remotely attended for everybody except
- a couple of us)
-* June 2017 (???) — Debian Stretch is released
-* June-August 2017 — Tails 3.0 is released
+ a couple of us), release Tails 3.0~rc1
+* June 2017 — Debian Stretch and Tails 3.0 are released
<a id="rolling"></a>
@@ -77,7 +80,7 @@ evaluate the idea of basing Tails on snapshots of Debian testing.
Let's use this porting cycle to evaluate how being based on snapshots
of Debian testing would feel like. During the entire cycle:
-* Keep the automated test suite up-to-date on feature/stretch :kytv:
+* Keep the automated test suite up-to-date on feature/stretch
- Whenever the porting work feels painful, e.g. because it requires
updating images, consider fixing the problem at its root in our
current devel branch, e.g. thanks to dogtail
@@ -170,3 +173,328 @@ happiness, and a warm feeling of being part of a broader community.
Another aspect is that we would essentially stop having to produce and
maintain backports of Debian packages.
+
+<a id="rolling-stretch-analysis"></a>
+
+## Analysis of the Stretch cycle
+
+### Statistics of Git activity
+
+We have generated
+[statistics and graphs](https://labs.riseup.net/code/attachments/download/1640/gitstats-2.x-to-3.0.tar.bz2)
+of the Git activity between our Jessie-based branch and our
+Stretch-based one. Long story short:
+
+ * We really started this work in 2016-08.
+ * The first peeks of activity are the two first sprints we had in
+ 2016-08 and 2016-11. Then quite some work was done every month
+ until the release, with more sustained activity starting in
+ 2017-03.
+ * The biggest peaks are:
+ - 2017-03: we had a Stretch + reproducible builds sprint, and the
+ work on reproducible builds is accounted for in these stats (it
+ was based on Stretch).
+ - 2017-05: we had a Stretch sprint and our technical writers were
+ busy updating the doc.
+
+### Code
+
+XXX:anonym, please add whatever input data, feelings and analysis
+you can come up with.
+
+Commits history in the `auto` and `config` directories between our
+Jessie and Stretch -based branches:
+
+ - 2016-01: 17
+ - 2016-02: 1
+ - 2016-03: 0
+ - 2016-04: 0
+ - 2016-05: 14
+ - 2016-06: 0
+ - 2016-07: 16
+ - 2016-08: 59 (in-person sprint)
+ - 2016-09: 2
+ - 2016-10: 0
+ - 2016-11: 88 (in-person sprint)
+ - 2016-12: 35 (remote sprint)
+ - 2017-01: 24 (remote sprint)
+ - 2017-02: 10 (remote sprint)
+ - 2017-03: 108 (in-person sprint + lots of work on reproducible builds)
+ - 2017-04: 27
+ - 2017-05: 97 (in-person sprint)
+ - 2017-06: 42
+
+So about 2/3 of the commits were done during 4 in-person sprints,
+which was the plan. Interestingly, remote sprints were less
+productive, but let's take this metric with a grain of salt.
+
+Clocking data:
+
+ * intrigeri worked 44 days on the Stretch migration. Sadly, this
+ includes some work that's irrelevant here, like:
+ * Some test suite work
+ * Porting to the new Greeter
+ * New memory wipe implementation
+ * Preparing 5 alpha/beta releases, most of which we wouldn't
+ have needed if we had been tracking Debian testing.
+ * Reviewing other contributors' work targeted at Stretch, which
+ would be instead part of RM'ing if we were based on
+ Debian testing.
+ * anonym mostly worked on the test suite, which doesn't count in this
+ section. Let's assume the code work he did somewhat compensates the
+ time erroneously clocked by intrigeri.
+ * A few other people also did some work, which was helpful, but
+ that's negligible vs. the total time spent.
+
+So all in all, we can assume about 44 days of work in this area.
+Dividing this number by the number of 3-months cycles in a Debian
+release cycle (8), that's 5.5 days every 3 months. But of course some
+work would have to be done more than once in two years if we tracked
+Debian testing, so this figure probably reflects an unrealistic best
+case scenario.
+
+Regarding code changes we had to do to adjust for changes in testing:
+Stretch was frozen for half of the experiment, so we haven't much data
+here. After looking closely at the Git log, what I could spot is
+mostly unfuzzying patches, cherry-picking packages from sid when they
+were auto-removed from testing, and rebasing packages we patch on top
+of the current version, i.e. trivial (although somewhat boring) work
+whose amount we could substantially lower on the long term by working
+more closely with upstream projects; the only bigger pieces I could
+spot are the migration to GnuPG v2 and Icedove → Thunderbird, but
+those would have to be made exactly once as well if we were based on
+Debian testing.
+
+Regarding tracking security issues fixed in sid but not in testing:
+
+ * blocked due to the normal transition time from unstable to testing:
+ we didn't pay attention to this when releasing Tails 3.0~, so we
+ have no data here; too bad.
+ * blocked by some ongoing transition: we started providing security
+ support for Tails 3.0~ after Stretch was frozen, so we had no
+ direct experience of this problem; too bad.
+
+### Test suite
+
+XXX:anonym, please add whatever input data, feelings and analysis
+you can come up with.
+
+Non-merge commits in `features/` and `run_test_suite` between our
+Jessie-based branch and our Stretch-based one:
+
+ - 2016-05: 1
+ - 2016-06: 0
+ - 2016-07: 1
+ - 2016-08: 62
+ - 2016-09: 0
+ - 2016-10: 0
+ - 2016-11: 41
+ - 2016-12: 39
+ - 2017-01: 7
+ - 2017-02: 30
+ - 2017-03: 29
+ - 2017-04: 19
+ - 2017-05: 20
+
+Here as well, most of the work was done during a few sprints.
+
+Clocking data:
+
+ * intrigeri didn't clock his test suite work separately from his
+ other Stretch work, but that probably wasn't more than 2-4 days.
+
+ * anonym worked 24 days during sprints + XXX days outside of sprints
+ on the Stretch migration; most of this time was spent on the
+ test suite.
+
+Total diff stat:
+
+ - 258 files changed, 1252 insertions(+), 986 deletions(-)
+ - among those, 200 images changed: 52 removed, 13 added, 135 updated;
+ and among these 200 image changes, at least 50 are orthogonal to
+ what we're analyzing here:
+ * many of the removals are thanks to dotail-ification, so at least
+ those won't need to be updated ever again
+ * 21 due to switching to Tor Browser 7.0
+ * 1 due to the memory wipe system change
+ * 23 due to the new Greeter
+
+Now let's do some stats ignoring the changes that are orthogonal to
+what we're analyzing here, in that we would have to do them once,
+regardless of what version of Debian (stable or testing) we're
+tracking, i.e. the Icedove → Thunderbird rename and the memory erasure
+system replacement:
+
+ - `*.feature`: 19 files changed, 152 insertions(+), 125 deletions(-);
+ most of the changes are still orthogonal to what we're analyzing
+ here (refactoring and a few new regressions tests for bugs that
+ affect Tails 2.x too)
+ - `*.rb`: 21 files changed, 661 insertions(+), 502 deletions(-); many
+ of the changes are still orthogonal to what we're analyzing here
+ (refactoring and porting to the new Greeter and memory erasure
+ system)
+
+In short, by far the biggest part of the porting work was done by
+updating images and dogtail-ifying tests. Only very few other bits had
+to be updated (GnuPG v2, migrating away from obsolete CLI, adjusting
+to new `nmcli`, this kind of things).
+
+Now, of course we can't ignore the dogtail-ification work when we
+think ahead about how test suite maintenance would look like if we
+tracked Debian testing:
+
+ * if we hadn't done this work, we would have lots more images
+ updates, and way fewer image deletions;
+ * it's mostly one-time work, so what's been done is done for good,
+ still we should keep investing in it and dogtail-ify more tests in
+ order to decrease the amount of images we need to maintain. So at
+ least for a few 3-months cycles, this work will be recurring.
+
+Additional data that would be interesting:
+
+ * Did we have to update some tests (e.g. images) more than once due
+ to changes in Debian testing?
+
+### Documentation
+
+XXX:sajolida, please add whatever input data, feelings and analysis
+you can come up with.
+
+Note: the following stats ignore PO files, the Icedove → Thunderbird
+renaming, and the `blueprint`, `contribute`, `inc` and `news`
+directories. Sorry I realized too late that I should have taken the
+3.0 release notes into account :/
+
+Non-merge commits in `wiki/src` between our Jessie-based branch and our
+Stretch-based one:
+
+ - 2016-08: 1
+ - 2016-09: 0
+ - 2016-10: 0
+ - 2016-11: 2
+ - 2016-12: 0
+ - 2017-01: 3
+ - 2017-02: 2
+ - 2017-03: 42
+ - 2017-04: 26
+ - 2017-05: 45
+ - 2017-06: 1
+
+So this confirms what we already knew: the bulk of the work was done
+in the last 3 months before the release, and started after Stretch was
+already deeply frozen, so obviously we won't learn much here regarding
+_continuously_ updating our doc to match a moving target.
+
+But at least we can get an idea of the total amount of work this has
+required :)
+
+ - 84 files changed, 417 insertions(+), 355 deletions(-)
+ - Among the 84 changed files: 35 pictures + 49 text files.
+
+Some of these changes are orthogonal to what we're analyzing here, in
+that we would have to do them once regardless of what version of
+Debian (stable or testing) we're tracking:
+
+ - New Greeter: 8 files changed, 151 insertions(+), 21 deletions(-)
+ - Most of the changes in the `install` directory are either about the
+ move to 64-bit, or about supporting installation from Debian
+ Stretch, or about the new Greteer as well: 21 files changed, 81
+ insertions(+), 100 deletions(-)
+ - KeePassX migration: even if we had been tracking testing, this
+ would have had to be done only once: 1 file changed, 64
+ insertions(+), 29 deletions(-)
+
+So very roughly, the changes that would be impacted by the "let's go
+rolling?" decision are closer to 54 files changed (24 pictures and 30
+text files), 121 insertions, 205 deletions.
+
+So, the worst case scenario is that every 3 months we have to:
+
+ * go through changes in the packages list, and identify what doc
+ pages and screenshots need updates; this can be semi-automated;
+ * update about 24 pictures
+ * update 100-200 lines in about 30 text files
+
+Let's keep in mind some other factors that will make reality a bit
+nicer:
+
+ * There's a GNOME release only every 6 months, so a non-negligible
+ part of our doc will have to be updated only twice a year, instead
+ of every 3 months. I bet many of our screenshots are part of
+ this lot.
+ * Our test suite can help identify the doc bits that need an update:
+ either text-based instructions (when our tests use dogtail), or
+ screenshots (when our tests use picture recognition). There are
+ a few ways we could boost this beneficial factor as we go e.g.:
+ - add automated tests specifically about things we document;
+ - add steps to our existing tests to validate the screenshots we
+ have in our documentation.
+
+Clocking data: XXX (ideally, specify clearly what's accounted for,
+e.g. whether the work listed above as irrelevant here is).
+
+### Summary
+
+Looking at the data we have, my (intrigeri) general feeling is rather
+positive but I was sold to this idea from the beginning, so let's be
+clear: I'm biased :)
+
+Now, I feel we haven't gathered enough data during the Stretch cycle
+to make a final decision wrt. starting to track Buster in 2018-01 or
+not: particularly in the doc and security support areas, we have very
+little data about _continuously_ adapting to a moving target.
+
+But I think we do have enough data to decide at the summit something
+like "if X happens by the end of November and takes us less than
+Y days, then we'll go ahead and switch to Buster in 2018-01".
+Worst case we'll suffer for a year until Buster is frozen, and then we
+won't try again before fixing some pre-conditions we'll have
+identified during our failed first try.
+
+I think the only way we can gather the missing data, and check if "X
+happens" and whether it takes "less than Y days", is to have sprints
+in 2017-10 or 2017-11, and actually port most of our code, test suite
+and documentation to Buster. We could take some shortcuts though, e.g.
+by estimating the amount work needed instead of doing it, when we feel
+very confident we can come up with a realistic estimate.
+
+It'll be impossible to have all these kinds of work done in parallel
+during one single sprint though; the best process I can think of is to
+serialize the tasks like this:
+
+1. 3 days: make the ISO build and boot (anonym + intrigeri)
+2. 3 days: loop over "port some of the test suite, fix regressions in
+ our code to make the ported tests pass" (anonym + intrigeri)
+3. 1 day: give our technical writers a list of software that has
+ changed in a way that may affect our documentation, so they can
+ update it (anonym + intrigeri)
+4. 3 days: update the doc (sajolida & his amazing tech writing band)
+
+If we eventually decide to postpone our migration to Stretch, some of
+this work will be wasted, and hopefully some won't. To minimize the
+amount of wasted work in the worst case, we should be ready to give up
+in the middle of the afore-described process, if we notice it's going
+to take us more time than "Y days".
+
+While doing this we should carefully gather the data we did not get
+during the Stretch cycle, in particular:
+
+1. How would we address security issues fixed in sid but not in
+ testing? (see the "Stretch cycle" section for details)
+2. How can developers convey to technical writers what changes may
+ affect the documentation? (see ideas in the "Documentation" section
+ above)
+3. Thanks to #2, can we identify what piece of doc needs updating
+ _without_ having to test the entire documentation every
+ three months?
+
+When deciding what X and Y should be, and when analyzing how the
+experiment went, we shall keep in mind that Debian testing changes _a
+lot_ when the gates open after the freeze. It's not exactly the time
+when it's the most reliable, even though there's been big progress in
+this area. And there are lots of library transitions going on, that
+could be painful for us, even though there's been big progress here as
+well. In other words, the delta between Stretch and "Buster in
+October" will be substantially bigger than what will happen during the
+next 3-months cycles, and the porting work will be close to the
+maximum one can expect during these 3-months cycles.
diff --git a/wiki/src/blueprint/intercept_interviews.mdwn b/wiki/src/blueprint/intercept_interviews.mdwn
index ecb9535..4c7e0e7 100644
--- a/wiki/src/blueprint/intercept_interviews.mdwn
+++ b/wiki/src/blueprint/intercept_interviews.mdwn
@@ -65,7 +65,158 @@ Template email for validating the output
Interviews
==========
-<a id="margarita"></a>
+<a id="Miguel"></a>
+
+Miguel, May 2017
+----------------
+
+Miguel is a 20 years old statistics student in Brazil. He is part of
+a collective that works on online privacy and security.
+
+In 2014 he was trying all the privacy tools he and his friends could
+found, and then he started using Tails. Sometimes he doesn't use Tails
+very often, and only as a way to use other people's computers: he
+keeps his passwords is a KeePassX database, along with some personal
+files and his Thunderbird configuration on the Tails persistent
+volume. And sometimes he uses Tails more intensively, for example
+when dealing with sensitive material. Miguel identifies himself as an
+intermediate level Tails user, although he helps others use Tails and
+does not need other people's help himself.
+
+What he likes:
+
+- the new Installation Assistant
+- the amnesic property, that allows him to use other people's
+ computers
+- the fact that Internet connections are routed through Tor
+- he finds Tails easy to use, e.g. the persistence setup
+- the set of bundled software
+
+What he does not like:
+
+- GNOME is heavy on older computers
+- the website translation workflow is hard
+- he misses the ability to install Tails on the command-line with dd
+ (and was surprised when I told him it still worked)
+
+<a id="Sophia"></a>
+
+Sophia, May 2017
+----------------
+
+Sophia is 30 years old, lives in Brazil and has two jobs: she is
+a teacher and a system administrator.
+
+In 2015, she was looking for an operating system that would be safer
+than macOS, and discovered Tails. She had been using Linux for 2 years
+already, but found it vastly easier to use Tails than to configure
+software to use Tor on a regular Linux distribution. Since then, Tails
+is her only OS and she uses it every day; she feels very comfortable
+using it, although she has not tried everything.
+
+What she likes:
+
+- Tails is plug'n'play and it "just works"
+- Tor Browser
+- MAT
+
+What she dislikes:
+
+- having to configure Tor Browser to match her security requirements
+ (security slider set to "High", JavaScript disabled by default)
+ every time she starts Tails; she would like a persistent setting
+ for these settings
+- Totem is buggy with some subtitles (buggy delay after pausing and
+ resuming), so she misses VLC
+- she misses a set of LibreOffice Impress templates/themes that could
+ be installed by default
+
+<a id="Isabella"></a>
+
+Isabella, May 2017
+------------------
+
+Isabella is a 50 years old Debian user living in Brazil. She used to
+be a journalist at a magazine that talked a lot about FOSS (among
+other things), then got in touch with people working on privacy
+enhancing technologies (PET) and switched jobs: she now works with
+a collective that defends freedom and privacy online, learns about
+privacy tools and does advocacy for them.
+
+She has been demonstrating Tails to people since 2 years: she finds it
+easier to advocate for than Debian since it's easy to try (without
+replacing one's current OS) and is pre-configured for privacy.
+She started using Tails herself 3 months ago. She found it easy, and
+doesn't need to ask for help anymore. She uses Tails about twice
+a month, mainly to upload sensitive material and for web browsing.
+
+What she likes:
+
+- "the bundle", i.e. everything pre-configured shipped in a box
+- She found Tails very didactic and liked how she could understand how
+ to use it.
+
+What she dislikes:
+
+- upgrades are painful when using Tails not so often
+
+<a id="Bernardo"></a>
+
+Bernardo, May 2017
+------------------
+
+Bernardo is a 37 years old public administration teacher and social
+science researcher in Brazil. He studies the way social movements use
+Internet communication tools. He discovered Tails after the Snowden
+leaks, via a hackers collective and the homepage of the Tor website.
+
+He uses Debian and GNOME (and has some basic knowledge of the command
+line interface) so he felt comfortable using Tails, and found it easy
+to get started with. He advocates using Tails and started using it
+himself since the coup; he uses it about once a month, primarily to
+release and distribute material against the government.
+
+What he likes:
+
+- everything is torified by default
+- the amnesic property: everything goes away when turning off the
+ computer
+- Windows Camouflage (when it was there…)
+- Pidgin
+
+What he dislikes:
+
+- he had some trouble with the Unsafe Browser
+
+<a id="Pedro"></a>
+
+Pedro, May 2017
+---------------
+
+Pedro is 23 years old and studies applied mathematics in college in
+Brazil. He has been a Linux user since 11 years; Qubes OS is now his
+main operating system.
+
+He learned about Tails via the homepage of the Tor website before the
+Snowden leaks, and got interested by the amnesic property of Tails.
+He feels he knows his way around Tails and uses it once or twice
+a week to browse hidden services websites and for encrypted chat
+(that he finds easier to use on Tails than elsewhere).
+
+What he likes:
+
+- carrying a computer environment in his pocket
+- OnionShare
+- easy to use, practical
+- how the project cares about people and security
+
+What he dislikes:
+
+- GNOME is heavy and slow on old hardware
+- the end of 32-bit support
+- no more Windows Camouflage
+
+<a id="Margarita"></a>
Margarita, March 2017
---------------------
@@ -100,7 +251,7 @@ Things she dislikes:
- In the case of women sharing abortion techniques, the learning curve
made it harder to adopt.
-<a id="helen"></a>
+<a id="Helen"></a>
Helen, March 2017
-----------------
@@ -148,7 +299,7 @@ Things she dislikes:
router was not giving a DHCP lease and the *Unsafe Browser* wouldn't
start without one.
-<a id="ernesto"></a>
+<a id="Ernesto"></a>
Ernesto, March 2017
-------------------
@@ -180,7 +331,7 @@ Things he dislikes:
- The new installation instructions are good for new users but he feels
a bit lost when looking for the command line instructions only.
-<a id="ray"></a>
+<a id="Ray"></a>
Ray, March 2017
---------------
@@ -224,7 +375,7 @@ Things he (and the people he trained) dislike:
portal, after people started the Unsafe Browser, they tend to trust it
more than they should because it's running from Tails.
-<a id="adam"></a>
+<a id="Adam"></a>
Adam, March 2017
----------------
@@ -285,7 +436,7 @@ Things he dislikes:
- He had a hard time finding a direct download with the new Installation
Assistant: *"I want a nerd link!"*
-<a id="alex"></a>
+<a id="Alex"></a>
Alex, March 2017
----------------
@@ -321,7 +472,7 @@ Things she dislikes:
- GMail doesn't work with Icedove and TorBirdy. So you have to switch to
the Unsafe Browser to connect to GMail.
-<a id="jeanne"></a>
+<a id="Jeanne"></a>
Jeanne, February 2017
---------------------
@@ -376,154 +527,3 @@ Things she dislikes:
She thinks that the documentation should be more accessible to less
technical people as a pedagogical tool: since she is making the effort
to getting into Tails, she is ready to read and learn.
-
-<a id="Miguel"></a>
-
-Miguel, May 2017
-----------------
-
-Miguel is a 20 years old statistics student in Brazil. He is part of
-a collective that works on online privacy and security.
-
-In 2014 he was trying all the privacy tools he and his friends could
-found, and then he started using Tails. Sometimes he doesn't use Tails
-very often, and only as a way to use other people's computers: he
-keeps his passwords is a KeePassX database, along with some personal
-files and his Thunderbird configuration on the Tails persistent
-volume). And sometimes he uses Tails more intensively, for example
-when dealing with sensitive material. Miguel identifies himself an
-intermediate level Tails user, although he helps others use Tails and
-does not need other people's help himself.
-
-What he likes:
-
-- the new Installation Assistant
-- the amnesic property, that allows him to use other people's
- computers
-- the fact that Internet connections are routed through Tor
-- he finds Tails easy to use, e.g. the persistence setup
-- the set of bundled software
-
-What he does not like:
-
-- GNOME is heavy on older computers
-- the website translation workflow is hard
-- he misses the ability to install Tails on the command-line with dd
- (and was surprised when I told him it still worked)
-
-<a id="Sophia"></a>
-
-Sophia, May 2017
-----------------
-
-Sophia is 30 years old, lives in Brazil and has two jobs: she is
-a teacher and a system administrator.
-
-In 2015, she was looking for an operating system that would be safer
-than macOS, and discovered Tails. She had been using Linux for 2 years
-already, but found it vastly easier to use Tails than to configure
-software to use Tor on a regular Linux distribution. Since then, Tails
-is her only OS and she uses it every day; she feels very comfortable
-using it, although she has not tried everything.
-
-What she likes:
-
-- Tails is plug'n'play and it "just works"
-- Tor Browser
-- MAT
-
-What she dislikes:
-
-- having to configure Tor Browser to match her security requirements
- (security slider set to "High", JavaScript disabled by default)
- every time she starts Tails; she would like a persistent setting
- for these settings
-- Totem is buggy with some subtitles (buggy delay after pausing and
- resuming), so she misses VLC
-- she misses a set of LibreOffice Impress templates/themes that could
- be installed by default
-
-<a id="Isabella"></a>
-
-Isabella, May 2017
-------------------
-
-Isabella is a 50 years old Debian user living in Brazil. She used to
-be a journalist at a magazine that talked a lot about FOSS (among
-other things), then got in touch with people working on privacy
-enhancing technologies (PET) and switched jobs: she now works with
-a collective that defends freedom and privacy online, learns about
-privacy tools and does advocacy for them.
-
-She has been demonstrating Tails to people since 2 years: she finds it
-easier to advocate for than Debian since it's easy to try (without
-replacing one's current OS) and is pre-configured for privacy.
-She started using Tails herself 3 months ago. She found it easy, and
-doesn't need to ask for help anymore. She uses Tails about twice
-a month, mainly to upload sensitive material and for web browsing.
-
-What she likes:
-
-- "the bundle", i.e. everything pre-configured shipped in a box
-- She found Tails very didactic and liked how she could understand how
- to use it.
-
-What she dislikes:
-
-- upgrades are painful when using Tails not so often
-
-<a id="Bernardo"></a>
-
-Bernardo, May 2017
-------------------
-
-Bernardo is a 37 years old public administration teacher and social
-science researcher in Brazil. He studies the way social movements use
-Internet communication tools. He discovered Tails after the Snowden
-leaks, via a hackers collective and the homepage of the Tor website.
-
-He uses Debian and GNOME (and has some basic knowledge of the command
-line interface) so he felt comfortable using Tails, and found it easy
-to get started with. He advocates using Tails and started using it
-himself since the coup; he uses it about once a month, primarily to
-release and distribute material against the government.
-
-What he likes:
-
-- everything is torified by default
-- the amnesic property: everything goes away when turning off the
- computer
-- Windows Camouflage (when it was there…)
-- Pidgin
-
-What he dislikes:
-
-- he had some trouble with the Unsafe Browser
-
-<a id="Pedro"></a>
-
-Pedro, May 2017
----------------
-
-Pedro is 23 years old and studies applied mathematics in college in
-Brazil. He has been a Linux user since 11 years; Qubes OS is now his
-main operating system.
-
-He learned about Tails via the homepage of the Tor website before the
-Snowden leaks, and got interested by the amnesic property of Tails.
-He feels he knows his way around Tails and uses it once or twice
-a week to browse hidden services websites and for encrypted chat
-(that he finds easier to use on Tails than elsewhere).
-
-What he likes:
-
-- carrying a computer environment in his pocket
-- OnionShare
-- easy to use, practical
-- how the project cares about people and security
-
-What he dislikes:
-
-- GNOME is heavy and slow on old hardware
-- the end of 32-bit support
-- no more Windows Camouflage
diff --git a/wiki/src/blueprint/l10n_Italian.mdwn b/wiki/src/blueprint/l10n_Italian.mdwn
index 9b74bde..3c5719d 100644
--- a/wiki/src/blueprint/l10n_Italian.mdwn
+++ b/wiki/src/blueprint/l10n_Italian.mdwn
@@ -7,7 +7,7 @@ Warning page = pagina degli avvertimenti/avvisi
Persistence = persistente <https://it.wikipedia.org/wiki/Persistenza_%28informatica%29>
-Sensitive = sensibile o riservato
+Sensitive = sensibile o riservato o confidenziale
[[Domande aperte sui termini]]
@@ -17,15 +17,10 @@ Qualche informazione sui file po:
<http://tp.linux.it/guida-po/index.html>
-Per iniziare una nuova traduzione, fai copia incolla di un file già esistenete,
-tipo: about.fr.po, e lo rinomini about.pot
-A quel punto lo apri con poedit e lui ti chiederà come nominarlo iniziando per una nuova lingua e tu gli dici: about.it
-a quel punto inizi a tradurre :)
# Aiuto con GIT
-
##mini guida GIT
<https://rogerdudler.github.io/git-guide/index.it.html>
@@ -36,8 +31,11 @@ E' qui: https://git.lattuga.net/transitails/italian
git clone http://git.lattuga.net/transitails/italian.git transitails
- git remote add origin http://git.lattuga.net/transitails/italian
+ cd transitails
+
+ git remote -v
+Verifichi di avere origin settato su http://git.lattuga.net/transitails/italian.git
Per essere abilitati in scrittura, iscrivetevi a git.lattuga.net e chiedete in lista di accettarvi l'utente.
@@ -51,13 +49,18 @@ Sincronizziamoci al repository remoto, prendendo i file che ci mancano:
$ git pull
-Ora controlliamo in che branch siamo
+
+Ora controlliamo a che punto siamo
+
+ $ git status
+
+Ora controlliamo che branch ci sono
$ git branch -a
Se non siamo su quella giusta facciamo
- $git checkout [nome branch]
+ $git checkout -b [nome branch]
Quindi iniziamo ad editare i file in locale usando POEDIT
@@ -193,141 +196,6 @@ E poi lanciare ikiwiki --changesetup ikiwiki.setu
cd mytails
./build-website --set destdir="/home/amnesia/Persistent/outtails" "$@"
-___
-
-# Come configurare il workflow git sul vostro pc VECCHIA VERSIONE
-
-
-1) Creata una cartella con TRADUZIONI:
-
- $ mkdir TRADUZIONI
-
-2) Entrata nella cartella:
-
- $ cd TRADUZIONI
-
-3) Clonato i file per il mio uso locale nella cartella mytails (indicata
-in fondo al comando):
-
- $ git clone https://git-tails.immerda.ch/l10n-italian/tails/ mytails
- Cloning into 'mytails'...
- remote: Counting objects: 184366, done.
- remote: Compressing objects: 100% (48007/48007), done.
- remote: Total 184366 (delta 121678), reused 184279 (delta 121629)
- Ricezione degli oggetti: 100% (184366/184366), 49.13 MiB | 892.00 KiB/s,
- done.
- Risoluzione dei delta: 100% (121678/121678), done.
- Checking connectivity... fatto.
-
-4)Entro nell cartella mytails e controllo che mi dice git:
-
- $ git status
- Sul branch master
- Your branch is up-to-date with 'origin/master'.
- nothing to commit, working directory clean
-
-5)Aggiungo il repository remoto:
-
- $ git remote add origin tails@git.tails.boum.org:tails
-
-6)Controllo che funzioni:
-
- $ git remote -v
- origin tails@git.tails.boum.org:tails (fetch)
- origin tails@git.tails.boum.org:tails (push)
- l10n-italian https://git-tails.immerda.ch/l10n-italian/tails/ (fetch)
- l10n-italian https://git-tails.immerda.ch/l10n-italian/tails/ (push)
-
-7)Modifico dei file, aggiungo traduzioni, etc.. poi torno al terminale.
-
-8)Aggiungo due file che ho creato e modificato:
-
- $ git add wiki/src/doc/about/license.it.po
- $ git add wiki/src/doc/about/requirements.it.po
- $ git status
- Sul branch master
- Your branch is up-to-date with 'origin/master'.
- Changes to be committed:
- (use "git reset HEAD <file>..." to unstage)
-
- new file: wiki/src/doc/about/license.it.po
- new file: wiki/src/doc/about/requirements.it.po
-
-9) Faccio il commit locale
-
- $ git commit -m "primi file tradotti"
- [master c149e1b] primi file tradotti
- Committer: cri <cri@localhost.lan>
- Il tuo nome e l'indirizzo email sono stati configurati automaticamente usando
- il tuo nome utente ed il nome host. Per favore, verifica che siano esatti.
- È possibile eliminare questo messaggio impostandoli esplicitamente:
-
- git config --global user.name "Tuo Nome"
- git config --global user.email tu@esempio.com
-
- Dopo questa operazione, puoi ripristinare l'identità usata in questo commit con:
-
- git commit --amend --reset-author
-
- 2 files changed, 203 insertions(+)
- create mode 100644 wiki/src/doc/about/license.it.po
- create mode 100644 wiki/src/doc/about/requirements.it.po
-
-10)Configuro la mia identità (opzionale):
-
- $ git config --global user.name "Tails Developer"
- $ git config --global user.email "developer@blablabla.net"
-
-11)Genero la chiave ssh, la invio agli sviluppatori TAILS(il file.pub) e l'associo per essere autenticato sul server:
-
- ssh-keygen -t rsa -b 4096 -C "ignifugo@blablabla.net"
-
-Ti chiederà il nome con cui genererà i due file della chiave, quello pubblico e quello segreto. QUindi ti cheide una passwor, due volte; i caratteri non si vedono quando li digiti.Finito
-
-Ora configuro la comunicazione ssh ad usare la mia chiave segreta ed invio quella pubblica agli sviluppatori di Tails per poter così scrivere nel repository condiviso.
-
- $ ssh-add /home/cri/ignissh
- Enter passphrase for /home/cri/ignissh:
- Identity added: /home/cri/ignissh (/home/cri/ignissh)
-
-12) Metto i file sul server:
-
- $ git push l10n-italian master
- The authenticity of host 'git.tails.boum.org (77.109.139.10)' can't be established.
- RSA key fingerprint is ed:1b:5b:45:e4:9c:d6:8f:55:f3:5f:b7:44:30:42:17.
- Are you sure you want to continue connecting (yes/no)? yes
- Warning: Permanently added 'git.tails.boum.org,77.109.139.10' (RSA) to the list of known hosts.
- Counting objects: 8, done.
- Delta compression using up to 2 threads.
- Compressing objects: 100% (8/8), done.
- Writing objects: 100% (8/8), 4.04 KiB | 0 bytes/s, done.
- Total 8 (delta 4), reused 0 (delta 0)
- To tails@git.tails.boum.org:l10n-italian/tails
- 42f6936..c149e1b master -> master
-
-13) Controllo che ci sia, sul terminale:
-
- $git log
-
-Oppure in grafica dal browser:
-
-<https://git-tails.immerda.ch/l10n-italian/tails/>
-
-
-# Controlli
-
-Ogni tanto (piu' frequentemente possibile) e' bene fare dei controlli per vedere che tutto vada bene. Ad esempio questo andrebbe fatto prima di ogni commit, e anche da parte dei revisori.
-
-## ricreare il sito
-
-`./build-website` non solo crea il sito, ma mostra anche dei warning.
-Ad esempio `Strange line:` mostra delle linee problematiche. Quando dice `Strange line: --><--` si sta lamentando di linee vuote che secondo lui non dovrebbero esistere. Tipicamente questo avviene tra un commento e un msgid, o all'interno di un messaggio multilinea.
-
-## check-po
-
-vedi [[contribute/l10n_tricks]] alla sezione "Check the validity of PO files"; questi controlli sono MOLTO utili, e sono molto rari i falsi positivi.
-Inoltre, gli sviluppatori di tails lanceranno quei controlli sui nostri file e non li mergeranno se i file hanno problemi, quindi lanciare check-po e' davvero importante!
-
# Workflow
diff --git a/wiki/src/blueprint/monthly_meeting.mdwn b/wiki/src/blueprint/monthly_meeting.mdwn
index 6e28236..f5c9a11 100644
--- a/wiki/src/blueprint/monthly_meeting.mdwn
+++ b/wiki/src/blueprint/monthly_meeting.mdwn
@@ -23,3 +23,8 @@ Discussions
- [[!tails_ticket 12402 desc="Include Yubico Authenticator in Tails"]]
- [[!tails_ticket 12098 desc="Spurious screensaver activation while synchronizing the system clock"]]
- [[!tails_ticket 12437 desc="Save coredumps to a sticky directory"]]
+ - [[!tails_ticket 12723 desc="Do we want to provide the GNOME screencast option in Tails and research privacy issues resulting from it?"]]
+ - [[!tails_ticket 12257 desc="Put a screenshot of Tails one the Tails homepage"]]
+ - [[!tails_ticket 12486 desc="
+Consider dropping flattr versus making it more prominent on our website"]]
+ - [[!tails_ticket 8253 desc="Should we include nautilus-image-converter in Tails?"]]
diff --git a/wiki/src/blueprint/monthly_report.mdwn b/wiki/src/blueprint/monthly_report.mdwn
index 00aba71..fa88ed9 100644
--- a/wiki/src/blueprint/monthly_report.mdwn
+++ b/wiki/src/blueprint/monthly_report.mdwn
@@ -171,4 +171,6 @@ Template
* 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/reproducible_builds.mdwn b/wiki/src/blueprint/reproducible_builds.mdwn
index fe3a371..aa0d08c 100644
--- a/wiki/src/blueprint/reproducible_builds.mdwn
+++ b/wiki/src/blueprint/reproducible_builds.mdwn
@@ -517,7 +517,7 @@ It also raises technical questions:
# Progress
-See [[our November report|news/report_2016_11]].
+See [[our May report|news/report_2017_05]].
# Future work
diff --git a/wiki/src/bugs.it.po b/wiki/src/bugs.it.po
index 2d8099c..c0b0199 100644
--- a/wiki/src/bugs.it.po
+++ b/wiki/src/bugs.it.po
@@ -3,32 +3,36 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: \n"
"POT-Creation-Date: 2015-11-19 23:06+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2017-07-21 13:56+0200\n"
"Language-Team: ita <transitails@inventati.org>\n"
-"Language: \n"
+"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Last-Translator: \n"
+"X-Generator: Poedit 1.8.11\n"
#. type: Plain text
#, no-wrap
msgid "[[!meta title=\"Bugs\"]]\n"
-msgstr ""
+msgstr "[[!meta title=\"Bugs\"]]\n"
#. type: Plain text
msgid ""
"If you've found a bug in Tails, please read "
"[[doc/first_steps/bug_reporting]]."
msgstr ""
+"Se hai trovato un bug in Tails, per favore "
+"leggi [[doc/first_steps/bug_reporting]]."
#. type: Plain text
msgid ""
"We don't use this section anymore, see "
"[[contribute/working_together/Redmine]] instead."
msgstr ""
+"Non usiamo più questa sezione, consulta invece "
+"[[contribute/working_together/Redmine]] ."
diff --git a/wiki/src/contribute.de.po b/wiki/src/contribute.de.po
index a9ee862..bd6fbad 100644
--- a/wiki/src/contribute.de.po
+++ b/wiki/src/contribute.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-05-14 18:32+0300\n"
+"POT-Creation-Date: 2017-06-22 13:54+0300\n"
"PO-Revision-Date: 2014-04-18 23:25+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -615,6 +615,13 @@ msgstr ""
#. type: Bullet: ' - '
#, fuzzy
+#| msgid "[[Document progress|contribute/working_together/document_progress]]"
+msgid "[[Social contract|contribute/working_together/social_contract]]"
+msgstr ""
+"[[Fortschritte dokumentieren|contribute/working_together/document_progress]]"
+
+#. type: Bullet: ' - '
+#, fuzzy
#| msgid "[[Meetings|contribute/meetings]], and minutes from past meetings"
msgid ""
"[[Contributors meetings|contribute/meetings]], and minutes from past meetings"
diff --git a/wiki/src/contribute.fa.po b/wiki/src/contribute.fa.po
index 9d0afa5..8a69717 100644
--- a/wiki/src/contribute.fa.po
+++ b/wiki/src/contribute.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-05-14 18:32+0300\n"
+"POT-Creation-Date: 2017-06-22 13:54+0300\n"
"PO-Revision-Date: 2015-10-15 15:23+0000\n"
"Last-Translator: sprint5 <translation5@451f.org>\n"
"Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/"
@@ -600,6 +600,12 @@ msgid "[[Code of conduct|contribute/working_together/code_of_conduct]]"
msgstr "[[مرام‌نامه|contribute/working_together/code_of_conduct]]"
#. type: Bullet: ' - '
+#, fuzzy
+#| msgid "[[Code of conduct|contribute/working_together/code_of_conduct]]"
+msgid "[[Social contract|contribute/working_together/social_contract]]"
+msgstr "[[مرام‌نامه|contribute/working_together/code_of_conduct]]"
+
+#. type: Bullet: ' - '
msgid ""
"[[Contributors meetings|contribute/meetings]], and minutes from past meetings"
msgstr "[[جلسات کمک‌کنندگان|contribute/meetings]] و خلاصهٔ جلسات پیشین"
diff --git a/wiki/src/contribute.fr.po b/wiki/src/contribute.fr.po
index 2d18d72..c5896ba 100644
--- a/wiki/src/contribute.fr.po
+++ b/wiki/src/contribute.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2017-05-14 18:32+0300\n"
+"POT-Creation-Date: 2017-06-22 13:54+0300\n"
"PO-Revision-Date: 2016-06-05 10:04-0000\n"
"Last-Translator: \n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -552,6 +552,10 @@ msgid "[[Code of conduct|contribute/working_together/code_of_conduct]]"
msgstr ""
#. type: Bullet: ' - '
+msgid "[[Social contract|contribute/working_together/social_contract]]"
+msgstr ""
+
+#. type: Bullet: ' - '
msgid ""
"[[Contributors meetings|contribute/meetings]], and minutes from past meetings"
msgstr ""
diff --git a/wiki/src/contribute.it.po b/wiki/src/contribute.it.po
index cfaa535..01036ba 100644
--- a/wiki/src/contribute.it.po
+++ b/wiki/src/contribute.it.po
@@ -3,23 +3,23 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-05-14 18:32+0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Project-Id-Version: \n"
+"POT-Creation-Date: 2017-06-22 13:54+0300\n"
+"PO-Revision-Date: 2017-07-21 14:12+0200\n"
"Language-Team: ita <transitails@inventati.org>\n"
-"Language: \n"
+"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Last-Translator: \n"
+"X-Generator: Poedit 1.8.11\n"
#. type: Plain text
#, no-wrap
msgid "[[!meta title=\"Contributing to Tails\"]]\n"
-msgstr ""
+msgstr "[[!meta title=\"Contribuire a Tails\"]]\n"
#. type: Plain text
msgid ""
@@ -27,6 +27,9 @@ msgid ""
"whatever you bring to this community will be appreciated. So read on to "
"find out how you can make a difference in Tails."
msgstr ""
+"Ci sono molti modi in cui puoi contribuire a Tails. Nessun sforzo è troppo "
+"piccolo e qualunque cosa tu porti a questa comunità sarà apprezzata. Quindi "
+"continua a leggere per scoprire come si può fare la differenza in Tails."
#. type: Plain text
#, no-wrap
@@ -35,11 +38,14 @@ msgid ""
"<h2>Share your experience</h2>\n"
"<div class=\"contribute-role\" id=\"user\">\n"
msgstr ""
+"<div class=\"contribute-roles-1\">\n"
+"<h2>Condividi la tua esperienza</h2>\n"
+"<div class=\"contribute-role\" id=\"user\">\n"
#. type: Plain text
#, no-wrap
msgid " [[!img user.png link=no]]\n"
-msgstr ""
+msgstr "[[!img user.png link=no]]\n"
#. type: Plain text
#, no-wrap
@@ -54,6 +60,15 @@ msgid ""
"</div>\n"
"</div>\n"
msgstr ""
+" <p>Ogni utente può aiutare gli altri o fornire agli sviluppatori informazioni utili.</p>\n"
+" <ul>\n"
+" <li>[[Riportare bugs|doc/first_steps/bug_reporting]]</li>\n"
+" <li>[[Testare immagini ISO sperimentali|contribute/how/testing]]</li>\n"
+" <li>[[Fornire input agli sviluppatori|contribute/how/input]]</li>\n"
+" <li>[[Aiutare gli altri utenti di Tails|contribute/how/help]]</li>\n"
+" </ul>\n"
+"</div>\n"
+"</div>\n"
#. type: Plain text
#, no-wrap
@@ -62,11 +77,14 @@ msgid ""
"<h2>Donate</h2>\n"
"<div class=\"contribute-role\" id=\"donate\">\n"
msgstr ""
+"<div class=\"contribute-roles-1\">\n"
+"<h2>Donare</h2>\n"
+"<div class=\"contribute-role\" id=\"donate\">\n"
#. type: Plain text
#, no-wrap
msgid " [[!img donate.png link=no]]\n"
-msgstr ""
+msgstr " [[!img donate.png link=no]]\n"
#. type: Plain text
#, no-wrap
@@ -78,6 +96,12 @@ msgid ""
"</div>\n"
"</div>\n"
msgstr ""
+" <p>Donare velocizza lo sviluppo di Tails.</p>\n"
+" <ul>\n"
+" <li>[[Fai una donazione|donate#contribute]]</li>\n"
+" </ul>\n"
+"</div>\n"
+"</div>\n"
#. type: Plain text
#, no-wrap
@@ -87,11 +111,15 @@ msgid ""
"<div class=\"contribute-role\" id=\"content-writer\">\n"
" <h3>Writer</h3>\n"
msgstr ""
+"<div class=\"contribute-roles-3\">\n"
+"<h2>Contribuisci con le tue abilità linguistiche</h2>\n"
+"<div class=\"contribute-role\" id=\"content-writer\">\n"
+" <h3>Writer</h3>\n"
#. type: Plain text
#, no-wrap
msgid " [[!img writer.png link=no]]\n"
-msgstr ""
+msgstr " [[!img writer.png link=no]]\n"
#. type: Plain text
#, no-wrap
@@ -105,11 +133,17 @@ msgid ""
"<div class=\"contribute-role\" id=\"translator\">\n"
" <h3>Translator</h3>\n"
msgstr ""
+" <p>Chi possiede *una buona penna* può rendere Tails accessibile a più persone.</p>\n"
+" <ul>\n"
+" <li>[[Migliora la documentazione|contribute/how/documentation]]</li>\n"
+" <li>[[Scrivi comunicati stampa|contribute/how/promote]]</li>\n"
+" </ul>\n"
+"</div>\n"
#. type: Plain text
#, no-wrap
msgid " [[!img translator.png link=no]]\n"
-msgstr ""
+msgstr " [[!img translator.png link=no]]\n"
#. type: Plain text
#, no-wrap
@@ -122,11 +156,18 @@ msgid ""
"<div class=\"contribute-role\" id=\"speaker\">\n"
" <h3>Speaker</h3>\n"
msgstr ""
+" <p>I traduttori possono consentire a più persone in tutto il mondo di utilizzare Tails.</p>\n"
+" <ul>\n"
+" <li>[[Migliora Tails nella tua lingua|contribute/how/translate]]</li>\n"
+" </ul>\n"
+"</div>\n"
+"<div class=\"contribute-role\" id=\"speaker\">\n"
+" <h3>Oratore</h3>\n"
#. type: Plain text
#, no-wrap
msgid " [[!img speaker.png link=no]]\n"
-msgstr ""
+msgstr " [[!img speaker.png link=no]]\n"
#. type: Plain text
#, no-wrap
@@ -138,6 +179,12 @@ msgid ""
"</div>\n"
"</div>\n"
msgstr ""
+" <p>Gli oratori possono sostenere la causa di Tails a tutti i tipi di pubblico.</p>\n"
+" <ul>\n"
+" <li>[[Parla agli eventi|contribute/how/promote]]</li>\n"
+" </ul>\n"
+"</div>\n"
+"</div>\n"
#. type: Plain text
#, no-wrap
@@ -147,11 +194,15 @@ msgid ""
"<div class=\"contribute-role\" id=\"developer\">\n"
" <h3>Developer or maintainer</h3>\n"
msgstr ""
+"<div class=\"contribute-roles-3\">\n"
+"<h2>Contribuisci alle tue abilità al computer</h2>\n"
+"<div class=\"contribute-role\" id=\"developer\">\n"
+" <h3>Sviluppatore o manutentore</h3>\n"
#. type: Plain text
#, no-wrap
msgid " [[!img software_developer.png link=no]]\n"
-msgstr ""
+msgstr " [[!img software_developer.png link=no]]\n"
#. type: Plain text
#, no-wrap
@@ -165,11 +216,19 @@ msgid ""
"<div class=\"contribute-role\" id=\"sysadmin\">\n"
" <h3>System administrator</h3>\n"
msgstr ""
+"<p>Le persone con competenze software molto diverse possono migliorare Tails.</p>\n"
+" <ul>\n"
+" <li>[[Lavora sul codice sorgente|contribute/how/code]]</li>\n"
+" <li>[[Migliora Tails lavorando su Debian|contribute/how/debian]]</li>\n"
+" </ul>\n"
+"</div>\n"
+"<div class=\"contribute-role\" id=\"sysadmin\">\n"
+" <h3>Amministratore di sistema</h3>\n"
#. type: Plain text
#, no-wrap
msgid " [[!img system_administrator.png link=no]]\n"
-msgstr ""
+msgstr " [[!img system_administrator.png link=no]]\n"
#. type: Plain text
#, no-wrap
@@ -183,11 +242,19 @@ msgid ""
"<div class=\"contribute-role\" id=\"designer\">\n"
" <h3>Designer</h3>\n"
msgstr ""
+" <p>Gli amministratori di sistema possono contribuire all'infrastruttura dietro Tails.</p>\n"
+" <ul>\n"
+" <li>[[Eseguire un mirror HTTP|contribute/how/mirror]]</li>\n"
+" <li>[[Migliorare l'infrastruttura Tails|contribute/how/sysadmin]]</li>\n"
+" </ul>\n"
+"</div>\n"
+"<div class=\"contribute-role\" id=\"designer\">\n"
+" <h3>Designer</h3>\n"
#. type: Plain text
#, no-wrap
msgid " [[!img designer.png link=no]]\n"
-msgstr ""
+msgstr " [[!img designer.png link=no]]\n"
#. type: Plain text
#, no-wrap
@@ -201,11 +268,19 @@ msgid ""
"</div>\n"
"</div>\n"
msgstr ""
+" <p>I Designer possono rendere Tails più facile da usare e più accativante.</p>\n"
+" <ul>\n"
+" <li>[[Migliora il sito|contribute/how/website]]</li>\n"
+" <li>[[Progetta la grafica|contribute/how/graphics]]</li>\n"
+" <li>[[Migliora l'interfaccia utente di Tails|contribute/how/user_interface]]</li>\n"
+" </ul>\n"
+"</div>\n"
+"</div>\n"
#. type: Plain text
#, no-wrap
msgid "<div class=\"toc\">\n"
-msgstr ""
+msgstr "<div class=\"toc\">\n"
#. type: Plain text
#, no-wrap
@@ -473,6 +548,10 @@ msgid "[[Code of conduct|contribute/working_together/code_of_conduct]]"
msgstr ""
#. type: Bullet: ' - '
+msgid "[[Social contract|contribute/working_together/social_contract]]"
+msgstr ""
+
+#. type: Bullet: ' - '
msgid ""
"[[Contributors meetings|contribute/meetings]], and minutes from past meetings"
msgstr ""
diff --git a/wiki/src/contribute.mdwn b/wiki/src/contribute.mdwn
index a61a174..abccb35 100644
--- a/wiki/src/contribute.mdwn
+++ b/wiki/src/contribute.mdwn
@@ -203,6 +203,7 @@ Collective process
- [[Calendar|contribute/calendar]] of releases, meetings, working sessions, etc.
- [[Code of conduct|contribute/working_together/code_of_conduct]]
+ - [[Social contract|contribute/working_together/social_contract]]
- [[Contributors meetings|contribute/meetings]], and minutes from past meetings
- [[Marking a task as easy|contribute/working_together/criteria_for_easy_tasks]]
- [[Document progress|contribute/working_together/document_progress]]
diff --git a/wiki/src/contribute.pt.po b/wiki/src/contribute.pt.po
index 6f0c24f..de70353 100644
--- a/wiki/src/contribute.pt.po
+++ b/wiki/src/contribute.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2017-05-14 18:32+0300\n"
+"POT-Creation-Date: 2017-06-22 13:54+0300\n"
"PO-Revision-Date: 2016-04-30 11:31-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: Portuguese <LL@li.org>\n"
@@ -601,6 +601,12 @@ msgid "[[Code of conduct|contribute/working_together/code_of_conduct]]"
msgstr "[[Código de conduta|contribute/working_together/code_of_conduct]]"
#. type: Bullet: ' - '
+#, fuzzy
+#| msgid "[[Code of conduct|contribute/working_together/code_of_conduct]]"
+msgid "[[Social contract|contribute/working_together/social_contract]]"
+msgstr "[[Código de conduta|contribute/working_together/code_of_conduct]]"
+
+#. type: Bullet: ' - '
msgid ""
"[[Contributors meetings|contribute/meetings]], and minutes from past meetings"
msgstr ""
diff --git a/wiki/src/contribute/APT_repository/custom.mdwn b/wiki/src/contribute/APT_repository/custom.mdwn
index a4667ff..c3767b1 100644
--- a/wiki/src/contribute/APT_repository/custom.mdwn
+++ b/wiki/src/contribute/APT_repository/custom.mdwn
@@ -335,13 +335,30 @@ If you just put out a final release:
* increment the version number in devel's `debian/changelog` to match
the next major release, so that
next builds from the `devel` branch do not use the APT suite meant
- for the last release
+ for the last release:
+
+ cd "${RELEASE_CHECKOUT}" && \
+ git checkout devel && \
+ dch --newversion "${NEXT_PLANNED_MAJOR_VERSION:?}" \
+ "Dummy entry for next release." && \
+ git commit debian/changelog \
+ -m "Add dummy changelog entry for ${NEXT_PLANNED_MAJOR_VERSION:?}."
+
* increment the version number in stable's `debian/changelog` to match
the next point release, so that
next builds from the `stable` branch do not use the APT suite meant
- for the last release
+ for the last release:
+
+ cd "${RELEASE_CHECKOUT}" && \
+ git checkout stable && \
+ dch --newversion "${NEXT_PLANNED_MINOR_VERSION:?}" \
+ "Dummy entry for next release." && \
+ git commit debian/changelog \
+ -m "Add dummy changelog entry for ${NEXT_PLANNED_MINOR_VERSION:?}."
+
-If you just released a RC:
+If you just released a RC (XXX: please automate these steps during the
+3.2~rc1 release process, based on the above commands):
* add a dummy changelog entry (for the upcoming, non-RC version) in
the branch used for the release (`stable` or `testing`), so that the
diff --git a/wiki/src/contribute/build.mdwn b/wiki/src/contribute/build.mdwn
index adaca0a..5d6902d 100644
--- a/wiki/src/contribute/build.mdwn
+++ b/wiki/src/contribute/build.mdwn
@@ -300,6 +300,12 @@ using *gzip*.
Building manually
=================
+<div class="note">
+This section may not be in tested and working shape as all active
+developers use Vagrant.
+</div>
+
+
In order to build Tails manually, you need a running Debian Jessie
system and some [backports](http://backports.debian.org/). Anything
else will fail.
diff --git a/wiki/src/contribute/calendar.mdwn b/wiki/src/contribute/calendar.mdwn
index f86d7ae..b66ad9c 100644
--- a/wiki/src/contribute/calendar.mdwn
+++ b/wiki/src/contribute/calendar.mdwn
@@ -1,22 +1,14 @@
[[!meta title="Calendar"]]
-* 2017-06-09:
- - Bump APT snapshots ([[!tails_ticket 12609]]).
- - Freeze: all branches targeting Tails 3.0 must be merged into the
- `devel` branch by 15:00 CEST.
-
-* 2017-06-10:
- - Import Tor Browser 7.0.1.
- - Build and upload the Tails 3.0 tentative ISO image.
+* 2017-07-06, 16:00 (Berlin time): CI team meeting
-* 2017-06-11 and 2017-06-12: Test the Tails 3.0 tentative ISO image
- (deadline: 2017-06-12, 17:00 CEST).
+* 2017-08-04, noon: all branches targeting Tails 3.1 must be merged
-* 2017-06-13: Release Tails 3.0 (Firefox 52.2) — intrigeri is the RM
+* 2017-08-05: Import Tor Browser 7.0.2, build and upload Tails 3.1
-* 2017-07-06, 16:00 (Berlin time): CI team meeting
+* 2017-08-06: Start testing Tails 3.1
-* 2017-08-08: Release 3.1? (Firefox 52.3)
+* 2017-08-08: Release 3.1 (Firefox 52.3)
- bertagaz is the RM
- intrigeri is on-call for Foundations Team work until 2017-07-30.
- anonym takes over the Foundations Team on-call hat on 2017-07-31.
diff --git a/wiki/src/contribute/design.mdwn b/wiki/src/contribute/design.mdwn
index a6367e3..77f5359 100644
--- a/wiki/src/contribute/design.mdwn
+++ b/wiki/src/contribute/design.mdwn
@@ -971,7 +971,7 @@ information leaks, decreasing attack surface and similar. The actual
binaries etc. used in Tails are those distributed by the Tor Project,
but the configuration differs slightly, which is described below.
-In Tails we diverge from the TBB's one-profile-only design, and
+In Tails we diverge from the Tor Browser's one-profile-only design, and
install the Tor Browser in a globally accessible directory used by all
browser profiles (and other XUL applications).
@@ -1009,7 +1009,7 @@ lot of stuff not needed in Tails (error checking mainly) and isn't
flexible since it looks for the browser profile in a specific
place. Our custom script makes use of the global installation and also
makes sure the default profile is used as a basis. Any shared libraries
-shipped inside the TBB are also used (via `LD_LIBRARY_PATH`) since
+shipped inside the Tor Browser are also used (via `LD_LIBRARY_PATH`) since
Debian stable often has too old versions to start the browser.
Whenever the user tries to start the Tor Browser before Tor is
@@ -1036,7 +1036,7 @@ The remaining configuration differences can be found in:
- [[!tails_gitweb config/chroot_local-hooks/14-generate-tor-browser-profile]]
- [[!tails_gitweb config/chroot_local-hooks/15-symlink-places.sqlite]]
-It should also be noted that the global TBB installation is also used
+It should also be noted that the global Tor Browser installation is also used
for the [[Unsafe Browser]], although it is
user-isolated and use a separate profile with very different
configuration.
@@ -1414,14 +1414,14 @@ Bundle and the known differences, if any, are listed in the [[known
issues|support/known_issues]] page.
However the fact that different browser extensions are installed in Tails and in
-the TBB surely allows more sophisticated attacks that usual fingerprint
+the Tor Browser surely allows more sophisticated attacks that usual fingerprint
as returned by tools such as <https://panopticlick.eff.org/> and
<http://ip-check.info/>. For example, the fact that uBlock Origin is removing
ads could be analysed.
From the point of view of the local network administrator, Tails is
almost exclusively generating Tor activity and that is probably quite
-different from other TBB users. We believe this would be hard to avoid.
+different from other Tor Browser users. We believe this would be hard to avoid.
Other possible fingerprint issues on the LAN or ISP exist but we believe
they would be harder to detect. See the discussion on fingerprinting in
the [[Time sync|contribute/design/Time_syncing]] design document and the
diff --git a/wiki/src/contribute/design/persistence.mdwn b/wiki/src/contribute/design/persistence.mdwn
index b20269e..777967a 100644
--- a/wiki/src/contribute/design/persistence.mdwn
+++ b/wiki/src/contribute/design/persistence.mdwn
@@ -406,6 +406,6 @@ Still, after login, if some settings are found that were not fully
migrated, or never migrated at all (i.e.
if `live-additional-software.conf.disabled`, `live-persistence.conf`
or `live-persistence.conf.old` is found), a desktop notification makes
-the user aware of it, and points them to the [[migration
-documentation|doc/first_steps/persistence/upgrade]] so that they can
+the user aware of it, and points them to the migration
+documentation so that they can
learn how to migrate their configuration.
diff --git a/wiki/src/contribute/how/documentation/release_notes.mdwn b/wiki/src/contribute/how/documentation/release_notes.mdwn
index 89534d5..0ec655b 100644
--- a/wiki/src/contribute/how/documentation/release_notes.mdwn
+++ b/wiki/src/contribute/how/documentation/release_notes.mdwn
@@ -63,6 +63,14 @@
- Order items to put the most visible, less technical, and most popular
items first while not being afraid of putting more technical items as
well down the list.
+ - Document known issues
+ - Update the `meta title` directive.
+ - Update the `meta date` directive.
+ - Make sure there's an `announce` tag to have an email sent to the
+ news mailing list.
+ - Update the [[support/known_issues]] page:
+ - Add regressions brought by the new release.
+ - Remove older known issues that are fixed by the new release.
- Format
- Link to ticket for fixed problems and changes that are well justified in Redmine
- Put the period before ticket number
diff --git a/wiki/src/contribute/how/documentation/release_notes/template.mdwn b/wiki/src/contribute/how/documentation/release_notes/template.mdwn
index b2025ef..f15f03a 100644
--- a/wiki/src/contribute/how/documentation/release_notes/template.mdwn
+++ b/wiki/src/contribute/how/documentation/release_notes/template.mdwn
@@ -18,6 +18,8 @@ upgrade as soon as possible.
For more details, read our [[!tails_gitweb debian/changelog desc="changelog"]].
+<a id="known-issues"></a>
+
# Known issues
None specific to this release.
diff --git a/wiki/src/contribute/how/donate.de.po b/wiki/src/contribute/how/donate.de.po
deleted file mode 100644
index 9e63331..0000000
--- a/wiki/src/contribute/how/donate.de.po
+++ /dev/null
@@ -1,416 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"POT-Creation-Date: 2016-03-21 18:14+0100\n"
-"PO-Revision-Date: 2015-12-31 13:49+0100\n"
-"Last-Translator: Tails translators <tails@boum.org>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: de\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.10\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"Make a donation\"]]\n"
-msgstr "[[!meta title=\"Eine Spende tätigen\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"Tails is free because <strong>nobody should have to pay to be safe\n"
-"while using computers</strong>. But Tails cannot stay alive without\n"
-"money and <strong>we need your help</strong>!\n"
-msgstr ""
-"Tails ist kostenlos, da <strong>niemand für die sichere Nutzung eines Computers\n"
-"bezahlen müssen sollte</strong>. Allerdings kann Tails nicht ohne finanzielle\n"
-"Unterstützung bestehen, daher <strong>brauchen wir Ihre Hilfe</strong>!\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<strong>[[Discover who you are helping around the world when\n"
-"donating to Tails.|news/who_are_you_helping]]</strong>\n"
-msgstr ""
-"<strong>[[Erfahren Sie mehr, wem Sie weltweit mit einer Spende an Tails\n"
-"helfen.|news/who_are_you_helping]]</strong>\n"
-
-#. type: Plain text
-msgid ""
-"Note that Tails is a project mainly run by volunteers. There are [[many "
-"other ways to contribute|contribute]]!"
-msgstr ""
-"Beachten Sie, dass Tails ein hauptsächlich von Freiwilligen betriebenes "
-"Projekt ist. Es gibt [[viele andere Wege sich einzubringen|contribute]]!"
-
-#. type: Title =
-#, no-wrap
-msgid "Ways to donate\n"
-msgstr "Möglichkeiten zu Spenden\n"
-
-#. type: Bullet: ' * '
-msgid ""
-"Crowdfunding campaign run by the American organization [Freedom of the Press "
-"Foundation](https://pressfreedomfoundation.org/bundle/encryption-tools-"
-"journalists)."
-msgstr ""
-"Crowdfunding Kampagne der amerikanischen Organisation [Freedom of the Press "
-"Foundation](https://pressfreedomfoundation.org/bundle/encryption-tools-"
-"journalists)."
-
-#. type: Plain text
-#, no-wrap
-msgid " If you live in the US, your donation will be tax-deductible.\n"
-msgstr " Falls Sie in den USA leben wird Ihre Spende von der Steuer absetzbar sein.\n"
-
-#. type: Bullet: ' * '
-msgid ""
-"[[Bank wire transfer|donate#swift]] or [[Paypal|donate#paypal]] through the "
-"German organization [Zwiebelfreunde e.V.](https://www.zwiebelfreunde.de/)."
-msgstr ""
-"[[Banküberweisung|donate#swift]] oder [[Paypal|donate#paypal]] über die "
-"deutsche Organisation [Zwiebelfreunde e.V.](https://www.zwiebelfreunde.de/)."
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" If you live in Europe, your donation might be tax-deductible. Check what are\n"
-" the precise conditions in your country, and [ask\n"
-" Zwiebelfreunde](https://www.torservers.net/contact.html) for a donation\n"
-" receipt if you need one.\n"
-msgstr ""
-" Wenn Sie in Europa leben, lässt sich Ihre Spende möglicherweise von der Steuer absetzen. Überprüfen Sie die genauen\n"
-" Bedingungen in Ihrem Land und [fragen Sie \n"
-" Zwiebelfreunde](https://www.torservers.net/contact.html) nach einer\n"
-" Spendenquittung, falls Sie eine benötigen.\n"
-
-#. type: Bullet: ' * '
-msgid "[[Bitcoin|donate#bitcoin]]"
-msgstr "[[Bitcoin|donate#bitcoin]]"
-
-#. type: Bullet: ' * '
-msgid ""
-"[Flattr](https://flattr.com/submit/auto?user_id=tails_live&url=https://tails."
-"boum.org&title=Tails)"
-msgstr ""
-"[Flattr](https://flattr.com/submit/auto?user_id=tails_live&url=https://tails."
-"boum.org&title=Tails)"
-
-#. type: Bullet: ' * '
-msgid ""
-"For fundraising related matters, you can write to [[tails-accounting@boum."
-"org|about/contact#tails-accounting]]."
-msgstr ""
-
-#. type: Bullet: ' * '
-msgid ""
-"If none of these methods suit you, consider [donating to the Tor Project]"
-"(https://www.torproject.org/donate/). They do great work, and also support "
-"us financially."
-msgstr ""
-"Falls Ihnen keine dieser Methoden zusagt, können Sie auch [eine Spende an "
-"das Tor Project](https://www.torproject.org/donate/) in Betracht ziehen. Sie "
-"leisten großartige Arbeit und unterstützen uns ebenfalls finanziell."
-
-#. type: Plain text
-msgid "Thank you for your donation!"
-msgstr "Vielen Dank für Ihre Spende!"
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"bitcoin\"></a>\n"
-msgstr "<a id=\"bitcoin\"></a>\n"
-
-#. type: Title -
-#, no-wrap
-msgid "Bitcoin\n"
-msgstr "Bitcoin\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "You can send Bitcoins to **<a href=\"bitcoin:1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2\">1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2</a>**.\n"
-msgstr "Sie können Bitcoins an **<a href=\"bitcoin:1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2\">1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2</a>** senden.\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"caution\">\n"
-msgstr "<div class=\"caution\">\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>Bitcoin is <a href=\"https://bitcoin.org/en/faq#is-bitcoin-anonymous\">not\n"
-"anonymous</a>.</p>\n"
-msgstr ""
-"<p>Bitcoin ist <a href=\"https://bitcoin.org/de/faq#ist-bitcoin-anonym\">nicht\n"
-"anonym</a>.</p>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
-msgstr "</div>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"swift\"></a>\n"
-msgstr "<a id=\"swift\"></a>\n"
-
-#. type: Title -
-#, no-wrap
-msgid "Bank wire transfer\n"
-msgstr "Banküberweisung\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" Account holder: Zwiebelfreunde e.V.\n"
-" Name of bank: GLS Gemeinschaftsbank eG\n"
-" IBAN: DE25430609671126825603\n"
-" BIC: GENODEM1GLS\n"
-" Address of bank: Christstrasse 9, 44789 Bochum, Germany\n"
-msgstr ""
-" Kontoinhaber: Zwiebelfreunde e.V.\n"
-" Name der Bank: GLS Gemeinschaftsbank eG\n"
-" IBAN: DE25430609671126825603\n"
-" BIC: GENODEM1GLS\n"
-" Adresse der Bank: Christstrasse 9, 44789 Bochum, Deutschland\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"paypal\"></a>\n"
-msgstr "<a id=\"paypal\"></a>\n"
-
-#. type: Title -
-#, no-wrap
-msgid "Paypal\n"
-msgstr "Paypal\n"
-
-#. type: Plain text
-msgid ""
-"Please, use the euro (EUR) as currency as this makes accounting easier. "
-"However, Paypal automatically converts it to your local currency."
-msgstr ""
-"Bitte benutzen Sie Euro (EUR) als Währung, da dies die Buchhaltung "
-"vereinfacht. Paypal wird die Umrechnung in Ihre lokale Währung übernehmen."
-
-#. type: Title ###
-#, no-wrap
-msgid "Set up a recurring donation"
-msgstr "Eine Spende per Dauerauftrag einrichten"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<form action=\"https://www.paypal.com/cgi-bin/webscr\" method=\"post\" target='_blank' class='donation'>\n"
-"\t<input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\"/>\n"
-"\t<input type=\"hidden\" name=\"business\" value=\"tails@torservers.net\"/>\n"
-"\t<input type=\"hidden\" name=\"item_name\" value=\"Tails recurring donation\"/>\n"
-"\t<input type=\"hidden\" name=\"no_note\" value=\"1\"/>\n"
-"\t<input type=\"hidden\" name=\"src\" value=\"1\"/>\n"
-"\t<input type=\"hidden\" name=\"modify\" value=\"1\"/>\n"
-"\t<input type=\"hidden\" name=\"t3\" value=\"M\"/>\n"
-"\t<input name=\"lc\" type=\"hidden\" value=\"US\" />\n"
-"\t<input type=\"radio\" name=\"a3\" value=\"5\" id=\"sub5\" checked=\"checked\" /><label for=\"sub5\">5</label>\n"
-"\t<input type=\"radio\" name=\"a3\" value=\"10\" id=\"sub10\"/><label for=\"sub10\">10</label>\n"
-"\t<input type=\"radio\" name=\"a3\" value=\"20\" id=\"sub20\"/><label for=\"sub20\">20</label>\n"
-"\t<input type=\"radio\" name=\"a3\" value=\"50\" id=\"sub50\"/><label for=\"sub50\">50</label>\n"
-"\t<input type=\"radio\" name=\"a3\" value=\"100\" id=\"sub100\"/><label for=\"sub100\">100</label>\n"
-"\t<input type=\"radio\" name=\"a3\" value=\"250\" id=\"sub250\"/><label for=\"sub250\">250</label>\n"
-"\t<input type=\"radio\" name=\"a3\" value=\"500\" id=\"sub500\"/><label for=\"sub500\">500</label>\n"
-"\t<select name=\"currency_code\">\n"
-"\t\t\t<option value='EUR'>EUR</option>\n"
-"\t\t\t<option value='USD'>USD</option>\n"
-"\t\t\t<option value='GBP'>GBP</option>\n"
-"\t\t\t<option value='CAD'>CAD</option>\n"
-"\t\t\t<option value='AUD'>AUD</option>\n"
-"\t\t\t<option value='NZD'>NZD</option>\n"
-"\t\t\t<option value='SEK'>SEK</option>\n"
-"\t\t\t<option value='CZK'>CZK</option>\n"
-"\t\t\t<option value='PLN'>PLN</option>\n"
-"\t\t\t<option value='DKK'>DKK</option>\n"
-"\t\t\t<option value='NOK'>NOK</option>\n"
-"\t\t\t<option value='MXN'>MXN</option>\n"
-"\t\t\t<option value='CHF'>CHF</option>\n"
-"\t\t\t<option value='HKD'>HKD</option>\n"
-"\t\t\t<option value='HUF'>HUF</option>\n"
-"\t\t\t<option value='ILS'>ILS</option>\n"
-"\t\t\t<option value='BRL'>BRL</option>\n"
-"\t\t\t<option value='JPY'>JPY</option>\n"
-"\t\t\t<option value='MYR'>MYR</option>\n"
-"\t\t\t<option value='PHP'>PHP</option>\n"
-"\t\t\t<option value='SGD'>SGD</option>\n"
-"\t\t\t<option value='TWD'>TWD</option>\n"
-"\t\t\t<option value='THB'>THB</option>\n"
-"\t</select>\n"
-"\t<br/>\n"
-"\t<input type=\"radio\" name=\"p3\" value=\"1\" id=\"sub_m\" checked=\"checked\" /><label for=\"sub_m\">monthly</label>\n"
-"\t<input type=\"radio\" name=\"p3\" value=\"3\" id=\"sub_q\"/><label for=\"sub_q\">quarterly</label>\n"
-"\t<input type=\"radio\" name=\"p3\" value=\"12\" id=\"sub_y\"/><label for=\"sub_y\">yearly</label>\n"
-"\t<br/>\n"
-"\t<input type=\"submit\" value=\"Subscribe\" class=\"button\" />\n"
-"</form>\n"
-msgstr ""
-"<form action=\"https://www.paypal.com/cgi-bin/webscr\" method=\"post\" target='_blank' class='donation'>\n"
-"\t<input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\"/>\n"
-"\t<input type=\"hidden\" name=\"business\" value=\"tails@torservers.net\"/>\n"
-"\t<input type=\"hidden\" name=\"item_name\" value=\"Tails recurring donation\"/>\n"
-"\t<input type=\"hidden\" name=\"no_note\" value=\"1\"/>\n"
-"\t<input type=\"hidden\" name=\"src\" value=\"1\"/>\n"
-"\t<input type=\"hidden\" name=\"modify\" value=\"1\"/>\n"
-"\t<input type=\"hidden\" name=\"t3\" value=\"M\"/>\n"
-"\t<input name=\"lc\" type=\"hidden\" value=\"US\" />\n"
-"\t<input type=\"radio\" name=\"a3\" value=\"5\" id=\"sub5\" checked=\"checked\" /><label for=\"sub5\">5</label>\n"
-"\t<input type=\"radio\" name=\"a3\" value=\"10\" id=\"sub10\"/><label for=\"sub10\">10</label>\n"
-"\t<input type=\"radio\" name=\"a3\" value=\"20\" id=\"sub20\"/><label for=\"sub20\">20</label>\n"
-"\t<input type=\"radio\" name=\"a3\" value=\"50\" id=\"sub50\"/><label for=\"sub50\">50</label>\n"
-"\t<input type=\"radio\" name=\"a3\" value=\"100\" id=\"sub100\"/><label for=\"sub100\">100</label>\n"
-"\t<input type=\"radio\" name=\"a3\" value=\"250\" id=\"sub250\"/><label for=\"sub250\">250</label>\n"
-"\t<input type=\"radio\" name=\"a3\" value=\"500\" id=\"sub500\"/><label for=\"sub500\">500</label>\n"
-"\t<select name=\"currency_code\">\n"
-"\t\t\t<option value='EUR'>EUR</option>\n"
-"\t\t\t<option value='USD'>USD</option>\n"
-"\t\t\t<option value='GBP'>GBP</option>\n"
-"\t\t\t<option value='CAD'>CAD</option>\n"
-"\t\t\t<option value='AUD'>AUD</option>\n"
-"\t\t\t<option value='NZD'>NZD</option>\n"
-"\t\t\t<option value='SEK'>SEK</option>\n"
-"\t\t\t<option value='CZK'>CZK</option>\n"
-"\t\t\t<option value='PLN'>PLN</option>\n"
-"\t\t\t<option value='DKK'>DKK</option>\n"
-"\t\t\t<option value='NOK'>NOK</option>\n"
-"\t\t\t<option value='MXN'>MXN</option>\n"
-"\t\t\t<option value='CHF'>CHF</option>\n"
-"\t\t\t<option value='HKD'>HKD</option>\n"
-"\t\t\t<option value='HUF'>HUF</option>\n"
-"\t\t\t<option value='ILS'>ILS</option>\n"
-"\t\t\t<option value='BRL'>BRL</option>\n"
-"\t\t\t<option value='JPY'>JPY</option>\n"
-"\t\t\t<option value='MYR'>MYR</option>\n"
-"\t\t\t<option value='PHP'>PHP</option>\n"
-"\t\t\t<option value='SGD'>SGD</option>\n"
-"\t\t\t<option value='TWD'>TWD</option>\n"
-"\t\t\t<option value='THB'>THB</option>\n"
-"\t</select>\n"
-"\t<br/>\n"
-"\t<input type=\"radio\" name=\"p3\" value=\"1\" id=\"sub_m\" checked=\"checked\" /><label for=\"sub_m\">monatlich</label>\n"
-"\t<input type=\"radio\" name=\"p3\" value=\"3\" id=\"sub_q\"/><label for=\"sub_q\">quartalsweise</label>\n"
-"\t<input type=\"radio\" name=\"p3\" value=\"12\" id=\"sub_y\"/><label for=\"sub_y\">jährlich</label>\n"
-"\t<br/>\n"
-"\t<input type=\"submit\" value=\"Absenden\" class=\"button\" />\n"
-"</form>\n"
-
-#. type: Title ###
-#, no-wrap
-msgid "Make a one-time donation"
-msgstr "Eine einmalige Spende tätigen"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<form action='https://www.paypal.com/cgi-bin/webscr' id='paypalForm' method='post' target='_blank' class='donation'>\n"
-"\t<input name='cmd' type='hidden' value='_donations' />\n"
-"\t<input name='business' type='hidden' value='tails@torservers.net' />\n"
-"\t<input name='item_name' type='hidden' value='Tails one-time donation' />\n"
-"\t<input type=\"hidden\" name=\"no_shipping\" value=\"1\"/>\n"
-"\t<input name=\"lc\" type=\"hidden\" value=\"US\" />\n"
-"\t<input type=\"radio\" name=\"amount\" value=\"5\" id=\"pp_5\" /><label for=\"pp_5\">5</label>\n"
-"\t<input type=\"radio\" name=\"amount\" value=\"10\" id=\"pp_10\"/><label for=\"pp_10\">10</label>\n"
-"\t<input type=\"radio\" name=\"amount\" value=\"20\" id=\"pp_20\"/><label for=\"pp_20\">20</label>\n"
-"\t<input type=\"radio\" name=\"amount\" value=\"50\" id=\"pp_50\"/><label for=\"pp_50\">50</label>\n"
-"\t<input type=\"radio\" name=\"amount\" value=\"100\" id=\"pp_100\"/><label for=\"pp_100\">100</label>\n"
-"\t<input type=\"radio\" name=\"amount\" value=\"\" id=\"pp_cust\" checked=\"checked\"/><label for=\"pp_cust\">custom amount</label>\n"
-"\t<select name=\"currency_code\">\n"
-"\t\t<option value='EUR'>EUR</option>\n"
-"\t\t<option value='USD'>USD</option>\n"
-"\t\t<option value='GBP'>GBP</option>\n"
-"\t\t<option value='CAD'>CAD</option>\n"
-"\t\t<option value='AUD'>AUD</option>\n"
-"\t\t<option value='NZD'>NZD</option>\n"
-"\t\t<option value='SEK'>SEK</option>\n"
-"\t\t<option value='CZK'>CZK</option>\n"
-"\t\t<option value='PLN'>PLN</option>\n"
-"\t\t<option value='DKK'>DKK</option>\n"
-"\t\t<option value='NOK'>NOK</option>\n"
-"\t\t<option value='MXN'>MXN</option>\n"
-"\t\t<option value='CHF'>CHF</option>\n"
-"\t\t<option value='HKD'>HKD</option>\n"
-"\t\t<option value='HUF'>HUF</option>\n"
-"\t\t<option value='ILS'>ILS</option>\n"
-"\t\t<option value='BRL'>BRL</option>\n"
-"\t\t<option value='JPY'>JPY</option>\n"
-"\t\t<option value='MYR'>MYR</option>\n"
-"\t\t<option value='PHP'>PHP</option>\n"
-"\t\t<option value='SGD'>SGD</option>\n"
-"\t\t<option value='TWD'>TWD</option>\n"
-"\t\t<option value='THB'>THB</option>\n"
-"\t</select>\n"
-"\t<br/>\n"
-"\t<input type=\"submit\" value=\"Donate\" class=\"button\" />\n"
-"</form>\n"
-msgstr ""
-"<form action='https://www.paypal.com/cgi-bin/webscr' id='paypalForm' method='post' target='_blank' class='donation'>\n"
-"\t<input name='cmd' type='hidden' value='_donations' />\n"
-"\t<input name='business' type='hidden' value='tails@torservers.net' />\n"
-"\t<input name='item_name' type='hidden' value='Tails one-time donation' />\n"
-"\t<input type=\"hidden\" name=\"no_shipping\" value=\"1\"/>\n"
-"\t<input name=\"lc\" type=\"hidden\" value=\"US\" />\n"
-"\t<input type=\"radio\" name=\"amount\" value=\"5\" id=\"pp_5\" /><label for=\"pp_5\">5</label>\n"
-"\t<input type=\"radio\" name=\"amount\" value=\"10\" id=\"pp_10\"/><label for=\"pp_10\">10</label>\n"
-"\t<input type=\"radio\" name=\"amount\" value=\"20\" id=\"pp_20\"/><label for=\"pp_20\">20</label>\n"
-"\t<input type=\"radio\" name=\"amount\" value=\"50\" id=\"pp_50\"/><label for=\"pp_50\">50</label>\n"
-"\t<input type=\"radio\" name=\"amount\" value=\"100\" id=\"pp_100\"/><label for=\"pp_100\">100</label>\n"
-"\t<input type=\"radio\" name=\"amount\" value=\"\" id=\"pp_cust\" checked=\"checked\"/><label for=\"pp_cust\">anderer Betrag</label>\n"
-"\t<select name=\"currency_code\">\n"
-"\t\t<option value='EUR'>EUR</option>\n"
-"\t\t<option value='USD'>USD</option>\n"
-"\t\t<option value='GBP'>GBP</option>\n"
-"\t\t<option value='CAD'>CAD</option>\n"
-"\t\t<option value='AUD'>AUD</option>\n"
-"\t\t<option value='NZD'>NZD</option>\n"
-"\t\t<option value='SEK'>SEK</option>\n"
-"\t\t<option value='CZK'>CZK</option>\n"
-"\t\t<option value='PLN'>PLN</option>\n"
-"\t\t<option value='DKK'>DKK</option>\n"
-"\t\t<option value='NOK'>NOK</option>\n"
-"\t\t<option value='MXN'>MXN</option>\n"
-"\t\t<option value='CHF'>CHF</option>\n"
-"\t\t<option value='HKD'>HKD</option>\n"
-"\t\t<option value='HUF'>HUF</option>\n"
-"\t\t<option value='ILS'>ILS</option>\n"
-"\t\t<option value='BRL'>BRL</option>\n"
-"\t\t<option value='JPY'>JPY</option>\n"
-"\t\t<option value='MYR'>MYR</option>\n"
-"\t\t<option value='PHP'>PHP</option>\n"
-"\t\t<option value='SGD'>SGD</option>\n"
-"\t\t<option value='TWD'>TWD</option>\n"
-"\t\t<option value='THB'>THB</option>\n"
-"\t</select>\n"
-"\t<br/>\n"
-"\t<input type=\"submit\" value=\"Spenden\" class=\"button\" />\n"
-"</form>\n"
-
-#. type: Title =
-#, no-wrap
-msgid "How does Tails use this money?\n"
-msgstr "Wofür verwendet Tails dieses Geld?\n"
-
-#. type: Plain text
-msgid ""
-"Our [[financial documents|doc/about/finances]] are available for your review."
-msgstr ""
-"Unsere [[Auflistungen über die Verwendung der Zuwendungen|doc/about/"
-"finances]] sind für Sie einsehbar."
-
-#~ msgid ""
-#~ "**Your support is critical to our success.** Consider making\n"
-#~ "a donation to Tails.\n"
-#~ msgstr ""
-#~ "**Ihre Hilfe ist ausschlaggebend für unseren Erfolg.** Bitte erwägen "
-#~ "Sie,\n"
-#~ " Tails eine Spende zukommen zu lassen.\n"
diff --git a/wiki/src/contribute/how/donate.fa.po b/wiki/src/contribute/how/donate.fa.po
deleted file mode 100644
index 8aefefd..0000000
--- a/wiki/src/contribute/how/donate.fa.po
+++ /dev/null
@@ -1,288 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-03-21 18:14+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"Make a donation\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"Tails is free because <strong>nobody should have to pay to be safe\n"
-"while using computers</strong>. But Tails cannot stay alive without\n"
-"money and <strong>we need your help</strong>!\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<strong>[[Discover who you are helping around the world when\n"
-"donating to Tails.|news/who_are_you_helping]]</strong>\n"
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"Note that Tails is a project mainly run by volunteers. There are [[many "
-"other ways to contribute|contribute]]!"
-msgstr ""
-
-#. type: Title =
-#, no-wrap
-msgid "Ways to donate\n"
-msgstr ""
-
-#. type: Bullet: ' * '
-msgid ""
-"Crowdfunding campaign run by the American organization [Freedom of the Press "
-"Foundation](https://pressfreedomfoundation.org/bundle/encryption-tools-"
-"journalists)."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " If you live in the US, your donation will be tax-deductible.\n"
-msgstr ""
-
-#. type: Bullet: ' * '
-msgid ""
-"[[Bank wire transfer|donate#swift]] or [[Paypal|donate#paypal]] through the "
-"German organization [Zwiebelfreunde e.V.](https://www.zwiebelfreunde.de/)."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" If you live in Europe, your donation might be tax-deductible. Check what are\n"
-" the precise conditions in your country, and [ask\n"
-" Zwiebelfreunde](https://www.torservers.net/contact.html) for a donation\n"
-" receipt if you need one.\n"
-msgstr ""
-
-#. type: Bullet: ' * '
-msgid "[[Bitcoin|donate#bitcoin]]"
-msgstr ""
-
-#. type: Bullet: ' * '
-msgid ""
-"[Flattr](https://flattr.com/submit/auto?user_id=tails_live&url=https://tails."
-"boum.org&title=Tails)"
-msgstr ""
-
-#. type: Bullet: ' * '
-msgid ""
-"For fundraising related matters, you can write to [[tails-accounting@boum."
-"org|about/contact#tails-accounting]]."
-msgstr ""
-
-#. type: Bullet: ' * '
-msgid ""
-"If none of these methods suit you, consider [donating to the Tor Project]"
-"(https://www.torproject.org/donate/). They do great work, and also support "
-"us financially."
-msgstr ""
-
-#. type: Plain text
-msgid "Thank you for your donation!"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"bitcoin\"></a>\n"
-msgstr ""
-
-#. type: Title -
-#, no-wrap
-msgid "Bitcoin\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "You can send Bitcoins to **<a href=\"bitcoin:1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2\">1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2</a>**.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"caution\">\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>Bitcoin is <a href=\"https://bitcoin.org/en/faq#is-bitcoin-anonymous\">not\n"
-"anonymous</a>.</p>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"swift\"></a>\n"
-msgstr ""
-
-#. type: Title -
-#, no-wrap
-msgid "Bank wire transfer\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" Account holder: Zwiebelfreunde e.V.\n"
-" Name of bank: GLS Gemeinschaftsbank eG\n"
-" IBAN: DE25430609671126825603\n"
-" BIC: GENODEM1GLS\n"
-" Address of bank: Christstrasse 9, 44789 Bochum, Germany\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"paypal\"></a>\n"
-msgstr ""
-
-#. type: Title -
-#, no-wrap
-msgid "Paypal\n"
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"Please, use the euro (EUR) as currency as this makes accounting easier. "
-"However, Paypal automatically converts it to your local currency."
-msgstr ""
-
-#. type: Title ###
-#, no-wrap
-msgid "Set up a recurring donation"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<form action=\"https://www.paypal.com/cgi-bin/webscr\" method=\"post\" target='_blank' class='donation'>\n"
-"\t<input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\"/>\n"
-"\t<input type=\"hidden\" name=\"business\" value=\"tails@torservers.net\"/>\n"
-"\t<input type=\"hidden\" name=\"item_name\" value=\"Tails recurring donation\"/>\n"
-"\t<input type=\"hidden\" name=\"no_note\" value=\"1\"/>\n"
-"\t<input type=\"hidden\" name=\"src\" value=\"1\"/>\n"
-"\t<input type=\"hidden\" name=\"modify\" value=\"1\"/>\n"
-"\t<input type=\"hidden\" name=\"t3\" value=\"M\"/>\n"
-"\t<input name=\"lc\" type=\"hidden\" value=\"US\" />\n"
-"\t<input type=\"radio\" name=\"a3\" value=\"5\" id=\"sub5\" checked=\"checked\" /><label for=\"sub5\">5</label>\n"
-"\t<input type=\"radio\" name=\"a3\" value=\"10\" id=\"sub10\"/><label for=\"sub10\">10</label>\n"
-"\t<input type=\"radio\" name=\"a3\" value=\"20\" id=\"sub20\"/><label for=\"sub20\">20</label>\n"
-"\t<input type=\"radio\" name=\"a3\" value=\"50\" id=\"sub50\"/><label for=\"sub50\">50</label>\n"
-"\t<input type=\"radio\" name=\"a3\" value=\"100\" id=\"sub100\"/><label for=\"sub100\">100</label>\n"
-"\t<input type=\"radio\" name=\"a3\" value=\"250\" id=\"sub250\"/><label for=\"sub250\">250</label>\n"
-"\t<input type=\"radio\" name=\"a3\" value=\"500\" id=\"sub500\"/><label for=\"sub500\">500</label>\n"
-"\t<select name=\"currency_code\">\n"
-"\t\t\t<option value='EUR'>EUR</option>\n"
-"\t\t\t<option value='USD'>USD</option>\n"
-"\t\t\t<option value='GBP'>GBP</option>\n"
-"\t\t\t<option value='CAD'>CAD</option>\n"
-"\t\t\t<option value='AUD'>AUD</option>\n"
-"\t\t\t<option value='NZD'>NZD</option>\n"
-"\t\t\t<option value='SEK'>SEK</option>\n"
-"\t\t\t<option value='CZK'>CZK</option>\n"
-"\t\t\t<option value='PLN'>PLN</option>\n"
-"\t\t\t<option value='DKK'>DKK</option>\n"
-"\t\t\t<option value='NOK'>NOK</option>\n"
-"\t\t\t<option value='MXN'>MXN</option>\n"
-"\t\t\t<option value='CHF'>CHF</option>\n"
-"\t\t\t<option value='HKD'>HKD</option>\n"
-"\t\t\t<option value='HUF'>HUF</option>\n"
-"\t\t\t<option value='ILS'>ILS</option>\n"
-"\t\t\t<option value='BRL'>BRL</option>\n"
-"\t\t\t<option value='JPY'>JPY</option>\n"
-"\t\t\t<option value='MYR'>MYR</option>\n"
-"\t\t\t<option value='PHP'>PHP</option>\n"
-"\t\t\t<option value='SGD'>SGD</option>\n"
-"\t\t\t<option value='TWD'>TWD</option>\n"
-"\t\t\t<option value='THB'>THB</option>\n"
-"\t</select>\n"
-"\t<br/>\n"
-"\t<input type=\"radio\" name=\"p3\" value=\"1\" id=\"sub_m\" checked=\"checked\" /><label for=\"sub_m\">monthly</label>\n"
-"\t<input type=\"radio\" name=\"p3\" value=\"3\" id=\"sub_q\"/><label for=\"sub_q\">quarterly</label>\n"
-"\t<input type=\"radio\" name=\"p3\" value=\"12\" id=\"sub_y\"/><label for=\"sub_y\">yearly</label>\n"
-"\t<br/>\n"
-"\t<input type=\"submit\" value=\"Subscribe\" class=\"button\" />\n"
-"</form>\n"
-msgstr ""
-
-#. type: Title ###
-#, no-wrap
-msgid "Make a one-time donation"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<form action='https://www.paypal.com/cgi-bin/webscr' id='paypalForm' method='post' target='_blank' class='donation'>\n"
-"\t<input name='cmd' type='hidden' value='_donations' />\n"
-"\t<input name='business' type='hidden' value='tails@torservers.net' />\n"
-"\t<input name='item_name' type='hidden' value='Tails one-time donation' />\n"
-"\t<input type=\"hidden\" name=\"no_shipping\" value=\"1\"/>\n"
-"\t<input name=\"lc\" type=\"hidden\" value=\"US\" />\n"
-"\t<input type=\"radio\" name=\"amount\" value=\"5\" id=\"pp_5\" /><label for=\"pp_5\">5</label>\n"
-"\t<input type=\"radio\" name=\"amount\" value=\"10\" id=\"pp_10\"/><label for=\"pp_10\">10</label>\n"
-"\t<input type=\"radio\" name=\"amount\" value=\"20\" id=\"pp_20\"/><label for=\"pp_20\">20</label>\n"
-"\t<input type=\"radio\" name=\"amount\" value=\"50\" id=\"pp_50\"/><label for=\"pp_50\">50</label>\n"
-"\t<input type=\"radio\" name=\"amount\" value=\"100\" id=\"pp_100\"/><label for=\"pp_100\">100</label>\n"
-"\t<input type=\"radio\" name=\"amount\" value=\"\" id=\"pp_cust\" checked=\"checked\"/><label for=\"pp_cust\">custom amount</label>\n"
-"\t<select name=\"currency_code\">\n"
-"\t\t<option value='EUR'>EUR</option>\n"
-"\t\t<option value='USD'>USD</option>\n"
-"\t\t<option value='GBP'>GBP</option>\n"
-"\t\t<option value='CAD'>CAD</option>\n"
-"\t\t<option value='AUD'>AUD</option>\n"
-"\t\t<option value='NZD'>NZD</option>\n"
-"\t\t<option value='SEK'>SEK</option>\n"
-"\t\t<option value='CZK'>CZK</option>\n"
-"\t\t<option value='PLN'>PLN</option>\n"
-"\t\t<option value='DKK'>DKK</option>\n"
-"\t\t<option value='NOK'>NOK</option>\n"
-"\t\t<option value='MXN'>MXN</option>\n"
-"\t\t<option value='CHF'>CHF</option>\n"
-"\t\t<option value='HKD'>HKD</option>\n"
-"\t\t<option value='HUF'>HUF</option>\n"
-"\t\t<option value='ILS'>ILS</option>\n"
-"\t\t<option value='BRL'>BRL</option>\n"
-"\t\t<option value='JPY'>JPY</option>\n"
-"\t\t<option value='MYR'>MYR</option>\n"
-"\t\t<option value='PHP'>PHP</option>\n"
-"\t\t<option value='SGD'>SGD</option>\n"
-"\t\t<option value='TWD'>TWD</option>\n"
-"\t\t<option value='THB'>THB</option>\n"
-"\t</select>\n"
-"\t<br/>\n"
-"\t<input type=\"submit\" value=\"Donate\" class=\"button\" />\n"
-"</form>\n"
-msgstr ""
-
-#. type: Title =
-#, no-wrap
-msgid "How does Tails use this money?\n"
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"Our [[financial documents|doc/about/finances]] are available for your review."
-msgstr ""
diff --git a/wiki/src/contribute/how/donate.fr.po b/wiki/src/contribute/how/donate.fr.po
deleted file mode 100644
index 1df859f..0000000
--- a/wiki/src/contribute/how/donate.fr.po
+++ /dev/null
@@ -1,415 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2016-03-21 18:14+0100\n"
-"PO-Revision-Date: 2016-06-19 11:15-0000\n"
-"Last-Translator: \n"
-"Language-Team: Tails translators <tails@boum.org>\n"
-"Language: fr\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.10\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"Make a donation\"]]\n"
-msgstr "[[!meta title=\"Faire un don\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"Tails is free because <strong>nobody should have to pay to be safe\n"
-"while using computers</strong>. But Tails cannot stay alive without\n"
-"money and <strong>we need your help</strong>!\n"
-msgstr ""
-"Tails est gratuit car <strong>personne ne devrait avoir à payer pour être en\n"
-"sécurité lors de l'utilisation d'ordinateurs</strong>. Cela dit, Tails ne peut\n"
-"pas survivre sans argent et <strong>nous avons besoin de votre aide </strong>!\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<strong>[[Discover who you are helping around the world when\n"
-"donating to Tails.|news/who_are_you_helping]]</strong>\n"
-msgstr ""
-"<strong>[[Découvrez qui vous aidez, à travers le monde, lorsque vous faites un\n"
-"don à Tails.|news/who_are_you_helping]]</strong>\n"
-
-#. type: Plain text
-msgid ""
-"Note that Tails is a project mainly run by volunteers. There are [[many "
-"other ways to contribute|contribute]]!"
-msgstr ""
-"Notez que le projet Tails est principalement maintenu par des bénévoles. Il "
-"y a [[de nombreuses autres façons de contribuer|contribute]] !"
-
-#. type: Title =
-#, no-wrap
-msgid "Ways to donate\n"
-msgstr "Comment faire un don\n"
-
-#. type: Bullet: ' * '
-msgid ""
-"Crowdfunding campaign run by the American organization [Freedom of the Press "
-"Foundation](https://pressfreedomfoundation.org/bundle/encryption-tools-"
-"journalists)."
-msgstr ""
-"Contribuer à la campagne de financement organisée par l'association états-"
-"unienne [Freedom of the Press Foundation](https://pressfreedomfoundation.org/"
-"bundle/encryption-tools-journalists)."
-
-#. type: Plain text
-#, no-wrap
-msgid " If you live in the US, your donation will be tax-deductible.\n"
-msgstr " Si vous habitez aux États-Unis, votre don sera déductible d'impôts.\n"
-
-#. type: Bullet: ' * '
-msgid ""
-"[[Bank wire transfer|donate#swift]] or [[Paypal|donate#paypal]] through the "
-"German organization [Zwiebelfreunde e.V.](https://www.zwiebelfreunde.de/)."
-msgstr ""
-"[[Virement bancaire|donate#swift]] ou [[Paypal|donate#paypal]] via "
-"l'association allemande [Zwiebelfreunde e.V.](https://www.zwiebelfreunde."
-"de/)."
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" If you live in Europe, your donation might be tax-deductible. Check what are\n"
-" the precise conditions in your country, and [ask\n"
-" Zwiebelfreunde](https://www.torservers.net/contact.html) for a donation\n"
-" receipt if you need one.\n"
-msgstr ""
-" Si vous habitez en Europe, votre don peut être déductible d'impôts. Vérifiez les\n"
-" conditions en vigueur dans votre pays et, au besoin, [demandez un reçu à\n"
-" Zwiebelfreunde](https://www.torservers.net/contact.html).\n"
-
-#. type: Bullet: ' * '
-msgid "[[Bitcoin|donate#bitcoin]]"
-msgstr "[[Bitcoin|donate#bitcoin]]"
-
-#. type: Bullet: ' * '
-msgid ""
-"[Flattr](https://flattr.com/submit/auto?user_id=tails_live&url=https://tails."
-"boum.org&title=Tails)"
-msgstr ""
-"[Flattr](https://flattr.com/submit/auto?user_id=tails_live&url=https://tails."
-"boum.org&title=Tails)"
-
-#. type: Bullet: ' * '
-msgid ""
-"For fundraising related matters, you can write to [[tails-accounting@boum."
-"org|about/contact#tails-accounting]]."
-msgstr ""
-"Pour des questions relatives à la collecte de fonds, vous pouvez écrire à "
-"[[tails-accounting@boum.org|about/contact#tails-accounting]]."
-
-#. type: Bullet: ' * '
-msgid ""
-"If none of these methods suit you, consider [donating to the Tor Project]"
-"(https://www.torproject.org/donate/). They do great work, and also support "
-"us financially."
-msgstr ""
-"Si aucun de ces moyens ne vous convient, vous pouvez [faire un don au projet "
-"Tor](https://www.torproject.org/donate/). Ils font un travail formidable et "
-"nous soutiennent financièrement."
-
-#. type: Plain text
-msgid "Thank you for your donation!"
-msgstr "Merci pour votre don !"
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"bitcoin\"></a>\n"
-msgstr "<a id=\"bitcoin\"></a>\n"
-
-#. type: Title -
-#, no-wrap
-msgid "Bitcoin\n"
-msgstr "Bitcoin\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "You can send Bitcoins to **<a href=\"bitcoin:1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2\">1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2</a>**.\n"
-msgstr "Vous pouvez envoyer des Bitcoins à l'adresse **<a href=\"bitcoin:1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2\">1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2</a>**.\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"caution\">\n"
-msgstr "<div class=\"caution\">\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>Bitcoin is <a href=\"https://bitcoin.org/en/faq#is-bitcoin-anonymous\">not\n"
-"anonymous</a>.</p>\n"
-msgstr ""
-"<p>Bitcoin n'est <a href=\"https://bitcoin.org/fr/faq#bitcoin-est-il-anonyme\">pas\n"
-"anonyme</a>.</p>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
-msgstr "</div>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"swift\"></a>\n"
-msgstr "<a id=\"swift\"></a>\n"
-
-#. type: Title -
-#, no-wrap
-msgid "Bank wire transfer\n"
-msgstr "Virement bancaire\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" Account holder: Zwiebelfreunde e.V.\n"
-" Name of bank: GLS Gemeinschaftsbank eG\n"
-" IBAN: DE25430609671126825603\n"
-" BIC: GENODEM1GLS\n"
-" Address of bank: Christstrasse 9, 44789 Bochum, Germany\n"
-msgstr ""
-" Titulaire du compte : Zwiebelfreunde e.V.\n"
-" Nom de la banque : GLS Gemeinschaftsbank eG\n"
-" IBAN : DE25430609671126825603\n"
-" BIC : GENODEM1GLS\n"
-" Adresse de la banque : Christstrasse 9, 44789 Bochum, Allemagne\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"paypal\"></a>\n"
-msgstr "<a id=\"paypal\"></a>\n"
-
-#. type: Title -
-#, no-wrap
-msgid "Paypal\n"
-msgstr "Paypal\n"
-
-#. type: Plain text
-msgid ""
-"Please, use the euro (EUR) as currency as this makes accounting easier. "
-"However, Paypal automatically converts it to your local currency."
-msgstr ""
-"Merci d'utiliser l'euro (EUR) pour faciliter notre comptabilité. Paypal "
-"convertira automatiquement le don dans votre devise."
-
-#. type: Title ###
-#, no-wrap
-msgid "Set up a recurring donation"
-msgstr "Faire un don régulier"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<form action=\"https://www.paypal.com/cgi-bin/webscr\" method=\"post\" target='_blank' class='donation'>\n"
-"\t<input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\"/>\n"
-"\t<input type=\"hidden\" name=\"business\" value=\"tails@torservers.net\"/>\n"
-"\t<input type=\"hidden\" name=\"item_name\" value=\"Tails recurring donation\"/>\n"
-"\t<input type=\"hidden\" name=\"no_note\" value=\"1\"/>\n"
-"\t<input type=\"hidden\" name=\"src\" value=\"1\"/>\n"
-"\t<input type=\"hidden\" name=\"modify\" value=\"1\"/>\n"
-"\t<input type=\"hidden\" name=\"t3\" value=\"M\"/>\n"
-"\t<input name=\"lc\" type=\"hidden\" value=\"US\" />\n"
-"\t<input type=\"radio\" name=\"a3\" value=\"5\" id=\"sub5\" checked=\"checked\" /><label for=\"sub5\">5</label>\n"
-"\t<input type=\"radio\" name=\"a3\" value=\"10\" id=\"sub10\"/><label for=\"sub10\">10</label>\n"
-"\t<input type=\"radio\" name=\"a3\" value=\"20\" id=\"sub20\"/><label for=\"sub20\">20</label>\n"
-"\t<input type=\"radio\" name=\"a3\" value=\"50\" id=\"sub50\"/><label for=\"sub50\">50</label>\n"
-"\t<input type=\"radio\" name=\"a3\" value=\"100\" id=\"sub100\"/><label for=\"sub100\">100</label>\n"
-"\t<input type=\"radio\" name=\"a3\" value=\"250\" id=\"sub250\"/><label for=\"sub250\">250</label>\n"
-"\t<input type=\"radio\" name=\"a3\" value=\"500\" id=\"sub500\"/><label for=\"sub500\">500</label>\n"
-"\t<select name=\"currency_code\">\n"
-"\t\t\t<option value='EUR'>EUR</option>\n"
-"\t\t\t<option value='USD'>USD</option>\n"
-"\t\t\t<option value='GBP'>GBP</option>\n"
-"\t\t\t<option value='CAD'>CAD</option>\n"
-"\t\t\t<option value='AUD'>AUD</option>\n"
-"\t\t\t<option value='NZD'>NZD</option>\n"
-"\t\t\t<option value='SEK'>SEK</option>\n"
-"\t\t\t<option value='CZK'>CZK</option>\n"
-"\t\t\t<option value='PLN'>PLN</option>\n"
-"\t\t\t<option value='DKK'>DKK</option>\n"
-"\t\t\t<option value='NOK'>NOK</option>\n"
-"\t\t\t<option value='MXN'>MXN</option>\n"
-"\t\t\t<option value='CHF'>CHF</option>\n"
-"\t\t\t<option value='HKD'>HKD</option>\n"
-"\t\t\t<option value='HUF'>HUF</option>\n"
-"\t\t\t<option value='ILS'>ILS</option>\n"
-"\t\t\t<option value='BRL'>BRL</option>\n"
-"\t\t\t<option value='JPY'>JPY</option>\n"
-"\t\t\t<option value='MYR'>MYR</option>\n"
-"\t\t\t<option value='PHP'>PHP</option>\n"
-"\t\t\t<option value='SGD'>SGD</option>\n"
-"\t\t\t<option value='TWD'>TWD</option>\n"
-"\t\t\t<option value='THB'>THB</option>\n"
-"\t</select>\n"
-"\t<br/>\n"
-"\t<input type=\"radio\" name=\"p3\" value=\"1\" id=\"sub_m\" checked=\"checked\" /><label for=\"sub_m\">monthly</label>\n"
-"\t<input type=\"radio\" name=\"p3\" value=\"3\" id=\"sub_q\"/><label for=\"sub_q\">quarterly</label>\n"
-"\t<input type=\"radio\" name=\"p3\" value=\"12\" id=\"sub_y\"/><label for=\"sub_y\">yearly</label>\n"
-"\t<br/>\n"
-"\t<input type=\"submit\" value=\"Subscribe\" class=\"button\" />\n"
-"</form>\n"
-msgstr ""
-"<form action=\"https://www.paypal.com/cgi-bin/webscr\" method=\"post\" target='_blank' class='donation'>\n"
-"\t<input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\"/>\n"
-"\t<input type=\"hidden\" name=\"business\" value=\"tails@torservers.net\"/>\n"
-"\t<input type=\"hidden\" name=\"item_name\" value=\"Tails recurring donation\"/>\n"
-"\t<input type=\"hidden\" name=\"no_note\" value=\"1\"/>\n"
-"\t<input type=\"hidden\" name=\"src\" value=\"1\"/>\n"
-"\t<input type=\"hidden\" name=\"modify\" value=\"1\"/>\n"
-"\t<input type=\"hidden\" name=\"t3\" value=\"M\"/>\n"
-"\t<input name=\"lc\" type=\"hidden\" value=\"US\" />\n"
-"\t<input type=\"radio\" name=\"a3\" value=\"5\" id=\"sub5\" checked=\"checked\" /><label for=\"sub5\">5</label>\n"
-"\t<input type=\"radio\" name=\"a3\" value=\"10\" id=\"sub10\"/><label for=\"sub10\">10</label>\n"
-"\t<input type=\"radio\" name=\"a3\" value=\"20\" id=\"sub20\"/><label for=\"sub20\">20</label>\n"
-"\t<input type=\"radio\" name=\"a3\" value=\"50\" id=\"sub50\"/><label for=\"sub50\">50</label>\n"
-"\t<input type=\"radio\" name=\"a3\" value=\"100\" id=\"sub100\"/><label for=\"sub100\">100</label>\n"
-"\t<input type=\"radio\" name=\"a3\" value=\"250\" id=\"sub250\"/><label for=\"sub250\">250</label>\n"
-"\t<input type=\"radio\" name=\"a3\" value=\"500\" id=\"sub500\"/><label for=\"sub500\">500</label>\n"
-"\t<select name=\"currency_code\">\n"
-"\t\t\t<option value='EUR'>EUR</option>\n"
-"\t\t\t<option value='USD'>USD</option>\n"
-"\t\t\t<option value='GBP'>GBP</option>\n"
-"\t\t\t<option value='CAD'>CAD</option>\n"
-"\t\t\t<option value='AUD'>AUD</option>\n"
-"\t\t\t<option value='NZD'>NZD</option>\n"
-"\t\t\t<option value='SEK'>SEK</option>\n"
-"\t\t\t<option value='CZK'>CZK</option>\n"
-"\t\t\t<option value='PLN'>PLN</option>\n"
-"\t\t\t<option value='DKK'>DKK</option>\n"
-"\t\t\t<option value='NOK'>NOK</option>\n"
-"\t\t\t<option value='MXN'>MXN</option>\n"
-"\t\t\t<option value='CHF'>CHF</option>\n"
-"\t\t\t<option value='HKD'>HKD</option>\n"
-"\t\t\t<option value='HUF'>HUF</option>\n"
-"\t\t\t<option value='ILS'>ILS</option>\n"
-"\t\t\t<option value='BRL'>BRL</option>\n"
-"\t\t\t<option value='JPY'>JPY</option>\n"
-"\t\t\t<option value='MYR'>MYR</option>\n"
-"\t\t\t<option value='PHP'>PHP</option>\n"
-"\t\t\t<option value='SGD'>SGD</option>\n"
-"\t\t\t<option value='TWD'>TWD</option>\n"
-"\t\t\t<option value='THB'>THB</option>\n"
-"\t</select>\n"
-"\t<br/>\n"
-"\t<input type=\"radio\" name=\"p3\" value=\"1\" id=\"sub_m\" checked=\"checked\" /><label for=\"sub_m\">mensuel</label>\n"
-"\t<input type=\"radio\" name=\"p3\" value=\"3\" id=\"sub_q\"/><label for=\"sub_q\">trimestriel</label>\n"
-"\t<input type=\"radio\" name=\"p3\" value=\"12\" id=\"sub_y\"/><label for=\"sub_y\">annuel</label>\n"
-"\t<br/>\n"
-"\t<input type=\"submit\" value=\"Souscrire\" class=\"button\" />\n"
-"</form>\n"
-
-#. type: Title ###
-#, no-wrap
-msgid "Make a one-time donation"
-msgstr "Faire un don ponctuel"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<form action='https://www.paypal.com/cgi-bin/webscr' id='paypalForm' method='post' target='_blank' class='donation'>\n"
-"\t<input name='cmd' type='hidden' value='_donations' />\n"
-"\t<input name='business' type='hidden' value='tails@torservers.net' />\n"
-"\t<input name='item_name' type='hidden' value='Tails one-time donation' />\n"
-"\t<input type=\"hidden\" name=\"no_shipping\" value=\"1\"/>\n"
-"\t<input name=\"lc\" type=\"hidden\" value=\"US\" />\n"
-"\t<input type=\"radio\" name=\"amount\" value=\"5\" id=\"pp_5\" /><label for=\"pp_5\">5</label>\n"
-"\t<input type=\"radio\" name=\"amount\" value=\"10\" id=\"pp_10\"/><label for=\"pp_10\">10</label>\n"
-"\t<input type=\"radio\" name=\"amount\" value=\"20\" id=\"pp_20\"/><label for=\"pp_20\">20</label>\n"
-"\t<input type=\"radio\" name=\"amount\" value=\"50\" id=\"pp_50\"/><label for=\"pp_50\">50</label>\n"
-"\t<input type=\"radio\" name=\"amount\" value=\"100\" id=\"pp_100\"/><label for=\"pp_100\">100</label>\n"
-"\t<input type=\"radio\" name=\"amount\" value=\"\" id=\"pp_cust\" checked=\"checked\"/><label for=\"pp_cust\">custom amount</label>\n"
-"\t<select name=\"currency_code\">\n"
-"\t\t<option value='EUR'>EUR</option>\n"
-"\t\t<option value='USD'>USD</option>\n"
-"\t\t<option value='GBP'>GBP</option>\n"
-"\t\t<option value='CAD'>CAD</option>\n"
-"\t\t<option value='AUD'>AUD</option>\n"
-"\t\t<option value='NZD'>NZD</option>\n"
-"\t\t<option value='SEK'>SEK</option>\n"
-"\t\t<option value='CZK'>CZK</option>\n"
-"\t\t<option value='PLN'>PLN</option>\n"
-"\t\t<option value='DKK'>DKK</option>\n"
-"\t\t<option value='NOK'>NOK</option>\n"
-"\t\t<option value='MXN'>MXN</option>\n"
-"\t\t<option value='CHF'>CHF</option>\n"
-"\t\t<option value='HKD'>HKD</option>\n"
-"\t\t<option value='HUF'>HUF</option>\n"
-"\t\t<option value='ILS'>ILS</option>\n"
-"\t\t<option value='BRL'>BRL</option>\n"
-"\t\t<option value='JPY'>JPY</option>\n"
-"\t\t<option value='MYR'>MYR</option>\n"
-"\t\t<option value='PHP'>PHP</option>\n"
-"\t\t<option value='SGD'>SGD</option>\n"
-"\t\t<option value='TWD'>TWD</option>\n"
-"\t\t<option value='THB'>THB</option>\n"
-"\t</select>\n"
-"\t<br/>\n"
-"\t<input type=\"submit\" value=\"Donate\" class=\"button\" />\n"
-"</form>\n"
-msgstr ""
-"<form action='https://www.paypal.com/cgi-bin/webscr' id='paypalForm' method='post' target='_blank' class='donation'>\n"
-"\t<input name='cmd' type='hidden' value='_donations' />\n"
-"\t<input name='business' type='hidden' value='tails@torservers.net' />\n"
-"\t<input name='item_name' type='hidden' value='Tails one-time donation' />\n"
-"\t<input type=\"hidden\" name=\"no_shipping\" value=\"1\"/>\n"
-"\t<input name=\"lc\" type=\"hidden\" value=\"US\" />\n"
-"\t<input type=\"radio\" name=\"amount\" value=\"5\" id=\"pp_5\" /><label for=\"pp_5\">5</label>\n"
-"\t<input type=\"radio\" name=\"amount\" value=\"10\" id=\"pp_10\"/><label for=\"pp_10\">10</label>\n"
-"\t<input type=\"radio\" name=\"amount\" value=\"20\" id=\"pp_20\"/><label for=\"pp_20\">20</label>\n"
-"\t<input type=\"radio\" name=\"amount\" value=\"50\" id=\"pp_50\"/><label for=\"pp_50\">50</label>\n"
-"\t<input type=\"radio\" name=\"amount\" value=\"100\" id=\"pp_100\"/><label for=\"pp_100\">100</label>\n"
-"\t<input type=\"radio\" name=\"amount\" value=\"\" id=\"pp_cust\" checked=\"checked\"/><label for=\"pp_cust\">autre montant</label>\n"
-"\t<select name=\"currency_code\">\n"
-"\t\t<option value='EUR'>EUR</option>\n"
-"\t\t<option value='USD'>USD</option>\n"
-"\t\t<option value='GBP'>GBP</option>\n"
-"\t\t<option value='CAD'>CAD</option>\n"
-"\t\t<option value='AUD'>AUD</option>\n"
-"\t\t<option value='NZD'>NZD</option>\n"
-"\t\t<option value='SEK'>SEK</option>\n"
-"\t\t<option value='CZK'>CZK</option>\n"
-"\t\t<option value='PLN'>PLN</option>\n"
-"\t\t<option value='DKK'>DKK</option>\n"
-"\t\t<option value='NOK'>NOK</option>\n"
-"\t\t<option value='MXN'>MXN</option>\n"
-"\t\t<option value='CHF'>CHF</option>\n"
-"\t\t<option value='HKD'>HKD</option>\n"
-"\t\t<option value='HUF'>HUF</option>\n"
-"\t\t<option value='ILS'>ILS</option>\n"
-"\t\t<option value='BRL'>BRL</option>\n"
-"\t\t<option value='JPY'>JPY</option>\n"
-"\t\t<option value='MYR'>MYR</option>\n"
-"\t\t<option value='PHP'>PHP</option>\n"
-"\t\t<option value='SGD'>SGD</option>\n"
-"\t\t<option value='TWD'>TWD</option>\n"
-"\t\t<option value='THB'>THB</option>\n"
-"\t</select>\n"
-"\t<br/>\n"
-"\t<input type=\"submit\" value=\"Donner\" class=\"button\" />\n"
-"</form>\n"
-
-#. type: Title =
-#, no-wrap
-msgid "How does Tails use this money?\n"
-msgstr "Comment Tails utilise cet argent ?\n"
-
-#. type: Plain text
-msgid ""
-"Our [[financial documents|doc/about/finances]] are available for your review."
-msgstr "Vous pouvez consulter nos [[rapports financiers|doc/about/finances]]."
-
-#~ msgid ""
-#~ "**Your support is critical to our success.** Consider making\n"
-#~ "a donation to Tails.\n"
-#~ msgstr ""
-#~ "**Votre soutien est essentiel.** Envisagez de faire\n"
-#~ "un don à Tails.\n"
diff --git a/wiki/src/contribute/how/donate.it.po b/wiki/src/contribute/how/donate.it.po
deleted file mode 100644
index cd408bb..0000000
--- a/wiki/src/contribute/how/donate.it.po
+++ /dev/null
@@ -1,288 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-05-17 09:40+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: ita <transitails@inventati.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"Make a donation\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"Tails is free because <strong>nobody should have to pay to be safe\n"
-"while using computers</strong>. But Tails cannot stay alive without\n"
-"money and <strong>we need your help</strong>!\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<strong>[[Discover who you are helping around the world when\n"
-"donating to Tails.|news/who_are_you_helping]]</strong>\n"
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"Note that Tails is a project mainly run by volunteers. There are [[many "
-"other ways to contribute|contribute]]!"
-msgstr ""
-
-#. type: Title =
-#, no-wrap
-msgid "Ways to donate\n"
-msgstr ""
-
-#. type: Bullet: ' * '
-msgid ""
-"Crowdfunding campaign run by the American organization [Freedom of the Press "
-"Foundation](https://pressfreedomfoundation.org/bundle/encryption-tools-"
-"journalists)."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " If you live in the US, your donation will be tax-deductible.\n"
-msgstr ""
-
-#. type: Bullet: ' * '
-msgid ""
-"[[Bank wire transfer|donate#swift]] or [[Paypal|donate#paypal]] through the "
-"German organization [Zwiebelfreunde e.V.](https://www.zwiebelfreunde.de/)."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" If you live in Europe, your donation might be tax-deductible. Check what are\n"
-" the precise conditions in your country, and [ask\n"
-" Zwiebelfreunde](https://www.torservers.net/contact.html) for a donation\n"
-" receipt if you need one.\n"
-msgstr ""
-
-#. type: Bullet: ' * '
-msgid "[[Bitcoin|donate#bitcoin]]"
-msgstr ""
-
-#. type: Bullet: ' * '
-msgid ""
-"[Flattr](https://flattr.com/submit/auto?user_id=tails_live&url=https://tails."
-"boum.org&title=Tails)"
-msgstr ""
-
-#. type: Bullet: ' * '
-msgid ""
-"For fundraising related matters, you can write to [[tails-accounting@boum."
-"org|about/contact#tails-accounting]]."
-msgstr ""
-
-#. type: Bullet: ' * '
-msgid ""
-"If none of these methods suit you, consider [donating to the Tor Project]"
-"(https://www.torproject.org/donate/). They do great work, and also support "
-"us financially."
-msgstr ""
-
-#. type: Plain text
-msgid "Thank you for your donation!"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"bitcoin\"></a>\n"
-msgstr ""
-
-#. type: Title -
-#, no-wrap
-msgid "Bitcoin\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "You can send Bitcoins to **<a href=\"bitcoin:1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2\">1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2</a>**.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"caution\">\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>Bitcoin is <a href=\"https://bitcoin.org/en/faq#is-bitcoin-anonymous\">not\n"
-"anonymous</a>.</p>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"swift\"></a>\n"
-msgstr ""
-
-#. type: Title -
-#, no-wrap
-msgid "Bank wire transfer\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" Account holder: Zwiebelfreunde e.V.\n"
-" Name of bank: GLS Gemeinschaftsbank eG\n"
-" IBAN: DE25430609671126825603\n"
-" BIC: GENODEM1GLS\n"
-" Address of bank: Christstrasse 9, 44789 Bochum, Germany\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"paypal\"></a>\n"
-msgstr ""
-
-#. type: Title -
-#, no-wrap
-msgid "Paypal\n"
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"Please, use the euro (EUR) as currency as this makes accounting easier. "
-"However, Paypal automatically converts it to your local currency."
-msgstr ""
-
-#. type: Title ###
-#, no-wrap
-msgid "Set up a recurring donation"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<form action=\"https://www.paypal.com/cgi-bin/webscr\" method=\"post\" target='_blank' class='donation'>\n"
-"\t<input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\"/>\n"
-"\t<input type=\"hidden\" name=\"business\" value=\"tails@torservers.net\"/>\n"
-"\t<input type=\"hidden\" name=\"item_name\" value=\"Tails recurring donation\"/>\n"
-"\t<input type=\"hidden\" name=\"no_note\" value=\"1\"/>\n"
-"\t<input type=\"hidden\" name=\"src\" value=\"1\"/>\n"
-"\t<input type=\"hidden\" name=\"modify\" value=\"1\"/>\n"
-"\t<input type=\"hidden\" name=\"t3\" value=\"M\"/>\n"
-"\t<input name=\"lc\" type=\"hidden\" value=\"US\" />\n"
-"\t<input type=\"radio\" name=\"a3\" value=\"5\" id=\"sub5\" checked=\"checked\" /><label for=\"sub5\">5</label>\n"
-"\t<input type=\"radio\" name=\"a3\" value=\"10\" id=\"sub10\"/><label for=\"sub10\">10</label>\n"
-"\t<input type=\"radio\" name=\"a3\" value=\"20\" id=\"sub20\"/><label for=\"sub20\">20</label>\n"
-"\t<input type=\"radio\" name=\"a3\" value=\"50\" id=\"sub50\"/><label for=\"sub50\">50</label>\n"
-"\t<input type=\"radio\" name=\"a3\" value=\"100\" id=\"sub100\"/><label for=\"sub100\">100</label>\n"
-"\t<input type=\"radio\" name=\"a3\" value=\"250\" id=\"sub250\"/><label for=\"sub250\">250</label>\n"
-"\t<input type=\"radio\" name=\"a3\" value=\"500\" id=\"sub500\"/><label for=\"sub500\">500</label>\n"
-"\t<select name=\"currency_code\">\n"
-"\t\t\t<option value='EUR'>EUR</option>\n"
-"\t\t\t<option value='USD'>USD</option>\n"
-"\t\t\t<option value='GBP'>GBP</option>\n"
-"\t\t\t<option value='CAD'>CAD</option>\n"
-"\t\t\t<option value='AUD'>AUD</option>\n"
-"\t\t\t<option value='NZD'>NZD</option>\n"
-"\t\t\t<option value='SEK'>SEK</option>\n"
-"\t\t\t<option value='CZK'>CZK</option>\n"
-"\t\t\t<option value='PLN'>PLN</option>\n"
-"\t\t\t<option value='DKK'>DKK</option>\n"
-"\t\t\t<option value='NOK'>NOK</option>\n"
-"\t\t\t<option value='MXN'>MXN</option>\n"
-"\t\t\t<option value='CHF'>CHF</option>\n"
-"\t\t\t<option value='HKD'>HKD</option>\n"
-"\t\t\t<option value='HUF'>HUF</option>\n"
-"\t\t\t<option value='ILS'>ILS</option>\n"
-"\t\t\t<option value='BRL'>BRL</option>\n"
-"\t\t\t<option value='JPY'>JPY</option>\n"
-"\t\t\t<option value='MYR'>MYR</option>\n"
-"\t\t\t<option value='PHP'>PHP</option>\n"
-"\t\t\t<option value='SGD'>SGD</option>\n"
-"\t\t\t<option value='TWD'>TWD</option>\n"
-"\t\t\t<option value='THB'>THB</option>\n"
-"\t</select>\n"
-"\t<br/>\n"
-"\t<input type=\"radio\" name=\"p3\" value=\"1\" id=\"sub_m\" checked=\"checked\" /><label for=\"sub_m\">monthly</label>\n"
-"\t<input type=\"radio\" name=\"p3\" value=\"3\" id=\"sub_q\"/><label for=\"sub_q\">quarterly</label>\n"
-"\t<input type=\"radio\" name=\"p3\" value=\"12\" id=\"sub_y\"/><label for=\"sub_y\">yearly</label>\n"
-"\t<br/>\n"
-"\t<input type=\"submit\" value=\"Subscribe\" class=\"button\" />\n"
-"</form>\n"
-msgstr ""
-
-#. type: Title ###
-#, no-wrap
-msgid "Make a one-time donation"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<form action='https://www.paypal.com/cgi-bin/webscr' id='paypalForm' method='post' target='_blank' class='donation'>\n"
-"\t<input name='cmd' type='hidden' value='_donations' />\n"
-"\t<input name='business' type='hidden' value='tails@torservers.net' />\n"
-"\t<input name='item_name' type='hidden' value='Tails one-time donation' />\n"
-"\t<input type=\"hidden\" name=\"no_shipping\" value=\"1\"/>\n"
-"\t<input name=\"lc\" type=\"hidden\" value=\"US\" />\n"
-"\t<input type=\"radio\" name=\"amount\" value=\"5\" id=\"pp_5\" /><label for=\"pp_5\">5</label>\n"
-"\t<input type=\"radio\" name=\"amount\" value=\"10\" id=\"pp_10\"/><label for=\"pp_10\">10</label>\n"
-"\t<input type=\"radio\" name=\"amount\" value=\"20\" id=\"pp_20\"/><label for=\"pp_20\">20</label>\n"
-"\t<input type=\"radio\" name=\"amount\" value=\"50\" id=\"pp_50\"/><label for=\"pp_50\">50</label>\n"
-"\t<input type=\"radio\" name=\"amount\" value=\"100\" id=\"pp_100\"/><label for=\"pp_100\">100</label>\n"
-"\t<input type=\"radio\" name=\"amount\" value=\"\" id=\"pp_cust\" checked=\"checked\"/><label for=\"pp_cust\">custom amount</label>\n"
-"\t<select name=\"currency_code\">\n"
-"\t\t<option value='EUR'>EUR</option>\n"
-"\t\t<option value='USD'>USD</option>\n"
-"\t\t<option value='GBP'>GBP</option>\n"
-"\t\t<option value='CAD'>CAD</option>\n"
-"\t\t<option value='AUD'>AUD</option>\n"
-"\t\t<option value='NZD'>NZD</option>\n"
-"\t\t<option value='SEK'>SEK</option>\n"
-"\t\t<option value='CZK'>CZK</option>\n"
-"\t\t<option value='PLN'>PLN</option>\n"
-"\t\t<option value='DKK'>DKK</option>\n"
-"\t\t<option value='NOK'>NOK</option>\n"
-"\t\t<option value='MXN'>MXN</option>\n"
-"\t\t<option value='CHF'>CHF</option>\n"
-"\t\t<option value='HKD'>HKD</option>\n"
-"\t\t<option value='HUF'>HUF</option>\n"
-"\t\t<option value='ILS'>ILS</option>\n"
-"\t\t<option value='BRL'>BRL</option>\n"
-"\t\t<option value='JPY'>JPY</option>\n"
-"\t\t<option value='MYR'>MYR</option>\n"
-"\t\t<option value='PHP'>PHP</option>\n"
-"\t\t<option value='SGD'>SGD</option>\n"
-"\t\t<option value='TWD'>TWD</option>\n"
-"\t\t<option value='THB'>THB</option>\n"
-"\t</select>\n"
-"\t<br/>\n"
-"\t<input type=\"submit\" value=\"Donate\" class=\"button\" />\n"
-"</form>\n"
-msgstr ""
-
-#. type: Title =
-#, no-wrap
-msgid "How does Tails use this money?\n"
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"Our [[financial documents|doc/about/finances]] are available for your review."
-msgstr ""
diff --git a/wiki/src/contribute/how/donate.mdwn b/wiki/src/contribute/how/donate.mdwn
deleted file mode 100644
index 5879393..0000000
--- a/wiki/src/contribute/how/donate.mdwn
+++ /dev/null
@@ -1,172 +0,0 @@
-[[!meta title="Make a donation"]]
-
-Tails is free because <strong>nobody should have to pay to be safe
-while using computers</strong>. But Tails cannot stay alive without
-money and <strong>we need your help</strong>!
-
-<strong>[[Discover who you are helping around the world when
-donating to Tails.|news/who_are_you_helping]]</strong>
-
-Note that Tails is a project mainly run by volunteers. There are
-[[many other ways to contribute|contribute]]!
-
-Ways to donate
-==============
-
- * Crowdfunding campaign run by the American organization [Freedom of the Press Foundation](https://pressfreedomfoundation.org/bundle/encryption-tools-journalists).
-
- If you live in the US, your donation will be tax-deductible.
-
- * [[Bank wire transfer|donate#swift]] or [[Paypal|donate#paypal]] through the
- German organization [Zwiebelfreunde e.V.](https://www.zwiebelfreunde.de/).
-
- If you live in Europe, your donation might be tax-deductible. Check what are
- the precise conditions in your country, and [ask
- Zwiebelfreunde](https://www.torservers.net/contact.html) for a donation
- receipt if you need one.
-
- * [[Bitcoin|donate#bitcoin]]
-
- * [Flattr](https://flattr.com/submit/auto?user_id=tails_live&url=https://tails.boum.org&title=Tails)
-
- * For fundraising related matters, you can write
- to [[tails-accounting@boum.org|about/contact#tails-accounting]].
-
- * If none of these methods suit you, consider [donating
- to the Tor Project](https://www.torproject.org/donate/). They do
- great work, and also support us financially.
-
-Thank you for your donation!
-
-<a id="bitcoin"></a>
-
-Bitcoin
--------
-
-You can send Bitcoins to **<a href="bitcoin:1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2">1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2</a>**.
-
-<div class="caution">
-
-<p>Bitcoin is <a href="https://bitcoin.org/en/faq#is-bitcoin-anonymous">not
-anonymous</a>.</p>
-
-</div>
-
-<a id="swift"></a>
-
-Bank wire transfer
-------------------
-
- Account holder: Zwiebelfreunde e.V.
- Name of bank: GLS Gemeinschaftsbank eG
- IBAN: DE25430609671126825603
- BIC: GENODEM1GLS
- Address of bank: Christstrasse 9, 44789 Bochum, Germany
-
-<a id="paypal"></a>
-
-Paypal
-------
-
-Please, use the euro (EUR) as currency as this makes accounting easier. However, Paypal
-automatically converts it to your local currency.
-
-### Set up a recurring donation
-
-<form action="https://www.paypal.com/cgi-bin/webscr" method="post" target='_blank' class='donation'>
- <input type="hidden" name="cmd" value="_xclick-subscriptions"/>
- <input type="hidden" name="business" value="tails@torservers.net"/>
- <input type="hidden" name="item_name" value="Tails recurring donation"/>
- <input type="hidden" name="no_note" value="1"/>
- <input type="hidden" name="src" value="1"/>
- <input type="hidden" name="modify" value="1"/>
- <input type="hidden" name="t3" value="M"/>
- <input name="lc" type="hidden" value="US" />
- <input type="radio" name="a3" value="5" id="sub5" checked="checked" /><label for="sub5">5</label>
- <input type="radio" name="a3" value="10" id="sub10"/><label for="sub10">10</label>
- <input type="radio" name="a3" value="20" id="sub20"/><label for="sub20">20</label>
- <input type="radio" name="a3" value="50" id="sub50"/><label for="sub50">50</label>
- <input type="radio" name="a3" value="100" id="sub100"/><label for="sub100">100</label>
- <input type="radio" name="a3" value="250" id="sub250"/><label for="sub250">250</label>
- <input type="radio" name="a3" value="500" id="sub500"/><label for="sub500">500</label>
- <select name="currency_code">
- <option value='EUR'>EUR</option>
- <option value='USD'>USD</option>
- <option value='GBP'>GBP</option>
- <option value='CAD'>CAD</option>
- <option value='AUD'>AUD</option>
- <option value='NZD'>NZD</option>
- <option value='SEK'>SEK</option>
- <option value='CZK'>CZK</option>
- <option value='PLN'>PLN</option>
- <option value='DKK'>DKK</option>
- <option value='NOK'>NOK</option>
- <option value='MXN'>MXN</option>
- <option value='CHF'>CHF</option>
- <option value='HKD'>HKD</option>
- <option value='HUF'>HUF</option>
- <option value='ILS'>ILS</option>
- <option value='BRL'>BRL</option>
- <option value='JPY'>JPY</option>
- <option value='MYR'>MYR</option>
- <option value='PHP'>PHP</option>
- <option value='SGD'>SGD</option>
- <option value='TWD'>TWD</option>
- <option value='THB'>THB</option>
- </select>
- <br/>
- <input type="radio" name="p3" value="1" id="sub_m" checked="checked" /><label for="sub_m">monthly</label>
- <input type="radio" name="p3" value="3" id="sub_q"/><label for="sub_q">quarterly</label>
- <input type="radio" name="p3" value="12" id="sub_y"/><label for="sub_y">yearly</label>
- <br/>
- <input type="submit" value="Subscribe" class="button" />
-</form>
-
-### Make a one-time donation
-
-<form action='https://www.paypal.com/cgi-bin/webscr' id='paypalForm' method='post' target='_blank' class='donation'>
- <input name='cmd' type='hidden' value='_donations' />
- <input name='business' type='hidden' value='tails@torservers.net' />
- <input name='item_name' type='hidden' value='Tails one-time donation' />
- <input type="hidden" name="no_shipping" value="1"/>
- <input name="lc" type="hidden" value="US" />
- <input type="radio" name="amount" value="5" id="pp_5" /><label for="pp_5">5</label>
- <input type="radio" name="amount" value="10" id="pp_10"/><label for="pp_10">10</label>
- <input type="radio" name="amount" value="20" id="pp_20"/><label for="pp_20">20</label>
- <input type="radio" name="amount" value="50" id="pp_50"/><label for="pp_50">50</label>
- <input type="radio" name="amount" value="100" id="pp_100"/><label for="pp_100">100</label>
- <input type="radio" name="amount" value="" id="pp_cust" checked="checked"/><label for="pp_cust">custom amount</label>
- <select name="currency_code">
- <option value='EUR'>EUR</option>
- <option value='USD'>USD</option>
- <option value='GBP'>GBP</option>
- <option value='CAD'>CAD</option>
- <option value='AUD'>AUD</option>
- <option value='NZD'>NZD</option>
- <option value='SEK'>SEK</option>
- <option value='CZK'>CZK</option>
- <option value='PLN'>PLN</option>
- <option value='DKK'>DKK</option>
- <option value='NOK'>NOK</option>
- <option value='MXN'>MXN</option>
- <option value='CHF'>CHF</option>
- <option value='HKD'>HKD</option>
- <option value='HUF'>HUF</option>
- <option value='ILS'>ILS</option>
- <option value='BRL'>BRL</option>
- <option value='JPY'>JPY</option>
- <option value='MYR'>MYR</option>
- <option value='PHP'>PHP</option>
- <option value='SGD'>SGD</option>
- <option value='TWD'>TWD</option>
- <option value='THB'>THB</option>
- </select>
- <br/>
- <input type="submit" value="Donate" class="button" />
-</form>
-
-How does Tails use this money?
-==============================
-
-Our [[financial documents|doc/about/finances]] are available for
-your review.
diff --git a/wiki/src/contribute/how/donate.pt.po b/wiki/src/contribute/how/donate.pt.po
deleted file mode 100644
index 8fb6360..0000000
--- a/wiki/src/contribute/how/donate.pt.po
+++ /dev/null
@@ -1,498 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-03-21 18:14+0100\n"
-"PO-Revision-Date: 2014-09-15 12:30-0300\n"
-"Last-Translator: Tails Developers <amnesia@boum.org>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"Make a donation\"]]\n"
-msgstr "[[!meta title=\"Faça uma doação\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"Tails is free because <strong>nobody should have to pay to be safe\n"
-"while using computers</strong>. But Tails cannot stay alive without\n"
-"money and <strong>we need your help</strong>!\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<strong>[[Discover who you are helping around the world when\n"
-"donating to Tails.|news/who_are_you_helping]]</strong>\n"
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"Note that Tails is a project mainly run by volunteers. There are [[many "
-"other ways to contribute|contribute]]!"
-msgstr ""
-"Note que Tails é um projeto executado principalmente por voluntários/as. "
-"Existem [[muitas outras formas de contribuir|contribute]]!"
-
-#. type: Title =
-#, no-wrap
-msgid "Ways to donate\n"
-msgstr "Formas de doação\n"
-
-#. type: Bullet: ' * '
-msgid ""
-"Crowdfunding campaign run by the American organization [Freedom of the Press "
-"Foundation](https://pressfreedomfoundation.org/bundle/encryption-tools-"
-"journalists)."
-msgstr ""
-"Campanha de financiamento coletivo coordenada pela organização americana "
-"[Freedom of the Press Foundation](https://pressfreedomfoundation.org/bundle/"
-"encryption-tools-journalists)."
-
-#. type: Plain text
-#, no-wrap
-msgid " If you live in the US, your donation will be tax-deductible.\n"
-msgstr " Se você vive nos Estados Unidos da América, sua doação será dedutível de impostos.\n"
-
-#. type: Bullet: ' * '
-msgid ""
-"[[Bank wire transfer|donate#swift]] or [[Paypal|donate#paypal]] through the "
-"German organization [Zwiebelfreunde e.V.](https://www.zwiebelfreunde.de/)."
-msgstr ""
-"[[Transferência bancária|donate#swift]] ou [[Paypal|donate#paypal]] através "
-"da organização alemã [Zwiebelfreunde e.V.](https://www.zwiebelfreunde.de/)."
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" If you live in Europe, your donation might be tax-deductible. Check what are\n"
-" the precise conditions in your country, and [ask\n"
-" Zwiebelfreunde](https://www.torservers.net/contact.html) for a donation\n"
-" receipt if you need one.\n"
-msgstr ""
-" Se você vive na Europa, é possível que sua doação seja dedutível de impostos. Verifique\n"
-" quais são exatamente as condições no seu país, e [peça à\n"
-" Zwiebelfreunde](https://www.torservers.net/contact.html) um recibo\n"
-" caso você precise de um.\n"
-
-#. type: Bullet: ' * '
-msgid "[[Bitcoin|donate#bitcoin]]"
-msgstr "[[Bitcoin|donate#bitcoin]]"
-
-#. type: Bullet: ' * '
-msgid ""
-"[Flattr](https://flattr.com/submit/auto?user_id=tails_live&url=https://tails."
-"boum.org&title=Tails)"
-msgstr ""
-
-#. type: Bullet: ' * '
-msgid ""
-"For fundraising related matters, you can write to [[tails-accounting@boum."
-"org|about/contact#tails-accounting]]."
-msgstr ""
-
-#. type: Bullet: ' * '
-msgid ""
-"If none of these methods suit you, consider [donating to the Tor Project]"
-"(https://www.torproject.org/donate/). They do great work, and also support "
-"us financially."
-msgstr ""
-"Se nenhum destes métodos são bons pra você, considere [fazer uma doação para "
-"o Projeto Tor](https://www.torproject.org/donate/). Eles fazem um ótimo "
-"trabalho, e também nos apoiam financeiramente."
-
-#. type: Plain text
-msgid "Thank you for your donation!"
-msgstr "Obrigado por sua doação!"
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"bitcoin\"></a>\n"
-msgstr "<a id=\"bitcoin\"></a>\n"
-
-#. type: Title -
-#, no-wrap
-msgid "Bitcoin\n"
-msgstr "Bitcoin\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "You can send Bitcoins to **<a href=\"bitcoin:1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2\">1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2</a>**.\n"
-msgstr "Você pode enviar Bitcoins para **<a href=\"bitcoin:1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2\">1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2</a>**.\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"caution\">\n"
-msgstr "<div class=\"caution\">\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>Bitcoin is <a href=\"https://bitcoin.org/en/faq#is-bitcoin-anonymous\">not\n"
-"anonymous</a>.</p>\n"
-msgstr ""
-"<p>Bitcoin <a href=\"https://bitcoin.org/pt_BR/faq#bitcoin-e-anonimo\">não\n"
-"é anônimo</a>.</p>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
-msgstr "</div>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"swift\"></a>\n"
-msgstr "<a id=\"swift\"></a>\n"
-
-#. type: Title -
-#, no-wrap
-msgid "Bank wire transfer\n"
-msgstr "Transferência bancária\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" Account holder: Zwiebelfreunde e.V.\n"
-" Name of bank: GLS Gemeinschaftsbank eG\n"
-" IBAN: DE25430609671126825603\n"
-" BIC: GENODEM1GLS\n"
-" Address of bank: Christstrasse 9, 44789 Bochum, Germany\n"
-msgstr ""
-" Titular da conta: Zwiebelfreunde e.V.\n"
-" Nome do banco: GLS Gemeinschaftsbank eG\n"
-" IBAN: DE25430609671126825603\n"
-" BIC: GENODEM1GLS\n"
-" Endereço do banco: Christstrasse 9, 44789 Bochum, Alemanha\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"paypal\"></a>\n"
-msgstr "<a id=\"paypal\"></a>\n"
-
-#. type: Title -
-#, no-wrap
-msgid "Paypal\n"
-msgstr "Paypal\n"
-
-#. type: Plain text
-msgid ""
-"Please, use the euro (EUR) as currency as this makes accounting easier. "
-"However, Paypal automatically converts it to your local currency."
-msgstr ""
-"Por favor, use euros (EUR) como moeda pois isto facilita nossa "
-"contabilidade. De qualquer forma, o Paypal converte automaticamente para sua "
-"moeda local."
-
-#. type: Title ###
-#, no-wrap
-msgid "Set up a recurring donation"
-msgstr "Configure uma doação periódica"
-
-#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<form action=\"https://www.paypal.com/cgi-bin/webscr\" method=\"post\" target='_blank' class='donation'>\n"
-#| "\t<input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\"/>\n"
-#| "\t<input type=\"hidden\" name=\"business\" value=\"donate@torservers.net\"/>\n"
-#| "\t<input type=\"hidden\" name=\"item_name\" value=\"Tails recurring donation\"/>\n"
-#| "\t<input type=\"hidden\" name=\"no_note\" value=\"1\"/>\n"
-#| "\t<input type=\"hidden\" name=\"src\" value=\"1\"/>\n"
-#| "\t<input type=\"hidden\" name=\"modify\" value=\"1\"/>\n"
-#| "\t<input type=\"hidden\" name=\"t3\" value=\"M\"/>\n"
-#| "\t<input name=\"lc\" type=\"hidden\" value=\"US\" />\n"
-#| "\t<input type=\"radio\" name=\"a3\" value=\"5\" id=\"sub5\" checked=\"checked\" /><label for=\"sub5\">5</label>\n"
-#| "\t<input type=\"radio\" name=\"a3\" value=\"10\" id=\"sub10\"/><label for=\"sub10\">10</label>\n"
-#| "\t<input type=\"radio\" name=\"a3\" value=\"20\" id=\"sub20\"/><label for=\"sub20\">20</label>\n"
-#| "\t<input type=\"radio\" name=\"a3\" value=\"50\" id=\"sub50\"/><label for=\"sub50\">50</label>\n"
-#| "\t<input type=\"radio\" name=\"a3\" value=\"100\" id=\"sub100\"/><label for=\"sub100\">100</label>\n"
-#| "\t<input type=\"radio\" name=\"a3\" value=\"250\" id=\"sub250\"/><label for=\"sub250\">250</label>\n"
-#| "\t<input type=\"radio\" name=\"a3\" value=\"500\" id=\"sub500\"/><label for=\"sub500\">500</label>\n"
-#| "\t<select name=\"currency_code\">\n"
-#| "\t\t\t<option value='EUR'>EUR</option>\n"
-#| "\t\t\t<option value='USD'>USD</option>\n"
-#| "\t\t\t<option value='GBP'>GBP</option>\n"
-#| "\t\t\t<option value='CAD'>CAD</option>\n"
-#| "\t\t\t<option value='AUD'>AUD</option>\n"
-#| "\t\t\t<option value='NZD'>NZD</option>\n"
-#| "\t\t\t<option value='SEK'>SEK</option>\n"
-#| "\t\t\t<option value='CZK'>CZK</option>\n"
-#| "\t\t\t<option value='PLN'>PLN</option>\n"
-#| "\t\t\t<option value='DKK'>DKK</option>\n"
-#| "\t\t\t<option value='NOK'>NOK</option>\n"
-#| "\t\t\t<option value='MXN'>MXN</option>\n"
-#| "\t\t\t<option value='CHF'>CHF</option>\n"
-#| "\t\t\t<option value='HKD'>HKD</option>\n"
-#| "\t\t\t<option value='HUF'>HUF</option>\n"
-#| "\t\t\t<option value='ILS'>ILS</option>\n"
-#| "\t\t\t<option value='BRL'>BRL</option>\n"
-#| "\t\t\t<option value='JPY'>JPY</option>\n"
-#| "\t\t\t<option value='MYR'>MYR</option>\n"
-#| "\t\t\t<option value='PHP'>PHP</option>\n"
-#| "\t\t\t<option value='SGD'>SGD</option>\n"
-#| "\t\t\t<option value='TWD'>TWD</option>\n"
-#| "\t\t\t<option value='THB'>THB</option>\n"
-#| "\t</select>\n"
-#| "\t<br/>\n"
-#| "\t<input type=\"radio\" name=\"p3\" value=\"1\" id=\"sub_m\" checked=\"checked\" /><label for=\"sub_m\">monthly</label>\n"
-#| "\t<input type=\"radio\" name=\"p3\" value=\"3\" id=\"sub_q\"/><label for=\"sub_q\">quarterly</label>\n"
-#| "\t<input type=\"radio\" name=\"p3\" value=\"12\" id=\"sub_y\"/><label for=\"sub_y\">yearly</label>\n"
-#| "\t<br/>\n"
-#| "\t<input type=\"submit\" value=\"Subscribe\" class=\"button\" />\n"
-#| "</form>\n"
-msgid ""
-"<form action=\"https://www.paypal.com/cgi-bin/webscr\" method=\"post\" target='_blank' class='donation'>\n"
-"\t<input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\"/>\n"
-"\t<input type=\"hidden\" name=\"business\" value=\"tails@torservers.net\"/>\n"
-"\t<input type=\"hidden\" name=\"item_name\" value=\"Tails recurring donation\"/>\n"
-"\t<input type=\"hidden\" name=\"no_note\" value=\"1\"/>\n"
-"\t<input type=\"hidden\" name=\"src\" value=\"1\"/>\n"
-"\t<input type=\"hidden\" name=\"modify\" value=\"1\"/>\n"
-"\t<input type=\"hidden\" name=\"t3\" value=\"M\"/>\n"
-"\t<input name=\"lc\" type=\"hidden\" value=\"US\" />\n"
-"\t<input type=\"radio\" name=\"a3\" value=\"5\" id=\"sub5\" checked=\"checked\" /><label for=\"sub5\">5</label>\n"
-"\t<input type=\"radio\" name=\"a3\" value=\"10\" id=\"sub10\"/><label for=\"sub10\">10</label>\n"
-"\t<input type=\"radio\" name=\"a3\" value=\"20\" id=\"sub20\"/><label for=\"sub20\">20</label>\n"
-"\t<input type=\"radio\" name=\"a3\" value=\"50\" id=\"sub50\"/><label for=\"sub50\">50</label>\n"
-"\t<input type=\"radio\" name=\"a3\" value=\"100\" id=\"sub100\"/><label for=\"sub100\">100</label>\n"
-"\t<input type=\"radio\" name=\"a3\" value=\"250\" id=\"sub250\"/><label for=\"sub250\">250</label>\n"
-"\t<input type=\"radio\" name=\"a3\" value=\"500\" id=\"sub500\"/><label for=\"sub500\">500</label>\n"
-"\t<select name=\"currency_code\">\n"
-"\t\t\t<option value='EUR'>EUR</option>\n"
-"\t\t\t<option value='USD'>USD</option>\n"
-"\t\t\t<option value='GBP'>GBP</option>\n"
-"\t\t\t<option value='CAD'>CAD</option>\n"
-"\t\t\t<option value='AUD'>AUD</option>\n"
-"\t\t\t<option value='NZD'>NZD</option>\n"
-"\t\t\t<option value='SEK'>SEK</option>\n"
-"\t\t\t<option value='CZK'>CZK</option>\n"
-"\t\t\t<option value='PLN'>PLN</option>\n"
-"\t\t\t<option value='DKK'>DKK</option>\n"
-"\t\t\t<option value='NOK'>NOK</option>\n"
-"\t\t\t<option value='MXN'>MXN</option>\n"
-"\t\t\t<option value='CHF'>CHF</option>\n"
-"\t\t\t<option value='HKD'>HKD</option>\n"
-"\t\t\t<option value='HUF'>HUF</option>\n"
-"\t\t\t<option value='ILS'>ILS</option>\n"
-"\t\t\t<option value='BRL'>BRL</option>\n"
-"\t\t\t<option value='JPY'>JPY</option>\n"
-"\t\t\t<option value='MYR'>MYR</option>\n"
-"\t\t\t<option value='PHP'>PHP</option>\n"
-"\t\t\t<option value='SGD'>SGD</option>\n"
-"\t\t\t<option value='TWD'>TWD</option>\n"
-"\t\t\t<option value='THB'>THB</option>\n"
-"\t</select>\n"
-"\t<br/>\n"
-"\t<input type=\"radio\" name=\"p3\" value=\"1\" id=\"sub_m\" checked=\"checked\" /><label for=\"sub_m\">monthly</label>\n"
-"\t<input type=\"radio\" name=\"p3\" value=\"3\" id=\"sub_q\"/><label for=\"sub_q\">quarterly</label>\n"
-"\t<input type=\"radio\" name=\"p3\" value=\"12\" id=\"sub_y\"/><label for=\"sub_y\">yearly</label>\n"
-"\t<br/>\n"
-"\t<input type=\"submit\" value=\"Subscribe\" class=\"button\" />\n"
-"</form>\n"
-msgstr ""
-"<form action=\"https://www.paypal.com/cgi-bin/webscr\" method=\"post\" target='_blank' class='donation'>\n"
-"\t<input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\"/>\n"
-"\t<input type=\"hidden\" name=\"business\" value=\"donate@torservers.net\"/>\n"
-"\t<input type=\"hidden\" name=\"item_name\" value=\"Tails recurring donation\"/>\n"
-"\t<input type=\"hidden\" name=\"no_note\" value=\"1\"/>\n"
-"\t<input type=\"hidden\" name=\"src\" value=\"1\"/>\n"
-"\t<input type=\"hidden\" name=\"modify\" value=\"1\"/>\n"
-"\t<input type=\"hidden\" name=\"t3\" value=\"M\"/>\n"
-"\t<input name=\"lc\" type=\"hidden\" value=\"US\" />\n"
-"\t<input type=\"radio\" name=\"a3\" value=\"5\" id=\"sub5\" checked=\"checked\" /><label for=\"sub5\">5</label>\n"
-"\t<input type=\"radio\" name=\"a3\" value=\"10\" id=\"sub10\"/><label for=\"sub10\">10</label>\n"
-"\t<input type=\"radio\" name=\"a3\" value=\"20\" id=\"sub20\"/><label for=\"sub20\">20</label>\n"
-"\t<input type=\"radio\" name=\"a3\" value=\"50\" id=\"sub50\"/><label for=\"sub50\">50</label>\n"
-"\t<input type=\"radio\" name=\"a3\" value=\"100\" id=\"sub100\"/><label for=\"sub100\">100</label>\n"
-"\t<input type=\"radio\" name=\"a3\" value=\"250\" id=\"sub250\"/><label for=\"sub250\">250</label>\n"
-"\t<input type=\"radio\" name=\"a3\" value=\"500\" id=\"sub500\"/><label for=\"sub500\">500</label>\n"
-"\t<select name=\"currency_code\">\n"
-"\t\t\t<option value='EUR'>EUR</option>\n"
-"\t\t\t<option value='USD'>USD</option>\n"
-"\t\t\t<option value='GBP'>GBP</option>\n"
-"\t\t\t<option value='CAD'>CAD</option>\n"
-"\t\t\t<option value='AUD'>AUD</option>\n"
-"\t\t\t<option value='NZD'>NZD</option>\n"
-"\t\t\t<option value='SEK'>SEK</option>\n"
-"\t\t\t<option value='CZK'>CZK</option>\n"
-"\t\t\t<option value='PLN'>PLN</option>\n"
-"\t\t\t<option value='DKK'>DKK</option>\n"
-"\t\t\t<option value='NOK'>NOK</option>\n"
-"\t\t\t<option value='MXN'>MXN</option>\n"
-"\t\t\t<option value='CHF'>CHF</option>\n"
-"\t\t\t<option value='HKD'>HKD</option>\n"
-"\t\t\t<option value='HUF'>HUF</option>\n"
-"\t\t\t<option value='ILS'>ILS</option>\n"
-"\t\t\t<option value='BRL'>BRL</option>\n"
-"\t\t\t<option value='JPY'>JPY</option>\n"
-"\t\t\t<option value='MYR'>MYR</option>\n"
-"\t\t\t<option value='PHP'>PHP</option>\n"
-"\t\t\t<option value='SGD'>SGD</option>\n"
-"\t\t\t<option value='TWD'>TWD</option>\n"
-"\t\t\t<option value='THB'>THB</option>\n"
-"\t</select>\n"
-"\t<br/>\n"
-"\t<input type=\"radio\" name=\"p3\" value=\"1\" id=\"sub_m\" checked=\"checked\" /><label for=\"sub_m\">mensal</label>\n"
-"\t<input type=\"radio\" name=\"p3\" value=\"3\" id=\"sub_q\"/><label for=\"sub_q\">trimestral</label>\n"
-"\t<input type=\"radio\" name=\"p3\" value=\"12\" id=\"sub_y\"/><label for=\"sub_y\">anual</label>\n"
-"\t<br/>\n"
-"\t<input type=\"submit\" value=\"Inscrever\" class=\"button\" />\n"
-"</form>\n"
-
-#. type: Title ###
-#, no-wrap
-msgid "Make a one-time donation"
-msgstr "Faça uma única doação"
-
-#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<form action='https://www.paypal.com/cgi-bin/webscr' id='paypalForm' method='post' target='_blank' class='donation'>\n"
-#| "\t<input name='cmd' type='hidden' value='_donations' />\n"
-#| "\t<input name='business' type='hidden' value='donate@torservers.net' />\n"
-#| "\t<input name='item_name' type='hidden' value='Tails one-time donation' />\n"
-#| "\t<input type=\"hidden\" name=\"no_shipping\" value=\"1\"/>\n"
-#| "\t<input name=\"lc\" type=\"hidden\" value=\"US\" />\n"
-#| "\t<input type=\"radio\" name=\"amount\" value=\"5\" id=\"pp_5\" /><label for=\"pp_5\">5</label>\n"
-#| "\t<input type=\"radio\" name=\"amount\" value=\"10\" id=\"pp_10\"/><label for=\"pp_10\">10</label>\n"
-#| "\t<input type=\"radio\" name=\"amount\" value=\"20\" id=\"pp_20\"/><label for=\"pp_20\">20</label>\n"
-#| "\t<input type=\"radio\" name=\"amount\" value=\"50\" id=\"pp_50\"/><label for=\"pp_50\">50</label>\n"
-#| "\t<input type=\"radio\" name=\"amount\" value=\"100\" id=\"pp_100\"/><label for=\"pp_100\">100</label>\n"
-#| "\t<input type=\"radio\" name=\"amount\" value=\"\" id=\"pp_cust\" checked=\"checked\"/><label for=\"pp_cust\">custom amount</label>\n"
-#| "\t<select name=\"currency_code\">\n"
-#| "\t\t<option value='EUR'>EUR</option>\n"
-#| "\t\t<option value='USD'>USD</option>\n"
-#| "\t\t<option value='GBP'>GBP</option>\n"
-#| "\t\t<option value='CAD'>CAD</option>\n"
-#| "\t\t<option value='AUD'>AUD</option>\n"
-#| "\t\t<option value='NZD'>NZD</option>\n"
-#| "\t\t<option value='SEK'>SEK</option>\n"
-#| "\t\t<option value='CZK'>CZK</option>\n"
-#| "\t\t<option value='PLN'>PLN</option>\n"
-#| "\t\t<option value='DKK'>DKK</option>\n"
-#| "\t\t<option value='NOK'>NOK</option>\n"
-#| "\t\t<option value='MXN'>MXN</option>\n"
-#| "\t\t<option value='CHF'>CHF</option>\n"
-#| "\t\t<option value='HKD'>HKD</option>\n"
-#| "\t\t<option value='HUF'>HUF</option>\n"
-#| "\t\t<option value='ILS'>ILS</option>\n"
-#| "\t\t<option value='BRL'>BRL</option>\n"
-#| "\t\t<option value='JPY'>JPY</option>\n"
-#| "\t\t<option value='MYR'>MYR</option>\n"
-#| "\t\t<option value='PHP'>PHP</option>\n"
-#| "\t\t<option value='SGD'>SGD</option>\n"
-#| "\t\t<option value='TWD'>TWD</option>\n"
-#| "\t\t<option value='THB'>THB</option>\n"
-#| "\t</select>\n"
-#| "\t<br/>\n"
-#| "\t<input type=\"submit\" value=\"Donate\" class=\"button\" />\n"
-#| "</form>\n"
-msgid ""
-"<form action='https://www.paypal.com/cgi-bin/webscr' id='paypalForm' method='post' target='_blank' class='donation'>\n"
-"\t<input name='cmd' type='hidden' value='_donations' />\n"
-"\t<input name='business' type='hidden' value='tails@torservers.net' />\n"
-"\t<input name='item_name' type='hidden' value='Tails one-time donation' />\n"
-"\t<input type=\"hidden\" name=\"no_shipping\" value=\"1\"/>\n"
-"\t<input name=\"lc\" type=\"hidden\" value=\"US\" />\n"
-"\t<input type=\"radio\" name=\"amount\" value=\"5\" id=\"pp_5\" /><label for=\"pp_5\">5</label>\n"
-"\t<input type=\"radio\" name=\"amount\" value=\"10\" id=\"pp_10\"/><label for=\"pp_10\">10</label>\n"
-"\t<input type=\"radio\" name=\"amount\" value=\"20\" id=\"pp_20\"/><label for=\"pp_20\">20</label>\n"
-"\t<input type=\"radio\" name=\"amount\" value=\"50\" id=\"pp_50\"/><label for=\"pp_50\">50</label>\n"
-"\t<input type=\"radio\" name=\"amount\" value=\"100\" id=\"pp_100\"/><label for=\"pp_100\">100</label>\n"
-"\t<input type=\"radio\" name=\"amount\" value=\"\" id=\"pp_cust\" checked=\"checked\"/><label for=\"pp_cust\">custom amount</label>\n"
-"\t<select name=\"currency_code\">\n"
-"\t\t<option value='EUR'>EUR</option>\n"
-"\t\t<option value='USD'>USD</option>\n"
-"\t\t<option value='GBP'>GBP</option>\n"
-"\t\t<option value='CAD'>CAD</option>\n"
-"\t\t<option value='AUD'>AUD</option>\n"
-"\t\t<option value='NZD'>NZD</option>\n"
-"\t\t<option value='SEK'>SEK</option>\n"
-"\t\t<option value='CZK'>CZK</option>\n"
-"\t\t<option value='PLN'>PLN</option>\n"
-"\t\t<option value='DKK'>DKK</option>\n"
-"\t\t<option value='NOK'>NOK</option>\n"
-"\t\t<option value='MXN'>MXN</option>\n"
-"\t\t<option value='CHF'>CHF</option>\n"
-"\t\t<option value='HKD'>HKD</option>\n"
-"\t\t<option value='HUF'>HUF</option>\n"
-"\t\t<option value='ILS'>ILS</option>\n"
-"\t\t<option value='BRL'>BRL</option>\n"
-"\t\t<option value='JPY'>JPY</option>\n"
-"\t\t<option value='MYR'>MYR</option>\n"
-"\t\t<option value='PHP'>PHP</option>\n"
-"\t\t<option value='SGD'>SGD</option>\n"
-"\t\t<option value='TWD'>TWD</option>\n"
-"\t\t<option value='THB'>THB</option>\n"
-"\t</select>\n"
-"\t<br/>\n"
-"\t<input type=\"submit\" value=\"Donate\" class=\"button\" />\n"
-"</form>\n"
-msgstr ""
-"<form action='https://www.paypal.com/cgi-bin/webscr' id='paypalForm' method='post' target='_blank' class='donation'>\n"
-"\t<input name='cmd' type='hidden' value='_donations' />\n"
-"\t<input name='business' type='hidden' value='donate@torservers.net' />\n"
-"\t<input name='item_name' type='hidden' value='Tails one-time donation' />\n"
-"\t<input type=\"hidden\" name=\"no_shipping\" value=\"1\"/>\n"
-"\t<input name=\"lc\" type=\"hidden\" value=\"US\" />\n"
-"\t<input type=\"radio\" name=\"amount\" value=\"5\" id=\"pp_5\" /><label for=\"pp_5\">5</label>\n"
-"\t<input type=\"radio\" name=\"amount\" value=\"10\" id=\"pp_10\"/><label for=\"pp_10\">10</label>\n"
-"\t<input type=\"radio\" name=\"amount\" value=\"20\" id=\"pp_20\"/><label for=\"pp_20\">20</label>\n"
-"\t<input type=\"radio\" name=\"amount\" value=\"50\" id=\"pp_50\"/><label for=\"pp_50\">50</label>\n"
-"\t<input type=\"radio\" name=\"amount\" value=\"100\" id=\"pp_100\"/><label for=\"pp_100\">100</label>\n"
-"\t<input type=\"radio\" name=\"amount\" value=\"\" id=\"pp_cust\" checked=\"checked\"/><label for=\"pp_cust\">valor personalizado</label>\n"
-"\t<select name=\"currency_code\">\n"
-"\t\t<option value='EUR'>EUR</option>\n"
-"\t\t<option value='USD'>USD</option>\n"
-"\t\t<option value='GBP'>GBP</option>\n"
-"\t\t<option value='CAD'>CAD</option>\n"
-"\t\t<option value='AUD'>AUD</option>\n"
-"\t\t<option value='NZD'>NZD</option>\n"
-"\t\t<option value='SEK'>SEK</option>\n"
-"\t\t<option value='CZK'>CZK</option>\n"
-"\t\t<option value='PLN'>PLN</option>\n"
-"\t\t<option value='DKK'>DKK</option>\n"
-"\t\t<option value='NOK'>NOK</option>\n"
-"\t\t<option value='MXN'>MXN</option>\n"
-"\t\t<option value='CHF'>CHF</option>\n"
-"\t\t<option value='HKD'>HKD</option>\n"
-"\t\t<option value='HUF'>HUF</option>\n"
-"\t\t<option value='ILS'>ILS</option>\n"
-"\t\t<option value='BRL'>BRL</option>\n"
-"\t\t<option value='JPY'>JPY</option>\n"
-"\t\t<option value='MYR'>MYR</option>\n"
-"\t\t<option value='PHP'>PHP</option>\n"
-"\t\t<option value='SGD'>SGD</option>\n"
-"\t\t<option value='TWD'>TWD</option>\n"
-"\t\t<option value='THB'>THB</option>\n"
-"\t</select>\n"
-"\t<br/>\n"
-"\t<input type=\"submit\" value=\"Doe\" class=\"button\" />\n"
-"</form>\n"
-
-#. type: Title =
-#, no-wrap
-msgid "How does Tails use this money?\n"
-msgstr "Como o Tails usa este dinheiro?\n"
-
-#. type: Plain text
-msgid ""
-"Our [[financial documents|doc/about/finances]] are available for your review."
-msgstr ""
-"Nossos [[documentos financeiros|doc/about/finances]] estão disponíveis para "
-"seu escrutínio."
-
-#~ msgid ""
-#~ "**Your support is critical to our success.** Consider making\n"
-#~ "a donation to Tails.\n"
-#~ msgstr ""
-#~ "**Seu apoio é crítico para nosso sucesso.** Considere fazer\n"
-#~ "uma doação para o Tails.\n"
diff --git a/wiki/src/contribute/how/mirror.mdwn b/wiki/src/contribute/how/mirror.mdwn
index fce1a17..714cdf9 100644
--- a/wiki/src/contribute/how/mirror.mdwn
+++ b/wiki/src/contribute/how/mirror.mdwn
@@ -2,7 +2,7 @@
<div id="intro">
-<p>Setting up a Tails BitTorrent or HTTP mirror helps Tails users
+<p>Setting up a Tails BitTorrent or HTTPS mirror helps Tails users
downloading it faster and more reliably.</p>
[[!toc levels=2]]
@@ -51,11 +51,12 @@ Else, new versions are announced on:
BitTorrent files.
<a id="http"></a>
+<a id="https"></a>
-HTTP
-====
+HTTPS
+=====
-To efficiently help Tails users downloading it over HTTP, one needs to
+To efficiently help Tails users downloading it over HTTPS, one needs to
have sufficiently privileged access to a web server with decent
bandwidth: a domestic DSL connection won't help; neither will a shared
web hosting setup that provides FTP access only.
@@ -86,19 +87,22 @@ The big picture
All downloads are currently served from a diverse pool of mirrors
(see the [[design document|contribute/design/mirrors]] for details).
-Every HTTP mirror makes our files available under a fixed URL
-(e.g. `http://42.dl.amnesia.boum.org/tails/` or `https://yourdomain.org/pub/tails/`)
+Every HTTPS mirror makes our files available under a fixed URL
+(e.g. `https://42.dl.amnesia.boum.org/tails/` or `https://yourdomain.org/pub/tails/`)
that contains per-version sub-directories (such as
-`http://42.dl.amnesia.boum.org/tails/stable/tails-i386-lenny-0.6.2/`).
+`https://42.dl.amnesia.boum.org/tails/stable/tails-i386-lenny-0.6.2/`).
Alongside our mirror pool redirecting to mirrors using their own domain, we maintain
a DNS Round Robin pool for the `dl.amnesia.boum.org` host. This pool serves as a
fallback, we add only a few fast and reliable mirrors to it.
+We only accept mirrors that provide a SSL certificate deemed valid by
+Firefox for the exact hostname used.
+
Pick a hostname for your mirror
-------------------------------
-Your web server needs to answer HTTP requests sent to
+Your web server needs to answer HTTP and HTTPS requests sent to
a _dedicated_ hostname that is unique, within our mirror pool.
Furthermore, your web server should answer requests sent to `dl.amnesia.boum.org`
(your mirror could be added to our fallback mirror pool at any moment).
@@ -133,31 +137,12 @@ Set up a virtual host for the hostname chosen at the
previous step. The virtual host will need to
have indexing enabled and [[!wikipedia HTTP_ETag desc="ETags"]] disabled.
-Please consider serving files over HTTPS. To be helpful in our
+Files must be served over HTTP and HTTPS. To be helpful in our
context, this requires a certificate that is considered valid by
mainstream web browsers; you can get such a certificate free of charge,
from [Let's Encrypt](https://letsencrypt.org/) for example.
-#### Apache configuration example using your own domain
-
- <VirtualHost YOUR_WEBSERVER_IP:80>
- ServerName yourdomain.org
- ServerAlias dl.amnesia.boum.org
- ServerAlias *.dl.amnesia.boum.org
- ServerAdmin YOUR_EMAIL
-
- DocumentRoot /var/www/YOUR_PATH/
- <Directory /var/www/YOUR_PATH/>
- Options Indexes
- FileETag None
- AllowOverride None
- IndexIgnore README.html
- IndexOptions FancyIndexing FoldersFirst IgnoreCase NameWidth=50
- IndexOrderDefault Descending Date
- </Directory>
- </VirtualHost>
-
-And if you want to enable HTTPS:
+#### Apache configuration example
<VirtualHost YOUR_WEBSERVER_IP:80>
ServerName yourdomain.org
@@ -192,24 +177,6 @@ You can harden this configuration using the
Mozilla SSL Configuration Generator</a>.
</div>
-#### Apache configuration example using a hostname under dl.amnesia.boum.org
-
- <VirtualHost YOUR_WEBSERVER_IP:80>
- ServerName dl.amnesia.boum.org
- ServerAlias *.dl.amnesia.boum.org
- ServerAdmin YOUR_EMAIL
-
- DocumentRoot /var/www/YOUR_PATH/
- <Directory /var/www/YOUR_PATH/>
- Options Indexes
- FileETag None
- AllowOverride None
- IndexIgnore README.html
- IndexOptions FancyIndexing FoldersFirst IgnoreCase NameWidth=50
- IndexOrderDefault Descending Date
- </Directory>
- </VirtualHost>
-
#### Lighttpd configuration example
static-file.etags = "disable"
diff --git a/wiki/src/contribute/how/translate.mdwn b/wiki/src/contribute/how/translate.mdwn
index cca9923..f4ea56b 100644
--- a/wiki/src/contribute/how/translate.mdwn
+++ b/wiki/src/contribute/how/translate.mdwn
@@ -55,10 +55,10 @@ Currently, there are several active **language teams**:
* [[German|translate/team/de]]
* [[Portuguese|translate/team/pt]]
* [[Italian|translate/team/it]]
+* [[Spanish|translate/team/es]]
Other teams are being set up:
-* Spanish
* Turkish
If your language is not listed here, read the documentation
diff --git a/wiki/src/contribute/how/translate/team/es.mdwn b/wiki/src/contribute/how/translate/team/es.mdwn
new file mode 100644
index 0000000..d382a8c
--- /dev/null
+++ b/wiki/src/contribute/how/translate/team/es.mdwn
@@ -0,0 +1,14 @@
+[[!meta title="Translate Tails into Spanish"]]
+
+[[!toc levels=2]]
+
+* 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)
+ (<tails-l10n-spanish@boum.org>).
+* We have [[a wiki|blueprint/l10n_Spanish]].
+* We use [Poedit](https://poedit.net/) for the translations (comes with Tails).
+* The first documents to translate should be the
+ [[core pages|contribute/l10n_tricks/core_po_files.txt]].
+
+If you want to contribute, please contact us first through the mailing list.
diff --git a/wiki/src/contribute/l10n_tricks.mdwn b/wiki/src/contribute/l10n_tricks.mdwn
index c26fcd2..eff6a71 100644
--- a/wiki/src/contribute/l10n_tricks.mdwn
+++ b/wiki/src/contribute/l10n_tricks.mdwn
@@ -130,3 +130,17 @@ Get an overview of translation progress
=======================================
You can get a list of pages that are not 100% translated on [[this dedicated page|contribute/how/translate/translation_progress]].
+
+Build a translation memory to use with Poedit
+=============================================
+
+For example for Spanish files, from the Git repo:
+
+ find wiki/src/ -name "*.es.po" > allspanish && \
+ msgcat --files-from=allspanish --output=allspanish.po
+
+You can then configure it on your Poedit:
+
+1. *Edit* → *Preferences* → *TM*
+2. *Learn from files*
+3. Select your newly created file (`allspanish.po` in this case)
diff --git a/wiki/src/contribute/release_process.mdwn b/wiki/src/contribute/release_process.mdwn
index 38b213c..b72d313 100644
--- a/wiki/src/contribute/release_process.mdwn
+++ b/wiki/src/contribute/release_process.mdwn
@@ -24,13 +24,18 @@ the scripts snippets found on this page:
* version numbers (see [[contribute/release_schedule#versioning]]):
- export VERSION=$(dpkg-parsechangelog -SVersion)
- export TAG=$(echo "${VERSION:?}" | sed -e 's,~,-,')
- export PREVIOUS_VERSION=$(dpkg-parsechangelog --offset 1 --count 1 -SVersion)
- export PREVIOUS_TAG=$(echo "${PREVIOUS_VERSION:?}" | sed -e 's,~,-,')
+ export VERSION=$(dpkg-parsechangelog -SVersion)
+ export TAG=$(echo "${VERSION:?}" | sed -e 's,~,-,')
+ 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
+* `NEXT_PLANNED_MINOR_VERSION`: set to the version number of the next
+ *minor* Tails release; if the next release is a point-release, use
+ that one; otherwise, use `${VERSION}.1`
* `MAJOR_RELEASE`: set to 1 if preparing a major release, to 0 else
* `ISOS`: the directory where one stores `tails-amd64-*`
sub-directories like the ones downloaded with BitTorrent.
@@ -50,6 +55,7 @@ the scripts snippets found on this page:
* `DIST`: either 'alpha' (for RC:s) or 'stable' (for actual releases)
* `export DEBEMAIL='tails@boum.org'`
* `export DEBFULLNAME='Tails developers'`
+* `export WEBSITE_RELEASE_BRANCH="web/release-${VERSION:?}"`
Pre-freeze
==========
@@ -135,6 +141,14 @@ Reset the release branch's `config/base_branch`:
git commit config/base_branch \
-m "Restore ${RELEASE_BRANCH:?}'s base branch."
+Bootstrap manual testing coordination:
+
+1. Create a pad.
+2. Copy the [[manual test suite|contribute/release_process/test]]
+ into it.
+3. Send the pad URL to the usual testers (see `manual_testers.mdwn` in
+ the `internal.git` repository).
+
Update included files
=====================
@@ -476,14 +490,14 @@ Build images
Sanity check
------------
-Verify that the TBB release used in Tails still is the most
-recent. Also look if there's a new `-buildX` tag for the targetted TBB
-and Tor Browser versions in their respective Git repos:
+Verify that the Tor Browser release used in Tails still is the most
+recent. Also look if there's a new `-buildX` tag for the targeted
+Tor Browser version in these Git repositories:
* <https://gitweb.torproject.org/builders/tor-browser-bundle.git>
* <https://gitweb.torproject.org/tor-browser.git>
-A new tag may indicate that a new TBB release is imminent.
+A new tag may indicate that a new Tor Browser release is imminent.
Better catch this before people spend time doing manual tests.
@@ -508,10 +522,10 @@ SquashFS file order
The following command is also helpful but requires that you save a
copy of the old sort file into `/tmp/squashfs.sort.old`:
- diff -NaurB \
- <( cut -d' ' -f1 /tmp/squashfs.sort.old | sort ) \
- <( cut -d' ' -f1 config/binary_rootfs/squashfs.sort | sort ) \
- | less
+ diff -NaurB \
+ <( cut -d' ' -f1 /tmp/squashfs.sort.old | sort ) \
+ <( cut -d' ' -f1 config/binary_rootfs/squashfs.sort | sort ) \
+ | less
1. `git commit -m 'Updating SquashFS sort file' config/binary_rootfs/squashfs.sort`
@@ -523,19 +537,19 @@ suite should be ready, so it is time to:
* Mark the version as "released" in the changelog:
- dch --release --no-force-save-on-release --maintmaint
- git commit -m "Mark Tails ${VERSION:?} as released." debian/changelog
+ dch --release --no-force-save-on-release --maintmaint
+ git commit -m "Mark Tails ${VERSION:?} as released." debian/changelog
* Export `SOURCE_DATE_EPOCH`:
- export SOURCE_DATE_EPOCH=$(date --utc --date="$(dpkg-parsechangelog --show-field=Date)" '+%s')
+ export SOURCE_DATE_EPOCH=$(date --utc --date="$(dpkg-parsechangelog --show-field=Date)" '+%s')
* tag the release *again*, with all included files in:
- git tag -f -u "${TAILS_SIGNATURE_KEY:?}" \
- -m "tagging version ${VERSION:?}" "${TAG:?}" && \
- git push --tags --force && \
- git push origin "${RELEASE_BRANCH:?}"
+ git tag -f -u "${TAILS_SIGNATURE_KEY:?}" \
+ -m "tagging version ${VERSION:?}" "${TAG:?}" && \
+ git push --tags --force && \
+ git push origin "${RELEASE_BRANCH:?}"
Note: for Jenkins to build the release you must push the release
branch with its tip tagged. I.e. if you deviate from the above
@@ -550,11 +564,17 @@ suite should be ready, so it is time to:
`debian-security` serial might be higher. To ensure we publish
the final build's `.build-manifest`, please run:
- export PACKAGES_MANIFEST="${ARTIFACTS:?}/tails-amd64-${VERSION:?}.iso.build-manifest"
+ export PACKAGES_MANIFEST="${ARTIFACTS:?}/tails-amd64-${VERSION:?}.iso.build-manifest"
+
+* check out a new branch:
-* check out the release branch again:
+ git checkout -b "${WEBSITE_RELEASE_BRANCH:?}" "${TAG:?}" && \
+ git push -u origin "${WEBSITE_RELEASE_BRANCH:?}"
- git checkout "${RELEASE_BRANCH:?}"
+ (as soon as a new commit is created on `$RELEASE_BRANCH`, its ISO
+ 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)
Generate the OpenPGP signatures and Torrents
============================================
@@ -651,25 +671,26 @@ Prepare upgrade-description files
*previous* supported release (e.g. N~rc1, N-1, N-1~rc2) that replaces
all existing upgrade paths with the path to the version being
released;
- * create a new upgrade-description for the version being released,
- that expresses that *no* upgrade is available for that one yet.
+ * create a new upgrade-description for the version being released
+ and for the next one, that expresses that *no* upgrade is
+ available for these ones yet.
This is what `tails-iuk-generate-upgrade-description-files` tool
does:
- ( cd ${IUK_CHECKOUT:?} && \
- ./bin/tails-iuk-generate-upgrade-description-files \
- --build-target amd64 \
- --version "${VERSION:?}" \
- --next-version "${NEXT_PLANNED_VERSION:?}" \
- --next-version "${NEXT_PLANNED_VERSION:?}~rc1" \
- --next-version "${VERSION:?}.1" \
- --iso "${ISOS:?}/tails-amd64-${VERSION:?}/tails-amd64-${VERSION:?}.iso" \
- --previous-version "${PREVIOUS_VERSION:?}" \
- --previous-version "${VERSION:?}~rc1" \
- --iuks "${ISOS:?}" \
- --release-checkout "${RELEASE_CHECKOUT:?}" \
- --major-release "${MAJOR_RELEASE:?}" \
+ ( cd ${IUK_CHECKOUT:?} && \
+ ./bin/tails-iuk-generate-upgrade-description-files \
+ --build-target amd64 \
+ --version "${VERSION:?}" \
+ --next-version "${NEXT_PLANNED_VERSION:?}" \
+ --next-version "${NEXT_PLANNED_VERSION:?}~rc1" \
+ --next-version "${VERSION:?}.1" \
+ --iso "${ISOS:?}/tails-amd64-${VERSION:?}/tails-amd64-${VERSION:?}.iso" \
+ --previous-version "${PREVIOUS_VERSION:?}" \
+ --previous-version "${VERSION:?}~rc1" \
+ --iuks "${ISOS:?}" \
+ --release-checkout "${RELEASE_CHECKOUT:?}" \
+ --major-release "${MAJOR_RELEASE:?}" \
)
Note:
@@ -700,28 +721,28 @@ Prepare upgrade-description files
1. Create an armoured detached signature for each created or modified
upgrade-description file.
- find "${RELEASE_CHECKOUT:?}/wiki/src/upgrade/" \
- -type f -name upgrades.yml | \
- while read udf; do
- if [ -n "$(git status --porcelain "${udf:?}")" ]; then
- gpg -u "${TAILS_SIGNATURE_KEY:?}" --armor --detach-sign "${udf:?}"
- mv "${udf:?}.asc" "${udf:?}.pgp"
- ( \
- cd ${IUK_CHECKOUT:?} && \
- ./bin/tails-iuk-check-upgrade-description-file "${udf:?}" \
- ) || break
- fi
- done
+ find "${RELEASE_CHECKOUT:?}/wiki/src/upgrade/" \
+ -type f -name upgrades.yml | \
+ while read udf; do
+ if [ -n "$(git status --porcelain "${udf:?}")" ]; then
+ gpg -u "${TAILS_SIGNATURE_KEY:?}" --armor --detach-sign "${udf:?}"
+ mv --force "${udf:?}.asc" "${udf:?}.pgp"
+ ( \
+ cd ${IUK_CHECKOUT:?} && \
+ ./bin/tails-iuk-check-upgrade-description-file "${udf:?}" \
+ ) || break
+ fi
+ done
1. Add and commit the upgrade-description files and their detached
- signatures to the Git branch used to prepare the release (`stable`
- or `testing`):
+ signatures to the Git branch used to prepare the release
+ (`$WEBSITE_RELEASE_BRANCH`):
- ( \
- cd "${RELEASE_CHECKOUT:?}" && git add wiki/src/upgrade && \
- git commit -m "Update upgrade-description files." && \
- git push origin ${RELEASE_BRANCH:?} \
- )
+ ( \
+ cd "${RELEASE_CHECKOUT:?}" && git add wiki/src/upgrade && \
+ git commit -m "Update upgrade-description files." && \
+ git push origin ${WEBSITE_RELEASE_BRANCH:?} \
+ )
1. If preparing anything but a final release (e.g. an alpha, beta
or RC), copy the generated or updated files to
@@ -732,25 +753,26 @@ Prepare upgrade-description files
release to the *test* channel in `$MASTER_CHECKOUT`, modify its content
accordingly, sign it, commit and push:
- # If more old versions are supported, add them (whitespace
- # separated) to this variable
- SUPPORTED_OLD_VERSIONS="${PREVIOUS_VERSION:?}"
-
- ( \
- cd ${MASTER_CHECKOUT:?} && \
- git fetch && \
- for old_version in ${SUPPORTED_OLD_VERSIONS:?}; do
- stable_udf="wiki/src/upgrade/v1/Tails/${old_version:?}/amd64/stable/upgrades.yml" && \
- test_udf="wiki/src/upgrade/v1/Tails/${old_version:?}/amd64/test/upgrades.yml" && \
- git show origin/${RELEASE_BRANCH:?}:${stable_udf:?} \
- | sed -e 's/channel: stable/channel: test/' > ${test_udf:?} && \
- gpg -u "${TAILS_SIGNATURE_KEY:?}" --armor --detach-sign ${test_udf:?} && \
- mv ${test_udf:?}.asc ${test_udf:?}.pgp && \
- git add ${test_udf:?}* ; \
- done && \
- git commit -m "Add incremental upgrades on the test channel for Tails ${VERSION:?}" && \
- git push origin master:master \
- )
+ # If more old versions are supported, add them (whitespace
+ # separated) to this variable
+ SUPPORTED_OLD_VERSIONS="${PREVIOUS_VERSION:?}"
+
+ ( \
+ cd ${MASTER_CHECKOUT:?} && \
+ git fetch && \
+ for old_version in ${SUPPORTED_OLD_VERSIONS:?}; do
+ stable_udf="wiki/src/upgrade/v1/Tails/${old_version:?}/amd64/stable/upgrades.yml" && \
+ test_udf="wiki/src/upgrade/v1/Tails/${old_version:?}/amd64/test/upgrades.yml" && \
+ mkdir -p "$(dirname "$test_udf")" && \
+ git show origin/${WEBSITE_RELEASE_BRANCH:?}:${stable_udf:?} \
+ | sed -e 's/channel: stable/channel: test/' > ${test_udf:?} && \
+ gpg -u "${TAILS_SIGNATURE_KEY:?}" --armor --detach-sign ${test_udf:?} && \
+ mv ${test_udf:?}.asc ${test_udf:?}.pgp && \
+ git add ${test_udf:?}* ; \
+ done && \
+ git commit -m "Add incremental upgrades on the test channel for Tails ${VERSION:?}" && \
+ git push origin master:master \
+ )
Prepare the ISO description file for DAVE
@@ -760,6 +782,17 @@ If preparing a RC, skip this part.
Update the ISO description file (IDF) used by the browser extension:
+ cat > "${RELEASE_CHECKOUT:?}"/wiki/src/install/v1/Tails/i386/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
cat > "${RELEASE_CHECKOUT:?}"/wiki/src/install/v1/Tails/amd64/stable/latest.yml <<EOF
---
build-target: amd64
@@ -781,7 +814,7 @@ Upload images
Sanity check
------------
-Verify once more that the TBB we ship is still the most recent (see
+Verify once more that the Tor Browser we ship is still the most recent (see
above).
## Announce, seed and test the Torrents
@@ -845,11 +878,38 @@ Push the released ISO to our Tails ISO history git-annex repo, so that
our isotesters can fetch it from there for their testing. How to do so
is described in our internal 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
+ <https://mirrors.wikimedia.org/tails/> are reliable and have plenty
+ of bandwidth.
+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.
+1. Email <tails@boum.org> and potential contributors (see
+ `manual_testers.mdwn` in the internal Git repository) that tests
+ may start:
+ - point them to the up-to-date mirror you've found previously
+ - make it clear what's the deadline
+ - make it clear where and how you expect to get feedback
+ - attach the Torrent
+ - attach the `.packages` file
+1. Make sure someone is committed to run the automated test suite.
+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. 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?
+
Update the website and Git repository
=====================================
-What follows in this section happens on the release branch in
-`${RELEASE_CHECKOUT:?}`.
+What follows in this section happens on the `$WEBSITE_RELEASE_BRANCH`
+branch in `${RELEASE_CHECKOUT:?}`.
If preparing a final release
----------------------------
@@ -864,7 +924,8 @@ of its name:
Rename the manifest of needed packages as well:
- mv "${PACKAGES_MANIFEST:?}" "${ARTIFACTS:?}/tails-amd64-${VERSION:?}.build-manifest"
+ mv "${PACKAGES_MANIFEST:?}" \
+ "${ARTIFACTS:?}/tails-amd64-${VERSION:?}.build-manifest"
Copy the `.iso.sig`, `.build-manifest`, `.packages`, `.torrent` and
`.torrent.sig` files into the website repository:
@@ -890,27 +951,9 @@ Generate the expected signature verification output:
sed 's/ /\&nbsp;/g;s/</\&lt;/;s/>/\&gt;/;s/$/<br\/>/g' > \
"${RELEASE_CHECKOUT:?}/wiki/src/inc/stable_amd64_gpg_signature_output.html"
-Update the [[support/known_issues]] page:
-
-- Add regressions brought by the new release.
-- Remove older known issues that are fixed by the new release.
-
-Write the announcement for the release in
-`wiki/src/news/version_${TAG:?}.mdwn`. See the [[release notes
-documentation|contribute/how/documentation/release_notes]]
-
-XXX: we should probably merge that into the above liked documentation.
-**Check you correctly:**
-
-- Updated the `meta title` directive.
-- Updated the `meta date` directive.
-- Made sure there's an `announce` tag to have an email sent to the
- news mailing list.
-- Documented important config changes that persistence users have to do
- themselves (e.g. the Pidgin proxy settings change in
- [[!tails_gitweb_commit 9925321]] breaks all existing persistent
- profiles).
-- Documented known issues.
+Ensure our [[contribute/working_together/roles/technical_writer]] has
+[[written|contribute/how/documentation/release_notes]] the
+announcement for the release in `wiki/src/news/version_${TAG:?}.mdwn`.
Write an announcement listing the security bugs affecting the previous
version in
@@ -919,9 +962,12 @@ 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:
-- if we are shipping Linux from testing/sid, the list of CVE fixed in
- Linux since the one shipped in the previous release of Tails:
- <http://metadata.ftp-master.debian.org/changelogs/main/l/linux/stable_changelog>
+- 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
+ Tails; you can find them in the relevant changelog e.g.:
+ * <http://metadata.ftp-master.debian.org/changelogs/main/l/linux/unstable_changelog>
+ * <http://metadata.ftp-master.debian.org/changelogs/main/l/linux/testing_changelog>
+ * <http://metadata.ftp-master.debian.org/changelogs/main/l/linux/stretch-backports_changelog>
- the list of DSA fixed in packages we ship since those that were in
the previous release of Tails: <https://www.debian.org/security/#DSAS>
- the list of BSA fixed in packages we ship since those that were in
@@ -935,10 +981,6 @@ If preparing a release candidate
Skip this part if preparing a final release.
-Copy the updated or or updated update-description files and their
-detached signatures to `${MASTER_CHECKOUT:?}`. They should be on the
-*alpha* channel.
-
Copy the `.iso.sig` file into the website repository:
cp "${ISO_PATH:?}.sig" \
@@ -964,8 +1006,9 @@ Write the announcement for the release in
In any case
-----------
-If preparing a final release, what follows happens in
-`$RELEASE_CHECKOUT`. Else, it happens in `$MASTER_CHECKOUT`.
+If preparing a final release, what follows happens on the
+`$WEBSITE_RELEASE_BRANCH` in `$RELEASE_CHECKOUT`. Else, it happens in
+`$MASTER_CHECKOUT`.
Generate PO files for the announcements with `./build-website`.
@@ -978,35 +1021,6 @@ Then, record the last commit before putting the release out for real:
git add wiki/src && \
git commit -m "releasing version ${VERSION:?}"
-Testing
-=======
-
-1. Using `check-mirrors`, choose a fast mirror that already has the
- tentative ISO. E.g. <https://mirrors.kernel.org/tails/> or
- <https://mirrors.wikimedia.org/tails/> are reliable and have plenty
- of bandwidth.
-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.
-1. Set up a pad and copy the [[manual test
- suite|contribute/release_process/test]] in it.
-1. Email <tails@boum.org> and potential contributors (see
- `manual_testers.mdwn` in the internal Git repository) that tests
- may start:
- - point them to the up-to-date mirror you've found previously
- - make it clear what's the deadline
- - make it clear where and how you expect to get feedback
- - attach the Torrent
- - attach the `.packages` file
-1. Make sure someone is committed to run the automated test suite.
-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. 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?
-
Go wild!
========
@@ -1023,11 +1037,14 @@ releasing an RC, add `--channel alpha`):
Ask <tails-mirrors@boum.org> to drop those that are lagging behind and
notify their administrators.
-Sanity check
-------------
+Sanity checks
+-------------
-Verify once more that the TBB we ship is still the most recent (see
-above).
+* Check the outcome of the "Testing" section above.
+* Wait for the Mozilla security advisory
+ [to be published](https://www.mozilla.org/en-US/security/advisories/).
+* Verify once more that the Tor Browser we ship is still the most recent (see
+ above).
Push
----
@@ -1042,12 +1059,13 @@ If preparing an actual release, push the last commits to our Git
repository like this:
( cd "${RELEASE_CHECKOUT:?}" && \
- git push origin "${RELEASE_BRANCH:?}:${RELEASE_BRANCH:?}" \
- devel:devel \
+ git push origin \
+ "${WEBSITE_RELEASE_BRANCH:?}:${WEBSITE_RELEASE_BRANCH:?}" \
+ devel:devel \
) && \
( cd "${MASTER_CHECKOUT:?}" && \
git fetch && \
- git merge "origin/${RELEASE_BRANCH:?}" && \
+ git merge "origin/${WEBSITE_RELEASE_BRANCH:?}" && \
git push origin master:master \
)
@@ -1108,21 +1126,43 @@ to the release notes:
Tor blog
--------
+XXX: move most of this to the list of things that can be done while
+waiting for manual test results, replace "Save and publish" there with
+"Save and keep unpublished", and keep only the "Save and publish" step
+here (+ adjust *Authoring Information* → *Authored on* since the date
+of the draft creation won't be correct). I didn't do this yet as it
+would conflict with the changes I've done for [[!tails_ticket 12629]]
+in painful ways.
+
We announce *major* releases on the Tor blog:
-- [login to their Drupal](https://blog.torproject.org/user)
-- *Add a New Blog Post*
-- add the same tags as the previous release announce had
-- choose *Filtered HTML* as the *Input format*
-- paste the HTML generated by ikiwiki from the announce in `news/`
- into the textarea in the blog post editor
-- cleanup a bit to make it shorter
-- add a link to the [[installation assistant|install]]
-- change the internal links into external links
-- turn `<h1>` into `<strong>`
-- direct users to [[our communication channels|support/talk]] for
- comments and feedback
-- disable comments
+- copy the HTML generated by ikiwiki from the announce in `news/`
+ into your preferred `$EDITOR`
+- append:
+
+ <h1>Support and feedback</h1>
+
+ For support and feedback, visit the <a href="https://tails.boum.org/support/">Support section</a> on the Tails website.
+
+- change the internal links into external links:
+ * replace all occurrences of `href="../` with `href="https://tails.boum.org/`
+ * replace all occurrences of `src="./` with `src="https://tails.boum.org/news/`
+ * replace most `.en.html` and `.html` with `/`, but beware of links
+ that don't point to our own website
+- [login to the Tor blog](https://blog.torproject.org/user)
+- click *Content* → *Add content* → *Blog Post*
+- add these tags:
+ * tails
+ * anonymous operating system
+ * tails releases
+- set *Title* to "Tails $VERSION is out"
+- choose *Filtered HTML* as the *Text format* in the blog post editor
+- copy the text you have prepared into the *Post Body* textarea of the
+ blog post editor
+- open *Content Settings* and verify that comments are *Closed*
+- open *Promotion Options* and check *Promoted to front page*
+- click *Preview* and ensure everything is OK
+- click *Save and publish*
Tor weekly news
---------------
@@ -1151,8 +1191,6 @@ this, and skip what does not make sense for a RC.
stable release on the mirrors.
1. Remove any remaining RC for the just-published release from
the mirrors.
-1. Revert the commits adding `alpha` channel incremental upgrades to
- the just released version.
1. Remove IUKs that are more than 6 months old from
`/{stable,alpha}/iuk` on the rsync server:
- first check that it's not going to remove anything we want to keep:
@@ -1173,7 +1211,7 @@ this, and skip what does not make sense for a RC.
-not -name '*~test_*~test.iuk' -delete \
\"
-1. Check how much space our mirrors will need:
+1. Check how much space our mirrors need:
ssh rsync.lizard du -sh /srv/rsync/tails
@@ -1183,9 +1221,11 @@ this, and skip what does not make sense for a RC.
space.
1. Delete Git branches that were merged:
+ cd "${MASTER_CHECKOUT:?}" && \
+ git checkout master && \
+ git fetch && \
+ git submodule update && \
bare_repo=$(mktemp -d)
- (cd "${MASTER_CHECKOUT:?}" && git fetch) && \
- (cd "${MASTER_CHECKOUT:?}" && git submodule update) && \
git clone --bare --reference "${MASTER_CHECKOUT:?}" \
boum_org_amnesia@webmasters.boum.org:wiki.git \
"${bare_repo:?}" && \
@@ -1234,12 +1274,13 @@ this, and skip what does not make sense for a RC.
1. Make sure Jenkins manages to build all updated major branches:
<https://jenkins.tails.boum.org/>.
1. Delete the _Release Manager View for ${VERSION_:?}_ Redmine custom query.
-1. Ensure the next few releases have their own _Release Manager View_.
+1. Ensure the next two releases have their own _Release Manager View_.
1. On the [[!tails_roadmap]], update the *Due date* for the *Holes
in the Roof* so that this section appears after the next release.
1. If you are the release manager for the next release too, look at the
tasks that must be done at the beginning of your shift in the
[[release manager role page|contribute/working_together/roles/release_manager]].
+ Otherwise, kindly remind the next release manager about this :)
Related pages
=============
diff --git a/wiki/src/contribute/release_process/test.mdwn b/wiki/src/contribute/release_process/test.mdwn
index cf67d60..f373f22 100644
--- a/wiki/src/contribute/release_process/test.mdwn
+++ b/wiki/src/contribute/release_process/test.mdwn
@@ -79,12 +79,12 @@ tracked by tickets prefixed with `todo/test_suite:`.
## Security and fingerprinting
-* Run the [tests the TBB folks
+* Run the [tests the Tor Browser folks
use](https://trac.torproject.org/projects/tor/wiki/doc/build/BuildSignoff#TestPagestoUse).
(automate: [[!tails_ticket 10260]])
-* Compare the fingerprint of Tails and the latest TBB using at least
+* Compare the fingerprint of Tails and the latest Tor Browser using at least
<https://panopticlick.eff.org/> (automate: [[!tails_ticket 10262]])
- - The exposed User-Agent should match the latest TBB's one.
+ - The exposed User-Agent should match the latest Tor Browser's one.
- Update the [[fingerprint section|support/known_issues#fingerprint]] of the
known issues page if needed.
* WebRTC should be disabled: (automate: [[!tails_ticket 10264]])
@@ -256,8 +256,22 @@ tracked by tickets prefixed with `todo/test_suite:`.
# Internationalization
-Boot and check basic functionality is working for every supported
-language. You *really* have to reboot between each language.
+Boot and check basic functionality is working for these (language,
+region) tuples:
+
+ - Arabic - Egypt
+ - Chinese - China
+ - Deutsch - Deutschland
+ - English - USA
+ - Español - España
+ - Français - France
+ - Italiano - Italia
+ - Persian - Iran
+ - Português - Brasil
+ - Russian - Russian Federation
+ - Tiếng Việt - Vietnam
+
+You *really* have to reboot between each language.
* The chosen keyboard layout must be applied. (automate: [[!tails_ticket 10261]])
* The virtual keyboard must work and be auto-configured to use the same keyboard
@@ -296,9 +310,8 @@ language. You *really* have to reboot between each language.
* Visit <https://tails.boum.org/install/debian/usb> in a Firefox-based
browser. Verify that you can install the Firefox Addon. Start
downloading a Tails image and copy the used mirror URL.
- - The URL should only start with dl.amnesia.boum.org if Javascript
- is disabled in your browser (requires a restart!). Otherwise it should
- contain a mirror URL from <https://tails.boum.org/mirrors.json>
+ - The URL should contain a mirror URL from
+ <https://tails.boum.org/mirrors.json>.
- Verify that pausing and resuming the download from this URL works.
- Verify that when you start the download, you can see it appear in
the download list (Ctrl+Shift+Y).
diff --git a/wiki/src/contribute/release_process/test/setup.mdwn b/wiki/src/contribute/release_process/test/setup.mdwn
index a6a085e..58add29 100644
--- a/wiki/src/contribute/release_process/test/setup.mdwn
+++ b/wiki/src/contribute/release_process/test/setup.mdwn
@@ -18,10 +18,8 @@ First of all, one needs a Debian Stretch system with:
The following packages are necessary on Debian Stretch:
- echo -e "Package: *\nPin: release o=Debian,n=stretch\nPin-Priority: 990" \
- > /etc/apt/preferences.d/Debian_stretch && \
- apt update && \
- apt install \
+ sudo apt update && \
+ sudo apt install \
cucumber \
devscripts \
dnsmasq-base \
@@ -64,7 +62,7 @@ The following packages are necessary on Debian Stretch:
tigervnc-viewer \
xvfb \
&& \
- service libvirtd restart
+ sudo service libvirtd restart
Other requirements
==================
@@ -115,10 +113,6 @@ where `$DISPLAY` is the display given to you by `run_test_suite` (often 0):
Running the test suite as a non-root user
-----------------------------------------
-<div class="note">
-This section may not be in tested and working shape.
-</div>
-
This is entirely possible, but there's some additional configuration
required. Run the following as `root`:
diff --git a/wiki/src/contribute/release_process/test/usage.mdwn b/wiki/src/contribute/release_process/test/usage.mdwn
index 38242ac..6d06ecb 100644
--- a/wiki/src/contribute/release_process/test/usage.mdwn
+++ b/wiki/src/contribute/release_process/test/usage.mdwn
@@ -16,7 +16,7 @@ Tails automated test suite.
</p>
</div>
-Use the `run_test_suite` script found in the Tails source root to run
+Use the `run_test_suite` script found in the [[Tails source root|contribute/git#main-repo]] to run
all automated Cucumber test features. See the [[setup
documentation|test/setup]] in case you don't have a testing
environment yet. Note that the full Tails source tree must be readable
diff --git a/wiki/src/contribute/release_process/thunderbird.mdwn b/wiki/src/contribute/release_process/thunderbird.mdwn
index f540df6..93f1e38 100644
--- a/wiki/src/contribute/release_process/thunderbird.mdwn
+++ b/wiki/src/contribute/release_process/thunderbird.mdwn
@@ -12,78 +12,125 @@ this will download almost 2 GiB of data):
1. Add a remote for Debian:
- git remote add debian-upstream git://anonscm.debian.org/pkg-mozilla/thunderbird.git
+ git remote add debian-upstream https://anonscm.debian.org/git/pkg-mozilla/icedove.git
Let's pretend the scenario is that Thunderbird 45.3.0-1 has just been
released:
VERSION=45.8.0-3
- TAG=debian/1%${VERSION}
+ TAG="debian/1%${VERSION:?}"
1. `git fetch && git fetch debian-upstream`
-1. Verify the tag (expected to have been made with the key
- 8B94 819C 2555 70A3 74B6 2CCD 26E3 C875 A744 20EF):
+1. Verify the signed tag:
- git tag -v "${TAG}"
+ git tag -v "${TAG:?}"
+
+ The tag should have been signed with one of the keys that follow;
+ investigate if it's not the case:
+
+ - `8B94 819C 2555 70A3 74B6 2CCD 26E3 C875 A744 20EF`
+ - `B70D FC6F 134F ECFC 011E 62AA 8301 6014 251D 1DB0`
+ - `D343 9DAA 19DC FACD AE87 9CF2 B999 CDB5 8C8D DBD2`
1. Let's update our branch to the new version:
git checkout tails/stretch && git merge origin/tails/stretch && \
- git merge --no-edit "${TAG}"
+ git merge --no-edit "${TAG:?}"
Now you most likely will have to deal with a merge conflict in
- debian/changelog -- just reorder the entries chronologically. Then
- let's release a new version:
-
- TAILS_VERSION="1:${VERSION}+tails1" && \
- DISTRIBUTION="feature-thunderbird-${VERSION}" && \
- dch --newversion "${TAILS_VERSION}" --force-bad-version \
- --distribution "${DISTRIBUTION}" --force-distribution \
- "Rebuild Thunderbird with Tails' secure autoconfiguration patches." && \
+ `debian/changelog` -- just reorder the conflicting entries by
+ version number, `git add` modified files as needed, and ensure
+ a merge commit is created eventually.
+
+1. Let's ensure our patches still apply cleanly:
+
+ 1. Check if they do:
+
+ quilt push -a
+
+ 2. Regardless of whether our they do, clean up:
+
+ quilt pop -a && rm -rf .pc
+
+ 3. If our patches applied cleanly, move on. Otherwise:
+
+ XXX (undocumented as we prefer focusing our efforts on
+ upstreaming our patches than on documenting the current,
+ temporary state of things): after reverse-engineering the state
+ of our Git repository, it seems that one should create a new
+ `secure_account_creation-${VERSION:?}` branch forked of the
+ latest existing one, transplant our commits on top of `${TAG}`
+ with the appropriate `--onto` option, squash our commits into
+ a new `secure_account_creation-${VERSION:?}-squashed` branch,
+ extract updated patches from there into
+ `debian/patches/secure-account-creation/`.
+
+1. Then let's release a new version:
+
+ TAILS_VERSION="1:${VERSION:?}+tails1" && \
+ DISTRIBUTION="feature-thunderbird-${VERSION:?}" && \
+ dch \
+ --newversion "${TAILS_VERSION:?}" \
+ --force-bad-version \
+ --distribution "${DISTRIBUTION:?}" \
+ --force-distribution \
+ "Rebuild Thunderbird with Tails' secure autoconfiguration patches." && \
git commit debian/changelog \
- -m "document changes and release ${TAILS_VERSION}" && \
- gbp buildpackage --git-debian-branch=tails/stretch \
- --git-sign-tags --git-tag-only
+ -m "document changes and release ${TAILS_VERSION:?}"
1. Fetch the Debian sources to be used for the build:
ICEDOVE_SOURCES="$(mktemp -d)" && \
GIT_DIR="$(pwd)" && \
- cd "${ICEDOVE_SOURCES}" && \
- apt source thunderbird="1:${VERSION}" && \
- cp thunderbird_*.orig*.tar.xz "${GIT_DIR}/.." && \
- cd "${GIT_DIR}" && \
- rm -r "${ICEDOVE_SOURCES}"
+ cd "${ICEDOVE_SOURCES:?}" && \
+ apt --download-only source thunderbird="1:${VERSION:?}" && \
+ mkdir -p "${GIT_DIR:?}/../tarballs/" && \
+ for tarball in icedove_*.orig*.tar.xz ; do
+ ln -s \
+ "${GIT_DIR:?}/../tarballs/$tarball" \
+ "${GIT_DIR:?}/../$tarball"
+ done
+ cp icedove_*.orig*.tar.xz "${GIT_DIR:?}/../tarballs/" && \
+ cd "${GIT_DIR:?}" && \
+ rm -rf "${ICEDOVE_SOURCES:?}"
Note: we cannot use the `pristine-tar` branch since Jessie builds
expect split .orig sources for l10n stuff, which is not the case in
Sid, which `pristine-tar` is made for. Or something like
this. Let's not waste time on investigating this.
-1. Build packages:
+1. Build packages in a Stretch amd64 chroot:
- gbp buildpackage --git-debian-branch=tails/jessie
+ gbp buildpackage \
+ --git-debian-branch=tails/stretch \
+ --git-no-pristine-tar \
+ --git-export=WC
+
+1. Tag the new version:
+
+ gbp buildpackage --git-debian-branch=tails/stretch \
+ --git-sign-tags --git-tag-only
1. Include all sources in the `.changes` file:
CHANGES_FILE="../thunderbird_${VERSION}+tails1_amd64.changes" && \
- changestool "${CHANGES_FILE}" includeallsources
+ changestool "${CHANGES_FILE:?}" includeallsources
1. Due to [[!tails_ticket 11531]] we won't be able to push the tag
generated by `gbp` so we have to replace it with a differently
named tag:
- NEW_TAG="$(echo ${TAG} | sed 's/1%//')" && \
- git tag -s "${NEW_TAG}" -m "thunderbird Debian release 1:${VERSION}" "${TAG}" && \
- TAG="${NEW_TAG}"
+ NEW_TAG="$(echo ${TAG:?} | sed 's/1%//')" && \
+ git tag -s "${NEW_TAG:?}" -m "thunderbird Debian release 1:${VERSION:?}" "${TAG:?}" && \
+ TAG="${NEW_TAG:?}"
1. Git push and upload packages:
- git push origin "${TAG}" tails/stretch && \
- debsign "${CHANGES_FILE}" && \
- dupload --to tails "${CHANGES_FILE}"
+ git push --follow-tags origin tails/stretch && \
+ debsign "${CHANGES_FILE:?}" && \
+ dupload --to tails "${CHANGES_FILE:?}"
- At the moment pushing `TAG` may fail due to
+ At the moment pushing `$TAG` may fail due to
[[!tails_ticket 11531]]. We'll just have to save these tags locally
until when it's solved, and then push...
diff --git a/wiki/src/contribute/working_together/roles/debian_maintainer.mdwn b/wiki/src/contribute/working_together/roles/debian_maintainer.mdwn
index 7950333..f306c552 100644
--- a/wiki/src/contribute/working_together/roles/debian_maintainer.mdwn
+++ b/wiki/src/contribute/working_together/roles/debian_maintainer.mdwn
@@ -20,33 +20,25 @@ Each package listed below is in the scope of this role:
Maintain
========
-The maintainer of our Debian packages needs to take care of the following
-packages:
-
-* libgsecuredelete
-* libotr
-* mat
-* nautilus-wipe
-* onioncircuits
-* onionshare
-* pidgin-otr
-* seahorse-nautilus
-* tails-installer
-* torbirdy
-* torsocks
+The maintainer of our Debian packages needs to take care of [a bunch of
+packages](https://udd.debian.org/dmd/?email1=&email2=&email3=&packages=libgsecuredelete+libotr+mat+nautilus-wipe+onioncircuits+onionshare+pidgin-otr+seahorse-nautilus+tails-installer+torbirdy+torsocks&ignpackages=&format=html#todo).
Review and sponsor
==================
-Furthermore, the maintainer of our packages in Debian shall review and sponsor
-the following packages:
-
-* bilibop
-* keyringer
+Furthermore, the maintainer of our packages in Debian shall review and
+sponsor
+[a few more packages](https://udd.debian.org/dmd/?email1=&email2=&email3=&packages=bilibop+keyringer&ignpackages=&format=html#todo).
Not in the scope of this mission
================================
-These packages are actively maintained and tracked already:
+These packages are not part of this mission:
-* AppArmor
+* [Debian AppArmor team](https://qa.debian.org/developer.php?email=pkg-apparmor-team%40lists.alioth.debian.org)'s packages:
+ maintained by members of that team
+* Perl libraries our custom software depends on: intrigeri does it
+ with his Debian hat.
+* [[!debpts torbrowser-launcher]]: we only use its AppArmor profiles,
+ that we could easily take from upstream if the Debian package was
+ not maintained.
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 865584a..7216c7b 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
@@ -14,27 +14,25 @@ new checks.
# Plugins
-Icinga2 "plugins" are scripts or software executed by Icinga2 to
+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)
if one fits our needs. If not, you'll have to install your custom
-plugin. Check the `tails::monitoring::plugin::check_torbrowser_archive`
-manifest in the [[!tails_gitweb_repo puppet-tails]] for a good
-example.
+plugin. Example: the `tails::monitoring::plugin::check_torbrowser_archive`
+class in [[!tails_gitweb_repo puppet-tails]].
-The plugins manifests are not deployed directly, but are rather
-included from their respective "check commands" manifests. See below.
+A plugin class is not included directly: instead, it is
+included from the corresponding *check command* class. See below.
# Check commands
-"Check commands" are describing to Icinga2 the way to use plugins. It
+A *check command* tells Icinga2 how to use a plugin. It
describes the options that can be used, and helps to configure for a
service how this plugin will be executed. If you intend to use a new
-custom plugin, you also need to install the related check command. See
-the torbrowser-archive one for a good starter. See
-`tails::monitoring::checkcommand::torbrowser_archive` manifest in
-[[!tails_gitweb_repo puppet-tails]].
+custom plugin, you also need to install the related check command.
+Example: the `tails::monitoring::checkcommand::torbrowser_archive`
+class in [[!tails_gitweb_repo puppet-tails]].
If you're using a new custom plugin, that's the place where you should
include its manifest so that it is installed on every system for which a
@@ -42,42 +40,48 @@ service check is using it.
# Services
-Once plugins and check commands are implemented, you can define a
-related service check.
+Once plugins and check commands are implemented, you can define the
+corresponding *service check*.
Have a look at the `tails::monitoring::service::torbrowser_archive`
-manifest in [[!tails_gitweb_repo puppet-tails]] and the related service
+manifest in [[!tails_gitweb_repo puppet-tails]] and the corresponding service
configuration template
(`templates/monitoring/service/torbrowser_archive.erb` in the same repo).
-It is the place where the related check command manifest has to be
+It is the place where the corresponding check command class has to be
included.
There are two types of service checks:
## Remotely executed service
-Ran on the master to check a remotely hosted service. In this
-case, this service exported resources needs to be collected on the
-Icinga2 master only as we do in the `tails::monitoring::master` class
-for the `tails::monitoring::service::http` check in
-[[!tails_gitweb_repo puppet-tails]].
+Ran on the master to check a remotely hosted service. The exported
+resources for the service check need to be collected on the Icinga2
+master only. Example: the bits about the
+`tails::monitoring::service::http` check in the
+`tails::monitoring::master` class in [[!tails_gitweb_repo puppet-tails]].
## Locally executed service
-It needs to be deployed on every host that will run it.
-In this case, the exported resources for this kind of service checks
-need to be collected on the master, satellite and concerned system(s).
-That's what we do in the `tails::monitoring::{master,satellite,agent}`
-classes for the `tails::monitoring::service::memory` check in
+It needs to be deployed on every host that will run it. The exported
+resources for the service check need to be collected on the master,
+satellite and any system it should monitor.
+Example: the bits about the `tails::monitoring::service::memory` check
+in the `tails::monitoring::{master,satellite,agent}` classes in
[[!tails_gitweb_repo puppet-tails]]. Make sure that the `$nodename` and
`$tag` parameters are set when collecting such exported resources.
# Deploy
-Once all of the plugin, check command and service related manifests are
-written, it's time to configure the service check. Declare it **as an
-exported resource** in the manifest of the node which hosts the service.
+Once the plugin, check command and service related manifests are
+written, it's time to enable the service check. Declare it *as an
+exported resource* in the manifest of the node which hosts the service.
-Depending if the service is local or remote, the Puppet clients may need
+Depending on whether the service is locally or remotely executed, the
+Puppet clients may need
to be run several times on different systems for the service check
exported resource to be collected and realized correctly.
+
+Once you've verified that the check works fine for one host,
+add it (if relevant) to the
+`tails::monitoring::config::common_services` class in
+[[!tails_gitweb_repo puppet-tails]].
diff --git a/wiki/src/doc.it.po b/wiki/src/doc.it.po
index 5328887..1c6498e 100644
--- a/wiki/src/doc.it.po
+++ b/wiki/src/doc.it.po
@@ -7,14 +7,14 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"POT-Creation-Date: 2016-11-17 10:52+0000\n"
-"PO-Revision-Date: 2016-06-11 18:37+0100\n"
+"PO-Revision-Date: 2017-06-29 09:56+0000\n"
"Last-Translator: \n"
"Language-Team: ita <transitails@inventati.org>\n"
"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.10\n"
+"X-Generator: Poedit 1.8.11\n"
#. type: Plain text
#, no-wrap
@@ -80,22 +80,16 @@ msgid "[[Install from Windows|install/win/usb/overview]]"
msgstr "[[Installa da Windows|install/win/usb/overview]]"
#. type: Bullet: ' - '
-#, fuzzy
-#| msgid "[[Install from Debian or Ubuntu|install/debian/usb/overview]]"
msgid "[[Install from Debian, Ubuntu, or Mint|install/debian/usb/overview]]"
-msgstr "[[Installa da Debian o Ubuntu|install/debian/usb/overview]]"
+msgstr "[[Installa da Debian, Ubuntu o Mint|install/debian/usb/overview]]"
#. type: Bullet: ' - '
-#, fuzzy
-#| msgid ""
-#| "[[Install from Debian or Ubuntu 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]]"
msgstr ""
-"[[Installa da Debian o Ubuntu usando il terminale e GnuPG|install/expert/usb/"
-"overview]]"
+"[[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]]"
diff --git a/wiki/src/doc/about.index.it.po b/wiki/src/doc/about.index.it.po
index eeef9ed..aff2165 100644
--- a/wiki/src/doc/about.index.it.po
+++ b/wiki/src/doc/about.index.it.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"POT-Creation-Date: 2016-07-13 18:05+0300\n"
-"PO-Revision-Date: 2017-05-31 18:50+0200\n"
+"PO-Revision-Date: 2017-07-09 00:09+0000\n"
"Last-Translator: \n"
"Language-Team: ita <transitails@inventati.org>\n"
"Language: it_IT\n"
@@ -44,6 +44,8 @@ msgid "[[!traillink Trusting_Tails|about/trust]]"
msgstr "[[!traillink Fidarsi_di_Tails|about/trust]]"
#. type: Bullet: ' - '
+#, fuzzy
+#| msgid "[[!traillink License|about/license]]"
msgid "[[!traillink License_and_source_code_distribution|about/license]]"
msgstr ""
"[[!traillink Licenze_e_distribuzione_del_codice_sorgente|about/license]]"
diff --git a/wiki/src/doc/about.index.it.po.orig b/wiki/src/doc/about.index.it.po.orig
new file mode 100644
index 0000000..887957e
--- /dev/null
+++ b/wiki/src/doc/about.index.it.po.orig
@@ -0,0 +1,69 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"POT-Creation-Date: 2016-07-13 18:05+0300\n"
+<<<<<<< HEAD
+"PO-Revision-Date: 2017-05-31 18:50+0200\n"
+=======
+"PO-Revision-Date: 2017-07-09 00:09+0000\n"
+>>>>>>> C0D305TRANSLATION
+"Last-Translator: \n"
+"Language-Team: ita <transitails@inventati.org>\n"
+"Language: it_IT\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.8.11\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. type: Bullet: ' - '
+msgid "[[!traillink System_requirements|about/requirements]]"
+msgstr "[[!traillink Requisiti_di_sistema|about/requirements]]"
+
+#. type: Bullet: ' - '
+msgid "[[!traillink Warnings!|about/warning]]"
+msgstr "[[!traillink Avvertimenti|about/warning]]"
+
+#. type: Bullet: ' - '
+msgid "[[!traillink Features_and_included_software|about/features]]"
+msgstr "[[!traillink Funzionalità_e_programmi_inclusi|about/features]]"
+
+#. type: Bullet: ' - '
+msgid "[[!traillink Why_does_Tails_use_Tor?|about/tor]]"
+msgstr "[[!traillink Perchè_Tails_usa_Tor?|about/tor]]"
+
+#. type: Bullet: ' - '
+msgid ""
+"[[!traillink Can_I_hide_the_fact_that_I_am_using_Tails?|about/fingerprint]]"
+msgstr ""
+"[[!traillink Posso_nascondere_il_fatto_che_uso_Tails?|about/fingerprint]]"
+
+#. type: Bullet: ' - '
+msgid "[[!traillink Trusting_Tails|about/trust]]"
+msgstr "[[!traillink Fidarsi_di_Tails|about/trust]]"
+
+#. type: Bullet: ' - '
+msgid "[[!traillink License_and_source_code_distribution|about/license]]"
+<<<<<<< HEAD
+msgstr ""
+"[[!traillink Licenze_e_distribuzione_del_codice_sorgente|about/license]]"
+=======
+msgstr "[[!traillink Licenze_e_codice_sorgente|about/license]]"
+>>>>>>> C0D305TRANSLATION
+
+#. type: Bullet: ' - '
+msgid ""
+"[[!traillink Acknowledgments_and_similar_projects|about/"
+"acknowledgments_and_similar_projects]]"
+msgstr ""
+"[[!traillink Ringraziamenti_e_progetti_simili|about/"
+"acknowledgments_and_similar_projects]]"
+
+#. type: Bullet: ' - '
+msgid "[[!traillink Finances|about/finances]]"
+msgstr "[[!traillink Bilancio_economico|about/finances]]"
diff --git a/wiki/src/doc/about/acknowledgments_and_similar_projects.de.po b/wiki/src/doc/about/acknowledgments_and_similar_projects.de.po
index 1a2d766..77cdf7b 100644
--- a/wiki/src/doc/about/acknowledgments_and_similar_projects.de.po
+++ b/wiki/src/doc/about/acknowledgments_and_similar_projects.de.po
@@ -28,11 +28,11 @@ msgstr "Danksagungen\n"
#. type: Bullet: ' - '
msgid ""
"Tails could not exist without [[Debian|https://www.debian.org/]], [[Debian "
-"Live|http://live.debian.net]], and [[Tor|https://www.torproject.org/]]; see "
+"Live|https://www.debian.org/devel/debian-live/]], and [[Tor|https://www.torproject.org/]]; see "
"our [[contribute/relationship with upstream]] document for details."
msgstr ""
-"Tails wäre ohne [[Debian|https://www.debian.org/]], [[Debian Live|http://"
-"live.debian.net]], und [[Tor|https://www.torproject.org/]] nicht möglich; "
+"Tails wäre ohne [[Debian|https://www.debian.org/index.de.html]], [[Debian Live|https://"
+"www.debian.org/devel/debian-live/]], und [[Tor|https://www.torproject.org/]] nicht möglich; "
"siehe unsere [[Beziehungen zum Upstream|contribute/"
"relationship_with_upstream]] für Details."
diff --git a/wiki/src/doc/about/acknowledgments_and_similar_projects.fa.po b/wiki/src/doc/about/acknowledgments_and_similar_projects.fa.po
index 4f885a4..a009a69 100644
--- a/wiki/src/doc/about/acknowledgments_and_similar_projects.fa.po
+++ b/wiki/src/doc/about/acknowledgments_and_similar_projects.fa.po
@@ -32,11 +32,11 @@ msgstr "قدردانی\n"
#. type: Bullet: ' - '
msgid ""
"Tails could not exist without [[Debian|https://www.debian.org/]], [[Debian "
-"Live|http://live.debian.net]], and [[Tor|https://www.torproject.org/]]; see "
+"Live|https://www.debian.org/devel/debian-live/]], and [[Tor|https://www.torproject.org/]]; see "
"our [[contribute/relationship with upstream]] document for details."
msgstr ""
-"پروژهٔ تیلز بدون [[دبیان|https://www.debian.org/]]، [[دبیان لایو|http://live."
-"debian.net]] و [[تور|https://www.torproject.org/]] امکان‌پذیر نبود؛ برای "
+"پروژهٔ تیلز بدون [[دبیان|https://www.debian.org/index.fa.html]]، [[دبیان لایو|https://www."
+"debian.org/devel/debian-live/]] و [[تور|https://www.torproject.org/]] امکان‌پذیر نبود؛ برای "
"جزییات بیشتر رجوع کنید به سند [[contribute/relationship with upstream]] ما."
#. type: Bullet: ' - '
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 6f036ec..fea714c 100644
--- a/wiki/src/doc/about/acknowledgments_and_similar_projects.fr.po
+++ b/wiki/src/doc/about/acknowledgments_and_similar_projects.fr.po
@@ -29,11 +29,11 @@ msgstr "Remerciements\n"
#. type: Bullet: ' - '
msgid ""
"Tails could not exist without [[Debian|https://www.debian.org/]], [[Debian "
-"Live|http://live.debian.net]], and [[Tor|https://www.torproject.org/]]; see "
+"Live|https://www.debian.org/devel/debian-live/]], and [[Tor|https://www.torproject.org/]]; see "
"our [[contribute/relationship with upstream]] document for details."
msgstr ""
"Tails ne pourrait exister sans [[Debian|https://www.debian.org/index.fr."
-"html]], [[Debian Live|http://live.debian.net]] et [[Tor|https://www."
+"html]], [[Debian Live|https://www.debian.org/devel/debian-live/]] et [[Tor|https://www."
"torproject.org/]] ; pour en savoir plus, consultez la page [[contribute/"
"relationship_with_upstream]]."
diff --git a/wiki/src/doc/about/acknowledgments_and_similar_projects.it.po b/wiki/src/doc/about/acknowledgments_and_similar_projects.it.po
index d8da6b5..ab5077d 100644
--- a/wiki/src/doc/about/acknowledgments_and_similar_projects.it.po
+++ b/wiki/src/doc/about/acknowledgments_and_similar_projects.it.po
@@ -3,35 +3,40 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-01-15 11:26+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Project-Id-Version: \n"
+"POT-Creation-Date: 2017-06-22 11:11+0300\n"
+"PO-Revision-Date: 2017-07-09 11:16+0000\n"
"Language-Team: ita <transitails@inventati.org>\n"
-"Language: \n"
+"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Last-Translator: \n"
+"X-Generator: Poedit 1.8.11\n"
#. type: Plain text
#, no-wrap
msgid "[[!meta title=\"Acknowledgements and similar projects\"]]\n"
-msgstr ""
+msgstr "[[!meta title=\"Riconoscimenti e progetti simili\"]]\n"
#. type: Title =
#, no-wrap
msgid "Acknowledgements\n"
-msgstr ""
+msgstr "Riconoscimenti\n"
#. type: Bullet: ' - '
msgid ""
"Tails could not exist without [[Debian|https://www.debian.org/]], [[Debian "
-"Live|http://live.debian.net]], and [[Tor|https://www.torproject.org/]]; see "
-"our [[contribute/relationship with upstream]] document for details."
+"Live|https://www.debian.org/devel/debian-live/]], and [[Tor|https://www."
+"torproject.org/]]; see our [[contribute/relationship with upstream]] "
+"document for details."
msgstr ""
+"Tails non potrebbe esistere senza [[Debian|https://www.debian.org/]],"
+"[[Debian Live|https://www.debian.org/devel/debian-live/]], e [[Tor|https://"
+"www.torproject.org/]]; leggi il nostro documento riguardo le [[contribute/"
+"relationship with upstream]] per i dettagli."
#. type: Bullet: ' - '
msgid ""
@@ -40,12 +45,18 @@ msgid ""
"declared it to be dead on March 23rd, 2010, and wrote that Tails \"should be "
"considered as its spiritual successor\"."
msgstr ""
+"Tails è stato ispirato da [[Incognito LiveCD|http://web.archive.org/"
+"web/20090220133020/http://anonymityanywhere.com/]]. L'autore di Incognito ha "
+"dichiarato che esso è morto il 23 marzo 2010 e ha scritto che Tails "
+"\"dovrebbe essere considerato come suo successore spirituale\"."
#. type: Bullet: ' - '
msgid ""
"The [[Privatix Live-System|http://mandalka.name/privatix/]] was an early "
"source of inspiration, too."
msgstr ""
+"Inizialmente, anche il [[Privatix Live-System|http://mandalka.name/"
+"privatix/]] fu una fonte di ispirazione."
#. type: Bullet: ' - '
msgid ""
@@ -53,125 +64,138 @@ msgid ""
"improvements to our [[contribute/design/memory_erasure]] procedure) were "
"borrowed from [Liberté Linux](http://dee.su/liberte)."
msgstr ""
+"Alcune idee (in particolare [[tordate|contribute/design/Time_syncing]] e "
+"alcuni miglioramenti alla nostra procedura di [[contribute/design/"
+"cancellazione_della_memoria]] ) sono stati presi in prestito da [Liberté "
+"Linux](http://dee.su/liberte)."
#. type: Plain text
#, no-wrap
msgid "<a id=\"similar_projects\"></a>\n"
-msgstr ""
+msgstr "<a id=\"similar_projects\"></a>\n"
#. type: Title =
#, no-wrap
msgid "Similar projects\n"
-msgstr ""
+msgstr "Progetti simili\n"
#. type: Plain text
msgid ""
"Feel free to contact us if you think that your project is missing, or if "
"some project is listed in the wrong category."
msgstr ""
+"Non esitate a contattarci se pensi che il tuo progetto manchi o se un "
+"progetto è stato elencato nella categoria sbagliata."
#. type: Title ##
#, no-wrap
msgid "Active projects"
-msgstr ""
+msgstr "Progetti attivi"
#. type: Bullet: '* '
msgid "[Lightweight Portable Security](http://www.spi.dod.mil/lipose.htm)"
-msgstr ""
+msgstr "[Lightweight Portable Security](http://www.spi.dod.mil/lipose.htm)"
#. type: Bullet: '* '
msgid "[Qubes](https://www.qubes-os.org/)"
-msgstr ""
+msgstr "[Qubes](https://www.qubes-os.org/)"
#. type: Bullet: '* '
msgid "[SubgraphOS](https://subgraph.com/sgos/)"
-msgstr ""
+msgstr "[SubgraphOS](https://subgraph.com/sgos/)"
#. type: Bullet: '* '
msgid "[Whonix](https://www.whonix.org/)"
-msgstr ""
+msgstr "[Whonix](https://www.whonix.org/)"
#. type: Bullet: '* '
msgid "[Heads](https://heads.dyne.org/)"
-msgstr ""
+msgstr "[Heads](https://heads.dyne.org/)"
#. type: Title ##
#, no-wrap
msgid "Discontinued, abandoned or sleeping projects"
-msgstr ""
+msgstr "Progetti discontinui, abbandonati o dormienti"
#. type: Bullet: '* '
msgid "[Anonym.OS](http://sourceforge.net/projects/anonym-os/)"
-msgstr ""
+msgstr "[Anonym.OS](http://sourceforge.net/projects/anonym-os/)"
#. type: Bullet: '* '
msgid "[Freepto](http://www.freepto.mx/)"
-msgstr ""
+msgstr "[Freepto](http://www.freepto.mx/)"
#. type: Bullet: '* '
msgid "[IprediaOS](http://www.ipredia.org/)"
-msgstr ""
+msgstr "[IprediaOS](http://www.ipredia.org/)"
#. type: Bullet: '* '
msgid "[ISXUbuntu](http://www.isoc-ny.org/wiki/ISXubuntu)"
-msgstr ""
+msgstr "[ISXUbuntu](http://www.isoc-ny.org/wiki/ISXubuntu)"
#. type: Bullet: '* '
msgid "[ELE](http://www.northernsecurity.net/download/ele/) (dead link)"
msgstr ""
+"[ELE](http://www.northernsecurity.net/download/ele/) (collegamento fuori uso)"
#. type: Bullet: '* '
msgid ""
"[Estrella Roja](http://distrowatch.com/table.php?distribution=estrellaroja)"
msgstr ""
+"[Estrella Roja](http://distrowatch.com/table.php?distribution=estrellaroja)"
#. type: Bullet: '* '
msgid "[The Haven Project](https://www.haven-project.org/) (dead link)"
msgstr ""
+"[The Haven Project](https://www.haven-project.org/) (collegamento fuori uso)"
#. type: Bullet: '* '
msgid ""
"[The Incognito LiveCD](http://web.archive.org/web/20090220133020/http://"
"anonymityanywhere.com/)"
msgstr ""
+"[The Incognito LiveCD](http://web.archive.org/web/20090220133020/http://"
+"anonymityanywhere.com/)"
#. type: Bullet: '* '
msgid ""
"[JonDo Live-CD](https://anonymous-proxy-servers.net/en/jondo-live-cd.html)"
msgstr ""
+"[JonDo Live-CD](https://anonymous-proxy-servers.net/en/jondo-live-cd.html)"
#. type: Bullet: '* '
msgid "[Liberté Linux](http://dee.su/liberte)"
-msgstr ""
+msgstr "[Liberté Linux](http://dee.su/liberte)"
#. type: Bullet: '* '
msgid "[Odebian](http://www.odebian.org/)"
-msgstr ""
+msgstr "[Odebian](http://www.odebian.org/)"
#. type: Bullet: '* '
msgid "[onionOS](http://jamon.name/files/onionOS/) (dead link)"
-msgstr ""
+msgstr "[onionOS](http://jamon.name/files/onionOS/) (collegamento fuori uso)"
#. type: Bullet: '* '
msgid "[ParanoidLinux](http://www.paranoidlinux.org/) (dead link)"
msgstr ""
+"[ParanoidLinux](http://www.paranoidlinux.org/) (collegamento fuori uso)"
#. type: Bullet: '* '
msgid "[Phantomix](http://phantomix.ytternhagen.de/)"
-msgstr ""
+msgstr "[Phantomix](http://phantomix.ytternhagen.de/)"
#. type: Bullet: '* '
msgid "[Polippix](http://polippix.org/)"
-msgstr ""
+msgstr "[Polippix](http://polippix.org/)"
#. type: Bullet: '* '
msgid "[Privatix](http://www.mandalka.name/privatix/)"
-msgstr ""
+msgstr "[Privatix](http://www.mandalka.name/privatix/)"
#. type: Bullet: '* '
msgid "[Ubuntu Privacy Remix](https://www.privacy-cd.org/)"
-msgstr ""
+msgstr "[Ubuntu Privacy Remix](https://www.privacy-cd.org/)"
#. type: Bullet: '* '
msgid "[uVirtus](http://uvirtus.org/)"
-msgstr ""
+msgstr "[uVirtus](http://uvirtus.org/)"
diff --git a/wiki/src/doc/about/acknowledgments_and_similar_projects.mdwn b/wiki/src/doc/about/acknowledgments_and_similar_projects.mdwn
index 7f28593..5bd926a 100644
--- a/wiki/src/doc/about/acknowledgments_and_similar_projects.mdwn
+++ b/wiki/src/doc/about/acknowledgments_and_similar_projects.mdwn
@@ -4,7 +4,7 @@ Acknowledgements
================
- Tails could not exist without [[Debian|https://www.debian.org/]],
- [[Debian Live|http://live.debian.net]], and
+ [[Debian Live|https://www.debian.org/devel/debian-live/]], and
[[Tor|https://www.torproject.org/]]; see our
[[contribute/relationship with upstream]] document for details.
- Tails was inspired by the [[Incognito
diff --git a/wiki/src/doc/about/acknowledgments_and_similar_projects.pt.po b/wiki/src/doc/about/acknowledgments_and_similar_projects.pt.po
index 3ea8698..4a20c05 100644
--- a/wiki/src/doc/about/acknowledgments_and_similar_projects.pt.po
+++ b/wiki/src/doc/about/acknowledgments_and_similar_projects.pt.po
@@ -28,11 +28,11 @@ msgstr "Agradecimentos\n"
#. type: Bullet: ' - '
msgid ""
"Tails could not exist without [[Debian|https://www.debian.org/]], [[Debian "
-"Live|http://live.debian.net]], and [[Tor|https://www.torproject.org/]]; see "
+"Live|https://www.debian.org/devel/debian-live/]], and [[Tor|https://www.torproject.org/]]; see "
"our [[contribute/relationship with upstream]] document for details."
msgstr ""
-"Tails não poderia existir sem o [[Debian|https://www.debian.org/]], o "
-"[[Debian Live|http://live.debian.net]], e o [[Tor|https://www.torproject."
+"Tails não poderia existir sem o [[Debian|https://www.debian.org/index.pt.html]], o "
+"[[Debian Live|https://www.debian.org/devel/debian-live/]], e o [[Tor|https://www.torproject."
"org/]]; veja nosso documento sobre o [[relacionamento com *upstream*|"
"contribute/relationship with upstream]] para mais detalhes."
diff --git a/wiki/src/doc/about/features.de.po b/wiki/src/doc/about/features.de.po
index 1c5a3a9..9fa0231 100644
--- a/wiki/src/doc/about/features.de.po
+++ b/wiki/src/doc/about/features.de.po
@@ -27,8 +27,8 @@ msgid "[[!toc levels=2]]\n"
msgstr "[[!toc levels=2]]\n"
#. type: Plain text
-msgid "Tails is based on [[Debian|https://www.debian.org/]] 8 (Jessie)."
-msgstr "Tails basiert auf [[Debian|https://www.debian.org/]] 8 (Jessie)."
+msgid "Tails is based on [[Debian|https://www.debian.org/]] 9 (Stretch)."
+msgstr "Tails basiert auf [[Debian|https://www.debian.org/index.de.html]] 9 (Stretch)."
#. type: Title =
#, no-wrap
@@ -137,23 +137,23 @@ msgstr "Desktop-Ausgabe\n"
#. type: Bullet: '* '
msgid ""
-"[LibreOffice](http://www.libreoffice.org/) ([[More...|doc/"
+"[LibreOffice](https://www.libreoffice.org/) ([[More...|doc/"
"sensitive_documents/office_suite]])"
msgstr ""
-"[LibreOffice](http://www.libreoffice.org/) ([[Mehr...|doc/"
+"[LibreOffice](https://de.libreoffice.org/) ([[Mehr...|doc/"
"sensitive_documents/office_suite]])"
#. type: Bullet: '* '
msgid ""
-"[Gimp](http://www.gimp.org/) and [Inkscape](https://inkscape.org/) to edit "
+"[Gimp](https://www.gimp.org/) and [Inkscape](https://inkscape.org/) to edit "
"images ([[More...|doc/sensitive_documents/graphics]])"
msgstr ""
-"[Gimp](http://www.gimp.org/) und [Inkscape](https://inkscape.org/de/) zum "
+"[Gimp](https://www.gimp.org/) und [Inkscape](https://inkscape.org/de/) zum "
"Bearbeiten von Bildern ([[Mehr...|doc/sensitive_documents/graphics]])"
#. type: Bullet: '* '
-msgid "[Scribus](http://www.scribus.net) for page layout"
-msgstr "[Scribus](http://www.scribus.net) ein Layout-Programm"
+msgid "[Scribus](https://www.scribus.net/) for page layout"
+msgstr "[Scribus](https://www.scribus.net/) ein Layout-Programm"
#. type: Bullet: '* '
#, fuzzy
@@ -169,42 +169,42 @@ msgstr ""
#. type: Bullet: '* '
msgid ""
-"[Audacity](http://audacity.sourceforge.net/) for recording and editing "
+"[Audacity](https://www.audacityteam.org/) for recording and editing "
"sounds ([[More...|doc/sensitive_documents/sound_and_video]])"
msgstr ""
-"[Audacity](http://audacity.sourceforge.net/) zum Aufnehmen und Bearbeiten "
+"[Audacity](https://www.audacityteam.org/) zum Aufnehmen und Bearbeiten "
"von Sound ([[Mehr...|doc/sensitive_documents/sound_and_video]])"
#. type: Bullet: '* '
msgid ""
-"[PiTiVi](http://www.pitivi.org/) for non-linear audio/video editing "
+"[PiTiVi](http://pitivi.org/) for non-linear audio/video editing "
"([[More...|doc/sensitive_documents/sound_and_video]])"
msgstr ""
-"[PiTiVi](http://www.pitivi.org/) zur nicht-linearen Audio-/Videobearbeitung "
+"[PiTiVi](http://pitivi.org/) zur nicht-linearen Audio-/Videobearbeitung "
"([[Mehr...|doc/sensitive_documents/sound_and_video]])"
#. type: Bullet: '* '
-msgid "[Poedit](http://poedit.sourceforge.net/) to edit .po files"
-msgstr "[Poedit](http://poedit.sourceforge.net/) zum Editieren von .po Dateien"
+msgid "[Poedit](https://poedit.net/) to edit .po files"
+msgstr "[Poedit](https://poedit.net/) zum Editieren von .po Dateien"
#. type: Bullet: '* '
msgid ""
-"[Simple Scan](https://launchpad.net/simple-scan) and [SANE](http://www.sane-"
+"[Simple Scan](https://launchpad.net/simple-scan) and [SANE](http://sane-"
"project.org/) for scanner support"
msgstr ""
-"[Simple Scan](https://launchpad.net/simple-scan) und [SANE](http://www.sane-"
+"[Simple Scan](https://launchpad.net/simple-scan) und [SANE](http://sane-"
"project.org/) zum Scannen"
#. type: Bullet: '* '
-msgid "[Brasero](http://projects.gnome.org/brasero/) to burn CD/DVDs"
-msgstr "[Brasero](http://projects.gnome.org/brasero/) zum Brennen von CDs/DVDs"
+msgid "[Brasero](https://wiki.gnome.org/Apps/Brasero) to burn CD/DVDs"
+msgstr "[Brasero](https://wiki.gnome.org/Apps/Brasero) zum Brennen von CDs/DVDs"
#. type: Bullet: '* '
msgid ""
-"[Sound Juicer](http://burtonini.com/blog/computers/sound-juicer) to rip "
+"[Sound Juicer](https://wiki.gnome.org/Apps/SoundJuicer) to rip "
"audio CDs"
msgstr ""
-"[Sound Juicer](http://burtonini.com/blog/computers/sound-juicer) um Audio-"
+"[Sound Juicer](https://wiki.gnome.org/Apps/SoundJuicer) um Audio-"
"CDs auszulesen"
#. type: Bullet: '* '
diff --git a/wiki/src/doc/about/features.fa.po b/wiki/src/doc/about/features.fa.po
index f231e4f..81f1007 100644
--- a/wiki/src/doc/about/features.fa.po
+++ b/wiki/src/doc/about/features.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-05-19 17:19+0200\n"
+"POT-Creation-Date: 2017-06-27 10:01+0300\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/features/"
@@ -34,7 +34,7 @@ msgstr "[[!toc levels=2]]\n"
#| msgid ""
#| "Tails is based on [[Debian|https://www.debian.org/]] 7 (Wheezy). It will "
#| "switch to Debian 8 (Jessie) a few months after its release."
-msgid "Tails is based on [[Debian|https://www.debian.org/]] 8 (Jessie)."
+msgid "Tails is based on [[Debian|https://www.debian.org/]] 9 (Stretch)."
msgstr ""
"تیلز مبتنی بر [[دبیان|https://www.debian.org/]] ۷ (ویزی) است که چند ماه بعد "
"از انتشار آن به دبیان ۸ ارتقا پیدا می‌کند."
@@ -140,23 +140,23 @@ msgstr "نسخهٔ دسکتاپ\n"
#. type: Bullet: '* '
msgid ""
-"[LibreOffice](http://www.libreoffice.org/) ([[More...|doc/"
+"[LibreOffice](https://www.libreoffice.org/) ([[More...|doc/"
"sensitive_documents/office_suite]])"
msgstr ""
-"[لیبره‌آفیس](http://www.libreoffice.org/) ([[بیشتر...|doc/sensitive_documents/"
+"[لیبره‌آفیس](https://fa.libreoffice.org/) ([[بیشتر...|doc/sensitive_documents/"
"office_suite]])"
#. type: Bullet: '* '
msgid ""
-"[Gimp](http://www.gimp.org/) and [Inkscape](https://inkscape.org/) to edit "
+"[Gimp](https://www.gimp.org/) and [Inkscape](https://inkscape.org/) to edit "
"images ([[More...|doc/sensitive_documents/graphics]])"
msgstr ""
-"[Gimp](http://www.gimp.org/) و [Inkscape](https://inkscape.org/) برای ویرایش "
-"عکس ([[بیشتر...|doc/sensitive_documents/graphics]])"
+"[Gimp](https://www.gimp.org/) و [Inkscape](https://inkscape.org/) برای "
+"ویرایش عکس ([[بیشتر...|doc/sensitive_documents/graphics]])"
#. type: Bullet: '* '
-msgid "[Scribus](http://www.scribus.net) for page layout"
-msgstr "[Scribus](http://www.scribus.net) برای چیدمان صفحه"
+msgid "[Scribus](https://www.scribus.net/) for page layout"
+msgstr "[Scribus](https://www.scribus.net/) برای چیدمان صفحه"
#. type: Bullet: '* '
#, fuzzy
@@ -172,45 +172,44 @@ msgstr ""
#. type: Bullet: '* '
msgid ""
-"[Audacity](http://audacity.sourceforge.net/) for recording and editing "
-"sounds ([[More...|doc/sensitive_documents/sound_and_video]])"
+"[Audacity](https://www.audacityteam.org/) for recording and editing sounds "
+"([[More...|doc/sensitive_documents/sound_and_video]])"
msgstr ""
-"[آداسیتی](http://audacity.sourceforge.net/)برای ثبت و ویرایش صدا ([[بیشتر...|"
+"[آداسیتی](https://www.audacityteam.org/)برای ثبت و ویرایش صدا ([[بیشتر...|"
"doc/sensitive_documents/sound_and_video]])"
#. type: Bullet: '* '
msgid ""
-"[PiTiVi](http://www.pitivi.org/) for non-linear audio/video editing "
-"([[More...|doc/sensitive_documents/sound_and_video]])"
-msgstr ""
-"[PiTiVi](http://www.pitivi.org/) برای ویرایش غیرخطی صدا و ویدئو ([[بیشتر...|"
+"[PiTiVi](http://pitivi.org/) for non-linear audio/video editing ([[More...|"
"doc/sensitive_documents/sound_and_video]])"
+msgstr ""
+"[PiTiVi](http://pitivi.org/) برای ویرایش غیرخطی صدا و ویدئو ([[بیشتر...|doc/"
+"sensitive_documents/sound_and_video]])"
#. type: Bullet: '* '
-msgid "[Poedit](http://poedit.sourceforge.net/) to edit .po files"
-msgstr "[Poedit](http://poedit.sourceforge.net/) برای ویرایش فایل‌های .po"
+msgid "[Poedit](https://poedit.net/) to edit .po files"
+msgstr "[Poedit](https://poedit.net/) برای ویرایش فایل‌های .po"
#. type: Bullet: '* '
msgid ""
-"[Simple Scan](https://launchpad.net/simple-scan) and [SANE](http://www.sane-"
+"[Simple Scan](https://launchpad.net/simple-scan) and [SANE](http://sane-"
"project.org/) for scanner support"
msgstr ""
-"[Simple Scan](https://launchpad.net/simple-scan) و [SANE](http://www.sane-"
+"[Simple Scan](https://launchpad.net/simple-scan) و [SANE](http://sane-"
"project.org/) برای پشتیبانی اسکنر"
#. type: Bullet: '* '
#, fuzzy
#| msgid "[Brasero](http://projects.gnome.org/brasero/) to burn CD/DVD"
-msgid "[Brasero](http://projects.gnome.org/brasero/) to burn CD/DVDs"
+msgid "[Brasero](https://wiki.gnome.org/Apps/Brasero) to burn CD/DVDs"
msgstr "[Brasero](http://projects.gnome.org/brasero/) برای ایجاد سی‌دی و دی‌وی‌دی"
#. type: Bullet: '* '
msgid ""
-"[Sound Juicer](http://burtonini.com/blog/computers/sound-juicer) to rip "
-"audio CDs"
+"[Sound Juicer](https://wiki.gnome.org/Apps/SoundJuicer) to rip audio CDs"
msgstr ""
-"[Sound Juicer](http://burtonini.com/blog/computers/sound-juicer) برای ایجاد "
-"سی‌دی‌های صوتی"
+"[Sound Juicer](https://wiki.gnome.org/Apps/SoundJuicer) برای ایجاد سی‌دی‌های "
+"صوتی"
#. type: Bullet: '* '
msgid ""
diff --git a/wiki/src/doc/about/features.fr.po b/wiki/src/doc/about/features.fr.po
index 225d975..46dcdb9 100644
--- a/wiki/src/doc/about/features.fr.po
+++ b/wiki/src/doc/about/features.fr.po
@@ -27,10 +27,10 @@ msgid "[[!toc levels=2]]\n"
msgstr "[[!toc levels=2]]\n"
#. type: Plain text
-msgid "Tails is based on [[Debian|https://www.debian.org/]] 8 (Jessie)."
+msgid "Tails is based on [[Debian|https://www.debian.org/]] 9 (Stretch)."
msgstr ""
-"Tails est basé sur [[Debian|https://www.debian.org/index.fr.html]] 8 "
-"(Jessie)."
+"Tails est basé sur [[Debian|https://www.debian.org/index.fr.html]] 9 "
+"(Stretch)."
#. type: Title =
#, no-wrap
@@ -114,25 +114,25 @@ msgstr "Bureautique\n"
#. type: Bullet: '* '
msgid ""
-"[LibreOffice](http://www.libreoffice.org/) ([[More...|doc/"
+"[LibreOffice](https://www.libreoffice.org/) ([[More...|doc/"
"sensitive_documents/office_suite]])"
msgstr ""
-"[LibreOffice](http://www.libreoffice.org/) ([[Plus d'information...|doc/"
+"[LibreOffice](https://fr.libreoffice.org/) ([[Plus d'information...|doc/"
"sensitive_documents/office_suite]])"
#. type: Bullet: '* '
msgid ""
-"[Gimp](http://www.gimp.org/) and [Inkscape](https://inkscape.org/) to edit "
+"[Gimp](https://www.gimp.org/) and [Inkscape](https://inkscape.org/) to edit "
"images ([[More...|doc/sensitive_documents/graphics]])"
msgstr ""
-"[Gimp](http://www.gimp.org/) et [Inkscape](https://inkscape.org/fr/) pour la "
+"[Gimp](https://www.gimp.org/) et [Inkscape](https://inkscape.org/fr/) pour la "
"retouche d'images ([[Plus d'information...|doc/sensitive_documents/"
"graphics]])"
#. type: Bullet: '* '
-msgid "[Scribus](http://www.scribus.net) for page layout"
+msgid "[Scribus](https://www.scribus.net/) for page layout"
msgstr ""
-"[Scribus](http://www.scribus.net), un logiciel de mise en page (PAO, "
+"[Scribus](https://www.scribus.net/), un logiciel de mise en page (PAO, "
"publication assistée par ordinateur)"
#. type: Bullet: '* '
@@ -145,44 +145,44 @@ msgstr ""
#. type: Bullet: '* '
msgid ""
-"[Audacity](http://audacity.sourceforge.net/) for recording and editing "
+"[Audacity](https://www.audacityteam.org/) for recording and editing "
"sounds ([[More...|doc/sensitive_documents/sound_and_video]])"
msgstr ""
-"[Audacity](http://audacity.sourceforge.net/) pour l'enregistrement et "
+"[Audacity](https://www.audacityteam.org/) pour l'enregistrement et "
"l'édition audio ([[Plus d'information...|doc/sensitive_documents/"
"sound_and_video]])"
#. type: Bullet: '* '
msgid ""
-"[PiTiVi](http://www.pitivi.org/) for non-linear audio/video editing "
+"[PiTiVi](http://pitivi.org/) for non-linear audio/video editing "
"([[More...|doc/sensitive_documents/sound_and_video]])"
msgstr ""
-"[PiTiVi](http://www.pitivi.org/) pour le montage audio/vidéo non-linéaire "
+"[PiTiVi](http://pitivi.org/) pour le montage audio/vidéo non-linéaire "
"([[Plus d'information...|doc/sensitive_documents/sound_and_video]])"
#. type: Bullet: '* '
-msgid "[Poedit](http://poedit.sourceforge.net/) to edit .po files"
-msgstr "[Poedit](http://poedit.sourceforge.net/) pour éditer les fichiers .po"
+msgid "[Poedit](https://poedit.net/) to edit .po files"
+msgstr "[Poedit](https://poedit.net/) pour éditer les fichiers .po"
#. type: Bullet: '* '
msgid ""
-"[Simple Scan](https://launchpad.net/simple-scan) and [SANE](http://www.sane-"
+"[Simple Scan](https://launchpad.net/simple-scan) and [SANE](http://sane-"
"project.org/) for scanner support"
msgstr ""
-"[Simple Scan](https://launchpad.net/simple-scan) et [SANE](http://www.sane-"
+"[Simple Scan](https://launchpad.net/simple-scan) et [SANE](http://sane-"
"project.org/) pour la gestion du scanner"
#. type: Bullet: '* '
-msgid "[Brasero](http://projects.gnome.org/brasero/) to burn CD/DVDs"
+msgid "[Brasero](https://wiki.gnome.org/Apps/Brasero) to burn CD/DVDs"
msgstr ""
-"[Brasero](http://projects.gnome.org/brasero/) pour graver des CD ou DVD"
+"[Brasero](https://wiki.gnome.org/Apps/Brasero) pour graver des CD ou DVD"
#. type: Bullet: '* '
msgid ""
-"[Sound Juicer](http://burtonini.com/blog/computers/sound-juicer) to rip "
+"[Sound Juicer](https://wiki.gnome.org/Apps/SoundJuicer) to rip "
"audio CDs"
msgstr ""
-"[Sound Juicer](http://burtonini.com/blog/computers/sound-juicer) pour "
+"[Sound Juicer](https://wiki.gnome.org/Apps/SoundJuicer) pour "
"encoder les CD audio"
#. type: Bullet: '* '
diff --git a/wiki/src/doc/about/features.it.po b/wiki/src/doc/about/features.it.po
index 787538e..f4878a6 100644
--- a/wiki/src/doc/about/features.it.po
+++ b/wiki/src/doc/about/features.it.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: revisione ignifugo\n"
"POT-Creation-Date: 2017-05-19 17:19+0200\n"
-"PO-Revision-Date: 2017-07-20 19:00+0200\n"
-"Last-Translator: boyska <piuttosto@logorroici.org>\n"
+"PO-Revision-Date: 2017-07-27 08:56+0200\n"
+"Last-Translator: \n"
"Language-Team: ita <transitails@inventati.org>\n"
"Language: it\n"
"MIME-Version: 1.0\n"
@@ -51,7 +51,32 @@ msgid "Networking\n"
msgstr "Connessioni\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "* [Tor](https://www.torproject.org) with:\n"
+#| " - [[stream isolation|contribute/design/stream_isolation]]\n"
+#| " - regular, obfs2, obfs3, obfs4, and ScrambleSuit bridges support\n"
+#| "* [NetworkManager](http://projects.gnome.org/NetworkManager/) for easy\n"
+#| " network configuration ([[More...|doc/anonymous_internet/networkmanager]])\n"
+#| "* [Tor Browser](https://www.torproject.org/projects/torbrowser.html.en) ([[More...|doc/anonymous_internet/Tor_Browser]]), a web\n"
+#| " browser based on [Mozilla Firefox](http://getfirefox.com) and modified to protect your anonymity with:\n"
+#| " - [Torbutton](https://www.torproject.org/torbutton) for anonymity\n"
+#| " and protection against evil JavaScript\n"
+#| " - all cookies are treated as session cookies by default;\n"
+#| " - [HTTPS Everywhere](https://www.eff.org/https-everywhere)\n"
+#| " transparently enables SSL-encrypted connections to a great number\n"
+#| " of major websites\n"
+#| " - [NoScript](http://noscript.net/) to have even more control over JavaScript.\n"
+#| " - [AdBlock Plus](https://adblockplus.org/en/firefox) to remove advertisements.\n"
+#| "* [Pidgin](http://www.pidgin.im/) preconfigured with\n"
+#| " [OTR](http://www.cypherpunks.ca/otr/index.php) for Off-the-Record\n"
+#| " Messaging ([[More...|doc/anonymous_internet/pidgin]])\n"
+#| "* [Thunderbird](https://www.mozilla.org/en-US/thunderbird/) email client with [Enigmail](https://www.enigmail.net/) for OpenPGP support ([[More...|doc/anonymous_internet/thunderbird]])\n"
+#| "* [Liferea](http://liferea.sourceforge.net/) feed aggregator\n"
+#| "* [Gobby](http://gobby.0x539.de/trac/) for collaborative text writing\n"
+#| "* [Aircrack-ng](http://aircrack-ng.org/) for wireless network auditing\n"
+#| "* [I2P](https://geti2p.net/) an anonymizing network ([[More...|doc/anonymous_internet/i2p]])\n"
+#| "* [Electrum](https://electrum.org/), an easy-to-use bitcoin client ([[More...|doc/anonymous_internet/electrum]])\n"
msgid ""
"* [Tor](https://www.torproject.org) with:\n"
" - [[stream isolation|contribute/design/stream_isolation]]\n"
@@ -93,16 +118,16 @@ msgstr ""
" rende attiva in maniera trasparente la connessione cifrata SSL in nella maggior parte dei \n"
" dei siti web\n"
" - [NoScript](http://noscript.net/) per avere più controllo su JavaScript.\n"
-" - [uBlock Origin](https://github.com/gorhill/uBlock/) per rimuovere le pubblicità.\n"
+" - [AdBlock Plus](https://adblockplus.org/en/firefox) per rimuovere la pubblicità.\n"
"* [Pidgin](http://www.pidgin.im/) preconfigurato con\n"
" [OTR](http://www.cypherpunks.ca/otr/index.php) per messaggistica Off-the-Record\n"
-" ([[More...|doc/anonymous_internet/pidgin]])\n"
-"* [OnionShare](https://onionshare.org/) per filesharing anonimo\n"
-"* [Thunderbird](https://www.mozilla.org/en-US/thunderbird/) client email con [Enigmail](https://www.enigmail.net/) per il supporto a OpenPGP ([[More...|doc/anonymous_internet/thunderbird]])\n"
-"* [Liferea](http://liferea.sourceforge.net/) aggregatore feed \n"
+" ([[leggi di più...|doc/anonymous_internet/pidgin]])\n"
+"* [OnionShare](https://onionshare.org/) per la condivisione di file in anonimato\n"
+"* [Thunderbird](https://www.mozilla.org/en-US/thunderbird/) un client email con [Enigmail](https://www.enigmail.net/) per il supporto a OpenPGP ([[leggi di più...|doc/anonymous_internet/thunderbird]])\n"
+"* [Liferea](http://liferea.sourceforge.net/) aggregatore di feed \n"
"* [Gobby](http://gobby.0x539.de/trac/) per la scrittura di testi collaborativi\n"
-"* [Aircrack-ng](http://aircrack-ng.org/) per l'ascolto di network wireless\n"
-"* [Electrum](https://electrum.org/), un client bitcoin facile da usare ([[More...|doc/anonymous_internet/electrum]])\n"
+"* [Aircrack-ng](http://aircrack-ng.org/) per la verifica della rete wireless\n"
+"* [Electrum](https://electrum.org/), un client bitcoin facile da usare ([[leggi di più...|doc/anonymous_internet/electrum]])\n"
#. type: Title -
#, no-wrap
@@ -138,7 +163,7 @@ msgid ""
"GNOME Sound Recorder for recording sound ([[More...|doc/sensitive_documents/"
"sound_and_video]])"
msgstr ""
-"GNOME Sound Recorder come registratore di suoni ([[More...|doc/"
+"GNOME Sound Recorder per la registrazione di file audio ([[leggi di più...|doc/"
"sensitive_documents/sound_and_video]])"
#. type: Bullet: '* '
@@ -286,14 +311,19 @@ msgstr ""
"foglio di carta ([[Plus d'information...|doc/advanced_topics/paperkey]])"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "The full packages list can be found in the [BitTorrent files download "
+#| "directory](/torrents/files/) (look for files with the `.packages` "
+#| "extension)."
msgid ""
"The full packages list can be found in the [BitTorrent files download "
"directory](https://tails.boum.org/torrents/files/) (look for files with the "
"`.packages` extension)."
msgstr ""
-"La lista completa dei pacchetti che si possono trovare nella [cartella di "
-"scaricamento dei file BitTorrent](https://tails.boum.org/torrents/files/) "
-"(guarda per i file con l'estensione '.packages')"
+"La lista completa dei pacchetti può essere trovata nella [cartella di download dei "
+"file BitTorrent](https://tails.boum.org/torrents/files/) (guarda per i file con "
+"l'estensione '.packages')"
#. type: Title =
#, no-wrap
@@ -364,13 +394,17 @@ msgstr ""
"con AppArmor"
#. type: Bullet: '* '
+#, fuzzy
+#| msgid ""
+#| "To prevent cold-boot attacks and various memory forensics, Tails erases "
+#| "memory on shutdown and when the boot media is physically removed."
msgid ""
"To prevent cold-boot attacks and various memory forensics, Tails erases most "
"memory on shutdown and when the boot media is physically removed."
msgstr ""
-"Per prevenire attacchi \"cold-boot\" e altre ispezioni forensi alla memoria, "
-"Tails cancella la memoria allo spegnimento del PC e quando il supporto di "
-"avvio (es l'USB) viene fisicamente staccato"
+"Per prevenire attacchi \"cold-boot\" e ispezioni forensi della memoria, Tails "
+"cancella la memoria allo spegnimento e quando il supporto di avvio è fisicamente "
+"staccato"
#. type: Title =
#, no-wrap
diff --git a/wiki/src/doc/about/features.it.po.orig b/wiki/src/doc/about/features.it.po.orig
new file mode 100644
index 0000000..a12cf7d
--- /dev/null
+++ b/wiki/src/doc/about/features.it.po.orig
@@ -0,0 +1,451 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: revisione ignifugo\n"
+"POT-Creation-Date: 2017-05-19 17:19+0200\n"
+<<<<<<< HEAD
+"PO-Revision-Date: 2017-07-20 19:00+0200\n"
+"Last-Translator: boyska <piuttosto@logorroici.org>\n"
+=======
+"PO-Revision-Date: 2017-07-27 08:56+0200\n"
+"Last-Translator: \n"
+>>>>>>> C0D305TRANSLATION
+"Language-Team: ita <transitails@inventati.org>\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.8.11\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"Features and included software\"]]\n"
+msgstr "[[!meta title=\"Caratteristiche e software incluso\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!toc levels=2]]\n"
+msgstr "[[!toc levels=2]]\n"
+
+#. type: Plain text
+msgid "Tails is based on [[Debian|https://www.debian.org/]] 9 (Stretch)."
+msgstr "Tails è basato su [[Debian|https://www.debian.org/index.it.html]] 9 (Stretch)"
+
+#. type: Title =
+#, no-wrap
+msgid "Included software\n"
+msgstr "Software incluso\n"
+
+#. type: Bullet: '* '
+msgid ""
+"[GNOME](http://www.gnome.org), an intuitive and attractive desktop environment "
+"([[More...|doc/first_steps/introduction_to_gnome_and_the_tails_desktop]])"
+msgstr ""
+"[GNOME](http://www.gnome.org), un intuitivo ed elegante ambiente desktop "
+"([[Maggiori informazioni...|doc/first_steps/"
+"introduction_to_gnome_and_the_tails_desktop]])"
+
+#. type: Title -
+#, no-wrap
+msgid "Networking\n"
+msgstr "Connessioni\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"* [Tor](https://www.torproject.org) with:\n"
+" - [[stream isolation|contribute/design/stream_isolation]]\n"
+" - regular, obfs2, obfs3, obfs4, and ScrambleSuit bridges support\n"
+" - the Onion Circuits graphical frontend ([[More...|doc/anonymous_internet/tor_status#circuits]])\n"
+"* [NetworkManager](http://projects.gnome.org/NetworkManager/) for easy\n"
+" network configuration ([[More...|doc/anonymous_internet/networkmanager]])\n"
+"* [Tor Browser](https://www.torproject.org/projects/torbrowser.html.en) ([[More...|doc/anonymous_internet/Tor_Browser]]), a web\n"
+" browser based on [Mozilla Firefox](http://getfirefox.com) and modified to protect your anonymity with:\n"
+" - [Torbutton](https://www.torproject.org/docs/torbutton/) for anonymity\n"
+" and protection against evil JavaScript\n"
+" - all cookies are treated as session cookies by default;\n"
+" - [HTTPS Everywhere](https://www.eff.org/https-everywhere)\n"
+" transparently enables SSL-encrypted connections to a great number\n"
+" of major websites\n"
+" - [NoScript](http://noscript.net/) to have even more control over JavaScript.\n"
+" - [uBlock Origin](https://github.com/gorhill/uBlock/) to remove advertisements.\n"
+"* [Pidgin](http://www.pidgin.im/) preconfigured with\n"
+" [OTR](http://www.cypherpunks.ca/otr/index.php) for Off-the-Record\n"
+" Messaging ([[More...|doc/anonymous_internet/pidgin]])\n"
+"* [OnionShare](https://onionshare.org/) for anonymous filesharing\n"
+"* [Thunderbird](https://www.mozilla.org/en-US/thunderbird/) email client with [Enigmail](https://www.enigmail.net/) for OpenPGP support ([[More...|doc/anonymous_internet/thunderbird]])\n"
+"* [Liferea](http://liferea.sourceforge.net/) feed aggregator\n"
+"* [Gobby](http://gobby.0x539.de/trac/) for collaborative text writing\n"
+"* [Aircrack-ng](http://aircrack-ng.org/) for wireless network auditing\n"
+"* [Electrum](https://electrum.org/), an easy-to-use bitcoin client ([[More...|doc/anonymous_internet/electrum]])\n"
+msgstr ""
+"* [Tor](https://www.torproject.org) con:\n"
+" - [[stream isolation|contribute/design/stream_isolation]]\n"
+" - regular, obfs2, obfs3, obfs4, e supporto a ScrambleSuit bridges \n"
+" - il front-end grafico di Onion Circuits ([[leggi di più...|doc/anonymous_internet/tor_status#circuits]])\n"
+"* [NetworkManager](http://projects.gnome.org/NetworkManager/) per una facile\n"
+" configurazione delle reti ([[leggi di più...|doc/anonymous_internet/networkmanager]])\n"
+"* [Tor Browser](https://www.torproject.org/projects/torbrowser.html.en) ([[leggi di più...|doc/anonymous_internet/Tor_Browser]]), un web\n"
+" browser basato su [Mozilla Firefox](http://getfirefox.com) e modificato per proteggere il tuo anonimato con:\n"
+" - [Torbutton](https://www.torproject.org/torbutton) per l'anonimato \n"
+" e protezione contro il JavaScript malevolo\n"
+" - tutti i cookie sono trattati come cookye di sessione per default;\n"
+" - [HTTPS Everywhere](https://www.eff.org/https-everywhere)\n"
+" rende attiva in maniera trasparente la connessione cifrata SSL nella maggior parte\n"
+" dei siti web\n"
+" - [NoScript](http://noscript.net/) per avere più controllo su JavaScript.\n"
+" - [uBlock Origin](https://github.com/gorhill/uBlock/) per rimuovere le pubblicità.\n"
+"* [Pidgin](http://www.pidgin.im/) preconfigurato con\n"
+" [OTR](http://www.cypherpunks.ca/otr/index.php) per messaggistica Off-the-Record\n"
+<<<<<<< HEAD
+" ([[More...|doc/anonymous_internet/pidgin]])\n"
+"* [OnionShare](https://onionshare.org/) per filesharing anonimo\n"
+"* [Thunderbird](https://www.mozilla.org/en-US/thunderbird/) client email con [Enigmail](https://www.enigmail.net/) per il supporto a OpenPGP ([[More...|doc/anonymous_internet/thunderbird]])\n"
+"* [Liferea](http://liferea.sourceforge.net/) aggregatore feed \n"
+"* [Gobby](http://gobby.0x539.de/trac/) per la scrittura di testi collaborativi\n"
+"* [Aircrack-ng](http://aircrack-ng.org/) per l'ascolto di network wireless\n"
+"* [Electrum](https://electrum.org/), un client bitcoin facile da usare ([[More...|doc/anonymous_internet/electrum]])\n"
+=======
+" ([[leggi di più...|doc/anonymous_internet/pidgin]])\n"
+"* [OnionShare](https://onionshare.org/) per la condivisione di file in anonimato\n"
+"* [Thunderbird](https://www.mozilla.org/en-US/thunderbird/) un client email con [Enigmail](https://www.enigmail.net/) per il supporto a OpenPGP ([[leggi di più...|doc/anonymous_internet/thunderbird]])\n"
+"* [Liferea](http://liferea.sourceforge.net/) aggregatore di feed \n"
+"* [Gobby](http://gobby.0x539.de/trac/) per la scrittura di testi collaborativi\n"
+"* [Aircrack-ng](http://aircrack-ng.org/) per la verifica della rete wireless\n"
+"* [Electrum](https://electrum.org/), un client bitcoin facile da usare ([[leggi di più...|doc/anonymous_internet/electrum]])\n"
+>>>>>>> C0D305TRANSLATION
+
+#. type: Title -
+#, no-wrap
+msgid "Desktop Edition\n"
+msgstr "Edizione Desktop\n"
+
+#. type: Bullet: '* '
+msgid ""
+"[LibreOffice](https://www.libreoffice.org/) ([[More...|doc/sensitive_documents/"
+"office_suite]])"
+msgstr ""
+"[LibreOffice](https://it.libreoffice.org/) ([[leggi di più...|doc/"
+"sensitive_documents/office_suite]])"
+
+#. type: Bullet: '* '
+msgid ""
+"[Gimp](https://www.gimp.org/) and [Inkscape](https://inkscape.org/) to edit images "
+"([[More...|doc/sensitive_documents/graphics]])"
+msgstr ""
+"[Gimp](https://www.gimp.org/) e [Inkscape](https://inkscape.org/it/) per "
+"l'elaborazione delle immagini ([[leggi di più...|doc/sensitive_documents/graphics]])"
+
+#. type: Bullet: '* '
+msgid "[Scribus](https://www.scribus.net/) for page layout"
+msgstr "[Scribus](https://www.scribus.net/), per l'impaginazione"
+
+#. type: Bullet: '* '
+<<<<<<< HEAD
+#| msgid ""
+#| "[Audacity](http://audacity.sourceforge.net/) for recording and editing "
+#| "sounds ([[More...|doc/sensitive_documents/sound_and_video]])"
+=======
+>>>>>>> C0D305TRANSLATION
+msgid ""
+"GNOME Sound Recorder for recording sound ([[More...|doc/sensitive_documents/"
+"sound_and_video]])"
+msgstr ""
+<<<<<<< HEAD
+"GNOME Sound Recorder come registratore di suoni ([[More...|doc/"
+=======
+"GNOME Sound Recorder per la registrazione di file audio ([[leggi di più...|doc/"
+>>>>>>> C0D305TRANSLATION
+"sensitive_documents/sound_and_video]])"
+
+#. type: Bullet: '* '
+msgid ""
+"[Audacity](https://www.audacityteam.org/) for recording and editing sounds "
+"([[More...|doc/sensitive_documents/sound_and_video]])"
+msgstr ""
+"[Audacity](https://www.audacityteam.org/) per la registrazione e l'elaborazione del "
+"suono ([[leggi di più...|doc/sensitive_documents/sound_and_video]])"
+
+#. type: Bullet: '* '
+msgid ""
+"[PiTiVi](http://pitivi.org/) for non-linear audio/video editing ([[More...|doc/"
+"sensitive_documents/sound_and_video]])"
+msgstr ""
+"[PiTiVi](http://pitivi.org/) per il montaggio audio/video non-lineare ([[leggi di "
+"più...|doc/sensitive_documents/sound_and_video]])"
+
+#. type: Bullet: '* '
+msgid "[Poedit](https://poedit.net/) to edit .po files"
+msgstr "[Poedit](https://poedit.net/) per editare i file .po"
+
+#. type: Bullet: '* '
+msgid ""
+"[Simple Scan](https://launchpad.net/simple-scan) and [SANE](http://sane-project."
+"org/) for scanner support"
+msgstr ""
+"[Simple Scan](https://launchpad.net/simple-scan) e [SANE](http://sane-project.org/) "
+"per il supporto degli scanner"
+
+#. type: Bullet: '* '
+msgid "[Brasero](https://wiki.gnome.org/Apps/Brasero) to burn CD/DVDs"
+msgstr "[Brasero](https://wiki.gnome.org/Apps/Brasero) per masterizzare CD/DVD"
+
+#. type: Bullet: '* '
+msgid "[Sound Juicer](https://wiki.gnome.org/Apps/SoundJuicer) to rip audio CDs"
+msgstr ""
+"[Sound Juicer](https://wiki.gnome.org/Apps/SoundJuicer) per estrarre l'audio dai CD"
+
+#. type: Bullet: '* '
+msgid "[Traverso](http://traverso-daw.org/) a multi-track audio recorder and editor"
+msgstr "[Traverso](http://traverso-daw.org/) un registratore multitraccia ed editor"
+
+#. type: Title -
+#, no-wrap
+msgid "Encryption and privacy\n"
+msgstr "Cifratura e privacy\n"
+
+#. type: Bullet: '* '
+msgid ""
+"[[!wikipedia Linux_Unified_Key_Setup desc=\"LUKS\"]] and [[!wikipedia GNOME_Disks]] "
+"to install and use encrypted storage devices, for example USB sticks ([[More...|doc/"
+"encryption_and_privacy/encrypted_volumes]])"
+msgstr ""
+"[[!wikipedia Linux_Unified_Key_Setup desc=\"LUKS\"]] e [[!wikipedia GNOME_Disks]] "
+"per installare e usare supporti di salvataggio cifrati, per esempio chiavette USB "
+"([[leggi di più...|doc/encryption_and_privacy/encrypted_volumes]])"
+
+#. type: Bullet: '* '
+msgid ""
+"[GnuPG](http://gnupg.org/), the GNU implementation of OpenPGP for email and data "
+"encyption and signing"
+msgstr ""
+"[GnuPG](http://gnupg.org/), l'implementazione GNU di OpenPGP per le email, la "
+"cifratura e la firma dei dati"
+
+#. type: Bullet: '* '
+msgid ""
+"[Monkeysign](http://web.monkeysphere.info/monkeysign), a tool for OpenPGP key "
+"signing and exchange"
+msgstr ""
+"[Monkeysign](http://web.monkeysphere.info/monkeysign), uno strumento per la firma e "
+"lo scambio di chiavi OpenPGP"
+
+#. type: Bullet: '* '
+msgid "[PWGen](http://pwgen-win.sourceforge.net/), a strong password generator"
+msgstr "[PWGen](http://pwgen-win.sourceforge.net/), un generatore di password forti"
+
+#. type: Bullet: '* '
+msgid ""
+"[Shamir's Secret Sharing](http://en.wikipedia.org/wiki/Shamir%27s_Secret_Sharing) "
+"using [gfshare](http://www.digital-scurf.org/software/libgfshare) and [ssss]"
+"(http://point-at-infinity.org/ssss/)"
+msgstr ""
+"[Shamir's Secret Sharing](http://en.wikipedia.org/wiki/Shamir%27s_Secret_Sharing) "
+"algoritmo di cifratura usato da [gfshare](http://www.digital-scurf.org/software/"
+"libgfshare) e [ssss](http://point-at-infinity.org/ssss/)"
+
+#. type: Bullet: '* '
+msgid ""
+"[Florence](http://florence.sourceforge.net/) virtual keyboard as a countermeasure "
+"against hardware [keyloggers](http://en.wikipedia.org/wiki/Keylogger) ([[More...|"
+"doc/encryption_and_privacy/virtual_keyboard]])"
+msgstr ""
+"[Florence](http://florence.sourceforge.net/) una tastiera virtuale come "
+"contromisura per i [keylogger hardware](https://fr.wikipedia.org/wiki/Keylogger)\n"
+" ([[leggi di più...|doc/encryption_and_privacy/virtual_keyboard]])"
+
+#. type: Bullet: '* '
+msgid "[MAT](https://mat.boum.org/) to anonymize metadata in files"
+msgstr "[MAT](https://mat.boum.org/) per rendere anonimi i metadata nei file "
+
+#. type: Bullet: '* '
+msgid ""
+"[KeePassX](http://www.keepassx.org/) password manager ([[More...|doc/"
+"encryption_and_privacy/manage_passwords]])"
+msgstr ""
+" [KeePassX](http://www.keepassx.org/) gestore delle password ([[leggi di più...|doc/"
+"encryption_and_privacy/manage_passwords]])"
+
+#. type: Bullet: '* '
+msgid ""
+"[GtkHash](http://gtkhash.sourceforge.net/) to calculate checksums ([[More...|doc/"
+"encryption_and_privacy/checksums]])"
+msgstr ""
+"[GtkHash](http://gtkhash.sourceforge.net/) per calcolare i checksum ([[leggi di "
+"più...|doc/encryption_and_privacy/checksums]])"
+
+#. type: Bullet: '* '
+msgid ""
+"[Keyringer](https://keyringer.pw/), a command line tool to encrypt secrets shared "
+"through Git ([[More...|doc/encryption_and_privacy/keyringer]])"
+msgstr ""
+"[Keyringer](https://keyringer.pw/), uno strumento da riga di comando per scambiare "
+"file segreti attraverso Git ([[leggi di più...|doc/encryption_and_privacy/"
+"keyringer]])"
+
+#. type: Bullet: '* '
+msgid ""
+"[Paperkey](http://www.jabberwocky.com/software/paperkey/) a command line tool to "
+"back up OpenPGP secret keys on paper ([[More...|doc/advanced_topics/paperkey]])"
+msgstr ""
+"[Paperkey](http://www.jabberwocky.com/software/paperkey/) uno strumento da riga di "
+"comando per fare copie di sicurezza delle chiavi OpenPGP su un foglio di carta "
+"([[leggi di più...|doc/advanced_topics/paperkey]])"
+
+#. type: Plain text
+msgid ""
+"The full packages list can be found in the [BitTorrent files download directory]"
+"(https://tails.boum.org/torrents/files/) (look for files with the `.packages` "
+"extension)."
+msgstr ""
+<<<<<<< HEAD
+"La lista completa dei pacchetti che si possono trovare nella [cartella di "
+"scaricamento dei file BitTorrent](https://tails.boum.org/torrents/files/) "
+"(guarda per i file con l'estensione '.packages')"
+=======
+"La lista completa dei pacchetti può essere trovata nella [cartella di download dei "
+"file BitTorrent](https://tails.boum.org/torrents/files/) (guarda per i file con "
+"l'estensione '.packages')"
+>>>>>>> C0D305TRANSLATION
+
+#. type: Title =
+#, no-wrap
+msgid "Additional software\n"
+msgstr "Software aggiuntivo\n"
+
+#. type: Plain text
+msgid ""
+"You can [[install additional software|doc/advanced_topics/additional_software]] in "
+"Tails: all software packaged for Debian is installable in Tails."
+msgstr ""
+"Tu puoi [[installare software aggiuntivo|doc/advanced_topics/additional_software]] "
+"in Tails: tutti i pacchetti software per Debian si possono installare in Tails"
+
+#. type: Title =
+#, no-wrap
+msgid "Additional features\n"
+msgstr "Caratteristiche aggiuntive\n"
+
+#. type: Bullet: '* '
+msgid ""
+"automatic mechanism to [[upgrade a USB stick or a SD card|doc/first_steps/upgrade]] "
+"to newer versions"
+msgstr ""
+"meccanismo automatico per [[aggiornare una chiavetta USB o una scheda SD|doc/"
+"first_steps/upgrade]] ad una nuova versione"
+
+#. type: Bullet: '* '
+msgid ""
+"can be run as a virtualized guest inside [VirtualBox](http://www.virtualbox.org/) "
+"([[More...|doc/advanced_topics/virtualization]])"
+msgstr ""
+"può essere eseguito come un utente virtualizzato [VirtualBox](http://www.virtualbox."
+"org/) ([[leggi di più...|doc/advanced_topics/virtualization]])"
+
+#. type: Bullet: '* '
+msgid ""
+"[[customization|contribute/customize]] (e.g. to add a given missing piece of "
+"software) is relatively easy: one may [[contribute/build]] a custom Amnesic "
+"Incognito Live System in about one hour on a modern desktop computer"
+msgstr ""
+"la [[personalizzazione|contribute/customize]] (per esempio per aggiungere un pezzo "
+"di software mancante) è relativamente semplice: una persona può [[compilare|"
+"contribute/build]] un sistema Tails in circa un ora su un computer moderno "
+
+#. type: Bullet: '* '
+msgid ""
+"64-bit PAE-enabled kernel with NX-bit and SMP support on hardware that supports it"
+msgstr ""
+"kernel 64-bit PEA attivato con supporto NX-bit e SMP sull'hardware che lo supporta"
+
+#. type: Bullet: '* '
+msgid "Some basic [[doc/first_steps/accessibility]] features"
+msgstr ""
+"Alcune caratteristiche di [[accessibilità|doc/first_steps/accessibility]] di base"
+
+#. type: Bullet: '* '
+msgid "Some [[contribute/design/application_isolation]] with AppArmor"
+msgstr ""
+"Alcune [[applicazioni confinate|contribute/design/application_isolation]] con "
+"AppArmor"
+
+#. type: Bullet: '* '
+msgid ""
+"To prevent cold-boot attacks and various memory forensics, Tails erases most memory "
+"on shutdown and when the boot media is physically removed."
+msgstr ""
+<<<<<<< HEAD
+"Per prevenire attacchi \"cold-boot\" e altre ispezioni forensi alla memoria, "
+"Tails cancella la memoria allo spegnimento del PC e quando il supporto di "
+"avvio (es l'USB) viene fisicamente staccato"
+=======
+"Per prevenire attacchi \"cold-boot\" e ispezioni forensi della memoria, Tails "
+"cancella la memoria allo spegnimento e quando il supporto di avvio è fisicamente "
+"staccato"
+>>>>>>> C0D305TRANSLATION
+
+#. type: Title =
+#, no-wrap
+msgid "Multilingual support\n"
+msgstr "Supporto multilingua\n"
+
+# Controllare i nomi delle lingue!!!
+#. type: Plain text
+msgid ""
+"When starting Tails, you can choose between a large number of languages, including "
+"Arabic, Azerbaijani, Catalan, Czech, Welsh, Danish, German, Greek, English, "
+"Spanish, Persian, Finnish, French, Croatian, Hungarian, Indonesian, Italian, "
+"Japanese, Khmer, Korean, Latvian, Bokmål, Dutch, Polish, Portuguese, Russian, "
+"Slovak, Slovene, Albanian, Serbian, Swedish, Turkish, Ukrainian, and Chinese."
+msgstr ""
+"Quando fai partire Tails, puoi scegliere tra un gran numero di lingue, incluso "
+"l'Arabo, Azero/Azerbaigiano, Catalano, Ceco, Gallese, Danese, Tedesco, Greco, "
+"Inglese, Spagnolo, Persiano, Finlandese, Francese, Croato, Ungherese, Indonesiano, "
+"Italiano, Giapponese, Khmer, Coreano, Lettone, Bokmål, Tedesco, Polacco, "
+"Portoghese, Russo, Slovacco, Sloveno, Albanese, Serbo, Svedese, Turco, Ucraino e "
+"Cinese"
+
+#. type: Plain text
+msgid "The required keyboard input system is automatically enabled."
+msgstr "Il sistema di input della tastiera è abilitato automaticamente"
+
+#. type: Plain text
+msgid ""
+"Some of these languages could not be thoroughly tested as we don't speak every "
+"language in the world. If you find issues using one of the supposedly supported "
+"languages, don't hesitate to [[tell us about it|support]]. E.g. Tails probably "
+"lacks some non-Latin fonts or input systems."
+msgstr ""
+"Alcuni di questi linguaggi non sono stati verificati e noi non parliamo tutte le "
+"lingue del mondo. Se trovi alcune imprecisioni usando uno dei linguaggi "
+"presumibilmente supportati, non esitare a [[dircelo|support]]. Per esempio, Tails "
+"può mancare di alcuni font non latini o di sistemi di input."
+
+#. type: Plain text
+msgid ""
+"If you wish to make it easier to use Tails for your language speakers, see the "
+"[[translators guidelines|contribute/how/translate]]."
+msgstr ""
+"Se vuoi rendere l'uso di Tails più semplice per la tua lingua parlata, vedi le "
+"[[linee guida per i traduttori|contribute/how/translate]]."
+
+#~ msgid "One can choose at boot time between a big number of languages."
+#~ msgstr ""
+#~ "Vous pouvez choisir parmis une grande variété de langues lors du démarrage."
+
+#~ msgid "[[TrueCrypt|encryption_and_privacy/truecrypt]] a disk encryption software"
+#~ msgstr ""
+#~ "[[TrueCrypt|encryption_and_privacy/truecrypt]] un logiciel de chiffrement de "
+#~ "disque"
+
+#~ msgid ""
+#~ "One can choose at boot time between the following languages: Arabic, Chinese, "
+#~ "English, French, Italian, German, Portuguese and Spanish (Castellano)."
+#~ msgstr ""
+#~ "Il est possible de choisir, au démarrage, entre les langues suivantes :\n"
+#~ "allemand, anglais, arabe, chinois, espagnol (castillan), français, italien et\n"
+#~ "portuguais."
diff --git a/wiki/src/doc/about/features.mdwn b/wiki/src/doc/about/features.mdwn
index 4ea77b7..675a585 100644
--- a/wiki/src/doc/about/features.mdwn
+++ b/wiki/src/doc/about/features.mdwn
@@ -2,7 +2,7 @@
[[!toc levels=2]]
-Tails is based on [[Debian|https://www.debian.org/]] 8 (Jessie).
+Tails is based on [[Debian|https://www.debian.org/]] 9 (Stretch).
Included software
=================
@@ -42,19 +42,19 @@ Networking
Desktop Edition
---------------
-* [LibreOffice](http://www.libreoffice.org/) ([[More...|doc/sensitive_documents/office_suite]])
-* [Gimp](http://www.gimp.org/) and
+* [LibreOffice](https://www.libreoffice.org/) ([[More...|doc/sensitive_documents/office_suite]])
+* [Gimp](https://www.gimp.org/) and
[Inkscape](https://inkscape.org/) to edit images ([[More...|doc/sensitive_documents/graphics]])
-* [Scribus](http://www.scribus.net) for page layout
+* [Scribus](https://www.scribus.net/) for page layout
* GNOME Sound Recorder for recording sound ([[More...|doc/sensitive_documents/sound_and_video]])
-* [Audacity](http://audacity.sourceforge.net/) for recording and
+* [Audacity](https://www.audacityteam.org/) for recording and
editing sounds ([[More...|doc/sensitive_documents/sound_and_video]])
-* [PiTiVi](http://www.pitivi.org/) for non-linear audio/video editing ([[More...|doc/sensitive_documents/sound_and_video]])
-* [Poedit](http://poedit.sourceforge.net/) to edit .po files
+* [PiTiVi](http://pitivi.org/) for non-linear audio/video editing ([[More...|doc/sensitive_documents/sound_and_video]])
+* [Poedit](https://poedit.net/) to edit .po files
* [Simple Scan](https://launchpad.net/simple-scan) and
- [SANE](http://www.sane-project.org/) for scanner support
-* [Brasero](http://projects.gnome.org/brasero/) to burn CD/DVDs
-* [Sound Juicer](http://burtonini.com/blog/computers/sound-juicer) to rip audio
+ [SANE](http://sane-project.org/) for scanner support
+* [Brasero](https://wiki.gnome.org/Apps/Brasero) to burn CD/DVDs
+* [Sound Juicer](https://wiki.gnome.org/Apps/SoundJuicer) to rip audio
CDs
* [Traverso](http://traverso-daw.org/) a multi-track audio recorder and editor
diff --git a/wiki/src/doc/about/features.pt.po b/wiki/src/doc/about/features.pt.po
index e18b2cf..605ef8c 100644
--- a/wiki/src/doc/about/features.pt.po
+++ b/wiki/src/doc/about/features.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-05-19 17:19+0200\n"
+"POT-Creation-Date: 2017-06-27 10:01+0300\n"
"PO-Revision-Date: 2014-08-14 15:59+0200\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -26,7 +26,7 @@ msgid "[[!toc levels=2]]\n"
msgstr "[[!toc levels=2]]\n"
#. type: Plain text
-msgid "Tails is based on [[Debian|https://www.debian.org/]] 8 (Jessie)."
+msgid "Tails is based on [[Debian|https://www.debian.org/]] 9 (Stretch)."
msgstr ""
#. type: Title =
@@ -140,7 +140,7 @@ msgstr "Edição de Desktop\n"
#, fuzzy
#| msgid "[LibreOffice](http://www.libreoffice.org/)"
msgid ""
-"[LibreOffice](http://www.libreoffice.org/) ([[More...|doc/"
+"[LibreOffice](https://www.libreoffice.org/) ([[More...|doc/"
"sensitive_documents/office_suite]])"
msgstr "[LibreOffice.org](http://www.libreoffice.org/)"
@@ -150,15 +150,15 @@ msgstr "[LibreOffice.org](http://www.libreoffice.org/)"
#| "[Gimp](http://www.gimp.org/) and [Inkscape](http://www.inkscape.org/) to "
#| "edit images"
msgid ""
-"[Gimp](http://www.gimp.org/) and [Inkscape](https://inkscape.org/) to edit "
+"[Gimp](https://www.gimp.org/) and [Inkscape](https://inkscape.org/) to edit "
"images ([[More...|doc/sensitive_documents/graphics]])"
msgstr ""
"[Gimp](http://www.gimp.org/) e [Inkscape](http://www.inkscape.org/) para a "
"edição de imagens"
#. type: Bullet: '* '
-msgid "[Scribus](http://www.scribus.net) for page layout"
-msgstr "[Scribus](http://www.scribus.net) para diagramação"
+msgid "[Scribus](https://www.scribus.net/) for page layout"
+msgstr "[Scribus](https://www.scribus.net/) para diagramação"
#. type: Bullet: '* '
#, fuzzy
@@ -177,8 +177,8 @@ msgstr ""
#| "[Audacity](http://audacity.sourceforge.net/) for recording and editing "
#| "sounds"
msgid ""
-"[Audacity](http://audacity.sourceforge.net/) for recording and editing "
-"sounds ([[More...|doc/sensitive_documents/sound_and_video]])"
+"[Audacity](https://www.audacityteam.org/) for recording and editing sounds "
+"([[More...|doc/sensitive_documents/sound_and_video]])"
msgstr ""
"[Audacity](http://audacity.sourceforge.net/) para gravação e edição de áudio"
@@ -186,36 +186,35 @@ msgstr ""
#, fuzzy
#| msgid "[PiTiVi](http://www.pitivi.org/) for non-linear audio/video editing"
msgid ""
-"[PiTiVi](http://www.pitivi.org/) for non-linear audio/video editing "
-"([[More...|doc/sensitive_documents/sound_and_video]])"
+"[PiTiVi](http://pitivi.org/) for non-linear audio/video editing ([[More...|"
+"doc/sensitive_documents/sound_and_video]])"
msgstr ""
"[PiTIVi](http://www.pitivi.org/) para edição não-linear de áudio e vídeo"
#. type: Bullet: '* '
-msgid "[Poedit](http://poedit.sourceforge.net/) to edit .po files"
-msgstr "[Poedit](http://poedit.sourceforge.net/) para editar arquivos .po"
+msgid "[Poedit](https://poedit.net/) to edit .po files"
+msgstr "[Poedit](https://poedit.net/) para editar arquivos .po"
#. type: Bullet: '* '
msgid ""
-"[Simple Scan](https://launchpad.net/simple-scan) and [SANE](http://www.sane-"
+"[Simple Scan](https://launchpad.net/simple-scan) and [SANE](http://sane-"
"project.org/) for scanner support"
msgstr ""
-"[Simple Scan](https://launchpad.net/simple-scan)ey [SANE](http://www.sane-"
+"[Simple Scan](https://launchpad.net/simple-scan)ey [SANE](http://sane-"
"project.org/) para suporte a scanners"
#. type: Bullet: '* '
#, fuzzy
#| msgid "[Brasero](http://projects.gnome.org/brasero/) to burn CD/DVD"
-msgid "[Brasero](http://projects.gnome.org/brasero/) to burn CD/DVDs"
+msgid "[Brasero](https://wiki.gnome.org/Apps/Brasero) to burn CD/DVDs"
msgstr "[Brasero](http://projects.gnome.org/brasero/) para gravar CD/DVD"
#. type: Bullet: '* '
msgid ""
-"[Sound Juicer](http://burtonini.com/blog/computers/sound-juicer) to rip "
-"audio CDs"
+"[Sound Juicer](https://wiki.gnome.org/Apps/SoundJuicer) to rip audio CDs"
msgstr ""
-"[Sound Juicer](http://burtonini.com/blog/computers/sound-juicer) para "
-"extrair CDs de áudio"
+"[Sound Juicer](https://wiki.gnome.org/Apps/SoundJuicer) para extrair CDs de "
+"áudio"
#. type: Bullet: '* '
msgid ""
@@ -352,15 +351,12 @@ msgid "Additional features\n"
msgstr "Características adicionais\n"
#. type: Bullet: '* '
-#, fuzzy
-#| msgid ""
-#| "automatic mechanism to upgrade a USB stick or a SD card to newer versions"
msgid ""
"automatic mechanism to [[upgrade a USB stick or a SD card|doc/first_steps/"
"upgrade]] to newer versions"
msgstr ""
-"mecanismo automático para atualizar uma memória USB ou um cartão SD para "
-"novas versões"
+"mecanismo automático para [[atualizar uma memória USB ou um cartão SD|doc/"
+"first_steps/upgrade]] para novas versões"
#. type: Bullet: '* '
#, fuzzy
diff --git a/wiki/src/doc/about/finances.fr.po b/wiki/src/doc/about/finances.fr.po
index ce38d2f..2cd32a8 100644
--- a/wiki/src/doc/about/finances.fr.po
+++ b/wiki/src/doc/about/finances.fr.po
@@ -5,35 +5,36 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-06-10 11:15+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Project-Id-Version: Tails\n"
+"POT-Creation-Date: 2017-06-28 17:27+0300\n"
+"PO-Revision-Date: 2017-06-17 13:09+0000\n"
+"Last-Translator: \n"
+"Language-Team: Tails translators <tails@boum.org>\n"
+"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.8.11\n"
#. type: Plain text
#, no-wrap
msgid "[[!meta title=\"Finances\"]]\n"
-msgstr ""
+msgstr "[[!meta title=\"Finances\"]]\n"
#. type: Plain text
#, no-wrap
msgid "[[!toc levels=2]]\n"
-msgstr ""
+msgstr "[[!toc levels=2]]\n"
#. type: Plain text
#, no-wrap
msgid "<a id=\"partners\"></a>\n"
-msgstr ""
+msgstr "<a id=\"partners\"></a>\n"
#. type: Title =
#, no-wrap
msgid "Partners\n"
-msgstr ""
+msgstr "Partenaires\n"
#. type: Plain text
msgid ""
@@ -41,16 +42,19 @@ msgid ""
"individuals are listed in a more visual way on our [[partners page|"
"partners]]."
msgstr ""
+"Subventions, récompenses, donations d'entreprises et dons importants venants "
+"d'individus sont listés de façon plus visuelle sur notre [[page partenaires|"
+"partners]]."
#. type: Plain text
#, no-wrap
msgid "<a id=\"2015\"></a>\n"
-msgstr ""
+msgstr "<a id=\"2015\"></a>\n"
#. type: Title =
#, no-wrap
msgid "Income statement for 2015\n"
-msgstr ""
+msgstr "Compte de résultat pour 2015\n"
#. type: Plain text
#, no-wrap
@@ -72,6 +76,22 @@ msgid ""
"\t 31.00Ƀ\n"
"\t 77552.79€\n"
msgstr ""
+"\tProduits :\n"
+"\t- Dons\n"
+"\t $35000.00 via RiseupLabs\n"
+"\t $8599.00 via FPF\n"
+"\t 6995.74€ via Zwiebelfreunde\n"
+"\t $ 47.70 espèces\n"
+"\t 557.05€ espèces\n"
+"\t 31.00Ƀ bitcoins\n"
+"\t- Subventions\n"
+"\t 70000.00€ Hivos\n"
+"\t- Divers\n"
+"\t $1000.00 vente de vieux matériel\n"
+"\t--------------------\n"
+"\t $44646.70\n"
+"\t 31.00Ƀ\n"
+"\t 77552.79€\n"
#. type: Plain text
#, no-wrap
@@ -104,6 +124,33 @@ msgid ""
"\t -174611.30€\n"
"\t -8.85Ƀ lost bitcoins\n"
msgstr ""
+"\tCharges :\n"
+"\t- Infrastructure\n"
+"\t $-787.23 matériel\n"
+"\t -775.41€ matériel\n"
+"\t -900.00€ hébergement Internet\n"
+"\t $-160.00 certificats SSL\n"
+"\t- Transport et réunions\n"
+"\t -9279.73€ transport\n"
+"\t -8155.21€ nourriture et boissons\n"
+"\t -988.00€ hébergement\n"
+"\t- Sous-traitance\n"
+"\t -146365.22€ sous-traitance\n"
+"\t $-4860.00 sous-traitance\n"
+"\t- Coûts de fonctionnement\n"
+"\t $-2179.95 administration\n"
+"\t -3849.79€ administration\n"
+"\t $-85.00 banque\n"
+"\t -106.41€ banque\n"
+"\t- Divers\n"
+"\t -4151.64€ bitcoins perdus\n"
+"\t -8.85Ƀ bitcoins perdus\n"
+"\t $-702.77 impôts sur le revenu\n"
+"\t -39.90€ matériel promotionnel\n"
+"\t--------------------\n"
+"\t $-8774.95\n"
+"\t -174611.30€\n"
+"\t -8.85Ƀ bitcoins perdus\n"
#. type: Plain text
#, no-wrap
@@ -114,16 +161,21 @@ msgid ""
"\t -97058.51€\n"
"\t 22.15Ƀ\n"
msgstr ""
+"\tTotal :\n"
+"\t--------------------\n"
+"\t $35871.75\n"
+"\t -97058.51€\n"
+"\t 22.15Ƀ\n"
#. type: Plain text
#, no-wrap
msgid "<a id=\"2014\"></a>\n"
-msgstr ""
+msgstr "<a id=\"2014\"></a>\n"
#. type: Title =
#, no-wrap
msgid "Income statement for 2014\n"
-msgstr ""
+msgstr "Compte de résultat pour 2014\n"
#. type: Plain text
#, no-wrap
@@ -148,6 +200,25 @@ msgid ""
"\t 71.67Ƀ\n"
"\t 82953.69€\n"
msgstr ""
+"\tProduits :\n"
+"\t- Dons\n"
+"\t $33376.83 via FPF\n"
+"\t 71.67Ƀ via bitcoin\n"
+"\t 7150.19€ via Zwiebelfreunde\n"
+"\t 803.50€ divers\n"
+"\t- Subventions\n"
+"\t $50000.00 Access Now\n"
+"\t 5000.00€ FFIS\n"
+"\t 70000.00€ Hivos\n"
+"\t $34884.00 NDI\n"
+"\t $25800.00 OpenITP\n"
+"\t $5000.00 Tor\n"
+"\t- Divers\n"
+"\t $3775.00 annulation de revirement\n"
+"\t--------------------\n"
+"\t $152835.83\n"
+"\t 71.67Ƀ\n"
+"\t 82953.69€\n"
#. type: Plain text
#, no-wrap
@@ -180,6 +251,33 @@ msgid ""
"\t $-66106.24\n"
"\t -40847.00€\n"
msgstr ""
+"\tCharges :\n"
+"\t- Infrastructure\n"
+"\t $-7856.38 matériel\n"
+"\t -897.84€ matériel\n"
+"\t -630.00€ hébergement Internet\n"
+"\t $-160.00 certificats SSL\n"
+"\t- Transport et réunions\n"
+"\t -4907.08€ transport\n"
+"\t -3724.35€ hébergement\n"
+"\t -4112.27€ nourriture et boissons\n"
+"\t $-400.00 invités\n"
+"\t -330.30€ invités\n"
+"\t- Sous-traitance\n"
+"\t $-53414.00 sous-traitance\n"
+"\t -20131.85€ sous-traitance\n"
+"\t- Coûts de fonctionnement\n"
+"\t $-568.53 banque\n"
+"\t -174.53€ banque\n"
+"\t $-3707.33 administration\n"
+"\t -5439.61€ administration\n"
+"\t- Divers\n"
+"\t -65.00€ autocollants\n"
+"\t -414.17€ achats non enregistrés\n"
+"\t -20.00€ communication\n"
+"\t--------------------\n"
+"\t $-66106.24\n"
+"\t -40847.00€\n"
#. type: Plain text
#, no-wrap
@@ -190,11 +288,16 @@ msgid ""
"\t 71.67Ƀ\n"
"\t 42106.69€\n"
msgstr ""
+"\tTotal :\n"
+"\t--------------------\n"
+"\t $86729.59\n"
+"\t 71.67Ƀ\n"
+"\t 42106.69€\n"
#. type: Title =
#, no-wrap
msgid "Income statement for 2013\n"
-msgstr ""
+msgstr "Compte de résultat pour 2013\n"
#. type: Plain text
#, no-wrap
@@ -209,6 +312,15 @@ msgid ""
"\t 29.58Ƀ\n"
"\t 330.00€\n"
msgstr ""
+"\tProduits :\n"
+"\t $21000.00 NDI\n"
+"\t $20000.00 Tor (programme de récompenses)\n"
+"\t 29.58Ƀ bitcoin\n"
+"\t 330.00€ taxe\n"
+"\t--------------------\n"
+"\t $41000.00\n"
+"\t 29.58Ƀ\n"
+"\t 330.00€\n"
#. type: Plain text
#, no-wrap
@@ -225,6 +337,17 @@ msgid ""
"\t $-39194.69\n"
"\t -3290.65€\n"
msgstr ""
+"\tCharges :\n"
+"\t -60.00€ banque\n"
+"\t $-17000.00 récompenses\n"
+"\t $-1194.69 matériel\n"
+"\t -499.65€ matériel\n"
+"\t -390.00€ hébergement\n"
+"\t -2341.00€ réunion\n"
+"\t $-21000.00 travail\n"
+"\t--------------------\n"
+"\t $-39194.69\n"
+"\t -3290.65€\n"
#. type: Plain text
#, no-wrap
@@ -235,11 +358,16 @@ msgid ""
"\t 29.58Ƀ\n"
"\t -2960.65€\n"
msgstr ""
+"\tTotal :\n"
+"\t--------------------\n"
+"\t $1805.31\n"
+"\t 29.58Ƀ\n"
+"\t -2960.65€\n"
#. type: Title =
#, no-wrap
msgid "Income statement for 2012\n"
-msgstr ""
+msgstr "Compte de résultat pour 2012\n"
#. type: Plain text
#, no-wrap
@@ -249,6 +377,10 @@ msgid ""
"\t--------------------\n"
"\t 137.30€\n"
msgstr ""
+"\tProduits :\n"
+"\t 137.30€ taxe\n"
+"\t--------------------\n"
+"\t 137.30€\n"
#. type: Plain text
#, no-wrap
@@ -263,6 +395,15 @@ msgid ""
"\t $-4289.71\n"
"\t -4285.18€\n"
msgstr ""
+"\tCharges :\n"
+"\t $-3810.71 matériel\n"
+"\t -856.79€ matériel\n"
+"\t -300.00€ hébergement\n"
+"\t -3128.39€ réunion\n"
+"\t $-479.00 certificats SSL\n"
+"\t--------------------\n"
+"\t $-4289.71\n"
+"\t -4285.18€\n"
#. type: Plain text
#, no-wrap
@@ -272,17 +413,23 @@ msgid ""
"\t $-4289.71\n"
"\t -4147.88€\n"
msgstr ""
+"\tTotal :\n"
+"\t--------------------\n"
+"\t $-4289.71\n"
+"\t -4147.88€\n"
#. type: Plain text
msgid ""
"In addition, one developer was paid full-time by the Tor Project, and NDI "
"sponsored 40 days of development work."
msgstr ""
+"En plus, une personne faisant du développement a été payée à plein temps par "
+"le Tor Project et le NDI a sponsorisé 40 jours de travail de développement."
#. type: Title =
#, no-wrap
msgid "Income statement for 2011\n"
-msgstr ""
+msgstr "Compte de résultat pour 2011\n"
#. type: Plain text
#, no-wrap
@@ -292,6 +439,10 @@ msgid ""
"\t--------------------\n"
"\t 7500.00€\n"
msgstr ""
+"\tProduits :\n"
+"\t 7500.00€ Tor\n"
+"\t--------------------\n"
+"\t 7500.00€\n"
#. type: Plain text
#, no-wrap
@@ -304,6 +455,13 @@ msgid ""
"\t $-555.00\n"
"\t -4238.32€\n"
msgstr ""
+"\tCharges :\n"
+"\t $-555.00 matériel\n"
+"\t -1075.00€ hébergement\n"
+"\t -3163.32€ réunion\n"
+"\t--------------------\n"
+"\t $-555.00\n"
+"\t -4238.32€\n"
#. type: Plain text
#, no-wrap
@@ -313,11 +471,15 @@ msgid ""
"\t $-555.00\n"
"\t 3261.68€\n"
msgstr ""
+"\tTotal :\n"
+"\t--------------------\n"
+"\t $-555.00\n"
+"\t 3261.68€\n"
#. type: Title =
#, no-wrap
msgid "Income statement for 2010\n"
-msgstr ""
+msgstr "Compte de résultat pour 2010\n"
#. type: Plain text
#, no-wrap
@@ -327,6 +489,10 @@ msgid ""
"\t--------------------\n"
"\t $8500.00\n"
msgstr ""
+"\tProduits :\n"
+"\t $8500.00 Tor\n"
+"\t--------------------\n"
+"\t $8500.00\n"
#. type: Plain text
#, no-wrap
@@ -336,6 +502,10 @@ msgid ""
"\t--------------------\n"
"\t -2025.00€\n"
msgstr ""
+"\tCharges :\n"
+"\t -2025.00€ matériel\n"
+"\t--------------------\n"
+"\t -2025.00€\n"
#. type: Plain text
#, no-wrap
@@ -345,3 +515,7 @@ msgid ""
"\t $8500.00\n"
"\t -2025.00€\n"
msgstr ""
+"\tTotal :\n"
+"\t--------------------\n"
+"\t $8500.00\n"
+"\t -2025.00€\n"
diff --git a/wiki/src/doc/about/finances.it.po b/wiki/src/doc/about/finances.it.po
index 8f13fd3..908e3b9 100644
--- a/wiki/src/doc/about/finances.it.po
+++ b/wiki/src/doc/about/finances.it.po
@@ -3,38 +3,38 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: \n"
"POT-Creation-Date: 2017-06-10 11:15+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2017-07-27 09:04+0200\n"
"Language-Team: ita <transitails@inventati.org>\n"
-"Language: \n"
+"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Last-Translator: \n"
+"X-Generator: Poedit 1.8.11\n"
#. type: Plain text
#, no-wrap
msgid "[[!meta title=\"Finances\"]]\n"
-msgstr ""
+msgstr "[[!meta title=\"Bilancio\"]]\n"
#. type: Plain text
#, no-wrap
msgid "[[!toc levels=2]]\n"
-msgstr ""
+msgstr "[[!toc levels=2]]\n"
#. type: Plain text
#, no-wrap
msgid "<a id=\"partners\"></a>\n"
-msgstr ""
+msgstr "<a id=\"partners\"></a>\n"
#. type: Title =
#, no-wrap
msgid "Partners\n"
-msgstr ""
+msgstr "Collaboratori\n"
#. type: Plain text
msgid ""
@@ -42,16 +42,19 @@ msgid ""
"individuals are listed in a more visual way on our [[partners page|"
"partners]]."
msgstr ""
+"Le sovvenzioni, i premi, le donazioni aziendali e le donazioni "
+"sostanziali degli individui sono elencate in modo più visivo sulla nostra "
+"[[pagina dei collaboratori|partners]]."
#. type: Plain text
#, no-wrap
msgid "<a id=\"2015\"></a>\n"
-msgstr ""
+msgstr "<a id=\"2015\"></a>\n"
#. type: Title =
#, no-wrap
msgid "Income statement for 2015\n"
-msgstr ""
+msgstr "Rendiconto finanziario per il 2015\n"
#. type: Plain text
#, no-wrap
@@ -73,6 +76,22 @@ msgid ""
"\t 31.00Ƀ\n"
"\t 77552.79€\n"
msgstr ""
+"\tRicavi:\n"
+"\t- Donazioni\n"
+"\t $35000.00 tramite RiseupLabs\n"
+"\t $8599.00 tramite FPF\n"
+"\t 6995.74€ tramite Zwiebelfreunde\n"
+"\t $ 47.70 contanti\n"
+"\t 557.05€ contanti\n"
+"\t 31.00Ƀ bitcoins\n"
+"\t- Sovvenzioni\n"
+"\t 70000.00€ Hivos\n"
+"\t- Misc\n"
+"\t $1000.00 vendendo vecchi hardware\n"
+"\t--------------------\n"
+"\t $44646.70\n"
+"\t 31.00Ƀ\n"
+"\t 77552.79€\n"
#. type: Plain text
#, no-wrap
@@ -105,6 +124,33 @@ msgid ""
"\t -174611.30€\n"
"\t -8.85Ƀ lost bitcoins\n"
msgstr ""
+"\tSpese:\n"
+"\t- Infrastruttura\n"
+"\t $ -787.23 hardware\n"
+"\t -775.41 € hardware\n"
+"\t -900.00 € Hosting di Internet\n"
+"\t $ -160.00 certificati SSL\n"
+"\t- Viaggi e riunioni\n"
+"\t -9279.73 € spese di viaggio\n"
+"\t -8155,21 € spese di cibo e bevande\n"
+"\t -988.00 € hosting\n"
+"\t- Subappalti\n"
+"\t -146365.22 € subappalto\n"
+"\t $ -4860.00 subappalto\n"
+"\t- Costi correnti\n"
+"\t $ -2179.95 amministrazione\n"
+"\t -3849.79 € amministrazione\n"
+"\t $ -85.00 banking\n"
+"\t -106,41 € banking\n"
+"\t- Misc\n"
+"\t -4151,64 € Bitcoins persi\n"
+"\t -8.85Ƀ Bitcoins persi\n"
+"\t $ -702.77 imposte sul reddito\n"
+"\t -39,90 € materiale promozionale\n"
+"\t--------------------\n"
+"\t $-8774.95\n"
+"\t -174611.30€\n"
+"\t -8.85Ƀ Bitcoins persi\n"
#. type: Plain text
#, no-wrap
@@ -115,16 +161,21 @@ msgid ""
"\t -97058.51€\n"
"\t 22.15Ƀ\n"
msgstr ""
+"\tTotale:\n"
+"\t--------------------\n"
+"\t $35871.75\n"
+"\t -97058.51€\n"
+"\t 22.15Ƀ\n"
#. type: Plain text
#, no-wrap
msgid "<a id=\"2014\"></a>\n"
-msgstr ""
+msgstr "<a id=\"2014\"></a>\n"
#. type: Title =
#, no-wrap
msgid "Income statement for 2014\n"
-msgstr ""
+msgstr "Rendiconto finanziario per il 2014\n"
#. type: Plain text
#, no-wrap
@@ -149,6 +200,25 @@ msgid ""
"\t 71.67Ƀ\n"
"\t 82953.69€\n"
msgstr ""
+"\tRicavi\n"
+"\t- Donazioni\n"
+"\t $33376.83 tramite FPF\n"
+"\t 71.67Ƀ tramite Bitcoin\n"
+"\t 7150.19€ tramite Zwiebelfreunde\n"
+"\t 803.50€ misc\n"
+"\t- Sovvenzioni\n"
+"\t $50000.00 Access Now\n"
+"\t 5000.00€ FFIS\n"
+"\t 70000.00€ Hivos\n"
+"\t $34884.00 NDI\n"
+"\t $25800.00 OpenITP\n"
+"\t $5000.00 Tor\n"
+"\t- Misc\n"
+"\t $3775.00 reverse reversal\n"
+"\t--------------------\n"
+"\t $152835.83\n"
+"\t 71.67Ƀ\n"
+"\t 82953.69€\n"
#. type: Plain text
#, no-wrap
@@ -181,6 +251,33 @@ msgid ""
"\t $-66106.24\n"
"\t -40847.00€\n"
msgstr ""
+"\tSpese:\n"
+"\t- Infrastrutture\n"
+"\t $-7856.38 hardware\n"
+"\t -897.84€ hardware\n"
+"\t -630.00€ Internet hosting\n"
+"\t $-160.00 certificati SSL\n"
+"\t- Viaggi & incontri\n"
+"\t -4907.08€ spese di viaggio\n"
+"\t -3724.35€ hosting\n"
+"\t -4112.27€ spese di cibo e bevande\n"
+"\t $-400.00 ospiti\n"
+"\t -330.30€ ospiti\n"
+"\t- Subappalti\n"
+"\t $-53414.00 subappalto\n"
+"\t -20131.85€ subappalto\n"
+"\t- Costi correnti\n"
+"\t $-568.53 banking\n"
+"\t -174.53€ banking\n"
+"\t $-3707.33 amministrazione\n"
+"\t -5439.61€ amministrazione\n"
+"\t- Misc\n"
+"\t -65.00€ adesivi\n"
+"\t -414.17€ acquisti non memorizzati\n"
+"\t -20.00€ communicazione\n"
+"\t--------------------\n"
+"\t $-66106.24\n"
+"\t -40847.00€\n"
#. type: Plain text
#, no-wrap
@@ -191,11 +288,16 @@ msgid ""
"\t 71.67Ƀ\n"
"\t 42106.69€\n"
msgstr ""
+"\tTotale:\n"
+"\t--------------------\n"
+"\t $86729.59\n"
+"\t 71.67Ƀ\n"
+"\t 42106.69€\n"
#. type: Title =
#, no-wrap
msgid "Income statement for 2013\n"
-msgstr ""
+msgstr "Rendiconto finanziario per il 2013\n"
#. type: Plain text
#, no-wrap
@@ -210,6 +312,15 @@ msgid ""
"\t 29.58Ƀ\n"
"\t 330.00€\n"
msgstr ""
+"\tRicavi:\n"
+"\t $21000.00 NDI\n"
+"\t $20000.00 Tor (programma di sovvenzione)\n"
+"\t 29.58Ƀ Bitcoin\n"
+"\t 330.00€ tassa\n"
+"\t--------------------\n"
+"\t $41000.00\n"
+"\t 29.58Ƀ\n"
+"\t 330.00€\n"
#. type: Plain text
#, no-wrap
@@ -226,6 +337,17 @@ msgid ""
"\t $-39194.69\n"
"\t -3290.65€\n"
msgstr ""
+"\tSpese:\n"
+"\t -60.00€ banking\n"
+"\t $-17000.00 sovvenzioni\n"
+"\t $-1194.69 hardware\n"
+"\t -499.65€ hardware\n"
+"\t -390.00€ hosting\n"
+"\t -2341.00€ riunioni\n"
+"\t $-21000.00 lavoro\n"
+"\t--------------------\n"
+"\t $-39194.69\n"
+"\t -3290.65€\n"
#. type: Plain text
#, no-wrap
@@ -236,11 +358,16 @@ msgid ""
"\t 29.58Ƀ\n"
"\t -2960.65€\n"
msgstr ""
+"\tTotale:\n"
+"\t--------------------\n"
+"\t $1805.31\n"
+"\t 29.58Ƀ\n"
+"\t -2960.65€\n"
#. type: Title =
#, no-wrap
msgid "Income statement for 2012\n"
-msgstr ""
+msgstr "Rendiconto finanziario per il 2012\n"
#. type: Plain text
#, no-wrap
@@ -250,6 +377,10 @@ msgid ""
"\t--------------------\n"
"\t 137.30€\n"
msgstr ""
+"\tRicavi:\n"
+"\t 137.30€ tassa\n"
+"\t--------------------\n"
+"\t 137.30€\n"
#. type: Plain text
#, no-wrap
@@ -264,6 +395,15 @@ msgid ""
"\t $-4289.71\n"
"\t -4285.18€\n"
msgstr ""
+"\tExpenses:\n"
+"\t $-3810.71 hardware\n"
+"\t -856.79€ hardware\n"
+"\t -300.00€ hosting\n"
+"\t -3128.39€ riunioni\n"
+"\t $-479.00 certificati SSL\n"
+"\t--------------------\n"
+"\t $-4289.71\n"
+"\t -4285.18€\n"
#. type: Plain text
#, no-wrap
@@ -273,17 +413,23 @@ msgid ""
"\t $-4289.71\n"
"\t -4147.88€\n"
msgstr ""
+"\tTotale:\n"
+"\t--------------------\n"
+"\t $-4289.71\n"
+"\t -4147.88€\n"
#. type: Plain text
msgid ""
"In addition, one developer was paid full-time by the Tor Project, and NDI "
"sponsored 40 days of development work."
msgstr ""
+"Inoltre, uno sviluppatore è stato pagato a tempo pieno dal progetto Tor, "
+"e NDI ha sponsorizzato 40 giorni di lavori di sviluppo."
#. type: Title =
#, no-wrap
msgid "Income statement for 2011\n"
-msgstr ""
+msgstr "Rendiconto finanziario per il 2011\n"
#. type: Plain text
#, no-wrap
@@ -293,6 +439,10 @@ msgid ""
"\t--------------------\n"
"\t 7500.00€\n"
msgstr ""
+"\tRicavi:\n"
+"\t 7500.00€ Tor\n"
+"\t--------------------\n"
+"\t 7500.00€\n"
#. type: Plain text
#, no-wrap
@@ -305,6 +455,13 @@ msgid ""
"\t $-555.00\n"
"\t -4238.32€\n"
msgstr ""
+"\tExpenses:\n"
+"\t $-555.00 hardware\n"
+"\t -1075.00€ hosting\n"
+"\t -3163.32€ riunioni\n"
+"\t--------------------\n"
+"\t $-555.00\n"
+"\t -4238.32€\n"
#. type: Plain text
#, no-wrap
@@ -314,11 +471,15 @@ msgid ""
"\t $-555.00\n"
"\t 3261.68€\n"
msgstr ""
+"\tTotale:\n"
+"\t--------------------\n"
+"\t $-555.00\n"
+"\t 3261.68€\n"
#. type: Title =
#, no-wrap
msgid "Income statement for 2010\n"
-msgstr ""
+msgstr "Rendiconto finanziario per il 2010\n"
#. type: Plain text
#, no-wrap
@@ -328,6 +489,10 @@ msgid ""
"\t--------------------\n"
"\t $8500.00\n"
msgstr ""
+"\tRicavi:\n"
+"\t $8500.00 Tor\n"
+"\t--------------------\n"
+"\t $8500.00\n"
#. type: Plain text
#, no-wrap
@@ -337,6 +502,10 @@ msgid ""
"\t--------------------\n"
"\t -2025.00€\n"
msgstr ""
+"\tSpese:\n"
+"\t -2025.00€ hardware\n"
+"\t--------------------\n"
+"\t -2025.00€\n"
#. type: Plain text
#, no-wrap
@@ -346,3 +515,7 @@ msgid ""
"\t $8500.00\n"
"\t -2025.00€\n"
msgstr ""
+"\tTotale:\n"
+"\t--------------------\n"
+"\t $8500.00\n"
+"\t -2025.00€\n"
diff --git a/wiki/src/doc/about/fingerprint.it.po b/wiki/src/doc/about/fingerprint.it.po
index 45e4473..b3594dd 100644
--- a/wiki/src/doc/about/fingerprint.it.po
+++ b/wiki/src/doc/about/fingerprint.it.po
@@ -7,14 +7,14 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"POT-Creation-Date: 2017-01-12 22:25+0100\n"
-"PO-Revision-Date: 2016-03-05 18:46-0000\n"
+"PO-Revision-Date: 2017-07-09 14:31+0000\n"
"Last-Translator: \n"
"Language-Team: ita <transitails@inventati.org>\n"
"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.10\n"
+"X-Generator: Poedit 1.8.11\n"
#. type: Plain text
#, no-wrap
@@ -47,7 +47,7 @@ msgstr ""
"**rendere più difficile possibile distinguere tra un utente Tails e un'altro utente Tor**,\n"
"in particolare per gli utenti di <span class=\"application\">Tor Browser</span> esterni a Tails.\n"
"Se è possibile determinare quando sei un utente di <span class=\"application\">Tor Browser</span> all'interno o all'esterno\n"
-"di Tails, provoca il fatto che saranno disponibili maggiori informazioni sulla tua identità riducendo il tuo essere anonimo. \n"
+"di Tails, provoca il fatto che saranno disponibili maggiori informazioni sulla tua identità riducendo il anonimato. \n"
#. type: Plain text
msgid ""
@@ -106,21 +106,16 @@ msgstr ""
"specifiche di Tails**. Attacchi più sofisticati possono utilizzare quelle differenze per riconoscere gli utenti Tails.\n"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "For example, Tails includes <span class=\"application\">Adblock\n"
-#| "Plus</span> which removes advertisements. If an attacker can determine\n"
-#| "that you are not downloading the advertisements that are included in a\n"
-#| "webpage, that could help identify you as a Tails user.\n"
+#, no-wrap
msgid ""
"For example, Tails includes <span class=\"application\">uBlock\n"
"Origin</span> which removes advertisements. If an attacker can determine\n"
"that you are not downloading the advertisements that are included in a\n"
"webpage, that could help identify you as a Tails user.\n"
msgstr ""
-"Per esempio, Tails include<span class=\"application\">Adblock\n"
-"Plus</span> che rimuove le pubblicità. Se un attaccante può determinare\n"
-"che non stai scaricando le pubblicità incluse in una pagina web, può aiutare\n"
+"Per esempio, Tails include<span class=\"application\">uBlock\n"
+"Origin</span> che rimuove le pubblicità. Se un attaccante può determinare\n"
+"che non stai scaricando le pubblicità incluse in una pagina web, ciò potrebbe aiutare\n"
"ad identificarti come utente Tails\n"
#. type: Plain text
@@ -145,9 +140,10 @@ msgid ""
"connecting to Tor to a local observer. If this is important for you, read "
"our documentation about [[doc/first_steps/startup_options/bridge_mode]]."
msgstr ""
-"I Tor bridges sono principalmente un buon modo per nascondere il fatto che "
-"sei connesso a Tor ad un osservatore locale. Se questo è importante per te, "
-"leggi la documentazione [[doc/first_steps/startup_options/bridge_mode]]."
+"I Tor bridges sono principalmente un buon modo per nascondere, ad un "
+"osservatore locale, il fatto che sei connesso a Tor. Se questo è importante "
+"per te, leggi la documentazione [[doc/first_steps/startup_options/"
+"bridge_mode]]."
#. type: Bullet: ' - '
msgid ""
@@ -198,8 +194,8 @@ msgid ""
"to distinguish Tails users, especially since this happens every time Tails "
"starts."
msgstr ""
-"Quando si avvia, Tails sincronizza l'orologio di sistema in modo che sia "
-"accurato. Facendo questo, se l'orario è impostato troppo distante nel "
+"Quando si avvia Tails, esso sincronizza l'orologio di sistema in modo che "
+"sia accurato. Facendo questo, se l'orario è impostato troppo distante nel "
"passato o nel futuro, Tor viene spento e fatto ripartire. Questo "
"comportamento\n"
"può essere usato per riconoscere un utente Tails, specialmente quando questo "
diff --git a/wiki/src/doc/about/license.it.po b/wiki/src/doc/about/license.it.po
index c47acca..c0b0661 100644
--- a/wiki/src/doc/about/license.it.po
+++ b/wiki/src/doc/about/license.it.po
@@ -7,19 +7,20 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION it\n"
"POT-Creation-Date: 2016-11-11 10:01+0100\n"
-"PO-Revision-Date: 2017-05-31 19:04+0200\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"
"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.11\n"
+"X-Generator: Poedit 1.6.10\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid "[[!meta title=\"License\"]]\n"
msgid "[[!meta title=\"License and source code distribution\"]]\n"
-msgstr "[[!meta title=\"Licenze e distribuzione del codice sorgente\"]]\n"
+msgstr "[[!meta title=\"Licenze\"]]\n"
#. type: Plain text
msgid ""
@@ -34,37 +35,34 @@ msgstr ""
#| "Tails is [[Free Software|http://www.gnu.org/philosophy/free-sw.html]] "
#| "released under the GNU/GPL (version 3 or above)."
msgid "Tails is released under the GNU/GPL (version 3 or above)."
-msgstr "Tails è licenziato sotto la licenza GNU/GPL (versione 3 o successive)."
+msgstr "Tails è stato pubblicato con la licenza GNU/GPL (versione 3 o superiore)."
#. type: Plain text
-msgid ""
-"However, Tails includes non-free firmware in order to work on as much "
-"hardware as possible."
+msgid "However, Tails includes non-free firmware in order to work on as much hardware as possible."
msgstr ""
-"Però, Tails include anche firmware non-free affinché possa funzionare sul "
-"maggior numero di hardware possibili. "
+"Tuttavia, Tails include anche firmware non-free affinché possa funzionare sul maggior numero di "
+"hardware possibili."
#. type: Title =
#, no-wrap
msgid "Source code\n"
-msgstr "Codice sorgente\n"
+msgstr ""
#. type: Plain text
msgid ""
"Most of the software included in Tails is taken directly from upstream "
"Debian packages and is neither modified nor recompiled by Tails."
msgstr ""
-"La maggior parte del codice incluso in Tails è preso direttamente "
-"dall'upstream dei pacchetti Debian e non è nè modificato nè ricompilato da "
-"Tails."
+"La maggior parte del software incluso in Tails viene prelevato direttamente da pacchetti Debian e non "
+"viene modificato né ricompilato da Tails."
#. type: Bullet: '- '
msgid ""
"The source code of software that is specific to Tails is available in [[our "
"Git repositories|contribute/git]]."
msgstr ""
-"Il codice sorgente del software che è specifico di Tails è disponibile nel "
-"[[nostro repository Git |contribute/git]]."
+"Il codice sorgente di un software specifico per Tails è disponibile nei [[nostri repository Git|"
+"contribute/git]]"
#. type: Bullet: '- '
msgid ""
@@ -72,9 +70,8 @@ msgid ""
"[APT snapshot](http://tagged.snapshots.deb.tails.boum.org/) that we created "
"for that version of Tails."
msgstr ""
-"Il codice sorgente dei pacchetti Debian inclusi in Tails è disponibile nel "
-"[APT snapshot](http://tagged.snapshots.deb.tails.boum.org/) che abbiamo "
-"creato per quella versione di Tails."
+"Il codice sorgente dei pacchetti Debian inclusi in Tails è disponibile nella [APT snapshot](http://"
+"tagged.snapshots.deb.tails.boum.org/) che abbiamo creato per quella versione di Tails."
#. type: Title =
#, no-wrap
@@ -82,15 +79,51 @@ msgid "Website\n"
msgstr "Sito web\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "This website uses several images with various copyright, licenses, "
+#| "trademarks and terms of distributions:"
msgid ""
"This website uses several images with distinct copyright, licenses, "
"trademarks and distribution terms:"
msgstr ""
-"Questo sito web utilizza parecchie immagini con differenti copyright, "
-"licenze, trademark e termini di distribuzione:"
+"Questo sito web utilizza parecchie immagini con differenti copyright, licenze, trademark e termini di "
+"distribuzione."
#. type: Plain text
-#, no-wrap
+#, 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"
@@ -141,42 +174,22 @@ msgstr ""
" - 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"
+" - [[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"
+" - [[Code|http://thenounproject.com/term/code/18033/]]: Creative Commons —\n"
" Attribution, di Azis.\n"
-" - [[Pen|http://thenounproject.com/term/pen/18907/]]: Creative Commons —\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"
+" - [[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"
+" - [[User|http://thenounproject.com/term/user/419/]]: Creative Commons —\n"
" Attribution, di Edward Boatman.\n"
-" - [[Translation|http://thenounproject.com/term/translation/5735/]]: Creative\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"
+" - [[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"
+" - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]]:\n"
" Creative Commons — Attribution, di 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"
#~ msgid "Distribution of the source code\n"
#~ msgstr "Distribuzione del codice sorgente\n"
diff --git a/wiki/src/doc/about/license.it.po.orig b/wiki/src/doc/about/license.it.po.orig
new file mode 100644
index 0000000..e0ef274
--- /dev/null
+++ b/wiki/src/doc/about/license.it.po.orig
@@ -0,0 +1,247 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION it\n"
+"POT-Creation-Date: 2016-11-11 10:01+0100\n"
+<<<<<<< HEAD
+"PO-Revision-Date: 2017-05-31 19:04+0200\n"
+=======
+"PO-Revision-Date: 2017-07-09 14:39+0000\n"
+>>>>>>> C0D305TRANSLATION
+"Last-Translator: Zeyev <zeyev@autistici.org>\n"
+"Language-Team: ita <transitails@inventati.org>\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.8.11\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"License and source code distribution\"]]\n"
+msgstr "[[!meta title=\"Licenze e distribuzione del codice sorgente\"]]\n"
+
+#. type: Plain text
+msgid ""
+"Tails is [Free Software](https://www.gnu.org/philosophy/free-sw.html): you can download, use, and "
+"share it with no restrictions."
+msgstr ""
+"Tails è [Software Libero](https://www.gnu.org/philosophy/free-sw.it.html): puoi scaricarlo, usarlo, e "
+"condividerlo senza nessuna restrizione."
+
+#. type: Plain text
+<<<<<<< HEAD
+#| msgid ""
+#| "Tails is [[Free Software|http://www.gnu.org/philosophy/free-sw.html]] "
+#| "released under the GNU/GPL (version 3 or above)."
+msgid "Tails is released under the GNU/GPL (version 3 or above)."
+msgstr "Tails è licenziato sotto la licenza GNU/GPL (versione 3 o successive)."
+
+#. type: Plain text
+msgid ""
+"However, Tails includes non-free firmware in order to work on as much "
+"hardware as possible."
+msgstr ""
+"Però, Tails include anche firmware non-free affinché possa funzionare sul "
+"maggior numero di hardware possibili. "
+=======
+msgid "Tails is released under the GNU/GPL (version 3 or above)."
+msgstr "Tails è stato pubblicato con la licenza GNU/GPL (versione 3 o superiore)."
+
+#. type: Plain text
+msgid "However, Tails includes non-free firmware in order to work on as much hardware as possible."
+msgstr ""
+"Tuttavia, Tails include anche firmware non-free affinché possa funzionare sul maggior numero di "
+"hardware possibili."
+>>>>>>> C0D305TRANSLATION
+
+#. type: Title =
+#, no-wrap
+msgid "Source code\n"
+msgstr "Codice sorgente\n"
+
+#. type: Plain text
+msgid ""
+"Most of the software included in Tails is taken directly from upstream Debian packages and is neither "
+"modified nor recompiled by Tails."
+msgstr ""
+<<<<<<< HEAD
+"La maggior parte del codice incluso in Tails è preso direttamente "
+"dall'upstream dei pacchetti Debian e non è nè modificato nè ricompilato da "
+"Tails."
+=======
+"La maggior parte del software incluso in Tails viene prelevato direttamente da pacchetti Debian e non "
+"viene modificato né ricompilato da Tails."
+>>>>>>> C0D305TRANSLATION
+
+#. type: Bullet: '- '
+msgid ""
+"The source code of software that is specific to Tails is available in [[our Git repositories|"
+"contribute/git]]."
+msgstr ""
+<<<<<<< HEAD
+"Il codice sorgente del software che è specifico di Tails è disponibile nel "
+"[[nostro repository Git |contribute/git]]."
+=======
+"Il codice sorgente di un software specifico per Tails è disponibile nei [[nostri repository Git|"
+"contribute/git]]"
+>>>>>>> C0D305TRANSLATION
+
+#. type: Bullet: '- '
+msgid ""
+"The source code of the Debian packages included in Tails is available in the [APT snapshot](http://"
+"tagged.snapshots.deb.tails.boum.org/) that we created for that version of Tails."
+msgstr ""
+<<<<<<< HEAD
+"Il codice sorgente dei pacchetti Debian inclusi in Tails è disponibile nel "
+"[APT snapshot](http://tagged.snapshots.deb.tails.boum.org/) che abbiamo "
+"creato per quella versione di Tails."
+=======
+"Il codice sorgente dei pacchetti Debian inclusi in Tails è disponibile nella [APT snapshot](http://"
+"tagged.snapshots.deb.tails.boum.org/) che abbiamo creato per quella versione di Tails."
+>>>>>>> C0D305TRANSLATION
+
+#. type: Title =
+#, no-wrap
+msgid "Website\n"
+msgstr "Sito web\n"
+
+#. type: Plain text
+msgid ""
+"This website uses several images with distinct copyright, licenses, trademarks and distribution terms:"
+msgstr ""
+<<<<<<< HEAD
+"Questo sito web utilizza parecchie immagini con differenti copyright, "
+"licenze, trademark e termini di distribuzione:"
+=======
+"Questo sito web utilizza parecchie immagini con differenti copyright, licenze, trademark e termini di "
+"distribuzione."
+>>>>>>> C0D305TRANSLATION
+
+#. type: Plain text
+#, 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"
+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 progetto Tails è 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"
+" - [[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"
+
+#~ msgid "Distribution of the source code\n"
+#~ msgstr "Distribuzione del codice sorgente\n"
+
+#~ msgid ""
+#~ "Most of the software distributed with Tails is taken directly from upstream Debian packages, and "
+#~ "is not modified or recompiled by Tails. Software that is modified or recompiled by Tails are "
+#~ "available in [[our git repositories|/contribute/git]]. If you require or desire the sources for "
+#~ "unmodified Debian upstream packages, retrieving them from Debian is the simplest solution for all "
+#~ "parties (packages that can not be found in the regular Debian archive anymore can be found at "
+#~ "<http://snapshot.debian.org/>)."
+#~ msgstr ""
+#~ "La maggior parte del software distribuito con Tails deriva direttamente dai pacchetti avallati da "
+#~ "Debian, e non sono modificati né ricompilati da Tails. I software che sono modificati o "
+#~ "ricompilati da Tails sono disponibili nei [[nostri repositori git|/contribute/git]]. Se necessiti "
+#~ "o desideri i sorgenti per i pacchetti Debian non modificati, recuperarli da Debian è la soluzione "
+#~ "migliore per tutti (i pacchetti che non ci sono nel regolare archivio Debian, possono trovarsi in "
+#~ "<http://snapshot.debian.org/>)."
+
+#~ msgid ""
+#~ "According to the GPL licence (section 3(b) of the GPLv2 and section 6(b) of the GPLv3), complete "
+#~ "sources for all Tails releases are available for anyone who requests them, in DVD format, via "
+#~ "postal mail, for a nominal charge. If you only require one or two source packages, Tails can work "
+#~ "with you to send a copy of individual packages electronically."
+#~ msgstr ""
+#~ "Come prevede la licenza GPL (sezione 3(b) della GPLv2 e sezione 6(b) della GPLv3), i codici "
+#~ "sorgente di tutte le versioni di Tails sono a disposizioni di chiunque ne faccia richiesta, in "
+#~ "formato DVD o via mezzo 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/openpgp_keys.de.po b/wiki/src/doc/about/openpgp_keys.de.po
index 6aef703..bd77389 100644
--- a/wiki/src/doc/about/openpgp_keys.de.po
+++ b/wiki/src/doc/about/openpgp_keys.de.po
@@ -150,14 +150,7 @@ msgid "Key details\n"
msgstr "Schlüsseldetails\n"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| " pub 4096R/0x1D2975EDF93E735F 2009-08-14 [expires: 2016-12-27]\n"
-#| " Key fingerprint = 09F6 BC8F EEC9 D8EE 005D BAA4 1D29 75ED F93E 735F\n"
-#| " uid Tails developers (Schleuder mailing-list) <tails@boum.org>\n"
-#| " uid Tails list (schleuder list) <tails-request@boum.org>\n"
-#| " uid Tails list (schleuder list) <tails-owner@boum.org>\n"
-#| " sub 4096R/0xD843C2F5E89382EB 2009-08-14 [expires: 2016-12-27]\n"
+#, no-wrap
msgid ""
" pub 4096R/0x1D2975EDF93E735F 2009-08-14 [expires: 2018-10-01]\n"
" Key fingerprint = 09F6 BC8F EEC9 D8EE 005D BAA4 1D29 75ED F93E 735F\n"
@@ -166,12 +159,12 @@ msgid ""
" uid Tails list (schleuder list) <tails-owner@boum.org>\n"
" sub 4096R/0xD843C2F5E89382EB 2009-08-14 [expires: 2018-10-01]\n"
msgstr ""
-" pub 4096R/0x1D2975EDF93E735F 2009-08-14 [expires: 2016-12-27]\n"
+" pub 4096R/0x1D2975EDF93E735F 2009-08-14 [expires: 2018-10-01]\n"
" Key fingerprint = 09F6 BC8F EEC9 D8EE 005D BAA4 1D29 75ED F93E 735F\n"
" uid Tails developers (Schleuder mailing-list) <tails@boum.org>\n"
" uid Tails list (schleuder list) <tails-request@boum.org>\n"
" uid Tails list (schleuder list) <tails-owner@boum.org>\n"
-" sub 4096R/0xD843C2F5E89382EB 2009-08-14 [expires: 2016-12-27]\n"
+" sub 4096R/0xD843C2F5E89382EB 2009-08-14 [expires: 2018-10-01]\n"
#. type: Title -
#, no-wrap
@@ -317,13 +310,7 @@ msgid "Expiration date: same as the primary key."
msgstr "Ablaufdatum: dasselbe wie beim primären Schlüssel."
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| " pub 4096R/0xDBB802B258ACD84F 2015-01-18 [expires: 2016-01-11]\n"
-#| " Key fingerprint = A490 D0F4 D311 A415 3E2B B7CA DBB8 02B2 58AC D84F\n"
-#| " uid [ full ] Tails developers (offline long-term identity key) <tails@boum.org>\n"
-#| " sub 4096R/0x98FEC6BC752A3DB6 2015-01-18 [expires: 2016-01-11]\n"
-#| " sub 4096R/0x3C83DCB52F699C56 2015-01-18 [expires: 2016-01-11]\n"
+#, no-wrap
msgid ""
" pub rsa4096/0xDBB802B258ACD84F 2015-01-18 [C] [expires: 2018-01-11]\n"
" Key fingerprint = A490 D0F4 D311 A415 3E2B B7CA DBB8 02B2 58AC D84F\n"
@@ -333,11 +320,13 @@ msgid ""
" sub rsa4096/0x3C83DCB52F699C56 2015-01-18 [S] [expires: 2018-01-11]\n"
" sub rsa4096/0xAF292B44A0EDAA41 2016-08-30 [S] [expires: 2018-01-11]\n"
msgstr ""
-" pub 4096R/0xDBB802B258ACD84F 2015-01-18 [expires: 2016-01-11]\n"
+" pub rsa4096/0xDBB802B258ACD84F 2015-01-18 [C] [expires: 2018-01-11]\n"
" Key fingerprint = A490 D0F4 D311 A415 3E2B B7CA DBB8 02B2 58AC D84F\n"
-" uid [ full ] Tails developers (offline long-term identity key) <tails@boum.org>\n"
-" sub 4096R/0x98FEC6BC752A3DB6 2015-01-18 [expires: 2016-01-11]\n"
-" sub 4096R/0x3C83DCB52F699C56 2015-01-18 [expires: 2016-01-11]\n"
+" uid [ full ] Tails developers (offline long-term identity key) <tails@boum.org>\n"
+" uid [ unknown] Tails developers <tails@boum.org>\n"
+" sub rsa4096/0x98FEC6BC752A3DB6 2015-01-18 [S] [expires: 2018-01-11]\n"
+" sub rsa4096/0x3C83DCB52F699C56 2015-01-18 [S] [expires: 2018-01-11]\n"
+" sub rsa4096/0xAF292B44A0EDAA41 2016-08-30 [S] [expires: 2018-01-11]\n"
#. type: Bullet: ' - '
msgid "download it from this website: [[!tails_website tails-signing.key]]"
@@ -551,14 +540,7 @@ msgstr ""
"org|about/contact#tails-sysadmins]] zu verschlüsseln."
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| " pub 4096R/0x70F4F03116525F43 2012-08-23 [expires: 2016-08-16]\n"
-#| " Key fingerprint = D113 CB6D 5131 D34B A5F0 FE9E 70F4 F031 1652 5F43\n"
-#| " uid Tails system administrators <tails-sysadmins@boum.org>\n"
-#| " uid Tails system administrators (schleuder list) <tails-sysadmins-owner@boum.org>\n"
-#| " uid Tails system administrators (schleuder list) <tails-sysadmins-request@boum.org>\n"
-#| " sub 4096R/0x58BA940CCA0A30B4 2012-08-23 [expires: 2016-08-16]\n"
+#, no-wrap
msgid ""
" pub 4096R/0x70F4F03116525F43 2012-08-23 [expires: 2018-05-16]\n"
" Key fingerprint = D113 CB6D 5131 D34B A5F0 FE9E 70F4 F031 1652 5F43\n"
@@ -567,12 +549,12 @@ msgid ""
" uid Tails system administrators (schleuder list) <tails-sysadmins-request@boum.org>\n"
" sub 4096R/0x58BA940CCA0A30B4 2012-08-23 [expires: 2018-05-16]\n"
msgstr ""
-" pub 4096R/0x70F4F03116525F43 2012-08-23 [expires: 2016-08-16]\n"
+" pub 4096R/0x70F4F03116525F43 2012-08-23 [expires: 2018-05-16]\n"
" Key fingerprint = D113 CB6D 5131 D34B A5F0 FE9E 70F4 F031 1652 5F43\n"
" uid Tails system administrators <tails-sysadmins@boum.org>\n"
" uid Tails system administrators (schleuder list) <tails-sysadmins-owner@boum.org>\n"
" uid Tails system administrators (schleuder list) <tails-sysadmins-request@boum.org>\n"
-" sub 4096R/0x58BA940CCA0A30B4 2012-08-23 [expires: 2016-08-16]\n"
+" sub 4096R/0x58BA940CCA0A30B4 2012-08-23 [expires: 2018-05-16]\n"
#. type: Bullet: ' - '
msgid "download it from this website: [[!tails_website tails-sysadmins.key]]"
diff --git a/wiki/src/doc/about/openpgp_keys.fa.po b/wiki/src/doc/about/openpgp_keys.fa.po
index 7bd7569..0fb1b9c 100644
--- a/wiki/src/doc/about/openpgp_keys.fa.po
+++ b/wiki/src/doc/about/openpgp_keys.fa.po
@@ -86,10 +86,6 @@ msgid "Encryption"
msgstr "رمزگذاری"
#. type: Plain text
-#, fuzzy
-#| msgid ""
-#| "This key has an encryption subkey. Please use it to encrypt email sent to "
-#| "the core developers encrypted mailing list: <tails@boum.org>."
msgid ""
"This key has an encryption subkey. Please use it to encrypt email sent to "
"the core developers encrypted mailing list: [[tails@boum.org|about/"
@@ -97,7 +93,7 @@ msgid ""
msgstr ""
"این کلید دارای یک زیرکلید رمزگذاری‌شده است. از آن برای رمزگذاری رایانامه به "
"فهرست رایانامهٔ توسعه‌دهندگان مرکزی که رمزگذاری شده‌است استفاده کنید: "
-"<tails@boum.org>."
+"[[tails@boum.org|about/contact#tails]]."
#. type: Title ###
#, no-wrap
@@ -152,14 +148,7 @@ msgid "Key details\n"
msgstr "جزئیات کلید\n"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| " pub 4096R/0x1D2975EDF93E735F 2009-08-14 [expires: 2016-12-27]\n"
-#| " Key fingerprint = 09F6 BC8F EEC9 D8EE 005D BAA4 1D29 75ED F93E 735F\n"
-#| " uid Tails developers (Schleuder mailing-list) <tails@boum.org>\n"
-#| " uid Tails list (schleuder list) <tails-request@boum.org>\n"
-#| " uid Tails list (schleuder list) <tails-owner@boum.org>\n"
-#| " sub 4096R/0xD843C2F5E89382EB 2009-08-14 [expires: 2016-12-27]\n"
+#, no-wrap
msgid ""
" pub 4096R/0x1D2975EDF93E735F 2009-08-14 [expires: 2018-10-01]\n"
" Key fingerprint = 09F6 BC8F EEC9 D8EE 005D BAA4 1D29 75ED F93E 735F\n"
@@ -168,12 +157,12 @@ msgid ""
" uid Tails list (schleuder list) <tails-owner@boum.org>\n"
" sub 4096R/0xD843C2F5E89382EB 2009-08-14 [expires: 2018-10-01]\n"
msgstr ""
-" pub 4096R/0x1D2975EDF93E735F 2009-08-14 [expires: 2016-12-27]\n"
+" pub 4096R/0x1D2975EDF93E735F 2009-08-14 [expires: 2018-10-01]\n"
" Key fingerprint = 09F6 BC8F EEC9 D8EE 005D BAA4 1D29 75ED F93E 735F\n"
" uid Tails developers (Schleuder mailing-list) <tails@boum.org>\n"
" uid Tails list (schleuder list) <tails-request@boum.org>\n"
" uid Tails list (schleuder list) <tails-owner@boum.org>\n"
-" sub 4096R/0xD843C2F5E89382EB 2009-08-14 [expires: 2016-12-27]\n"
+" sub 4096R/0xD843C2F5E89382EB 2009-08-14 [expires: 2018-10-01]\n"
#. type: Title -
#, no-wrap
@@ -316,13 +305,7 @@ msgid "Expiration date: same as the primary key."
msgstr "تاریخ انقضا: مشابه زیرکلید."
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| " pub 4096R/0xDBB802B258ACD84F 2015-01-18 [expires: 2016-01-11]\n"
-#| " Key fingerprint = A490 D0F4 D311 A415 3E2B B7CA DBB8 02B2 58AC D84F\n"
-#| " uid [ full ] Tails developers (offline long-term identity key) <tails@boum.org>\n"
-#| " sub 4096R/0x98FEC6BC752A3DB6 2015-01-18 [expires: 2016-01-11]\n"
-#| " sub 4096R/0x3C83DCB52F699C56 2015-01-18 [expires: 2016-01-11]\n"
+#, no-wrap
msgid ""
" pub rsa4096/0xDBB802B258ACD84F 2015-01-18 [C] [expires: 2018-01-11]\n"
" Key fingerprint = A490 D0F4 D311 A415 3E2B B7CA DBB8 02B2 58AC D84F\n"
@@ -332,11 +315,13 @@ msgid ""
" sub rsa4096/0x3C83DCB52F699C56 2015-01-18 [S] [expires: 2018-01-11]\n"
" sub rsa4096/0xAF292B44A0EDAA41 2016-08-30 [S] [expires: 2018-01-11]\n"
msgstr ""
-" pub 4096R/0xDBB802B258ACD84F 2015-01-18 [expires: 2016-01-11]\n"
+" pub rsa4096/0xDBB802B258ACD84F 2015-01-18 [C] [expires: 2018-01-11]\n"
" Key fingerprint = A490 D0F4 D311 A415 3E2B B7CA DBB8 02B2 58AC D84F\n"
-" uid [ full ] Tails developers (offline long-term identity key) <tails@boum.org>\n"
-" sub 4096R/0x98FEC6BC752A3DB6 2015-01-18 [expires: 2016-01-11]\n"
-" sub 4096R/0x3C83DCB52F699C56 2015-01-18 [expires: 2016-01-11]\n"
+" uid [ full ] Tails developers (offline long-term identity key) <tails@boum.org>\n"
+" uid [ unknown] Tails developers <tails@boum.org>\n"
+" sub rsa4096/0x98FEC6BC752A3DB6 2015-01-18 [S] [expires: 2018-01-11]\n"
+" sub rsa4096/0x3C83DCB52F699C56 2015-01-18 [S] [expires: 2018-01-11]\n"
+" sub rsa4096/0xAF292B44A0EDAA41 2016-08-30 [S] [expires: 2018-01-11]\n"
#. type: Bullet: ' - '
msgid "download it from this website: [[!tails_website tails-signing.key]]"
@@ -494,10 +479,9 @@ msgstr ""
"آن را از این تارنما دانلود کنید: [[!tails_website tails-accounting.key]]"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid "<a id=\"press\"></a>\n"
+#, no-wrap
msgid "<a id=\"mirrors\"></a>\n"
-msgstr "<a id=\"press\"></a>\n"
+msgstr "<a id=\"mirrors\"></a>\n"
#. type: Plain text
#, no-wrap
@@ -518,14 +502,7 @@ msgstr ""
"فرستاده شده‌اند استفاده کنید."
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| " pub 4096R/0x457080B5A072CBE3 2014-07-11\n"
-#| " Key fingerprint = F3CD 9B7B 4BDF 9995 DA22 088E 4570 80B5 A072 CBE3\n"
-#| "\tuid Tails press team (schleuder list) <tails-press@boum.org>\n"
-#| "\tuid Tails press team (schleuder list) <tails-press-owner@boum.org>\n"
-#| "\tuid Tails press team (schleuder list) <tails-press-request@boum.org>\n"
-#| "\tsub 4096R/0x5748DE3BC338BFFC 2014-07-11\n"
+#, no-wrap
msgid ""
"\tpub rsa4096/0xD2EDA621B572DD73 2016-04-29 [SCEA]\n"
"\t Key fingerprint = 0B08 8E31 D4F8 E59A 3D39 9137 D2ED A621 B572 DD73\n"
@@ -534,18 +511,16 @@ msgid ""
"\tuid [ unknown] Tails mirror pool managers (schleuder list) <tails-mirrors-owner@boum.org>\n"
"\tsub rsa4096/0x3DCFC1EB1C62C73C 2016-04-29 [SEA]\n"
msgstr ""
-" pub 4096R/0x457080B5A072CBE3 2014-07-11\n"
-" Key fingerprint = F3CD 9B7B 4BDF 9995 DA22 088E 4570 80B5 A072 CBE3\n"
-"\tuid Tails press team (schleuder list) <tails-press@boum.org>\n"
-"\tuid Tails press team (schleuder list) <tails-press-owner@boum.org>\n"
-"\tuid Tails press team (schleuder list) <tails-press-request@boum.org>\n"
-"\tsub 4096R/0x5748DE3BC338BFFC 2014-07-11\n"
+"\tpub rsa4096/0xD2EDA621B572DD73 2016-04-29 [SCEA]\n"
+"\t Key fingerprint = 0B08 8E31 D4F8 E59A 3D39 9137 D2ED A621 B572 DD73\n"
+"\tuid [ unknown] Tails mirror pool managers (schleuder list) <tails-mirrors@boum.org>\n"
+"\tuid [ unknown] Tails mirror pool managers (schleuder list) <tails-mirrors-request@boum.org>\n"
+"\tuid [ unknown] Tails mirror pool managers (schleuder list) <tails-mirrors-owner@boum.org>\n"
+"\tsub rsa4096/0x3DCFC1EB1C62C73C 2016-04-29 [SEA]\n"
#. type: Bullet: ' - '
-#, fuzzy
-#| msgid "download it from this website: [[!tails_website tails-press.key]]"
msgid "download it from this website: [[!tails_website tails-mirrors.key]]"
-msgstr "آن را از این تارنما دانلود کنید: [[!tails_website tails-press.key]]"
+msgstr "آن را از این تارنما دانلود کنید: [[!tails_website tails-mirrors.key]]"
#. type: Plain text
#, no-wrap
@@ -569,14 +544,7 @@ msgstr ""
"فرستاده شده‌اند استفاده کنید."
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| " pub 4096R/0x70F4F03116525F43 2012-08-23 [expires: 2016-08-16]\n"
-#| " Key fingerprint = D113 CB6D 5131 D34B A5F0 FE9E 70F4 F031 1652 5F43\n"
-#| " uid Tails system administrators <tails-sysadmins@boum.org>\n"
-#| " uid Tails system administrators (schleuder list) <tails-sysadmins-owner@boum.org>\n"
-#| " uid Tails system administrators (schleuder list) <tails-sysadmins-request@boum.org>\n"
-#| " sub 4096R/0x58BA940CCA0A30B4 2012-08-23 [expires: 2016-08-16]\n"
+#, no-wrap
msgid ""
" pub 4096R/0x70F4F03116525F43 2012-08-23 [expires: 2018-05-16]\n"
" Key fingerprint = D113 CB6D 5131 D34B A5F0 FE9E 70F4 F031 1652 5F43\n"
@@ -585,12 +553,12 @@ msgid ""
" uid Tails system administrators (schleuder list) <tails-sysadmins-request@boum.org>\n"
" sub 4096R/0x58BA940CCA0A30B4 2012-08-23 [expires: 2018-05-16]\n"
msgstr ""
-" pub 4096R/0x70F4F03116525F43 2012-08-23 [expires: 2016-08-16]\n"
+" pub 4096R/0x70F4F03116525F43 2012-08-23 [expires: 2018-05-16]\n"
" Key fingerprint = D113 CB6D 5131 D34B A5F0 FE9E 70F4 F031 1652 5F43\n"
" uid Tails system administrators <tails-sysadmins@boum.org>\n"
" uid Tails system administrators (schleuder list) <tails-sysadmins-owner@boum.org>\n"
" uid Tails system administrators (schleuder list) <tails-sysadmins-request@boum.org>\n"
-" sub 4096R/0x58BA940CCA0A30B4 2012-08-23 [expires: 2016-08-16]\n"
+" sub 4096R/0x58BA940CCA0A30B4 2012-08-23 [expires: 2018-05-16]\n"
#. type: Bullet: ' - '
msgid "download it from this website: [[!tails_website tails-sysadmins.key]]"
diff --git a/wiki/src/doc/about/openpgp_keys.it.po b/wiki/src/doc/about/openpgp_keys.it.po
index 5578106..efa9d5f 100644
--- a/wiki/src/doc/about/openpgp_keys.it.po
+++ b/wiki/src/doc/about/openpgp_keys.it.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"POT-Creation-Date: 2016-10-26 16:26+0300\n"
-"PO-Revision-Date: 2017-05-31 19:27+0200\n"
+"PO-Revision-Date: 2017-07-09 15:16+0000\n"
"Last-Translator: \n"
"Language-Team: ita <transitails@inventati.org>\n"
"Language: it\n"
@@ -31,13 +31,13 @@ msgid "<div class=\"caution\">\n"
msgstr "<div class=\"caution\">\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
msgid ""
"<p>Make sure to verify the keys that you download, because there are\n"
"several fake and maybe malicious Tails keys on the key servers.</p>\n"
msgstr ""
-"<p>Assicurati di verificare le chiavi che hai scaricato perchè ci sono \n"
-"parecchie chiavi Tails OpenPGP false (maligne) sui keyservers.</p>\n"
+"Assicurati di verificare le chiavi scaricate, poiché esistono\n"
+"diverse chiavi false e probabilmente Tails malevoli sui server chiave.\n"
#. type: Plain text
#, no-wrap
@@ -68,9 +68,9 @@ msgid "<a id=\"private\"></a>\n"
msgstr "<a id=\"privato\"></a>\n"
#. type: Title =
-#, no-wrap
+#, fuzzy, no-wrap
msgid "Private mailing list key\n"
-msgstr "Chiave della mailing list privata\n"
+msgstr "Chiave privata della mailing list\n"
#. type: Title -
#, no-wrap
@@ -127,7 +127,7 @@ msgid ""
msgstr ""
"Il materiale della chiave segreta e la sua password sono custoditi in un "
"server che gira le nostre mailing-list criptate e sui sistemi controllati "
-"dagli sviluppatori di Tails."
+"dagli sviluppatori di Tails"
#. type: Plain text
msgid ""
@@ -138,9 +138,9 @@ msgid ""
msgstr ""
"Questo significa che le persone che non sono sviluppatori di Tails sono "
"nella posizione di usare questa chiave segreta. Gli sviluppatori di Tails si "
-"fidano di queste persone abbastanza da lasciargli eseguire la nostra mailing-"
-"list criptata, ma ancora: questa coppia di chiavi è controllata in una "
-"maniera meno sicura della nostra chiave di firma"
+"fidano di queste persone al punto da lasciargli seguire la nostra mailing-"
+"list criptata, ma tuttavia: questa coppia di chiavi è controllata in una "
+"maniera meno sicura della nostra chiave di firma."
#. type: Title -
#, no-wrap
@@ -149,13 +149,6 @@ msgstr "Dettagli della chiave\n"
#. type: Plain text
#, no-wrap
-#| msgid ""
-#| " pub 4096R/0x1D2975EDF93E735F 2009-08-14 [expires: 2016-12-27]\n"
-#| " Key fingerprint = 09F6 BC8F EEC9 D8EE 005D BAA4 1D29 75ED F93E 735F\n"
-#| " uid Tails developers (Schleuder mailing-list) <tails@boum.org>\n"
-#| " uid Tails list (schleuder list) <tails-request@boum.org>\n"
-#| " uid Tails list (schleuder list) <tails-owner@boum.org>\n"
-#| " sub 4096R/0xD843C2F5E89382EB 2009-08-14 [expires: 2016-12-27]\n"
msgid ""
" pub 4096R/0x1D2975EDF93E735F 2009-08-14 [expires: 2018-10-01]\n"
" Key fingerprint = 09F6 BC8F EEC9 D8EE 005D BAA4 1D29 75ED F93E 735F\n"
@@ -164,12 +157,12 @@ msgid ""
" uid Tails list (schleuder list) <tails-owner@boum.org>\n"
" sub 4096R/0xD843C2F5E89382EB 2009-08-14 [expires: 2018-10-01]\n"
msgstr ""
-" pub 4096R/0x1D2975EDF93E735F 2009-08-14 [expires: 2018-10-01]\n"
+" pub 4096R/0x1D2975EDF93E735F 2009-08-14 [expires: 2016-12-27]\n"
" Key fingerprint = 09F6 BC8F EEC9 D8EE 005D BAA4 1D29 75ED F93E 735F\n"
" uid Tails developers (Schleuder mailing-list) <tails@boum.org>\n"
" uid Tails list (schleuder list) <tails-request@boum.org>\n"
" uid Tails list (schleuder list) <tails-owner@boum.org>\n"
-" sub 4096R/0xD843C2F5E89382EB 2009-08-14 [expires: 2018-10-01]\n"
+" sub 4096R/0xD843C2F5E89382EB 2009-08-14 [expires: 2016-12-27]\n"
#. type: Title -
#, no-wrap
@@ -231,8 +224,8 @@ msgid ""
"systems managed by anyone other than Tails core developers."
msgstr ""
"Il materiale della chiave segreta non sarà mai conservato su un server "
-"online o un sistema gestito da qualcun'altro eccetto gli sviluppatori del "
-"nucleo di Tails. "
+"online o un sistema gestito da qualcun altro eccetto gli sviluppatori del "
+"nucleo di Tails."
#. type: Title ###
#, no-wrap
@@ -240,7 +233,7 @@ msgid "Primary key"
msgstr "Chiave primaria"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
msgid ""
"* Is not owned in a usable format by any single individual. It is\n"
" split cryptographically using\n"
@@ -262,19 +255,18 @@ msgstr ""
"* Nessuno individuo le possiede in un formato utilizzabile direttamente. Sono divise\n"
" crittograficamente con\n"
" [gfshare](http://www.digital-scurf.org/software/libgfshare).\n"
-"* Sono utilizzate solo off-line, in una Tails isolata dal mondo esterno\n"
-" attraverso la procedura:\n"
-" - Mettere la flash media Tails in un altro sistema operativo per installare Tails\n"
-" nel primo posto.\n"
-" - Mettere un altro media removibile nella Tails isolata per inviare\n"
-" chiave pubblica, pezzi di chiave segreta, parti della chiave segreta master, e simili\n"
-" al mondo fuori.\n"
-" - Mettere un altro media removibile nella Tails isolata per ricevere i pacchetti Debian\n"
-" chiave pubbliche, e simili dal mondo fuori.\n"
-"* Scadono in meno di un anno. Noi potremo estendere la validità \n"
-" quante volte lo crediamo ragionevole.\n"
-"* Ha un certificato di revoca diviso tra più persone.\n"
-"Guarda i [[dettagli del meccanismo|signing_key_revocation]].\n"
+"* Sono utilizzate solo off-line, esclusivamente in un sistema Tails \"air-gap\" in comunicazione con il mondo esterno\n"
+" attraverso:\n"
+" - collegamenti di supporti flash Tails in un altro sistema operativo per installare Tails in primo luogo..\n"
+" - collegamento di altri supporti rimovibili in un \"Tails air-gapped\" per inviare la\n"
+" chiave pubblica, gli stub di chiavi segrete, parti del codice master segreto e così via,\n"
+" al mondo esterno.\n"
+" - collegamento di altri supporti rimovibili in un \"Tails air-gapped\" per ricevere pacchetti\n"
+" Debian, chiavi pubbliche e così via, dal mondo esterno.\n"
+"* Scadono in meno di un anno. Noi estenderemo la loro validità \n"
+" fin tanto lo riterremmo ragionevole.\n"
+"* Ha un certificato di revoca suddiviso tra diverse persone.\n"
+" Vedere i [[dettagli del meccanismo|signing_key_revocation]].\n"
#. type: Title ###
#, no-wrap
@@ -295,7 +287,7 @@ msgstr ""
#. type: Bullet: '* '
msgid "Expiration date: same as the primary key."
-msgstr "Data di scadenza: la stessa della chiave primaria. "
+msgstr "Data di scadenza: la stessa della chiave principale."
#. type: Plain text
#, no-wrap
@@ -347,9 +339,8 @@ msgid ""
"Use this key to encrypt private support requests sent to [[tails-support-"
"private@boum.org|about/contact#tails-support-private]]."
msgstr ""
-"Usa questa chiave per criptare richieste di supporto confidenziali da "
-"mandare a [[tails-support-private@boum.org|about/contact#tails-support-"
-"private]]."
+"Utilizza questa chiave per criptare richieste di supporto da mandare a "
+"[[tails-support-private@boum.org|about/contact#tails-support-private]]."
#. type: Bullet: ' - '
msgid ""
@@ -397,8 +388,8 @@ msgid ""
"Use this key to encrypt private emails sent to [[tails-press@boum.org|about/"
"contact#tails-press]]."
msgstr ""
-"Usa questa chiave per mandare email criptate a [[tails-press@boum.org|about/"
-"contact#tails-press]]."
+"Utilizza questa chiave per mandare email criptate a [[tails-press@boum.org|"
+"about/contact#tails-press]]."
#. type: Plain text
#, no-wrap
@@ -436,7 +427,7 @@ msgid ""
"Use this key to encrypt private emails sent to [[tails-accounting@boum.org|"
"about/contact#tails-acccounting]]."
msgstr ""
-"Usa questa chiave per criptare le email private mandate a [[tails-"
+"Utilizza questa chiave per criptare le email private mandate a [[tails-"
"accounting@boum.org|about/contact#tails-acccounting]]."
#. type: Plain text
@@ -461,9 +452,9 @@ msgid "download it from this website: [[!tails_website tails-accounting.key]]"
msgstr "scaricala dal sito: [[!tails_website tails-signing.key]]"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
msgid "<a id=\"mirrors\"></a>\n"
-msgstr "<a id=\"mirrors\"></a>\n"
+msgstr "<a id=\"premi\"></a>\n"
#. type: Plain text
#, no-wrap
@@ -477,11 +468,11 @@ msgid ""
"Use this key to encrypt private emails sent to [[tails-mirrors@boum.org|"
"about/contact#tails-mirrors]]."
msgstr ""
-"Usa questa chiave per mandare email criptate a [[tails-mirrors@boum.org|"
-"about/contact#tails-mirrors]]."
+"Utilizza questa chiave per mandare email criptate a [[tails-mirrors@boum."
+"org|about/contact#tails-mirrors]]."
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
msgid ""
"\tpub rsa4096/0xD2EDA621B572DD73 2016-04-29 [SCEA]\n"
"\t Key fingerprint = 0B08 8E31 D4F8 E59A 3D39 9137 D2ED A621 B572 DD73\n"
@@ -499,7 +490,7 @@ msgstr ""
#. type: Bullet: ' - '
msgid "download it from this website: [[!tails_website tails-mirrors.key]]"
-msgstr "scaricala dal sito: [[!tails_website tails-mirrors.key]]"
+msgstr "scaricala dal sito: [[!tails_website tails-email.key]]"
#. type: Plain text
#, no-wrap
@@ -516,18 +507,11 @@ msgid ""
"Use this key to encrypt private emails sent to [[tails-sysadmins@boum.org|"
"about/contact#tails-sysadmins]]."
msgstr ""
-"Usa questa chiave per mandare email criptate a [[tails-sysadmins@boum.org|"
-"about/contact#tails-sysadmins]]."
+"Utilizza questa chiave per mandare email criptate a [[tails-sysadmins@boum."
+"org|about/contact#tails-sysadmins]]."
#. type: Plain text
#, no-wrap
-#| msgid ""
-#| " pub 4096R/0x70F4F03116525F43 2012-08-23 [expires: 2016-08-16]\n"
-#| " Key fingerprint = D113 CB6D 5131 D34B A5F0 FE9E 70F4 F031 1652 5F43\n"
-#| " uid Tails system administrators <tails-sysadmins@boum.org>\n"
-#| " uid Tails system administrators (schleuder list) <tails-sysadmins-owner@boum.org>\n"
-#| " uid Tails system administrators (schleuder list) <tails-sysadmins-request@boum.org>\n"
-#| " sub 4096R/0x58BA940CCA0A30B4 2012-08-23 [expires: 2016-08-16]\n"
msgid ""
" pub 4096R/0x70F4F03116525F43 2012-08-23 [expires: 2018-05-16]\n"
" Key fingerprint = D113 CB6D 5131 D34B A5F0 FE9E 70F4 F031 1652 5F43\n"
@@ -536,12 +520,12 @@ msgid ""
" uid Tails system administrators (schleuder list) <tails-sysadmins-request@boum.org>\n"
" sub 4096R/0x58BA940CCA0A30B4 2012-08-23 [expires: 2018-05-16]\n"
msgstr ""
-" pub 4096R/0x70F4F03116525F43 2012-08-23 [expires: 2018-05-16]\n"
+" pub 4096R/0x70F4F03116525F43 2012-08-23 [expires: 2016-08-16]\n"
" Key fingerprint = D113 CB6D 5131 D34B A5F0 FE9E 70F4 F031 1652 5F43\n"
" uid Tails system administrators <tails-sysadmins@boum.org>\n"
" uid Tails system administrators (schleuder list) <tails-sysadmins-owner@boum.org>\n"
" uid Tails system administrators (schleuder list) <tails-sysadmins-request@boum.org>\n"
-" sub 4096R/0x58BA940CCA0A30B4 2012-08-23 [expires: 2018-05-16]\n"
+" sub 4096R/0x58BA940CCA0A30B4 2012-08-23 [expires: 2016-08-16]\n"
#. type: Bullet: ' - '
msgid "download it from this website: [[!tails_website tails-sysadmins.key]]"
diff --git a/wiki/src/doc/about/openpgp_keys.it.po.orig b/wiki/src/doc/about/openpgp_keys.it.po.orig
new file mode 100644
index 0000000..5e481f1
--- /dev/null
+++ b/wiki/src/doc/about/openpgp_keys.it.po.orig
@@ -0,0 +1,651 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"POT-Creation-Date: 2016-10-26 16:26+0300\n"
+<<<<<<< HEAD
+"PO-Revision-Date: 2017-05-31 19:27+0200\n"
+=======
+"PO-Revision-Date: 2017-07-09 15:16+0000\n"
+>>>>>>> C0D305TRANSLATION
+"Last-Translator: \n"
+"Language-Team: ita <transitails@inventati.org>\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.8.11\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"OpenPGP keys\"]]\n"
+msgstr "[[!meta title=\"chiavi OpenPGP\"]]\n"
+
+#. type: Plain text
+msgid "Tails developers maintain several OpenPGP key pairs."
+msgstr "Gli sviluppatori di Tails mantengono diverse coppie di chiavi OpenPGP"
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"caution\">\n"
+msgstr "<div class=\"caution\">\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p>Make sure to verify the keys that you download, because there are\n"
+"several fake and maybe malicious Tails keys on the key servers.</p>\n"
+msgstr ""
+<<<<<<< HEAD
+"<p>Assicurati di verificare le chiavi che hai scaricato perchè ci sono \n"
+"parecchie chiavi Tails OpenPGP false (maligne) sui keyservers.</p>\n"
+=======
+"Assicurati di verificare le chiavi scaricate, poiché esistono\n"
+"diverse chiavi false e probabilmente Tails malevoli sui server chiave.\n"
+>>>>>>> C0D305TRANSLATION
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p>For example, if you first [[authenticate the Tails signing key\n"
+"through the OpenPGP Web of Trust|install/download/openpgp#wot]], then\n"
+"you can verify our others keys as they are all certified by the Tails\n"
+"signing key.</p>\n"
+msgstr ""
+"<p>Per esempio, se tu prima [[autentichi la chiave della firma di Tails\n"
+"attraverso la Rete di Fiducia OpenPGP|install/download/openpgp#wot]], poi\n"
+"sarà possibile verificare le chiavi degli altri in quanto sono tutte certificate\n"
+"dalla chiave della firma di Tails<p>\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "</div>\n"
+msgstr "</div>\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!toc levels=1]]\n"
+msgstr "[[!toc levels=1]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"private\"></a>\n"
+msgstr "<a id=\"private\"></a>\n"
+
+#. type: Title =
+#, no-wrap
+msgid "Private mailing list key\n"
+msgstr "Chiave della mailing list privata\n"
+
+#. type: Title -
+#, no-wrap
+msgid "Purpose\n"
+msgstr "Scopo\n"
+
+#. type: Title ###
+#, no-wrap
+msgid "Encryption"
+msgstr "Crittografia"
+
+#. type: Plain text
+msgid ""
+"This key has an encryption subkey. Please use it to encrypt email sent to "
+"the core developers encrypted mailing list: [[tails@boum.org|about/"
+"contact#tails]]."
+msgstr ""
+<<<<<<< HEAD
+"Questa chiave ha una sottochiave di cifratura. Per piacere usala per "
+"criptare le email mandate agli sviluppatori nella mailing list criptata "
+"principale : [[tails@boum.org|about/contact#tails]]."
+=======
+"Questa chiave ha una sottochiave criptata. Per piacere usala per criptare le "
+"email inviate agli sviluppatori nella mailing list principale criptata: "
+"[[tails@boum.org|about/contact#tails]]."
+>>>>>>> C0D305TRANSLATION
+
+#. type: Title ###
+#, no-wrap
+msgid "Signature"
+msgstr "Firma"
+
+# ??? Non si capisce molto bene in Inglese...
+#. type: Plain text
+msgid ""
+"This key also has the capability to sign and certify. Until Tails 0.5 and "
+"0.6~rc3, released images were signed by this key. This purpose is now "
+"deprecated: further releases will be signed by a dedicated, safer signing "
+"key. As of 2010 October 7th, our mailing list key signature only means our "
+"mailing list software checked the signed content was originally OpenPGP-"
+"signed by a Tails core developer."
+msgstr ""
+"Questa chiave ha la capacità di firmare e certificare. Dalle versioni Tails "
+"0.5 e 0.6~rc3, le immagini rilasciate vengono firmate con questa chiave. "
+"Questo obiettivo è ormai superato: le future versioni saranno firmate "
+<<<<<<< HEAD
+"tramite una chiave dedicata più sicura. Dal 7 Ottobre 2010, la nostra chiave "
+"della mailing-list dice che il contenuto firmato era originariamente firmato "
+"con OpenPGP dagli sviluppatori del nucleo di Tails "
+=======
+"tramite una chiave dedicata più sicura. A partire dal 7 Ottobre 2010, la "
+"nostra chiave della mailing list firma solo il software controllato con il "
+"contenuto firmato con OpenPGP dagli sviluppatori del nucleo di Tails."
+>>>>>>> C0D305TRANSLATION
+
+#. type: Title -
+#, no-wrap
+msgid "Policy\n"
+msgstr "Regolamento\n"
+
+#. type: Plain text
+msgid ""
+"The secret key material and its passphrase are stored on the server that "
+"runs our encrypted mailing list software and on systems managed by core "
+"Tails developers."
+msgstr ""
+"Il materiale della chiave segreta e la sua password sono custoditi in un "
+"server che gira le nostre mailing-list criptate e sui sistemi controllati "
+"dagli sviluppatori di Tails."
+
+#. type: Plain text
+msgid ""
+"This means people other than Tails developers are in a position to use this "
+"secret key. Tails developers trust these people enough to rely on them for "
+"running our encrypted mailing list, but still: this key pair is managed in a "
+"less safe way than our signing key."
+msgstr ""
+"Questo significa che le persone che non sono sviluppatori di Tails sono "
+"nella posizione di usare questa chiave segreta. Gli sviluppatori di Tails si "
+<<<<<<< HEAD
+"fidano di queste persone abbastanza da lasciargli eseguire la nostra mailing-"
+"list criptata, ma ancora: questa coppia di chiavi è controllata in una "
+"maniera meno sicura della nostra chiave di firma"
+=======
+"fidano di queste persone al punto da lasciargli seguire la nostra mailing-"
+"list criptata, ma tuttavia: questa coppia di chiavi è controllata in una "
+"maniera meno sicura della nostra chiave di firma."
+>>>>>>> C0D305TRANSLATION
+
+#. type: Title -
+#, no-wrap
+msgid "Key details\n"
+msgstr "Dettagli della chiave\n"
+
+#. type: Plain text
+#, no-wrap
+<<<<<<< HEAD
+#| msgid ""
+#| " pub 4096R/0x1D2975EDF93E735F 2009-08-14 [expires: 2016-12-27]\n"
+#| " Key fingerprint = 09F6 BC8F EEC9 D8EE 005D BAA4 1D29 75ED F93E 735F\n"
+#| " uid Tails developers (Schleuder mailing-list) <tails@boum.org>\n"
+#| " uid Tails list (schleuder list) <tails-request@boum.org>\n"
+#| " uid Tails list (schleuder list) <tails-owner@boum.org>\n"
+#| " sub 4096R/0xD843C2F5E89382EB 2009-08-14 [expires: 2016-12-27]\n"
+=======
+>>>>>>> C0D305TRANSLATION
+msgid ""
+" pub 4096R/0x1D2975EDF93E735F 2009-08-14 [expires: 2018-10-01]\n"
+" Key fingerprint = 09F6 BC8F EEC9 D8EE 005D BAA4 1D29 75ED F93E 735F\n"
+" uid Tails developers (Schleuder mailing-list) <tails@boum.org>\n"
+" uid Tails list (schleuder list) <tails-request@boum.org>\n"
+" uid Tails list (schleuder list) <tails-owner@boum.org>\n"
+" sub 4096R/0xD843C2F5E89382EB 2009-08-14 [expires: 2018-10-01]\n"
+msgstr ""
+" pub 4096R/0x1D2975EDF93E735F 2009-08-14 [expires: 2018-10-01]\n"
+" Key fingerprint = 09F6 BC8F EEC9 D8EE 005D BAA4 1D29 75ED F93E 735F\n"
+" uid Tails developers (Schleuder mailing-list) <tails@boum.org>\n"
+" uid Tails list (schleuder list) <tails-request@boum.org>\n"
+" uid Tails list (schleuder list) <tails-owner@boum.org>\n"
+" sub 4096R/0xD843C2F5E89382EB 2009-08-14 [expires: 2018-10-01]\n"
+
+#. type: Title -
+#, no-wrap
+msgid "How to get the public key?\n"
+msgstr "Come ottenere questa chiave?\n"
+
+#. type: Plain text
+msgid "There are multiple ways to get this OpenPGP public key:"
+msgstr "Ci sono molti modi per ottenere questa chiave OpenPGP:"
+
+#. type: Bullet: '- '
+msgid "download it from this website: [[!tails_website tails-email.key]]"
+msgstr "scaricarla dal sito web: [[!tails_website tails-email.key]]"
+
+#. type: Bullet: '- '
+msgid "fetch it from your favourite keyserver"
+msgstr "prenderla dal nostro keyserver preferito"
+
+#. type: Bullet: '- '
+msgid "send an email to <tails-sendkey@boum.org>."
+msgstr "invia una mail a <tails-sendkey@boum.org>."
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"signing\"></a>\n"
+msgstr "<a id=\"firmare\"></a>\n"
+
+#. type: Title =
+#, no-wrap
+msgid "Signing key\n"
+msgstr "Chiave per la firma\n"
+
+#. type: Plain text
+msgid ""
+"This key only has the capability to sign and certify: it has no encryption "
+"subkey."
+msgstr ""
+"Questa chiave ha solo la capacità di firmare e certificare: non ha la "
+"sottochiave di criptazione."
+
+#. type: Plain text
+msgid "Its only purpose is:"
+msgstr "Il suo unico scopo è:"
+
+#. type: Bullet: '- '
+msgid "to sign Tails released images;"
+msgstr "firmare le immagini delle versioni di Tails;"
+
+#. type: Bullet: '- '
+msgid ""
+"to certify other cryptographic public keys needed for Tails development."
+msgstr ""
+"per certificare altre chiavi pubbliche crittografiche necessarie allo "
+"sviluppo di Tails."
+
+#. type: Plain text
+msgid ""
+"The secret key material will never be stored on an online server or on "
+"systems managed by anyone other than Tails core developers."
+msgstr ""
+"Il materiale della chiave segreta non sarà mai conservato su un server "
+<<<<<<< HEAD
+"online o un sistema gestito da qualcun'altro eccetto gli sviluppatori del "
+"nucleo di Tails. "
+=======
+"online o un sistema gestito da qualcun altro eccetto gli sviluppatori del "
+"nucleo di Tails."
+>>>>>>> C0D305TRANSLATION
+
+#. type: Title ###
+#, no-wrap
+msgid "Primary key"
+msgstr "Chiave primaria"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"* Is not owned in a usable format by any single individual. It is\n"
+" split cryptographically using\n"
+" [gfshare](http://www.digital-scurf.org/software/libgfshare).\n"
+"* Is only used offline, in an air-gapped Tails only communicating with\n"
+" the outside world through:\n"
+" - Plugging the Tails flash media in another operating system to install Tails\n"
+" in the first place.\n"
+" - Plugging other removable media in the air-gapped Tails to send the\n"
+" public key, secret key stubs, parts of the secret master key, and so on\n"
+" to the outside world.\n"
+" - Plugging other removable media in the air-gapped Tails to receive Debian\n"
+" packages, public keys, and so on from the outside world.\n"
+"* Expires in less than one year. We will extend its validity as many\n"
+" times as we find reasonable.\n"
+"* Has a revocation certificate split amongst different people.\n"
+" See the [[details of the mechanism|signing_key_revocation]].\n"
+msgstr ""
+"* Nessuno individuo le possiede in un formato utilizzabile direttamente. Sono divise\n"
+" crittograficamente con\n"
+" [gfshare](http://www.digital-scurf.org/software/libgfshare).\n"
+<<<<<<< HEAD
+"* Sono utilizzate solo off-line, in una Tails isolata dal mondo esterno\n"
+" attraverso la procedura:\n"
+" - Mettere la flash media Tails in un altro sistema operativo per installare Tails\n"
+" nel primo posto.\n"
+" - Mettere un altro media removibile nella Tails isolata per inviare\n"
+" chiave pubblica, pezzi di chiave segreta, parti della chiave segreta master, e simili\n"
+" al mondo fuori.\n"
+" - Mettere un altro media removibile nella Tails isolata per ricevere i pacchetti Debian\n"
+" chiave pubbliche, e simili dal mondo fuori.\n"
+"* Scadono in meno di un anno. Noi potremo estendere la validità \n"
+" quante volte lo crediamo ragionevole.\n"
+"* Ha un certificato di revoca diviso tra più persone.\n"
+"Guarda i [[dettagli del meccanismo|signing_key_revocation]].\n"
+=======
+"* Sono utilizzate solo off-line, esclusivamente in un sistema Tails \"air-gap\" in comunicazione con il mondo esterno\n"
+" attraverso:\n"
+" - collegamenti di supporti flash Tails in un altro sistema operativo per installare Tails in primo luogo..\n"
+" - collegamento di altri supporti rimovibili in un \"Tails air-gapped\" per inviare la\n"
+" chiave pubblica, gli stub di chiavi segrete, parti del codice master segreto e così via,\n"
+" al mondo esterno.\n"
+" - collegamento di altri supporti rimovibili in un \"Tails air-gapped\" per ricevere pacchetti\n"
+" Debian, chiavi pubbliche e così via, dal mondo esterno.\n"
+"* Scadono in meno di un anno. Noi estenderemo la loro validità \n"
+" fin tanto lo riterremmo ragionevole.\n"
+"* Ha un certificato di revoca suddiviso tra diverse persone.\n"
+" Vedere i [[dettagli del meccanismo|signing_key_revocation]].\n"
+>>>>>>> C0D305TRANSLATION
+
+#. type: Title ###
+#, no-wrap
+msgid "Signing subkeys"
+msgstr "Firma delle sottochiavi"
+
+#. type: Bullet: '* '
+msgid ""
+"Stored on OpenPGP smartcards owned by those who need them. Smartcards "
+"ensure that the cryptographic operations are done on the smartcard itself "
+"and that the secret cryptographic material is not directly available to the "
+"operating system using it."
+msgstr ""
+"Custodite su delle smart card OpenPGP possedute da chi le necessita. Le "
+"smart card assicurano che le operazioni di crittografia siano fatte sulle "
+"smart card stesse e che il materiale di crittografia segreto non sia "
+"direttamente disponibile al sistema operativo che lo usa. "
+
+#. type: Bullet: '* '
+msgid "Expiration date: same as the primary key."
+<<<<<<< HEAD
+msgstr "Data di scadenza: la stessa della chiave primaria. "
+=======
+msgstr "Data di scadenza: la stessa della chiave principale."
+>>>>>>> C0D305TRANSLATION
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" pub rsa4096/0xDBB802B258ACD84F 2015-01-18 [C] [expires: 2018-01-11]\n"
+" Key fingerprint = A490 D0F4 D311 A415 3E2B B7CA DBB8 02B2 58AC D84F\n"
+" uid [ full ] Tails developers (offline long-term identity key) <tails@boum.org>\n"
+" uid [ unknown] Tails developers <tails@boum.org>\n"
+" sub rsa4096/0x98FEC6BC752A3DB6 2015-01-18 [S] [expires: 2018-01-11]\n"
+" sub rsa4096/0x3C83DCB52F699C56 2015-01-18 [S] [expires: 2018-01-11]\n"
+" sub rsa4096/0xAF292B44A0EDAA41 2016-08-30 [S] [expires: 2018-01-11]\n"
+msgstr ""
+" pub rsa4096/0xDBB802B258ACD84F 2015-01-18 [C] [expires: 2018-01-11]\n"
+" Key fingerprint = A490 D0F4 D311 A415 3E2B B7CA DBB8 02B2 58AC D84F\n"
+" uid [ full ] Tails developers (offline long-term identity key) <tails@boum.org>\n"
+" uid [ unknown] Tails developers <tails@boum.org>\n"
+" sub rsa4096/0x98FEC6BC752A3DB6 2015-01-18 [S] [expires: 2018-01-11]\n"
+" sub rsa4096/0x3C83DCB52F699C56 2015-01-18 [S] [expires: 2018-01-11]\n"
+" sub rsa4096/0xAF292B44A0EDAA41 2016-08-30 [S] [expires: 2018-01-11]\n"
+
+#. type: Bullet: ' - '
+msgid "download it from this website: [[!tails_website tails-signing.key]]"
+msgstr "scaricalo dal sito web: [[!tails_website tails-signing.key]]"
+
+#. type: Bullet: ' - '
+msgid "fetch it from your favourite keyserver."
+msgstr "prendila dal tuo keyserver preferito."
+
+#. type: Plain text
+msgid ""
+"If you already have Tails signing key but download it again, it can update "
+"the list of existing signatures of the key."
+msgstr ""
+"Se hai già una chiave di firma per Tails ma la scarichi ancora, può "
+"aggiornare la lista delle firme delle chiavi esistenti."
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"support\"></a>\n"
+msgstr "<a id=\"supporto\"></a>\n"
+
+#. type: Title =
+#, no-wrap
+msgid "User support key\n"
+msgstr "Chiave del supporto utente\n"
+
+#. type: Bullet: ' - '
+msgid ""
+"Use this key to encrypt private support requests sent to [[tails-support-"
+"private@boum.org|about/contact#tails-support-private]]."
+msgstr ""
+<<<<<<< HEAD
+"Usa questa chiave per criptare richieste di supporto confidenziali da "
+"mandare a [[tails-support-private@boum.org|about/contact#tails-support-"
+"private]]."
+=======
+"Utilizza questa chiave per criptare richieste di supporto da mandare a "
+"[[tails-support-private@boum.org|about/contact#tails-support-private]]."
+>>>>>>> C0D305TRANSLATION
+
+#. type: Bullet: ' - '
+msgid ""
+"This same key is used to handle [[*WhisperBack* reports|first_steps/"
+"bug_reporting]]."
+msgstr ""
+"La stessa chiave è usata per gestire i [[*WhisperBack* reports|first_steps/"
+"bug_reporting]]."
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" pub 4096R/EC57B56EF0C43132 2013-07-24 [expires: 2018-07-23]\n"
+" Key fingerprint = 1F56 EDD3 0741 0480 35DA C1C5 EC57 B56E F0C4 3132\n"
+" uid Tails bug squad <tails-bugs@boum.org>\n"
+" uid Tails bug squad (schleuder list) <tails-bugs-owner@boum.org>\n"
+" uid Tails bug squad (schleuder list) <tails-bugs-request@boum.org>\n"
+" uid Tails private user support <tails-support-private@boum.org>\n"
+" sub 4096R/9D6D6472AFC1AD77 2013-07-24 [expires: 2018-07-23]\n"
+msgstr ""
+" pub 4096R/EC57B56EF0C43132 2013-07-24 [expires: 2018-07-23]\n"
+" Key fingerprint = 1F56 EDD3 0741 0480 35DA C1C5 EC57 B56E F0C4 3132\n"
+" uid Tails bug squad <tails-bugs@boum.org>\n"
+" uid Tails bug squad (schleuder list) <tails-bugs-owner@boum.org>\n"
+" uid Tails bug squad (schleuder list) <tails-bugs-request@boum.org>\n"
+" uid Tails private user support <tails-support-private@boum.org>\n"
+" sub 4096R/9D6D6472AFC1AD77 2013-07-24 [expires: 2018-07-23]\n"
+
+#. type: Bullet: ' - '
+msgid "download it from this website: [[!tails_website tails-bugs.key]]"
+msgstr "scaricala dal sito: [[!tails_website tails-bugs.key]]"
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"press\"></a>\n"
+msgstr ""
+"<a id=\"press\"></a>\n"
+"\n"
+
+#. type: Title =
+#, no-wrap
+msgid "Press team key\n"
+msgstr "Chiave del team di Stampa\n"
+
+#. type: Bullet: ' - '
+msgid ""
+"Use this key to encrypt private emails sent to [[tails-press@boum.org|about/"
+"contact#tails-press]]."
+msgstr ""
+<<<<<<< HEAD
+"Usa questa chiave per mandare email criptate a [[tails-press@boum.org|about/"
+"contact#tails-press]]."
+=======
+"Utilizza questa chiave per mandare email criptate a [[tails-press@boum.org|"
+"about/contact#tails-press]]."
+>>>>>>> C0D305TRANSLATION
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" pub 4096R/0x457080B5A072CBE3 2014-07-11\n"
+" Key fingerprint = F3CD 9B7B 4BDF 9995 DA22 088E 4570 80B5 A072 CBE3\n"
+"\tuid Tails press team (schleuder list) <tails-press@boum.org>\n"
+"\tuid Tails press team (schleuder list) <tails-press-owner@boum.org>\n"
+"\tuid Tails press team (schleuder list) <tails-press-request@boum.org>\n"
+"\tsub 4096R/0x5748DE3BC338BFFC 2014-07-11\n"
+msgstr ""
+" pub 4096R/0x457080B5A072CBE3 2014-07-11\n"
+" Key fingerprint = F3CD 9B7B 4BDF 9995 DA22 088E 4570 80B5 A072 CBE3\n"
+"\tuid Tails press team (schleuder list) <tails-press@boum.org>\n"
+"\tuid Tails press team (schleuder list) <tails-press-owner@boum.org>\n"
+"\tuid Tails press team (schleuder list) <tails-press-request@boum.org>\n"
+"\tsub 4096R/0x5748DE3BC338BFFC 2014-07-11\n"
+
+#. type: Bullet: ' - '
+msgid "download it from this website: [[!tails_website tails-press.key]]"
+msgstr "scaricala dal sito: [[!tails_website tails-press.key]]"
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"accounting\"></a>\n"
+msgstr "<a id=\"accounting\"></a>\n"
+
+#. type: Title =
+#, no-wrap
+msgid "Accounting team key\n"
+msgstr "Chiave del team Accounting\n"
+
+#. type: Bullet: ' - '
+msgid ""
+"Use this key to encrypt private emails sent to [[tails-accounting@boum.org|"
+"about/contact#tails-acccounting]]."
+msgstr ""
+<<<<<<< HEAD
+"Usa questa chiave per criptare le email private mandate a [[tails-"
+=======
+"Utilizza questa chiave per criptare le email private mandate a [[tails-"
+>>>>>>> C0D305TRANSLATION
+"accounting@boum.org|about/contact#tails-acccounting]]."
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\tpub 4096R/0xC436090F4BB47C6F 2014-07-11\n"
+"\tKey fingerprint = 256D EB90 7788 0CD6 8167 8528 C436 090F 4BB4 7C6F\n"
+"\tuid Tails accounting team (schleuder list) <tails-accounting@boum.org>\n"
+"\tuid Tails accounting team (schleuder list) <tails-accounting-request@boum.org>\n"
+"\tuid Tails accounting team (schleuder list) <tails-accounting-owner@boum.org>\n"
+"\tsub 4096R/0x289A5B45A9E89475 2014-07-11\n"
+msgstr ""
+"\tpub 4096R/0xC436090F4BB47C6F 2014-07-11\n"
+"\tKey fingerprint = 256D EB90 7788 0CD6 8167 8528 C436 090F 4BB4 7C6F\n"
+"\tuid Tails accounting team (schleuder list) <tails-accounting@boum.org>\n"
+"\tuid Tails accounting team (schleuder list) <tails-accounting-request@boum.org>\n"
+"\tuid Tails accounting team (schleuder list) <tails-accounting-owner@boum.org>\n"
+"\tsub 4096R/0x289A5B45A9E89475 2014-07-11\n"
+
+#. type: Bullet: ' - '
+msgid "download it from this website: [[!tails_website tails-accounting.key]]"
+msgstr "scaricala dal sito: [[!tails_website tails-accounting.key]]"
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"mirrors\"></a>\n"
+msgstr "<a id=\"mirrors\"></a>\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"Mirrors team key\n"
+"===================\n"
+msgstr ""
+"Chiavi del Team dei Mirror\n"
+"===================\n"
+"\n"
+
+#. type: Bullet: ' - '
+msgid ""
+"Use this key to encrypt private emails sent to [[tails-mirrors@boum.org|"
+"about/contact#tails-mirrors]]."
+msgstr ""
+<<<<<<< HEAD
+"Usa questa chiave per mandare email criptate a [[tails-mirrors@boum.org|"
+"about/contact#tails-mirrors]]."
+=======
+"Utilizza questa chiave per mandare email criptate a [[tails-mirrors@boum."
+"org|about/contact#tails-mirrors]]."
+>>>>>>> C0D305TRANSLATION
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\tpub rsa4096/0xD2EDA621B572DD73 2016-04-29 [SCEA]\n"
+"\t Key fingerprint = 0B08 8E31 D4F8 E59A 3D39 9137 D2ED A621 B572 DD73\n"
+"\tuid [ unknown] Tails mirror pool managers (schleuder list) <tails-mirrors@boum.org>\n"
+"\tuid [ unknown] Tails mirror pool managers (schleuder list) <tails-mirrors-request@boum.org>\n"
+"\tuid [ unknown] Tails mirror pool managers (schleuder list) <tails-mirrors-owner@boum.org>\n"
+"\tsub rsa4096/0x3DCFC1EB1C62C73C 2016-04-29 [SEA]\n"
+msgstr ""
+"\tpub rsa4096/0xD2EDA621B572DD73 2016-04-29 [SCEA]\n"
+"\t Key fingerprint = 0B08 8E31 D4F8 E59A 3D39 9137 D2ED A621 B572 DD73\n"
+"\tuid [ unknown] Tails mirror pool managers (schleuder list) <tails-mirrors@boum.org>\n"
+"\tuid [ unknown] Tails mirror pool managers (schleuder list) <tails-mirrors-request@boum.org>\n"
+"\tuid [ unknown] Tails mirror pool managers (schleuder list) <tails-mirrors-owner@boum.org>\n"
+"\tsub rsa4096/0x3DCFC1EB1C62C73C 2016-04-29 [SEA]\n"
+
+#. type: Bullet: ' - '
+msgid "download it from this website: [[!tails_website tails-mirrors.key]]"
+msgstr "scaricala dal sito: [[!tails_website tails-mirrors.key]]"
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"sysadmins\"></a>\n"
+msgstr "<a id=\"sysadmins\"></a>\n"
+
+#. type: Title =
+#, no-wrap
+msgid "Sysadmins team key\n"
+msgstr "Chiave del team degli amministratori di sistema\n"
+
+#. type: Bullet: ' - '
+msgid ""
+"Use this key to encrypt private emails sent to [[tails-sysadmins@boum.org|"
+"about/contact#tails-sysadmins]]."
+msgstr ""
+<<<<<<< HEAD
+"Usa questa chiave per mandare email criptate a [[tails-sysadmins@boum.org|"
+"about/contact#tails-sysadmins]]."
+
+#. type: Plain text
+#, no-wrap
+#| msgid ""
+#| " pub 4096R/0x70F4F03116525F43 2012-08-23 [expires: 2016-08-16]\n"
+#| " Key fingerprint = D113 CB6D 5131 D34B A5F0 FE9E 70F4 F031 1652 5F43\n"
+#| " uid Tails system administrators <tails-sysadmins@boum.org>\n"
+#| " uid Tails system administrators (schleuder list) <tails-sysadmins-owner@boum.org>\n"
+#| " uid Tails system administrators (schleuder list) <tails-sysadmins-request@boum.org>\n"
+#| " sub 4096R/0x58BA940CCA0A30B4 2012-08-23 [expires: 2016-08-16]\n"
+=======
+"Utilizza questa chiave per mandare email criptate a [[tails-sysadmins@boum."
+"org|about/contact#tails-sysadmins]]."
+
+#. type: Plain text
+#, no-wrap
+>>>>>>> C0D305TRANSLATION
+msgid ""
+" pub 4096R/0x70F4F03116525F43 2012-08-23 [expires: 2018-05-16]\n"
+" Key fingerprint = D113 CB6D 5131 D34B A5F0 FE9E 70F4 F031 1652 5F43\n"
+" uid Tails system administrators <tails-sysadmins@boum.org>\n"
+" uid Tails system administrators (schleuder list) <tails-sysadmins-owner@boum.org>\n"
+" uid Tails system administrators (schleuder list) <tails-sysadmins-request@boum.org>\n"
+" sub 4096R/0x58BA940CCA0A30B4 2012-08-23 [expires: 2018-05-16]\n"
+msgstr ""
+" pub 4096R/0x70F4F03116525F43 2012-08-23 [expires: 2018-05-16]\n"
+" Key fingerprint = D113 CB6D 5131 D34B A5F0 FE9E 70F4 F031 1652 5F43\n"
+" uid Tails system administrators <tails-sysadmins@boum.org>\n"
+" uid Tails system administrators (schleuder list) <tails-sysadmins-owner@boum.org>\n"
+" uid Tails system administrators (schleuder list) <tails-sysadmins-request@boum.org>\n"
+" sub 4096R/0x58BA940CCA0A30B4 2012-08-23 [expires: 2018-05-16]\n"
+
+#. type: Bullet: ' - '
+msgid "download it from this website: [[!tails_website tails-sysadmins.key]]"
+msgstr "scaricala dal sito: [[!tails_website tails-sysadmins.key]]"
+
+#~ msgid ""
+#~ " pub 4096R/0xDBB802B258ACD84F 2015-01-18 [expires: 2016-01-11]\n"
+#~ " Key fingerprint = A490 D0F4 D311 A415 3E2B B7CA DBB8 02B2 58AC "
+#~ "D84F\n"
+#~ " uid [ full ] Tails developers (offline long-term "
+#~ "identity key) <tails@boum.org>\n"
+#~ " sub 4096R/0x98FEC6BC752A3DB6 2015-01-18 [expires: 2016-01-11]\n"
+#~ " sub 4096R/0x3C83DCB52F699C56 2015-01-18 [expires: 2016-01-11]\n"
+#~ msgstr ""
+#~ " pub 4096R/0xDBB802B258ACD84F 2015-01-18 [expires: 2016-01-11]\n"
+#~ " Key fingerprint = A490 D0F4 D311 A415 3E2B B7CA DBB8 02B2 58AC "
+#~ "D84F\n"
+#~ " uid [ full ] Tails developers (offline long-term "
+#~ "identity key) <tails@boum.org>\n"
+#~ " sub 4096R/0x98FEC6BC752A3DB6 2015-01-18 [expires: 2016-01-11]\n"
+#~ " sub 4096R/0x3C83DCB52F699C56 2015-01-18 [expires: 2016-01-11]\n"
diff --git a/wiki/src/doc/about/requirements.de.po b/wiki/src/doc/about/requirements.de.po
index fb85021..6b9c7aa 100644
--- a/wiki/src/doc/about/requirements.de.po
+++ b/wiki/src/doc/about/requirements.de.po
@@ -48,7 +48,7 @@ msgid ""
"span> compatible processor: **<span class=\"definition\">[[!wikipedia "
"IBM_PC_compatible]]</span>** and others but not <span class=\"definition"
"\">[[!wikipedia PowerPC]]</span> nor <span class=\"definition\">[[!wikipedia "
-"ARM]]</span>. Mac computers are IBM PC compatible since 2006."
+"ARM_architecture desc=\"ARM\"]]</span>. Mac computers are IBM PC compatible since 2006."
msgstr ""
"Tails benötigt einen Prozessor, der auf der <span class=\"definition\">[[!"
"wikipedia_de x86 desc=\"x86-Architektur\"]]</span> basiert. Deshalb läuft es "
diff --git a/wiki/src/doc/about/requirements.fa.po b/wiki/src/doc/about/requirements.fa.po
index 65b5ca8..6dd1e8a 100644
--- a/wiki/src/doc/about/requirements.fa.po
+++ b/wiki/src/doc/about/requirements.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-05-19 17:19+0200\n"
+"POT-Creation-Date: 2017-06-16 20:12+0300\n"
"PO-Revision-Date: 2015-10-09 16:51+0000\n"
"Last-Translator: sprint5 <translation5@451f.org>\n"
"Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/"
@@ -55,9 +55,10 @@ msgstr ""
msgid ""
"Tails requires a 64-bit <span class=\"definition\">[[!wikipedia x86-64]]</"
"span> compatible processor: **<span class=\"definition\">[[!wikipedia "
-"IBM_PC_compatible]]</span>** and others but not <span class=\"definition"
-"\">[[!wikipedia PowerPC]]</span> nor <span class=\"definition\">[[!wikipedia "
-"ARM]]</span>. Mac computers are IBM PC compatible since 2006."
+"IBM_PC_compatible]]</span>** and others but not <span class=\"definition\">"
+"[[!wikipedia PowerPC]]</span> nor <span class=\"definition\">[[!wikipedia "
+"ARM_architecture desc=\"ARM\"]]</span>. Mac computers are IBM PC compatible "
+"since 2006."
msgstr ""
"تیلز به یک پردازش‌گر سازگار با <span class=\"definition\">[[!wikipedia x86]]</"
"span> نیاز دارد: **<span class=\"definition\">[[!wikipedia "
diff --git a/wiki/src/doc/about/requirements.fr.po b/wiki/src/doc/about/requirements.fr.po
index 6286888..dbc3a32 100644
--- a/wiki/src/doc/about/requirements.fr.po
+++ b/wiki/src/doc/about/requirements.fr.po
@@ -43,7 +43,7 @@ msgid ""
"span> compatible processor: **<span class=\"definition\">[[!wikipedia "
"IBM_PC_compatible]]</span>** and others but not <span class=\"definition"
"\">[[!wikipedia PowerPC]]</span> nor <span class=\"definition\">[[!wikipedia "
-"ARM]]</span>. Mac computers are IBM PC compatible since 2006."
+"ARM_architecture desc=\"ARM\"]]</span>. Mac computers are IBM PC compatible since 2006."
msgstr ""
"Tails nécessite un processeur compatible 64 bits <span class=\"definition"
"\">[[!wikipedia_fr X64 desc=\"x86-64\"]]</span> : **<span class=\"definition"
diff --git a/wiki/src/doc/about/requirements.it.po b/wiki/src/doc/about/requirements.it.po
index ce431b3..fdff7be 100644
--- a/wiki/src/doc/about/requirements.it.po
+++ b/wiki/src/doc/about/requirements.it.po
@@ -6,15 +6,15 @@
msgid ""
msgstr ""
"Project-Id-Version: Italian translation\n"
-"POT-Creation-Date: 2017-05-19 17:19+0200\n"
-"PO-Revision-Date: 2016-03-05 19:25-0000\n"
+"POT-Creation-Date: 2017-06-16 20:12+0300\n"
+"PO-Revision-Date: 2017-07-09 15:25+0000\n"
"Last-Translator: Zeyev <zeyev@autistici.org>\n"
"Language-Team: ita <transitails@inventati.org>\n"
"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.10\n"
+"X-Generator: Poedit 1.8.11\n"
#. type: Plain text
#, no-wrap
@@ -22,46 +22,36 @@ msgid "[[!meta title=\"System requirements\"]]\n"
msgstr "[[!meta title=\"Requisiti di sistema\"]]\n"
#. type: Plain text
-#, fuzzy
-#| msgid ""
-#| "Tails should work on any reasonably recent computer, say manufactured "
-#| "after 2005. Here is a detailed list of requirements:"
msgid ""
"Tails works on most reasonably recent computers, say manufactured after "
"2008. Here is a detailed list of requirements:"
msgstr ""
"Tails funziona su qualsiasi computer ragionevolmente recente, diciamo "
-"fabbricato dopo il 2005. Qui c'è la lista dettagliata dei requisiti:"
+"fabbricato almeno dopo il 2008. Qui c'è la lista dettagliata dei requisiti:"
#. type: Bullet: '- '
msgid ""
"Either **an internal or external DVD reader** or the possibility to **boot "
"from a USB stick or SD card**."
msgstr ""
-"Un **lettore di DVD integrato o esterno** o un pc che si possa **avviare da "
-"una memoria USB o da una carta SD**."
+"Un **lettore DVD integrato o esterno** o un computer che si possa **avviare "
+"da una memoria USB o da una SD card**."
#. type: Bullet: '- '
-#, fuzzy
-#| msgid ""
-#| "Tails requires an <span class=\"definition\">[[!wikipedia x86]]</span> "
-#| "compatible processor: **<span class=\"definition\">[[!wikipedia "
-#| "IBM_PC_compatible]]</span>** and others but not <span class=\"definition"
-#| "\">[[!wikipedia PowerPC]]</span> nor <span class=\"definition\">[[!"
-#| "wikipedia ARM]]</span>. Mac computers are IBM PC compatible since 2006."
msgid ""
"Tails requires a 64-bit <span class=\"definition\">[[!wikipedia x86-64]]</"
"span> compatible processor: **<span class=\"definition\">[[!wikipedia "
"IBM_PC_compatible]]</span>** and others but not <span class=\"definition"
"\">[[!wikipedia PowerPC]]</span> nor <span class=\"definition\">[[!wikipedia "
-"ARM]]</span>. Mac computers are IBM PC compatible since 2006."
+"ARM_architecture desc=\"ARM\"]]</span>. Mac computers are IBM PC compatible "
+"since 2006."
msgstr ""
-"Per funzionare Tails necessita di un processore compatibile con "
-"l'architettura <span class=\"definition\">[[!wikipedia x86]]</span>: **<span "
-"class=\"definition\">[[!wikipedia IBM_PC_compatible]]</span>** e altre, ma "
-"non funziona con <span class=\"definition\">[[!wikipedia PowerPC]]</span> e "
-"neanche su <span class=\"definition\">[[!wikipedia ARM]]</span>. I computer "
-"MAC sono IBM compatibili dal 2006."
+"Tails necessita di un processore compatibile <span class=\"definition\">[[!"
+"wikipedia x86-64]]</span> a 64 bit: **<span class=\"definition\">[[!"
+"wikipedia _PC_IBM_sono_compatibili]]</span>** e altri ma non <span class="
+"\"definition\">[[!wikipedia PowerPC]]</span> né <span class=\"definition"
+"\">[[!wikipedia ARM_architecture desc=\"ARM\"]]</span>. I computer Mac sono "
+"compatibili con i PC IBM dal 2006."
#. type: Bullet: '- '
msgid ""
@@ -79,3 +69,6 @@ msgid ""
"See the [[known hardware compatibility issues|support/known_issues]].\n"
"</div>\n"
msgstr ""
+"<div class=\"note\">\n"
+"Leggi i [[problemi noti di compatibilità hardware|support/known_issues]].\n"
+"</div>\n"
diff --git a/wiki/src/doc/about/requirements.mdwn b/wiki/src/doc/about/requirements.mdwn
index 5f848d3..8214e1b 100644
--- a/wiki/src/doc/about/requirements.mdwn
+++ b/wiki/src/doc/about/requirements.mdwn
@@ -8,7 +8,7 @@ Here is a detailed list of requirements:
compatible processor: **<span class="definition">[[!wikipedia
IBM_PC_compatible]]</span>** and others but not <span
class="definition">[[!wikipedia PowerPC]]</span> nor <span
- class="definition">[[!wikipedia ARM]]</span>. Mac computers are IBM PC
+ class="definition">[[!wikipedia ARM_architecture desc="ARM"]]</span>. Mac computers are IBM PC
compatible since 2006.
- **2 GB of RAM** to work smoothly. Tails is known to work with less memory
but you might experience strange behaviours or crashes.
diff --git a/wiki/src/doc/about/requirements.pt.po b/wiki/src/doc/about/requirements.pt.po
index d502313..0acde79 100644
--- a/wiki/src/doc/about/requirements.pt.po
+++ b/wiki/src/doc/about/requirements.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-05-19 17:19+0200\n"
+"POT-Creation-Date: 2017-06-16 20:12+0300\n"
"PO-Revision-Date: 2014-07-31 00:49-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -51,15 +51,16 @@ msgstr ""
msgid ""
"Tails requires a 64-bit <span class=\"definition\">[[!wikipedia x86-64]]</"
"span> compatible processor: **<span class=\"definition\">[[!wikipedia "
-"IBM_PC_compatible]]</span>** and others but not <span class=\"definition"
-"\">[[!wikipedia PowerPC]]</span> nor <span class=\"definition\">[[!wikipedia "
-"ARM]]</span>. Mac computers are IBM PC compatible since 2006."
+"IBM_PC_compatible]]</span>** and others but not <span class=\"definition\">"
+"[[!wikipedia PowerPC]]</span> nor <span class=\"definition\">[[!wikipedia "
+"ARM_architecture desc=\"ARM\"]]</span>. Mac computers are IBM PC compatible "
+"since 2006."
msgstr ""
"Tails requer um processador compatível com <span class=\"definition\">[[!"
"wikipedia x86]]</span>: **<span class=\"definition\">[[!wikipedia "
"IBM_PC_compatible]]</span>** e outros, mas não <span class=\"definition\">[[!"
-"wikipedia PowerPC]]</span> nem <span class=\"definition\">[[!wikipedia "
-"ARM]]</span>. Computadores Mac são compatíveis com IBM PC desde 2006."
+"wikipedia PowerPC]]</span> nem <span class=\"definition\">[[!wikipedia ARM]]"
+"</span>. Computadores Mac são compatíveis com IBM PC desde 2006."
#. type: Bullet: '- '
#, fuzzy
diff --git a/wiki/src/doc/about/tor.it.po b/wiki/src/doc/about/tor.it.po
index 68bf250..f2f30f4 100644
--- a/wiki/src/doc/about/tor.it.po
+++ b/wiki/src/doc/about/tor.it.po
@@ -7,14 +7,14 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"POT-Creation-Date: 2017-02-25 15:24+0100\n"
-"PO-Revision-Date: 2016-09-07 19:57+0200\n"
+"PO-Revision-Date: 2017-08-02 15:30+0200\n"
"Last-Translator: Tails developers <tails@boum.org>\n"
"Language-Team: ita <transitails@inventati.org>\n"
"Language: it_IT\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.7.1\n"
+"X-Generator: Poedit 1.8.11\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. type: Plain text
@@ -24,7 +24,7 @@ msgstr "[[!meta title=\"Perche' Tails usa Tor?\"]]\n"
#. type: Plain text
msgid "Tails uses Tor because it is the best available anonymity network."
-msgstr "Tails usa Tor perché è la migliore rete di anonimato disponibile."
+msgstr "Tails utilizza Tor perché è la migliore rete di anonimato disponibile."
#. type: Title =
#, no-wrap
@@ -47,7 +47,7 @@ msgid ""
"good speed."
msgstr ""
"Negli anni Tor è diventata una grande rete con molta capacità di banda e una "
-"buona velocità. "
+"buona velocità."
#. type: Plain text
msgid ""
@@ -60,9 +60,9 @@ msgstr ""
"I Networks virtuali privati (VPNs) possono essere più veloci di Tor, ma non "
"hanno una rete di anonimato, perchè gli amministratori delle VPN possono "
"sapere sia da dove ti stai connettendo che dove stai cercando di connetterti "
-"e questo cancella il tuo anonimato. Tor provvede l'anonimato rendendo "
+"e questo infrange il tuo anonimato. Tor provvede l'anonimato rendendo "
"impossibile per un singolo punto della rete sapere sia l'origine che la "
-"destinazione della connessione. "
+"destinazione della connessione."
#. type: Plain text
msgid ""
@@ -104,8 +104,8 @@ msgstr ""
"governi, attivisti per i diritti umani, imprenditori, militari, vittime di "
"abusi e cittadini interessati alla loro privacy in rete. Questa diversità "
"offre un forte anonimato per tutti e rende molto più difficile identificare "
-"o rintracciare uno specifico profilo di un utente Tor. L'anonimato ama la "
-"compagnia. "
+"o rintracciare uno specifico profilo di un utente Tor. *L'anonimato ama la "
+"compagnia.*"
#. type: Title =
#, no-wrap
@@ -145,7 +145,7 @@ msgstr ""
"\"[il Re dell'alta sicurezza, dell'anonimato in internet a bassa latenza]"
"(http://www.theguardian.com/world/interactive/2013/oct/04/tor-high-secure-"
"internet-anonymity)\" con \"nessun contendente per il trono che stanno "
-"aspettando\""
+"aspettando\"."
#. type: Plain text
#, no-wrap
@@ -164,7 +164,7 @@ msgstr ""
#. type: Bullet: ' - '
msgid "The Tor network is run by a worldwide community of volunteers."
-msgstr "La rete Tor è gestita da una comunità di volontari di t mondo."
+msgstr "La rete Tor è gestita da una comunità di volontari di tutto il mondo."
#. type: Bullet: ' - '
msgid "Tails is a separate project made by a different group of people."
@@ -189,6 +189,6 @@ msgid ""
"other things than accessing the Internet through Tor, for example to work "
"offline on sensitive documents."
msgstr ""
-"Ma molte persone usano Tor al di fuori di Tails, e molte persone usano Tails "
-"per fare altre cose che accedere ad Internet attraverso Tos, per esempio "
-"lavorare offline su documenti sensibili."
+"Ma molte persone usano Tor al di fuori di Tails, e molte persone utilizzano "
+"Tails per fare altre cose che accedere ad Internet attraverso Tor, per "
+"esempio lavorare offline su documenti sensibili."
diff --git a/wiki/src/doc/about/trust.de.po b/wiki/src/doc/about/trust.de.po
index 2297f4e..7cedbf6 100644
--- a/wiki/src/doc/about/trust.de.po
+++ b/wiki/src/doc/about/trust.de.po
@@ -138,7 +138,7 @@ msgid ""
"intentionally placed security holes have never been found to our knowledge."
msgstr ""
"Der Großteil der Software in Tails stammt aus der [[Debian GNU/Linux\n"
-"Distribution|https://www.debian.org/]]. Debian ist mutmaßlich *die*\n"
+"Distribution|https://www.debian.org/index.de.html]]. Debian ist mutmaßlich *die*\n"
"Linux Distribution, deren Softwarepakete am intensivsten öffentlich\n"
"untersucht werden. Debian ist nicht nur eine der größten Linux\n"
"Distributionen, sondern auch die populärste Basis-Distribution, um\n"
diff --git a/wiki/src/doc/about/trust.fa.po b/wiki/src/doc/about/trust.fa.po
index 6ebb6d4..bdbac6d 100644
--- a/wiki/src/doc/about/trust.fa.po
+++ b/wiki/src/doc/about/trust.fa.po
@@ -161,7 +161,7 @@ msgid ""
"intentionally placed security holes have never been found to our knowledge."
msgstr ""
"اغلب نرم‌افزارهای موجود در تیلز از [[توزیع گنو/لینوکس دبیان|https://www."
-"debian.org/]] می‌آیند. دبیان یک توزیع لینوکس است که بسته‌های نرم‌افزاری‌اش "
+"debian.org/index.fa.html]] می‌آیند. دبیان یک توزیع لینوکس است که بسته‌های نرم‌افزاری‌اش "
"عمیق‌ترین مراقبت عمومی را دارند. دبیان هم یکی از بزرگ‌ترین توزیع‌های لینوکس است "
"و هم یکی از محبوب‌ترین آن‌ها برای به وجود آوردن شاخه‌ها و مشتقات دیگر. برای "
"نمونه لینوکس اوبونتو یک شاخهٔ مبتنی بر دبیان است، همین‌طور لینوکس مینت. "
diff --git a/wiki/src/doc/about/trust.fr.po b/wiki/src/doc/about/trust.fr.po
index 448c047..7eccf66 100644
--- a/wiki/src/doc/about/trust.fr.po
+++ b/wiki/src/doc/about/trust.fr.po
@@ -137,7 +137,7 @@ msgid ""
"intentionally placed security holes have never been found to our knowledge."
msgstr ""
"La grande majorité des logiciels livrés dans Tails proviennent de la "
-"[[distribution Debian GNU/Linux|https://www.debian.org/]]. Debian est la "
+"[[distribution Debian GNU/Linux|https://www.debian.org/index.fr.html]]. Debian est la "
"distribution Linux dont, et c'est de notoriété publique, les logiciels "
"fournis via les paquets subissent un examen public des plus approfondis. "
"Debian n'est pas seulement une des plus importante distributions Linux, "
diff --git a/wiki/src/doc/about/trust.it.po b/wiki/src/doc/about/trust.it.po
index 2522d9f..f2a95cf 100644
--- a/wiki/src/doc/about/trust.it.po
+++ b/wiki/src/doc/about/trust.it.po
@@ -7,22 +7,20 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"POT-Creation-Date: 2016-05-17 09:40+0200\n"
-"PO-Revision-Date: 2017-05-31 19:32+0200\n"
+"PO-Revision-Date: 2017-08-02 15:36+0200\n"
"Last-Translator: \n"
"Language-Team: ita <transitails@inventati.org>\n"
"Language: it_IT\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.11\n"
+"X-Generator: Poedit 1.8.7.1\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
msgid "[[!meta title=\"Trusting Tails\"]]\n"
-msgstr ""
-"[[!meta title=\"Verificando Tails\"]]\n"
-" \n"
+msgstr "[[!meta title=\"Affidarsi a Tails\"]]\n"
#. type: Plain text
msgid ""
@@ -33,13 +31,12 @@ msgid ""
"generate compromised encryption keys in order to enable the government to "
"spy on you? Do you simply trust our word that we are legit?"
msgstr ""
-"La fiducia e' una questione molto problematica, ed è l'essenza del perché la "
-"sicurezza è difficile in tutti i campi, inclusi i computer e le "
-"comunicazioni Internet. Ti fidi di Tails e dei suoi sviluppatori ? Pensi che "
-"abbiamo inserito backdoor in Tails in modo da poster prendere il controllo "
-"del tuo computer, o che abbiamo fatto generare a Tails delle chiavi di "
-"cifratura compromesse in modo da poter abilitare i governi a spiarti ? Ti "
-"fidi semplicemente della nostra parola e che siamo ok ? "
+"La fiducia e' una questione molto problematica, ed è l'essenza del perché la sicurezza è "
+"difficile in tutti i campi, inclusi i computer e le comunicazioni Internet. Ti fidi di "
+"Tails e dei suoi sviluppatori ? Pensi che abbiamo inserito backdoor in Tails in modo da "
+"poter prendere il controllo del tuo computer, o che abbiamo fatto generare a Tails delle "
+"chiavi di cifratura compromesse in modo da poter abilitare i governi a spiarti ? Ti fidi "
+"semplicemente della nostra parola e che siamo onesti ?"
#. type: Plain text
msgid ""
@@ -76,6 +73,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|download]]. 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, "
@@ -88,15 +97,14 @@ msgid ""
"version actually was built with the source code, or if any malicious changes "
"have been made."
msgstr ""
-"Il Software Libero, [[come Tails|about/license]], permette ai suoi utenti di "
-"controllare esattamente in cosa il software consiste e come funziona dato "
-"che il codice sorgente è reso disponibile a tutti. Quindi una verifica "
-"approfondita del codice può rivelare se del codice maligno, come una "
-"backdoor, è presente. Inoltre con il codice sorgente è possibile compilare "
-"il software e, successivamente comparare i risultati con qualsiasi versione "
-"che è stata già creata ed è stata distribuita, come le immagini ISO di "
-"Tails. In questo modo è possibile determinare se la versione è stata "
-"costruita dal codice sorgente, o se sono state apportate modifiche dannose."
+"Il Software Libero, [[come Tails|about/license]], abilita i suoi utenti a controllare "
+"esattamente in cosa il software consiste e come funziona dato che il codice sorgente è "
+"reso disponibile a tutti. Quindi una verifica approfondita del codice può rivelare se "
+"del codice maligno, come una backdoor, è presente. Inoltre con il codice sorgente è "
+"possibile compilare il software e, successivamente comparare i risultati con qualsiasi "
+"versione che è stata già creata e distribuita, come le immagini ISO di Tails [[che puoi "
+"scaricare da noi|download]]. In questo modo è possibile determinare se la versione è "
+"stata costruita dal codice sorgente, o se sono state apportate modifiche dannose."
#. type: Plain text
msgid ""
diff --git a/wiki/src/doc/about/trust.it.po.orig b/wiki/src/doc/about/trust.it.po.orig
new file mode 100644
index 0000000..7e3b055
--- /dev/null
+++ b/wiki/src/doc/about/trust.it.po.orig
@@ -0,0 +1,242 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"POT-Creation-Date: 2016-05-17 09:40+0200\n"
+<<<<<<< HEAD
+"PO-Revision-Date: 2017-05-31 19:32+0200\n"
+=======
+"PO-Revision-Date: 2017-08-02 15:36+0200\n"
+>>>>>>> C0D305TRANSLATION
+"Last-Translator: \n"
+"Language-Team: ita <transitails@inventati.org>\n"
+"Language: it_IT\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.8.11\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"Trusting Tails\"]]\n"
+<<<<<<< HEAD
+msgstr ""
+"[[!meta title=\"Verificando Tails\"]]\n"
+" \n"
+=======
+msgstr "[[!meta title=\"Affidarsi a Tails\"]]\n"
+>>>>>>> C0D305TRANSLATION
+
+#. type: Plain text
+msgid ""
+"Trust is a very problematic issue, and that's the essence of why security is difficult "
+"in every field, including computers and Internet communication. Do you trust Tails and "
+"its developers? Do you think we have planted backdoors in Tails so we can take control "
+"of your computer, or that we make Tails generate compromised encryption keys in order to "
+"enable the government to spy on you? Do you simply trust our word that we are legit?"
+msgstr ""
+<<<<<<< HEAD
+"La fiducia e' una questione molto problematica, ed è l'essenza del perché la "
+"sicurezza è difficile in tutti i campi, inclusi i computer e le "
+"comunicazioni Internet. Ti fidi di Tails e dei suoi sviluppatori ? Pensi che "
+"abbiamo inserito backdoor in Tails in modo da poster prendere il controllo "
+"del tuo computer, o che abbiamo fatto generare a Tails delle chiavi di "
+"cifratura compromesse in modo da poter abilitare i governi a spiarti ? Ti "
+"fidi semplicemente della nostra parola e che siamo ok ? "
+=======
+"La fiducia e' una questione molto problematica, ed è l'essenza del perché la sicurezza è "
+"difficile in tutti i campi, inclusi i computer e le comunicazioni Internet. Ti fidi di "
+"Tails e dei suoi sviluppatori ? Pensi che abbiamo inserito backdoor in Tails in modo da "
+"poter prendere il controllo del tuo computer, o che abbiamo fatto generare a Tails delle "
+"chiavi di cifratura compromesse in modo da poter abilitare i governi a spiarti ? Ti fidi "
+"semplicemente della nostra parola e che siamo onesti ?"
+>>>>>>> C0D305TRANSLATION
+
+#. type: Plain text
+msgid ""
+"No matter what your opinion is in this matter you should ask yourself how you reached "
+"your conclusion. Both trust and distrust need to be established based on facts, not gut "
+"feelings, paranoid suspicion, unfounded hearsay, or our word. Of course, we claim to be "
+"honest, but written assurances are worthless. In order to make an informed decision you "
+"must look at the greater picture of what Tails is comprised of, our affiliations, and "
+"possibly how others trust us."
+msgstr ""
+"Non importa quale sia la tua opinione, piuttosto in queste situazioni si dovrebbe "
+"chiedere a se stessi come si è arrivati a questa conclusione. Sia la fiducia che la "
+"sfiducia hanno bisogno di fatti per essere stabilite, non dall'istinto, dai sospetti "
+"paranoici, dicerie infondate o le nostre parole. Naturalmente, diciamo di essere onesti, "
+"ma le assicurazioni scritte sono inutili. Al fine di prendere una decisione consapevole "
+"è necessario guardare al quadro generale di cui Tails è composto, ossia le nostre "
+"affiliazioni, ed eventualmente come gli altri si fidano di noi."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!toc levels=2]]\n"
+msgstr "[[!toc levels=2]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"free_software\"></a>\n"
+msgstr "<a id=\"free_software\"></a>\n"
+
+#. type: Title =
+#, no-wrap
+msgid "Free software and public scrutiny\n"
+msgstr "Il Software Libero e l'osservazione pubblica\n"
+
+#. type: Plain text
+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."
+msgstr ""
+<<<<<<< HEAD
+"Il Software Libero, [[come Tails|about/license]], permette ai suoi utenti di "
+"controllare esattamente in cosa il software consiste e come funziona dato "
+"che il codice sorgente è reso disponibile a tutti. Quindi una verifica "
+"approfondita del codice può rivelare se del codice maligno, come una "
+"backdoor, è presente. Inoltre con il codice sorgente è possibile compilare "
+"il software e, successivamente comparare i risultati con qualsiasi versione "
+"che è stata già creata ed è stata distribuita, come le immagini ISO di "
+"Tails. In questo modo è possibile determinare se la versione è stata "
+"costruita dal codice sorgente, o se sono state apportate modifiche dannose."
+=======
+"Il Software Libero, [[come Tails|about/license]], abilita i suoi utenti a controllare "
+"esattamente in cosa il software consiste e come funziona dato che il codice sorgente è "
+"reso disponibile a tutti. Quindi una verifica approfondita del codice può rivelare se "
+"del codice maligno, come una backdoor, è presente. Inoltre con il codice sorgente è "
+"possibile compilare il software e, successivamente comparare i risultati con qualsiasi "
+"versione che è stata già creata e distribuita, come le immagini ISO di Tails [[che puoi "
+"scaricare da noi|download]]. In questo modo è possibile determinare se la versione è "
+"stata costruita dal codice sorgente, o se sono state apportate modifiche dannose."
+>>>>>>> C0D305TRANSLATION
+
+#. type: Plain text
+msgid ""
+"Of course, most people do not have the knowledge, skills or time required to do this, "
+"but due to public scrutiny anyone can have a certain degree of implicit trust in Free "
+"software, at least if it is popular enough that other developers look into the source "
+"code and do what was described in the previous paragraph. After all, there is a strong "
+"tradition within the Free software community to publicly report serious issues that are "
+"found within software."
+msgstr ""
+"Di certo la maggior parte delle persone non ha le conoscenze, le capacità o il tempo "
+"necessario per fare questo, ma a causa del controllo pubblico chiunque può avere un "
+"certo grado di fiducia implicita nel software libero, almeno se questo è abbastanza "
+"popolare affinché altri sviluppatori esaminino il codice sorgente e facciano quello che "
+"è stato descritto nel paragrafo precedente. Dopo tutto, vi è una forte tradizione "
+"all'interno della comunità del Software Libero di riferire pubblicamente gravi problemi "
+"che si trovano all'interno del software."
+
+#. type: Title =
+#, no-wrap
+msgid "Trusting Debian GNU/Linux\n"
+msgstr "Verificare Debian GNU/Linux \n"
+
+#. type: Plain text
+msgid ""
+"The vast majority of all software shipped in Tails comes from the [[Debian GNU/Linux "
+"distribution|https://www.debian.org/]]. Debian is arguably the Linux distribution whose "
+"software packages are under the deepest public scrutiny. Not only is Debian itself one "
+"of the largest Linux distros, but it's also one of the most popular distros to make "
+"derivatives from. Ubuntu Linux, for instance, is a Debian derivative, and the same goes "
+"transitively for all of its derivatives, like Linux Mint. Thus there are countless "
+"people using Debian's software packages, and countless developers inspect their "
+"integrity. Very serious security issues have been discovered (like the infamous [[Debian "
+"SSH PRNG vulnerability|https://lists.debian.org/debian-security-announce/2008/msg00152."
+"html]]), but backdoors or other types of intentionally placed security holes have never "
+"been found to our knowledge."
+msgstr ""
+"La stragrande maggioranza di tutti i software forniti in Tails arrivano dalla "
+"[[distribuzione Debian GNU/Linux |https://www.debian.org/index.it.html]], Debian è "
+"probabilmente la distribuzione Linux che contiene pacchetti software con il più profondo "
+"controllo pubblico. Non solo Debian da sola è una delle grandi distribuzioni Linux, ma è "
+"anche una delle più popolari distribuzioni usate per creare altre distrubuzioni "
+"derivate. Ubuntu, per esempio, è una derivata di Debian, e lo stesso vale per ognuna "
+"delle sue derivate, come Linux Mint. In questo modo ci sono innumerevoli persone che "
+"utilizzano pacchetti software di Debian, e innumerevoli sviluppatori che ispezionano la "
+"loro integrità. Sono stati scoperti molti seri problemi di sicurezza (come il famigerato "
+"[[Debian SSH PRNG vulnerability|https://lists.debian.org/debian-security-announce/2008/"
+"msg00152.html]]), ma backdoor o altri tipi di buchi di sicurezza volutamente inseriti, "
+"in base alla nostra esperienza, non sono mai stati scoperti."
+
+#. type: Title =
+#, no-wrap
+msgid "Trusting Tor\n"
+msgstr "Fidarsi di Tor\n"
+
+#. type: Plain text
+msgid ""
+"Tails anonymity is based on Tor, which is developed by [[The Tor Project|https://www."
+"torproject.org/]]. The development of Tor is under a lot of public scrutiny both "
+"academically (research on attacks and defenses on onion routing) and engineering-wise "
+"(Tor's code has gone through several external audits, and many independent developers "
+"have read through the sources for other reasons). Again, security issues have been "
+"reported, but nothing malicious like a backdoor -- we would argue that it's only "
+"uninformed conspiracy theorists that speculate about deliberate backdoors in Tor these "
+"days. Furthermore, Tor's distributed trust model makes it hard for a single entity to "
+"capture an individual's traffic and effectively identify them."
+msgstr ""
+"L'anonimato di Tails si basa su Tor, che è sviluppato da [[The Tor Project|https://www."
+"torproject.org/]]. Lo sviluppo di Tor è sotto un grande controllo pubblico sia "
+"accademico (ricerca sugli attacchi e la difesa dei router a cipolla) che ingegneristico "
+"(il codice di Tor è passato attraverso diverse osservazioni esterne e molti sviluppatori "
+"indipendenti hanno letto il codice per altre ragioni). Nuovamente, i problemi di "
+"sicurezza sono stati segnalati, ma niente di malevolo come una backdoor. -- Dovremmo "
+"sostenere che e' solo una recente teoria di cospirazione disinformata che specula "
+"riguardo a backdoor inserite deliberatamente in Tor. Inoltre, il modello di fiducia "
+"nella distribuzione di Tor rende difficile da una unica entità catturare un traffico di "
+"rete individuale e effettivamente identificarlo."
+
+#. type: Title =
+#, no-wrap
+msgid "Trusting Tails\n"
+msgstr "Fidarsi di Tails \n"
+
+#. type: Plain text
+msgid ""
+"One could say that Tails is the union of Debian and Tor. What we do, essentially, is "
+"gluing it all together. Hence, if you trust Debian and The Tor Project, what remains to "
+"establish trust for Tails is to trust our \"glue\". As has been mentioned, Tails is Free "
+"software, so its source code is completely open for inspection, and it mainly consists "
+"of a specification for which Debian software packages to install and how they should be "
+"configured. While Tails surely doesn't get the same amount of attention as Debian or "
+"Tor, we do have some eyes on us, especially the Tor community, and also some of the "
+"general security community (see our [[audits page|security/audits]]). Given that Tails' "
+"source code is comparably small and devoid of complexities, we're in a pretty good spot "
+"compared to many other projects of similar nature. Our [[specification and design "
+"document|contribute/design]] is a good starting point to understand how Tails works, by "
+"the way."
+msgstr ""
+"Qualcuno potrebbe dire che Tails è l'unione di Debian e Tor. Quello che facciamo, "
+"essenzialmente, è incollare tutto insieme. Da qui, se ti fidi ti Debian e del progetto "
+"Tor, ciò che rimane da stabilire per fidarsi di Tails è verificare la nostra \"colla\". "
+"Come abbiamo già menzionato Tails è Software Libero, così il suo codice è completamente "
+"aperto per essere ispezionato, ed è costituito dalle specifiche date dall'installazione "
+"dei pacchetti software di Debian, e come questi dovrebbero essere configurati. Mentre "
+"Tails sicuramente non ottiene la stessa attenzione come Debian o Tor, abbiamo alcuni "
+"occhi su di noi specialmente dalla comunità Tor, e anche da alcuni della comunità che si "
+"occupa di sicurezza in generale (guarda le nostre [[audits page|security/audits]]). Dato "
+"che il codice sorgente di Tails è relativamente piccolo e privo di complessità, siamo in "
+"un buona posizione rispetto a molti altri progetti di analoga natura. La nostra "
+"[[documentazione sulle specifiche del progetto|contribute/design]] è un buon punto di "
+"partenza per capire come Tails lavora."
+
+#. type: Plain text
+msgid ""
+"With all this in light (which you ideally also should try to verify), you should be able "
+"to make an informed decision on whether or not you should trust our software."
+msgstr ""
+"Con tutto questo alla luce del sole (che idealmente dovresti anche provare a "
+"verificare), dovresti essere in grado di prendere una decisione informata sul fatto di "
+"poterti fidare oppure no del nostro software."
diff --git a/wiki/src/doc/about/trust.pt.po b/wiki/src/doc/about/trust.pt.po
index 63da752..5164833 100644
--- a/wiki/src/doc/about/trust.pt.po
+++ b/wiki/src/doc/about/trust.pt.po
@@ -169,7 +169,7 @@ msgid ""
"intentionally placed security holes have never been found to our knowledge."
msgstr ""
"A vasta maioria de todos os programas incluídos no Tails vêm da "
-"[[distribuição Debian GNU/Linux|https://www.debian.org/]]. O Debian é sem "
+"[[distribuição Debian GNU/Linux|https://www.debian.org/index.pt.html]]. O Debian é sem "
"dúvida a distribuição de Linux cujos pacotes de programas estão sob o mais "
"profundo escrutínio público. Não somente é o Debian uma das maiores "
"distribuições de Linux, mas ele é também uma das distribuições mais "
diff --git a/wiki/src/doc/about/warning.it.po b/wiki/src/doc/about/warning.it.po
index ca58785..fc0c21f 100644
--- a/wiki/src/doc/about/warning.it.po
+++ b/wiki/src/doc/about/warning.it.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"POT-Creation-Date: 2016-05-17 09:40+0200\n"
-"PO-Revision-Date: 2017-05-31 19:38+0200\n"
+"PO-Revision-Date: 2017-07-09 15:58+0000\n"
"Last-Translator: jkl <jkl>\n"
"Language-Team: ita <transitails@inventati.org>\n"
"Language: it\n"
@@ -86,7 +86,7 @@ msgstr "Tails non ti protegge contro attacchi al BIOS o a firmware\n"
#. type: Plain text
msgid "It is also impossible for Tails to protect against attacks made through the BIOS or other firmware embedded in the computer. These are not managed or provided by the operating system directly, and no operating system can protect against such attacks."
-msgstr "Per Tails è impossibile anche proteggerti contro gli attacchi fatti attraverso il BIOS o altri firmware embeddeb dentro al computer. Non c'è modo per il sistema operativo di fornirli o organizzarli e nessun sistema operativo può difendersi da tali attacchi."
+msgstr "Per Tails è impossibile anche proteggerti contro gli attacchi fatti attraverso il BIOS o altri firmware embeddeb dentro al computer. Non c'è modo per il sistema operativo di gestirli o provvedere ad essi, e nessun sistema operativo può difendersi da tali attacchi."
#. type: Plain text
msgid "See for example, this [attack on BIOS by LegbaCore](https://www.youtube.com/watch?v=sNYsfUNegEA)."
@@ -125,12 +125,16 @@ msgstr ""
"posizione per catturare qualsiasi traffico attraverso di esso**. Guarda [Tor FAQ: Can exit nodes eavesdrop on communications?](https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#CanexitnodeseavesdroponcommunicationsIsntthatbad)."
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "For example, in 2007, a security researcher intercepted thousands of private email messages sent by foreign embassies and human rights groups around the world by spying on the connections coming out of an exit node he was running. See [Wired: Rogue Nodes Turn Tor Anonymizer Into Eavesdropper's Paradise]"
+#| "(http://www.wired.com/politics/security/news/2007/09/embassy_hacks)."
msgid ""
-"For example, in 2007, a security researcher intercepted thousands of private email messages sent by foreign embassies and human rights groups around the world by spying on the connections coming out of an exit node he was running. See [Wired: Rogue Nodes Turn Tor Anonymizer Into Eavesdropper's Paradise](http://"
-"archive.wired.com/politics/security/news/2007/09/embassy_hacks)."
+"For example, in 2007, a security researcher intercepted thousands of private email messages sent by foreign embassies and human rights groups around the world by spying on the connections coming out of an exit node he was running. See [Wired: Rogue Nodes Turn Tor Anonymizer Into Eavesdropper's Paradise]"
+"(http://archive.wired.com/politics/security/news/2007/09/embassy_hacks)."
msgstr ""
"Per esempio, nel 2007, un ricercatore in ambito della sicurezza ha intercettato migliaia di messaggi e-mail privati inviati da ambasciate straniere e gruppi sui diritti umani in giro per il mondo spiando le connessioni che arrivavano fuori dal nodo di uscita che stava facendo girare sul proprio server. Guarda "
-"[Wired: Rogue Nodes Turn Tor Anonymizer Into Eavesdropper's Paradise](http://www.wired.com/politics/security/news/2007/09/embassy_hacks). "
+"[Wired: Rogue Nodes Turn Tor Anonymizer Into Eavesdropper's Paradise](http://www.wired.com/politics/security/news/2007/09/embassy_hacks)."
#. type: Plain text
#, no-wrap
@@ -153,7 +157,7 @@ msgid "<a id=\"fingerprint\"></a>\n"
msgstr "<a id=\"fingerprint\"></a>\n"
#. type: Title =
-#, no-wrap
+#, fuzzy, no-wrap
msgid "Tails makes it clear that you are using Tor and probably Tails\n"
msgstr ""
"Tails rende chiaro che si sta utilizzando Tor e probabilmente Tails\n"
@@ -174,7 +178,7 @@ msgstr ""
"che stai usando Tor.\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
msgid ""
"**The destination server that you are contacting through Tor** can know whether your\n"
"communication comes from a Tor exit node by consulting the publicly\n"
@@ -185,7 +189,6 @@ msgstr ""
"**Il server che stai contattando attraverso Tor** può sapere che\n"
"la tua comunicazione arriva da un nodo di uscita Tor (exit node), consultando la lista pubblica disponibile \n"
"dei nodi di uscita. Per esempio usando [Tor\n"
-" \n"
" Bulk Exit List tool](https://check.torproject.org/cgi-bin/TorBulkExitList.py)\n"
"da The Tor Project.\n"
@@ -232,14 +235,13 @@ msgstr "[[!img man-in-the-middle.png link=no alt=\"Illustrazione di un attacco M
msgid "<!-- Source: wiki/lib/man-in-the-middle.svg -->\n"
msgstr "<!-- Source: wiki/lib/man-in-the-middle.svg -->\n"
-# ERRORE NEI LINK?!?
#. type: Plain text
msgid ""
"While using Tor, man-in-the-middle attacks can still happen between the exit node and the destination server. The exit node itself can also act as a man-in-the-middle. For an example of such an attack see [MW-Blog: TOR exit-node doing MITM attacks](https://web.archive.org/web/20120113162841/http://www.teamfurry."
"com/wordpress/2007/11/20/tor-exit-node-doing-mitm-attacks)."
msgstr ""
-"Mentre usiamo Tor, un attacco man-in-the-middle può ancora avvenire tra il nodo di uscita e il server di destinazione. Il nodo di uscita stesso può anche agire come man-in-the-middle. Un esempio di questo attacco si può vedere [MW-Blog: TOR exit-node doing MITM attacks](https://web.archive.org/"
-"web/20120113162841/http://www.teamfurry.com/wordpress/2007/11/20/tor-exit-node-doing-mitm-attacks)."
+"Durante l'utilizzo di Tor, un attacco man-in-the-middle può ancora avvenire tra il nodo di uscita e il server di destinazione. Il nodo di uscita può anche agire come man-in-the-middle. Un esempio di questo attacco si può vedere [MW-Blog: TOR exit-node doing MITM attacks](http://www.teamfurry.com/"
+"wordpress/2007/11/20/tor-exit-node-doing-mitm-attacks)."
#. type: Plain text
#, no-wrap
@@ -264,7 +266,7 @@ msgid ""
msgstr ""
"Normalmente, questo viene fatto automaticamente dai certificati SSL controllati dal tuo\n"
"browser con una serie gia' riconosciuta di [[!wikipedia\n"
-"Certificate_authority desc=\"certificate authorities\"]]).\n"
+"Certificate_authority desc=\"autorità di certificazione\"]]).\n"
"Se ricevi un messaggio di eccezione di protezione come questo potresti essere una\n"
"vittima di un attacco man-in-the-middle e non dovresti ignorarlo a meno che non\n"
"disponi di un altro modo sicuro per controllare le impronte digitali del certificato con\n"
@@ -285,7 +287,7 @@ msgid ""
"live.com, www.google.com, login.yahoo.com (three certificates), login.skype.com, addons.mozilla.org, and global trustee. See [Comodo: The Recent RA Compromise](https://blog.comodo.com/other/the-recent-ra-compromise/)."
msgstr ""
"Per esempio, il 15 Marzo 2011, Comodo, una delle maggiori compagnie di certificati SSL, ha segnalato che un profilo utente di una autorità di registrazione di affiliazione era stato compromesso. Era stato usato per creare un nuovo profilo utente che ha rilasciato nove certificati firmati per sette domini: mail."
-"google.com, login.live.com, www.google.com, login.yahoo.com (tre certificati), login.skype.com, addons.mozilla.org, e global trustee. Guarda [Comodo: The Recent RA Compromise](http://blogs.comodo.com/it-security/data-security/the-recent-ra-compromise/). "
+"google.com, login.live.com, www.google.com, login.yahoo.com (tre certificati), login.skype.com, addons.mozilla.org, e global trustee. Guarda [Comodo: The Recent RA Compromise](http://blogs.comodo.com/it-security/data-security/the-recent-ra-compromise/)."
#. type: Plain text
msgid ""
@@ -313,7 +315,14 @@ msgstr ""
"MitM su larga scala, o attaccare **un server specifico**, e specialmente a quegli utenti che hanno intenzione di usare Tor."
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<p class=\"quoted-from\">Quoted from [[!wikipedia Man-in-the-middle_attack\n"
+#| "desc=\"Wikipedia: %s\"]], [[!wikipedia\n"
+#| "Comodo_Group#Iran_SSL_certificate_controversy desc=\"Wikipedia: %s\"]] and <a\n"
+#| "href=\"https://blog.torproject.org/blog/detecting-certificate-authority-compromises-and-web-browser-collusion\">Tor\n"
+#| "Project: Detecting Certificate Authority compromises and web browser\n"
+#| "collusion</a>.</p>\n"
msgid ""
"<p class=\"quoted-from\">Quoted from [[!wikipedia Man-in-the-middle_attack\n"
"desc=\"Wikipedia: %s\"]], [[!wikipedia\n"
@@ -322,9 +331,9 @@ msgid ""
"Project: Detecting Certificate Authority compromises and web browser\n"
"collusion</a>.</p>\n"
msgstr ""
-"<p class=\"quoted-from\">Citazione da [!wikipedia Man-in-the-middle_attack\n"
+"<p class=\"quoted-from\">Citazione da [[!wikipedia attacco Man-in-the-Middle\n"
"desc=\"Wikipedia: %s\"]], [[!wikipedia\n"
-"Comodo_Group#Certificate_hacking desc=\"Wikipedia: %s\"]] e <a\n"
+"Comodo_Group#Iran_SSL_certificate_controversy desc=\"Wikipedia: %s\"]] e <a\n"
"href=\"https://blog.torproject.org/blog/detecting-certificate-authority-compromises-and-web-browser-collusion\">Tor\n"
"Project: Detecting Certificate Authority compromises and web browser\n"
"collusion</a>.</p>\n"
diff --git a/wiki/src/doc/about/warning.it.po.orig b/wiki/src/doc/about/warning.it.po.orig
new file mode 100644
index 0000000..3463e69
--- /dev/null
+++ b/wiki/src/doc/about/warning.it.po.orig
@@ -0,0 +1,553 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"POT-Creation-Date: 2016-05-17 09:40+0200\n"
+<<<<<<< HEAD
+"PO-Revision-Date: 2017-05-31 19:38+0200\n"
+=======
+"PO-Revision-Date: 2017-07-09 15:58+0000\n"
+>>>>>>> C0D305TRANSLATION
+"Last-Translator: jkl <jkl>\n"
+"Language-Team: ita <transitails@inventati.org>\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.8.11\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"Warning\"]]\n"
+msgstr "[[!meta title=\"Avvertenze\"]]\n"
+
+#. type: Plain text
+msgid ""
+"Even though we do our best to offer you good tools to protect your privacy while using a computer, **there is no magic or perfect solution to such a complex problem**. Understanding well the limits of such tools is a crucial step to, first, decide whether Tails is the right tool for you, and second, make a good "
+"use of it."
+msgstr ""
+"Anche se stiamo facendo del nostro meglio per offrire buoni strumenti per proteggere la vostra privacy mentre utilizzate un computer, ** non c'è magia o soluzione perfetta per un problema così complesso **. Capire bene i limiti di questi strumenti è un passo fondamentale, in primo luogo, per decidere se Tails è "
+"lo strumento giusto per te, e successivamente, aiutarti a farne buon uso."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!toc levels=2]]\n"
+msgstr "[[!toc levels=2]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"compromised_hardware\"></a>\n"
+msgstr "<a id=\"compromised_hardware\"></a>\n"
+
+#. type: Title =
+#, no-wrap
+msgid "Tails does not protect against compromised hardware\n"
+msgstr "Tails non offre protezione contro un hardware compromesso\n"
+
+#. type: Plain text
+msgid "If the computer has been compromised by someone having physical access to it and who installed untrusted pieces of hardware (like a keylogger), then it might be unsafe to use Tails."
+msgstr "Se il computer è stato compromesso da qualcuno che ha accesso fisico ad esso e/o hai installato parti di hardware non verificato/non sicuro (come un keylogger), allora questo renderebbe insicuro anche l'uso di Tails."
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"untrusted_system\"></a>\n"
+msgstr "<a id=\"untrusted_system\"></a>\n"
+
+#. type: Title =
+#, no-wrap
+msgid "Tails can be compromised if installed or plugged in untrusted systems\n"
+msgstr "Tails potrebbe venir compromesso dall'inserimento o dall'installazione da parte di un sistema operativo compromesso\n"
+
+#. type: Plain text
+msgid "When starting your computer on Tails, it cannot be compromised by a virus in your usual operating system, but:"
+msgstr "Quando avvii sul tuo computer Tails, esso non può essere compromesso da un virus che si trova nel tuo ordinario sistema operativo, ma:"
+
+#. type: Bullet: '* '
+msgid "Tails should be installed from a trusted system. Otherwise it might be corrupted during installation."
+msgstr "Tails dovrebbe venir installato da un sistema verificato e sicuro. Facendo in altro modo potrebbe essere corrotto nella fase di installazione."
+
+#. type: Bullet: '* '
+msgid "Plugging your Tails device in a compromised operating system might corrupt your Tails installation, and destroy the protection that Tails provides. Only use your Tails device to start Tails."
+msgstr "Inserire il tuo dispositivo con Tails in un sistema operativo compromesso, potrebbe compromettere anche la tua installazione di Tails, e distruggere la protezione che Tails ti fornisce. Usa il tuo dispositivo Tails soltanto per avviare Tails."
+
+#. type: Plain text
+msgid "See the [[corresponding FAQ|support/faq#compromised_system]]."
+msgstr "Guarda le [[FAQ corrispondenti|support/faq#compromised_system]]."
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"bios\"></a>\n"
+msgstr "<a id=\"bios\"></a>\n"
+
+#. type: Title =
+#, no-wrap
+msgid "Tails does not protect against BIOS or firmware attacks\n"
+msgstr "Tails non ti protegge contro attacchi al BIOS o a firmware\n"
+
+#. type: Plain text
+msgid "It is also impossible for Tails to protect against attacks made through the BIOS or other firmware embedded in the computer. These are not managed or provided by the operating system directly, and no operating system can protect against such attacks."
+msgstr "Per Tails è impossibile anche proteggerti contro gli attacchi fatti attraverso il BIOS o altri firmware embeddeb dentro al computer. Non c'è modo per il sistema operativo di gestirli o provvedere ad essi, e nessun sistema operativo può difendersi da tali attacchi."
+
+#. type: Plain text
+msgid "See for example, this [attack on BIOS by LegbaCore](https://www.youtube.com/watch?v=sNYsfUNegEA)."
+msgstr "Guarda per esempio, questo [attack on BIOS by LegbaCore](https://www.youtube.com/watch?v=sNYsfUNegEA)."
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"exit_node\"></a>\n"
+msgstr "<a id=\"exit_node\"></a>\n"
+
+#. type: Title =
+#, no-wrap
+msgid "Tor exit nodes can eavesdrop on communications\n"
+msgstr "I nodi di uscita di Tor (exit node) possono spiare le comunicazioni\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "**Tor is about hiding your location, not about encrypting your communication.**\n"
+msgstr "**Tor nasconde la tua posizione, non cifra le tue comunicazioni.**\n"
+
+#. type: Plain text
+msgid "Instead of taking a direct route from source to destination, communications using the Tor network take a random pathway through several Tor relays that cover your tracks. So no observer at any single point can tell where the data came from or where it's going."
+msgstr "Invece di prendere un percorso diretto dalla sorgente alla destinazione, le comunicazioni usano la rete Tor prendendo un percorso casuale attraverso molti nodi Tor che coprono le vostre tracce. Così nessun osservatore potrà in qualsiasi punto dire dove i dati partono e dove stanno andando."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!img htw2-tails.png link=no alt=\"A Tor connection usually goes through 3 relays with the last one establishing the actual connection to the final destination\"]]\n"
+msgstr "[[!img htw2-tails.png link=no alt=\"Di solito il collegamento Tor passa attraverso tre nodi con l'ultimo che stabilisce la connessione corrente fino alla destinazione finale\"]]\n"
+
+#. type: Plain text
+msgid ""
+"The last relay on this circuit, called the exit node, is the one that establishes the actual connection to the destination server. As Tor does not, and by design cannot, encrypt the traffic between an exit node and the destination server, **any exit node is in a position to capture any traffic passing through "
+"it**. See [Tor FAQ: Can exit nodes eavesdrop on communications?](https://www.torproject.org/docs/faq.html.en#CanExitNodesEavesdrop)."
+msgstr ""
+"L'ultimo nodo di questo circuito, chiamato nodo di uscita, è uno di quelli che stabilisce la connessione attuale verso il server di destinazione. Quello che Tor non fa, ed è progettato per non farlo, è cifrare il traffico dal nodo di uscita fino al server di destinazione **e qualsiasi nodo di uscita è in una "
+"posizione per catturare qualsiasi traffico attraverso di esso**. Guarda [Tor FAQ: Can exit nodes eavesdrop on communications?](https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#CanexitnodeseavesdroponcommunicationsIsntthatbad)."
+
+#. type: Plain text
+msgid ""
+"For example, in 2007, a security researcher intercepted thousands of private email messages sent by foreign embassies and human rights groups around the world by spying on the connections coming out of an exit node he was running. See [Wired: Rogue Nodes Turn Tor Anonymizer Into Eavesdropper's Paradise](http://"
+"archive.wired.com/politics/security/news/2007/09/embassy_hacks)."
+msgstr ""
+<<<<<<< HEAD
+"Per esempio, nel 2007, un ricercatore in ambito della sicurezza ha intercettato migliaia di messaggi e-mail privati inviati da ambasciate straniere e gruppi sui diritti umani in giro per il mondo spiando le connessioni che arrivavano fuori dal nodo di uscita che stava facendo girare sul proprio server. Guarda "
+"[Wired: Rogue Nodes Turn Tor Anonymizer Into Eavesdropper's Paradise](http://www.wired.com/politics/security/news/2007/09/embassy_hacks). "
+=======
+"Per esempio, nel 2007, un ricercatore in ambito della sicurezza ha intercettato migliaia di messaggi e-mail privati inviati da ambasciate straniere e gruppi sui diritti umani in giro per il mondo, spiando le connessioni che arrivavano fuori dal nodo di uscita che stava facendo girare sul proprio server. Guarda "
+"[Wired: Rogue Nodes Turn Tor Anonymizer Into Eavesdropper's Paradise](http://www.wired.com/politics/security/news/2007/09/embassy_hacks)."
+>>>>>>> C0D305TRANSLATION
+
+#. type: Plain text
+#, no-wrap
+msgid "**To protect yourself from such attacks you should use end-to-end encryption.**\n"
+msgstr "**Per proteggersi dagli attacchi si dovrebbe usare una crittografia end-to-end .**\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"**Tails includes many tools to help you using strong encryption** while\n"
+"browsing, sending email or chatting, as presented on our [[about\n"
+"page|/about#cryptography]].\n"
+msgstr ""
+"**Tails include molti strumenti per aiutarti a usare una cifratura forte ** mentre stai navigando, inviando una mail o chattando, come presentato sul nostro [[ about\n"
+"page|/about#cryptography]].\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"fingerprint\"></a>\n"
+msgstr "<a id=\"fingerprint\"></a>\n"
+
+#. type: Title =
+#, no-wrap
+msgid "Tails makes it clear that you are using Tor and probably Tails\n"
+msgstr "Tails rende chiaro che si sta utilizzando Tor e probabilmente Tails\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"**Your Internet Service Provider (ISP) or your local network administrator**\n"
+"can see that you're connecting to a Tor relay, and not a normal web server for\n"
+"example. Using [[Tor bridges in certain\n"
+"conditions|first_steps/startup_options/bridge_mode]] can help you hide the fact\n"
+"that you are using Tor.\n"
+msgstr ""
+"**Il tuo gestore del servizio Internet (ISP) o il tuo amministratore della rete locale**\n"
+"può vedere se sei connesso a un nodo Tor e non a un normale server web, per\n"
+"esempio. Usando [[Tor-Bridges in alcune condizioni|first_steps/startup_options/bridge_mode]] può aiutarti a nascondere il fatto\n"
+"che stai usando Tor.\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"**The destination server that you are contacting through Tor** can know whether your\n"
+"communication comes from a Tor exit node by consulting the publicly\n"
+"available list of exit nodes that might contact it. For example using the [Tor\n"
+"Bulk Exit List tool](https://check.torproject.org/cgi-bin/TorBulkExitList.py) from\n"
+"the Tor Project.\n"
+msgstr ""
+"**Il server di destinazione che stai contattando attraverso Tor** può sapere che\n"
+"la tua comunicazione arriva da un nodo di uscita Tor (exit node), consultando la lista pubblica disponibile \n"
+"dei nodi di uscita. Per esempio usando [Tor\n"
+" \n"
+" Bulk Exit List tool](https://check.torproject.org/cgi-bin/TorBulkExitList.py)\n"
+"da The Tor Project.\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"**So using Tails doesn't make you look like any random Internet user.**\n"
+"The anonymity provided by Tor and Tails works by trying to make all of their\n"
+"users look the same so it's not possible to identify who is who amongst them.\n"
+msgstr ""
+"**Così usando Tails non ti fa apparire come un utente internet casuale.**\n"
+"L'anonimato fornito da Tor e Tails lavora per cercare di rendere tutti i loro utenti \n"
+"uguali in modo che non sia possibile identificare chi è chi tra loro.\n"
+
+#. type: Plain text
+msgid "See also [[Can I hide the fact that I am using Tails?|fingerprint]]"
+msgstr "Leggi anche [[Posso nascondere il fatto che sto usando Tails?|fingerprint]]"
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"man-in-the-middle\"></a>\n"
+msgstr "<a id=\"man-in-the-middle\"></a>\n"
+
+#. type: Title =
+#, no-wrap
+msgid "Man-in-the-middle attacks\n"
+msgstr "Attacco Man-in-the-Middle\n"
+
+#. type: Plain text
+msgid ""
+"A man-in-the-middle attack (MitM) is a form of active eavesdropping in which the attacker makes independent connections with the victims and relays messages between them, making them believe that they are talking directly to each other over a private connection, when in fact the entire conversation is "
+"controlled by the attacker."
+msgstr ""
+"Un attacco Man-in-the-Middle (MITM) è una forma di intercettazione attiva dove l'attaccante crea connessioni indipendenti con le vittime e ritrasmette i messaggi tra di loro, facendogli credere che stiano parlando direttamente l'uno con l'altro in una connessione privata, mentre, realmente, l'intera "
+"conversazione è controllata dall'attaccante."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!img man-in-the-middle.png link=no alt=\"Illustration of a man-in-the-middle attack\"]]\n"
+msgstr "[[!img man-in-the-middle.png link=no alt=\"Illustrazione di un attacco Man-in-the-Middle\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "<!-- Source: wiki/lib/man-in-the-middle.svg -->\n"
+msgstr "<!-- Source: wiki/lib/man-in-the-middle.svg -->\n"
+
+# ERRORE NEI LINK?!?
+#. type: Plain text
+msgid ""
+"While using Tor, man-in-the-middle attacks can still happen between the exit node and the destination server. The exit node itself can also act as a man-in-the-middle. For an example of such an attack see [MW-Blog: TOR exit-node doing MITM attacks](https://web.archive.org/web/20120113162841/http://www.teamfurry."
+"com/wordpress/2007/11/20/tor-exit-node-doing-mitm-attacks)."
+msgstr ""
+<<<<<<< HEAD
+"Mentre usiamo Tor, un attacco man-in-the-middle può ancora avvenire tra il nodo di uscita e il server di destinazione. Il nodo di uscita stesso può anche agire come man-in-the-middle. Un esempio di questo attacco si può vedere [MW-Blog: TOR exit-node doing MITM attacks](https://web.archive.org/"
+"web/20120113162841/http://www.teamfurry.com/wordpress/2007/11/20/tor-exit-node-doing-mitm-attacks)."
+=======
+"Durante l'utilizzo di Tor, un attacco man-in-the-middle può ancora avvenire tra il nodo di uscita e il server di destinazione. Il nodo di uscita può anche agire come man-in-the-middle. Un esempio di questo attacco si può vedere [MW-Blog: TOR exit-node doing MITM attacks](http://www.teamfurry.com/"
+"wordpress/2007/11/20/tor-exit-node-doing-mitm-attacks)."
+>>>>>>> C0D305TRANSLATION
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"**Again, to protect yourself from such attacks you should use end-to-end\n"
+"encryption** and while doing so taking extra care at verifying the server\n"
+"authenticity.\n"
+msgstr ""
+"**Nuovamente, per proteggerti da questi attacchi devi usare una crittografia end-to-end** \n"
+"e nel farlo dovresti avere un ulteriore attenzione nel verificare l'autenticità del server.\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"Usually, this is automatically done throught SSL certificates checked by your\n"
+"browser against a given set of recognized [[!wikipedia\n"
+"Certificate_authority desc=\"certificate authorities\"]]).\n"
+"If you get a security exception message such as this one you might be the victim of\n"
+"a man-in-the-middle attack and should not bypass the warning unless you have another\n"
+"trusted way of checking the certificate's fingerprint with the people running\n"
+"the service.\n"
+msgstr ""
+"Normalmente, questo viene fatto automaticamente dai certificati SSL controllati dal tuo\n"
+"browser con una serie gia' riconosciuta di [[!wikipedia\n"
+"Certificate_authority desc=\"certificate authorities\"]]).\n"
+"Se ricevi un messaggio di eccezione di protezione come questo potresti essere una\n"
+"vittima di un attacco man-in-the-middle e non dovresti ignorarlo a meno che non\n"
+"disponi di un altro modo sicuro per controllare le impronte digitali del certificato con\n"
+" le persone che erogano il servizio\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!img ssl_warning.png link=no alt=\"This Connection is Untrusted\"]]\n"
+msgstr "[[!img ssl_warning.png link=no alt=\"La Connessione non è attendibile\"]]\n"
+
+#. type: Plain text
+msgid "But on top of that the certificate authorities model of trust on the Internet is susceptible to various methods of compromise."
+msgstr "Ma dopo tutto, in internet il modello di fiducia basato sulle autorità di certificazione è suscettibile a vari compromessi."
+
+#. type: Plain text
+msgid ""
+"For example, on March 15, 2011, Comodo, one of the major SSL certificates authorities, reported that a user account with an affiliate registration authority had been compromised. It was then used to create a new user account that issued nine certificate signing requests for seven domains: mail.google.com, login."
+"live.com, www.google.com, login.yahoo.com (three certificates), login.skype.com, addons.mozilla.org, and global trustee. See [Comodo: The Recent RA Compromise](https://blog.comodo.com/other/the-recent-ra-compromise/)."
+msgstr ""
+"Per esempio, il 15 Marzo 2011, Comodo, una delle maggiori compagnie di certificati SSL, ha segnalato che un profilo utente di una autorità di registrazione di affiliazione era stato compromesso. Era stato usato per creare un nuovo profilo utente che ha rilasciato nove certificati firmati per sette domini: mail."
+"google.com, login.live.com, www.google.com, login.yahoo.com (tre certificati), login.skype.com, addons.mozilla.org, e global trustee. Guarda [Comodo: The Recent RA Compromise](http://blogs.comodo.com/it-security/data-security/the-recent-ra-compromise/). "
+
+#. type: Plain text
+msgid ""
+"Later in 2011, DigiNotar, a Dutch SSL certificate company, incorrectly issued certificates to a malicious party or parties. Later on, it came to light that they were apparently compromised months before, perhaps as far back as May of 2009, or even earlier. Rogue certificates were issued for domains such as "
+"google.com, mozilla.org, torproject.org, login.yahoo.com and many more. See [The Tor Project: The DigiNotar Debacle, and what you should do about it](https://blog.torproject.org/blog/diginotar-debacle-and-what-you-should-do-about-it)."
+msgstr ""
+"Più tardi nel 2011, Diginotar, una compagnia di certificazioni SSL Tedesca, ha erroneamente rilasciato dei certificati con una parte o più parti malevole. Più tardi è venuto alla luce che apparentemente erano stati compromessi mesi prima o addirittura dal Maggio del 2009. Certificati compromessi erano stati "
+"emessi per domini come google.com, mozilla.org, torproject.org, login.yahoo.com e molti altri. Guarda, [The Tor Project: The DigiNotar Debacle, and what you should do about it](https://blog.torproject.org/blog/diginotar-debacle-and-what-you-should-do-about-it)."
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"**This still leaves open the possibility of a man-in-the-middle attack even when\n"
+"your browser is trusting an HTTPS connection.**\n"
+msgstr ""
+"**Questo lascia ancora aperto l'attacco Man-in-the-Middle quando \n"
+"il tuo browser si sta fidando di una connessione HTTPS**\n"
+
+#. type: Plain text
+msgid ""
+"On one hand, by providing anonymity, Tor makes it more difficult to perform a man-in-the-middle attack targeted at **one specific person** with the blessing of a rogue SSL certificate. But on the other end, Tor makes it easier for people or organizations running exit nodes to perform large scale MitM attempts, "
+"or attacks targeted at **a specific server**, and especially those among its users who happen to use Tor."
+msgstr ""
+"Da una parte, fornendo anonimato, Tor rende più difficile un attacco man-in-the-middle, con la complicità di un certificato SSL malevolo, mirato a **una specifica persona**. Ma, dall'altra parte, Tor rende più facile alle persone o alle organizzazioni che fanno girare un nodo di uscita (exit node) di eseguire "
+"MitM su larga scala, o attaccare **un server specifico**, e specialmente a quegli utenti che hanno intenzione di usare Tor."
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p class=\"quoted-from\">Quoted from [[!wikipedia Man-in-the-middle_attack\n"
+"desc=\"Wikipedia: %s\"]], [[!wikipedia\n"
+"Comodo_Group#Certificate_hacking desc=\"Wikipedia: %s\"]] and <a\n"
+"href=\"https://blog.torproject.org/blog/detecting-certificate-authority-compromises-and-web-browser-collusion\">Tor\n"
+"Project: Detecting Certificate Authority compromises and web browser\n"
+"collusion</a>.</p>\n"
+msgstr ""
+<<<<<<< HEAD
+"<p class=\"quoted-from\">Citazione da [!wikipedia Man-in-the-middle_attack\n"
+=======
+"<p class=\"Citato-da\">Citazione da [[!wikipedia attacco Man-in-the-Middle\n"
+>>>>>>> C0D305TRANSLATION
+"desc=\"Wikipedia: %s\"]], [[!wikipedia\n"
+"Comodo_Group#Certificate_hacking desc=\"Wikipedia: %s\"]] e <a\n"
+"href=\"https://blog.torproject.org/blog/detecting-certificate-authority-compromises-and-web-browser-collusion\">Tor\n"
+"Project: Detecting Certificate Authority compromises and web browser\n"
+"collusion</a>.</p>\n"
+
+#. type: Title =
+#, no-wrap
+msgid "Confirmation attacks\n"
+msgstr "Conferma di un attacco\n"
+
+#. type: Plain text
+msgid "The Tor design doesn't try to protect against an attacker who can see or measure both traffic going into the Tor network and also traffic coming out of the Tor network. That's because if you can see both flows, some simple statistics let you decide whether they match up."
+msgstr "La struttura di Tor non tenta di proteggerti dagli attacchi di chi può vedere o misurare entrambi i traffici che entrano ed escono dalla rete Tor. Questo perché se puoi vedere entrambi i flussi, alcune semplici statistiche consentono di decidere dove corrispondono."
+
+#. type: Plain text
+msgid "That could also be the case if your ISP (or your local network administrator) and the ISP of the destination server (or the destination server itself) cooperate to attack you."
+msgstr "Questo potrebbe anche essere il caso se il proprio ISP (o l'amministratore di rete locale) e l'ISP del server di destinazione (o il server di destinazione stesso) cooperano per attaccarvi."
+
+#. type: Plain text
+msgid ""
+"Tor tries to protect against traffic analysis, where an attacker tries to learn whom to investigate, but Tor can't protect against traffic confirmation (also known as end-to-end correlation), where an attacker tries to confirm a hypothesis by monitoring the right locations in the network and then doing the math."
+msgstr ""
+"Tor cerca di proteggerti contro l'analisi del traffico di rete, dove un aggressore cerca di capire su chi indagare, ma Tor non può proteggerti contro la conferma del traffico (anche conosciuto come la correlazione end-to-end), in cui un aggressore tenta di confermare una ipotesi monitorando le località idonee "
+"nella rete e quindi facendo due conti."
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p class=\"quoted-from\">Quoted from <a\n"
+"href=\"https://blog.torproject.org/blog/one-cell-enough\">Tor Project: \"One cell\n"
+"is enough to break Tor's anonymity\"</a>.</p>\n"
+msgstr ""
+"<p class=\"quoted-from\">Citazioni da<a\n"
+"href=\"https://blog.torproject.org/blog/one-cell-enough\">Tor Project: \"One cell\n"
+"is enough to break Tor's anonymity\"</a>.</p>\n"
+
+#. type: Title =
+#, no-wrap
+msgid "Tails doesn't encrypt your documents by default\n"
+msgstr "Tails non cifra i tuoi documenti come default\n"
+
+#. type: Plain text
+msgid "The documents that you might save on storage devices will not be encrypted by default, except in the [[encrypted persistent volume|doc/first_steps/persistence]]. But Tails provides you with tools to encrypt your documents, such as GnuPG, or encrypt your storage devices, such as LUKS."
+msgstr ""
+"I documenti che potresti salvare su un dispositivo di archiviazione non saranno cifrati di default, tranne nel caso [[cifratura nel volume persistente|doc/first_steps/persistence]]. Ma Tails provvede a fornirti gli strumenti per crittografare, come GnuPG, o cifrare il tuo dispositivo di archiviazione, come "
+"LUKS. E' probabile che i file che potrai creare manterranno le tracce che sono stati creati con Tails."
+
+#. type: Plain text
+msgid "It is also likely that the files you may create will contain evidence that they were created using Tails."
+msgstr "E' anche come quei file che tu puoi creare e che contengono evidenze che sono stati creati utilizzando Tails."
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"**If you need to access the local hard-disks** of the computer you are using, be\n"
+"conscious that you might then leave trace of your activities with Tails on it.\n"
+msgstr ""
+"**Se hai necessità di accedere al disco rigido locale**del computer che stai usando\n"
+"devi essere conscio che potresti lasciare traccia delle tue attività con Tails su di esso.\n"
+"\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"Tails doesn't clear the metadata of your documents for you and doesn't encrypt the Subject: and other headers of your encrypted email messages\n"
+"===========================================================================================\n"
+msgstr ""
+"Tails non cancella i metadati dei tuoi documenti per te e non cifra l'Oggetto e le altre intestazioni dei tuoi messaggi crittografati\n"
+"===========================================================================================\n"
+
+#. type: Plain text
+msgid "Numerous files formats store hidden data or metadata inside of the files. Word processing or PDF files could store the name of the author, the date and time of creation of the file, and sometimes even parts of the editing history of the file, depending on the file format and the software used."
+msgstr "Numerosi formati di file nascondono dati o metadati nascosti dentro al file. Documenti Word o PDF possono contenere dentro il nome dell'autore, la data e il momento della creazione del file, e a volte addirittura parti di editing del file, a seconda del software e del formato del file che è stato usato."
+
+#. type: Plain text
+msgid ""
+"Please note also, that the Subject: as well as the rest of the header lines of your OpenPGP encrypted email messages are not encrypted. This is not a bug of Tails or the [OpenPGP](http://www.mozilla-enigmail.org/forum/viewtopic.php?f=3&t=328) protocol; it's due to backwards compatibility with the original SMTP "
+"protocol. Unfortunately no RFC standard exists yet for Subject: line encryption."
+msgstr ""
+"Si segnala inoltre, che l' Oggetto: così come il resto delle linee delle tue intestazioni e-mail crittografate con OpenPGP non sono cifrate. Questo non è un baco di Tails o del protocollo [OpenPGP](http://www.mozilla-enigmail.org/forum/viewtopic.php?f=3&t=328); questo dipende dalla compatibilità con il "
+"protocollo SMTP originale. Sfortunatamente non esiste ancora un standard RFC per la crittografia dell'Oggetto."
+
+#. type: Plain text
+msgid ""
+"Image file formats, like TIFF of JPEG, probably take the prize for most hidden data. These files, created by digital cameras or mobile phones, contain a metadata format called EXIF which can include the date, time and sometimes the GPS coordinates when the picture was taken, the brand and serial number of the "
+"device which took it, as well as a thumbnail of the original image. Image processing software tends to keep this metadata intact. The internet is full of cropped or blurred images in which the included EXIF thumbnail still shows the original picture."
+msgstr ""
+"I file in formato immagine, come TIFF o JPEG, probabilmente prendono un premio per avere gran quantità di dati nascosti. Questi file, creati da macchine fotografiche digitali o telefoni cellulari, contengono formati metadata chiamati EXIF che possono includere la data, l'ora e ogni tanto le coordinate GPS della "
+"fotografia, la marca e il numero di serie del dispositivo che ha fatto la miniatura o l'immagine originale. Il programma per processare l'immagine tende a tenere questi dati intatti. Internet è piena di immagini ritagliate o sfocate per il quale la miniatura EXIF contiene ancora tutta la fotografia originale."
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"**Tails doesn't clear the metadata of your files for you**. Yet. Still it's in\n"
+"Tails' design goal to help you do that. For example, Tails already comes with\n"
+"the [Metadata anonymisation toolkit](https://mat.boum.org/).\n"
+msgstr ""
+"**Tails non pulisce i metadata dei tuoi file per te**Eppure l'obiettivo\n"
+"della struttura di Tails è aiutarti per farlo. Per esempio, Tails è già dotato di \n"
+"[Strumenti di anonimato dei Metadati](https://mat.boum.org/).\n"
+
+#. type: Title =
+#, no-wrap
+msgid "Tor doesn't protect you from a global adversary\n"
+msgstr "Tor non ti protegge da un avversario globale\n"
+
+#. type: Plain text
+msgid ""
+"A global passive adversary would be a person or an entity able to monitor at the same time the traffic between all the computers in a network. By studying, for example, the timing and volume patterns of the different communications across the network, it would be statistically possible to identify Tor circuits "
+"and thus match Tor users and destination servers."
+msgstr ""
+"Un avversario passivo globale potrebbe essere una persona o un soggetto in grado di monitorare contemporaneamente il traffico tra tutti i computer di una rete. Studiando, ad esempio, il tempo e il volume di modelli di diverse comunicazioni attraverso la rete, sarebbe statisticamente in grado di identificare "
+"circuiti Tor e i relativi utenti Tor e server di destinazione."
+
+#. type: Plain text
+msgid "It is part of Tor's initial trade-off not to address such a threat in order to create a low-latency communication service usable for web browsing, Internet chat or SSH connections."
+msgstr "Fa parte dello scambio iniziale di Tor di non affrontare una tale minaccia al fine di creare un servizio di comunicazione a bassa latenza utilizzabile per la navigazione web, chat su Internet o connessioni SSH."
+
+#. type: Plain text
+msgid "For more expert information see the Tor design paper, \"[Tor Project: The Second-Generation Onion Router](https://svn.torproject.org/svn/projects/design-paper/tor-design.pdf)\", specifically, \"Part 3. Design goals and assumptions.\""
+msgstr "Per ulteriori informazioni vedere [Tor Project: The Second-Generation Onion Router](https://svn.torproject.org/svn/projects/design-paper/tor-design.pdf), parte 3. Nello specifico: \"Design goals and assumptions\"."
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"identities\"></a>\n"
+msgstr "<a id=\"identities\"></a>\n"
+
+#. type: Title =
+#, no-wrap
+msgid "Tails doesn't magically separate your different contextual identities\n"
+msgstr "Tails non separa magicamente le tue identità contestuali\n"
+
+#. type: Plain text
+msgid "It is usually not advisable to use the same Tails session to perform two tasks or endorse two contextual identities that you really want to keep separate from one another. For example hiding your location to check your email and anonymously publishing a document."
+msgstr "Normalmente non è consigliabile usare la stessa sessione di Tails per eseguire due compiti o approvare due identità contestuali che vuoi tenere separate l'una dall'altra. Per esempio nascondere la propria posizione per controllare la posta elettronica e pubblicare in forma anonima un documento."
+
+#. type: Plain text
+msgid ""
+"First, because Tor tends to reuse the same circuits, for example, within the same browsing session. Since the exit node of a circuit knows both the destination server (and possibly the content of the communication if it's not encrypted) and the address of the previous relay it received the communication from, "
+"it makes it easier to correlate several browsing requests as part of a same circuit and possibly made by the same user. If you are facing a global adversary as described above, it might then also be in a position to do this correlation."
+msgstr ""
+"Primo, perché Tor tende a riutilizzare gli stessi circuiti, per esempio nella stessa sessione di navigazione. Il nodo di uscita del circuito (exit node) conosce entrambe le destinazioni del server (e possibilmente i contenuti delle comunicazioni se non cifrate) e gli indirizzi dei precedenti salti che hanno "
+"ricevuto le comunicazioni, questo rende più semplice correlare le diverse richieste di navigazione come parte dello stesso circuito e quindi dimostrare che probabilmente provengono dallo stesso utente. Se siete di fronte ad un avversario globale come sopra descritto, potrebbe essere in grado di fare anche "
+"questa correlazione."
+
+#. type: Plain text
+msgid "Second, in case of a security hole or an error in using Tails or one of its applications, information about your session could be leaked. That could reveal that the same person was behind the various actions made during the session."
+msgstr "Secondo, in caso di un buco di sicurezza o di abuso nell'utilizzo di Tails o una delle sue applicazioni, le informazioni relative alla tua sessione potrebbero trapelare. Questo potrebbe rivelare che la stessa persona era dietro le varie azioni fatte durante quella sessione."
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"**The solution to both threats is to shutdown and restart Tails** every time\n"
+"you're using a new identity, if you really want to isolate them better.\n"
+msgstr ""
+"**La soluzione a entrambe le minacce è riavviare Tails**,\n"
+"tutte le volte che usi una nuova identità, se veramente vuoi isolarli al meglio \n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"As explained in our documentation about\n"
+"[[Tor Browser|anonymous_internet/Tor_Browser#new_identity]],\n"
+"its **New identity** feature is not a perfect solution to separate\n"
+"different contextual identities. And, as\n"
+"[[explained in the FAQ|support/faq#new_identity]], Tails does not\n"
+"provide a global <span class=\"guilabel\">New Identity</span>\n"
+"feature. **Shutdown and restart Tails instead.**\n"
+msgstr ""
+"Come spiegato nella nostra documentazione su [[Tor Browser|anonymous_internet/Tor_Browser#new_identity]], la funzione: **Nuova identità**, non sono la soluzione perfetta per separare le differenti identità contestuali. E, come\n"
+"[[spiegato nelle FAQ|support/faq#new_identity]], Tails non\n"
+"presenta la feature <span class=\"guilabel\">Nuova identità</span>.\n"
+" **Riavvia Tails piuttosto.**\n"
+
+#. type: Title =
+#, no-wrap
+msgid "Tails doesn't make your crappy passwords stronger\n"
+msgstr "Tails non rende le tue semplici password più sicure\n"
+
+#. type: Plain text
+msgid "Tor allows you to be anonymous online; Tails allows you to leave no trace on the computer you're using. But again, **neither or both are magic spells for computer security**."
+msgstr "Tor ti premette di essere anonimo online; Tails permette di non lasciare tracce sul computer che stai usando, Ma nuovamente, **entrambi non sono incantesimi magici per la sicurezza del computer** ."
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"If you use weak passwords, they can be guessed by brute-force attacks with or\n"
+"without Tails in the same way. To know if your passwords are weak and learn good\n"
+"practices to create better password, you can read [[!wikipedia\n"
+"Weak_password#Examples_of_weak_passwords desc=\"Wikipedia: Weak Passwords\"]].\n"
+msgstr ""
+"Se usi delle password deboli, possono essere indovinate da un attacco-di-forza-bruta allo stesso modo, con o\n"
+"senza Tails. Per sapere se le tue password sono deboli e per imparare delle buone pratiche \n"
+"per creare delle password migliori, puoi leggere [[!wikipedia\n"
+"Weak_password#Examples_of_weak_passwords desc=\"Wikipedia: Password deboli\"]].\n"
+
+#. type: Title =
+#, no-wrap
+msgid "Tails is a work in progress\n"
+msgstr "Tails è un lavoro in corso\n"
+
+#. type: Plain text
+msgid "Tails, as well as all the software it includes, are continuously being developed and may contain programming errors or security holes."
+msgstr "Tails, così come tutto il software che comprende, è in continuo sviluppo e potrebbe contenere errori di programmazione o buchi di sicurezza. [[Rimanete sintonizzati|download#stay_tuned]] sullo sviluppo di Tails."
+
+#~ msgid ""
+#~ "Vidalia's \"New Identity\" button forces Tor to use new circuits but only for new connections: existing connections might stay open. Plus, apart from the Tor circuits, other kind of information can reveal your past activities, for example the cookies stored by your browser. So this feature of Vidalia is not "
+#~ "a solution to really separate contextual identities. Shutdown and restart Tails instead."
+#~ msgstr ""
+#~ "Die \"Neue Identität\"-Funktion in Vidalia zwingt Tor eine neue Verbindung zu verwenden, aber nur für neue Verbindungen: Bereits existierende Verbindungen können weiterhin bestehen. Abgesehen von den Tor-Verbindungen kann andere Information ihre vergangenen Aktivitäten zeigen, beispielsweise die in Ihrem "
+#~ "Browser abgespeicherten Cookies. Daher ist diese Funktion in Vidalia keine echte Lösung, um Identitäten in verschiedenen Kontexten wirklich zu trennen. Fahren Sie Tails stattdessen herunter und starten es neu."
diff --git a/wiki/src/doc/about/warning.pt.po b/wiki/src/doc/about/warning.pt.po
index 960a9aa..6cccc5b 100644
--- a/wiki/src/doc/about/warning.pt.po
+++ b/wiki/src/doc/about/warning.pt.po
@@ -462,8 +462,8 @@ msgid ""
"Project: Detecting Certificate Authority compromises and web browser\n"
"collusion</a>.</p>\n"
msgstr ""
-"<p class=\"quoted-from\">Citado de [[!wikipedia Man-in-the-middle_attack\n"
-"desc=\"Wikipedia: %s\"]], [[!wikipedia\n"
+"<p class=\"quoted-from\">Citado de [[!wikipedia_pt Ataque_man-in-the-middle\n"
+"desc=\"Wikipédia: %s\"]], [[!wikipedia\n"
"Comodo_Group#Certificate_hacking desc=\"Wikipedia: %s\"]] e <a\n"
"href=\"https://blog.torproject.org/blog/detecting-certificate-authority-compromises-and-web-browser-collusion\">Tor\n"
"Project: Detecting Certificate Authority compromises and web browser\n"
diff --git a/wiki/src/doc/advanced_topics.index.it.po b/wiki/src/doc/advanced_topics.index.it.po
index f5484fc..aec8272 100644
--- a/wiki/src/doc/advanced_topics.index.it.po
+++ b/wiki/src/doc/advanced_topics.index.it.po
@@ -3,30 +3,34 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: \n"
"POT-Creation-Date: 2016-09-02 17:27+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2017-07-09 00:17+0000\n"
"Language-Team: ita <transitails@inventati.org>\n"
-"Language: \n"
+"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Last-Translator: \n"
+"X-Generator: Poedit 1.8.11\n"
#. type: Bullet: ' - '
msgid ""
"[[!traillink Installing_additional_software|advanced_topics/"
"additional_software]]"
msgstr ""
+"[[!traillink Installare_software_aggiuntivo|advanced_topics/"
+"additional_software]]"
#. type: Bullet: ' - '
msgid ""
"[[!traillink Protection_against_cold_boot_attacks|advanced_topics/"
"cold_boot_attacks]]"
msgstr ""
+"[[!traillink Protezione_contro_i_\"cold_boot_attacks\"|"
+"advanced_topics/cold_boot_attacks]]"
#. type: Plain text
#, no-wrap
@@ -39,3 +43,10 @@ msgid ""
" - [[!traillink Enable_a_wireless_device|advanced_topics/wireless_devices]]\n"
" - [[!traillink Backing_up_OpenPGP_secret_keys_on_paper_using_<span_class=\"application\">paperkey</span>|advanced_topics/paperkey]]\n"
msgstr ""
+" - [[!traillink Virtualizzazione|advanced_topics/virtualization]]\n"
+" - [[!traillink <span_class=\"application\">VirtualBox</span>|advanced_topics/virtualization/virtualbox]]\n"
+" - [[!traillink <span_class=\"application\">GNOME_Boxes</span>|advanced_topics/virtualization/boxes]]\n"
+" - [[!traillink <span_class=\"application\">virt-manager</span>|advanced_topics/virtualization/virt-manager]]\n"
+" - [[!traillink Accesso_alle_risorse_sulla_rete_locale|advanced_topics/lan]]\n"
+" - [[!traillink Attivare_un_dispositivo_wireless|advanced_topics/wireless_devices]]\n"
+" - [[!traillink Backup_delle_chiavi_segrete_OpenPGP_su_carta_utilizzando_<span_class=\"application\">paperkey</span>|advanced_topics/paperkey]]\n"
diff --git a/wiki/src/doc/advanced_topics/virtualization/virtualbox.de.po b/wiki/src/doc/advanced_topics/virtualization/virtualbox.de.po
index 6b4898c..35d84fc 100644
--- a/wiki/src/doc/advanced_topics/virtualization/virtualbox.de.po
+++ b/wiki/src/doc/advanced_topics/virtualization/virtualbox.de.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2017-03-19 13:18+0100\n"
-"PO-Revision-Date: 2017-02-16 11:29+0100\n"
+"POT-Creation-Date: 2017-06-28 16:53+0200\n"
+"PO-Revision-Date: 2017-06-28 16:54+0200\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: \n"
"Language: de\n"
@@ -58,8 +58,9 @@ msgstr "<div class=\"caution\">\n"
#. type: Plain text
#, no-wrap
msgid ""
-"For security reasons, we recommend you to use only the <span class=\"application\">Open Source Edition</span>,\n"
-"though it does not allow to use a persistent volume.\n"
+"For security reasons, we recommend you to use only the <span\n"
+"class=\"application\">Open Source Edition</span>, though it does not\n"
+"allow to use a persistent volume.\n"
msgstr ""
"Aus Sicherheitsgründen empfehlen wir Ihnen nur die <span class=\"application\">Open Source Edition</span> zu verwenden,\n"
"auch wenn diese es Ihnen nicht erlaubt, einen beständigen Speicherbereich einzurichten.\n"
@@ -187,46 +188,6 @@ msgid ""
" - **Type**: **Linux**.\n"
" - **Version**: **Other Linux (64 bit)**.\n"
" - Click **Next**.\n"
-msgstr ""
-" 1. Wählen Sie\n"
-" <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Maschine</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Neu</span></span>.\n"
-" 1. Geben Sie in dem Fenster **Name und Betriebssystem** an:\n"
-" - Einen Namen Ihrer Wahl.\n"
-" - **Typ**: **Linux**.\n"
-" - **Version**: **Other Linux (32 bit)**.\n"
-" - Klicken Sie auf **Weiter**.\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <div class=\"bug\"><p><span class=\"application\">VirtualBox</span> guest\n"
-" modules allow for additional features when using Tails in a virtual\n"
-" machine: shared folders, resizable display, shared clipboard, etc.</p>\n"
-msgstr ""
-" <div class=\"bug\"><p><span class=\"application\">VirtualBox</span>\n"
-" Gastmodule erlauben Ihnen weitere Funktionen, wenn Sie Tails in einer virtuellen Maschine\n"
-" verwenden: verteilte Ordner, größenveränderbarer Bildschirm, gemeinsame Zwischenablage, usw.</p>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <p>But due to <a href=\"https://www.virtualbox.org/ticket/11037\">a bug in\n"
-" <span class=\"application\">VirtualBox</span></a>, the resizable display\n"
-" and shared clipboard only work in Tails if the virtual machine is configured to\n"
-" have a 32-bit processor. The shared folders work both on 32-bit and\n"
-" 64-bit guests.</p></div>\n"
-msgstr ""
-" <p>Aber aufgrund <a href=\"https://www.virtualbox.org/ticket/11037\">eines Bugs in\n"
-" <span class=\"application\">VirtualBox</span></a> funktionieren die größenveränderbare\n"
-" Anzeige und gemeinsame Zwischenablage in Tails nur, wenn die virtuelle Maschine so konfiguriert\n"
-" wurde, dass sie einen 32-Bit Prozessor hat. Die Gemeinsamen Ordner funktionieren sowohl mit 32-Bit\n"
-" als auch 64-Bit Gästen.</p></div>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
" 1. In the **Memory size** screen:\n"
" - Allocate at least 2048 MB of RAM.\n"
" - Click **Next**.\n"
@@ -236,14 +197,15 @@ msgid ""
" - Click **Continue** in the warning dialog about creating a virtual\n"
" machine without a hard drive.\n"
msgstr ""
-" 1. In dem Fenster **Speichergröße**:\n"
-" - Weisen Sie mindestens 2048 MB Hauptspeicher (RAM) zu.\n"
+" 1. Wählen Sie\n"
+" <span class=\"menuchoice\">\n"
+" <span class=\"guimenu\">Maschine</span>&nbsp;▸\n"
+" <span class=\"guimenuitem\">Neu</span></span>.\n"
+" 1. Geben Sie in dem Fenster **Name und Betriebssystem** an:\n"
+" - Einen Namen Ihrer Wahl.\n"
+" - **Typ**: **Linux**.\n"
+" - **Version**: **Other Linux (32 bit)**.\n"
" - Klicken Sie auf **Weiter**.\n"
-" 1. In dem Fenster **Platte**:\n"
-" - Wählen Sie **Keine Festplatte**.\n"
-" - Klicken Sie auf **Erzeugen**.\n"
-" - Klicken Sie in dem Warnfenster zum Erstellen einer virtuellen Maschine ohne\n"
-" Festplatte auf **Fortfahren**.\n"
#. type: Plain text
msgid "To configure the virtual machine to start from an ISO image:"
@@ -315,3 +277,56 @@ msgstr "Wählen Sie die virtuelle Maschine im linken Fensterbereich aus."
#. type: Bullet: ' 1. '
msgid "Click **Start**."
msgstr "Klicken Sie auf **Starten**."
+
+#~ msgid ""
+#~ " <div class=\"bug\"><p><span class=\"application\">VirtualBox</span> "
+#~ "guest\n"
+#~ " modules allow for additional features when using Tails in a virtual\n"
+#~ " machine: shared folders, resizable display, shared clipboard, etc.</"
+#~ "p>\n"
+#~ msgstr ""
+#~ " <div class=\"bug\"><p><span class=\"application\">VirtualBox</span>\n"
+#~ " Gastmodule erlauben Ihnen weitere Funktionen, wenn Sie Tails in "
+#~ "einer virtuellen Maschine\n"
+#~ " verwenden: verteilte Ordner, größenveränderbarer Bildschirm, "
+#~ "gemeinsame Zwischenablage, usw.</p>\n"
+
+#~ msgid ""
+#~ " <p>But due to <a href=\"https://www.virtualbox.org/ticket/11037\">a "
+#~ "bug in\n"
+#~ " <span class=\"application\">VirtualBox</span></a>, the resizable "
+#~ "display\n"
+#~ " and shared clipboard only work in Tails if the virtual machine is "
+#~ "configured to\n"
+#~ " have a 32-bit processor. The shared folders work both on 32-bit and\n"
+#~ " 64-bit guests.</p></div>\n"
+#~ msgstr ""
+#~ " <p>Aber aufgrund <a href=\"https://www.virtualbox.org/"
+#~ "ticket/11037\">eines Bugs in\n"
+#~ " <span class=\"application\">VirtualBox</span></a> funktionieren die "
+#~ "größenveränderbare\n"
+#~ " Anzeige und gemeinsame Zwischenablage in Tails nur, wenn die "
+#~ "virtuelle Maschine so konfiguriert\n"
+#~ " wurde, dass sie einen 32-Bit Prozessor hat. Die Gemeinsamen Ordner "
+#~ "funktionieren sowohl mit 32-Bit\n"
+#~ " als auch 64-Bit Gästen.</p></div>\n"
+
+#~ msgid ""
+#~ " 1. In the **Memory size** screen:\n"
+#~ " - Allocate at least 2048 MB of RAM.\n"
+#~ " - Click **Next**.\n"
+#~ " 1. In the **Hard drive** screen:\n"
+#~ " - Choose **Do not add a virtual hard drive**.\n"
+#~ " - Click **Create**.\n"
+#~ " - Click **Continue** in the warning dialog about creating a virtual\n"
+#~ " machine without a hard drive.\n"
+#~ msgstr ""
+#~ " 1. In dem Fenster **Speichergröße**:\n"
+#~ " - Weisen Sie mindestens 2048 MB Hauptspeicher (RAM) zu.\n"
+#~ " - Klicken Sie auf **Weiter**.\n"
+#~ " 1. In dem Fenster **Platte**:\n"
+#~ " - Wählen Sie **Keine Festplatte**.\n"
+#~ " - Klicken Sie auf **Erzeugen**.\n"
+#~ " - Klicken Sie in dem Warnfenster zum Erstellen einer virtuellen "
+#~ "Maschine ohne\n"
+#~ " Festplatte auf **Fortfahren**.\n"
diff --git a/wiki/src/doc/advanced_topics/virtualization/virtualbox.fa.po b/wiki/src/doc/advanced_topics/virtualization/virtualbox.fa.po
index cd6ffb2..250a177 100644
--- a/wiki/src/doc/advanced_topics/virtualization/virtualbox.fa.po
+++ b/wiki/src/doc/advanced_topics/virtualization/virtualbox.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-03-19 13:18+0100\n"
+"POT-Creation-Date: 2017-06-28 16:53+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -51,8 +51,9 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"For security reasons, we recommend you to use only the <span class=\"application\">Open Source Edition</span>,\n"
-"though it does not allow to use a persistent volume.\n"
+"For security reasons, we recommend you to use only the <span\n"
+"class=\"application\">Open Source Edition</span>, though it does not\n"
+"allow to use a persistent volume.\n"
msgstr ""
#. type: Plain text
@@ -148,29 +149,6 @@ msgid ""
" - **Type**: **Linux**.\n"
" - **Version**: **Other Linux (64 bit)**.\n"
" - Click **Next**.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <div class=\"bug\"><p><span class=\"application\">VirtualBox</span> guest\n"
-" modules allow for additional features when using Tails in a virtual\n"
-" machine: shared folders, resizable display, shared clipboard, etc.</p>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <p>But due to <a href=\"https://www.virtualbox.org/ticket/11037\">a bug in\n"
-" <span class=\"application\">VirtualBox</span></a>, the resizable display\n"
-" and shared clipboard only work in Tails if the virtual machine is configured to\n"
-" have a 32-bit processor. The shared folders work both on 32-bit and\n"
-" 64-bit guests.</p></div>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
" 1. In the **Memory size** screen:\n"
" - Allocate at least 2048 MB of RAM.\n"
" - Click **Next**.\n"
diff --git a/wiki/src/doc/advanced_topics/virtualization/virtualbox.fr.po b/wiki/src/doc/advanced_topics/virtualization/virtualbox.fr.po
index 02e22cd..6d2537b 100644
--- a/wiki/src/doc/advanced_topics/virtualization/virtualbox.fr.po
+++ b/wiki/src/doc/advanced_topics/virtualization/virtualbox.fr.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2017-03-19 13:18+0100\n"
-"PO-Revision-Date: 2017-05-26 09:16-0000\n"
+"POT-Creation-Date: 2017-06-28 16:53+0200\n"
+"PO-Revision-Date: 2017-06-28 16:54+0200\n"
"Last-Translator: Chre <tor@renaudineau.org>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
"Language: fr\n"
@@ -58,8 +58,9 @@ msgstr "<div class=\"caution\">\n"
#. type: Plain text
#, no-wrap
msgid ""
-"For security reasons, we recommend you to use only the <span class=\"application\">Open Source Edition</span>,\n"
-"though it does not allow to use a persistent volume.\n"
+"For security reasons, we recommend you to use only the <span\n"
+"class=\"application\">Open Source Edition</span>, though it does not\n"
+"allow to use a persistent volume.\n"
msgstr ""
"Pour des raisons de sécurité, nous recommandons d'utiliser uniquement la version <span class=\"application\">Open Source Edition</span>,\n"
"même si elle ne permet pas d'utiliser de volume persistant.\n"
@@ -165,7 +166,17 @@ msgid "To create a new virtual machine:"
msgstr "Pour créer une nouvelle machine virtuelle :"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " 1. Choose\n"
+#| " <span class=\"menuchoice\">\n"
+#| " <span class=\"guimenu\">Machine</span>&nbsp;▸\n"
+#| " <span class=\"guimenuitem\">New...</span></span>.\n"
+#| " 1. In the **Name and operating system** screen, specify:\n"
+#| " - A name of your choice.\n"
+#| " - **Type**: **Linux**.\n"
+#| " - **Version**: **Other Linux (64 bit)**.\n"
+#| " - Click **Next**.\n"
msgid ""
" 1. Choose\n"
" <span class=\"menuchoice\">\n"
@@ -176,46 +187,6 @@ msgid ""
" - **Type**: **Linux**.\n"
" - **Version**: **Other Linux (64 bit)**.\n"
" - Click **Next**.\n"
-msgstr ""
-" 1. Choisir\n"
-" <span class=\"menuchoice\">\n"
-" <span class=\"guimenu\">Machine</span>&nbsp;▸\n"
-" <span class=\"guimenuitem\">Nouvelle...</span></span>.\n"
-" 1. Dans la fenêtre **Nom et système d'exploitation**, mettre :\n"
-" - Un nom de votre choix.\n"
-" - **Type** : **Linux**.\n"
-" - **Version** : **Other Linux (64 bit)**.\n"
-" - Cliquer sur **Suivant**.\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <div class=\"bug\"><p><span class=\"application\">VirtualBox</span> guest\n"
-" modules allow for additional features when using Tails in a virtual\n"
-" machine: shared folders, resizable display, shared clipboard, etc.</p>\n"
-msgstr ""
-" <div class=\"bug\"><p>Les modules invités de <span class=\"application\">VirtualBox</span>\n"
-" permettent l'usage de fonctionnalités supplémentaires lors de l'utilisation de Tails\n"
-" dans une machine virtuelle : dossiers partagés, affichage redimensionnable, presse-papier partagé, etc.</p>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <p>But due to <a href=\"https://www.virtualbox.org/ticket/11037\">a bug in\n"
-" <span class=\"application\">VirtualBox</span></a>, the resizable display\n"
-" and shared clipboard only work in Tails if the virtual machine is configured to\n"
-" have a 32-bit processor. The shared folders work both on 32-bit and\n"
-" 64-bit guests.</p></div>\n"
-msgstr ""
-" <p>Mais à cause d'un <a hreg=\"https://www.virtualbox.org/ticket/11037\">bug dans\n"
-" <span class=\"application\">VirtualBox</span></a>, l'affichage redimensionnable\n"
-" et le presse-papier partagé ne fonctionnent dans Tails que si la machine virtuelle est\n"
-" configurée pour avoir un processeur 32-bit. Les dossiers partagés fonctionnent pour les\n"
-" systèmes invités 32-bit et 64-bit.</p></div>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
" 1. In the **Memory size** screen:\n"
" - Allocate at least 2048 MB of RAM.\n"
" - Click **Next**.\n"
@@ -225,14 +196,15 @@ msgid ""
" - Click **Continue** in the warning dialog about creating a virtual\n"
" machine without a hard drive.\n"
msgstr ""
-" 1. Dans la fenêtre **Taille de la mémoire** :\n"
-" - Allouer au moins 2048 Mo de RAM.\n"
+" 1. Choisir\n"
+" <span class=\"menuchoice\">\n"
+" <span class=\"guimenu\">Machine</span>&nbsp;▸\n"
+" <span class=\"guimenuitem\">Nouvelle...</span></span>.\n"
+" 1. Dans la fenêtre **Nom et système d'exploitation**, mettre :\n"
+" - Un nom de votre choix.\n"
+" - **Type** : **Linux**.\n"
+" - **Version** : **Other Linux (64 bit)**.\n"
" - Cliquer sur **Suivant**.\n"
-" 1. Dans la fenêtre **Disque dur** :\n"
-" - Choisir **ne pas ajouter de disque dur virtuel**.\n"
-" - Cliquer sur **Créer**.\n"
-" - Cliquer sur **Continuer** dans la fenêtre d'avertissement à propos de la\n"
-" création de machine virtuelle sans disque dur.\n"
#. type: Plain text
msgid "To configure the virtual machine to start from an ISO image:"
@@ -301,3 +273,57 @@ msgstr "Sélectionner la machine virtuelle dans la partie gauche de la fenêtre.
#. type: Bullet: ' 1. '
msgid "Click **Start**."
msgstr "Cliquer sur **Démarrer**."
+
+#~ msgid ""
+#~ " <div class=\"bug\"><p><span class=\"application\">VirtualBox</span> "
+#~ "guest\n"
+#~ " modules allow for additional features when using Tails in a virtual\n"
+#~ " machine: shared folders, resizable display, shared clipboard, etc.</"
+#~ "p>\n"
+#~ msgstr ""
+#~ " <div class=\"bug\"><p>Les modules invités de <span class="
+#~ "\"application\">VirtualBox</span>\n"
+#~ " permettent l'usage de fonctionnalités supplémentaires lors de "
+#~ "l'utilisation de Tails\n"
+#~ " dans une machine virtuelle : dossiers partagés, affichage "
+#~ "redimensionnable, presse-papier partagé, etc.</p>\n"
+
+#~ msgid ""
+#~ " <p>But due to <a href=\"https://www.virtualbox.org/ticket/11037\">a "
+#~ "bug in\n"
+#~ " <span class=\"application\">VirtualBox</span></a>, the resizable "
+#~ "display\n"
+#~ " and shared clipboard only work in Tails if the virtual machine is "
+#~ "configured to\n"
+#~ " have a 32-bit processor. The shared folders work both on 32-bit and\n"
+#~ " 64-bit guests.</p></div>\n"
+#~ msgstr ""
+#~ " <p>Mais à cause d'un <a hreg=\"https://www.virtualbox.org/"
+#~ "ticket/11037\">bug dans\n"
+#~ " <span class=\"application\">VirtualBox</span></a>, l'affichage "
+#~ "redimensionnable\n"
+#~ " et le presse-papier partagé ne fonctionnent dans Tails que si la "
+#~ "machine virtuelle est\n"
+#~ " configurée pour avoir un processeur 32-bit. Les dossiers partagés "
+#~ "fonctionnent pour les\n"
+#~ " systèmes invités 32-bit et 64-bit.</p></div>\n"
+
+#~ msgid ""
+#~ " 1. In the **Memory size** screen:\n"
+#~ " - Allocate at least 2048 MB of RAM.\n"
+#~ " - Click **Next**.\n"
+#~ " 1. In the **Hard drive** screen:\n"
+#~ " - Choose **Do not add a virtual hard drive**.\n"
+#~ " - Click **Create**.\n"
+#~ " - Click **Continue** in the warning dialog about creating a virtual\n"
+#~ " machine without a hard drive.\n"
+#~ msgstr ""
+#~ " 1. Dans la fenêtre **Taille de la mémoire** :\n"
+#~ " - Allouer au moins 2048 Mo de RAM.\n"
+#~ " - Cliquer sur **Suivant**.\n"
+#~ " 1. Dans la fenêtre **Disque dur** :\n"
+#~ " - Choisir **ne pas ajouter de disque dur virtuel**.\n"
+#~ " - Cliquer sur **Créer**.\n"
+#~ " - Cliquer sur **Continuer** dans la fenêtre d'avertissement à propos "
+#~ "de la\n"
+#~ " création de machine virtuelle sans disque dur.\n"
diff --git a/wiki/src/doc/advanced_topics/virtualization/virtualbox.it.po b/wiki/src/doc/advanced_topics/virtualization/virtualbox.it.po
index 8b20ef7..9704246 100644
--- a/wiki/src/doc/advanced_topics/virtualization/virtualbox.it.po
+++ b/wiki/src/doc/advanced_topics/virtualization/virtualbox.it.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-03-19 13:18+0100\n"
+"POT-Creation-Date: 2017-06-28 16:53+0200\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"
@@ -51,8 +51,9 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"For security reasons, we recommend you to use only the <span class=\"application\">Open Source Edition</span>,\n"
-"though it does not allow to use a persistent volume.\n"
+"For security reasons, we recommend you to use only the <span\n"
+"class=\"application\">Open Source Edition</span>, though it does not\n"
+"allow to use a persistent volume.\n"
msgstr ""
#. type: Plain text
@@ -148,29 +149,6 @@ msgid ""
" - **Type**: **Linux**.\n"
" - **Version**: **Other Linux (64 bit)**.\n"
" - Click **Next**.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <div class=\"bug\"><p><span class=\"application\">VirtualBox</span> guest\n"
-" modules allow for additional features when using Tails in a virtual\n"
-" machine: shared folders, resizable display, shared clipboard, etc.</p>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <p>But due to <a href=\"https://www.virtualbox.org/ticket/11037\">a bug in\n"
-" <span class=\"application\">VirtualBox</span></a>, the resizable display\n"
-" and shared clipboard only work in Tails if the virtual machine is configured to\n"
-" have a 32-bit processor. The shared folders work both on 32-bit and\n"
-" 64-bit guests.</p></div>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
" 1. In the **Memory size** screen:\n"
" - Allocate at least 2048 MB of RAM.\n"
" - Click **Next**.\n"
diff --git a/wiki/src/doc/advanced_topics/virtualization/virtualbox.mdwn b/wiki/src/doc/advanced_topics/virtualization/virtualbox.mdwn
index 28dc0fe..04a39fa 100644
--- a/wiki/src/doc/advanced_topics/virtualization/virtualbox.mdwn
+++ b/wiki/src/doc/advanced_topics/virtualization/virtualbox.mdwn
@@ -13,8 +13,9 @@ devices.
<div class="caution">
-For security reasons, we recommend you to use only the <span class="application">Open Source Edition</span>,
-though it does not allow to use a persistent volume.
+For security reasons, we recommend you to use only the <span
+class="application">Open Source Edition</span>, though it does not
+allow to use a persistent volume.
</div>
@@ -73,17 +74,6 @@ To create a new virtual machine:
- **Type**: **Linux**.
- **Version**: **Other Linux (64 bit)**.
- Click **Next**.
-
- <div class="bug"><p><span class="application">VirtualBox</span> guest
- modules allow for additional features when using Tails in a virtual
- machine: shared folders, resizable display, shared clipboard, etc.</p>
-
- <p>But due to <a href="https://www.virtualbox.org/ticket/11037">a bug in
- <span class="application">VirtualBox</span></a>, the resizable display
- and shared clipboard only work in Tails if the virtual machine is configured to
- have a 32-bit processor. The shared folders work both on 32-bit and
- 64-bit guests.</p></div>
-
1. In the **Memory size** screen:
- Allocate at least 2048 MB of RAM.
- Click **Next**.
diff --git a/wiki/src/doc/advanced_topics/virtualization/virtualbox.pt.po b/wiki/src/doc/advanced_topics/virtualization/virtualbox.pt.po
index cd6ffb2..250a177 100644
--- a/wiki/src/doc/advanced_topics/virtualization/virtualbox.pt.po
+++ b/wiki/src/doc/advanced_topics/virtualization/virtualbox.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-03-19 13:18+0100\n"
+"POT-Creation-Date: 2017-06-28 16:53+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -51,8 +51,9 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"For security reasons, we recommend you to use only the <span class=\"application\">Open Source Edition</span>,\n"
-"though it does not allow to use a persistent volume.\n"
+"For security reasons, we recommend you to use only the <span\n"
+"class=\"application\">Open Source Edition</span>, though it does not\n"
+"allow to use a persistent volume.\n"
msgstr ""
#. type: Plain text
@@ -148,29 +149,6 @@ msgid ""
" - **Type**: **Linux**.\n"
" - **Version**: **Other Linux (64 bit)**.\n"
" - Click **Next**.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <div class=\"bug\"><p><span class=\"application\">VirtualBox</span> guest\n"
-" modules allow for additional features when using Tails in a virtual\n"
-" machine: shared folders, resizable display, shared clipboard, etc.</p>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" <p>But due to <a href=\"https://www.virtualbox.org/ticket/11037\">a bug in\n"
-" <span class=\"application\">VirtualBox</span></a>, the resizable display\n"
-" and shared clipboard only work in Tails if the virtual machine is configured to\n"
-" have a 32-bit processor. The shared folders work both on 32-bit and\n"
-" 64-bit guests.</p></div>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
" 1. In the **Memory size** screen:\n"
" - Allocate at least 2048 MB of RAM.\n"
" - Click **Next**.\n"
diff --git a/wiki/src/doc/anonymous_internet.index.it.po b/wiki/src/doc/anonymous_internet.index.it.po
index 2bd5f51..961af3e 100644
--- a/wiki/src/doc/anonymous_internet.index.it.po
+++ b/wiki/src/doc/anonymous_internet.index.it.po
@@ -3,18 +3,18 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: \n"
"POT-Creation-Date: 2017-02-25 15:24+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2017-07-09 00:27+0000\n"
"Language-Team: ita <transitails@inventati.org>\n"
-"Language: \n"
+"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Last-Translator: \n"
+"X-Generator: Poedit 1.8.11\n"
#. type: Plain text
#, no-wrap
@@ -29,3 +29,12 @@ msgid ""
" - [[!traillink Exchange_bitcoins_using_<span_class=\"application\">Electrum</span>|anonymous_internet/electrum]]\n"
" - [[!traillink Why_Tor_is_slow?|anonymous_internet/why_tor_is_slow]]\n"
msgstr ""
+" - [[!traillink Connettersi_ad_una_rete|anonymous_internet/networkmanager]]\n"
+" - [[!traillink Accedere_ad_internet_attraverso_i_\"captive_portals\"|anonymous_internet/unsafe_browser]]\n"
+" - [[!traillink Visualizzare_lo_stato_e_i_circuiti_di_Tor|anonymous_internet/tor_status]]\n"
+" - [[!traillink Esplorare_il_web_con_<span_class=\"application\">Tor_Browser</span>|anonymous_internet/tor_browser]]\n"
+" - [[!traillink Chattare_con_Pidgin_&_OTR|anonymous_internet/pidgin]]\n"
+" - [[!traillink Inviare_e-mail_con_<span_class=\"application\">Thunderbird</span>|anonymous_internet/thunderbird]]\n"
+" - [[!traillink Condividere_file_con_<span_class=\"application\">OnionShare</span>|anonymous_internet/onionshare]]\n"
+" - [[!traillink Scambiare_bitcoins_utilizzando_<span_class=\"application\">Electrum</span>|anonymous_internet/electrum]]\n"
+" - [[!traillink Perché_Tor_è_lento?|anonymous_internet/why_tor_is_slow]]\n"
diff --git a/wiki/src/doc/anonymous_internet.it.po b/wiki/src/doc/anonymous_internet.it.po
index b2d45ed..757f645 100644
--- a/wiki/src/doc/anonymous_internet.it.po
+++ b/wiki/src/doc/anonymous_internet.it.po
@@ -3,25 +3,25 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: \n"
"POT-Creation-Date: 2015-11-19 23:06+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2017-07-09 00:28+0000\n"
"Language-Team: ita <transitails@inventati.org>\n"
-"Language: \n"
+"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Last-Translator: \n"
+"X-Generator: Poedit 1.8.11\n"
#. type: Plain text
#, no-wrap
msgid "[[!meta title=\"Connect to the Internet anonymously\"]]\n"
-msgstr ""
+msgstr "[[!meta title=\"Connettersi ad Internet anonimamente\"]]\n"
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"doc/anonymous_internet.index\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr ""
+msgstr "[[!inline pages=\"doc/anonymous_internet.index\" raw=\"yes\" sort=\"age\"]]\n"
diff --git a/wiki/src/doc/anonymous_internet/thunderbird.de.po b/wiki/src/doc/anonymous_internet/thunderbird.de.po
index 9de893d..e96ef6b 100644
--- a/wiki/src/doc/anonymous_internet/thunderbird.de.po
+++ b/wiki/src/doc/anonymous_internet/thunderbird.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2016-01-28 15:18+0100\n"
+"POT-Creation-Date: 2017-06-22 11:11+0300\n"
"PO-Revision-Date: 2016-01-24 11:31+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -32,26 +32,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!inline pages=\"doc/anonymous_internet/thunderbird/name.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"doc/anonymous_internet/thunderbird/name.inline.de\" raw=\"yes\" sort=\"age\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"note\">\n"
-msgstr "<div class=\"note\">\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"doc/anonymous_internet/thunderbird/replacement.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr "[[!inline pages=\"doc/anonymous_internet/thunderbird/replacement.inline.de\" raw=\"yes\" sort=\"age\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
-msgstr "</div>\n"
-
-#. type: Plain text
-#, no-wrap
msgid ""
"To start <span class=\"application\">Thunderbird</span> choose\n"
"<span class=\"menuchoice\">\n"
@@ -83,6 +63,11 @@ msgstr ""
#. type: Plain text
#, no-wrap
+msgid "</div>\n"
+msgstr "</div>\n"
+
+#. type: Plain text
+#, no-wrap
msgid ""
"For more detailed documentation, refer to the [official\n"
"<span class=\"application\">Thunderbird</span>\n"
@@ -198,6 +183,11 @@ msgstr ""
#. type: Plain text
#, no-wrap
+msgid "<div class=\"note\">\n"
+msgstr "<div class=\"note\">\n"
+
+#. type: Plain text
+#, no-wrap
msgid ""
"<p>Sending emails in HTML format is disabled by <span class=\"application\">TorBirdy</span>. Emails received in HTML format\n"
"are displayed in plain text and can become harder to read.</p>\n"
@@ -213,3 +203,9 @@ msgid ""
msgstr ""
"Um mehr über die Sicherheitseigenschaften von <span class=\"application\">TorBirdy</span> zu erfahren,\n"
"können Sie das entsprechende [Designdokument](https://trac.torproject.org/projects/tor/attachment/wiki/doc/TorifyHOWTO/EMail/Thunderbird/Thunderbird%2BTor.pdf) lesen.\n"
+
+#~ msgid "[[!inline pages=\"doc/anonymous_internet/thunderbird/name.inline\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgstr "[[!inline pages=\"doc/anonymous_internet/thunderbird/name.inline.de\" raw=\"yes\" sort=\"age\"]]\n"
+
+#~ msgid "[[!inline pages=\"doc/anonymous_internet/thunderbird/replacement.inline\" raw=\"yes\" sort=\"age\"]]\n"
+#~ msgstr "[[!inline pages=\"doc/anonymous_internet/thunderbird/replacement.inline.de\" raw=\"yes\" sort=\"age\"]]\n"
diff --git a/wiki/src/doc/anonymous_internet/thunderbird.fa.po b/wiki/src/doc/anonymous_internet/thunderbird.fa.po
index 8c6798f..933b1a3 100644
--- a/wiki/src/doc/anonymous_internet/thunderbird.fa.po
+++ b/wiki/src/doc/anonymous_internet/thunderbird.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-01-28 15:18+0100\n"
+"POT-Creation-Date: 2017-06-22 11:11+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -30,26 +30,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!inline pages=\"doc/anonymous_internet/thunderbird/name.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"note\">\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"doc/anonymous_internet/thunderbird/replacement.inline\" raw=\"yes\" sort=\"age\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
msgid ""
"To start <span class=\"application\">Thunderbird</span> choose\n"
"<span class=\"menuchoice\">\n"
@@ -73,6 +53,11 @@ msgstr ""
#. type: Plain text
#, no-wrap
+msgid "</div>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
msgid ""
"For more detailed documentation, refer to the [official\n"
"<span class=\"application\">Thunderbird</span>\n"
@@ -156,6 +141,11 @@ msgstr ""
#. type: Plain text
#, no-wrap
+msgid "<div class=\"note\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
msgid ""
"<p>Sending emails in HTML format is disabled by <span class=\"application\">TorBirdy</span>. Emails received in HTML format\n"
"are displayed in plain text and can become harder to read.</p>\n"
diff --git a/wiki/src/doc/anonymous_internet/thunderbird.fr.po b/wiki/src/doc/anonymous_internet/thunderbird.fr.po
index e1a6456..660a799 100644
--- a/wiki/src/doc/anonymous_internet/thunderbird.fr.po
+++ b/wiki/src/doc/anonymous_internet/thunderbird.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2016-01-28 15:18+0100\n"
+"POT-Creation-Date: 2017-06-22 11:11+0300\n"
"PO-Revision-Date: 2016-06-13 09:35-0000\n"
"Last-Translator: Chre <tor@renaudineau.org>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -32,26 +32,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!inline pages=\"doc/anonymous_internet/thunderbird/name.inline\" raw=\"yes\"