summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2016-05-17 07:05:25 +0000
committerintrigeri <intrigeri@boum.org>2016-05-17 07:05:25 +0000
commit90cbf3c3be52ca5d05e6010d4210b7d5a5990c5e (patch)
tree5cd29fdef6370bc4e432d9dab6bad23571c522e5
parent246d746c992639dc4e93abc526b154ec04c1c0dc (diff)
parent98a18593f754a5511d4f59aab3e5f80754b90cac (diff)
Merge remote-tracking branch 'origin/devel' into test/10971-more-CPUs-for-TailsToaster
-rw-r--r--.gitmodules4
-rwxr-xr-xconfig/chroot_local-hooks/98-remove_unwanted_files5
-rw-r--r--config/chroot_local-includes/etc/sysctl.d/kptr_restrict.conf1
-rw-r--r--features/chutney/test-network56
-rw-r--r--features/icedove.feature6
-rw-r--r--features/images/IcedoveTorbirdyCongratulationsTab.pngbin2668 -> 0 bytes
-rw-r--r--features/images/IcedoveTorbirdyPreferencesWindow.pngbin2471 -> 0 bytes
-rw-r--r--features/images/IcedoveTorbirdyTestProxySettingsButton.pngbin2164 -> 0 bytes
-rw-r--r--features/images/TailsHomepage.pngbin0 -> 4743 bytes
-rw-r--r--features/images/TorBrowserTorCheck.pngbin5226 -> 0 bytes
-rw-r--r--features/images/UnsafeBrowserTorCheckFail.pngbin6913 -> 0 bytes
-rw-r--r--features/step_definitions/browser.rb35
-rw-r--r--features/step_definitions/chutney.rb128
-rw-r--r--features/step_definitions/common_steps.rb22
-rw-r--r--features/step_definitions/firewall_leaks.rb29
-rw-r--r--features/step_definitions/icedove.rb10
-rw-r--r--features/step_definitions/mac_spoofing.rb16
-rw-r--r--features/step_definitions/ssh.rb1
-rw-r--r--features/step_definitions/tor.rb66
-rw-r--r--features/step_definitions/torified_browsing.rb8
-rw-r--r--features/step_definitions/unsafe_browser.rb4
-rw-r--r--features/support/helpers/firewall_helper.rb177
-rw-r--r--features/support/helpers/misc_helpers.rb32
-rw-r--r--features/support/helpers/sniffing_helper.rb14
-rw-r--r--features/support/helpers/vm_helper.rb1
-rw-r--r--features/support/hooks.rb28
-rw-r--r--features/time_syncing.feature88
-rw-r--r--features/tor_bridges.feature14
-rw-r--r--features/tor_enforcement.feature20
-rw-r--r--features/torified_browsing.feature14
-rw-r--r--features/unsafe_browser.feature8
-rw-r--r--ikiwiki-cgi.setup2
-rw-r--r--ikiwiki.setup2
-rwxr-xr-xrun_test_suite2
m---------submodules/chutney0
-rwxr-xr-xvagrant/provision/assets/build-tails1
-rw-r--r--wiki/src/.htaccess31
-rw-r--r--wiki/src/about.de.po7
-rw-r--r--wiki/src/about.fa.po7
-rw-r--r--wiki/src/about.fr.po7
-rw-r--r--wiki/src/about.mdwn1
-rw-r--r--wiki/src/about.pt.po7
-rw-r--r--wiki/src/about/contact.mdwn10
-rw-r--r--wiki/src/blueprint/HTTP_mirror_pool.mdwn144
-rw-r--r--wiki/src/blueprint/SponsorS/reports/2016_04.mdwn68
-rw-r--r--wiki/src/blueprint/Tails_research.mdwn2
-rw-r--r--wiki/src/blueprint/backups.mdwn2
-rw-r--r--wiki/src/blueprint/bootstrapping/verification.mdwn4
-rw-r--r--wiki/src/blueprint/freezable_APT_repository.mdwn261
-rw-r--r--wiki/src/blueprint/greeter_revamp_UI/design_rationale_phase1.mdwn28
-rw-r--r--wiki/src/blueprint/l10n_Italian.mdwn59
-rw-r--r--wiki/src/blueprint/monthly_meeting.mdwn2
-rw-r--r--wiki/src/blueprint/monthly_report.mdwn6
-rw-r--r--wiki/src/blueprint/monthly_report/report_2016_04.mdwn45
-rw-r--r--wiki/src/blueprint/tails_server.mdwn1
-rw-r--r--wiki/src/bugs.pt.po30
-rw-r--r--wiki/src/contribute.de.po3
-rw-r--r--wiki/src/contribute.fa.po3
-rw-r--r--wiki/src/contribute.pt.po86
-rw-r--r--wiki/src/contribute/calendar.mdwn2
-rw-r--r--wiki/src/contribute/design/kernel_hardening.mdwn21
-rw-r--r--wiki/src/contribute/how/mirror.mdwn44
-rw-r--r--wiki/src/contribute/l10n_tricks/core_po_files.txt74
-rw-r--r--wiki/src/contribute/meetings/201604.mdwn72
-rw-r--r--wiki/src/contribute/meetings/201605.mdwn58
-rw-r--r--wiki/src/contribute/release_process.mdwn17
-rw-r--r--wiki/src/contribute/release_process/perl5lib.mdwn5
-rw-r--r--wiki/src/contribute/release_process/persistence-setup.mdwn5
-rw-r--r--wiki/src/contribute/release_process/tails-greeter.mdwn5
-rw-r--r--wiki/src/contribute/release_process/tails-installer.mdwn5
-rw-r--r--wiki/src/contribute/release_process/tails-iuk.mdwn5
-rw-r--r--wiki/src/contribute/release_process/test/setup.mdwn56
-rw-r--r--wiki/src/contribute/release_process/test/usage.mdwn39
-rw-r--r--wiki/src/contribute/reports/SponsorS/2015/2015_01-07.mdwn122
-rw-r--r--wiki/src/contribute/reports/SponsorS/2015/2015_08.mdwn84
-rw-r--r--wiki/src/contribute/reports/SponsorS/2015/2015_09.mdwn118
-rw-r--r--wiki/src/contribute/reports/SponsorS/2015/2015_10.mdwn123
-rw-r--r--wiki/src/contribute/reports/SponsorS/2015/2016_04.mdwn364
-rw-r--r--wiki/src/doc.de.po62
-rw-r--r--wiki/src/doc.fa.po62
-rw-r--r--wiki/src/doc.fr.po62
-rw-r--r--wiki/src/doc.mdwn10
-rw-r--r--wiki/src/doc.pt.po120
-rw-r--r--wiki/src/doc/about.index.fr.po12
-rw-r--r--wiki/src/doc/about/acknowledgments_and_similar_projects.fr.po36
-rw-r--r--wiki/src/doc/about/features.de.po13
-rw-r--r--wiki/src/doc/about/features.fa.po9
-rw-r--r--wiki/src/doc/about/features.fr.po12
-rw-r--r--wiki/src/doc/about/features.mdwn4
-rw-r--r--wiki/src/doc/about/features.pt.po9
-rw-r--r--wiki/src/doc/about/fingerprint.fr.po61
-rw-r--r--wiki/src/doc/about/license.de.po18
-rw-r--r--wiki/src/doc/about/license.fa.po14
-rw-r--r--wiki/src/doc/about/license.fr.po80
-rw-r--r--wiki/src/doc/about/license.mdwn6
-rw-r--r--wiki/src/doc/about/license.pt.po14
-rw-r--r--wiki/src/doc/about/openpgp_keys.de.po64
-rw-r--r--wiki/src/doc/about/openpgp_keys.fa.po76
-rw-r--r--wiki/src/doc/about/openpgp_keys.fr.po70
-rw-r--r--wiki/src/doc/about/openpgp_keys.mdwn41
-rw-r--r--wiki/src/doc/about/openpgp_keys.pt.po53
-rw-r--r--wiki/src/doc/about/trust.de.po12
-rw-r--r--wiki/src/doc/about/trust.fa.po16
-rw-r--r--wiki/src/doc/about/trust.fr.po14
-rw-r--r--wiki/src/doc/about/trust.mdwn4
-rw-r--r--wiki/src/doc/about/trust.pt.po16
-rw-r--r--wiki/src/doc/about/warning.de.po20
-rw-r--r--wiki/src/doc/about/warning.fa.po34
-rw-r--r--wiki/src/doc/about/warning.fr.po32
-rw-r--r--wiki/src/doc/about/warning.mdwn10
-rw-r--r--wiki/src/doc/about/warning.pt.po34
-rw-r--r--wiki/src/doc/advanced_topics/paperkey.de.po54
-rw-r--r--wiki/src/doc/advanced_topics/virtualization.de.po4
-rw-r--r--wiki/src/doc/advanced_topics/virtualization.fa.po5
-rw-r--r--wiki/src/doc/advanced_topics/virtualization.fr.po4
-rw-r--r--wiki/src/doc/advanced_topics/virtualization.mdwn2
-rw-r--r--wiki/src/doc/advanced_topics/virtualization.pt.po4
-rw-r--r--wiki/src/doc/anonymous_internet.index.de.po4
-rw-r--r--wiki/src/doc/anonymous_internet.index.fa.po4
-rw-r--r--wiki/src/doc/anonymous_internet.index.fr.po25
-rw-r--r--wiki/src/doc/anonymous_internet.index.mdwn2
-rw-r--r--wiki/src/doc/anonymous_internet.index.pt.po4
-rw-r--r--wiki/src/doc/anonymous_internet/Tor_Browser.de.po20
-rw-r--r--wiki/src/doc/anonymous_internet/Tor_Browser.fa.po18
-rw-r--r--wiki/src/doc/anonymous_internet/Tor_Browser.fr.po24
-rw-r--r--wiki/src/doc/anonymous_internet/Tor_Browser.mdwn10
-rw-r--r--wiki/src/doc/anonymous_internet/Tor_Browser.pt.po24
-rw-r--r--wiki/src/doc/anonymous_internet/Tor_status.mdwn60
-rw-r--r--wiki/src/doc/anonymous_internet/networkmanager.fr.po2
-rw-r--r--wiki/src/doc/anonymous_internet/tor_status.de.po (renamed from wiki/src/doc/anonymous_internet/Tor_status.de.po)311
-rw-r--r--wiki/src/doc/anonymous_internet/tor_status.fa.po (renamed from wiki/src/doc/anonymous_internet/Tor_status.fa.po)291
-rw-r--r--wiki/src/doc/anonymous_internet/tor_status.fr.po (renamed from wiki/src/doc/anonymous_internet/Tor_status.fr.po)318
-rw-r--r--wiki/src/doc/anonymous_internet/tor_status.mdwn65
-rw-r--r--wiki/src/doc/anonymous_internet/tor_status.pt.po (renamed from wiki/src/doc/anonymous_internet/Tor_status.pt.po)293
-rw-r--r--wiki/src/doc/anonymous_internet/tor_status/onion-circuits.png (renamed from wiki/src/doc/anonymous_internet/Tor_status/Onion_Circuits.png)bin26387 -> 26387 bytes
-rw-r--r--wiki/src/doc/anonymous_internet/tor_status/tor-connected.pngbin0 -> 328 bytes
-rw-r--r--wiki/src/doc/anonymous_internet/tor_status/tor-disconnected.pngbin0 -> 375 bytes
-rw-r--r--wiki/src/doc/encryption_and_privacy/secure_deletion.de.po145
-rw-r--r--wiki/src/doc/first_steps.index.de.po101
-rw-r--r--wiki/src/doc/first_steps.index.fa.po50
-rw-r--r--wiki/src/doc/first_steps.index.fr.po113
-rw-r--r--wiki/src/doc/first_steps.index.mdwn16
-rw-r--r--wiki/src/doc/first_steps.index.pt.po111
-rw-r--r--wiki/src/doc/first_steps/bug_reporting.de.po29
-rw-r--r--wiki/src/doc/first_steps/bug_reporting.fa.po29
-rw-r--r--wiki/src/doc/first_steps/bug_reporting.fr.po29
-rw-r--r--wiki/src/doc/first_steps/bug_reporting.mdwn9
-rw-r--r--wiki/src/doc/first_steps/bug_reporting.pt.po29
-rw-r--r--wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.de.po235
-rw-r--r--wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.fa.po240
-rw-r--r--wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.fr.po272
-rw-r--r--wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.mdwn95
-rw-r--r--wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.pt.po276
-rw-r--r--wiki/src/doc/first_steps/dvd.de.po36
-rw-r--r--wiki/src/doc/first_steps/dvd.fa.po41
-rw-r--r--wiki/src/doc/first_steps/dvd.fr.po37
-rw-r--r--wiki/src/doc/first_steps/dvd.mdwn7
-rw-r--r--wiki/src/doc/first_steps/dvd.pt.po38
-rw-r--r--wiki/src/doc/first_steps/installation.de.po230
-rw-r--r--wiki/src/doc/first_steps/installation.fa.po225
-rw-r--r--wiki/src/doc/first_steps/installation.fr.po242
-rw-r--r--wiki/src/doc/first_steps/installation.mdwn85
-rw-r--r--wiki/src/doc/first_steps/installation.pt.po270
-rw-r--r--wiki/src/doc/first_steps/installation/manual.de.po45
-rw-r--r--wiki/src/doc/first_steps/installation/manual.fa.po46
-rw-r--r--wiki/src/doc/first_steps/installation/manual.fr.po44
-rw-r--r--wiki/src/doc/first_steps/installation/manual.intro.de.po37
-rw-r--r--wiki/src/doc/first_steps/installation/manual.intro.fa.po43
-rw-r--r--wiki/src/doc/first_steps/installation/manual.intro.fr.po36
-rw-r--r--wiki/src/doc/first_steps/installation/manual.intro.mdwn7
-rw-r--r--wiki/src/doc/first_steps/installation/manual.intro.pt.po35
-rw-r--r--wiki/src/doc/first_steps/installation/manual.mdwn7
-rw-r--r--wiki/src/doc/first_steps/installation/manual.pt.po42
-rw-r--r--wiki/src/doc/first_steps/installation/manual/linux.de.po289
-rw-r--r--wiki/src/doc/first_steps/installation/manual/linux.fa.po284
-rw-r--r--wiki/src/doc/first_steps/installation/manual/linux.fr.po358
-rw-r--r--wiki/src/doc/first_steps/installation/manual/linux.mdwn114
-rw-r--r--wiki/src/doc/first_steps/installation/manual/linux.pt.po355
-rw-r--r--wiki/src/doc/first_steps/installation/manual/linux/destination_device_description.fr.pngbin33469 -> 0 bytes
-rw-r--r--wiki/src/doc/first_steps/installation/manual/linux/destination_device_description.pngbin26413 -> 0 bytes
-rw-r--r--wiki/src/doc/first_steps/installation/manual/mac.de.po395
-rw-r--r--wiki/src/doc/first_steps/installation/manual/mac.fa.po389
-rw-r--r--wiki/src/doc/first_steps/installation/manual/mac.fr.po493
-rw-r--r--wiki/src/doc/first_steps/installation/manual/mac.mdwn155
-rw-r--r--wiki/src/doc/first_steps/installation/manual/mac.pt.po466
-rw-r--r--wiki/src/doc/first_steps/installation/manual/windows.de.po151
-rw-r--r--wiki/src/doc/first_steps/installation/manual/windows.fa.po183
-rw-r--r--wiki/src/doc/first_steps/installation/manual/windows.fr.po164
-rw-r--r--wiki/src/doc/first_steps/installation/manual/windows.mdwn51
-rw-r--r--wiki/src/doc/first_steps/installation/manual/windows.pt.po164
-rw-r--r--wiki/src/doc/first_steps/installation/manual/windows/01-run.jpgbin56935 -> 0 bytes
-rw-r--r--wiki/src/doc/first_steps/installation/manual/windows/02-run.jpgbin53124 -> 0 bytes
-rw-r--r--wiki/src/doc/first_steps/installation/manual/windows/03-license-agreement.pngbin18906 -> 0 bytes
-rw-r--r--wiki/src/doc/first_steps/installation/manual/windows/04-select-tails.pngbin17377 -> 0 bytes
-rw-r--r--wiki/src/doc/first_steps/installation/manual/windows/05-browse-iso.pngbin16885 -> 0 bytes
-rw-r--r--wiki/src/doc/first_steps/installation/manual/windows/06-choose-drive.pngbin16193 -> 0 bytes
-rw-r--r--wiki/src/doc/first_steps/installation/manual/windows/07-create.pngbin16180 -> 0 bytes
-rw-r--r--wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.de.po2
-rw-r--r--wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fa.po2
-rw-r--r--wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fr.po2
-rw-r--r--wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.mdwn2
-rw-r--r--wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.pt.po2
-rw-r--r--wiki/src/doc/first_steps/persistence.caution.de.po8
-rw-r--r--wiki/src/doc/first_steps/persistence.caution.fa.po8
-rw-r--r--wiki/src/doc/first_steps/persistence.caution.fr.po8
-rw-r--r--wiki/src/doc/first_steps/persistence.caution.mdwn4
-rw-r--r--wiki/src/doc/first_steps/persistence.caution.pt.po8
-rw-r--r--wiki/src/doc/first_steps/persistence.de.po7
-rw-r--r--wiki/src/doc/first_steps/persistence.fa.po59
-rw-r--r--wiki/src/doc/first_steps/persistence.fr.po9
-rw-r--r--wiki/src/doc/first_steps/persistence.mdwn3
-rw-r--r--wiki/src/doc/first_steps/persistence.pt.po9
-rw-r--r--wiki/src/doc/first_steps/persistence/configure.de.po140
-rw-r--r--wiki/src/doc/first_steps/persistence/configure.fa.po138
-rw-r--r--wiki/src/doc/first_steps/persistence/configure.fr.po133
-rw-r--r--wiki/src/doc/first_steps/persistence/configure.mdwn35
-rw-r--r--wiki/src/doc/first_steps/persistence/configure.pt.po133
-rw-r--r--wiki/src/doc/first_steps/start_tails.de.po455
-rw-r--r--wiki/src/doc/first_steps/start_tails.fa.po494
-rw-r--r--wiki/src/doc/first_steps/start_tails.fr.po452
-rw-r--r--wiki/src/doc/first_steps/start_tails.mdwn109
-rw-r--r--wiki/src/doc/first_steps/start_tails.pt.po516
-rw-r--r--wiki/src/doc/first_steps/startup_options.de.po21
-rw-r--r--wiki/src/doc/first_steps/startup_options.fa.po21
-rw-r--r--wiki/src/doc/first_steps/startup_options.fr.po23
-rw-r--r--wiki/src/doc/first_steps/startup_options.mdwn6
-rw-r--r--wiki/src/doc/first_steps/startup_options.pt.po21
-rw-r--r--wiki/src/doc/first_steps/startup_options/bridge_mode.de.po4
-rw-r--r--wiki/src/doc/first_steps/startup_options/bridge_mode.fa.po2
-rw-r--r--wiki/src/doc/first_steps/startup_options/bridge_mode.fr.po4
-rw-r--r--wiki/src/doc/first_steps/startup_options/bridge_mode.mdwn2
-rw-r--r--wiki/src/doc/first_steps/startup_options/bridge_mode.pt.po2
-rw-r--r--wiki/src/doc/first_steps/upgrade.de.po343
-rw-r--r--wiki/src/doc/first_steps/upgrade.fa.po317
-rw-r--r--wiki/src/doc/first_steps/upgrade.fr.po350
-rw-r--r--wiki/src/doc/first_steps/upgrade.mdwn109
-rw-r--r--wiki/src/doc/first_steps/upgrade.pt.po345
-rw-r--r--wiki/src/doc/get/signing_key_transition.inline.de.po42
-rw-r--r--wiki/src/doc/get/signing_key_transition.inline.fa.po46
-rw-r--r--wiki/src/doc/get/signing_key_transition.inline.fr.po42
-rw-r--r--wiki/src/doc/get/signing_key_transition.inline.mdwn9
-rw-r--r--wiki/src/doc/get/signing_key_transition.inline.pt.po37
-rw-r--r--wiki/src/doc/get/trusting_tails_signing_key.de.po535
-rw-r--r--wiki/src/doc/get/trusting_tails_signing_key.fa.po568
-rw-r--r--wiki/src/doc/get/trusting_tails_signing_key.fr.po616
-rw-r--r--wiki/src/doc/get/trusting_tails_signing_key.mdwn196
-rw-r--r--wiki/src/doc/get/trusting_tails_signing_key.pt.po606
-rw-r--r--wiki/src/doc/get/verify.de.po215
-rw-r--r--wiki/src/doc/get/verify.fa.po211
-rw-r--r--wiki/src/doc/get/verify.fr.po214
-rw-r--r--wiki/src/doc/get/verify.html96
-rw-r--r--wiki/src/doc/get/verify.pt.po216
-rw-r--r--wiki/src/doc/get/verify_the_iso_image_using_gnome.de.po247
-rw-r--r--wiki/src/doc/get/verify_the_iso_image_using_gnome.fa.po240
-rw-r--r--wiki/src/doc/get/verify_the_iso_image_using_gnome.fr.po288
-rw-r--r--wiki/src/doc/get/verify_the_iso_image_using_gnome.html100
-rw-r--r--wiki/src/doc/get/verify_the_iso_image_using_gnome.pt.po285
-rw-r--r--wiki/src/doc/get/verify_the_iso_image_using_gnome/bad_signature.pngbin6552 -> 0 bytes
-rw-r--r--wiki/src/doc/get/verify_the_iso_image_using_gnome/good_signature.pngbin6781 -> 0 bytes
-rw-r--r--wiki/src/doc/get/verify_the_iso_image_using_gnome/import_key.pngbin31451 -> 0 bytes
-rw-r--r--wiki/src/doc/get/verify_the_iso_image_using_gnome/key_imported.pngbin9423 -> 0 bytes
-rw-r--r--wiki/src/doc/get/verify_the_iso_image_using_gnome/verify_signature.pngbin35222 -> 0 bytes
-rw-r--r--wiki/src/doc/get/verify_the_iso_image_using_gnome/verifying.pngbin8492 -> 0 bytes
-rw-r--r--wiki/src/doc/get/verify_the_iso_image_using_other_operating_systems.de.po200
-rw-r--r--wiki/src/doc/get/verify_the_iso_image_using_other_operating_systems.fa.po195
-rw-r--r--wiki/src/doc/get/verify_the_iso_image_using_other_operating_systems.fr.po413
-rw-r--r--wiki/src/doc/get/verify_the_iso_image_using_other_operating_systems.html87
-rw-r--r--wiki/src/doc/get/verify_the_iso_image_using_other_operating_systems.pt.po273
-rw-r--r--wiki/src/doc/get/verify_the_iso_image_using_other_operating_systems/checksums_do_not_match.pngbin15465 -> 0 bytes
-rw-r--r--wiki/src/doc/get/verify_the_iso_image_using_other_operating_systems/checksums_match.pngbin4395 -> 0 bytes
-rw-r--r--wiki/src/doc/get/verify_the_iso_image_using_other_operating_systems/selected_hash.pngbin14617 -> 0 bytes
-rw-r--r--wiki/src/doc/get/verify_the_iso_image_using_the_command_line.de.po270
-rw-r--r--wiki/src/doc/get/verify_the_iso_image_using_the_command_line.fa.po264
-rw-r--r--wiki/src/doc/get/verify_the_iso_image_using_the_command_line.fr.po239
-rw-r--r--wiki/src/doc/get/verify_the_iso_image_using_the_command_line.html112
-rw-r--r--wiki/src/doc/get/verify_the_iso_image_using_the_command_line.pt.po281
-rw-r--r--wiki/src/doc/upgrade/error.pt.po14
-rw-r--r--wiki/src/doc/upgrade/error/check.pt.po30
-rw-r--r--wiki/src/doc/upgrade/error/download.pt.po30
-rw-r--r--wiki/src/doc/upgrade/error/install.pt.po41
-rw-r--r--wiki/src/getting_started.fr.po21
-rw-r--r--wiki/src/getting_started.pt.po16
-rw-r--r--wiki/src/inc/stable_i386_hash.html1
-rw-r--r--wiki/src/inc/stable_i386_torrent_sig_url.html1
-rw-r--r--wiki/src/inc/trace2
-rw-r--r--wiki/src/index.de.po12
-rw-r--r--wiki/src/index.fa.po44
-rw-r--r--wiki/src/index.fr.po19
-rw-r--r--wiki/src/index.html6
-rw-r--r--wiki/src/index.pt.po38
-rw-r--r--wiki/src/install/download/openpgp.de.po654
-rw-r--r--wiki/src/install/download/openpgp.fa.po645
-rw-r--r--wiki/src/install/download/openpgp.fr.po650
-rw-r--r--wiki/src/install/download/openpgp.mdwn243
-rw-r--r--wiki/src/install/download/openpgp.pt.po641
-rw-r--r--wiki/src/install/expert/usb.de.po33
-rw-r--r--wiki/src/install/expert/usb.fa.po17
-rw-r--r--wiki/src/install/expert/usb.fr.po17
-rw-r--r--wiki/src/install/expert/usb.mdwn11
-rw-r--r--wiki/src/install/expert/usb.pt.po17
-rw-r--r--wiki/src/install/inc/overview.pt.po102
-rw-r--r--wiki/src/install/inc/overview/vm.pt.po16
-rw-r--r--wiki/src/install/inc/router/clone.pt.po25
-rw-r--r--wiki/src/install/inc/router/why_extra.inline.pt.po16
-rw-r--r--wiki/src/install/inc/router/why_two.inline.pt.po27
-rw-r--r--wiki/src/install/inc/screenshots/mac_option_key.png (renamed from wiki/src/install/mac/option_key.png)bin191417 -> 191417 bytes
-rw-r--r--wiki/src/install/inc/screenshots/notification_in_tails.pngbin0 -> 28739 bytes
-rw-r--r--wiki/src/install/inc/screenshots/tails_boot_menu.png (renamed from wiki/src/doc/first_steps/start_tails/tails_boot_menu.png)bin2974 -> 2974 bytes
-rw-r--r--wiki/src/install/inc/screenshots/verifying_in_tails.pngbin0 -> 6829 bytes
-rw-r--r--wiki/src/install/inc/steps/bittorrent_verification.inline.de.po4
-rw-r--r--wiki/src/install/inc/steps/bittorrent_verification.inline.fa.po4
-rw-r--r--wiki/src/install/inc/steps/bittorrent_verification.inline.fr.po15
-rw-r--r--wiki/src/install/inc/steps/bittorrent_verification.inline.html2
-rw-r--r--wiki/src/install/inc/steps/bittorrent_verification.inline.pt.po19
-rw-r--r--wiki/src/install/inc/steps/create_persistence.inline.de.po154
-rw-r--r--wiki/src/install/inc/steps/create_persistence.inline.fa.po6
-rw-r--r--wiki/src/install/inc/steps/create_persistence.inline.fr.po153
-rw-r--r--wiki/src/install/inc/steps/create_persistence.inline.mdwn3
-rw-r--r--wiki/src/install/inc/steps/create_persistence.inline.pt.po156
-rw-r--r--wiki/src/install/inc/steps/download.inline.de.po33
-rw-r--r--wiki/src/install/inc/steps/download.inline.fa.po33
-rw-r--r--wiki/src/install/inc/steps/download.inline.fr.po33
-rw-r--r--wiki/src/install/inc/steps/download.inline.html9
-rw-r--r--wiki/src/install/inc/steps/download.inline.pt.po211
-rw-r--r--wiki/src/install/inc/steps/install_final.inline.de.po43
-rw-r--r--wiki/src/install/inc/steps/install_final.inline.fa.po10
-rw-r--r--wiki/src/install/inc/steps/install_final.inline.fr.po124
-rw-r--r--wiki/src/install/inc/steps/install_final.inline.mdwn8
-rw-r--r--wiki/src/install/inc/steps/install_final.inline.pt.po109
-rw-r--r--wiki/src/install/inc/steps/install_intermediary_intro.inline.de.po6
-rw-r--r--wiki/src/install/inc/steps/install_intermediary_intro.inline.fa.po16
-rw-r--r--wiki/src/install/inc/steps/install_intermediary_intro.inline.fr.po21
-rw-r--r--wiki/src/install/inc/steps/install_intermediary_intro.inline.mdwn3
-rw-r--r--wiki/src/install/inc/steps/install_intermediary_intro.inline.pt.po35
-rw-r--r--wiki/src/install/inc/steps/install_intermediary_outro.inline.fr.po8
-rw-r--r--wiki/src/install/inc/steps/install_intermediary_outro.inline.pt.po23
-rw-r--r--wiki/src/install/inc/steps/install_tails_installer.inline.de.po17
-rw-r--r--wiki/src/install/inc/steps/install_tails_installer.inline.fa.po8
-rw-r--r--wiki/src/install/inc/steps/install_tails_installer.inline.fr.po45
-rw-r--r--wiki/src/install/inc/steps/install_tails_installer.inline.mdwn5
-rw-r--r--wiki/src/install/inc/steps/install_tails_installer.inline.pt.po56
-rw-r--r--wiki/src/install/inc/steps/mac_startup_disks.inline.de.po27
-rw-r--r--wiki/src/install/inc/steps/mac_startup_disks.inline.fa.po2
-rw-r--r--wiki/src/install/inc/steps/mac_startup_disks.inline.fr.po4
-rw-r--r--wiki/src/install/inc/steps/mac_startup_disks.inline.mdwn2
-rw-r--r--wiki/src/install/inc/steps/mac_startup_disks.inline.pt.po25
-rw-r--r--wiki/src/install/inc/steps/not_at_all.inline.de.po236
-rw-r--r--wiki/src/install/inc/steps/not_at_all.inline.fa.po112
-rw-r--r--wiki/src/install/inc/steps/not_at_all.inline.fr.po134
-rw-r--r--wiki/src/install/inc/steps/not_at_all.inline.mdwn36
-rw-r--r--wiki/src/install/inc/steps/not_at_all.inline.pt.po112
-rw-r--r--wiki/src/install/inc/steps/restart_first_time.inline.de.po32
-rw-r--r--wiki/src/install/inc/steps/restart_first_time.inline.fa.po18
-rw-r--r--wiki/src/install/inc/steps/restart_first_time.inline.fr.po32
-rw-r--r--wiki/src/install/inc/steps/restart_first_time.inline.mdwn15
-rw-r--r--wiki/src/install/inc/steps/restart_first_time.inline.pt.po18
-rw-r--r--wiki/src/install/inc/steps/restart_second_time.inline.de.po88
-rw-r--r--wiki/src/install/inc/steps/restart_second_time.inline.fa.po8
-rw-r--r--wiki/src/install/inc/steps/restart_second_time.inline.fr.po12
-rw-r--r--wiki/src/install/inc/steps/restart_second_time.inline.mdwn6
-rw-r--r--wiki/src/install/inc/steps/restart_second_time.inline.pt.po8
-rw-r--r--wiki/src/install/inc/steps/verify_up-to-date.inline.de.po47
-rw-r--r--wiki/src/install/inc/steps/verify_up-to-date.inline.fa.po6
-rw-r--r--wiki/src/install/inc/steps/verify_up-to-date.inline.fr.po8
-rw-r--r--wiki/src/install/inc/steps/verify_up-to-date.inline.mdwn3
-rw-r--r--wiki/src/install/inc/steps/verify_up-to-date.inline.pt.po43
-rw-r--r--wiki/src/install/inc/stylesheets/assistant.css5
-rw-r--r--wiki/src/install/inc/stylesheets/steps.css5
-rw-r--r--wiki/src/install/inc/tails-installation-assistant.inline.pt.po14
-rw-r--r--wiki/src/install/mac/dvd.de.po8
-rw-r--r--wiki/src/install/mac/dvd.fa.po6
-rw-r--r--wiki/src/install/mac/dvd.fr.po8
-rw-r--r--wiki/src/install/mac/dvd.mdwn3
-rw-r--r--wiki/src/install/mac/dvd.pt.po6
-rw-r--r--wiki/src/install/mac/usb/overview.de.po2
-rw-r--r--wiki/src/install/mac/usb/overview.fa.po5
-rw-r--r--wiki/src/install/mac/usb/overview.fr.po2
-rw-r--r--wiki/src/install/mac/usb/overview.html2
-rw-r--r--wiki/src/install/mac/usb/overview.pt.po5
-rw-r--r--wiki/src/local.css16
-rw-r--r--wiki/src/news.de.po4
-rw-r--r--wiki/src/news.fa.po4
-rw-r--r--wiki/src/news.fr.po46
-rw-r--r--wiki/src/news.mdwn2
-rw-r--r--wiki/src/news.pt.po4
-rw-r--r--wiki/src/news/new_SSL_certificate.de.po37
-rw-r--r--wiki/src/news/new_SSL_certificate.fa.po110
-rw-r--r--wiki/src/news/new_SSL_certificate.fr.po37
-rw-r--r--wiki/src/news/new_SSL_certificate.mdwn2
-rw-r--r--wiki/src/news/new_SSL_certificate.pt.po37
-rw-r--r--wiki/src/news/report_2011_05-06.mdwn2
-rw-r--r--wiki/src/news/report_2013_04.mdwn8
-rw-r--r--wiki/src/news/report_2013_12.mdwn4
-rw-r--r--wiki/src/news/report_2015_04.mdwn2
-rw-r--r--wiki/src/news/report_2015_08.mdwn2
-rw-r--r--wiki/src/news/report_2016_03.mdwn6
-rw-r--r--wiki/src/news/report_2016_04.mdwn88
-rw-r--r--wiki/src/news/signing_key_transition.de.po6
-rw-r--r--wiki/src/news/signing_key_transition.fa.po10
-rw-r--r--wiki/src/news/signing_key_transition.fr.po12
-rw-r--r--wiki/src/news/signing_key_transition.mdwn2
-rw-r--r--wiki/src/news/signing_key_transition.pt.po6
-rw-r--r--wiki/src/news/summit_2013.fr.po12
-rw-r--r--wiki/src/news/test_0.13-rc1.html2
-rw-r--r--wiki/src/news/test_0.14-rc1.html2
-rw-r--r--wiki/src/news/test_0.14-rc2.html2
-rw-r--r--wiki/src/news/test_0.15-rc1.html2
-rw-r--r--wiki/src/news/test_0.16-rc1.html2
-rw-r--r--wiki/src/news/test_0.17-rc1.html2
-rw-r--r--wiki/src/news/test_0.17.2-rc1.html2
-rw-r--r--wiki/src/news/test_0.18-rc1.html2
-rw-r--r--wiki/src/news/test_0.19-rc1.html2
-rw-r--r--wiki/src/news/test_0.20-rc1.html2
-rw-r--r--wiki/src/news/test_0.21-rc1.html2
-rw-r--r--wiki/src/news/test_0.22-rc1.html2
-rw-r--r--wiki/src/news/test_0.22.1-rc1.mdwn2
-rw-r--r--wiki/src/news/test_0.23-rc1.html2
-rw-r--r--wiki/src/news/test_1.0-rc1.de.po4
-rw-r--r--wiki/src/news/test_1.0-rc1.fa.po68
-rw-r--r--wiki/src/news/test_1.0-rc1.fr.po4
-rw-r--r--wiki/src/news/test_1.0-rc1.mdwn2
-rw-r--r--wiki/src/news/test_1.0-rc1.pt.po4
-rw-r--r--wiki/src/news/test_1.1-beta1.de.po4
-rw-r--r--wiki/src/news/test_1.1-beta1.fa.po127
-rw-r--r--wiki/src/news/test_1.1-beta1.fr.po4
-rw-r--r--wiki/src/news/test_1.1-beta1.mdwn2
-rw-r--r--wiki/src/news/test_1.1-beta1.pt.po4
-rw-r--r--wiki/src/news/test_1.1-rc1.de.po4
-rw-r--r--wiki/src/news/test_1.1-rc1.fa.po64
-rw-r--r--wiki/src/news/test_1.1-rc1.fr.po4
-rw-r--r--wiki/src/news/test_1.1-rc1.mdwn2
-rw-r--r--wiki/src/news/test_1.1-rc1.pt.po4
-rw-r--r--wiki/src/news/test_1.2-rc1.de.po29
-rw-r--r--wiki/src/news/test_1.2-rc1.fa.po42
-rw-r--r--wiki/src/news/test_1.2-rc1.fr.po29
-rw-r--r--wiki/src/news/test_1.2-rc1.mdwn2
-rw-r--r--wiki/src/news/test_1.2-rc1.pt.po29
-rw-r--r--wiki/src/news/test_1.3-rc1.de.po4
-rw-r--r--wiki/src/news/test_1.3-rc1.fa.po49
-rw-r--r--wiki/src/news/test_1.3-rc1.fr.po6
-rw-r--r--wiki/src/news/test_1.3-rc1.mdwn2
-rw-r--r--wiki/src/news/test_1.3-rc1.pt.po4
-rw-r--r--wiki/src/news/test_1.4-rc1.de.po4
-rw-r--r--wiki/src/news/test_1.4-rc1.fa.po43
-rw-r--r--wiki/src/news/test_1.4-rc1.fr.po4
-rw-r--r--wiki/src/news/test_1.4-rc1.mdwn2
-rw-r--r--wiki/src/news/test_1.4-rc1.pt.po4
-rw-r--r--wiki/src/news/test_1.5-rc1.de.po4
-rw-r--r--wiki/src/news/test_1.5-rc1.fa.po61
-rw-r--r--wiki/src/news/test_1.5-rc1.fr.po4
-rw-r--r--wiki/src/news/test_1.5-rc1.mdwn2
-rw-r--r--wiki/src/news/test_1.5-rc1.pt.po4
-rw-r--r--wiki/src/news/test_1.7-rc1.de.po4
-rw-r--r--wiki/src/news/test_1.7-rc1.fa.po34
-rw-r--r--wiki/src/news/test_1.7-rc1.fr.po6
-rw-r--r--wiki/src/news/test_1.7-rc1.mdwn2
-rw-r--r--wiki/src/news/test_1.7-rc1.pt.po4
-rw-r--r--wiki/src/news/test_2.0-beta1.de.po4
-rw-r--r--wiki/src/news/test_2.0-beta1.fa.po4
-rw-r--r--wiki/src/news/test_2.0-beta1.fr.po6
-rw-r--r--wiki/src/news/test_2.0-beta1.mdwn2
-rw-r--r--wiki/src/news/test_2.0-beta1.pt.po4
-rw-r--r--wiki/src/news/test_2.0-rc1.de.po4
-rw-r--r--wiki/src/news/test_2.0-rc1.fa.po4
-rw-r--r--wiki/src/news/test_2.0-rc1.fr.po4
-rw-r--r--wiki/src/news/test_2.0-rc1.mdwn2
-rw-r--r--wiki/src/news/test_2.0-rc1.pt.po4
-rw-r--r--wiki/src/news/test_UEFI.de.po15
-rw-r--r--wiki/src/news/test_UEFI.fa.po42
-rw-r--r--wiki/src/news/test_UEFI.fr.po15
-rw-r--r--wiki/src/news/test_UEFI.mdwn6
-rw-r--r--wiki/src/news/test_UEFI.pt.po15
-rw-r--r--wiki/src/news/version_0.11.mdwn4
-rw-r--r--wiki/src/news/version_1.0.de.po4
-rw-r--r--wiki/src/news/version_1.0.fa.po59
-rw-r--r--wiki/src/news/version_1.0.fr.po9
-rw-r--r--wiki/src/news/version_1.0.mdwn2
-rw-r--r--wiki/src/news/version_1.0.pt.po168
-rw-r--r--wiki/src/news/version_1.3.2.de.po5
-rw-r--r--wiki/src/news/version_1.3.2.fa.po19
-rw-r--r--wiki/src/news/version_1.3.2.fr.po5
-rw-r--r--wiki/src/news/version_1.3.2.mdwn4
-rw-r--r--wiki/src/news/version_1.3.2.pt.po5
-rw-r--r--wiki/src/news/version_2.2.1.de.po2
-rw-r--r--wiki/src/news/version_2.2.de.po4
-rw-r--r--wiki/src/news/version_2.2.fa.po2
-rw-r--r--wiki/src/news/version_2.2.fr.po4
-rw-r--r--wiki/src/news/version_2.2.mdwn2
-rw-r--r--wiki/src/news/version_2.2.pt.po2
-rw-r--r--wiki/src/news/version_2.3.de.po2
-rw-r--r--wiki/src/news/version_2.3.fa.po2
-rw-r--r--wiki/src/news/version_2.3.fr.po104
-rw-r--r--wiki/src/news/version_2.3.mdwn2
-rw-r--r--wiki/src/news/version_2.3.pt.po2
-rw-r--r--wiki/src/security.de.po4
-rw-r--r--wiki/src/security.fa.po4
-rw-r--r--wiki/src/security.fr.po12
-rw-r--r--wiki/src/security.mdwn2
-rw-r--r--wiki/src/security.pt.po4
-rw-r--r--wiki/src/sidebar.fr.po10
-rw-r--r--wiki/src/sidebar.pt.po15
-rw-r--r--wiki/src/support.de.po6
-rw-r--r--wiki/src/support.fa.po15
-rw-r--r--wiki/src/support.fr.po7
-rw-r--r--wiki/src/support.mdwn2
-rw-r--r--wiki/src/support.pt.po18
-rw-r--r--wiki/src/support/faq.de.po9
-rw-r--r--wiki/src/support/faq.fa.po18
-rw-r--r--wiki/src/support/faq.fr.po25
-rw-r--r--wiki/src/support/faq.mdwn4
-rw-r--r--wiki/src/support/faq.pt.po22
-rw-r--r--wiki/src/support/known_issues.de.po24
-rw-r--r--wiki/src/support/known_issues.fa.po35
-rw-r--r--wiki/src/support/known_issues.fr.po41
-rw-r--r--wiki/src/support/known_issues.mdwn15
-rw-r--r--wiki/src/support/known_issues.pt.po35
-rw-r--r--wiki/src/support/learn/intro.inline.pt.po13
-rw-r--r--wiki/src/support/talk/languages.inline.pt.po22
-rw-r--r--wiki/src/tails-mirrors.key90
-rw-r--r--wiki/src/tails-sysadmins.key561
-rw-r--r--wiki/src/upgrade.pt.po67
-rw-r--r--wiki/src/upgrade/v1/Tails/2.2.1/i386/alpha/upgrades.yml17
-rw-r--r--wiki/src/upgrade/v1/Tails/2.2.1/i386/alpha/upgrades.yml.pgp26
-rw-r--r--wiki/src/upgrade/v1/Tails/2.3.1/i386/alpha/upgrades.yml5
-rw-r--r--wiki/src/upgrade/v1/Tails/2.3.1/i386/alpha/upgrades.yml.pgp16
-rw-r--r--wiki/src/upgrade/v1/Tails/2.3.1/i386/stable/upgrades.yml5
-rw-r--r--wiki/src/upgrade/v1/Tails/2.3.1/i386/stable/upgrades.yml.pgp16
527 files changed, 12462 insertions, 20547 deletions
diff --git a/.gitmodules b/.gitmodules
index 31cff48..d6d5399 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,7 @@
[submodule "submodules/jenkins-tools"]
path = submodules/jenkins-tools
url = https://git-tails.immerda.ch/jenkins-tools
+[submodule "submodules/chutney"]
+ path = submodules/chutney
+ url = https://git-tails.immerda.ch/chutney
+ branch = feature/tails_test_suite
diff --git a/config/chroot_local-hooks/98-remove_unwanted_files b/config/chroot_local-hooks/98-remove_unwanted_files
index 030e03f..43433fb 100755
--- a/config/chroot_local-hooks/98-remove_unwanted_files
+++ b/config/chroot_local-hooks/98-remove_unwanted_files
@@ -30,3 +30,8 @@ find /etc/ssl/certs /etc/ssl/private |
fi
done
update-ca-certificates
+
+# Remove the kernel .map files which are only useful for kernel
+# debugging (and slightly make things easier for malware, perhaps) and
+# otherwise just occupy disk space.
+rm -f /boot/*.map /boot/*.map-*
diff --git a/config/chroot_local-includes/etc/sysctl.d/kptr_restrict.conf b/config/chroot_local-includes/etc/sysctl.d/kptr_restrict.conf
new file mode 100644
index 0000000..a1e18e8
--- /dev/null
+++ b/config/chroot_local-includes/etc/sysctl.d/kptr_restrict.conf
@@ -0,0 +1 @@
+kernel.kptr_restrict=2
diff --git a/features/chutney/test-network b/features/chutney/test-network
new file mode 100644
index 0000000..adb8ee5
--- /dev/null
+++ b/features/chutney/test-network
@@ -0,0 +1,56 @@
+Authority = Node(
+ tag="auth",
+ authority=1,
+ relay=1,
+ torrc="authority.tmpl"
+)
+
+BridgeAuthority = Node(
+ tag="brauth",
+ authority=1,
+ bridgeauthority=1,
+ relay=1,
+ torrc="bridgeauthority.tmpl"
+)
+
+NonExitRelay = Node(
+ tag="relay",
+ relay=1,
+ torrc="relay-non-exit.tmpl"
+)
+
+ExitRelay = Node(
+ tag="exit",
+ relay=1,
+ exit=1,
+ torrc="relay.tmpl"
+)
+
+Client = Node(
+ tag="client",
+ torrc="client.tmpl"
+)
+
+Bridge = Node(
+ tag="bridge",
+ bridge=1,
+ relay=1,
+ torrc="bridge.tmpl"
+)
+
+BridgeObfs4 = Node(
+ tag="obfs4",
+ bridge=1,
+ relay=1,
+ torrc="bridge-obfs4.tmpl"
+)
+
+NODES = Authority.getN(4) + \
+ BridgeAuthority.getN(1) + \
+ NonExitRelay.getN(20) + \
+ ExitRelay.getN(10) + \
+ Bridge.getN(3) + \
+ BridgeObfs4.getN(3) + \
+ Client.getN(1)
+
+ConfigureNodes(NODES)
diff --git a/features/icedove.feature b/features/icedove.feature
index e05f024..3d661db 100644
--- a/features/icedove.feature
+++ b/features/icedove.feature
@@ -31,9 +31,3 @@ Feature: Icedove email client
Given I cancel setting up an email account
And I open Torbirdy's preferences
Then I see that Torbirdy is configured to use Tor
-
- Scenario: Icedove will work over Tor
- Given I cancel setting up an email account
- And I open Torbirdy's preferences
- When I test Torbirdy's proxy settings
- Then Torbirdy's proxy test is successful
diff --git a/features/images/IcedoveTorbirdyCongratulationsTab.png b/features/images/IcedoveTorbirdyCongratulationsTab.png
deleted file mode 100644
index 464db25..0000000
--- a/features/images/IcedoveTorbirdyCongratulationsTab.png
+++ /dev/null
Binary files differ
diff --git a/features/images/IcedoveTorbirdyPreferencesWindow.png b/features/images/IcedoveTorbirdyPreferencesWindow.png
deleted file mode 100644
index 288b21e..0000000
--- a/features/images/IcedoveTorbirdyPreferencesWindow.png
+++ /dev/null
Binary files differ
diff --git a/features/images/IcedoveTorbirdyTestProxySettingsButton.png b/features/images/IcedoveTorbirdyTestProxySettingsButton.png
deleted file mode 100644
index 2e2e127..0000000
--- a/features/images/IcedoveTorbirdyTestProxySettingsButton.png
+++ /dev/null
Binary files differ
diff --git a/features/images/TailsHomepage.png b/features/images/TailsHomepage.png
new file mode 100644
index 0000000..e21c0f7
--- /dev/null
+++ b/features/images/TailsHomepage.png
Binary files differ
diff --git a/features/images/TorBrowserTorCheck.png b/features/images/TorBrowserTorCheck.png
deleted file mode 100644
index 0ed51a8..0000000
--- a/features/images/TorBrowserTorCheck.png
+++ /dev/null
Binary files differ
diff --git a/features/images/UnsafeBrowserTorCheckFail.png b/features/images/UnsafeBrowserTorCheckFail.png
deleted file mode 100644
index 635c2e3..0000000
--- a/features/images/UnsafeBrowserTorCheckFail.png
+++ /dev/null
Binary files differ
diff --git a/features/step_definitions/browser.rb b/features/step_definitions/browser.rb
index e01893f..293202c 100644
--- a/features/step_definitions/browser.rb
+++ b/features/step_definitions/browser.rb
@@ -113,6 +113,28 @@ When /^I open the address "([^"]*)" in the (.*)$/ do |address, browser|
end
end
+# This step is limited to the Tor Browser due to #7502 since dogtail
+# uses the same interface.
+Then /^a page titled "([^"]+)" has loaded in the Tor Browser$/ do |title|
+ expected_title = "#{title} - Tor Browser"
+ app = Dogtail::Application.new('Firefox')
+ app.child(expected_title, roleName: 'frame').wait(60)
+ # The 'Stop loading this page' button (graphically shown as an X) is
+ # only shown while a page is loading, so once we see the expected
+ # title *and* this one has disappeared, then we can be sure that the
+ # page has fully loaded.
+ try_for(60) do
+ assert_raise do
+ app.child(
+ 'Location',
+ roleName: 'push button',
+ description: 'Stop loading this page',
+ retry: False
+ )
+ end
+ end
+end
+
Then /^the (.*) has no plugins installed$/ do |browser|
step "I open the address \"about:plugins\" in the #{browser}"
step "I see \"TorBrowserNoPlugins.png\" after at most 30 seconds"
@@ -193,3 +215,16 @@ Then /^the file is saved to the default Tor Browser download directory$/ do
expected_path = "/home/#{LIVE_USER}/Tor Browser/#{@some_file}"
try_for(10) { $vm.file_exist?(expected_path) }
end
+
+When /^I open Tails homepage in the (.+)$/ do |browser|
+ step "I open the address \"https://tails.boum.org\" in the #{browser}"
+end
+
+Then /^Tails homepage loads in the Tor Browser$/ do
+ title = 'Tails - Privacy for anyone anywhere'
+ step "a page titled \"#{title}\" has loaded in the Tor Browser"
+end
+
+Then /^Tails homepage loads in the Unsafe Browser$/ do
+ @screen.wait('TailsHomepage.png', 60)
+end
diff --git a/features/step_definitions/chutney.rb b/features/step_definitions/chutney.rb
new file mode 100644
index 0000000..0b24b31
--- /dev/null
+++ b/features/step_definitions/chutney.rb
@@ -0,0 +1,128 @@
+def ensure_chutney_is_running
+ # Ensure that a fresh chutney instance is running, and that it will
+ # be cleaned upon exit. We only do it once, though, since the same
+ # setup can be used throughout the same test suite run.
+ if not($chutney_initialized)
+ chutney_src_dir = "#{GIT_DIR}/submodules/chutney"
+ chutney_listen_address = $vmnet.bridge_ip_addr
+ chutney_script = "#{chutney_src_dir}/chutney"
+ assert(
+ File.executable?(chutney_script),
+ "It does not look like '#{chutney_src_dir}' is the Chutney source tree"
+ )
+ network_definition = "#{GIT_DIR}/features/chutney/test-network"
+ env = {
+ 'CHUTNEY_LISTEN_ADDRESS' => chutney_listen_address,
+ 'CHUTNEY_DATA_DIR' => "#{$config['TMPDIR']}/chutney-data/"
+ }
+
+ chutney_data_dir_cleanup = Proc.new do
+ if File.directory?(env['CHUTNEY_DATA_DIR'])
+ FileUtils.rm_r(env['CHUTNEY_DATA_DIR'])
+ end
+ end
+
+ chutney_cmd = Proc.new do |cmd|
+ Dir.chdir(chutney_src_dir) do
+ cmd_helper([chutney_script, cmd, network_definition], env)
+ end
+ end
+
+ if KEEP_SNAPSHOTS
+ begin
+ chutney_cmd.call('start')
+ rescue Test::Unit::AssertionFailedError
+ if File.directory?(env['CHUTNEY_DATA_DIR'])
+ raise "You are running with --keep-snapshots but Chutney failed " +
+ "to start with its current data directory. To recover you " +
+ "likely want to delete '#{env['CHUTNEY_DATA_DIR']}' and " +
+ "all test suite snapshots and then start over."
+ else
+ chutney_cmd.call('configure')
+ chutney_cmd.call('start')
+ end
+ end
+ else
+ chutney_cmd.call('stop')
+ chutney_data_dir_cleanup.call
+ chutney_cmd.call('configure')
+ chutney_cmd.call('start')
+ end
+
+ at_exit do
+ chutney_cmd.call('stop')
+ chutney_data_dir_cleanup.call unless KEEP_SNAPSHOTS
+ end
+
+ $chutney_initialized = true
+ end
+end
+
+When /^I configure Tails to use a simulated Tor network$/ do
+ # At the moment this step essentially assumes that we boot with 'the
+ # network is unplugged', run this step, and then 'the network is
+ # plugged'. I believe we can make this pretty transparent without
+ # the need of a dedicated step by using tags (e.g. @fake_tor or
+ # whatever -- possibly we want the opposite, @real_tor,
+ # instead).
+ #
+ # There are two time points where we for a scenario must ensure that
+ # the client configuration below is enabled if and only if the
+ # scenario is tagged, and that is:
+ #
+ # 1. During a proper boot, as soon as the remote shell is up in the
+ # 'the computer boots Tails' step.
+ #
+ # 2. When restoring a snapshot, in restore_background().
+ #
+ # If we do this, it doesn't even matter if a snapshot is made of an
+ # untagged scenario (without the conf), and we later restore it with
+ # a tagged scenario.
+ #
+ # Note: We probably have to clear the /var/lib/tor data dir when we
+ # switch mode. Possibly there are other such problems that make this
+ # abstraction impractical and it's better that we avoid it an go
+ # with the more explicit, step-based approach.
+
+ assert(not($vm.execute('service tor status').success?),
+ "Running this step when Tor is running is probably not intentional")
+ ensure_chutney_is_running
+ # Most of these lines are taken from chutney's client template.
+ client_torrc_lines = [
+ 'TestingTorNetwork 1',
+ 'AssumeReachable 1',
+ 'PathsNeededToBuildCircuits 0.25',
+ 'TestingBridgeDownloadSchedule 0, 5',
+ 'TestingClientConsensusDownloadSchedule 0, 5',
+ 'TestingClientDownloadSchedule 0, 5',
+ 'TestingDirAuthVoteExit *',
+ 'TestingDirAuthVoteGuard *',
+ 'TestingDirAuthVoteHSDir *',
+ 'TestingMinExitFlagThreshold 0',
+ 'V3AuthNIntervalsValid 2',
+ # Enabling TestingTorNetwork disables ClientRejectInternalAddresses
+ # so the Tor client will happily try LAN connections. Coupled with
+ # that TestingTorNetwork is enabled on all exits, and their
+ # ExitPolicyRejectPrivate is disabled, we will allow exiting to
+ # LAN hosts. We have at least one test that tries to make sure
+ # that is *not* possible (Scenario: The Tor Browser cannot access
+ # the LAN) so we cannot allow it. We'll have to rethink all this
+ # if we ever want to run all services locally as well (#9520).
+ 'ClientRejectInternalAddresses 1',
+ ]
+ # We run one client in chutney so we easily can grep the generated
+ # DirAuthority lines and use them.
+ chutney_src_dir = "#{GIT_DIR}/submodules/chutney"
+ client_torrcs = Dir.glob(
+ "#{$config['TMPDIR']}/chutney-data/nodes/*client/torrc"
+ )
+ dir_auth_lines = open(client_torrcs.first) do |f|
+ f.grep(/^(Alternate)?(Dir|Bridge)Authority\s/)
+ end
+ client_torrc_lines.concat(dir_auth_lines)
+ $vm.file_append('/etc/tor/torrc', client_torrc_lines)
+end
+
+When /^Tails is using the real Tor network$/ do
+ assert($vm.execute('grep "TestingTorNetwork 1" /etc/torrc').failure?)
+end
diff --git a/features/step_definitions/common_steps.rb b/features/step_definitions/common_steps.rb
index 38381ee..f30933d 100644
--- a/features/step_definitions/common_steps.rb
+++ b/features/step_definitions/common_steps.rb
@@ -290,6 +290,7 @@ Given /^the computer (re)?boots Tails$/ do |reboot|
@screen.wait('TailsGreeter.png', 30*60)
$vm.wait_until_remote_shell_is_up
activate_filesystem_shares
+ step 'I configure Tails to use a simulated Tor network'
end
Given /^I log in to a new session(?: in )?(|German)$/ do |lang|
@@ -454,9 +455,10 @@ Then /^I (do not )?see "([^"]*)" after at most (\d+) seconds$/ do |negation, ima
end
Then /^all Internet traffic has only flowed through Tor$/ do
- leaks = FirewallLeakCheck.new(@sniffer.pcap_file,
- :accepted_hosts => get_all_tor_nodes)
- leaks.assert_no_leaks
+ allowed_hosts = allowed_hosts_under_tor_enforcement
+ assert_all_connections(@sniffer.pcap_file) do |c|
+ allowed_hosts.include?({ address: c.daddr, port: c.dport })
+ end
end
Given /^I enter the sudo password in the pkexec prompt$/ do
@@ -783,9 +785,9 @@ When /^I can print the current page as "([^"]+[.]pdf)" to the (default downloads
end
Given /^a web server is running on the LAN$/ do
- web_server_ip_addr = $vmnet.bridge_ip_addr
- web_server_port = 8000
- @web_server_url = "http://#{web_server_ip_addr}:#{web_server_port}"
+ @web_server_ip_addr = $vmnet.bridge_ip_addr
+ @web_server_port = 8000
+ @web_server_url = "http://#{@web_server_ip_addr}:#{@web_server_port}"
web_server_hello_msg = "Welcome to the LAN web server!"
# I've tested ruby Thread:s, fork(), etc. but nothing works due to
@@ -800,14 +802,15 @@ Given /^a web server is running on the LAN$/ do
require "webrick"
STDOUT.reopen("/dev/null", "w")
STDERR.reopen("/dev/null", "w")
- server = WEBrick::HTTPServer.new(:BindAddress => "#{web_server_ip_addr}",
- :Port => #{web_server_port},
+ server = WEBrick::HTTPServer.new(:BindAddress => "#{@web_server_ip_addr}",
+ :Port => #{@web_server_port},
:DocumentRoot => "/dev/null")
server.mount_proc("/") do |req, res|
res.body = "#{web_server_hello_msg}"
end
server.start
EOF
+ add_lan_host(@web_server_ip_addr, @web_server_port)
proc = IO.popen(['ruby', '-e', code])
try_for(10, :msg => "It seems the LAN web server failed to start") do
Process.kill(0, proc.pid) == 1
@@ -883,8 +886,7 @@ When /^AppArmor has (not )?denied "([^"]+)" from opening "([^"]+)"(?: after at m
end
Then /^I force Tor to use a new circuit$/ do
- debug_log("Forcing new Tor circuit...")
- $vm.execute_successfully('tor_control_send "signal NEWNYM"', :libs => 'tor')
+ force_new_tor_circuit
end
When /^I eject the boot medium$/ do
diff --git a/features/step_definitions/firewall_leaks.rb b/features/step_definitions/firewall_leaks.rb
index 942d00b..5d07a6e 100644
--- a/features/step_definitions/firewall_leaks.rb
+++ b/features/step_definitions/firewall_leaks.rb
@@ -1,29 +1,6 @@
-Then(/^the firewall leak detector has detected (.*?) leaks$/) do |type|
- leaks = FirewallLeakCheck.new(@sniffer.pcap_file,
- :accepted_hosts => get_all_tor_nodes)
- case type.downcase
- when 'ipv4 tcp'
- if leaks.ipv4_tcp_leaks.empty?
- leaks.save_pcap_file
- raise "Couldn't detect any IPv4 TCP leaks"
- end
- when 'ipv4 non-tcp'
- if leaks.ipv4_nontcp_leaks.empty?
- leaks.save_pcap_file
- raise "Couldn't detect any IPv4 non-TCP leaks"
- end
- when 'ipv6'
- if leaks.ipv6_leaks.empty?
- leaks.save_pcap_file
- raise "Couldn't detect any IPv6 leaks"
- end
- when 'non-ip'
- if leaks.nonip_leaks.empty?
- leaks.save_pcap_file
- raise "Couldn't detect any non-IP leaks"
- end
- else
- raise "Incorrect packet type '#{type}'"
+Then(/^the firewall leak detector has detected leaks$/) do
+ assert_raise(Test::Unit::AssertionFailedError) do
+ step 'all Internet traffic has only flowed through Tor'
end
end
diff --git a/features/step_definitions/icedove.rb b/features/step_definitions/icedove.rb
index d367289..dd3a0a0 100644
--- a/features/step_definitions/icedove.rb
+++ b/features/step_definitions/icedove.rb
@@ -82,13 +82,3 @@ When /^I open Torbirdy's preferences$/ do
@screen.wait('GnomeQuestionDialogIcon.png', 10)
@screen.type(Sikuli::Key.ENTER)
end
-
-When /^I test Torbirdy's proxy settings$/ do
- @screen.wait('IcedoveTorbirdyPreferencesWindow.png', 10)
- @screen.click('IcedoveTorbirdyTestProxySettingsButton.png')
- @screen.wait('IcedoveTorbirdyCongratulationsTab.png', 180)
-end
-
-Then /^Torbirdy's proxy test is successful$/ do
- @screen.wait('IcedoveTorbirdyCongratulationsTab.png', 180)
-end
diff --git a/features/step_definitions/mac_spoofing.rb b/features/step_definitions/mac_spoofing.rb
index a4aa871..0c10fb0 100644
--- a/features/step_definitions/mac_spoofing.rb
+++ b/features/step_definitions/mac_spoofing.rb
@@ -33,20 +33,8 @@ end
Then /^the real MAC address was (not )?leaked$/ do |mode|
is_leaking = mode.nil?
- leaks = FirewallLeakCheck.new(@sniffer.pcap_file)
- mac_leaks = leaks.mac_leaks
- if is_leaking
- if !mac_leaks.include?($vm.real_mac)
- save_pcap_file
- raise "The real MAC address was expected to leak but didn't. We " +
- "observed the following MAC addresses: #{mac_leaks}"
- end
- else
- if mac_leaks.include?($vm.real_mac)
- save_pcap_file
- raise "The real MAC address was leaked but was expected not to. We " +
- "observed the following MAC addresses: #{mac_leaks}"
- end
+ assert_all_connections(@sniffer.pcap_file) do |c|
+ [c.mac_saddr, c.mac_daddr].include?($vm.real_mac) == is_leaking
end
end
diff --git a/features/step_definitions/ssh.rb b/features/step_definitions/ssh.rb
index 038b297..64c6841 100644
--- a/features/step_definitions/ssh.rb
+++ b/features/step_definitions/ssh.rb
@@ -75,6 +75,7 @@ Given /^an SSH server is running on the LAN$/ do
@sshd_server_host = $vmnet.bridge_ip_addr
sshd = SSHServer.new(@sshd_server_host, @sshd_server_port)
sshd.start
+ add_lan_host(@sshd_server_host, @sshd_server_port)
add_after_scenario_hook { sshd.stop }
end
diff --git a/features/step_definitions/tor.rb b/features/step_definitions/tor.rb
index 8452866..babde27 100644
--- a/features/step_definitions/tor.rb
+++ b/features/step_definitions/tor.rb
@@ -337,35 +337,47 @@ When /^the Tor Launcher autostarts$/ do
end
When /^I configure some (\w+) pluggable transports in Tor Launcher$/ do |bridge_type|
- bridge_type.downcase!
- bridge_type.capitalize!
- begin
- @bridges = $config["Tor"]["Transports"][bridge_type]
- assert_not_nil(@bridges)
- assert(!@bridges.empty?)
- rescue NoMethodError, Test::Unit::AssertionFailedError
- raise(
-<<EOF
-It seems no '#{bridge_type}' pluggable transports are defined in your local configuration file (#{LOCAL_CONFIG_FILE}). See wiki/src/contribute/release_process/test/usage.mdwn for the format.
-EOF
-)
- end
- @bridge_hosts = []
- for bridge in @bridges do
- @bridge_hosts << bridge["ipv4_address"]
- end
-
@screen.wait_and_click('TorLauncherConfigureButton.png', 10)
@screen.wait('TorLauncherBridgePrompt.png', 10)
@screen.wait_and_click('TorLauncherYesRadioOption.png', 10)
@screen.wait_and_click('TorLauncherNextButton.png', 10)
@screen.wait_and_click('TorLauncherBridgeList.png', 10)
- for bridge in @bridges do
- bridge_line = bridge_type.downcase + " " +
- bridge["ipv4_address"] + ":" +
- bridge["ipv4_port"].to_s
- bridge_line += " " + bridge["fingerprint"].to_s if bridge["fingerprint"]
- bridge_line += " " + bridge["extra"].to_s if bridge["extra"]
+ @bridge_hosts = []
+ chutney_src_dir = "#{GIT_DIR}/submodules/chutney"
+ bridge_dirs = Dir.glob(
+ "#{$config['TMPDIR']}/chutney-data/nodes/*#{bridge_type}/"
+ )
+ bridge_dirs.each do |bridge_dir|
+ address = $vmnet.bridge_ip_addr
+ port = nil
+ fingerprint = nil
+ extra = nil
+ if bridge_type == 'bridge'
+ open(bridge_dir + "/torrc") do |f|
+ port = f.grep(/^OrPort\b/).first.split.last
+ end
+ else
+ # This is the pluggable transport case. While we could set a
+ # static port via ServerTransportListenAddr we instead let it be
+ # picked randomly so an already used port is not picked --
+ # Chutney already has issues with that for OrPort selection.
+ pt_re = /Registered server transport '#{bridge_type}' at '[^']*:(\d+)'/
+ open(bridge_dir + "/notice.log") do |f|
+ pt_lines = f.grep(pt_re)
+ port = pt_lines.last.match(pt_re)[1]
+ end
+ if bridge_type == 'obfs4'
+ open(bridge_dir + "/pt_state/obfs4_bridgeline.txt") do |f|
+ extra = f.readlines.last.chomp.sub(/^.* cert=/, 'cert=')
+ end
+ end
+ end
+ open(bridge_dir + "/fingerprint") do |f|
+ fingerprint = f.read.chomp.split.last
+ end
+ @bridge_hosts << { address: address, port: port.to_i }
+ bridge_line = bridge_type + " " + address + ":" + port
+ [fingerprint, extra].each { |e| bridge_line += " " + e.to_s if e }
@screen.type(bridge_line + Sikuli::Key.ENTER)
end
@screen.wait_and_click('TorLauncherNextButton.png', 10)
@@ -378,9 +390,9 @@ end
When /^all Internet traffic has only flowed through the configured pluggable transports$/ do
assert_not_nil(@bridge_hosts, "No bridges has been configured via the " +
"'I configure some ... bridges in Tor Launcher' step")
- leaks = FirewallLeakCheck.new(@sniffer.pcap_file,
- :accepted_hosts => @bridge_hosts)
- leaks.assert_no_leaks
+ assert_all_connections(@sniffer.pcap_file) do |c|
+ @bridge_hosts.include?({ address: c.daddr, port: c.dport })
+ end
end
Then /^the Tor binary is configured to use the expected Tor authorities$/ do
diff --git a/features/step_definitions/torified_browsing.rb b/features/step_definitions/torified_browsing.rb
index c8f3ff1..7676078 100644
--- a/features/step_definitions/torified_browsing.rb
+++ b/features/step_definitions/torified_browsing.rb
@@ -1,5 +1,5 @@
-When /^no traffic has flowed to the LAN$/ do
- leaks = FirewallLeakCheck.new(@sniffer.pcap_file, :ignore_lan => false)
- assert(not(leaks.ipv4_tcp_leaks.include?(@lan_host)),
- "Traffic was sent to LAN host #{@lan_host}")
+Then /^no traffic was sent to the web server on the LAN$/ do
+ assert_no_connections(@sniffer.pcap_file) do |c|
+ c.daddr == @web_server_ip_addr and c.dport == @web_server_port
+ end
end
diff --git a/features/step_definitions/unsafe_browser.rb b/features/step_definitions/unsafe_browser.rb
index b8c0498..c2860dd 100644
--- a/features/step_definitions/unsafe_browser.rb
+++ b/features/step_definitions/unsafe_browser.rb
@@ -140,9 +140,9 @@ Then /^I cannot configure the Unsafe Browser to use any local proxies$/ do
@screen.waitVanish('UnsafeBrowserProxySettingsWindow.png', 10)
# Test that the proxy settings work as they should
- step "I open the address \"https://check.torproject.org\" in the Unsafe Browser"
+ step 'I open Tails homepage in the Unsafe Browser'
if proxy_type == no_proxy
- @screen.wait('UnsafeBrowserTorCheckFail.png', 60)
+ step 'Tails homepage loads in the Unsafe Browser'
else
@screen.wait('UnsafeBrowserProxyRefused.png', 60)
end
diff --git a/features/support/helpers/firewall_helper.rb b/features/support/helpers/firewall_helper.rb
index fce363c..ed2a09b 100644
--- a/features/support/helpers/firewall_helper.rb
+++ b/features/support/helpers/firewall_helper.rb
@@ -1,121 +1,74 @@
require 'packetfu'
-require 'ipaddr'
-# Extent IPAddr with a private/public address space checks
-class IPAddr
- PrivateIPv4Ranges = [
- IPAddr.new("10.0.0.0/8"),
- IPAddr.new("172.16.0.0/12"),
- IPAddr.new("192.168.0.0/16"),
- IPAddr.new("255.255.255.255/32")
- ]
-
- PrivateIPv6Ranges = [
- IPAddr.new("fc00::/7")
- ]
-
- def private?
- private_ranges = self.ipv4? ? PrivateIPv4Ranges : PrivateIPv6Ranges
- private_ranges.any? { |range| range.include?(self) }
- end
-
- def public?
- !private?
- end
-end
-
-class FirewallLeakCheck
- attr_reader :ipv4_tcp_leaks, :ipv4_nontcp_leaks, :ipv6_leaks, :nonip_leaks, :mac_leaks
-
- def initialize(pcap_file, options = {})
- options[:accepted_hosts] ||= []
- options[:ignore_lan] ||= true
- @pcap_file = pcap_file
- packets = PacketFu::PcapFile.new.file_to_array(:filename => @pcap_file)
- mac_leaks = Set.new
- ipv4_tcp_packets = []
- ipv4_nontcp_packets = []
- ipv6_packets = []
- nonip_packets = []
- packets.each do |p|
- if PacketFu::EthPacket.can_parse?(p)
- packet = PacketFu::EthPacket.parse(p)
- mac_leaks << packet.eth_saddr
- mac_leaks << packet.eth_daddr
- end
-
- if PacketFu::TCPPacket.can_parse?(p)
- ipv4_tcp_packets << PacketFu::TCPPacket.parse(p)
- elsif PacketFu::IPPacket.can_parse?(p)
- ipv4_nontcp_packets << PacketFu::IPPacket.parse(p)
- elsif PacketFu::IPv6Packet.can_parse?(p)
- ipv6_packets << PacketFu::IPv6Packet.parse(p)
- elsif PacketFu::Packet.can_parse?(p)
- nonip_packets << PacketFu::Packet.parse(p)
- else
- save_pcap_file
- raise "Found something in the pcap file that cannot be parsed"
- end
+# Returns the unique edges (based on protocol, source/destination
+# address/port) in the graph of all network flows.
+def pcap_connections_helper(pcap_file, opts = {})
+ opts[:ignore_dhcp] ||= true
+ connections = Array.new
+ packets = PacketFu::PcapFile.new.file_to_array(:filename => pcap_file)
+ packets.each do |p|
+ if PacketFu::EthPacket.can_parse?(p)
+ eth_packet = PacketFu::EthPacket.parse(p)
+ else
+ raise 'Found something that is not an ethernet packet'
end
- ipv4_tcp_hosts = filter_hosts_from_ippackets(ipv4_tcp_packets,
- options[:ignore_lan])
- accepted = Set.new(options[:accepted_hosts])
- @mac_leaks = mac_leaks
- @ipv4_tcp_leaks = ipv4_tcp_hosts.select { |host| !accepted.member?(host) }
- @ipv4_nontcp_leaks = filter_hosts_from_ippackets(ipv4_nontcp_packets,
- options[:ignore_lan])
- @ipv6_leaks = filter_hosts_from_ippackets(ipv6_packets,
- options[:ignore_lan])
- @nonip_leaks = nonip_packets
- end
-
- def save_pcap_file
- save_failure_artifact("Network capture", @pcap_file)
- end
-
- # Returns a list of all unique destination IP addresses found in
- # `packets`. Exclude LAN hosts if ignore_lan is set.
- def filter_hosts_from_ippackets(packets, ignore_lan)
- hosts = []
- packets.each do |p|
- candidate = nil
- if p.kind_of?(PacketFu::IPPacket)
- candidate = p.ip_daddr
- elsif p.kind_of?(PacketFu::IPv6Packet)
- candidate = p.ipv6_header.ipv6_daddr
- else
- save_pcap_file
- raise "Expected an IP{v4,v6} packet, but got something else:\n" +
- p.peek_format
- end
- if candidate != nil and (not(ignore_lan) or IPAddr.new(candidate).public?)
- hosts << candidate
- end
+ sport = nil
+ dport = nil
+ if PacketFu::TCPPacket.can_parse?(p)
+ ip_packet = PacketFu::TCPPacket.parse(p)
+ protocol = 'tcp'
+ sport = ip_packet.tcp_sport
+ dport = ip_packet.tcp_dport
+ elsif PacketFu::UDPPacket.can_parse?(p)
+ ip_packet = PacketFu::UDPPacket.parse(p)
+ protocol = 'udp'
+ sport = ip_packet.udp_sport
+ dport = ip_packet.udp_dport
+ elsif PacketFu::ICMPPacket.can_parse?(p)
+ ip_packet = PacketFu::ICMPPacket.parse(p)
+ protocol = 'icmp'
+ elsif PacketFu::IPPacket.can_parse?(p)
+ ip_packet = PacketFu::IPPacket.parse(p)
+ protocol = 'ip'
+ elsif PacketFu::IPv6Packet.can_parse?(p)
+ ip_packet = PacketFu::IPv6Packet.parse(p)
+ protocol = 'ipv6'
+ else
+ raise "Found something that cannot be parsed"
end
- hosts.uniq
- end
- def assert_no_leaks
- err = ""
- if !@ipv4_tcp_leaks.empty?
- err += "The following IPv4 TCP non-Tor Internet hosts were " +
- "contacted:\n" + ipv4_tcp_leaks.join("\n")
- end
- if !@ipv4_nontcp_leaks.empty?
- err += "The following IPv4 non-TCP Internet hosts were contacted:\n" +
- ipv4_nontcp_leaks.join("\n")
- end
- if !@ipv6_leaks.empty?
- err += "The following IPv6 Internet hosts were contacted:\n" +
- ipv6_leaks.join("\n")
- end
- if !@nonip_leaks.empty?
- err += "Some non-IP packets were sent\n"
- end
- if !err.empty?
- save_pcap_file
- raise err
+ if protocol == "udp" and
+ sport == 68 and
+ dport == 67 and
+ ip_packet.ip_saddr == '0.0.0.0' and
+ ip_packet.ip_daddr == "255.255.255.255"
+ next if opts[:ignore_dhcp]
end
+
+ connections << {
+ mac_saddr: eth_packet.eth_saddr,
+ mac_daddr: eth_packet.eth_daddr,
+ protocol: protocol,
+ saddr: ip_packet.ip_saddr,
+ daddr: ip_packet.ip_daddr,
+ sport: sport,
+ dport: dport,
+ }
end
+ connections.uniq.map { |p| OpenStruct.new(p) }
+end
+
+# These assertions are made from the perspective of the system under
+# testing when it comes to the concepts of "source" and "destination".
+def assert_all_connections(pcap_file, opts = {}, &block)
+ all = pcap_connections_helper(pcap_file, opts)
+ good = all.find_all(&block)
+ bad = all - good
+ save_failure_artifact("Network capture", pcap_file) unless bad.empty?
+ assert(bad.empty?, "Unexpected connections were made:\n" +
+ bad.map { |e| " #{e}" } .join("\n"))
+end
+def assert_no_connections(pcap_file, opts = {}, &block)
+ assert_all_connections(pcap_file, opts) { |*args| not(block.call(*args)) }
end
diff --git a/features/support/helpers/misc_helpers.rb b/features/support/helpers/misc_helpers.rb
index 7e09411..8f4bcd8 100644
--- a/features/support/helpers/misc_helpers.rb
+++ b/features/support/helpers/misc_helpers.rb
@@ -89,6 +89,11 @@ end
class MaxRetriesFailure < StandardError
end
+def force_new_tor_circuit()
+ debug_log("Forcing new Tor circuit...")
+ $vm.execute_successfully('tor_control_send "signal NEWNYM"', :libs => 'tor')
+end
+
# This will retry the block up to MAX_NEW_TOR_CIRCUIT_RETRIES
# times. The block must raise an exception for a run to be considered
# as a failure. After a failure recovery_proc will be called (if
@@ -177,13 +182,14 @@ def convert_from_bytes(size, unit)
return size.to_f/convert_bytes_mod(unit).to_f
end
-def cmd_helper(cmd)
+def cmd_helper(cmd, env = {})
if cmd.instance_of?(Array)
cmd << {:err => [:child, :out]}
elsif cmd.instance_of?(String)
cmd += " 2>&1"
end
- IO.popen(cmd) do |p|
+ env = ENV.to_h.merge(env)
+ IO.popen(env, cmd) do |p|
out = p.readlines.join("\n")
p.close
ret = $?
@@ -192,11 +198,23 @@ def cmd_helper(cmd)
end
end
-# This command will grab all router IP addresses from the Tor
-# consensus in the VM + the hardcoded TOR_AUTHORITIES.
-def get_all_tor_nodes
- cmd = 'awk "/^r/ { print \$6 }" /var/lib/tor/cached-microdesc-consensus'
- $vm.execute(cmd).stdout.chomp.split("\n") + TOR_AUTHORITIES
+def all_tor_hosts
+ nodes = Array.new
+ chutney_torrcs = Dir.glob(
+ "#{$config['TMPDIR']}/chutney-data/nodes/*/torrc"
+ )
+ chutney_torrcs.each do |torrc|
+ open(torrc) do |f|
+ nodes += f.grep(/^(Or|Dir)Port\b/).map do |line|
+ { address: $vmnet.bridge_ip_addr, port: line.split.last.to_i }
+ end
+ end
+ end
+ return nodes
+end
+
+def allowed_hosts_under_tor_enforcement
+ all_tor_hosts + @lan_hosts
end
def get_free_space(machine, path)
diff --git a/features/support/helpers/sniffing_helper.rb b/features/support/helpers/sniffing_helper.rb
index 213411e..38b1382 100644
--- a/features/support/helpers/sniffing_helper.rb
+++ b/features/support/helpers/sniffing_helper.rb
@@ -22,8 +22,18 @@ class Sniffer
end
def capture(filter="not ether src host #{@vmnet.bridge_mac} and not ether proto \\arp and not ether proto \\rarp")
- job = IO.popen(["/usr/sbin/tcpdump", "-n", "-i", @vmnet.bridge_name, "-w",
- @pcap_file, "-U", filter, :err => ["/dev/null", "w"]])
+ job = IO.popen(
+ [
+ "/usr/sbin/tcpdump",
+ "-n",
+ "-U",
+ "--immediate-mode",
+ "-i", @vmnet.bridge_name,
+ "-w", @pcap_file,
+ filter,
+ :err => ["/dev/null", "w"]
+ ]
+ )
@pid = job.pid
end
diff --git a/features/support/helpers/vm_helper.rb b/features/support/helpers/vm_helper.rb
index 9566661..72448f3 100644
--- a/features/support/helpers/vm_helper.rb
+++ b/features/support/helpers/vm_helper.rb
@@ -1,3 +1,4 @@
+require 'ipaddr'
require 'libvirt'
require 'rexml/document'
diff --git a/features/support/hooks.rb b/features/support/hooks.rb
index be8a023..6589d9b 100644
--- a/features/support/hooks.rb
+++ b/features/support/hooks.rb
@@ -127,6 +127,21 @@ def save_failure_artifact(type, path)
$failure_artifacts << [type, path]
end
+# Due to Tails' Tor enforcement, we only allow contacting hosts that
+# are Tor (or I2P) nodes or located on the LAN. However, when we try
+# to verify that only such hosts are contacted we have a problem --
+# we run all Tor nodes (via Chutney) *and* LAN hosts (used on some
+# tests) on the same host, the one running the test suite. Hence we
+# need to always explicitly track which nodes are LAN or not.
+#
+# Warning: when a host is added via this function, it is only added
+# for the current scenario. As such, if this is done before saving a
+# snapshot, it will not remain after the snapshot is loaded.
+def add_lan_host(ipaddr, port)
+ @lan_hosts ||= []
+ @lan_hosts << { address: ipaddr, port: port }
+end
+
BeforeFeature('@product') do |feature|
if TAILS_ISO.nil?
raise "No Tails ISO image specified, and none could be found in the " +
@@ -159,6 +174,7 @@ BeforeFeature('@product') do |feature|
$vmstorage = VMStorage.new($virt, VM_XML_PATH)
$started_first_product_feature = true
end
+ ensure_chutney_is_running
end
AfterFeature('@product') do
@@ -198,6 +214,8 @@ Before('@product') do |scenario|
@os_loader = "MBR"
@sudo_password = "asdf"
@persistence_password = "asdf"
+ # See comment for add_lan_host() above.
+ @lan_hosts ||= []
end
# Cucumber After hooks are executed in the *reverse* order they are
@@ -252,14 +270,10 @@ end
After('@product', '@check_tor_leaks') do |scenario|
@tor_leaks_sniffer.stop
if scenario.passed?
- if @bridge_hosts.nil?
- expected_tor_nodes = get_all_tor_nodes
- else
- expected_tor_nodes = @bridge_hosts
+ allowed_nodes = @bridge_hosts ? @bridge_hosts : allowed_hosts_under_tor_enforcement
+ assert_all_connections(@tor_leaks_sniffer.pcap_file) do |c|
+ allowed_nodes.include?({ address: c.daddr, port: c.dport })
end
- leaks = FirewallLeakCheck.new(@tor_leaks_sniffer.pcap_file,
- :accepted_hosts => expected_tor_nodes)
- leaks.assert_no_leaks
end
end
diff --git a/features/time_syncing.feature b/features/time_syncing.feature
index 69a0c9e..cc75f3a 100644
--- a/features/time_syncing.feature
+++ b/features/time_syncing.feature
@@ -18,95 +18,11 @@ Feature: Time syncing
Given I have started Tails from DVD without network and logged in with bridge mode enabled
When the network is plugged
And the Tor Launcher autostarts
- And I configure some Bridge pluggable transports in Tor Launcher
+ And I configure some bridge pluggable transports in Tor Launcher
And Tor is ready
Then Tails clock is less than 5 minutes incorrect
- #10497: wait_until_tor_is_working
- @fragile
- Scenario: Clock is one day in the past
- Given I have started Tails from DVD without network and logged in
- When I bump the system time with "-1 day"
- And the network is plugged
- And Tor is ready
- Then Tails clock is less than 5 minutes incorrect
-
- #10497: wait_until_tor_is_working
- @fragile
- Scenario: Clock is one day in the past in bridge mode
- Given I have started Tails from DVD without network and logged in with bridge mode enabled
- When I bump the system time with "-1 day"
- And the network is plugged
- And the Tor Launcher autostarts
- And I configure some Bridge pluggable transports in Tor Launcher
- And Tor is ready
- Then Tails clock is less than 5 minutes incorrect
-
- #10497: wait_until_tor_is_working
- @fragile
- Scenario: Clock is way in the past
- Given I have started Tails from DVD without network and logged in
- # 13 weeks will span over two Tails release cycles.
- When I bump the system time with "-13 weeks"
- And the network is plugged
- And Tor is ready
- Then Tails clock is less than 5 minutes incorrect
-
- #10497: wait_until_tor_is_working
- @fragile
- Scenario: Clock way in the past in bridge mode
- Given I have started Tails from DVD without network and logged in with bridge mode enabled
- When I bump the system time with "-6 weeks"
- And the network is plugged
- And the Tor Launcher autostarts
- And I configure some Bridge pluggable transports in Tor Launcher
- And Tor is ready
- Then Tails clock is less than 5 minutes incorrect
-
- #10497: wait_until_tor_is_working
- #10440: Time syncing tests are fragile
- @fragile
- Scenario: Clock is one day in the future
- Given I have started Tails from DVD without network and logged in
- When I bump the system time with "+1 day"
- And the network is plugged
- And Tor is ready
- Then Tails clock is less than 5 minutes incorrect
-
- #10497: wait_until_tor_is_working
- @fragile
- Scenario: Clock is one day in the future in bridge mode
- Given I have started Tails from DVD without network and logged in with bridge mode enabled
- When I bump the system time with "+1 day"
- And the network is plugged
- And the Tor Launcher autostarts
- And I configure some Bridge pluggable transports in Tor Launcher
- And Tor is ready
- Then Tails clock is less than 5 minutes incorrect
-
- #10497: wait_until_tor_is_working
- #10440: Time syncing tests are fragile
- @fragile
- Scenario: Clock way in the future
- Given I have started Tails from DVD without network and logged in
- When I set the system time to "01 Jan 2020 12:34:56"
- And the network is plugged
- And Tor is ready
- Then Tails clock is less than 5 minutes incorrect
-
- #10497: wait_until_tor_is_working
- #10440: Time syncing tests are fragile
- @fragile
- Scenario: Clock way in the future in bridge mode
- Given I have started Tails from DVD without network and logged in with bridge mode enabled
- When I set the system time to "01 Jan 2020 12:34:56"
- And the network is plugged
- And the Tor Launcher autostarts
- And I configure some Bridge pluggable transports in Tor Launcher
- And Tor is ready
- Then Tails clock is less than 5 minutes incorrect
-
-Scenario: The system time is not synced to the hardware clock
+ Scenario: The system time is not synced to the hardware clock
Given I have started Tails from DVD without network and logged in
When I bump the system time with "-15 days"
And I warm reboot the computer
diff --git a/features/tor_bridges.feature b/features/tor_bridges.feature
index b5277ca..463714f 100644
--- a/features/tor_bridges.feature
+++ b/features/tor_bridges.feature
@@ -12,19 +12,7 @@ Feature: Using Tails with Tor pluggable transports
And the Tor Launcher uses all expected TBB shared libraries
Scenario: Using bridges
- When I configure some Bridge pluggable transports in Tor Launcher
- Then Tor is ready
- And available upgrades have been checked
- And all Internet traffic has only flowed through the configured pluggable transports
-
- Scenario: Using obfs2 pluggable transports
- When I configure some obfs2 pluggable transports in Tor Launcher
- Then Tor is ready
- And available upgrades have been checked
- And all Internet traffic has only flowed through the configured pluggable transports
-
- Scenario: Using obfs3 pluggable transports
- When I configure some obfs3 pluggable transports in Tor Launcher
+ When I configure some bridge pluggable transports in Tor Launcher
Then Tor is ready
And available upgrades have been checked
And all Internet traffic has only flowed through the configured pluggable transports
diff --git a/features/tor_enforcement.feature b/features/tor_enforcement.feature
index 164220a..82def31 100644
--- a/features/tor_enforcement.feature
+++ b/features/tor_enforcement.feature
@@ -18,34 +18,34 @@ Feature: The Tor enforcement is effective
And the firewall is configured to block all external IPv6 traffic
@fragile
- Scenario: Anti test: Detecting IPv4 TCP leaks from the Unsafe Browser with the firewall leak detector
+ Scenario: Anti test: Detecting TCP leaks from the Unsafe Browser with the firewall leak detector
Given I have started Tails from DVD and logged in and the network is connected
And I capture all network traffic
When I successfully start the Unsafe Browser
- And I open the address "https://check.torproject.org" in the Unsafe Browser
- And I see "UnsafeBrowserTorCheckFail.png" after at most 60 seconds
- Then the firewall leak detector has detected IPv4 TCP leaks
+ And I open Tails homepage in the Unsafe Browser
+ And Tails homepage loads in the Unsafe Browser
+ Then the firewall leak detector has detected leaks
- Scenario: Anti test: Detecting IPv4 TCP leaks of TCP DNS lookups with the firewall leak detector
+ Scenario: Anti test: Detecting TCP leaks of DNS lookups with the firewall leak detector
Given I have started Tails from DVD and logged in and the network is connected
And I capture all network traffic
And I disable Tails' firewall
When I do a TCP DNS lookup of "torproject.org"
- Then the firewall leak detector has detected IPv4 TCP leaks
+ Then the firewall leak detector has detected leaks
- Scenario: Anti test: Detecting IPv4 non-TCP leaks (UDP) of UDP DNS lookups with the firewall leak detector
+ Scenario: Anti test: Detecting UDP leaks of DNS lookups with the firewall leak detector
Given I have started Tails from DVD and logged in and the network is connected
And I capture all network traffic
And I disable Tails' firewall
When I do a UDP DNS lookup of "torproject.org"
- Then the firewall leak detector has detected IPv4 non-TCP leaks
+ Then the firewall leak detector has detected leaks
- Scenario: Anti test: Detecting IPv4 non-TCP (ICMP) leaks of ping with the firewall leak detector
+ Scenario: Anti test: Detecting ICMP leaks of ping with the firewall leak detector
Given I have started Tails from DVD and logged in and the network is connected
And I capture all network traffic
And I disable Tails' firewall
When I send some ICMP pings
- Then the firewall leak detector has detected IPv4 non-TCP leaks
+ Then the firewall leak detector has detected leaks
@check_tor_leaks
Scenario: The Tor enforcement is effective at blocking untorified TCP connection attempts
diff --git a/features/torified_browsing.feature b/features/torified_browsing.feature
index 41dc250..55abf72 100644
--- a/features/torified_browsing.feature
+++ b/features/torified_browsing.feature
@@ -14,7 +14,7 @@ Feature: Browsing the web using the Tor Browser
And the Tor Browser has started and loaded the startup page
And I open a page on the LAN web server in the Tor Browser
Then I see "TorBrowserUnableToConnect.png" after at most 20 seconds
- And no traffic has flowed to the LAN
+ And no traffic was sent to the web server on the LAN
@check_tor_leaks
Scenario: The Tor Browser directory is usable
@@ -110,20 +110,12 @@ Feature: Browsing the web using the Tor Browser
Then the Tor Browser uses all expected TBB shared libraries
@check_tor_leaks @fragile
- Scenario: Opening check.torproject.org in the Tor Browser shows the green onion and the congratulations message
- Given I have started Tails from DVD and logged in and the network is connected
- When I start the Tor Browser
- And the Tor Browser has started and loaded the startup page
- And I open the address "https://check.torproject.org" in the Tor Browser
- Then I see "TorBrowserTorCheck.png" after at most 180 seconds
-
- @check_tor_leaks @fragile
Scenario: The Tor Browser's "New identity" feature works as expected
Given I have started Tails from DVD and logged in and the network is connected
When I start the Tor Browser
And the Tor Browser has started and loaded the startup page
- And I open the address "https://check.torproject.org" in the Tor Browser
- Then I see "TorBrowserTorCheck.png" after at most 180 seconds
+ And I open Tails homepage in the Tor Browser
+ Then Tails homepage loads in the Tor Browser
When I request a new identity using Torbutton
And I acknowledge Torbutton's New Identity confirmation prompt
Then the Tor Browser loads the startup page
diff --git a/features/unsafe_browser.feature b/features/unsafe_browser.feature
index d47f770..9c8a101 100644
--- a/features/unsafe_browser.feature
+++ b/features/unsafe_browser.feature
@@ -41,14 +41,6 @@ Feature: Browsing the web using the Unsafe Browser
Then I see a warning about another instance already running
@fragile
- Scenario: Opening check.torproject.org in the Unsafe Browser shows the red onion and a warning message.
- Given I have started Tails from DVD and logged in and the network is connected
- When I successfully start the Unsafe Browser
- And I open the address "https://check.torproject.org" in the Unsafe Browser
- Then I see "UnsafeBrowserTorCheckFail.png" after at most 60 seconds
- And the clearnet user has sent packets out to the Internet
-
- @fragile
Scenario: The Unsafe Browser cannot be configured to use Tor and other local proxies.
Given I have started Tails from DVD and logged in and the network is connected
When I successfully start the Unsafe Browser
diff --git a/ikiwiki-cgi.setup b/ikiwiki-cgi.setup
index 21b5d0a..c787118 100644
--- a/ikiwiki-cgi.setup
+++ b/ikiwiki-cgi.setup
@@ -230,7 +230,7 @@ po_slave_languages:
# On each release `n` of Tails 3.0, 4.0, etc. this list should be
# updated to disable translations of news/version_*, news/test_*, and
# security/Numerous_security_holes_in_* for release `n-2`.
-# Also update ikiwiki.setup, news.mdwn, and security.mdwn.
+# Also update ikiwiki.setup, index.html, news.mdwn, and security.mdwn.
po_translatable_pages: '!security/audits and !security/audits/* and !news/report_2* and !news/version_0* and !news/test_0* and !security/Numerous_security_holes_in_0* and (about or bugs or chat or contribute or contribute/how/donate or doc or doc/* or download or download.inline or getting_started or inc/stable_i386_release_notes or index or news or news/* or press or press/* or security or security/* or sidebar or support or support/* or todo or torrents or wishlist 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 cec94a0..143601e 100644
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -207,7 +207,7 @@ po_slave_languages:
# On each release `n` of Tails 3.0, 4.0, etc. this list should be
# updated to disable translations of news/version_*, news/test_*, and
# security/Numerous_security_holes_in_* for release `n-2`.
-# Also update ikiwiki-cgi.setup, news.mdwn, and security.mdwn.
+# Also update ikiwiki-cgi.setup, index.html, news.mdwn, and security.mdwn.
po_translatable_pages: '!security/audits and !security/audits/* and !news/report_2* and !news/version_0* and !news/test_0* and !security/Numerous_security_holes_in_0* and (about or bugs or chat or contribute or contribute/how/donate or doc or doc/* or download or download.inline or getting_started or inc/stable_i386_release_notes or index or news or news/* or press or press/* or security or security/* or sidebar or support or support/* or todo or torrents or wishlist 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/run_test_suite b/run_test_suite
index d753dab..33d9a20 100755
--- a/run_test_suite
+++ b/run_test_suite
@@ -20,6 +20,7 @@ libvirt-clients
libvirt-daemon-system
libvirt-dev
libvirt0
+obfs4proxy
openssh-server
ovmf
python-jabberbot
@@ -37,6 +38,7 @@ ruby-rspec
ruby-test-unit
seabios
tcpdump
+tor
unclutter
virt-viewer
xvfb
diff --git a/submodules/chutney b/submodules/chutney
new file mode 160000
+Subproject cd708d3003bc57cdc6ee06d18cfde75721a103b
diff --git a/vagrant/provision/assets/build-tails b/vagrant/provision/assets/build-tails
index c1471a5..a414a2f 100755
--- a/vagrant/provision/assets/build-tails
+++ b/vagrant/provision/assets/build-tails
@@ -84,6 +84,7 @@ fi
cd "$WORKSPACE"
git checkout --force "$REV"
git reset --hard "$COMMIT"
+git submodule update --init
if [ -n "$JENKINS_URL" ]; then
git clean --force -d -x
diff --git a/wiki/src/.htaccess b/wiki/src/.htaccess
index b32c2ea..de1f6b5 100644
--- a/wiki/src/.htaccess
+++ b/wiki/src/.htaccess
@@ -1,6 +1,6 @@
RewriteEngine on
RewriteBase /
-RewriteRule ^bug_reporting doc/first_steps/report_a_bug [R]
+RewriteRule ^bug_reporting doc/first_steps/bug_reporting [R]
RewriteRule ^build contribute/build [R]
RewriteRule ^bugs/FireGPG_may_be_unsafe doc/encryption_and_privacy/FireGPG_susceptible_to_devastating_attacks [R]
RewriteRule ^chat support/chat [R]
@@ -10,19 +10,19 @@ RewriteRule ^found_a_problem support/found_a_problem [R]
RewriteRule ^git contribute/git [R]
RewriteRule ^GnuPG_key doc/about/openpgp_keys [R]
RewriteRule ^license doc/about/license [R]
-RewriteRule ^talk-dev contribute/talk [R]
+RewriteRule ^talk-dev about/contact#tails-dev [R,NE]
RewriteRule ^talk-users support/talk [R]
RewriteRule ^customize contribute/customize [R]
RewriteRule ^support/truecrypt doc/encryption_and_privacy/truecrypt [R]
RewriteRule ^support/virtualization doc/advanced_topics/virtualization [R]
RewriteRule ^support/walkthrough doc [R]
RewriteRule ^doc/anonymous_internet/iceweasel doc/anonymous_internet/Tor_Browser [R]
-RewriteRule ^doc/installing_onto_a_usb_stick/linux doc/first_steps/manual_usb_installation/linux [R]
-RewriteRule ^doc/installing_onto_a_usb_stick/windows doc/first_steps/manual_usb_installation/windows [R]
-RewriteRule ^doc/installing_onto_a_usb_stick/mac doc/first_steps/manual_usb_installation/mac [R]
+RewriteRule ^doc/installing_onto_a_usb_stick/linux install/linux/usb/overview [R]
+RewriteRule ^doc/installing_onto_a_usb_stick/windows install/win/usb/overview [R]
+RewriteRule ^doc/installing_onto_a_usb_stick/mac install/mac/usb/overview [R]
RewriteRule ^doc/first_steps/bridge_mode doc/first_steps/startup_options/bridge_mode [R]
RewriteRule ^doc/first_steps/windows_theme doc/first_steps/startup_options/windows_camouflage [R]
-RewriteRule ^doc/trusting_tails_signing_key doc/get/trusting_tails_signing_key [R]
+RewriteRule ^doc/trusting_tails_signing_key install/download/openpgp#wot [R,NE]
RewriteRule ^doc/first_steps/report_a_bug doc/first_steps/bug_reporting [R]
RewriteRule ^doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitely_asked doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked [R]
RewriteRule ^doc/encryption_and_privacy/openpgp_passphrase_encryption doc/encryption_and_privacy/gpgapplet/passphrase_encryption [R]
@@ -34,10 +34,10 @@ RewriteRule ^doc/first_steps/usb_reset doc/first_steps/reset [R]
RewriteRule ^doc/first_steps/usb_reset/linux doc/first_steps/reset/linux [R]
RewriteRule ^doc/first_steps/usb_reset/windows doc/first_steps/reset/windows [R]
RewriteRule ^doc/first_steps/usb_upgrade doc/first_steps/upgrade [R]
-RewriteRule ^doc/first_steps/manual_usb_installation doc/first_steps/installation/manual [R]
-RewriteRule ^doc/first_steps/manual_usb_installation/linux doc/first_steps/installation/manual/linux [R]
-RewriteRule ^doc/first_steps/manual_usb_installation/windows doc/first_steps/installation/manual/windows [R]
-RewriteRule ^doc/first_steps/manual_usb_installation/mac doc/first_steps/installation/manual/mac [R]
+RewriteRule ^doc/first_steps/manual_usb_installation install [R]
+RewriteRule ^doc/first_steps/manual_usb_installation/linux install/linux/usb/overview [R]
+RewriteRule ^doc/first_steps/manual_usb_installation/windows install/win/usb/overview [R]
+RewriteRule ^doc/first_steps/manual_usb_installation/mac install/mac/usb/overview [R]
RewriteRule ^contribute/design/usb_installation contribute/design/installation [R]
RewriteRule ^doc/sensitive_documents/audio doc/sensitive_documents/sound_and_video [R]
RewriteRule ^blueprint/tails-greeter:_revamp_UI blueprint/greeter_revamp_UI [R]
@@ -46,6 +46,17 @@ RewriteRule ^blueprint/Persistence:_add_iceweasel_client_certificates_preset blu
RewriteRule ^news/Call_for_help:_improve_the_infrastructure_behind_Tails news/improve_the_infrastructure_behind_Tails [R]
RewriteRule ^promote/(.*) contribute/how/promote/material/$1 [R]
RewriteRule ^download install [R]
+RewriteRule ^doc/first_steps/dvd install/dvd [R]
+RewriteRule ^doc/first_steps/installation install [R]
+RewriteRule ^doc/first_steps/installation/manual install [R]
+RewriteRule ^doc/first_steps/installation/manual/linux install/linux/usb/overview [R]
+RewriteRule ^doc/first_steps/installation/manual/mac install/mac/usb/overview [R]
+RewriteRule ^doc/first_steps/installation/manual/windows install/win/usb/overview [R]
+RewriteRule ^doc/get/trusting_tails_signing_key install/download/openpgp#wot [R,NE]
+RewriteRule ^doc/get/verify_the_iso_image_using_gnome install/download/openpgp [R]
+RewriteRule ^doc/get/verify_the_iso_image_using_other_operating_systems install/download/openpgp [R]
+RewriteRule ^doc/get/verify_the_iso_image_using_the_command_line install/download/openpgp [R]
+RewriteRule ^doc/first_steps/bug_reporting/tails_does_not_start doc/first_steps/bug_reporting#does_not_start [R,NE]
# Legacy tickets URLs
RewriteRule ^todo/custom_plymouth_theme https://labs.riseup.net/code/issues/5948 [R]
diff --git a/wiki/src/about.de.po b/wiki/src/about.de.po
index a574fc9..faee635 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: 2016-03-21 18:14+0100\n"
+"POT-Creation-Date: 2016-04-29 13:53+0000\n"
"PO-Revision-Date: 2016-03-14 13:51-0000\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: Tails translators <tails-l10n@boum.org>\n"
@@ -410,6 +410,11 @@ msgstr ""
"Tails enthalten sind,"
#. type: Bullet: ' - '
+msgid ""
+"our [[installation instructions|install]] to download and install Tails,"
+msgstr ""
+
+#. type: Bullet: ' - '
msgid "our [[documentation|doc]] explaining in detail how to use Tails,"
msgstr ""
"unsere [[Dokumentation|doc]], die die Benutzung von Tails im Detail erklärt,"
diff --git a/wiki/src/about.fa.po b/wiki/src/about.fa.po
index 180c629..87bb423 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: 2016-03-21 18:14+0100\n"
+"POT-Creation-Date: 2016-04-29 13:53+0000\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/"
@@ -441,6 +441,11 @@ msgstr ""
"تیلز"
#. type: Bullet: ' - '
+msgid ""
+"our [[installation instructions|install]] to download and install Tails,"
+msgstr ""
+
+#. type: Bullet: ' - '
msgid "our [[documentation|doc]] explaining in detail how to use Tails,"
msgstr "[[مستندات|doc]] شامل جزئیات کامل در مورد چگونگی استفاده از تیلز"
diff --git a/wiki/src/about.fr.po b/wiki/src/about.fr.po
index 5bc254f..0e1b011 100644
--- a/wiki/src/about.fr.po
+++ b/wiki/src/about.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: tails-about-fr\n"
-"POT-Creation-Date: 2016-03-21 18:14+0100\n"
+"POT-Creation-Date: 2016-04-29 13:53+0000\n"
"PO-Revision-Date: 2013-10-13 17:08-0000\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -402,6 +402,11 @@ msgstr ""
"features]] dans Tails,"
#. type: Bullet: ' - '
+msgid ""
+"our [[installation instructions|install]] to download and install Tails,"
+msgstr ""
+
+#. type: Bullet: ' - '
msgid "our [[documentation|doc]] explaining in detail how to use Tails,"
msgstr ""
"notre [[documentation|doc]] qui explique en détails comment utiliser Tails,"
diff --git a/wiki/src/about.mdwn b/wiki/src/about.mdwn
index 4e24a35..d2a64b2 100644
--- a/wiki/src/about.mdwn
+++ b/wiki/src/about.mdwn
@@ -138,6 +138,7 @@ To continue discovering Tails, you can now read:
- the [[warning page|doc/about/warning]] to better understand the security limitations of Tails and Tor,
- more details about the [[features and software|doc/about/features]] included in Tails,
+ - our [[installation instructions|install]] to download and install Tails,
- our [[documentation|doc]] explaining in detail how to use Tails,
- some hints on why [[you should trust Tails|doc/about/trust]],
- our [[design document|contribute/design]] laying out Tails specification, threat model and implementation,
diff --git a/wiki/src/about.pt.po b/wiki/src/about.pt.po
index 77471f1..504cf6c 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: 2016-03-21 18:14+0100\n"
+"POT-Creation-Date: 2016-04-29 13:53+0000\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"
@@ -400,6 +400,11 @@ msgstr ""
"incluídos no Tails,"
#. type: Bullet: ' - '
+msgid ""
+"our [[installation instructions|install]] to download and install Tails,"
+msgstr ""
+
+#. type: Bullet: ' - '
msgid "our [[documentation|doc]] explaining in detail how to use Tails,"
msgstr "nossa [[documentação|doc]] explicando em detalhes como usar o Tails,"
diff --git a/wiki/src/about/contact.mdwn b/wiki/src/about/contact.mdwn
index 4280a6a..287c9bf 100644
--- a/wiki/src/about/contact.mdwn
+++ b/wiki/src/about/contact.mdwn
@@ -150,6 +150,16 @@ If you want to fund Tails, write to <tails-accounting@boum.org>.
[[OpenPGP key|tails-accounting.key]]
([[details|doc/about/openpgp_keys#accounting]]).
+<a id="tails-mirrors"></a>
+
+tails-mirrors
+-----------------
+
+If you want to operate a Tails mirror, write to <tails-mirrors@boum.org>.
+
+[[OpenPGP key|tails-mirrors.key]]
+([[details|doc/about/openpgp_keys#mirrors]]).
+
<a id="tails-sysadmins"></a>
tails-sysadmins
diff --git a/wiki/src/blueprint/HTTP_mirror_pool.mdwn b/wiki/src/blueprint/HTTP_mirror_pool.mdwn
index 82c0600..6d99fd1 100644
--- a/wiki/src/blueprint/HTTP_mirror_pool.mdwn
+++ b/wiki/src/blueprint/HTTP_mirror_pool.mdwn
@@ -31,8 +31,6 @@ We decided to implement a two-way strategy for this feature:
## Remaining questions
-* How do we manage *.dl.amnesia.boum.org DNS?
-
* What to do for downloads we offer outside of the Installation
Assistant, that are not supported by DAVE, such as images for
release candidates? What to do for browsers that don't have DAVE,
@@ -97,6 +95,11 @@ of them we need a few values:
0 means that the mirror is currently disabled, and will never be
redirected to
+ * email (optional): the email address of the mirror's operator
+
+ * notes (optional): various additional notes that can be useful to
+ the managers of the mirror pool
+
For a more formal, and probably more up-to-date definition of the data
model, better see
[its JSON schema](https://git-tails.immerda.ch/mirror-pool/tree/schema.json).
@@ -104,13 +107,136 @@ model, better see
Here is
[an example configuration file](https://git-tails.immerda.ch/mirror-pool/tree/example-mirrors.json).
-Later, we may want to add more data that is not blocking for the
-initial iterations:
-
- * email: contact information for the operator(s) of this mirror; XXX:
- check if all mirror operators are OK with this; if enough are OK,
- then document on [[contribute/how/mirror]] that it's the case, and
- do it; otherwise, we'll need to manage contact info separately.
+<a id="speed"></a>
+
+# Speed
+
+This is mainly for [[!tails_ticket 10295]].
+
+## Potentially fast & reliable enough mirrors
+
+i.e. those that I've seen provide good speed and that have had no
+reliability issue in the last N months.
+
+Note: measurements done from lizard are capped to 100Mbps due to
+upstream network configuration, so they can barely be used to reliably
+compare those fast mirrors with each other. For measurements done from
+Germany, upstream network should not be the limiting factor for most
+practical purposes here.
+
+* 192.42.116.116 aka http://192.42.116.116/tails/ (Netherlands):
+ - from lizard: 4.36 MB/s, 6.45 MB/s, 5.94 MB/s, 6.53 MB/s
+ - from Germany: 45.0 MB/s, 45.5 MB/s, 38.0 MB/s
+ - from France: avg. 16.8 MB/s, stdev 2.0 MB/s
+ - from Netherlands: 89 MB/s, 94.8 MB/s, 88.0 MB/s
+* 5.45.108.219 aka https://tails.mirror.metalgamer.eu/tails/ (Germany):
+ - from lizard: 8.21 MB/s, 6.87 MB/s, 7.48 MB/s
+ - from Germany: 37.7 MB/s, 43.4 MB/s, 37.2 MB/s
+ - from France: avg. 21.1 MB/s, stdev 4.1 MB/s
+ - from Netherlands: 50.4 MB/s, 41.3 MB/s, 43.7 MB/s
+* 85.93.216.116 aka https://tails.c3l.lu/tails/ (Luxembourg):
+ - from lizard: 6.58 MB/s, 6.72 MB/s, 3.73 MB/s, 5.52 MB/s, 2.97 MB/s, 5.31 MB/s, 4.46 MB/s, 4.50 MB/s, 3.15 MB/s
+ - from Germany: 34.7 MB/s, 34.9 MB/s, 31.3 MB/s
+ - from France: avg. 14.5 MB/s, stdev 3.4 MB/s
+ - from Netherlands: 54.0 MB/s, 52.7 MB/s, 51.7 MB/s
+* 195.154.14.189 aka https://16.dl.amnesia.boum.org/tails/ (France):
+ - from lizard: 5.08 MB/s, 5.25 MB/s, 6.26 MB/s, 6.33 MB/s, 6.17 MB/s
+ - from Germany: 22.4 MB/s, 21.6 MB/s, 22.6 MB/s
+ - from France: avg. 25.4 MB/s, stdev. 1.5 MB/s
+ - from Netherlands: 17.2 MB/s, 17.5 MB/s, 18.4 MB/s
+* 5.104.106.180 aka https://dl2.crypto-rebels.de/tails/ (Germany):
+ - from lizard: 7.08 MB/s, 5.23 MB/s, 5.46 MB/s, 5.09 MB/s, 4.45 MB/s, 5.72 MB/s
+ - from Germany (from the same network): 24.6 MB/s, 17.6 MB/s, 18.4 MB/s
+ - from France: avg. 15.7 MB/s, stdev. 2.1 MB/s
+ - from Netherlands: 38.0 MB/s, 37.9 MB/s
+* 212.110.161.69 aka http://mirror.bytemark.co.uk/tails/ (UK):
+ - from lizard: 5.31 MB/s, 6.62 MB/s, 4.61 MB/s, 6.70 MB/s, 6.34 MB/s, 6.26 MB/s
+ - from Germany: 15.5 MB/s, 17.1 MB/s, 16.1 MB/s
+ - from France: avg. 10.4 MB/s, stdev. 2.7 MB/s
+ - from Netherlands: 25.2 MB/s, 66.3 MB/s, 43.9 MB/s
+* 141.138.141.28 aka http://25.dl.amnesia.boum.org/tails/ (Netherlands):
+ - from lizard: 3.35MB/s, 9.07MB/s, 6.00MB/s, 5.35 MB/s, 4.74 MB/s, 3.97 MB/s
+ - from Germany: 16.7MB/s, 27.9MB/s, 24.5MB/s
+ - from France: avg. 11.9 MB/s, stdev 2.3 MB/s
+ - from Netherlands: 21.5 MB/s, 21.9 MB/s, 23.3 MB/s
+* https://mirrors.ocf.berkeley.edu/tails/ (California)
+ - from lizard: 10.3MB/s, 11.0MB/s, 11.2MB/s
+ - from Germany: **XXX**
+ - from Netherlands: 16.0 MB/s, 12.7 MB/s, 14.7 MB/s
+
+## Too slow mirrors
+
+* 62.201.161.88 aka http://tails.mirror.iphh.net/tails/ (Germany):
+ - from lizard: 2.67 MB/s, 1.84MB/s, 1.82MB/s, 2.44MB/s
+ - from Germany: 56.7MB/s, 32.1MB/s, 13.7MB/s
+ - from France: avg. 11.6 MB/s, stdev 3.7 MB/s
+* 178.217.184.32 aka https://tails.uk.to/tails/ (Poland):
+ - from lizard: 4.96 MB/s, 4.96 MB/s
+ - from Germany: 17.1 MB/s, 18.9 MB/s, 16.7 MB/s
+ - from France: avg. 8.5 MB/s, stdev 2.1 MB/s
+* 176.9.38.37:
+ - from lizard: 2.81 MB/s, 2.74MB/s, 3.05MB/s, 2.74MB/s
+ - from Germany: 43.0MB/s, 22.1MB/s, 7.41MB/s
+ - from France: avg. 11.7 MB/s, stdev 2.6 MB/s
+* 195.154.188.146: 3.69 MB/s
+* 83.212.104.246:
+ - from lizard: 3.90 MB/s
+ - from France: avg. 4.8 MB/s, stdev 2.4 MB/s
+* 188.138.127.35 aka https://tails.bl0m.de/tails/: perf. varies too much
+* 45.33.79.99
+ - from France: avg. 4.3 MB/s, stdev 0.6 MB/s
+* 80.241.222.98 aka http://dl3.crypto-rebels.de/tails/ (Germany):
+ - from lizard: 9.18 MB/s, 3.90 MB/s, 6.62 MB/s
+ - from Germany: 7.83 MB/s, 8.00 MB/s, 7.54 MB/s
+* 213.136.84.245 aka https://dl1.crypto-rebels.de/tails/ (Germany):
+ - from lizard: 7.10 MB/s, 8.46 MB/s
+ - from Germany: 9.74 MB/s, 7.99 MB/s, 7.60 MB/s
+ - from France: avg. 6.5 MB/s, stdev. 2.4 MB/s
+* 81.7.10.29 aka https://tails.ybti.net/tails/ (Germany):
+ - from lizard: 6.28 MB/s, 5.17 MB/s, 5.26 MB/s
+ - from Germany: 7.92 MB/s, 6.04 MB/s, 6.92 MB/s
+ - from France: avg. 5.2 MB/s, stdev 1.5 MB/s
+* 96.126.119.95 aka https://tails.interpipe.net/tails/ (USA):
+ - from lizard: 6.10 MB/s, 7.04 MB/s
+ - from Germany: 4.99 MB/s, 4.62 MB/s, 4.59 MB/s
+ - from France: avg. 3.5 MB/s, stdev 0.1 MB/s
+* 5.135.66.221 aka http://24.dl.amnesia.boum.org/tails/ (France):
+ - from lizard: 3.27MB/s, 2.77MB/s, 2.89MB/s
+ - from Germany: 6.22MB/s, 6.93MB/s, 5.05MB/s
+ - from France: avg. 10.2 MB/s, stdev 1.7 MB/s
+* 151.80.190.129 (France):
+ - from lizard: 2.69MB/s, 1.24MB/s, 1.27MB/s
+ - from Germany: 2.40MB/s, 2.60MB/s, 4.42MB/s
+ - from France: avg. 7.0 MB/s, stdev 0.6 MB/s
+* 158.36.190.173 (Norway):
+ - from lizard: 3.17MB/s, 3.44MB/s, 2.44MB/s
+ - from Germany: 24.4MB/s, 23.1MB/s, 23.5MB/s
+ - from France: avg. 7.0 MB/s, stdev 1.1 MB/s
+
+## Not reliable enough mirrors
+
+i.e. mirrors that have had issues at least once in the last 6 months;
+let's not include them in the fallback DNS pool:
+
+* 5.196.175.179
+* 77.70.69.9
+ - from France: avg. 0.3 MB/s, stdev 0.1 MB/s ⇒ **TODO** remove from the pool?
+* 80.90.43.162
+* 84.106.196.237
+* 86.59.119.84
+* 109.239.48.152
+* 137.226.34.46:
+ - from lizard: 798 KB/s, 9.80MB/s, 2.08MB/s, 1.37MB/s
+ connection closes in the middle of the download pretty often
+ - from Germany: 8.73MB/s, 10.4MB/s, 12.2MB/s
+ - from France: avg. 11.1 MB/s, stdev 2.5 MB/s
+* 141.138.136.78
+* 144.76.14.145
+* 149.202.98.175
+* 178.32.220.171
+* 192.99.131.144
+* 198.199.103.96
+* 212.47.229.219
# Initial research
diff --git a/wiki/src/blueprint/SponsorS/reports/2016_04.mdwn b/wiki/src/blueprint/SponsorS/reports/2016_04.mdwn
deleted file mode 100644
index 504cf14..0000000
--- a/wiki/src/blueprint/SponsorS/reports/2016_04.mdwn
+++ /dev/null
@@ -1,68 +0,0 @@
-[[!meta title="Tails April 2016 report"]]
-
-[[!toc levels=2]]
-
-<div class="caution">
-<strong>Deadline: 2016-05-05</strong>
-</div>
-
-<div class="note">
-Deliverable identifiers and descriptions are not free-form: they must
-be copy'n'pasted as-is from the proposal sent to the sponsor.
-</div>
-
-[Last month's activity on Redmine](https://labs.riseup.net/code/projects/tails/issues?query_id=208)
-can be helpful.
-
-This reports covers the activity of Tails in April 2016.
-
-Everything in this report is public.
-
-# A. Replace Claws Mail with Icedove
-
-## A.n. description of subsection
-
-- A.n.m. description of deliverable: ticket numbers
-
- status summary:
-
- * what was done
- * what is the outcome (how it makes Tails better)
- * what was not done, and why
-
-# B. Improve our quality assurance process
-
-
-# C. Scale our infrastructure
-
-## C.1. Change in depth the infrastructure of our pool of mirrors
-
-XXX: see March report for ticket numbers about other C.1.n's.
-
-* DAVE ([[!tails_ticket 11109]])
- - The URL used for a new download is now built using our mirror pool
- (example) config, using our mirror-dispatcher.js library.
- - Next WIP step (as of 20160408): support resuming an existing
- download (that may have been started using another mirror than the
- one we would like to use this time).
- - And then we'll want other people to review and audit our
- proposed changes.
-
-* C.1.3. Design and implement the mirrors pool administration process and tools ([[!tails_ticket 8638]], [[!tails_ticket 11122]], [[!tails_ticket 11054]], [[!tails_ticket 11335]])
-
-* C.1.5. Deploy the script and the mirror pool description ([[!tails_ticket 8641]], XXX)
-
- They are now live on our website, but not used yet until C.1.6.
-
- Let's say this now includes [[!tails_ticket 10295]] and
- [[!tails_ticket 11284]].
-
-* C.1.6. Adjust download documentation to point to the mirror pool dispatcher's URL ([[!tails_ticket 8642]], [[!tails_ticket 11329]])
-
-* C.1.8. Clean up the remainers of the old mirror pool setup ([[!tails_ticket 8643]])
-
-
-# D. Migration to Debian Jessie
-
-
-# E. Release management
diff --git a/wiki/src/blueprint/Tails_research.mdwn b/wiki/src/blueprint/Tails_research.mdwn
index 0b130ad..6f5a010 100644
--- a/wiki/src/blueprint/Tails_research.mdwn
+++ b/wiki/src/blueprint/Tails_research.mdwn
@@ -18,6 +18,8 @@ The best way to reach us is through the [tails-dev](https://mailman.boum.org/lis
* [Persistent Tor state](https://tails.boum.org/blueprint/persistent_Tor_state/)
* [Time syncing](https://tails.boum.org/blueprint/robust_time_syncing/)
+If you have an idea yourself and would like to propose it, please write to us through the tails-dev mailinglist.
+
## User experience
If you're an user interface designer you might be delighted to hear that we have a [mailinglist](https://tails.boum.org/contribute/how/user_interface/) targeted at you!
diff --git a/wiki/src/blueprint/backups.mdwn b/wiki/src/blueprint/backups.mdwn
index adb8cdb..b9ba991 100644
--- a/wiki/src/blueprint/backups.mdwn
+++ b/wiki/src/blueprint/backups.mdwn
@@ -17,7 +17,7 @@ might hit tons of corner cases to handle, that one initially does not think of.
And once we take it all into account, then we get a large piece of code to
maintain all by ourselves, because it was meant only for Tails' needs.
-So, we should try to reinvent this wheel, and use an existing, proven solution instead.
+So, we shouldn't try to reinvent this wheel, and use an existing, proven solution instead.
Tar + GPG
---------
diff --git a/wiki/src/blueprint/bootstrapping/verification.mdwn b/wiki/src/blueprint/bootstrapping/verification.mdwn
index f8b7eca..9e9abb0 100644
--- a/wiki/src/blueprint/bootstrapping/verification.mdwn
+++ b/wiki/src/blueprint/bootstrapping/verification.mdwn
@@ -63,8 +63,8 @@ The cons:
About the removal of Seahorse Nautilus
======================================
-As of now, we are explaining how to [[verify ISO images using
-`seahorse-nautilus` for GNOME|doc/get/verify_the_iso_image_using_gnome]].
+As of now, we are explaining how to verify ISO images using
+`seahorse-nautilus` for GNOME.
While reworking the ISO verification scenarios, we pretty much settled on the
idea of removing Seahorse Nautilus as a verification option, at least from the
assistant. Here is why.
diff --git a/wiki/src/blueprint/freezable_APT_repository.mdwn b/wiki/src/blueprint/freezable_APT_repository.mdwn
index b5ed032..d47c4cc 100644
--- a/wiki/src/blueprint/freezable_APT_repository.mdwn
+++ b/wiki/src/blueprint/freezable_APT_repository.mdwn
@@ -28,7 +28,6 @@ little value.
- developer (including stable, testing, devel, and `$topic`)
* get the updated documentation + this design reviewed, including
security aspects [i]
- * give RM's access to `reprepro-time-based-snapshots@apt.lizard` [i]
* document how to freeze time-based APT snapshots being used:
./auto/scripts/apt-snapshots-serials freeze && \
@@ -53,43 +52,44 @@ little value.
doc + contributors doc
2. time-based snapshots [i]
- a. **done** initial reprepro setup that keeps up-to-date local mirrors of
- the APT repositories we need
- b. **done** snapshot these mirrors every time they're updated
- c. **done** decide how many reprepro instances we want/have to split all
- this among
- d. **done** mirror relevant suites of deb.tails.b.o as well
- d. **done** publish the snapshots over HTTP
- d. **done** clean up Wheezy packages (including those referenced by
- snapshots)
- e. **done** publish the snapshots' serial over HTTP
- (e.g. <http://time-based.snapshots.deb.tails.boum.org/debian-security/project/trace/debian-security>)
- e. **done** try using such snapshots for building an ISO:
- done in `feature/5926-freezable-APT-repository`
e. Avoid re-downloading everything one has in their local
apt-cacher-ng, and filling its cache with files duplicated
- many times. It's acceptable not to have optimal caching for `dists/`; what
- matters is `pool`. We have a working PoC using the "merging" strategy (documented on
- <file:///usr/share/doc/apt-cacher-ng/html/config-serv.html#repmap>),
- that is `Remap-tails` with no `TargetURLs` list; it works if
- we do that for the `pool/` directory only (we don't want to
- merge the cache for the different `dists` directory):
-
- $ echo 'Remap-tailspool: file:tails-time-based-snapshots-debian-pool.list' \
- | sudo tee /etc/apt-cacher-ng/tails-time-based-snapshots-debian-pool.conf
-
- $ for origin in $(cd config/APT_snapshots.d/ ; ls -d *) ; do for y in $(seq 2016 2026) ; do for m in $(seq 1 12); do for d in $(seq 1 31) ; do for t in $(seq 1 4) ; do printf 'http://time-based.snapshots.deb.tails.boum.org/%s/%04u%02u%02u%02u/pool/\n' $origin $y $m $d $t ; done ; done ; done ; done | sudo tee /etc/apt-cacher-ng/tails-time-based-snapshots-$origin-pool.list ; done
-
- e. check if/how
- [by-hash](http://www.chiark.greenend.org.uk/~cjwatson/blog/no-more-hash-sum-mismatch-errors.html)
- impacts our design and implementation
- e. deny robots access to that data
- e. implement GC of expired snapshots and packages (`tails-delete-expired-apt-snapshots`):
- * review [i]
- * test, including dry-run, silent & verbose modes, performance,
- and removal of expired snapshots' `dist` directories after
- `deleteunreferenced` [i]
- * deploy with Puppet, redirect output to a log file, logrotate snippet [i]
+ many times. We have a config file generator in:
+ `auto/scripts/update-acng-config`. We need to use it, somehow,
+ for:
+ - **done**: Vagrant build setup: update this file as part of the
+ build process
+ - **done** `tails::builder` Puppet class
+ - manual build setup: we should not bother too much because
+ now Vagrant should be working for everyone, so a manual build
+ setup is a corner case, that we can address with some minimal
+ documentation. What to do depends on where `apt-cacher-ng`
+ runs; when it's on the build host, then we can update the
+ configuration as part of the build process, just like for the
+ Vagrant case; else, if it's run elsewhere, then one should use
+ a cronjob, just like in the Puppet case, or do it by hand;
+ let's keep in mind that once generated, the config file should
+ be valid for a while.
+ f. handle ever-growing `references.db`, aka. [[!debbug 823629]]: if
+ `references.db` doesn't fit in the memory disk cache, then at
+ least our GC process gets very slow); the visible consequence
+ would be: long periods of heavy disk read, and much slower
+ snapshots expiration process; so we added an Icinga2 check on
+ the file size itself. When this problem occurs, our options are:
+ * add more RAM to the VM if that's still feasible and reasonable
+ (likely not)
+ * reset the whole `debian` repository to an empty state (simple
+ and big hammer, painful as it requires lots of coordination
+ with developers)
+ * compact the DB with `db5.3_dump` + `db5.3_load`: it got our
+ big `debian/db/references.db` down from 5.4 GB to 1.5 GB
+ * compact the DB with `DB->compact()`, using
+ [a script we wrote](https://git-tails.immerda.ch/puppet-tails/tree/files/reprepro/snapshots/time_based/tails-compact-reprepro-db)
+ (<https://docs.oracle.com/cd/E17076_02/html/programmer_reference/am_misc_diskspace.html>,
+ <https://groups.google.com/forum/#!topic/memcachedb/uiSvgStzYNY>,
+ <https://docs.oracle.com/cd/E17076_02/html/api_reference/C/dbcompact.html>):
+ works on small databases, but on our big `debian` the file
+ doesn't shrink
g. have build system output the snapshots being used,
and have Jenkins publish this info if available
@@ -108,29 +108,16 @@ little value.
[[switching to live APT sources at runtime|freezable_APT_repository#runtime-sources]]
4. tagged snapshots
- a. **done** PoC of capturing the list of binary packages used during the build
- b. **done** PoC of capturing the list of source packages used during the build
- c. **done** initial reprepro setup for tagged snapshots
- d. **done** debootstrap in jessie-backports
- d. **done** Have Jenkins create, publish and manage
- `latest.iso.build-manifest` symlinks
- e. **WIP** create a partial snapshot from a manifest and
- the origin time-based snapshots:
- * `generate-build-manifest` (main Git repo), aka. get [[!tails_ticket 10748]]
- done in Tails 2.3 [i]
- - convert custom `data/debootstrap/tails-wheezy` into a patch,
- or set up the process to update/replace it in the future,
- or something (we're using Jessie now) [i]
- - get rid of the last XXX in `data/wrappers/apt-get`
- - move `data/wrappers/apt-get` to a better place
- * deploy, update release process doc, grant RM's access
- h. publish tagged snapshots over HTTP
- h. for some Tails release: generate manifest, import packages into
- tagged snapshots, try building *offline* with these tagged
- snapshots [i]
- k. Update the
- [[Listing used packages|freezable APT repository#build-manifest]]
- section
+ h. for some Tails ISO build:
+ * **done** create the corresponding tagged snapshots
+ tails-i386-feature_5926-freezable-APT-repository-2.4-20160514T2039Z-8580736.iso
+ * **done** build with these tagged snapshots
+ tails-i386-feature_5926-freezable-APT-repository-2.4-20160514T2148Z-d6ce38d.iso
+ * check what is pulled during the build
+ * compare the resulting build manifest, build log and package list
+ with the one from a similar build that used time-based snapshots
+ i. release process: publish the build manifest
+ k. delete the testing `8.32-alpha` tagged snapshot
l. Point consumers of the now deprecated `*.{bin,src}pkg` (probably
only jenkins.debian.net) to the new build manifest.
m. if needed, implement GC
@@ -206,65 +193,8 @@ except:
* if a set of APT repository snapshots is encoded directly in that
branch: use them, even for security.debian.org.
-## Different problems ⇒ different solutions
-
-Note that:
-
- * The time-based snapshots of the mirrored APT repositories that are
- used basically all the time (except when building a release) should
- be *full* snapshots, that is they should contain exactly the same
- set of packages as the mirrored repository. This has the advantage
- that some workflows are trivially handled, e.g. working on a topic
- branch that installs additional Debian packages; if such snapshots
- were not full ones, then to work on one such branch, one would need
- either that I have the credentials to import new packages from
- Debian into our own mirror or repositories (which raises the
- barrier for contributing), or that during some phases of Tails
- development the regular Debian archive is used instead of our own
- mirror, which feels prone to "time to QA vs. time to
- release" issues.
-
- * The tagged snapshots used to build releases can be *partial*, that
- is they can contain only the subset of the mirrored repositories
- that is required for building a specific Tails ISO image.
-
-So, we actually want to manage two sets of snapshots that are vastly
-different in terms of goals, users, turnover, garbage collection and
-backup strategies:
-
- * **time-based, full snapshots** of the mirrored APT repositories over
- the last N days;
- - goal: freezable repo feature for the dev process and QA
- - this one can be restarted from scratch from time to time if
- reprepro becomes too slow for some reason (such as imperfect DB
- garbage collection);
- - if we lose this content, we lose only N days of data, and we can
- immediately rebuild a working data set from scratch ⇒ no need to
- sync' this content to the failover server; no need to back it up;
-
- * **tagged, partial snapshots** that were used to build released Tails
- ISO images:
- - goal: reproducible builds, GPL compliance;
- - in there we import only the needed packages;
- - we want to back up this data, and expire it very cautiously,
- if ever.
-
-Trying to solve both problems in the same `reprepro` instance would be
-problematic. Not only, coupling very different problems together, and
-trying to address them with the exact same tools and process, is
-generally a bad idea. But also, reprepro's database becomes quite big
-when we import large chunks of the Debian archive into it, which may
-make it slow ([[!tails_ticket 6295]]), and in any case makes it hard
-to back up... which we want to, for preserving the releases' tagged
-snapshots information.
-
-So we'll use two independent `reprepro` instances to address these
-two problems.
-
# Special cases and implementation
-<a id="runtime-sources"></a>
-
## Custom APT repository
Our custom APT repository (<http://deb.tails.boum.org/>) is not part of
@@ -281,6 +211,8 @@ upload a package to it, and when we can build an ISO with it; we could
solve this by automatically creating a new snapshot whenever an APT
suite corresponding to a release branch is updated).
+<a id="runtime-sources"></a>
+
## APT sources used inside Tails
A running Tails' APT must be pointed at the official, live Debian
@@ -575,8 +507,6 @@ is very appealing. The counterpart being that:
* bumping `Valid-Until` for a given time-based snapshot has to be
done directly in `dist`, without any help from reprepro.
-XXX: find out how we can solve these two problems.
-
None of these problems seem to warrant going back to the other
option... and having to deal with 80GB+ BDB databases.
@@ -590,101 +520,6 @@ tracking a distribution. E.g. to remove all Wheezy snapshots:
| xargs -n 1 reprepro _removereferences \
&& reprepro deleteunreferenced
-<a id="build-manifest"></a>
-
-## Listing used packages
-
-Saved as ISO build artifact, both when building in Jenkins and outside
-from it.
-
-Output:
-
-- for each .deb: the installed version
-- The union of all APT sources used during the build.
-
-### Corner case
-
-If a (package, version) is seen at build time in 2 or more APT
-sources, `tails-prepare-tagged-apt-snapshot-import` will inject it
-into each of the tagged snapshots corresponding to these sources.
-The goal is to avoid this scenario:
-
- - version X of package P is available both in suite S1 on origin O1,
- and in suite S2 on origin O2
- - version Y of package P is available in suite S3 of origin O3
- - our pinning makes us prefer version X of package P *because it's
- available in O1/S1*; otherwise, if it wasn't in there, then our
- pinning would make APT prefer version Y to version X
- - at ISO build time, APT fetches package P version X from O2/S2
- - given this build manifest, we import package P version X into our
- tagged snapshot of O2/S2, but not into our tagged snapshot of O1/S1
- - if we rebuild from the same source tree using that set of tagged
- snapshots, then version Y of package P will be installed
-
-This scenario can happen in practice:
-
- # cat /etc/apt/sources.list
- deb http://security.debian.org wheezy/updates main
- deb http://ftp.us.debian.org/debian/ wheezy main
- deb http://ftp.us.debian.org/debian/ jessie main
-
- # cat /etc/apt/preferences
- Package: *
- Pin: origin security.debian.org
- Pin-Priority: -10
-
- Package: *
- Pin: release o=Debian,n=wheezy
- Pin-Priority: 990
-
- Package: *
- Pin: release o=Debian,n=jessie
- Pin-Priority: 700
-
- # apt-cache madison a2ps
- a2ps | 1:4.14-1.3 | http://ftp.us.debian.org/debian/ jessie/main amd64 Packages
- a2ps | 1:4.14-1.1+deb7u1 | http://security.debian.org/ wheezy/updates/main amd64 Packages
- a2ps | 1:4.14-1.1+deb7u1 | http://ftp.us.debian.org/debian/ wheezy/main amd64 Packages
-
- # apt-cache policy a2ps
- a2ps:
- Installed: (none)
- Candidate: 1:4.14-1.1+deb7u1
- Version table:
- 1:4.14-1.3 0
- 700 http://ftp.us.debian.org/debian/ jessie/main amd64 Packages
- 1:4.14-1.1+deb7u1 0
- -10 http://security.debian.org/ wheezy/updates/main amd64 Packages
- 990 http://ftp.us.debian.org/debian/ wheezy/main amd64 Packages
-
-And then, in the current state of things APT will download `a2ps` from
-security.d.o:
-
- # apt-get download a2ps --print-uris
- 'http://security.debian.org/pool/updates/main/a/a2ps/a2ps_4.14-1.1+deb7u1_amd64.deb' a2ps_4.14-1.1+deb7u1_amd64.deb 956298 sha256:e47d7fe9adb7aa62421108debf425830f4e2385e98151c5cb359d3eb8688eea8
-
-... but if `a2ps` was not available in the regular Wheezy archive,
-e.g. because we were using a tagged snapshot that imported `a2ps` into
-the security archive, then APT would prefer `a2ps` from Jessie, which
-demonstrates the bug... hence the "inject it into each of the tagged
-snapshots corresponding to these sources" requirement we had.
-
-### Bonus material
-
-- Allows to inspect the diff between the subset of two different
- snapshots that was used at build time; the benefit is very
- minor as long as we're based on Debian oldstable or stable, but
- if/when we switch to being based on Debian testing then we will
- definitely want that. Not that minor: we also fetch packages
- from testing, sid, backports, etc.
-- Say a branch (topic one, or devel, etc.) introduces
- a regression, and has changes the set of packages used at build
- time, we may want to check how exactly that set was changed.
- Think "check the diff between `.packages`" as we do at release
- time, but done in a correct way.
-- Allows keeping only _partial_ snapshots (of our full archive
- ones) for those we want to keep forever, i.e. release ones.
-
## Valid-Until and signing
Assumption: it is acceptable to have our APT repository snapshots
diff --git a/wiki/src/blueprint/greeter_revamp_UI/design_rationale_phase1.mdwn b/wiki/src/blueprint/greeter_revamp_UI/design_rationale_phase1.mdwn
index 9159685..97aba7e 100644
--- a/wiki/src/blueprint/greeter_revamp_UI/design_rationale_phase1.mdwn
+++ b/wiki/src/blueprint/greeter_revamp_UI/design_rationale_phase1.mdwn
@@ -58,11 +58,14 @@ Design a greeter dialog that:
A single welcome and settings screen, which is always displayed, that acts as a "Check & Go" screen, as well as a hub for editing settings.
-<img src="https://labs.riseup.net/code/attachments/download/1318/Greeter.Explained.png" width="100%" height="auto" />
+<img src="https://labs.riseup.net/code/attachments/download/1353/locked.png" width="100%" height="auto" />
+[full size bitmap](https://labs.riseup.net/code/attachments/download/1353/locked.png)
+<img src="https://labs.riseup.net/code/attachments/download/1341/Greeter.Explained.png" width="100%" height="auto" />
-[full size bitmap](https://labs.riseup.net/code/attachments/download/1318/Greeter.Explained.png)
-[source](https://labs.riseup.net/code/attachments/download/1319/Greeter.Explained.svgz)
+
+[full size bitmap](https://labs.riseup.net/code/attachments/download/1341/Greeter.Explained.png)
+[source](https://labs.riseup.net/code/attachments/download/1343/Greeter.Explained.svgz)
## Greeter States
@@ -81,13 +84,6 @@ A single welcome and settings screen, which is always displayed, that acts as a
[full size bitmap](https://labs.riseup.net/code/attachments/download/1325/Greeter.Language.&.Region.png)
[source](https://labs.riseup.net/code/attachments/download/1326/Greeter.Language.&.Region.svgz)
-### Keyboard & Time Zone
-
-<img src="https://labs.riseup.net/code/attachments/download/1288/Greeter.Keyboard.&.Time.Zone.png" width="100%" height="auto" />
-
-[full size bitmap](https://labs.riseup.net/code/attachments/download/1288/Greeter.Keyboard.&.Time.Zone.png)
-[source](https://labs.riseup.net/code/attachments/download/1289/Greeter.Keyboard.&.Time.Zone.svgz)
-
The language section is always visible. When a language is saved (in cleartext), it is automatically filled in with saved options.
When a line is clicked, a popover ([[https://developer.gnome.org/hig/stable/popovers.html.en]]) opens with an explanation of the option and the controls to change its value.
@@ -109,9 +105,17 @@ UI when "Save Language Changes" is checked:
### Storage
-<img src="https://labs.riseup.net/code/attachments/download/997/Encrypted.Storage.png" width="100%" height="auto" />
+<img src="https://labs.riseup.net/code/attachments/download/1355/locked-small.png" width="100%" height="auto" />
+
+[full size bitmap](https://labs.riseup.net/code/attachments/download/1355/locked-small.png)
+
+<img src="https://labs.riseup.net/code/attachments/download/1354/unlocked-small.png" width="100%" height="auto" />
+
+[full size bitmap](https://labs.riseup.net/code/attachments/download/1354/unlocked-small.png)
+
+<img src="https://labs.riseup.net/code/attachments/download/1344/Greeter.Encrypted.Storage.png" width="100%" height="auto" />
-[full size bitmap](https://labs.riseup.net/code/attachments/download/997/Encrypted.Storage.png) [source](https://labs.riseup.net/code/attachments/download/998/Encrypted.Storage.svgz)
+[full size bitmap](https://labs.riseup.net/code/attachments/download/1344/Greeter.Encrypted.Storage.png)
### Privacy
diff --git a/wiki/src/blueprint/l10n_Italian.mdwn b/wiki/src/blueprint/l10n_Italian.mdwn
index a2043ff..7954550 100644
--- a/wiki/src/blueprint/l10n_Italian.mdwn
+++ b/wiki/src/blueprint/l10n_Italian.mdwn
@@ -1,5 +1,63 @@
[[!toc levels=2]]
+#errore compilazione wiki
+
+Message conversion to user's charset will not work.
+wiki/src/doc/first_steps/startup_options/administration_password.it.po:4:2: syntax error
+
+
+#merge delle branch remote
+
+[cri@localhost lastTails2.3]$ cd Masteritalian/
+
+[cri@localhost Masteritalian]$ git branch -a
+* master
+ remotes/origin/HEAD -> origin/master
+ remotes/origin/doc_first_step_ABIM
+ remotes/origin/doc_first_step_start
+ remotes/origin/doc_get
+ remotes/origin/italian_about
+ remotes/origin/italian_first_step_RUS
+ remotes/origin/italian_first_steps_RUS
+ remotes/origin/italian_installation
+ remotes/origin/italian_persistence
+ remotes/origin/italian_warnings
+ remotes/origin/master
+
+[cri@localhost Masteritalian]$ git checkout -b first_step_start remotes/origin/doc_first_step_start
+Branch first_step_start set up to track remote branch doc_first_step_start from origin.
+Switched to a new branch 'first_step_start'
+
+[cri@localhost Masteritalian]$ git branch
+* first_step_start
+ master
+
+[cri@localhost Masteritalian]$ git checkout master
+Si è passati al branch 'master'
+Your branch is up-to-date with 'origin/master'.
+
+[cri@localhost Masteritalian]$ git merge first_step_start
+Auto-merging wiki/src/doc/first_steps/startup_options/administration_password.it.po
+CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/startup_options/administration_password.it.po
+Merge automatico fallito; risolvi i conflitti ed eseguire il commit
+del risultato.
+
+-----------------------------------
+
+Aggiornamento di 7f39480..a6e77d9
+Fast-forward
+ wiki/src/doc/first_steps.index.it.po | 100 ++++++++++++++++++++++++++++++++++++----------------------------------------------------------------
+ wiki/src/doc/first_steps/accessibility.it.po | 18 +++++++++++++-----
+ wiki/src/doc/first_steps/bug_reporting.it.po | 18 +++++++++---------
+ wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.it.po | 8 ++++----
+ wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.it.po | 53 ++++++++++++++++++++++++++++++++++++-----------------
+ wiki/src/doc/first_steps/media.it.po | 14 +++++++-------
+ 6 files changed, 105 insertions(+), 106 deletions(-)
+
+
+-------------------------------------------------------
+
+
#mini guida GIT
https://rogerdudler.github.io/git-guide/index.it.html
@@ -425,6 +483,7 @@ Genera il wiki in locale su TAILS
Il codice sorgente del sito internet si trova nella cartella wiki/src/ .
Per accelerare la compilazione, puoi disabilitare alcune lingue nei parametri po_slave_languages delle configurazioni nei file ikiwiki.setup.
+E poi lanciare ikiwiki --changesetup ikiwiki.setu
Ora puoi visistare questo indirizzo locale dal tuo browser per vedere il sito web generato:
diff --git a/wiki/src/blueprint/monthly_meeting.mdwn b/wiki/src/blueprint/monthly_meeting.mdwn
index 746e556..74b66f2 100644
--- a/wiki/src/blueprint/monthly_meeting.mdwn
+++ b/wiki/src/blueprint/monthly_meeting.mdwn
@@ -17,3 +17,5 @@ Discussions
===========
- [[!tails_ticket 7626 desc="Investigate using Icedove as the RSS reader"]]
+ - [[!tails_ticket 11052 desc="Do not suspend when closing lid
+"]]
diff --git a/wiki/src/blueprint/monthly_report.mdwn b/wiki/src/blueprint/monthly_report.mdwn
index 5c6d523..279fe59 100644
--- a/wiki/src/blueprint/monthly_report.mdwn
+++ b/wiki/src/blueprint/monthly_report.mdwn
@@ -40,13 +40,15 @@ Publishing
XXX: Move report to news/report_YEAR_MO.mdwn
XXX: Tweet about the report:
- - "Read about the activity of @Tails_live in MONTH YEAR: https://tails.boum.org/news/report_YEAR_MO."
- "In MONTH we worked on [...] and much more: https://tails.boum.org/news/report_YEAR_MO."
+ - If you don't have access to our Twitter account send you text
+ for the tweet along with your merge request for the report.
XXX: Send link to tor-reports@lists.torproject.org and tails-project@boum.org
- To: tails-project@boum.org
- Cc: tor-reports@lists.torproject.org
- Subject: Tails report for XXXXXXXX YYYY
- Reply-to: tails-project@boum.org
+XXX: Ask on tails-project who wants to be the coordinator for next month.
https://tails.boum.org/news/report_YEAR_MO/
- Make sure that we already have a volunteer for next month, or
@@ -129,6 +131,8 @@ Press and testimonials
======================
XXX: Copy content from press/media_appearances_2016.mdwn
+ This page is continuously updated by tails-press@boum.org, so if
+ it's empty there might be nothing special to report.
Translation
===========
diff --git a/wiki/src/blueprint/monthly_report/report_2016_04.mdwn b/wiki/src/blueprint/monthly_report/report_2016_04.mdwn
deleted file mode 100644
index 747e7d8..0000000
--- a/wiki/src/blueprint/monthly_report/report_2016_04.mdwn
+++ /dev/null
@@ -1,45 +0,0 @@
-[[!meta title="Tails report for April, 2016"]]
-
-[[!toc]]
-
-Releases
-========
-* [[Tails 2.3 was released on April 26, 2016|news/version_2.3]] (major release).
-
-Code
-====
-
-Documentation and website
-=========================
-* Some exemple were added on the documentation about [[adding new mirror|contribute/how/mirror]].
-
-User experience
-===============
-
-Infrastructure
-==============
-* We moved our contributors chat to an [[XMPP channel|xmpp://tails-dev@conference.riseup.net]]. More infos [[here|contribute/chat]]
-
-Funding
-=======
-
-Outreach
-========
-Past Events
------------
-
-On-going discussions
-====================
-* We are updating our mirror infrasturcture to allow more mirrors. https://tails.boum.org/blueprint/HTTP_mirror_pool/
-
-Press and testimonials
-======================
-
-Translation
-===========
-
-Metrics
-=======
-* Tails has been started more than XXXtimes this month. This makes XXX boots a day on average.
-* XXX downloads of the OpenPGP signature of Tails ISO from our website.
-* XXX bug reports were received through WhisperBack.
diff --git a/wiki/src/blueprint/tails_server.mdwn b/wiki/src/blueprint/tails_server.mdwn
index 355abfa..6ec8343 100644
--- a/wiki/src/blueprint/tails_server.mdwn
+++ b/wiki/src/blueprint/tails_server.mdwn
@@ -61,6 +61,7 @@ Please add to this list!
* Prosody
* ejabberd
* IRC
+ * charybdis
* ngIRCd
* IRCD-Hybrid
* SSH
diff --git a/wiki/src/bugs.pt.po b/wiki/src/bugs.pt.po
index 53ff791..7dba3dc 100644
--- a/wiki/src/bugs.pt.po
+++ b/wiki/src/bugs.pt.po
@@ -5,42 +5,34 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: 1\n"
"POT-Creation-Date: 2014-07-13 10:15+0300\n"
-"PO-Revision-Date: 2014-06-22 08:38-0300\n"
+"PO-Revision-Date: 2016-04-04 14:55-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Language-Team: Portuguese <LL@li.org>\n"
+"Language: pt\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
-#, fuzzy, no-wrap
-#| msgid "[[!meta title=\"bugs\"]]"
+#, no-wrap
msgid "[[!meta title=\"Bugs\"]]\n"
-msgstr "[[!meta title=\"bugs\"]]"
+msgstr "[[!meta title=\"Bugs\"]]\n"
#. type: Plain text
-#, fuzzy
-#| msgid ""
-#| "If you've found a bug in The Amnesic Incognito Live System, please read "
-#| "[[support/found_a_problem]]."
msgid ""
"If you've found a bug in Tails, please read [[doc/first_steps/"
"bug_reporting]]."
msgstr ""
-"Se você encontrou um bug no Tails, por favor leia [[encontrei um problema|"
-"support/found_a_problem]]. "
+"Se você encontrou um bug no Tails, por favor leia sobre [[como relatar bugs|"
+"doc/first_steps/bug_reporting]]. "
#. type: Plain text
-#, fuzzy
-#| msgid ""
-#| "We don't use this section anymore, see [[!tails_redmine \"\" desc="
-#| "\"Redmine\"]] instead."
msgid ""
"We don't use this section anymore, see [[contribute/working_together/"
"Redmine]] instead."
msgstr ""
-"Nós não usamos mais esta seção. Veja a página do [[!tails_redmine \"\" desc="
-"\"Redmine\"]]."
+"Nós não usamos mais esta seção, ao invés disso dê uma olhada em [[como "
+"contribuir usando Redmine|contribute/working_together/Redmine]]."
diff --git a/wiki/src/contribute.de.po b/wiki/src/contribute.de.po
index 466d849..409398c 100644
--- a/wiki/src/contribute.de.po
+++ b/wiki/src/contribute.de.po
@@ -553,6 +553,3 @@ msgid ""
"To talk to other Tails contributors, subscribe to our [[tails-dev@boum.org|"
"about/contact#tails-dev]] mailing list."
msgstr ""
-
-#~ msgid " [[!inline pages=\"contribute/talk\" raw=\"yes\"]]\n"
-#~ msgstr " [[!inline pages=\"contribute/talk\" raw=\"yes\"]]\n"
diff --git a/wiki/src/contribute.fa.po b/wiki/src/contribute.fa.po
index a6438a2..05b9b5d 100644
--- a/wiki/src/contribute.fa.po
+++ b/wiki/src/contribute.fa.po
@@ -539,8 +539,5 @@ msgid ""
"about/contact#tails-dev]] mailing list."
msgstr ""
-#~ msgid " [[!inline pages=\"contribute/talk\" raw=\"yes\"]]\n"
-#~ msgstr " [[!inline pages=\"contribute/talk\" raw=\"yes\"]]\n"
-
#~ msgid "[[contribute/Low-hanging_fruit_sessions]]"
#~ msgstr "[[contribute/Low-hanging_fruit_sessions]]"
diff --git a/wiki/src/contribute.pt.po b/wiki/src/contribute.pt.po
index 0e3fb78..477ce57 100644
--- a/wiki/src/contribute.pt.po
+++ b/wiki/src/contribute.pt.po
@@ -5,18 +5,17 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: \n"
"POT-Creation-Date: 2016-04-12 19:05+0300\n"
-"PO-Revision-Date: 2014-05-23 14:56-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"
-"Language: \n"
+"Language: pt\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Portugues\n"
-"X-Poedit-Country: BRASIL\n"
"X-Poedit-SourceCharset: utf-8\n"
+"X-Generator: Poedit 1.6.10\n"
#. type: Plain text
#, no-wrap
@@ -63,12 +62,12 @@ msgid ""
"</div>\n"
"</div>\n"
msgstr ""
-" <p>Todo usuário/a pode ajudar os/as outros/as ou dar aos/às desenvolvedores/as informação útil.</p>\n"
+" <p>Todas as pessoas que usam o Tails podem ajudar umas às outras ou dar informações úteis a quem desenvolve o sistema.</p>\n"
" <ul>\n"
" <li>[[Relate bugs|doc/first_steps/bug_reporting]]</li>\n"
" <li>[[Teste imagens ISO experimentais|contribute/how/testing]]</li>\n"
" <li>[[Dê informações aos desenvolvedores|contribute/how/input]]</li>\n"
-" <li>[[Ajude outros/as usuários/as do Tails|contribute/how/help]]</li>\n"
+" <li>[[Ajude outras pessoas que usam Tails|contribute/how/help]]</li>\n"
" </ul>\n"
"</div>\n"
"</div>\n"
@@ -175,14 +174,7 @@ msgid " [[!img speaker.png link=no]]\n"
msgstr " [[!img speaker.png link=no]]\n"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| " <p>Speakers can advocate Tails to all kinds of public.</p>\n"
-#| " <ul>\n"
-#| " <li>[[Talk at events|contribute/how/promote]]</li>\n"
-#| " </ul>\n"
-#| "</div>\n"
-#| "</div>\n"
+#, no-wrap
msgid ""
" <p>Speakers can advocate Tails to all kinds of public.</p>\n"
" <ul>\n"
@@ -192,9 +184,10 @@ msgid ""
"</div>\n"
"</div>\n"
msgstr ""
-" <p>Porta-vozed podem advogar o Tails para todos os tipos de público.</p>\n"
+" <p>Porta-vozes podem divulgar o Tails para todos os tipos de público.</p>\n"
" <ul>\n"
" <li>[[Fale em eventos|contribute/how/promote]]</li>\n"
+" <li>[[Ensine a usar o Tails|support/learn]]</li>\n"
" </ul>\n"
"</div>\n"
"</div>\n"
@@ -370,7 +363,7 @@ msgstr "[[Política de aceitação de código|contribute/merge_policy]]"
#. type: Bullet: ' - '
msgid "[[!tails_website contribute/how/promote/material/logo desc=\"Logo\"]]"
-msgstr ""
+msgstr "[[!tails_website contribute/how/promote/material/logo desc=\"Logo\"]]"
#. type: Plain text
#, no-wrap
@@ -387,19 +380,7 @@ msgid "Source code: [[Git repositories|contribute/git]]"
msgstr "Código fonte: [[Repositórios git|contribute/git]]"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| " - [[Redmine bug tracker|contribute/working_together/Redmine]]\n"
-#| " - [Roadmap](https://labs.riseup.net/code/projects/tails/roadmap)\n"
-#| " - [[Easy tasks|easy_tasks]] for new contributors\n"
-#| " - [Tasks](https://labs.riseup.net/code/projects/tails/issues)\n"
-#| " can be filtered by type of work (see links in the sidebar)\n"
-#| " - [[Building a Tails image|contribute/build]]\n"
-#| " - [[Build the website|contribute/build/website]]\n"
-#| " - [[Customize Tails|contribute/customize]]\n"
-#| " - [[Debian package builder|contribute/Debian_package_builder]], to automatically build our custom packages\n"
-#| " - [[APT repository|contribute/APT_repository]], to store our custom Debian packages\n"
-#| " - [[Glossary for contributors|contribute/glossary]]\n"
+#, no-wrap
msgid ""
" - [[Redmine bug tracker|contribute/working_together/Redmine]]\n"
" - [Roadmap](https://labs.riseup.net/code/projects/tails/roadmap)\n"
@@ -417,10 +398,9 @@ msgstr ""
" - [[Tarefas fáceis|easy_tasks]] para novos contribuidores\n"
" - [Tarefas](https://labs.riseup.net/code/projects/tails/issues)\n"
" podem ser filtradas por tipo de trabalho (veja os links na barra lateral)\n"
-" - [[Construindo uma imagem do Tails|contribute/build]]\n"
-" - [[Construindo o sítio web|contribute/build/website]]\n"
+" - [[Gerando uma imagem do Tails|contribute/build]]\n"
+" - [[Gerando uma cópia local do website|contribute/build/website]]\n"
" - [[Customize o Tails|contribute/customize]]\n"
-" - [[Construtor de pacote Debian|contribute/Debian_package_builder]], para construir automaticamente nossos pacotes específicos\n"
" - [[Repositório APT|contribute/APT_repository]], para armazenar nossos pacotes Debian específicos\n"
" - [[Glossário para contribuidores|contribute/glossary]]\n"
@@ -439,10 +419,7 @@ msgid "[[Release schedule|contribute/release_schedule]]"
msgstr "[[Agenda de lançamento|contribute/release_schedule]]"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| " - [[Release process|contribute/release_process]]\n"
-#| " - [[Manual test suite|contribute/release_process/test]]\n"
+#, no-wrap
msgid ""
" - [[Release process|contribute/release_process]]\n"
" - [[Manual test suite|contribute/release_process/test]]\n"
@@ -450,6 +427,7 @@ msgid ""
msgstr ""
" - [[Processo de lançamento|contribute/release_process]]\n"
" - [[Conjunto de testes manuais|contribute/release_process/test]]\n"
+" - [[Conjunto de testes automatizados|contribute/release_process/test/automated_tests]]\n"
#. type: Plain text
#, no-wrap
@@ -457,10 +435,9 @@ msgid "<a id=\"upstream\"></a>\n"
msgstr "<a id=\"upstream\"></a>\n"
#. type: Title =
-#, fuzzy, no-wrap
-#| msgid "Relationship with upstream\n"
+#, no-wrap
msgid "Relationship with upstream and derivatives\n"
-msgstr "Relacionamento com upstream\n"
+msgstr "Relacionamento com upstream e derivados\n"
#. type: Bullet: ' - '
msgid "[[Relationship with upstream|contribute/relationship_with_upstream]]"
@@ -472,7 +449,7 @@ msgstr "[[Melhore o Tails trabalhando no Debian|contribute/how/debian]]"
#. type: Bullet: ' - '
msgid "[[About creating Tails derivatives|contribute/derivatives]]"
-msgstr ""
+msgstr "[[Sobre como criar derivados do Tails|contribute/derivatives]]"
#. type: Plain text
#, no-wrap
@@ -493,18 +470,15 @@ msgstr ""
"trabalho, etc."
#. type: Bullet: ' - '
-#, fuzzy
-#| msgid "[[Document progress|contribute/working_together/document_progress]]"
msgid "[[Code of conduct|contribute/working_together/code_of_conduct]]"
-msgstr ""
-"[[Documentação de progresso|contribute/working_together/document_progress]]"
+msgstr "[[Código de conduta|contribute/working_together/code_of_conduct]]"
#. type: Bullet: ' - '
-#, fuzzy
-#| msgid "[[Meetings|contribute/meetings]], and minutes from past meetings"
msgid ""
"[[Contributors meetings|contribute/meetings]], and minutes from past meetings"
-msgstr "[[Reuniões|contribute/meetings]], e notas de reuniões passadas"
+msgstr ""
+"[[Reuniões de contribuidores|contribute/meetings]], e notas de reuniões "
+"passadas"
#. type: Bullet: ' - '
msgid ""
@@ -520,12 +494,7 @@ msgstr ""
"[[Documentação de progresso|contribute/working_together/document_progress]]"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| " - Roles\n"
-#| " - [[Front desk|contribute/working_together/roles/front_desk]]\n"
-#| " - [[Release manager|contribute/working_together/roles/release_manager]]\n"
-#| " - [[Ticket gardener|contribute/working_together/roles/ticket_gardener]]\n"
+#, no-wrap
msgid ""
" - Roles\n"
" - [[Front desk|contribute/working_together/roles/front_desk]]\n"
@@ -540,6 +509,10 @@ msgstr ""
" - [[Recepcionista|contribute/working_together/roles/front_desk]]\n"
" - [[Gerente de versões|contribute/working_together/roles/release_manager]]\n"
" - [[Jardineiro de tíquetes|contribute/working_together/roles/ticket_gardener]]\n"
+" - [[Administradores de sistemas|contribute/working_together/roles/sysadmins]]\n"
+" - [[Escritor técnico|contribute/working_together/roles/technical_writer]]\n"
+" - [[Mantenedores dos conjuntos de testes|contribute/working_together/roles/test_suite]]\n"
+" - [[Relatórios enviados para contribuidores|contribute/reports]]\n"
#. type: Plain text
#, no-wrap
@@ -556,9 +529,8 @@ msgid ""
"To talk to other Tails contributors, subscribe to our [[tails-dev@boum.org|"
"about/contact#tails-dev]] mailing list."
msgstr ""
-
-#~ msgid " [[!inline pages=\"contribute/talk\" raw=\"yes\"]]\n"
-#~ msgstr " [[!inline pages=\"contribute/talk\" raw=\"yes\"]]\n"
+"Para falar com outras pessoas que contribuem com o Tails, inscreva-se na "
+"nossa lista de emails [[tails-dev@boum.org|about/contact#tails-dev]]."
#, fuzzy
#~| msgid "[[Logo|promote/logo]]"
diff --git a/wiki/src/contribute/calendar.mdwn b/wiki/src/contribute/calendar.mdwn
index b36edb4..e7d7b5e 100644
--- a/wiki/src/contribute/calendar.mdwn
+++ b/wiki/src/contribute/calendar.mdwn
@@ -1,7 +1,5 @@
[[!meta title="Calendar"]]
-* 2016-04-26: Release 2.3
-
* 2016-06-07: Release 2.4 (Firefox 45.2)
* 2016-08-02: Release 2.5 (Firefox 45.3; intrigeri is the RM)
diff --git a/wiki/src/contribute/design/kernel_hardening.mdwn b/wiki/src/contribute/design/kernel_hardening.mdwn
index 5c18721..6602fe0 100644
--- a/wiki/src/contribute/design/kernel_hardening.mdwn
+++ b/wiki/src/contribute/design/kernel_hardening.mdwn
@@ -1,9 +1,9 @@
-We pass a few kernel parameters on the boot command line to increase
-security at little to no cost.
+We pass a few kernel parameters on the boot command line and /proc/sys
+to increase security at little to no cost.
-See [[!tails_ticket 11143]] for the discussion that lead to this
-choice of parameters. Most of what follows come straight from what
-"cypherpunks" wrote there.
+See [[!tails_ticket 11143]] and [[!tails_ticket 10951]] for the
+discussion that lead to this choice of parameters. Most of what
+follows come straight from what "cypherpunks" wrote there.
#### `slab_nomerge`
@@ -74,3 +74,14 @@ over, suffering only a SIGBUS at failure. Setting `mce=0` should have
no impact. Any hardware which regularly triggers a memory-based MCE is
unlikely to even boot, and the default is 1 only for
long-lived servers.
+
+#### `kernel.kptr_restrict=2`
+
+Some off-the-shelf malware exploit kernel addresses exposed via
+`/proc/kallsyms` so by not making these addresses easily available we
+increase the cost of such attack some what; now such malware has to
+check which kernel Tails is running and then fetch the corresponding
+kernel address map from some external source. This is not hard, but
+certainly not all malware has such functionality.
+
+For this reason, we also make sure to purge `/boot/System.map`.
diff --git a/wiki/src/contribute/how/mirror.mdwn b/wiki/src/contribute/how/mirror.mdwn
index 1a95e29..a1b2c3f 100644
--- a/wiki/src/contribute/how/mirror.mdwn
+++ b/wiki/src/contribute/how/mirror.mdwn
@@ -71,8 +71,8 @@ You will also need around **5-10 GiB** of disk space.
If you satisfy these practical requirements, please read on!
Else, please consider seeding Tails images over BitTorrent instead.
-Before starting doing any real work on this topic, please get in touch
-(<tails@boum.org>, [[OpenPGP key|doc/about/openpgp_keys#private]]) and send us
+Before starting doing any real work on this topic, you may want to get in touch
+(<tails-mirrors@boum.org>, [[OpenPGP key|doc/about/openpgp_keys#mirrors]]) and send us
your OpenPGP public key, so that any further communication between us
can be properly encrypted and authenticated.
@@ -90,16 +90,8 @@ Every HTTP mirror makes our files available under a fixed URL
that contains per-version sub-directories (such as
`http://dl.amnesia.boum.org/tails/stable/tails-i386-lenny-0.6.2/`).
-<div class="tip">
-If you are using [[!wikipedia Puppet_(software) desc="Puppet"]] to configure
-your server infrastructure, consider using the available [[HTTP mirror Puppet
-module|mirror#http-puppet]].
-</div>
-
-Manual set up
--------------------------
-
-### 1. Pick a hostname for your mirror
+Pick a hostname for your mirror
+-------------------------------
Your web server needs to answer requests sent to `dl.amnesia.boum.org`
(for compatibility with our current legacy mirror pool setup).
@@ -123,7 +115,16 @@ There are two ways to pick that dedicated hostname:
mirror to the pool, also ask us to create a dedicated hostname
for you.
-### 2. Set up your web server
+Manual set up
+-------------------------
+
+<div class="tip">
+If you are using [[!wikipedia Puppet_(software) desc="Puppet"]] to configure
+your server infrastructure, consider using the available [[HTTP mirror Puppet
+module|mirror#http-puppet]].
+</div>
+
+### 1. Set up your web server
Set up a virtual host for the hostname chosen at the
previous step. The virtual host will need to
@@ -191,8 +192,7 @@ Mozilla SSL Configuration Generator</a>.
#### Apache configuration example using a hostname under dl.amnesia.boum.org
<VirtualHost YOUR_WEBSERVER_IP:80>
- ServerName yourdomain.org
- ServerAlias dl.amnesia.boum.org
+ ServerName dl.amnesia.boum.org
ServerAlias *.dl.amnesia.boum.org
ServerAdmin YOUR_EMAIL
@@ -226,7 +226,7 @@ Mozilla SSL Configuration Generator</a>.
}
}
-### 3. Download the files
+### 2. Download the files
Download a snapshot of the current Tails files:
@@ -240,7 +240,7 @@ download:
rsync -rt --delete --exclude=/tails/obsolete --delete-excluded \
rsync.torproject.org::amnesia-archive /var/www/YOUR_PATH/
-### 4. Schedule the pulling of the files
+### 3. Schedule the pulling of the files
Your mirror should sync every hour + 15 minutes (at 00:15, 01:15, 02:15, etc.).
Use `cron` or equivalent to schedule the same `rsync` command
@@ -295,6 +295,16 @@ so that we can add it to the Round Robin pool.
Also, if you decided to use a hostname under `dl.amnesia.boum.org`,
please ask us to create it at the same time.
+<div class="note">
+
+We will publish your email address, associated with the URL of your
+mirror, in a file hosted on our website. If you are not comfortable
+with this, give us an email alias that we can publish without
+revealing additional information, such as
+<emph>webmaster@your-mirror.org</emph>.
+
+</div>
+
# Talk to us
You can subscribe to [[tails-dev@boum.org|about/contact#tails-dev]],
diff --git a/wiki/src/contribute/l10n_tricks/core_po_files.txt b/wiki/src/contribute/l10n_tricks/core_po_files.txt
index ba4a331..9c507e9 100644
--- a/wiki/src/contribute/l10n_tricks/core_po_files.txt
+++ b/wiki/src/contribute/l10n_tricks/core_po_files.txt
@@ -1,9 +1,9 @@
./about
./doc
./doc/about
+./doc/about.index
./doc/about/features
./doc/about/fingerprint
-./doc/about.index
./doc/about/license
./doc/about/openpgp_keys
./doc/about/requirements
@@ -11,18 +11,10 @@
./doc/about/trust
./doc/about/warning
./doc/first_steps
+./doc/first_steps.index
./doc/first_steps/accessibility
./doc/first_steps/bug_reporting
-./doc/first_steps/bug_reporting/tails_does_not_start
-./doc/first_steps.index
./doc/first_steps/introduction_to_gnome_and_the_tails_desktop
-./doc/first_steps/installation
-./doc/first_steps/installation/manual
-./doc/first_steps/installation/manual.intro
-./doc/first_steps/installation/manual/linux
-./doc/first_steps/installation/manual/mac
-./doc/first_steps/installation/manual/windows
-./doc/first_steps/media
./doc/first_steps/persistence
./doc/first_steps/persistence.caution
./doc/first_steps/persistence/configure
@@ -30,24 +22,76 @@
./doc/first_steps/persistence/use
./doc/first_steps/persistence/warnings
./doc/first_steps/shutdown
-./doc/first_steps/start_tails
./doc/first_steps/startup_options
./doc/first_steps/startup_options/administration_password
./doc/first_steps/startup_options/bridge_mode
./doc/first_steps/startup_options/mac_spoofing
./doc/first_steps/startup_options/network_configuration
+./doc/first_steps/startup_options/offline_mode
./doc/first_steps/reset
./doc/first_steps/reset.intro
./doc/first_steps/reset/linux
./doc/first_steps/reset/windows
+./doc/first_steps/reset/mac
./doc/first_steps/upgrade
-./doc/get/trusting_tails_signing_key
-./doc/get/verify_the_iso_image_using_gnome
-./doc/get/verify_the_iso_image_using_other_operating_systems
-./doc/get/verify_the_iso_image_using_the_command_line
+./doc/first_steps/upgrade/release_notes.inline
+./doc/upgrade/error/check
+./doc/upgrade/error/download
+./doc/upgrade/error/install
+./doc/upgrade/error
./getting_started
./index
./install
+./install/clone
+./install/debian/clone/overview
+./install/debian
+./install/debian/usb
+./install/debian/usb/overview
+./install/download
+./install/download/openpgp
+./install/dvd
+./install/expert/usb
+./install/expert/usb/overview
+./install/inc/overview
+./install/inc/overview/vm
+./install/inc/router/clone
+./install/inc/router/why_extra.inline
+./install/inc/router/why_two.inline
+./install/inc/steps/bittorrent_verification.inline
+./install/inc/steps/create_persistence.inline
+./install/inc/steps/download.inline
+./install/inc/steps/install_final.inline
+./install/inc/steps/install_intermediary_intro.inline
+./install/inc/steps/install_intermediary_outro.inline
+./install/inc/steps/install_tails_installer.inline
+./install/inc/steps/mac_startup_disks.inline
+./install/inc/steps/not_at_all.inline
+./install/inc/steps/restart_first_time.inline
+./install/inc/steps/restart_second_time.inline
+./install/inc/steps/verify_up-to-date.inline
+./install/inc/tails-installation-assistant.inline
+./install/linux/clone/overview
+./install/linux
+./install/linux/usb
+./install/linux/usb/overview
+./install/mac/clone
+./install/mac/clone/overview
+./install/mac/dvd
+./install/mac/dvd/overview
+./install/mac
+./install/mac/usb
+./install/mac/usb/overview
+./install/os
+./install/vm
+./install/win/clone/overview
+./install/win
+./install/win/usb
+./install/win/usb/overview
+./misc/unsafe_browser_warning
./sidebar
./support
./upgrade
+./upgrade/clone
+./upgrade/clone/overview
+./upgrade/tails
+./upgrade/tails/overview
diff --git a/wiki/src/contribute/meetings/201604.mdwn b/wiki/src/contribute/meetings/201604.mdwn
new file mode 100644
index 0000000..4a2659a
--- /dev/null
+++ b/wiki/src/contribute/meetings/201604.mdwn
@@ -0,0 +1,72 @@
+Volunteers to handle "Hole in the roof" tickets this month
+----------------------------------------------------------
+
+- sycamoreone will work on [[!tails_ticket 6116]]: Audit random seed and related tickets
+- intrigeri will work on [[!tails_ticket 6310]]: Pull source packages from foreign APT repositories
+
+Availability and plans until the next meeting
+---------------------------------------------
+
+- segfault will keep working on [[Tails Server|blueprint/tails_server]] more (a gui prototype is almost
+ there!):
+- alan will work on:
+ - new Tails Greeter
+ - maintenance of Onion circuits
+ - Whisperback
+
+Decide if we want to have monthly reports and who should edit them [[!tails_ticket 11047]]
+------------------------------------------------------------------
+
+So, report volunteers will take shifts for next months reports.
+During monthly meeting information can be gathered, and 5 days after report is finished by the volunteer
+
+- April: u
+- May:spriver?
+- June:sajolida
+- July: Atomike?
+- August: intrigeri
+
+Support channel [[!tails_ticket 7874]]
+--------------------------------------
+
+We discussed about the problem of users not being able to join irc from Tails.
+The incremental plan could be:
+
+1. intrigeri will move #tails to our regular XMPP server to deprecate IRC right now [[!tails_ticket 11306]].
+2. sycamoreone will make sure that anonymous logins work fine in Pidgin/Tails [[!tails_ticket 11307]]
+3. emmapeel will pass a call for help on setting up a server with anonymous logins and migrate #1 there [[!tails_ticket 11306]].
+
+Retire the experimental branch [[!tails_ticket 11202]]
+------------------------------------------------------
+
+Nobody uses it anymore. We can retire it.
+
+Review our list of SSH ciphers, MACs and HostKeyAlgorithms [[!tails_ticket 7315]]
+---------------------------------------------------------------------------------
+
+Everybody agrees with the email thread as well. Will be done for Tails 2.3 by intrigeri.
+
+Decide what to do with the old OpenPGP verification instructions [[!tails_ticket 11027]]
+----------------------------------------------------------------------------------------
+
+<https://mailman.boum.org/pipermail/tails-dev/2016-February/010272.html>
+
+After a very long discussion we identified 2 different scenarios:
+
+1. People who don't want to use DAVE or BitTorrent and prefer doing a direct
+ download and an equivalent GPG verification.
+2. People who want to do a stronger verification than DAVE or BT going through
+ the WoT (Web of Trust), and the current instructions explain this only for
+ Linux on the command line.
+
+And we decided to:
+
+A. Point people from the direct download to a simpliflied version of the GPG
+ instructions (without all the Web of Trust information) to satisfy scenario #1.
+B. Work on better WoT instructions as *additional* verification after DAVE, BT,
+ or #B to satisfy scenario #2.
+ But these would be different documents accessible through different paths.
+
+If there's another specific *verification* use case that we find badly supported
+and that needs OpenPGP for some reason, we can describe it over
+[[email|about/contact#tails-dev]].
diff --git a/wiki/src/contribute/meetings/201605.mdwn b/wiki/src/contribute/meetings/201605.mdwn
new file mode 100644
index 0000000..dee0b33
--- /dev/null
+++ b/wiki/src/contribute/meetings/201605.mdwn
@@ -0,0 +1,58 @@
+[[!meta title="May 2016 online meeting"]]
+
+[[!toc levels=1]]
+
+# Volunteers to handle "[Hole in the roof](https://labs.riseup.net/code/versions/198)" tickets this month
+
+- sajolida has put [[!tails_ticket 7700]] (distribution of the
+ revocation certificate) on his radar again to have something to roll
+ out at the summit.
+- intrigeri is working on freezable APT repository that will help
+ solving #5987 and friends.
+
+# Important tickets flagged for next release but without assignee
+
+- We assigned [[!tails_ticket 11270]] to anonym.
+- It's anonym's duty to find a reviewer for [[!tails_ticket 11229]].
+
+# Availability this month
+
+- u will work on the mirror scripts, DAVE, and Icedove.
+- intrigeri will work on the APT repository and mirrors.
+- segfault will work on Tails Server.
+- emmapeel will work on frontdesk and docs.
+- spriver hope to do some minor doc and maybe some translations.
+- muri will review spriver's translations.
+- sajolida will wrap up the design doc from the assistant and start
+ redesigning the donation page.
+
+# [[!tails_ticket 7626 desc="Investigate using Icedove as the RSS reader"]]
+
+Actually, this ticket was not in a state for discussing but more for
+making plans on how to audit Icedove for RSS feeds.
+
+We updated the TorBirdy FAQ about RSS feeds to mention "Is JavaScript
+disabled?" and "Are proxy settings respected?", even if proxy obedience
+is out of scope as far as Tails is concerned.
+
+sajolida will write to anonym, co6, jvoisin, Sukhbir, and u to see if we
+can find someone to do this part of Icedove + TorBirdy. [[!tails_ticket 11399]]
+
+# [[!tails_ticket 11052 desc="Do not suspend when closing lid "]]
+
+- Coming back from suspend breaks sometimes on some hardware.
+- But suspend disables emergency shutdown (until the lid is open again)
+ and some people might be surprised by this.
+
+So we want to support both options and thus what makes more sense is to
+add an option to suspend from the system menu through some button,
+keyboard shortcut, or a combination of both. Hypothesis are:
+
+- Replace the "Restart" button with a "Suspend" button. That's more
+ visible.
+- Change "Restart" or "Power Off" into "Suspend" when pressing "Alt".
+ That's more like the default in GNOME.
+- Have an additional and dedicated button for "Suspend". But we might
+ add yet another button for the screen locker.
+
+segfault will do whatever he things is more appropriate.
diff --git a/wiki/src/contribute/release_process.mdwn b/wiki/src/contribute/release_process.mdwn
index 2d910f6..094fdc6 100644
--- a/wiki/src/contribute/release_process.mdwn
+++ b/wiki/src/contribute/release_process.mdwn
@@ -499,13 +499,6 @@ check the generated `.torrent` files metainfo:
"tails-i386-${VERSION}" && \
btshowmetainfo tails-i386-$VERSION.torrent
-Fifth, generate detached OpenPGP signatures for every published
-`.torrent` file:
-
- gpg --armor --default-key "$TAILS_SIGNATURE_KEY" --detach-sign \
- tails-i386-$VERSION.torrent && \
- mv tails-i386-$VERSION.torrent.{asc,sig}
-
Lastly, let's set some variables to be used later:
ISO_PATH="${ISOS}/tails-i386-${VERSION}/tails-i386-${VERSION}.iso"
@@ -764,24 +757,17 @@ of its name:
mv "$ARTIFACTS"/tails-i386-"$VERSION".iso.packages \
"$ARTIFACTS/tails-i386-$VERSION.packages"
-Copy the `.iso.sig`, `.packages`, `.torrent` and `.torrent.sig` files
+Copy the `.iso.sig`, `.packages` and `.torrent` files
into the website repository:
cp "$ISOS/tails-i386-$VERSION/tails-i386-$VERSION.iso.sig" \
"$ARTIFACTS/tails-i386-$VERSION.packages" \
"$ISOS/tails-i386-$VERSION.torrent" \
- "$ISOS/tails-i386-$VERSION.torrent.sig" \
"$RELEASE_CHECKOUT/wiki/src/torrents/files/"
Remove from `wiki/src/torrents/files/` any remaining file from the
previous release (including any RC).
-Generate the SHA-256 hash of every image
-to be released in `inc/*`:
-
- echo "${ISO_SHA256SUM}" > \
- "${RELEASE_CHECKOUT}/wiki/src/inc/stable_i386_hash.html"
-
Update the size of the ISO image in `inc/*`:
LC_NUMERIC=C ls -l -h $ISOS/tails-i386-$VERSION/tails-i386-$VERSION.iso | \
@@ -839,7 +825,6 @@ Copy the `.iso.sig` file into the website repository:
cp "${ISO_PATH}.sig" \
"$ISOS/tails-i386-${VERSION}.torrent" \
- "$ISOS/tails-i386-${VERSION}.torrent.sig" \
"${MASTER_CHECKOUT}/wiki/src/torrents/files/
Write the announcement for the release in
diff --git a/wiki/src/contribute/release_process/perl5lib.mdwn b/wiki/src/contribute/release_process/perl5lib.mdwn
index 68e94dd..10a3208 100644
--- a/wiki/src/contribute/release_process/perl5lib.mdwn
+++ b/wiki/src/contribute/release_process/perl5lib.mdwn
@@ -74,7 +74,10 @@ and then update `debian/changelog` again if needed.
Commit `debian/changelog`:
- git commit debian/changelog -m "$(head -n 1 debian/changelog | sed -e 's,).*,),')"
+ git commit debian/changelog -m "$(head -n 1 debian/changelog | sed -e 's,).*,),')
+
+Git-Dch: Ignore
+"
Build a Debian package (use a Jessie/i386 chroot):
diff --git a/wiki/src/contribute/release_process/persistence-setup.mdwn b/wiki/src/contribute/release_process/persistence-setup.mdwn
index 3ec8cd8..edbffb5 100644
--- a/wiki/src/contribute/release_process/persistence-setup.mdwn
+++ b/wiki/src/contribute/release_process/persistence-setup.mdwn
@@ -59,7 +59,10 @@ Update `debian/changelog`:
Commit `debian/changelog`:
- git commit debian/changelog -m "$(head -n 1 debian/changelog | sed -e 's,).*,),')"
+ git commit debian/changelog -m "$(head -n 1 debian/changelog | sed -e 's,).*,),')
+
+Git-Dch: Ignore
+"
Build a Debian package (use a Jessie/i386 chroot, that
has 1. either tails-perl5lib installed, or the Tails APT repository
diff --git a/wiki/src/contribute/release_process/tails-greeter.mdwn b/wiki/src/contribute/release_process/tails-greeter.mdwn
index b5763d4..97b1f22 100644
--- a/wiki/src/contribute/release_process/tails-greeter.mdwn
+++ b/wiki/src/contribute/release_process/tails-greeter.mdwn
@@ -29,7 +29,10 @@ Update `debian/changelog`:
Commit the changelog:
- git commit debian/changelog -m "$(head -n 1 debian/changelog | sed -e 's,).*,),')"
+ git commit debian/changelog -m "$(head -n 1 debian/changelog | sed -e 's,).*,),')
+
+Git-Dch: Ignore
+"
Build a new Debian package (use a Jessie/i386 chroot):
diff --git a/wiki/src/contribute/release_process/tails-installer.mdwn b/wiki/src/contribute/release_process/tails-installer.mdwn
index c067c1d..f32adef 100644
--- a/wiki/src/contribute/release_process/tails-installer.mdwn
+++ b/wiki/src/contribute/release_process/tails-installer.mdwn
@@ -177,7 +177,10 @@ In there, set the appropriate:
Commit the changelog:
- git commit debian/changelog -m "$(head -n 1 debian/changelog | sed -e 's,).*,),')"
+ git commit debian/changelog -m "$(head -n 1 debian/changelog | sed -e 's,).*,),')
+
+Git-Dch: Ignore
+"
Make sure that the working environment is clean:
diff --git a/wiki/src/contribute/release_process/tails-iuk.mdwn b/wiki/src/contribute/release_process/tails-iuk.mdwn
index aaf7d4d..a8241cc 100644
--- a/wiki/src/contribute/release_process/tails-iuk.mdwn
+++ b/wiki/src/contribute/release_process/tails-iuk.mdwn
@@ -90,7 +90,10 @@ and then update `debian/changelog` again if needed.
Commit `debian/changelog`:
- git commit debian/changelog -m "$(head -n 1 debian/changelog | sed -e 's,).*,),')"
+ git commit debian/changelog -m "$(head -n 1 debian/changelog | sed -e 's,).*,),')
+
+Git-Dch: Ignore
+"
Build a Debian package (use a Jessie chroot with the right version of
`tails-perl5lib` installed), add a signed tag to the repository and
diff --git a/wiki/src/contribute/release_process/test/setup.mdwn b/wiki/src/contribute/release_process/test/setup.mdwn
index fd4c7d0..583fb62 100644
--- a/wiki/src/contribute/release_process/test/setup.mdwn
+++ b/wiki/src/contribute/release_process/test/setup.mdwn
@@ -21,16 +21,47 @@ The following packages are necessary on Debian Jessie:
echo -e "Package: *\nPin: release o=Debian,n=jessie\nPin-Priority: 990" \
> /etc/apt/preferences.d/Debian_jessie && \
apt update && \
- apt install cucumber devscripts dnsmasq-base gawk git i18nspector \
- libav-tools libcap2-bin libsikuli-script-java libvirt0 \
- libvirt-clients libvirt-daemon-system libvirt-dev libvpx1 ntp \
- ovmf python-jabberbot python-potr/jessie-backports \
- qemu-kvm qemu-system-x86 ruby-guestfs ruby-json ruby-libvirt \
- ruby-net-irc ruby-packetfu ruby-rb-inotify ruby-rjb ruby-rspec \
- ruby-test-unit seabios tcpdump unclutter virt-viewer x11vnc \
- xtightvncviewer xvfb openssh-server && \
+ apt install \
+ cucumber \
+ devscripts \
+ dnsmasq-base \
+ gawk \
+ git \
+ i18nspector \
+ libav-tools \
+ libcap2-bin \
+ libsikuli-script-java \
+ libvirt-clients \
+ libvirt-daemon-system \
+ libvirt-dev \
+ libvirt0 \
+ obfs4proxy \
+ openssh-server \
+ ovmf \
+ python-jabberbot \
+ python-potr/jessie-backports \
+ qemu-kvm \
+ qemu-system-x86 \
+ ruby-guestfs \
+ ruby-json \
+ ruby-libvirt \
+ ruby-net-irc \
+ ruby-packetfu \
+ ruby-rb-inotify \
+ ruby-rjb \
+ ruby-rspec \
+ ruby-test-unit \
+ seabios \
+ tcpdump/jessie-backports \
+ tor/jessie-backports \
+ unclutter \
+ virt-viewer \
+ x11vnc \
+ xtightvncviewer \
+ xvfb \
+ && \
service libvirtd restart
-
+
Other requirements
==================
@@ -39,9 +70,10 @@ Synchronized clock
The system running the test suite needs an accurate clock since we
sync the clock from the host to the Tails guest after a background
-snapshot restore to appease Tor. This is why we installed ntp above,
-but if you prefer you can use whatever time synchronization
-tool instead.
+snapshot restore to appease Tor.
+
+You might want to install `ntp` or your favorite time synchronization
+tool for this.
File permissions
----------------
diff --git a/wiki/src/contribute/release_process/test/usage.mdwn b/wiki/src/contribute/release_process/test/usage.mdwn
index 6ed273a..2e92385 100644
--- a/wiki/src/contribute/release_process/test/usage.mdwn
+++ b/wiki/src/contribute/release_process/test/usage.mdwn
@@ -5,6 +5,17 @@
Basic usage
===========
+<div class="caution">
+<p>
+Note that all traffic that normally would be sent through the Tor
+network is sent directly from the system running the automated test
+suite to the destinations! In other words, nothing is torified, and
+some tests contact hosts associated with Tails, Tor, Riseup etc. It
+will, for instance, be obvious to your ISP that you are running the
+Tails automated test suite.
+</p>
+</div>
+
Use the `run_test_suite` script found in the Tails source root to run
all automated Cucumber test features. See the [[setup
documentation|test/setup]] in case you don't have a testing
@@ -117,34 +128,6 @@ must be configured in the local configuration file for certain
features or scenarios to work. If any of these are omitted, parts of
the test suite will fail.
-### Tor pluggable transports
-
-The format is:
-
- Tor:
- Transports:
- $TYPE:
- - ipv4_address: "1.2.3.4"
- ipv4_port: 443
- fingerprint: "01234567890abcdef01234567890abcdef012345"
- extra:
- - ipv4_address: "5.6.7.8"
- [...]
- $ANOTHER_TYPE:
- - ipv4_address: "1.2.3.4"
- [...]
-
-where the type `$TYPE` (and `$ANOTHER_TYPE`) should be something like
-`Obfs4` or `Bridge` (the first type) or whatever Tor calls them. Both
-`fingerprint` and `extra` are optional and can be left empty (or
-skipped completely), but e.g. `extra` is necessary for `Obfs4` type
-bridges, for the `cert=... iat-mode=...` stuff, and the same for
-`Scramblesuite`'s `password=...`.
-
-This setting is required for `tor_bridges.feature` (requires types
-`Bridge`, `Obfs2`, `Obfs3` and `Obfs4`) and `time_syncing.feature`
-(requires type `Bridge` only).
-
### Pidgin
These secrets are required for some scenarios in
diff --git a/wiki/src/contribute/reports/SponsorS/2015/2015_01-07.mdwn b/wiki/src/contribute/reports/SponsorS/2015/2015_01-07.mdwn
index 9ad3673..befb531 100644
--- a/wiki/src/contribute/reports/SponsorS/2015/2015_01-07.mdwn
+++ b/wiki/src/contribute/reports/SponsorS/2015/2015_01-07.mdwn
@@ -11,28 +11,19 @@ guarantee that they would be paid, contractors have "only" done the
vast majority of the work, but did not feel strictly bound to these
deadlines yet.
-Note: the numbers preceded with a `#` correspond to tickets in our bug
-tracker which contains more technical details and timeline. For example,
-ticket #6938 can been seed on https://labs.riseup.net/code/issues/6938.
-
A. Replace Claws Mail with Icedove
==================================
-Due to an important security issue that we discovered in Claws Mails [1]
+Due to an [[important security issue that we discovered in Claws Mails|security/claws_mail_leaks_plaintext_to_imap]]
we want to move faster on the migration to Icedove and try to have it in Tails
1.7 (November 3) instead of Tails 1.9 (January 26). Icedove in Tails 1.7
will fallback on the account wizard provided by TorBirdy, and Icedove in
Tails 1.9 will have the usual Icedove wizard with additional security (for
example with TLS enforced).
-[1]: https://tails.boum.org/security/claws_mail_leaks_plaintext_to_imap/
-
-B. Improve our quality assurance process
-========================================
+# B. Improve our quality assurance process
-B.1. Automatically build ISO images for all the branches of our source
-code that are under active development
-----------------------------------------------------------------------
+## B.1. Automatically build ISO images for all the branches of our source code that are under active development
Any active Tails development branch is now built automatically on our
Jenkins server. Since this piece of infrastructure has been deployed,
@@ -47,22 +38,19 @@ being developed.
The steps that lead to completion of this project where:
-- B.1.1. Improve the Puppet code of our ISO building server (based on
- Jenkins) to be able to replicate our setup as needed: #6938 and #6056
+- B.1.1. Improve the Puppet code of our ISO building server (based on Jenkins) to be able to replicate our setup as needed: [[!tails_ticket 6938]] and [[!tails_ticket 6056]]
Once this refactoring was completed, we successfully validated it by
replicating our Jenkins setup locally. This should for example help
new contributors participate in infrastructure improvements.
-- B.1.2. Have a mechanism to automatically update Jenkins jobs
- when changes to their code are pushed through Git: #5898
+- B.1.2. Have a mechanism to automatically update Jenkins jobs when changes to their code are pushed through Git: [[!tails_ticket 5898]]
This, along with the next few completed tasks, enabled us to have
the Jenkins build jobs dynamically generated based on activity that
happens in the main Tails code repository, in a fully automated way.
-- B.1.3. Decide what kind of branches qualify for automatic building:
- #8655
+- B.1.3. Decide what kind of branches qualify for automatic building: [[!tails_ticket 8655]]
After an initial design was proposed by our infrastructure team,
other Tails developers were involved in the discussion to make sure
@@ -72,7 +60,7 @@ The steps that lead to completion of this project where:
which proved to be correct once the whole system was deployed
later on.
-- B.1.4. Improve automatic cleanup of nightly built ISO images: #6439
+- B.1.4. Improve automatic cleanup of nightly built ISO images: [[!tails_ticket 6439]]
The program that takes care of garbage collecting ISO images built
on our Jenkins infrastructure was previously buggy. Issues in the
@@ -81,8 +69,7 @@ The steps that lead to completion of this project where:
developers to debug regressions: they now have more data points
to compare.
-- B.1.5. Publish and upstream our improvements to the Jenkins Puppet
- module to ease its maintenance: #9682
+- B.1.5. Publish and upstream our improvements to the Jenkins Puppet module to ease its maintenance: [[!tails_ticket 9682]]
Tails has a policy of working hand-in-hand with upstream when
feasible, as a way to share our improvements with the outside world,
@@ -92,10 +79,10 @@ The steps that lead to completion of this project where:
As a result, we now are back to using the upstream version of
this code.
-- B.1.6. Have topic branches built using the APT repository of their base branch
- (stable, devel, etc.) and not devel by default as is currently the
+- B.1.6. Have topic branches built using the APT repository of their base branch (stable, devel, etc.)
+ and not devel by default as is currently the
case, merging them into their base branch. Adjust contributing
- processes and documentation accordingly: #8654
+ processes and documentation accordingly: [[!tails_ticket 8654]]
We deemed it important, when building ISO images from development
branches, to make sure that they merge fine with the base branch
@@ -107,24 +94,20 @@ The steps that lead to completion of this project where:
development & QA processes and infrastructure. Thankfully the result
works well and makes the daily work of Tails developers easier.
-- B.1.7. Write library code that implements the automatic build
- criteria and parameters designed during the previous iteration: #8657
-- B.1.8. Write tools that generate a set of Jenkins jobs to build ISO
- images based on the aforementioned library code: #8656
+- B.1.7. Write library code that implements the automatic build criteria and parameters designed during the previous iteration: [[!tails_ticket 8657]]
+
+- B.1.8. Write tools that generate a set of Jenkins jobs to build ISO images based on the aforementioned library code: [[!tails_ticket 8656]]
This is the implementation of the design we came up with previously
(B.1.3). The vast majority of the code was implemented as a library,
so that we can reuse it in the future for whatever may need it.
-- B.1.9. Deploy, refresh regularly our Jenkins jobs
- and automatically clean obsolete ones: #8658
+- B.1.9. Deploy, refresh regularly our Jenkins jobs and automatically clean obsolete ones: [[!tails_ticket 8658]]
This was the final step, when we deployed live the entire piece of
infrastructure, crossed fingers, and happily saw it work flawlessly.
-B.2. Continuously run our entire test suite on all those ISO images
-once they are built
--------------------------------------------------------------------
+## B.2. Continuously run our entire test suite on all those ISO images once they are built
- B.2.1. Adjust our infrastructure to run tests in parallel
@@ -136,26 +119,23 @@ once they are built
* We have starting deploying more virtual machines that will act as
test runners.
-- B.2.2. Decide what kind of ISO images qualify for testing
- and when, how to process, advertise, and store the results
+- B.2.2. Decide what kind of ISO images qualify for testing and when, how to process, advertise, and store the results
An initial draft design was written, posted on our development
mailing list, and as a result the discussion has started but was not
completed yet.
-B.3. Extend the coverage of our test suite
-------------------------------------------
+## B.3. Extend the coverage of our test suite
### Refactoring to make room for improvements in the next iterations
-- B.3.1. Use libguestfs for better disk handling in the test suite:
- #5294
+- B.3.1. Use libguestfs for better disk handling in the test suite: [[!tails_ticket 5294]]
Using libguestfs gave us some noticeable performance improvements
when running our automated test suite, and enables us more
flexibility when dealing with disk images.
-- B.3.2. Reorganize the test suite: #6543
+- B.3.2. Reorganize the test suite: [[!tails_ticket 6543]]
After two years of active development, our test suite has seen
a well-deserved spring clean up and refactoring, which allows us to
@@ -163,7 +143,7 @@ B.3. Extend the coverage of our test suite
### Writing more automated tests
-- B.3.3. Test "Report an error" launcher: #6904
+- B.3.3. Test "Report an error" launcher: [[!tails_ticket 6904]]
This was completed, and got rid of one more manual test we
previously had to do at release time.
@@ -179,10 +159,10 @@ B.3. Extend the coverage of our test suite
During this iteration, this included:
-- B.3.4. Research how we can use background snapshots more efficiently
- for speeding up the test suite. Report upstream any bug we discover
+- B.3.4. Research how we can use background snapshots more efficiently for speeding up the test suite
+ and report upstream any bug we discover
along the way, if any, in the hope that we can benefit more from
- this feature later on: #6094
+ this feature later on: [[!tails_ticket 6094]]
A proof-of-concept was created, and so far it is very convincing:
e.g. we've seen 20-30% test suite runtime decrease on various
@@ -195,20 +175,16 @@ During this iteration, this included:
our test suite more robust, as part of a project we have with
another sponsor.
-C. Scale our infrastructure
-===========================
+# C. Scale our infrastructure
-C.2. Be able to detect within hours failures and malfunction on our
-services
--------------------------------------------------------------------
+## C.2. Be able to detect within hours failures and malfunction on our services
This section is about monitoring the most critical pieces of the
infrastructure that supports Tails development. We have some early
progress to report about, even though this deliverable is technically
part of a milestone that is still many months in the future.
-- C.2.3. Do an inventory of the services that need monitoring and
- prioritize: #8649
+- C.2.3. Do an inventory of the services that need monitoring and prioritize: [[!tails_ticket 8649]]
We did that, and while we were at it we wrote a detailed
specification for the upcoming monitoring system, which will help
@@ -218,8 +194,7 @@ part of a milestone that is still many months in the future.
monitoring systems. A dedicated virtual machine has been set up for
these experiments.
-C.3. Make it easier for new contributors to start working on Tails
-------------------------------------------------------------------
+## C.3. Make it easier for new contributors to start working on Tails
Until a few months ago, cloning our main Git repository required
downloading more than 300 MB of data. Most of this corresponded to
@@ -239,8 +214,7 @@ identified and cleaned up regularly.
This covers deliverables C.3.1 to C.3.7.
-C.4. Maintain our already existing services
--------------------------------------------
+## C.4. Maintain our already existing services
This covers deliverables C.4.1 and C.4.2.
@@ -267,18 +241,15 @@ tasks we have completed:
* written a Puppet module to deploy systems able to run our
test suite.
-D. Migration to Debian Jessie
-=============================
+# D. Migration to Debian Jessie
We did quite some work on this migration. For details about bits that
are not covered by this OTF project, see
<https://labs.riseup.net/code/projects/tails/issues?query_id=130>.
-D.2. Take advantage of systemd to improve the internals of Tails
-----------------------------------------------------------------
+## D.2. Take advantage of systemd to improve the internals of Tails
-- D.2.1. Convert at least 4 of our custom initscripts to native
- systemd units
+- D.2.1. Convert at least 4 of our custom initscripts to native systemd units
The 9 custom initscripts currently shipped in Tails (based on Debian
Wheezy) were converted to systemd unit files. Besides, while we were
@@ -292,18 +263,16 @@ D.2. Take advantage of systemd to improve the internals of Tails
initscripts. For the record, the goal we want to reach here is to go
down to 9.
-D.6. Upgrade Tails-specific tools to Debian Jessie technologies
----------------------------------------------------------------
+## D.6. Upgrade Tails-specific tools to Debian Jessie technologies
-- D.6.1 Port Tails-specific tools from udisks 1 to udisks 2: #8292
+- D.6.1 Port Tails-specific tools from udisks 1 to udisks 2: [[!tails_ticket 8292]]
We have ported Tails Installer, Tails Upgrader, and the persistent
volume assistant to udisks 2. As a result, our Jessie branch does
not ship udisks 1 anymore, which forced us to port our automated
test suite (that still relied on it) as well.
-- D.6.2 Adjust the memory wipe on shutdown feature for Debian Jessie:
- #7183, #8372 and #9032
+- D.6.2 Adjust the memory wipe on shutdown feature for Debian Jessie: [[!tails_ticket 7183]], [[!tails_ticket 8372]] and [[!tails_ticket 9032]]
This ended up being quite involved, but was successfully completed.
@@ -319,12 +288,11 @@ D.6. Upgrade Tails-specific tools to Debian Jessie technologies
used by the Python 2 version, with others that support Python 3.
The last remaining step is to add native SOCKS proxy support to
this application, because for some reason the Python 3 version does
- not start under torsocks: #9412.
+ not start under torsocks: [[!tails_ticket 9412]]
-E. Release management
-=====================
+# E. Release management
- - Tails 1.3 was released on 2015-02-24 [2]:
+ - [[Tails 1.3|news/version_1.3]] was released on 2015-02-24:
- Add Electrum bitcoin wallet.
- Sandbox Tor Browser using AppArmor.
@@ -335,16 +303,12 @@ E. Release management
- Add Ibus Vietnamese input method.
- Improve support for OpenPGP smartcards.
- [2]: https://tails.boum.org/news/version_1.3/
-
- - Tails 1.3.1 was released on 2015-03-23 [3]:
+ - [[Tails 1.3.1|news/version_1.3.1]] was released on 2015-03-23:
- We transitioned to a new signing key.
- Updated Tor Launcher.
- [3]: https://tails.boum.org/news/version_1.3.1/
-
- - Tails 1.4 was released on 2015-05-12 [4]:
+ - [[Tails 1.4|news/version_1.4]] was released on 2015-05-12:
- Update Tor Browser to include the security slider and better
protection against third-party tracking.
@@ -363,14 +327,10 @@ E. Release management
- Fix the OpenPGP key servers configured in Seahorse.
- Prevent Tor Browser from crashing when Orca is enabled.
- [4]: https://tails.boum.org/news/version_1.4/
-
- - Tails 1.4.1 was released on 2015-07-03 [5]:
+ - [[Tails 1.4.1|news/version_1.4.1]] was released on 2015-07-03:
- Upgrade Tor Browser to 4.5.3.
- Upgrade Tor to 0.2.6.9-1~d70.wheezy+1+tails2.
- Upgrade Linux to 3.16.7-ckt11-1.
- Have AppArmor Deny Tor Browser access to the list of recently used files.
- Fix automatic upgrades in Windows camouflage.
-
- [5]: https://tails.boum.org/news/version_1.4.1/
diff --git a/wiki/src/contribute/reports/SponsorS/2015/2015_08.mdwn b/wiki/src/contribute/reports/SponsorS/2015/2015_08.mdwn
index 63d4ff8..e13af21 100644
--- a/wiki/src/contribute/reports/SponsorS/2015/2015_08.mdwn
+++ b/wiki/src/contribute/reports/SponsorS/2015/2015_08.mdwn
@@ -2,21 +2,10 @@
[[!toc levels=2]]
-<div class="caution">
-<strong>Deadline: 2015-09-05</strong>
-</div>
-
-<div class="note">
-Deliverable identifiers and descriptions are not free-form: they must
-be copy'n'pasted as-is from the proposal sent to the sponsor.
-</div>
-
-<pre>
-
# A. Replace Claws Mail with Icedove
In May we discovered than Claws Mail is leaking plaintext of encrypted
-emails to the IMAP server [1] and that it was impossible to fix this
+emails to the IMAP server and that it was impossible to fix this
properly in Tails. As a consequence, we're now considering moving to
Icedove faster than planned initially (late January) and to:
@@ -28,27 +17,21 @@ Icedove faster than planned initially (late January) and to:
We also started prototyping tools for users to migrate their data from
Claws Mail to Icedove but nothing is published yet.
-[1]: https://tails.boum.org/security/claws_mail_leaks_plaintext_to_imap/
-
# B. Improve our quality assurance process
-## B.1. Automatically build ISO images for all the branches of our
- source code that are under active development
+## B.1. Automatically build ISO images for all the branches of our source code that are under active development
- B.1.9. Deploy, refresh our Jenkins jobs regularly
After our code freeze for Tails 1.5, we realized that there was
a bug in our algorithm that detects what Git branch should be built
- on Jenkins (#9925). We promptly worked around the
+ on Jenkins ([[!tails_ticket 9925]]). We promptly worked around the
problem initially, to not interfere with the release management work.
And then, a proper fix was implemented and deployed.
- https://labs.riseup.net/code/issues/9925
-
-## B.2. Continuously run our entire test suite on all those ISO images
- once they are built
+## B.2. Continuously run our entire test suite on all those ISO images once they are built
-- B.2.1. Adjust our infrastructure to run tests in parallel (#9645, #9486)
+- B.2.1. Adjust our infrastructure to run tests in parallel: [[!tails_ticket 9645]], [[!tails_ticket 9486]]
All the testing VMs we planned to deploy (four of them) are now live,
and our test suite developers have access to them and can run the test
@@ -65,20 +48,14 @@ Claws Mail to Icedove but nothing is published yet.
clean test VM before each test suite run. Ideas to implement this have
been researched, evaluated, and discussed.
- https://labs.riseup.net/code/issues/9645
- https://labs.riseup.net/code/issues/9486
+- B.2.2. Decide what kind of ISO images qualify for testing and when, how to process, advertise, and store the results: [[!tails_ticket 8667]]
-- B.2.2. Decide what kind of ISO images qualify for testing and when,
- how to process, advertise, and store the results (#8667)
-
- The discussion has almost reached its end, and the corresponding
- blueprint [2] is now essentially complete. Now that this step is
+ The discussion has almost reached its end, and [[the corresponding
+ blueprint|blueprint/automated_builds_and_tests/automated_tests_specs]] is now essentially complete. Now that this step is
completed, we have clear design goals, and we know what will need to
be done to deploy our automated test suite on our Jenkins
infrastructure.
- [2]: https://tails.boum.org/blueprint/automated_builds_and_tests/automated_tests_specs/
-
# C. Scale our infrastructure
## C.4. Maintain our already existing services
@@ -88,19 +65,15 @@ the end of August.
- We fixed the "reboot required" notifications on our Jessie and
newer systems. The corresponding Puppet code was proposed upstream.
-- We started adapting our Puppet code to migrate to Gitolite v3 (#10093).
+- We started adapting our Puppet code to migrate to Gitolite v3 ([[!tails_ticket 10093]]).
- We experimented with http://httpredir.debian.org, with limited
success so far. It should improve with the version of APT that will
ship in Debian 9 (Stretch).
- We deployed to pre-production a meeting reminder system that should
- be more robust (#9172).
+ be more robust ([[!tails_ticket 9172]]).
- We converted some obsolete service management we had to systemd.
- We installed the base system of the VM that was planned to be a
- failover for our critical services (#6250).
-
- https://labs.riseup.net/code/issues/10093
- https://labs.riseup.net/code/issues/9172
- https://labs.riseup.net/code/issues/6250
+ failover for our critical services ([[!tails_ticket 6250]]).
# D. Migration to Debian Jessie
@@ -110,57 +83,44 @@ GUADEC and DebConf.
Still, aside of the achievements described below:
- We identified issues on Jessie with the AppArmor profile for CUPS
- (#9963). The Tails-specific part was corrected,
+ ([[!tails_ticket 9963]]). The Tails-specific part was corrected,
and more generic maintainability issues were raised on the upstream
mailing list.
- https://labs.riseup.net/code/issues/9963
-
- We identified a couple minor issues that we would like to address
- before the Tails 2.0 release (#9966, #9967), if time permits.
-
- https://labs.riseup.net/code/issues/9966
- https://labs.riseup.net/code/issues/9967
+ before the Tails 2.0 release ([[!tails_ticket 9966]], [[!tails_ticket 9967]]), if time permits.
## D.1. Adjust to the change of desktop environment to GNOME Shell
- Regarding the not fully solved problem we have with desktop
- notifications (#7989): we asked for advice to
+ notifications ([[!tails_ticket 7989]]): we asked for advice to
a GNOME developer, and were pointed to a technical solution that
seems to be exactly what we need.
- https://labs.riseup.net/code/issues/7989
-
## D.2. Take advantage of systemd to improve the internals of Tails
- D.2.2. Replace our patches to upstream initscripts with systemd
- drop-in overrides (#9881)
+ drop-in overrides ([[!tails_ticket 9881]])
We actually found a better solution to solve the underlying problem.
The objective was to patch 9 initscripts maximum, and we are now
modifying only 8.
- https://labs.riseup.net/code/issues/9881
-
## D.6. Upgrade Tails-specific tools to Debian Jessie technologies
- D.6.1. Port Tails-specific tools from udisks 1 to udisks 2
We worked a bit on simple reproducers for the race conditions we are
- seeing in udisks (#9691).
-
- https://labs.riseup.net/code/issues/9691
+ seeing in udisks ([[!tails_ticket 9691]]).
- D.6.3. Port WhisperBack, our integrated bug reporting tool, to Python 3
We fixed a bug caused by a typo, and made progress on adding native
- SOCKS support to WhisperBack (#9412).
-
- https://labs.riseup.net/code/issues/9412
+ SOCKS support to WhisperBack ([[!tails_ticket 9412]]).
# E. Release management
- - Tails 1.5 [3] was released on 2015-08-11
+ - [[Tails 1.5|news/version_1.5]] was released on 2015-08-11
- Disable access to the local network in the Tor Browser. Users
should now use the Unsafe Browser to access the local network.
@@ -173,13 +133,7 @@ Still, aside of the achievements described below:
- Our AppArmor setup has been audited and improved in various ways
which should harden the system.
- [3]: https://tails.boum.org/news/version_1.5/
-
- - Tails 1.5.1 [4] was released on 2015-08-28
+ - [[Tails 1.5.1|news/version_1.5.1]] was released on 2015-08-28
Tails 1.5.1 was an emergency release triggered by an unscheduled Firefox
release meant to fix critical security issues.
-
- [4]: https://tails.boum.org/news/version_1.5.1/
-
-</pre>
diff --git a/wiki/src/contribute/reports/SponsorS/2015/2015_09.mdwn b/wiki/src/contribute/reports/SponsorS/2015/2015_09.mdwn
index be7816b..3f6e8fc 100644
--- a/wiki/src/contribute/reports/SponsorS/2015/2015_09.mdwn
+++ b/wiki/src/contribute/reports/SponsorS/2015/2015_09.mdwn
@@ -2,23 +2,10 @@
[[!toc levels=2]]
-<div class="caution">
-<strong>Deadline: 2015-10-05</strong>
-</div>
-
-<div class="note">
-Deliverable identifiers and descriptions are not free-form: they must
-be copy'n'pasted as-is from the proposal sent to the sponsor.
-</div>
-
This reports covers the activity of Tails in September 2015.
Everything in this report can be made public.
-Note: the numbers preceded with a `#` correspond to tickets in our bug
-tracker which contain more technical details and timeline. For example,
-ticket #6938 can be seen on <https://labs.riseup.net/code/issues/6938>.
-
# A. Replace Claws Mail with Icedove
- A.1.3. Integrate Icedove into Tails
@@ -28,23 +15,23 @@ ticket #6938 can be seen on <https://labs.riseup.net/code/issues/6938>.
Icedove in Tails 1.7 (2015-11-03), but without the Icedove account
setup wizard. During this first stage, Torbirdy's own account setup
wizard will be used. And the second stage will be about securing
- Icedove's wizard (#6154). If this works out as we hope, Tails users
+ Icedove's wizard ([[!tails_ticket 6154]]). If this works out as we hope, Tails users
will be able to start using Icedove two months earlier than what we
planned initially, and the transition period from Claws Mail will be
longer, and thus smoother, for users.
- We started implementing this plan (#10285), set up team coordination
+ We started implementing this plan ([[!tails_ticket 10285]]), set up team coordination
tools, and triaged what is a blocker for the first stage, from what is
not.
Then we worked on the "Torbirdy uses Arabic as a default locale"
- bug, submitted a pull request upstream, that was accepted (#9821).
+ bug, submitted a pull request upstream, that was accepted ([[!tails_ticket 9821]]).
- A.1.4. Provide a migration path for our users from Claws Mail to Icedove
We decided how long to keep Claws Mails once we have Icedove
- (#10010), and initiated work on the migration for users of Tails
- persistence feature (#9498).
+ ([[!tails_ticket 10010]]), and initiated work on the migration for users of Tails
+ persistence feature ([[!tails_ticket 9498]]).
# B. Improve our quality assurance process
@@ -57,13 +44,13 @@ ticket #6938 can be seen on <https://labs.riseup.net/code/issues/6938>.
machine before each test suite run. It was tricky to implement this in
a way that prevented race conditions, but we now have a working
prototype that we are confident fixes the issues we have seen earlier
- (#9486, #10215). Along the way we encouraged a few Debian developers
+ ([[!tails_ticket 9486]], [[!tails_ticket 10215]]). Along the way we encouraged a few Debian developers
to take care of a package we rely on (`jenkins-job-builder`), and one
of them promptly took it over and updated it to the version we need
- (#9646).
+ ([[!tails_ticket 9646]]).
- B.2.2. Decide what kind of ISO images qualify for testing and when,
- how to process, advertise, and store the results (#8667)
+ how to process, advertise, and store the results ([[!tails_ticket 8667]])
Early in September, we reached an agreement on all discussion topics
that were left pending in August, such as how to archive videos from
@@ -76,13 +63,13 @@ ticket #6938 can be seen on <https://labs.riseup.net/code/issues/6938>.
- B.2.3. Research and design a solution to generate a set of Jenkins ISO test jobs
Some research and experiments were done for sending ISO images that
- shall be tested to the test suite runner virtual machines (#9597), and
+ shall be tested to the test suite runner virtual machines ([[!tails_ticket 9597]]), and
major blockers were removed in the underlying infrastructure. Some of
our Puppet code saw a nice refactoring in this process. On the same
topic, we reached a consensus regarding what "old" ISO image to use
- for tests that require two images, such as upgrade tests (#10117). And
+ for tests that require two images, such as upgrade tests ([[!tails_ticket 10117]]). And
here as well, test suite developers promptly implemented what we
- needed (#10147).
+ needed ([[!tails_ticket 10147]]).
<https://tails.boum.org/blueprint/automated_builds_and_tests/jenkins/>
@@ -90,7 +77,7 @@ ticket #6938 can be seen on <https://labs.riseup.net/code/issues/6938>.
### General improvements
-- Filesystem shares are incompatible with QEMU snapshots: #5571
+- Filesystem shares are incompatible with QEMU snapshots: [[!tails_ticket 5571]]
We have come up with a short-term strategy that will work well with
our current workflow. In addition we have our eyes on a long-term
@@ -107,30 +94,30 @@ images once they are built".
It should be noted that many of the things mentioned here also greatly
assist developers when debugging the automated test suite.
-- Leverage Cucumber's formatter system for debug logging: #9491
+- Leverage Cucumber's formatter system for debug logging: [[!tails_ticket 9491]]
This makes it easier to have clean console logging while still
keeping the full debug log in a separate file. Consequently it will
be easier to get an overview of how a test is currently running.
-- Capture individual videos for failed scenarios only: #10148
+- Capture individual videos for failed scenarios only: [[!tails_ticket 10148]]
This will both make these video artifacts more manageable and useful
for the developers (more focused, better granularity), and will save
a lot of disk space on our servers by excluding videos of tests that
succeeded and hence aren't very interesting.
-- Make the old Tails ISO default to the "new" ISO: #10147
+- Make the old Tails ISO default to the "new" ISO: [[!tails_ticket 10147]]
This compromise will test 90% of what we want to test, and simplify
the Jenkins setup by eliminating the need to share multiple ISO
artifacts to the test suite context.
-### B.3.6. Fix newly identified issues to make our test suite more robust and faster
+## B.3.6. Fix newly identified issues to make our test suite more robust and faster
-#### Performance improvements
+### Performance improvements
-- Snapshot improvements: #6094, #8008
+- Snapshot improvements: [[!tails_ticket 6094]], [[!tails_ticket 8008]]
The proof-of-concept that was written as part of B.3.4 has matured
into a reliable implementation and
@@ -141,35 +128,35 @@ assist developers when debugging the automated test suite.
thus complete "B.3.9. Optimize tests that need a persistent volume"
three months in advance.
-- Use the more efficient x264 encoding when capturing videos: #10001
+- Use the more efficient x264 encoding when capturing videos: [[!tails_ticket 10001]]
This will reduce the CPU load on the host running the automated test
suite, as well as reduce its runtime with a few percent.
-- Optimize IRC test using waitAny: #9653
+- Optimize IRC test using waitAny: [[!tails_ticket 9653]]
In case there are connection issues, this may save several minutes
per instance by waiting for both the failure and success condition
in parallel, instead of serially.
-#### Robustness improvements
+### Robustness improvements
Some of what follows was part of a project we have with
another sponsor.
-- Avoid nested FindFailed exceptions in waitAny()/findAny(): #9633
+- Avoid nested FindFailed exceptions in waitAny()/findAny(): [[!tails_ticket 9633]]
This works around a race condition due to a bug in Rjb that made
these helpers fail with some probability depending on the host
hardware.
-- Import logging module in otr-bot.py: #9375
+- Import logging module in otr-bot.py: [[!tails_ticket 9375]]
Without this fix, the bot may occasionally fail due to it wanting to
use the logging facility when it is not in place.
- Force new Tor circuit and reload web site on browser
- timeouts: #10116
+ timeouts: [[!tails_ticket 10116]]
Given the inherent instability of Tor circuits, this will
drastically improve the robustness of all Tor Browser tests.
@@ -178,18 +165,18 @@ another sponsor.
(e.g. one window covering the window we want to interact with):
* Focus Pidgin's buddy list before trying to access the tools
- menu: #10217
+ menu: [[!tails_ticket 10217]]
- * Wait for (and focus if necessary) Pidgin's Certificate windows: #10222
+ * Wait for (and focus if necessary) Pidgin's Certificate windows: [[!tails_ticket 10222]]
-- Develop a strategy for dealing with newly discovered fragile tests: #10288
+- Develop a strategy for dealing with newly discovered fragile tests: [[!tails_ticket 10288]]
By leveraging our Jenkins instance, following this strategy will
isolate individual robustness issues into individual branches while
keeping all other branches functional. Consequently it will be
easier to track and deal with future robustness issues.
-- Escape regexp used to match nick in CTCP replies: #10219
+- Escape regexp used to match nick in CTCP replies: [[!tails_ticket 10219]]
Due to how we randomize the nick name for the default Pidgin
accounts, there was a 10% chance to generate one with characters
@@ -199,7 +186,7 @@ another sponsor.
### Writing more automated tests
- B.3.8. Automatically test that udev-watchdog is monitoring the
- right device: #9890.
+ right device: [[!tails_ticket 9890]].
This was completed and merged almost four months ahead of schedule.
@@ -222,25 +209,25 @@ The big picture is described on the corresponding blueprint:
implementation choices, and started researching what would be the
best naming scheme for mirrors, taking into account future HTTPS
hardening we have in mind, and support in various popular web
- servers (#10294).
+ servers ([[!tails_ticket 10294]]).
- C.1.3. Design and implement the mirrors pool administration process and tools
We settled on ikiwiki overlays for integration into our website, and
- on using Git and SSH to store and convey the configuration (#8637).
+ on using Git and SSH to store and convey the configuration ([[!tails_ticket 8637]]).
- C.1.2. Write & audit the code that makes the redirection decision
- We did some prototyping work (#8639), and then started refactoring
+ We did some prototyping work ([[!tails_ticket 8639]]), and then started refactoring
it so that the code can be reused by other components that will need
- to implement the same redirection scheme client-side (#10284).
+ to implement the same redirection scheme client-side ([[!tails_ticket 10284]]).
## C.2. Be able to detect within hours failures and malfunction on our services
This deliverable is technically due for January 15, but we kept on
working on it.
-- C.2.1. Research and decide what monitoring solution to use: #8645
+- C.2.1. Research and decide what monitoring solution to use: [[!tails_ticket 8645]]
We completed experiments and comparisons between monitoring systems,
and settled on Icinga 2. We started looking for solutions regarding
@@ -249,23 +236,22 @@ working on it.
<https://tails.boum.org/blueprint/monitor_servers/>
- C.2.2. Set up the monitoring software and the underlying
- infrastructure: #8646, #8647
+ infrastructure: [[!tails_ticket 8646]], [[!tails_ticket 8647]]
We found hosting for our monitoring setup, got access to the
machine, and installed an operating system on it.
## C.4. Maintain our already existing services
-This covers "C.4.3. Administer our services upto milestone III" until
-the end of September.
+- C.4.3. Administer our services upto milestone III
-Aside of the usual security updates and taking care of daily requests
-coming from the Tails development community, we did some resources
-planning, and updated the system requirements for the VM that will be
-used as a failover for our critical services (#10243) and looked for
-hosting that would meet our needs (#10244). We have an initial
-agreement with a hosting organization, and will follow-up on
-this shortly.
+ Aside of the usual security updates and taking care of daily requests
+ coming from the Tails development community, we did some resources
+ planning, and updated the system requirements for the VM that will be
+ used as a failover for our critical services ([[!tails_ticket 10243]]) and looked for
+ hosting that would meet our needs ([[!tails_ticket 10244]]). We have an initial
+ agreement with a hosting organization, and will follow-up on
+ this shortly.
# D. Migration to Debian Jessie
@@ -274,10 +260,10 @@ this shortly.
- D.1.1. Adjust to the change of desktop environment to GNOME Shell
We completed the work started on our "Shutdown helper" applet for
- Jessie (#8302): visually impaired users can now use it, and we made
+ Jessie ([[!tails_ticket 8302]]): visually impaired users can now use it, and we made
sure it is integrated with our translation system.
- We cleaned up the desktop Applications menu (#8505).
+ We cleaned up the desktop Applications menu ([[!tails_ticket 8505]]).
## D.6. Upgrade Tails-specific tools to Debian Jessie technologies
@@ -285,30 +271,30 @@ this shortly.
We followed up on the persistent volume assistant's porting to
udisks 2, and made sure it does not trigger spurious GNOME
- notifications that could confuse users (#9280).
+ notifications that could confuse users ([[!tails_ticket 9280]]).
- D.6.3. Port WhisperBack, our integrated bug reporting tool, to Python 3
Native SOCKS support was completed, which was the only missing piece
- to make WhisperBack work great on Jessie and Python 3 (#9412).
+ to make WhisperBack work great on Jessie and Python 3 ([[!tails_ticket 9412]]).
## Additional improvements that were not planned
- When starting Tails in a virtual machine that runs with non-free
technology (and does not hide this fact), users are now warned about
- the risks (#5315).
+ the risks ([[!tails_ticket 5315]]).
- Simplify printers administration: it can now be done without having
to set an administration password, just like it was back when Tails
- was based on Debian Squeeze (#8443). This removes a usability
+ was based on Debian Squeeze ([[!tails_ticket 8443]]). This removes a usability
pain-point, namely the need to restart Tails when one realizes too
late they need to print a document, and should have set an
administration password. In passing, we noticed that AppArmor
- blocked adding a printer on Jessie, and fixed it (#10210).
+ blocked adding a printer on Jessie, and fixed it ([[!tails_ticket 10210]]).
# E. Release management
-- Tails 1.6 was released on 2015-09-22 [1]:
+- [[Tails 1.6|news/version_1.6]] was released on 2015-09-22:
* Upgrade Tor Browser to version 5.0.3 (based on Firefox 38.3.0 ESR).
* Upgrade I2P to version 0.9.22 and enable its AppArmor profile.
@@ -319,5 +305,3 @@ this shortly.
- A notification is displayed if MAC address spoofing causes
network issues, for example if a network only allows
connections from a list of authorized MAC addresses.
-
- [1] <https://tails.boum.org/news/version_1.6/>
diff --git a/wiki/src/contribute/reports/SponsorS/2015/2015_10.mdwn b/wiki/src/contribute/reports/SponsorS/2015/2015_10.mdwn
index d0bc789..a15ff87 100644
--- a/wiki/src/contribute/reports/SponsorS/2015/2015_10.mdwn
+++ b/wiki/src/contribute/reports/SponsorS/2015/2015_10.mdwn
@@ -2,64 +2,51 @@
[[!toc levels=2]]
-<div class="caution">
-<strong>Deadline: 2015-11-05</strong>
-</div>
-
-<div class="note">
-Deliverable identifiers and descriptions are not free-form: they must
-be copy'n'pasted as-is from the proposal sent to the sponsor.
-</div>
-
This reports covers the activity of Tails in October 2015.
Everything in this report can be made public.
-Note: the numbers preceded with a `#` correspond to tickets in our bug
-tracker which contains more technical details and timeline. For example,
-ticket #6938 can be seen on <https://labs.riseup.net/code/issues/6938>.
-
# A. Replace Claws Mail with Icedove
- A.1.3. Integrate Icedove into Tails
- We configured Icedove in Tails to match our security goals (#6151),
+ We configured Icedove in Tails to match our security goals ([[!tails_ticket 6151]]),
as part of this we disabled:
- - The remote email account feature (#10009)
- - The automatic add-on updates (#10428)
+ - The remote email account feature ([[!tails_ticket 10009]])
+ - The automatic add-on updates ([[!tails_ticket 10428]])
- We adapted Torbirdy to suit our needs in Tails. (#10007)
+ We adapted Torbirdy to suit our needs in Tails. ([[!tails_ticket 10007]])
During this work we discovered a bug in Torbirdy sometimes
choosing a wrong language, which we patched upstream. Once our
patch was merged, we updated the Torbirdy Debian package to a new
- version which we could also include in Tails. (#9821)
+ version which we could also include in Tails. ([[!tails_ticket 9821]])
- A.1.4. Provide a migration path for our users from Claws Mail to Icedove
We studied the most common Claws Mail persistence configuration
- (#9494, #5663), then provided a script (#10453) to migrate POP
+ ([[!tails_ticket 9494]], [[!tails_ticket 5663]]), then provided a script ([[!tails_ticket 10453]]) to migrate POP
mailboxes to Icedove and wrote
- [migration instructions](https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove/)
- (#9495) for users to migrate their mailboxes, email account
+ [[migration instructions|doc/anonymous_internet/claws_mail_to_icedove]]
+ ([[!tails_ticket 9495]]) for users to migrate their mailboxes, email account
settings, and address books.
To make this migration easier to users, we enabled automatically the
Icedove persistence feature when the Claws Mail persistence was
- enabled (#9498) and temporarily added the `nmh` package to Tails.
+ enabled ([[!tails_ticket 9498]]) and temporarily added the `nmh` package to Tails.
- A.1.5. Update Icedove documentation
- The previous Thunderbird documentation was [completely
- rewritten](https://tails.boum.org/doc/anonymous_internet/icedove/). (#7158)
+ The previous Thunderbird documentation was [[completely
+ rewritten|doc/anonymous_internet/icedove]]). ([[!tails_ticket 7158]])
- A.1.6. Release Icedove in Tails
- Icedove has been added to Tails 1.7. (#10285)
+ Icedove has been added to Tails 1.7. ([[!tails_ticket 10285]])
It is advertised as a technology preview in our
- [release notes](https://tails.boum.org/news/version_1.7/). We want
+ [[release notes|news/version_1.7]]). We want
to have some more advanced users test our configuration and the
migration process before we make Icedove the default email client
and remove Claws Mail.
@@ -82,14 +69,14 @@ servers since the deployment of the automatic ISO builds:
- B.2.3. Research and design a solution to generate a set of Jenkins ISO test jobs
Early in October we finally settled to the best option we found to
- reboot the VM between each run of the test suite in Jenkins (#9486).
+ reboot the VM between each run of the test suite in Jenkins ([[!tails_ticket 9486]]).
We finished evaluating the solution set up last month to share
artifacts between the build jobs and the corresponding test jobs,
- and concluded that it works correctly. (#9597)
+ and concluded that it works correctly. ([[!tails_ticket 9597]])
We had to upgrade our jenkins-job-builder setup to the new 1.3.0 version,
- which was required to configure some Jenkins plugins our test jobs need. (#9646)
+ which was required to configure some Jenkins plugins our test jobs need. ([[!tails_ticket 9646]])
We also pushed upstream a patch to handle the CucumberTestResult Jenkins
plugin, so that we can easily use it in our setup and have a nice display of
@@ -97,24 +84,25 @@ servers since the deployment of the automatic ISO builds:
jenkins-job-builder 1.4.0: <https://review.openstack.org/#/c/218668/>.
We worked together with the test suite team on getting video artifacts
- for failing scenarios of a test job stored so that we could better debug. (#10154)
+ for failing scenarios of a test job stored so that we could better debug. ([[!tails_ticket 10154]])
With all this, we were able to deploy automated tests of ISO builds
automatically for our main release branches at the end of the first week of
- October, which helped us confirm our design was working. (#10117)
+ October, which helped us confirm our design was working. ([[!tails_ticket 10117]])
<https://tails.boum.org/blueprint/automated_builds_and_tests/jenkins/>
- B.2.4. Deploy the best solution from this research
With this first initial and limited deployment, we corrected some tiny
- configuration details we didn't catch during the design step. (#10215, #10417)
+ configuration details we didn't catch during the design step.
+ ([[!tails_ticket 10215]], [[!tails_ticket 10417]])
We stumbled upon a bug due to hardware or kernel troubles with nested
- virtualization we had to workaround. (#10229)
+ virtualization we had to workaround. ([[!tails_ticket 10229]])
It also helped us fix some issues in the integration of our test
- in the Jenkins environment. (#10356, #10359)
+ in the Jenkins environment. ([[!tails_ticket 10356]], [[!tails_ticket 10359]])
- B.2.5. Write library code that maps Jenkins jobs from building to testing
@@ -123,7 +111,7 @@ servers since the deployment of the automatic ISO builds:
adapted our code that generates build jobs for active branches to
output their corresponding test jobs. We also ended up using the power
of a more recent jenkins-job-builder version to simplify
- this code quite a lot. (#10118, #10119)
+ this code quite a lot. ([[!tails_ticket 10118]], [[!tails_ticket 10119]])
It was already clear that we wouldn't be able to notify the
committers on test suite failures at first, as the number of false
@@ -131,7 +119,7 @@ servers since the deployment of the automatic ISO builds:
such notifications. So we planned a first iteration during which
only the test suite team would receive notifications upon failure,
so that they'll be able to work on the remaining tests being too
- fragile. (#10287)
+ fragile. ([[!tails_ticket 10287]])
By October 15th, we had the automated test deployed live in Jenkins
for all active branches. However, we quickly understood that our Git
@@ -145,7 +133,7 @@ servers since the deployment of the automatic ISO builds:
We're also discussing on our public mailing list whether it makes sense to
run our whole test suite on ISO images built from
- documentation branches. (#10492)
+ documentation branches. ([[!tails_ticket 10492]])
## B.3. Extend the coverage of our test suite
@@ -153,7 +141,7 @@ servers since the deployment of the automatic ISO builds:
- B.3.5. Write tests for I2P
Basic I2P functionality and configuration that is important in the
- context of Tails is now tested (#6306):
+ context of Tails is now tested ([[!tails_ticket 6306]]):
<https://git-tails.immerda.ch/tails/tree/features/i2p.feature?h=stable>
@@ -165,57 +153,57 @@ servers since the deployment of the automatic ISO builds:
A plan was devised to leverage out automated testing
infrastructure for identifying robustness issues is our test suite, and isolating
them into separate branches, where they can be dealt with in
- isolation. (#10288)
+ isolation. ([[!tails_ticket 10288]])
Other improvements:
* The new snapshot system improved robustness noticeably, and
reduced the amount of time needed for a full run with at least
- 30%. (#6094)
+ 30%. ([[!tails_ticket 6094]])
* Restart Tor if bootstrapping stalls for too long.
This started out as a robustness improvement in the test suite,
since many tests failed randomly due to Tor. We then implemented
it as a feature in Tails, since it arguably should improve the
- user experience too (#9516).
+ user experience too ([[!tails_ticket 9516]]).
- B.3.9. Optimize tests that need a persistent volume
The new snapshot system was finished early (part of Milestone IV,
- January 15, 2015). (#6094, #8008)
+ January 15, 2015). ([[!tails_ticket 6094]], [[!tails_ticket 8008]])
- B.3.13. Split the "various checks" feature
Started early, but not finished; so far only `mat.feature` and
`localization.feature` have been created from split out
- scenarios. Thanks to #6094 the remainder of this work will be
+ scenarios. Thanks to [[!tails_ticket 6094]], the remainder of this work will be
trivial.
- Some other new tests that were written:
- * Write initial Icedove tests. (#10332)
+ * Write initial Icedove tests. ([[!tails_ticket 10332]])
* Write a test for the fix of a symlink attack. It was added at
the same time as the fix, and this is the ideal workflow we hope
- to be ready to adopt soon. (#10333)
+ to be ready to adopt soon. ([[!tails_ticket 10333]])
- Some improvements for test suite developers:
* Organize automated test suite artifacts in per-run directories,
and improve the naming so that it's easier to see e.g. which video
- belongs to which failed scenario. (#10151)
+ belongs to which failed scenario. ([[!tails_ticket 10151]])
- * Clean up automated test suite dependencies. (#10208)
+ * Clean up automated test suite dependencies. ([[!tails_ticket 10208]])
* Force UTF-8 locale in automated test suite, to avoid implicitly
- relying on the system locales configuration. (#10359)
+ relying on the system locales configuration. ([[!tails_ticket 10359]])
- * Run the automated test suite's VNC server forever. (#10345)
+ * Run the automated test suite's VNC server forever. ([[!tails_ticket 10345]])
* Don't print test suite information to STDERR, but use the
Cucumber logging facilities so this information is included when
- logging to file. (#10342)
+ logging to file. ([[!tails_ticket 10342]])
- Bugs and regressions identified by our test suite
@@ -223,29 +211,31 @@ servers since the deployment of the automatic ISO builds:
probably not complete.
* "Restart Tor if bootstrapping stalls for too long", mentioned
- above (#9516).
+ above ([[!tails_ticket 9516]]).
* In September, implementing the automated MAC spoofing tests led
- us to notice that the MAC spoofing's panic mode was broken (#10160).
+ us to notice that the MAC spoofing's panic mode was broken
+ ([[!tails_ticket 10160]]).
## B.4. Freezable APT repository
- B.4.1. Specify when we want to import foreign packages into which
- APT suites (#9488),
- B.4.4. Design freezable APT repository (#5926),
+ APT suites ([[!tails_ticket 9488]]),
+ B.4.4. Design freezable APT repository ([[!tails_ticket 5926]]),
and B.4.5. Implement processes and tools for importing and freezing
- those packages (#9487, #6295, #7427, #6906)
+ those packages ([[!tails_ticket 9487]], [[!tails_ticket 6295]],
+ [[!tails_ticket 7427]], [[!tails_ticket 6906]])
Some initial research and experiments were conducted.
The proposed design is described on a blueprint:
<https://tails.boum.org/blueprint/freezable_APT_repository/>.
- A server-side implementation (#6296, #6299) has been drafted in the
+ A server-side implementation ([[!tails_ticket 6296]], [[!tails_ticket 6299]]) has been drafted in the
`tails::reprepro::snapshots::*` Puppet classes in the
<https://git-tails.immerda.ch/puppet-tails/> module.
- B.4.2. Implement a mechanism to save the list of packages used at
- ISO build time (#6297)
+ ISO build time ([[!tails_ticket 6297]])
We have found ways to implement this, and have a working
proof-of-concept, that now needs to be refined. This implied adding
@@ -264,30 +254,29 @@ servers since the deployment of the automatic ISO builds:
- C.1.2. Write & audit the code that makes the redirection decision
- Our prototype code (#8639) has been refined and will be adapted to work
+ Our prototype code ([[!tails_ticket 8639]]) has been refined and will be adapted to work
with our new installation assistant.
## C.2. Be able to detect within hours failures and malfunction on our services
-- C.2.1. Research and decide what monitoring solution to use: #8645
+- C.2.1. Research and decide what monitoring solution to use: [[!tails_ticket 8645]]
A little bit more research was done to ensure that our current best
option will satisfy our needs.
## C.4. Maintain our already existing services
-This covers "C.4.3. Administer our services upto milestone III" until
-the end of October.
+- C.4.3. Administer our services upto milestone III
* We kept on answering to the request from the community as well as taking
care of security updates.
* We had to reinstall one of our ISO builder VM that was failing too
- often. (#10334)
+ often. ([[!tails_ticket 10334]])
* The OpenPGP key of our Debian repository was going to expire, so we had to
- update it. (#10419)
+ update it. ([[!tails_ticket 10419]])
* We thought a bit further how we could make our Jenkins instance public
(#6270) which probably means to update to the packages provided by
- upstream. (#10068)
+ upstream. ([[!tails_ticket 10068]])
# D. Migration to Debian Jessie
@@ -295,9 +284,9 @@ the end of October.
- D.3.1 Update our test suite for Tails Jessie
- * Fix memory erasure tests in Debian Jessie. (#8317, #9705)
+ * Fix memory erasure tests in Debian Jessie. ([[!tails_ticket 8317]], [[!tails_ticket 9705]])
- * Work around screen blanking when testing Synaptic. (#10403)
+ * Work around screen blanking when testing Synaptic. ([[!tails_ticket 10403]])
* Fix a robustness issue with the "Applications" menu
- handling. (#9706)
+ handling. ([[!tails_ticket 9706]])
diff --git a/wiki/src/contribute/reports/SponsorS/2015/2016_04.mdwn b/wiki/src/contribute/reports/SponsorS/2015/2016_04.mdwn
new file mode 100644
index 0000000..0565303
--- /dev/null
+++ b/wiki/src/contribute/reports/SponsorS/2015/2016_04.mdwn
@@ -0,0 +1,364 @@
+[[!meta title="Tails April 2016 report"]]
+
+[[!toc levels=2]]
+
+This reports covers the activity of Tails in April 2016. We had
+a quarterly milestone (V) ending in April, so we are also summing up
+the status of our projects and deliverables at the end of
+this milestone.
+
+Everything in this report is public.
+
+# A. Replace Claws Mail with Icedove
+
+## A.1.1. Secure the Icedove autoconfig wizard ([[!tails_ticket 6154]])
+
+Our modifications to secure the Icedove autoconfig wizard have been
+merged into TorBirdy. A new version of TorBirdy is yet to be released
+though. We are currently undecided if we want to update the TorBirdy
+Debian package until this happens, or wait until we can package the
+new upstream release.
+
+TorBirdy disables Thunderbird's autoconfig wizard by default, and in
+order not to lose TorBirdy's secure options, we made some changes for
+Tails to be able to use the wizard, while still proposing only
+secure options.
+
+What these patches do:
+
+ * Use Tor's SOCKSPort for Enigmail's keyserver configuration.
+ It's not necessarily the case that users have a HTTP proxy running
+ on port 8118, and if they do it may be a non-torified one.
+ Using the Tor's SOCKSPort will always work, and be torified.
+ * Always disable remote account creation. If that is something
+ TorBirdy developers
+ want to make enabled as an option, it should be handled separately
+ from the autoconfig wizard. This fixes Tails bug [[!tails_ticket 10464]].
+ * Do not check for new messages at startup.
+
+Our current plan is to include modified versions of TorBirdy and
+Icedove in Tails 2.4, so that we can enable the secured autoconfig
+wizard, improve user experience and complete this deliverable.
+
+## A.1.2. Make our improvements maintainable for future versions of Icedove
+
+In order to make our improvements maintainable for future versions of
+Icedove, we've submitted our patches upstream, as reported earlier.
+They are currently still being reviewed but we are happy to announce
+that there has been a
+[little progress](https://bugzilla.mozilla.org/show_bug.cgi?id=971347#c34)
+on this
+process. We will follow up on this very closely in order to obtain
+a common strategy and provide these secure options to all
+Thunderbird and Icedove users.
+
+However, Thunderbird's upstream is still in the process of being
+reorganized since Mozilla has announced to give the project a new home.
+That might explain why review processes take quite some time. Thus, we
+assume that our modifications will likely not be merged before we
+release Tails 2.4. That's why we've now decided, against our previous
+decision, to ship our own, modified Icedove and TorBirdy until
+everything has been merged upstream.
+
+## Other Icedove-related work (out of the scope of this grant)
+
+What's not been done yet is to provide an AppArmor profile for the
+Icedove Debian package. However, progress has been made on this front
+too: the profile made by Simon Déziel has been reviewed and merged
+into AppArmor upstream already. That means it will now be very easy
+for us to provide a patch and ship this profile in Tails.
+
+# B. Improve our quality assurance process
+
+## B.1. Automatically build ISO images for all the branches of our source code that are under active development
+
+In April, **779 ISO images** were automatically built by our Jenkins
+instance.
+
+## B.2. Continuously run our entire test suite on all those ISO images once they are built
+
+In April, **778 ISO images** were automatically tested by our Jenkins
+instance.
+
+- B.2.4. Implement and deploy the best solution from this research: [[!tails_ticket 5288]]
+
+ We closed a bug where our isotesters sometimes were not connecting
+ back to our Jenkins master after being rebooted, as it didn't
+ happen ever again. [[!tails_ticket 10601]]
+
+ So, this deliverable is now completed.
+
+## B.3. Extend the coverage of our test suite
+
+### B.3.11. Fix newly identified issues to make our test suite more robust and faster
+
+- Robustness improvements
+
+ As discussed
+ [[last month|contribute/reports/SponsorS/2015/2016_03#index3h2]] and
+ the
+ [[one before|contribute/reports/SponsorS/2015/2016_02#index3h2]], we
+ have continued trying out new "fundamental approaches" to deal with
+ our robustness issues. This month we have looked closer at the
+ "transient network issues", of which all seem to be related to using
+ the real Tor network. Our solution ended up being to run our own
+ miniature Tor network on the automated test suite host using the Tor
+ project's own tool for running Tor network diagnostic tests,
+ [Chutney](https://gitweb.torproject.org/chutney.git). ([[!tails_ticket 9521]])
+
+ The Tor client shipped in Tails is hardcoded to use the real Tor
+ network, but after we carefully "patch" it to use our Tor network
+ during tests, everything is essentially identical to the real thing
+ from Tails' perspective, so we can trust the testing
+ results. Initial test results are very positive -- so far no
+ Tor-related test failures have been observed with this approach, so
+ it seems sufficient for our immediate needs. On the bonus-side, we
+ now have some of the features and systems in place required for our
+ long-term goal of running all network services locally for even more
+ control, performance and (most importantly) increased
+ reliability. ([[!tails_ticket 9519]], [[!tails_ticket 9520]])
+
+ This concludes our two experiments with new fundamental approaches,
+ of which both seem to be successes. The next two months will be used
+ to fully integrate them into our test suite, and use these new tools
+ to fix specific tests that we see still exhibiting these types of
+ robustness problems.
+
+## B.4. Freezable APT repository
+
+First, note that in February, we shared
+[[updated development schedule|contribute/reports/SponsorS/2015/2016_02#index4h2]]
+for this project.
+
+- B.4.1. Specify when we want to import foreign packages into which APT suites ([[!tails_ticket 9488]])
+ and B.4.4. Design freezable APT repository ([[!tails_ticket 9487]])
+
+ These were delivered in March.
+
+- B.4.2. Implement a mechanism to save the list of packages used at ISO build time ([[!tails_ticket 10748]], [[!tails_ticket 10749]])
+
+ We still have to do some polishing but are happy with how this component
+ works now.
+
+ In April, we focused on C.1 (Change in depth the infrastructure of
+ our pool of mirrors) so much that we did not manage to polish this
+ in time for Tails 2.3. So, we now aim to get this merged in time for
+ Tails 2.4.
+
+ This will allow us to store, virtually forever, all the packages needed to build
+ a given Tails release.
+
+- B.4.3. Centralize and merge the list of needed packages
+
+ As [[explained last month|contribute/reports/SponsorS/2015/2016_03#index4h2]],
+ the original definition of this deliverable doesn't make sense
+ anymore, so here we are reporting about what now replaces it:
+
+ * Allow storing APT snapshots longer than the default when needed. For
+ example to store the snapshots used during a code freeze that lasts
+ longer than usual and prevent them from being deleted by our garbage
+ collector: the
+ [corresponding script](https://git-tails.immerda.ch/puppet-tails/tree/files/reprepro/snapshots/time_based/tails-bump-apt-snapshot-valid-until)
+ was tested and works fine.
+
+ * Freeze and unfreeze the APT snapshots used by a branch when
+ needed: the
+ [corresponding script](https://git-tails.immerda.ch/tails/tree/auto/scripts/apt-snapshots-serials?h=feature/build-from-snapshots)
+ passed early testing in March, but we did not work on it April.
+ This will be one of our main focuses in May.
+
+- B.4.5. Implement processes and tools for importing and freezing those packages ([[!tails_ticket 6299]], [[!tails_ticket 6296]])
+
+ This infrastructure is described with and managed by a [Puppet
+ manifest](https://git-tails.immerda.ch/puppet-tails/tree/manifests/reprepro).
+
+ Time-based snapshots have been generated four times a day and
+ [published over HTTP](http://time-based.snapshots.deb.tails.boum.org/)
+ since months now. This has proven to be solid.
+
+ The last remaining bits here are about handling some consequences on
+ this system:
+
+ * The process for garbage collecting these snapshots was designed in March,
+ and the
+ [implementation](<https://git-tails.immerda.ch/puppet-tails/tree/files/reprepro/snapshots/time_based/tails-delete-expired-apt-snapshots>)
+ was completed in April. Spoiler alert: this was deployed in
+ production in May, and works fine.
+
+ * Manage a very custom configuration for `apt-cacher-ng`, the
+ caching proxy used to speed up building Tails ISO images, to make
+ it compatible with our time-based snapshots (see last month's
+ report for details): our proof-of-concept works, we now need to
+ integrate it into the various configuration used to build a Tails
+ ISO image.
+
+ * `reprepro`'s database grows relatively quickly, which at some
+ point creates performance issues on our server, once this system
+ has been running for months; we have set up an Icinga2 check to
+ keep an eye of the size of this database, and have researched how
+ to compact that database, together with `reprepro`'s upstream
+ author. Our current best solution works well, and we now need to
+ document the process so that our system administrators know how to
+ apply it when needed.
+
+- B.4.6. Adjust the rest of our ecosystem to the freezable APT repository ([[!tails_ticket 6303]])
+
+ The last remaining tiny blocker was completed in April, so this
+ deliverable is now done.
+
+# C. Scale our infrastructure
+
+## C.1. Change in depth the infrastructure of our pool of mirrors
+
+* C.1.1. Specify a way of describing the pool of mirrors ([[!tails_ticket 8637]], [[!tails_ticket 10284]])
+
+ As reported last month, this deliverable is done.
+
+* C.1.2. Write & audit the code that makes the redirection decision from our website ([[!tails_ticket 8639]], [[!tails_ticket 8640]], [[!tails_ticket 11109]])
+
+ The `mirror-dispatcher.js` library code was written, tested and
+ reviewed in April. An initial security audit was conducted, and
+ following up on it we have been busy implementing the auditor's
+ recommendations. We are now waiting for the auditor to do
+ a final review.
+
+ We started modifying our Download And Verification Extension for
+ Firefox to make it use the same redirection code. The general use
+ case is now supported, using our `mirror-dispatcher.js` library.
+ We now need to add support for resuming an existing download (that
+ may have been started using another mirror than the one we would
+ like to use this time). And then, we'll want other people to review
+ and audit our proposed changes.
+
+* C.1.3. Design and implement the mirrors pool administration process and tools ([[!tails_ticket 8638]], [[!tails_ticket 11122]], [[!tails_ticket 11054]], [[!tails_ticket 11335]])
+
+ We documented how our mirrors should be configured to be part of the
+ new pool of mirrors, and created the corresponding administration
+ process and tools. So this deliverable is now done.
+
+* C.1.4. Communicate with each mirror operator to adapt their configuration ([[!tails_ticket 8635]], [[!tails_ticket 11079]])
+
+ We asked mirror operators to adapt their configuration, and we are
+ pleased to say that their response time was excellent: 92% of them
+ have already applied the required changes. As a bonus, 59% of our
+ mirrors followed our suggestions and additionally set up HTTPS,
+ which paves the way towards a HTTPS-only pool of mirrors (this is
+ not part of this deliverable formally speaking, but still we did not
+ want to miss this opportunity of looking further ahead).
+
+ We still need to issue a call for more mirrors.
+
+* C.1.5. Deploy the script and the mirror pool description ([[!tails_ticket 8641]])
+
+ The script and mirror pool description are now live on our website,
+ so this deliverable is completed. They will be used in production
+ once C.1.6 is done as well.
+
+* C.1.6. Adjust download documentation to point to the mirror pool dispatcher's URL ([[!tails_ticket 8642]], [[!tails_ticket 11329]], [[!tails_ticket 10295]], [[!tails_ticket 11284]])
+
+ We prepared branches of our website that make all links pointing to
+ our mirror pool use the new redirection system, and let our
+ documentation writers know how they should implement such links in
+ the future.
+
+ Actual deployment is now only blocked by:
+
+ * One last round of audit of our redirection code (see C.1.2).
+ * Prepare our new fallback pool based on DNS, that will be used by
+ users who have JavaScript disabled in their web browser.
+
+* C.1.7. Adjust update-description files for incremental upgrades ([[!tails_ticket 11123]])
+
+ With our current design, the original definition of this deliverable
+ doesn't make sense anymore. Instead, we have adjusted the code of
+ Tails Upgrader to use the new mirror pool. This code was tested, and
+ is now waiting to be reviewed and merged.
+
+* C.1.8. Clean up the remainers of the old mirror pool setup ([[!tails_ticket 8643]])
+
+ This is currently blocked by C.1.6.
+
+Scheduling-wise, our goals are unchanged since last month: we still
+aim to deploy the new mirror pool in May but, if we are delayed, the
+deployment might have to wait until July.
+
+## C.2. Be able to detect within hours failures and malfunction on our services
+
+The complete monitoring system was deployed to production, and works
+very well so far. So, we consider this deliverable as completed.
+
+- C.2.2. Set up the monitoring software and the underlying infrastructure
+
+ In April, we had only a little bit of polishing left to do on
+ this front.
+
+ We polished the Puppet code used to deploy the VPN between the
+ monitoring host and the monitored ones. [[!tails_ticket 11094]]
+
+ We configured the Icinga2 agents on the remaining half of our
+ systems. This allowed us to validate our corresponding Puppet code.
+
+ We set up different accounts for each system administrators, so that
+ they can use more efficiently Icingaweb2's integrated discussion
+ feature to comment on problems. [[!tails_ticket 11282]]
+
+ We also defined some relevant host groups and service groups, that will ease
+ scheduling downtimes, e.g. for an entire virtualization host.
+ [[!tails_ticket 11277]]
+
+ We disabled the statistics history feature that we don't use, in
+ order to save disk space. [[!tails_ticket 11368]]
+
+- C.2.4. Configure and debug the monitoring of the most critical
+ services and C.2.6. Configure and debug the monitoring of other
+ high-priority services
+
+ We wrote the last two Icinga2 custom plugins that we needed: one
+ checking if our SSH and SFTP accounts used by our automatic tests are
+ working, and another one checking if our SMTP Onion Service used by our
+ WhisperBack bug reporting tool is available.
+ [[!tails_ticket 8650]] and [[!tails_ticket 8653]]
+
+ As during March, Icinga2 already warned us of some problems in our
+ infrastructure. Some of our partitions were close to be filled and we
+ were able to fix them before it became a problem. Most notably, it
+ helped us notice that the Tor daemon running our SMTP Onion
+ Service was not upgraded to the right version when its host was,
+ leading to crashes (and restarts) of the Tor daemon every few
+ minutes, rendering the service not so
+ reliable. We fixed that by upgrading the Tor daemon.
+
+ We've then reviewed every checks to define the frequency they should
+ be run at, and the number of retries after which our system
+ administrators shall be notified. We came up with an agreement that
+ was promptly implemented, and refined after a few days of
+ evaluation. [[!tails_ticket 11358]]
+
+ In the end, all of the high-prirority and critical checks were
+ deployed early April, and we're now running 79 different checks on 19
+ different hosts.
+
+- C.2.5. Configure the receiving side of the monitoring notifications
+
+ In April, we enabled email notifications from Icinga2 to our main
+ monitoring developer's email address, so that we could evaluate
+ their volume and delay. This helped us refine checks' frequency, and
+ at the end of the month we concluded that the signal/noise ratio was
+ good enough for us to release the email notifications to our entire
+ team of system administrators. [[!tails_ticket 8651]]
+
+## C.4. Maintain our already existing services
+
+- C.4.5. Administer our services upto milestone V
+
+ We kept on answering the requests from the community and taking
+ care of security updates as covered by "C.4.5. Administer our services
+ up to milestone V".
+
+ We fixed the Postfix configuration of our monitoring host that was
+ spamming us for every emails it sent because IPv6 is disabled on this
+ host. [[!tails_ticket 11342]]
+
+# E. Release management
+
+[[Tails 2.3|news/version_2.3]] was released on April 26.
diff --git a/wiki/src/doc.de.po b/wiki/src/doc.de.po
index d8ff4fd..d77fa82 100644
--- a/wiki/src/doc.de.po
+++ b/wiki/src/doc.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails website\n"
-"POT-Creation-Date: 2016-02-24 23:12+0100\n"
+"POT-Creation-Date: 2016-04-29 13:53+0000\n"
"PO-Revision-Date: 2016-03-28 11:22+0200\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: Tails translators <tails-l10n@boum.org>\n"
@@ -89,12 +89,18 @@ msgid "[[Install from Windows|install/win/usb/overview]]"
msgstr "[[Installation unter Windows|install/win/usb/overview]]"
#. type: Bullet: ' - '
-msgid "[[Install from Ubuntu|install/debian/usb/overview]]"
+#, fuzzy
+#| msgid "[[Install from Ubuntu|install/debian/usb/overview]]"
+msgid "[[Install from Debian or Ubuntu|install/debian/usb/overview]]"
msgstr "[[Installation unter Ubuntu|install/debian/usb/overview]]"
#. type: Bullet: ' - '
+#, fuzzy
+#| msgid ""
+#| "[[Install from Ubuntu and the command line|install/expert/usb/overview]]"
msgid ""
-"[[Install from Ubuntu and the command line|install/expert/usb/overview]]"
+"[[Install from Debian or Ubuntu using the command line and GnuPG|install/"
+"expert/usb/overview]]"
msgstr ""
"[[Installation von Ubuntu aus unter Nutzung der Kommandozeile|install/expert/"
"usb/overview]]"
@@ -126,20 +132,11 @@ msgstr "[[Tails auf eine DVD brennen|install/dvd]]"
msgid "[[Download without installing|install/download]]"
msgstr "[[Ohne Installation herunterladen|install/download]]"
-#. type: Plain text
-#, no-wrap
-msgid ""
-" - [[Verify the ISO image|doc/get/verify]]\n"
-" - [[Using Gnome: Ubuntu, Debian, Tails, etc.|get/verify_the_iso_image_using_gnome]]\n"
-" - [[Using Linux with the command line|get/verify_the_iso_image_using_the_command_line]]\n"
-" - [[Using other operating systems|get/verify_the_iso_image_using_other_operating_systems]]\n"
-" - [[Trusting Tails signing key|get/trusting_tails_signing_key]]\n"
-msgstr ""
-" - [[ISO-Image verifizieren|doc/get/verify]]\n"
-" - [[Unter Gnome: Ubuntu, Debian, Tails, usw.|get/verify_the_iso_image_using_gnome]]\n"
-" - [[Unter Linux mit der Kommandozeile|get/verify_the_iso_image_using_the_command_line]]\n"
-" - [[Unter anderen Betriebssystemen|get/verify_the_iso_image_using_other_operating_systems]]\n"
-" - [[Dem Signaturschlüssel von Tails vertrauen|get/trusting_tails_signing_key]]\n"
+#. type: Bullet: ' - '
+#, fuzzy
+#| msgid "[[Download without installing|install/download]]"
+msgid "[[Download and verify using OpenPGP|install/download/openpgp]]"
+msgstr "[[Ohne Installation herunterladen|install/download]]"
#. type: Title #
#, no-wrap
@@ -191,5 +188,36 @@ msgstr "Fortgeschrittene Themen"
msgid "[[!inline pages=\"doc/advanced_topics.index\" raw=\"yes\"]]\n"
msgstr "[[!inline pages=\"doc/advanced_topics.index.de\" raw=\"yes\"]]\n"
+#, fuzzy
+#~| msgid ""
+#~| " - [[Verify the ISO image|doc/get/verify]]\n"
+#~| " - [[Using Gnome: Ubuntu, Debian, Tails, etc.|get/"
+#~| "verify_the_iso_image_using_gnome]]\n"
+#~| " - [[Using Linux with the command line|get/"
+#~| "verify_the_iso_image_using_the_command_line]]\n"
+#~| " - [[Using other operating systems|get/"
+#~| "verify_the_iso_image_using_other_operating_systems]]\n"
+#~| " - [[Trusting Tails signing key|get/trusting_tails_signing_key]]\n"
+#~ msgid ""
+#~ " - [[Verify the ISO image|doc/get/verify]]\n"
+#~ " - [[Using Gnome: Ubuntu, Debian, Tails, etc.|get/"
+#~ "verify_the_iso_image_using_gnome]]\n"
+#~ " - [[Using Linux with the command line|get/"
+#~ "verify_the_iso_image_using_the_command_line]]\n"
+#~ " - [[Using other operating systems|get/"
+#~ "verify_the_iso_image_using_other_operating_systems]]\n"
+#~ " - [[Trusting Tails signing key|get/trusting_tails_signing_key]]\n"
+#~ " - [[Download and verify using OpenPGP|install/download/openpgp]]\n"
+#~ msgstr ""
+#~ " - [[ISO-Image verifizieren|doc/get/verify]]\n"
+#~ " - [[Unter Gnome: Ubuntu, Debian, Tails, usw.|get/"
+#~ "verify_the_iso_image_using_gnome]]\n"
+#~ " - [[Unter Linux mit der Kommandozeile|get/"
+#~ "verify_the_iso_image_using_the_command_line]]\n"
+#~ " - [[Unter anderen Betriebssystemen|get/"
+#~ "verify_the_iso_image_using_other_operating_systems]]\n"
+#~ " - [[Dem Signaturschlüssel von Tails vertrauen|get/"
+#~ "trusting_tails_signing_key]]\n"
+
#~ msgid "[[!inline pages=\"doc/get.index\" raw=\"yes\"]]\n"
#~ msgstr "[[!inline pages=\"doc/get.index.de\" raw=\"yes\"]]\n"
diff --git a/wiki/src/doc.fa.po b/wiki/src/doc.fa.po
index 9df4ff0..e33b924 100644
--- a/wiki/src/doc.fa.po
+++ b/wiki/src/doc.fa.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2016-02-24 23:12+0100\n"
+"POT-Creation-Date: 2016-04-29 13:53+0000\n"
"PO-Revision-Date: 2015-10-20 21:45+0000\n"
"Last-Translator: Weblate Admin <admin@example.com>\n"
"Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/doc/fa/"
@@ -86,12 +86,13 @@ msgid "[[Install from Windows|install/win/usb/overview]]"
msgstr ""
#. type: Bullet: ' - '
-msgid "[[Install from Ubuntu|install/debian/usb/overview]]"
+msgid "[[Install from Debian or Ubuntu|install/debian/usb/overview]]"
msgstr ""
#. type: Bullet: ' - '
msgid ""
-"[[Install from Ubuntu and the command line|install/expert/usb/overview]]"
+"[[Install from Debian or Ubuntu using the command line and GnuPG|install/"
+"expert/usb/overview]]"
msgstr ""
#. type: Bullet: ' - '
@@ -115,28 +116,9 @@ msgstr ""
msgid "[[Download without installing|install/download]]"
msgstr ""
-#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| " - [[Verify the ISO image|doc/get/verify]]\n"
-#| " - [[Using Gnome: Ubuntu, Debian, Tails, etc.|get/verify_the_iso_image_using_gnome]]\n"
-#| " - [[Using Linux with the command line|get/verify_the_iso_image_using_the_command_line]]\n"
-#| " - [[Using other operating systems|get/verify_the_iso_image_using_other_operating_systems]]\n"
-#| " - [[Trusting Tails signing key|get/trusting_tails_signing_key]]\n"
-#| " - [[Stay tuned|download#stay_tuned]]\n"
-msgid ""
-" - [[Verify the ISO image|doc/get/verify]]\n"
-" - [[Using Gnome: Ubuntu, Debian, Tails, etc.|get/verify_the_iso_image_using_gnome]]\n"
-" - [[Using Linux with the command line|get/verify_the_iso_image_using_the_command_line]]\n"
-" - [[Using other operating systems|get/verify_the_iso_image_using_other_operating_systems]]\n"
-" - [[Trusting Tails signing key|get/trusting_tails_signing_key]]\n"
+#. type: Bullet: ' - '
+msgid "[[Download and verify using OpenPGP|install/download/openpgp]]"
msgstr ""
-" - [[ایمج ایزو را تأیید کنید|doc/get/verify]]\n"
-" - [[استفاده از گنوم: اوبونتو، دبیان، تیلز و غیره|get/verify_the_iso_image_using_gnome]]\n"
-" - [[استفاده از لینوکس به کمک خط فرمان|get/verify_the_iso_image_using_the_command_line]]\n"
-" - [[استفاده از سیستم‌های عامل دیگر|get/verify_the_iso_image_using_other_operating_systems]]\n"
-" - [[اعتماد به کلید امضا|get/trusting_tails_signing_key]]\n"
-" - [[صبر کنیدdownload#stay_tuned]]\n"
#. type: Title #
#, no-wrap
@@ -188,5 +170,37 @@ msgstr "موضوع‌های پیشرفته"
msgid "[[!inline pages=\"doc/advanced_topics.index\" raw=\"yes\"]]\n"
msgstr "[[!inline pages=\"doc/advanced_topics.index.fa\" raw=\"yes\"]]\n"
+#, fuzzy
+#~| msgid ""
+#~| " - [[Verify the ISO image|doc/get/verify]]\n"
+#~| " - [[Using Gnome: Ubuntu, Debian, Tails, etc.|get/"
+#~| "verify_the_iso_image_using_gnome]]\n"
+#~| " - [[Using Linux with the command line|get/"
+#~| "verify_the_iso_image_using_the_command_line]]\n"
+#~| " - [[Using other operating systems|get/"
+#~| "verify_the_iso_image_using_other_operating_systems]]\n"
+#~| " - [[Trusting Tails signing key|get/trusting_tails_signing_key]]\n"
+#~| " - [[Stay tuned|download#stay_tuned]]\n"
+#~ msgid ""
+#~ " - [[Verify the ISO image|doc/get/verify]]\n"
+#~ " - [[Using Gnome: Ubuntu, Debian, Tails, etc.|get/"
+#~ "verify_the_iso_image_using_gnome]]\n"
+#~ " - [[Using Linux with the command line|get/"
+#~ "verify_the_iso_image_using_the_command_line]]\n"
+#~ " - [[Using other operating systems|get/"
+#~ "verify_the_iso_image_using_other_operating_systems]]\n"
+#~ " - [[Trusting Tails signing key|get/trusting_tails_signing_key]]\n"
+#~ " - [[Download and verify using OpenPGP|install/download/openpgp]]\n"
+#~ msgstr ""
+#~ " - [[ایمج ایزو را تأیید کنید|doc/get/verify]]\n"
+#~ " - [[استفاده از گنوم: اوبونتو، دبیان، تیلز و غیره|get/"
+#~ "verify_the_iso_image_using_gnome]]\n"
+#~ " - [[استفاده از لینوکس به کمک خط فرمان|get/"
+#~ "verify_the_iso_image_using_the_command_line]]\n"
+#~ " - [[استفاده از سیستم‌های عامل دیگر|get/"
+#~ "verify_the_iso_image_using_other_operating_systems]]\n"
+#~ " - [[اعتماد به کلید امضا|get/trusting_tails_signing_key]]\n"
+#~ " - [[صبر کنیدdownload#stay_tuned]]\n"
+
#~ msgid "[[!inline pages=\"doc/get.index\" raw=\"yes\"]]\n"
#~ msgstr "[[!inline pages=\"doc/get.index.fa\" raw=\"yes\"]]\n"
diff --git a/wiki/src/doc.fr.po b/wiki/src/doc.fr.po
index 4ef39c3..52f172d 100644
--- a/wiki/src/doc.fr.po
+++ b/wiki/src/doc.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: SACKAGE VERSION\n"
-"POT-Creation-Date: 2016-02-24 23:12+0100\n"
+"POT-Creation-Date: 2016-04-29 13:53+0000\n"
"PO-Revision-Date: 2016-03-23 21:25+0100\n"
"Last-Translator: AtomiKe <tails@atomike.ninja>\n"
"Language-Team: SLANGUAGE <LL@li.org>\n"
@@ -87,12 +87,18 @@ msgid "[[Install from Windows|install/win/usb/overview]]"
msgstr "[[Installation à partir de Windows|install/win/usb/overview]]"
#. type: Bullet: ' - '
-msgid "[[Install from Ubuntu|install/debian/usb/overview]]"
+#, fuzzy
+#| msgid "[[Install from Ubuntu|install/debian/usb/overview]]"
+msgid "[[Install from Debian or Ubuntu|install/debian/usb/overview]]"
msgstr "[[Installation à partir d'Ubuntu|install/debian/usb/overview]]"
#. type: Bullet: ' - '
+#, fuzzy
+#| msgid ""
+#| "[[Install from Ubuntu and the command line|install/expert/usb/overview]]"
msgid ""
-"[[Install from Ubuntu and the command line|install/expert/usb/overview]]"
+"[[Install from Debian or Ubuntu using the command line and GnuPG|install/"
+"expert/usb/overview]]"
msgstr ""
"[[Installation à partir d'Ubuntu en ligne de commande|install/expert/usb/"
"overview]]"
@@ -124,20 +130,11 @@ msgstr "[[Graver un DVD|install/dvd]]"
msgid "[[Download without installing|install/download]]"
msgstr "[[Télécharger sans installer|install/download]]"
-#. type: Plain text
-#, no-wrap
-msgid ""
-" - [[Verify the ISO image|doc/get/verify]]\n"
-" - [[Using Gnome: Ubuntu, Debian, Tails, etc.|get/verify_the_iso_image_using_gnome]]\n"
-" - [[Using Linux with the command line|get/verify_the_iso_image_using_the_command_line]]\n"
-" - [[Using other operating systems|get/verify_the_iso_image_using_other_operating_systems]]\n"
-" - [[Trusting Tails signing key|get/trusting_tails_signing_key]]\n"
-msgstr ""
-" - [[Vérifier l'image ISO|doc/get/verify]]\n"
-" - [[Avec Gnome : Ubuntu, Debian, Tails, etc.|get/verify_the_iso_image_using_gnome]]\n"
-" - [[Avec Linux et la ligne de commande|get/verify_the_iso_image_using_the_command_line]]\n"
-" - [[Avec un autre système d'exploitation|get/verify_the_iso_image_using_other_operating_systems]]\n"
-" - [[Faire confiance à la clé de signature de Tails|get/trusting_tails_signing_key]]\n"
+#. type: Bullet: ' - '
+#, fuzzy
+#| msgid "[[Download without installing|install/download]]"
+msgid "[[Download and verify using OpenPGP|install/download/openpgp]]"
+msgstr "[[Télécharger sans installer|install/download]]"
#. type: Title #
#, no-wrap
@@ -189,6 +186,37 @@ msgstr "Sujets avancés"
msgid "[[!inline pages=\"doc/advanced_topics.index\" raw=\"yes\"]]\n"
msgstr "[[!inline pages=\"doc/advanced_topics.index.fr\" raw=\"yes\"]]\n"
+#, fuzzy
+#~| msgid ""
+#~| " - [[Verify the ISO image|doc/get/verify]]\n"
+#~| " - [[Using Gnome: Ubuntu, Debian, Tails, etc.|get/"
+#~| "verify_the_iso_image_using_gnome]]\n"
+#~| " - [[Using Linux with the command line|get/"
+#~| "verify_the_iso_image_using_the_command_line]]\n"
+#~| " - [[Using other operating systems|get/"
+#~| "verify_the_iso_image_using_other_operating_systems]]\n"
+#~| " - [[Trusting Tails signing key|get/trusting_tails_signing_key]]\n"
+#~ msgid ""
+#~ " - [[Verify the ISO image|doc/get/verify]]\n"
+#~ " - [[Using Gnome: Ubuntu, Debian, Tails, etc.|get/"
+#~ "verify_the_iso_image_using_gnome]]\n"
+#~ " - [[Using Linux with the command line|get/"
+#~ "verify_the_iso_image_using_the_command_line]]\n"
+#~ " - [[Using other operating systems|get/"
+#~ "verify_the_iso_image_using_other_operating_systems]]\n"
+#~ " - [[Trusting Tails signing key|get/trusting_tails_signing_key]]\n"
+#~ " - [[Download and verify using OpenPGP|install/download/openpgp]]\n"
+#~ msgstr ""
+#~ " - [[Vérifier l'image ISO|doc/get/verify]]\n"
+#~ " - [[Avec Gnome : Ubuntu, Debian, Tails, etc.|get/"
+#~ "verify_the_iso_image_using_gnome]]\n"
+#~ " - [[Avec Linux et la ligne de commande|get/"
+#~ "verify_the_iso_image_using_the_command_line]]\n"
+#~ " - [[Avec un autre système d'exploitation|get/"
+#~ "verify_the_iso_image_using_other_operating_systems]]\n"
+#~ " - [[Faire confiance à la clé de signature de Tails|get/"
+#~ "trusting_tails_signing_key]]\n"
+
#~ msgid "[[!inline pages=\"doc/get.index\" raw=\"yes\"]]\n"
#~ msgstr "[[!inline pages=\"doc/get.index.fr\" raw=\"yes\"]]\n"
diff --git a/wiki/src/doc.mdwn b/wiki/src/doc.mdwn
index 259b1a5..2098429 100644
--- a/wiki/src/doc.mdwn
+++ b/wiki/src/doc.mdwn
@@ -23,18 +23,14 @@ documentation|/contribute/how/documentation]].
- [[Install from another Tails (for PC)|install/win/clone/overview]]
- [[Install from another Tails (for Mac)|install/mac/clone/overview]]
- [[Install from Windows|install/win/usb/overview]]
- - [[Install from Ubuntu|install/debian/usb/overview]]
- - [[Install from Ubuntu and the command line|install/expert/usb/overview]]
+ - [[Install from Debian or Ubuntu|install/debian/usb/overview]]
+ - [[Install from Debian or Ubuntu using the command line and GnuPG|install/expert/usb/overview]]
- [[Install from other Linux distributions|install/linux/usb/overview]]
- [[Install from Mac OS X by burning a DVD first|install/mac/dvd/overview]]
- [[Install from Mac OS X and the command line|install/mac/usb/overview]]
- [[Burn a DVD|install/dvd]]
- [[Download without installing|install/download]]
- - [[Verify the ISO image|doc/get/verify]]
- - [[Using Gnome: Ubuntu, Debian, Tails, etc.|get/verify_the_iso_image_using_gnome]]
- - [[Using Linux with the command line|get/verify_the_iso_image_using_the_command_line]]
- - [[Using other operating systems|get/verify_the_iso_image_using_other_operating_systems]]
- - [[Trusting Tails signing key|get/trusting_tails_signing_key]]
+ - [[Download and verify using OpenPGP|install/download/openpgp]]
# First steps with Tails
diff --git a/wiki/src/doc.pt.po b/wiki/src/doc.pt.po
index 17b8fd2..aabee2f 100644
--- a/wiki/src/doc.pt.po
+++ b/wiki/src/doc.pt.po
@@ -5,18 +5,17 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-02-24 23:12+0100\n"
-"PO-Revision-Date: 2014-07-31 11:42-0300\n"
+"Project-Id-Version: \n"
+"POT-Creation-Date: 2016-05-12 15:19+0000\n"
+"PO-Revision-Date: 2016-04-15 10:56-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: Portuguese <LL@li.org>\n"
-"Language: \n"
+"Language: pt\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Portugues\n"
-"X-Poedit-Country: BRASIL\n"
"X-Poedit-SourceCharset: utf-8\n"
+"X-Generator: Poedit 1.6.10\n"
#. type: Plain text
#, no-wrap
@@ -30,7 +29,7 @@ msgstr "Esta documentação é um trabalho em progresso e uma tarefa coletiva."
#. type: Plain text
#, no-wrap
msgid "<div class=\"tip\">\n"
-msgstr ""
+msgstr "<div class=\"tip\">\n"
#. type: Plain text
#, no-wrap
@@ -38,11 +37,13 @@ msgid ""
"<p>If this section doesn't answer your questions, you can also look at our\n"
"[[FAQ|support/faq]].</p>\n"
msgstr ""
+"<p>Se esta seção não responde suas perguntas, você pode dar uma olhada no\n"
+"[[FAQ|support/faq]].</p>\n"
#. type: Plain text
#, no-wrap
msgid "</div>\n"
-msgstr ""
+msgstr "</div>\n"
#. type: Plain text
msgid ""
@@ -67,78 +68,71 @@ msgid "[[!inline pages=\"doc/about.index\" raw=\"yes\"]]\n"
msgstr "[[!inline pages=\"doc/about.index.pt\" raw=\"yes\"]]\n"
#. type: Title #
-#, fuzzy, no-wrap
-#| msgid "Download and verify"
+#, no-wrap
msgid "Download and install"
-msgstr "Baixe e verifique"
+msgstr "Baixe e instale"
#. type: Bullet: ' - '
msgid "[[Install from another Tails (for PC)|install/win/clone/overview]]"
msgstr ""
+"[[Instale a partir de um outro Tails (para PC)|install/win/clone/overview]]"
#. type: Bullet: ' - '
msgid "[[Install from another Tails (for Mac)|install/mac/clone/overview]]"
msgstr ""
+"[[Instale a partir de um outro Tails (para Mac)|install/mac/clone/overview]]"
#. type: Bullet: ' - '
msgid "[[Install from Windows|install/win/usb/overview]]"
-msgstr ""
+msgstr "[[Instale a partir de um Windows|install/win/usb/overview]]"
#. type: Bullet: ' - '
-msgid "[[Install from Ubuntu|install/debian/usb/overview]]"
-msgstr ""
+#, fuzzy
+#| msgid "[[Install from Ubuntu|install/debian/usb/overview]]"
+msgid "[[Install from Debian or Ubuntu|install/debian/usb/overview]]"
+msgstr "[[Instale a partir de um Ubuntu|install/debian/usb/overview]]"
#. type: Bullet: ' - '
msgid ""
-"[[Install from Ubuntu and the command line|install/expert/usb/overview]]"
+"[[Install from Debian or Ubuntu using the command line and GnuPG|install/"
+"expert/usb/overview]]"
msgstr ""
+"[[Instale a partir de um Ubuntu usando a linha de comando|install/expert/usb/"
+"overview]]"
#. type: Bullet: ' - '
msgid "[[Install from other Linux distributions|install/linux/usb/overview]]"
msgstr ""
+"[[Instale a partir de outras distribuições de Linux|install/linux/usb/"
+"overview]]"
#. type: Bullet: ' - '
msgid ""
"[[Install from Mac OS X by burning a DVD first|install/mac/dvd/overview]]"
msgstr ""
+"[[Instale a partir de um Mac OS X gravando um DVD primeiro|install/mac/dvd/"
+"overview]]"
#. type: Bullet: ' - '
msgid "[[Install from Mac OS X and the command line|install/mac/usb/overview]]"
msgstr ""
+"[[Instale a partir de um Mac OS X usando a linha de comando|install/mac/usb/"
+"overview]]"
#. type: Bullet: ' - '
msgid "[[Burn a DVD|install/dvd]]"
-msgstr ""
+msgstr "[[Grave um DVD|install/dvd]]"
+
+#. type: Bullet: ' - '
+msgid "[[Download without installing|install/download]]"
+msgstr "[[Baixe sem instalar|install/download]]"
#. type: Bullet: ' - '
#, fuzzy
#| msgid "[[Download the ISO image|download#index2h1]]"
-msgid "[[Download without installing|install/download]]"
+msgid "[[Download and verify using OpenPGP|install/download/openpgp]]"
msgstr "[[Baixar a imagen ISO|download#index2h1]]"
-#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| " - [[Verify the ISO image|doc/get/verify]]\n"
-#| " - [[Using Gnome: Ubuntu, Debian, Tails, etc.|get/verify_the_iso_image_using_gnome]]\n"
-#| " - [[Using Linux with the command line|get/verify_the_iso_image_using_the_command_line]]\n"
-#| " - [[Using other operating systems|get/verify_the_iso_image_using_other_operating_systems]]\n"
-#| " - [[Trusting Tails signing key|get/trusting_tails_signing_key]]\n"
-#| " - [[Stay tuned|download#stay_tuned]]\n"
-msgid ""
-" - [[Verify the ISO image|doc/get/verify]]\n"
-" - [[Using Gnome: Ubuntu, Debian, Tails, etc.|get/verify_the_iso_image_using_gnome]]\n"
-" - [[Using Linux with the command line|get/verify_the_iso_image_using_the_command_line]]\n"
-" - [[Using other operating systems|get/verify_the_iso_image_using_other_operating_systems]]\n"
-" - [[Trusting Tails signing key|get/trusting_tails_signing_key]]\n"
-msgstr ""
-" - [[Verifique a imagem ISO|doc/get/verify]]\n"
-" - [[Usando Gnome: Ubuntu, Debian, Tails, etc.|get/verify_the_iso_image_using_gnome]]\n"
-" - [[Usando linux com a linha de comando|get/verify_the_iso_image_using_the_command_line]]\n"
-" - [[Usando outros sistemas operacionais|get/verify_the_iso_image_using_other_operating_systems]]\n"
-" - [[Confiando na chave de assinatura do Tails|get/trusting_tails_signing_key]]\n"
-" - [[Fique ligado/a|download#stay_tuned]]\n"
-
#. type: Title #
#, no-wrap
msgid "First steps with Tails"
@@ -189,6 +183,52 @@ msgstr "Tópicos avançados"
msgid "[[!inline pages=\"doc/advanced_topics.index\" raw=\"yes\"]]\n"
msgstr "[[!inline pages=\"doc/advanced_topics.index.pt\" raw=\"yes\"]]\n"
+#~ msgid ""
+#~ " - [[Verify the ISO image|doc/get/verify]]\n"
+#~ " - [[Using Gnome: Ubuntu, Debian, Tails, etc.|get/verify_the_iso_image_using_gnome]]\n"
+#~ " - [[Using Linux with the command line|get/verify_the_iso_image_using_the_command_line]]\n"
+#~ " - [[Using other operating systems|get/verify_the_iso_image_using_other_operating_systems]]\n"
+#~ " - [[Trusting Tails signing key|get/trusting_tails_signing_key]]\n"
+#~ msgstr ""
+#~ " - [[Verifique a imagem ISO|doc/get/verify]]\n"
+#~ " - [[Usando Gnome: Ubuntu, Debian, Tails, etc.|get/verify_the_iso_image_using_gnome]]\n"
+#~ " - [[Usando Linux com a linha de comando|get/verify_the_iso_image_using_the_command_line]]\n"
+#~ " - [[Usando outros sistemas operacionais|get/verify_the_iso_image_using_other_operating_systems]]\n"
+#~ " - [[Confiando na chave de assinatura do Tails|get/trusting_tails_signing_key]]\n"
+
+#, fuzzy
+#~| msgid ""
+#~| " - [[Verify the ISO image|doc/get/verify]]\n"
+#~| " - [[Using Gnome: Ubuntu, Debian, Tails, etc.|get/"
+#~| "verify_the_iso_image_using_gnome]]\n"
+#~| " - [[Using Linux with the command line|get/"
+#~| "verify_the_iso_image_using_the_command_line]]\n"
+#~| " - [[Using other operating systems|get/"
+#~| "verify_the_iso_image_using_other_operating_systems]]\n"
+#~| " - [[Trusting Tails signing key|get/trusting_tails_signing_key]]\n"
+#~| " - [[Stay tuned|download#stay_tuned]]\n"
+#~ msgid ""
+#~ " - [[Verify the ISO image|doc/get/verify]]\n"
+#~ " - [[Using Gnome: Ubuntu, Debian, Tails, etc.|get/"
+#~ "verify_the_iso_image_using_gnome]]\n"
+#~ " - [[Using Linux with the command line|get/"
+#~ "verify_the_iso_image_using_the_command_line]]\n"
+#~ " - [[Using other operating systems|get/"
+#~ "verify_the_iso_image_using_other_operating_systems]]\n"
+#~ " - [[Trusting Tails signing key|get/trusting_tails_signing_key]]\n"
+#~ " - [[Download and verify using OpenPGP|install/download/openpgp]]\n"
+#~ msgstr ""
+#~ " - [[Verifique a imagem ISO|doc/get/verify]]\n"
+#~ " - [[Usando Gnome: Ubuntu, Debian, Tails, etc.|get/"
+#~ "verify_the_iso_image_using_gnome]]\n"
+#~ " - [[Usando linux com a linha de comando|get/"
+#~ "verify_the_iso_image_using_the_command_line]]\n"
+#~ " - [[Usando outros sistemas operacionais|get/"
+#~ "verify_the_iso_image_using_other_operating_systems]]\n"
+#~ " - [[Confiando na chave de assinatura do Tails|get/"
+#~ "trusting_tails_signing_key]]\n"
+#~ " - [[Fique ligado/a|download#stay_tuned]]\n"
+
#~ msgid "[[!inline pages=\"doc/get.index\" raw=\"yes\"]]\n"
#~ msgstr "[[!inline pages=\"doc/get.index.pt\" raw=\"yes\"]]\n"
diff --git a/wiki/src/doc/about.index.fr.po b/wiki/src/doc/about.index.fr.po
index 4bb4cfb..d5dc25b 100644
--- a/wiki/src/doc/about.index.fr.po
+++ b/wiki/src/doc/about.index.fr.po
@@ -5,12 +5,12 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: Tails\n"
"POT-Creation-Date: 2015-01-25 22:13+0100\n"
-"PO-Revision-Date: 2014-05-10 20:50-0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"PO-Revision-Date: 2016-05-15 16:39-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"
@@ -30,7 +30,7 @@ msgstr "[[!traillink Fonctionnalités_et_logiciels_inclus|about/features]]"
#. type: Bullet: ' - '
msgid "[[!traillink Why_does_Tails_use_Tor?|about/tor]]"
-msgstr "[[!traillink Pourquoi_Tails_utilise_Tor_?|about/trust]]"
+msgstr "[[!traillink Pourquoi_Tails_utilise_Tor_?|about/tor]]"
#. type: Bullet: ' - '
msgid ""
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 5c651c1..8d53eaa 100644
--- a/wiki/src/doc/about/acknowledgments_and_similar_projects.fr.po
+++ b/wiki/src/doc/about/acknowledgments_and_similar_projects.fr.po
@@ -3,15 +3,14 @@
# 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-04-25 15:26+0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2016-05-05 18:19-0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -32,10 +31,10 @@ msgid ""
"Live|http://live.debian.net]], 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/]], [[Debian "
-"Live|http://live.debian.net]], et [[Tor|https://www.torproject.org/]]; pour "
-"en savoir plus, consultez [[cette page|contribute/relationship with "
-"upstream]]."
+"Tails ne pourrait exister sans [[Debian|https://www.debian.org/index.fr."
+"html]], [[Debian Live|http://live.debian.net]] et [[Tor|https://www."
+"torproject.org/]] ; pour en savoir plus, consultez la page [[contribute/"
+"relationship_with_upstream]]."
#. type: Bullet: ' - '
msgid ""
@@ -51,16 +50,12 @@ msgstr ""
"\".)"
#. type: Bullet: ' - '
-#, fuzzy
-#| msgid ""
-#| "The [[Privatix Live-System|http://mandalka.name/privatix/]] an early "
-#| "source of inspiration, too."
msgid ""
"The [[Privatix Live-System|http://mandalka.name/privatix/]] was an early "
"source of inspiration, too."
msgstr ""
-"Le [[Live-System Privatix|http://mandalka.name/privatix/]] est lui aussi une "
-"source d'inspiration."
+"Le [[Live-System Privatix|http://mandalka.name/privatix/]] a été lui aussi "
+"une source d'inspiration."
#. type: Bullet: ' - '
msgid ""
@@ -69,8 +64,9 @@ msgid ""
"borrowed from [Liberté Linux](http://dee.su/liberte)."
msgstr ""
"Certaines idées (en particulier [[tordate|contribute/design/Time_syncing]] "
-"et plusieurs améliorations de notre [[contribute/design/memory_erasure]] "
-"procédure) ont été empruntées à [Liberté Linux](http://dee.su/liberte)."
+"et plusieurs améliorations de notre procédure [[contribute/design/"
+"memory_erasure]]) ont été empruntées à [Liberté Linux](http://dee.su/"
+"liberte)."
#. type: Plain text
#, no-wrap
@@ -106,14 +102,12 @@ msgid "[Lightweight Portable Security](http://www.spi.dod.mil/lipose.htm)"
msgstr "[Lightweight Portable Security](http://www.spi.dod.mil/lipose.htm)"
#. type: Bullet: '* '
-#, fuzzy
-#| msgid "[Whonix](https://www.whonix.org/)"
msgid "[Qubes](https://www.qubes-os.org/)"
-msgstr "[Whonix](https://www.whonix.org/)"
+msgstr "[Qubes](https://www.qubes-os.org/)"
#. type: Bullet: '* '
msgid "[SubgraphOS](https://subgraph.com/sgos/)"
-msgstr "[SubgraphOS](https://subgraph.com/sgos/)"
+msgstr "[SubgraphOS](https://subgraph.com/sgos/index.fr.html)"
#. type: Bullet: '* '
msgid "[Whonix](https://www.whonix.org/)"
@@ -142,7 +136,7 @@ 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/) (lien cassé)"
+msgstr "[ELE](http://www.northernsecurity.net/download/ele/) (lien mort)"
#. type: Bullet: '* '
msgid ""
diff --git a/wiki/src/doc/about/features.de.po b/wiki/src/doc/about/features.de.po
index 47204c1..80688d5 100644
--- a/wiki/src/doc/about/features.de.po
+++ b/wiki/src/doc/about/features.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails translations\n"
-"POT-Creation-Date: 2016-03-09 12:43+0100\n"
+"POT-Creation-Date: 2016-04-29 13:53+0000\n"
"PO-Revision-Date: 2016-03-28 15:03+0200\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: Tails translations <tails-l10n@boum.org>\n"
@@ -56,7 +56,7 @@ 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"
+" - 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"
@@ -82,7 +82,7 @@ msgstr ""
"* [Tor](https://www.torproject.org) mit:\n"
" - [[stream isolation|contribute/design/stream_isolation]]\n"
" - Unterstützung von normalen, obfs2, obfs3, obfs4 und ScrambleSuit Bridges\n"
-" - dem grafischen Front-End Onion Circuits ([[Mehr...|doc/anonymous_internet/Tor_status#circuits]])\n"
+" - dem grafischen Front-End Onion Circuits ([[Mehr...|doc/anonymous_internet/tor_status#circuits]])\n"
"* [NetworkManager](http://projects.gnome.org/NetworkManager/) für einfache\n"
" Netzwerkkonfiguration ([[Mehr...|doc/anonymous_internet/networkmanager]])\n"
"* [Tor Browser](https://www.torproject.org/projects/torbrowser.html.de) ([[Mehr...|doc/anonymous_internet/Tor_Browser]]), ein Webbrowser\n"
@@ -277,10 +277,11 @@ msgstr ""
#. type: Plain text
msgid ""
"The full packages list can be found in the [BitTorrent files download "
-"directory](/torrents/files/) (look for files with the `.packages` extension)."
+"directory](https://tails.boum.org/torrents/files/) (look for files with the "
+"`.packages` extension)."
msgstr ""
-"Die gesamte Paketliste kann im [BitTorrent-Downloadverzeichnis](/torrents/"
-"files/) gefunden werden (siehe Dateien mit der Endung `.packages`)"
+"Die gesamte Paketliste kann im [BitTorrent-Downloadverzeichnis](https://tails.boum.org/torrents/files/)"
+"gefunden werden (siehe Dateien mit der Endung `.packages`)"
#. type: Title =
#, no-wrap
diff --git a/wiki/src/doc/about/features.fa.po b/wiki/src/doc/about/features.fa.po
index 77ef9c9..053526b 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: 2016-03-07 18:54+0100\n"
+"POT-Creation-Date: 2016-04-29 13:53+0000\n"
"PO-Revision-Date: 2015-10-21 10:59+0000\n"
"Last-Translator: sprint5 <translation5@451f.org>\n"
"Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/features/"
@@ -91,7 +91,7 @@ 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"
+" - 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"
@@ -305,10 +305,11 @@ msgstr ""
#. type: Plain text
msgid ""
"The full packages list can be found in the [BitTorrent files download "
-"directory](/torrents/files/) (look for files with the `.packages` extension)."
+"directory](https://tails.boum.org/torrents/files/) (look for files with the "
+"`.packages` extension)."
msgstr ""
"فهرست کامل بسته‌ها را می‌توانید این‌جا ببینید: [دایرکتوری دانلود فایل بیت‌تورنت]"
-"(/torrents/files/) (دنبال فایل‌هایی با این پسوند بگردید`.packages`)."
+"(https://tails.boum.org/torrents/files/) (دنبال فایل‌هایی با این پسوند بگردید`.packages`)."
#. type: Title =
#, no-wrap
diff --git a/wiki/src/doc/about/features.fr.po b/wiki/src/doc/about/features.fr.po
index b441009..c4106d3 100644
--- a/wiki/src/doc/about/features.fr.po
+++ b/wiki/src/doc/about/features.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2016-03-07 18:54+0100\n"
+"POT-Creation-Date: 2016-04-29 13:53+0000\n"
"PO-Revision-Date: 2016-04-02 19:18+0100\n"
"Last-Translator: Chre <tor@renaudineau.org>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -56,7 +56,7 @@ 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"
+" - 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"
@@ -82,7 +82,7 @@ msgstr ""
"* [Tor](https://www.torproject.org) avec :\n"
" - [[isolation de flux|contribute/design/stream_isolation]]\n"
" - prise en charge des bridges normaux, obfs2, obfs3, obfs4 et ScrambleSuit\n"
-" - l'interface graphique Onion Circuits ([[Plus d'information...|doc/anonymous_internet/Tor_status#circuits]])\n"
+" - l'interface graphique Onion Circuits ([[Plus d'information...|doc/anonymous_internet/tor_status#circuits]])\n"
"* [NetworkManager](http://projects.gnome.org/NetworkManager/) pour une\n"
" configuration réseau simple ([[Plus d'information...|doc/anonymous_internet/networkmanager]])\n"
"* Le [Navigateur Tor](https://www.torproject.org/projects/torbrowser.html.en) ([[Plus d'information...|doc/anonymous_internet/Tor_Browser]]), un navigateur\n"
@@ -285,11 +285,11 @@ msgstr ""
#. type: Plain text
msgid ""
"The full packages list can be found in the [BitTorrent files download "
-"directory](/torrents/files/) (look for files with the `.packages` extension)."
+"directory](https://tails.boum.org/torrents/files/) (look for files with the "
+"`.packages` extension)."
msgstr ""
"La liste complète des paquets se trouve dans les fichiers portant "
-"l'extension `.packages` du [répertoire de téléchargement BitTorrent](/"
-"torrents/files/)."
+"l'extension `.packages` du [répertoire de téléchargement BitTorrent](https://tails.boum.org/torrents/files/)."
#. type: Title =
#, no-wrap
diff --git a/wiki/src/doc/about/features.mdwn b/wiki/src/doc/about/features.mdwn
index 3a892d1..0b223dd 100644
--- a/wiki/src/doc/about/features.mdwn
+++ b/wiki/src/doc/about/features.mdwn
@@ -16,7 +16,7 @@ Networking
* [Tor](https://www.torproject.org) with:
- [[stream isolation|contribute/design/stream_isolation]]
- regular, obfs2, obfs3, obfs4, and ScrambleSuit bridges support
- - the Onion Circuits graphical frontend ([[More...|doc/anonymous_internet/Tor_status#circuits]])
+ - the Onion Circuits graphical frontend ([[More...|doc/anonymous_internet/tor_status#circuits]])
* [NetworkManager](http://projects.gnome.org/NetworkManager/) for easy
network configuration ([[More...|doc/anonymous_internet/networkmanager]])
* [Tor Browser](https://www.torproject.org/projects/torbrowser.html.en) ([[More...|doc/anonymous_internet/Tor_Browser]]), a web
@@ -82,7 +82,7 @@ Encryption and privacy
* [Paperkey](http://www.jabberwocky.com/software/paperkey/) a command line tool to back up OpenPGP secret keys on paper ([[More...|doc/advanced_topics/paperkey]])
The full packages list can be found in the [BitTorrent files download
-directory](/torrents/files/) (look for files with the `.packages`
+directory](https://tails.boum.org/torrents/files/) (look for files with the `.packages`
extension).
Additional software
diff --git a/wiki/src/doc/about/features.pt.po b/wiki/src/doc/about/features.pt.po
index db5b8fb..219dcd1 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: 2016-03-07 18:54+0100\n"
+"POT-Creation-Date: 2016-04-29 13:53+0000\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"
@@ -83,7 +83,7 @@ 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"
+" - 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"
@@ -315,10 +315,11 @@ msgstr ""
#. type: Plain text
msgid ""
"The full packages list can be found in the [BitTorrent files download "
-"directory](/torrents/files/) (look for files with the `.packages` extension)."
+"directory](https://tails.boum.org/torrents/files/) (look for files with the "
+"`.packages` extension)."
msgstr ""
"A lista completa de pacotes pode ser encontrada no [diretório de download de "
-"arquivos BitTorrent](/torrents/files/) (arquivos com a extensão `.packages`)."
+"arquivos BitTorrent](https://tails.boum.org/torrents/files/) (arquivos com a extensão `.packages`)."
#. type: Title =
#, fuzzy, no-wrap
diff --git a/wiki/src/doc/about/fingerprint.fr.po b/wiki/src/doc/about/fingerprint.fr.po
index e8f518b..b03a79e 100644
--- a/wiki/src/doc/about/fingerprint.fr.po
+++ b/wiki/src/doc/about/fingerprint.fr.po
@@ -5,16 +5,16 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: Tails\n"
"POT-Creation-Date: 2015-12-15 20:57+0100\n"
-"PO-Revision-Date: 2015-09-14 17:20-0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"PO-Revision-Date: 2016-05-06 12:53+0100\n"
+"Last-Translator: Chre <tor@renaudineau.org>\n"
+"Language-Team: Tails translators <tails@boum.org>\n"
+"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.6.10\n"
#. type: Plain text
#, no-wrap
@@ -46,8 +46,8 @@ msgstr ""
"[[Comme expliqué sur notre page d'avertissements|warning#fingerprint]], en utilisant Tails\n"
"il est possible de savoir que vous utilisez Tor. Mais Tails essaye de rendre\n"
"**aussi difficile que possible de distinguer les utilisateurs de Tails de ceux de Tor**,\n"
-"en particulier des personnes utilisant le <span class=\"application\">navigateur Tor</span> en dehors de Tails.\n"
-"La possibilité de savoir si vous êtes un utilisateur du <span class=\"application\">navigateur Tor</span> dans Tails\n"
+"en particulier des personnes utilisant le <span class=\"application\">Navigateur Tor</span> en dehors de Tails.\n"
+"La possibilité de savoir si vous êtes un utilisateur du <span class=\"application\">Navigateur Tor</span> dans Tails\n"
"ou en dehors fournit plus d'informations sur vous et diminue d'autant plus votre\n"
"anonymat.\n"
@@ -57,8 +57,8 @@ msgid ""
"this could be used to identify you as a Tails user."
msgstr ""
"Cette section explicite certains problèmes concernant l'empreinte de Tails "
-"et comment celle-ci peut être utilisée pour vous identifier comme un "
-"utilisateur de Tails."
+"et comment celle-ci peut être utilisée pour vous identifier comme une "
+"personne utilisant Tails."
#. type: Title =
#, no-wrap
@@ -72,7 +72,7 @@ msgid ""
"size, list of available extensions, timezone, available fonts, etc."
msgstr ""
"Les sites web que vous visitez peuvent récupérer beaucoup d'informations sur "
-"votre navigateur. Elle peuvent inclure son nom, sa version, la taille de la "
+"votre navigateur. Elles peuvent inclure son nom, sa version, la taille de la "
"fenêtre, la liste des extensions disponibles, le fuseau horaire, les polices "
"disponibles etc."
@@ -84,23 +84,19 @@ msgid ""
"order to have similar fingerprints.\n"
msgstr ""
"Pour rendre difficile de distinguer un utilisateur de Tails,\n"
-"**le <span class=\"application\">navigateur Tor</span> inclus dans Tails essaye de révéler des informations identiques à un <span class=\"application\">navigateur Tor</span> utilisé sur un autre système d'exploitation**\n"
+"**le <span class=\"application\">Navigateur Tor</span> inclus dans Tails essaye de révéler des informations identiques à un <span class=\"application\">Navigateur Tor</span> utilisé sur un autre système d'exploitation**\n"
"afin d'avoir des empreintes similaires.\n"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "See the [[fingerprint section of known issues\n"
-#| "page|support/known_issues#fingerprint]] for a list of known differences\n"
-#| "between the fingerprints of <span class=\"application\">Tor Browser</span> inside and outside of Tails.\n"
+#, no-wrap
msgid ""
"Refer to the [[fingerprint section of our list of known issues\n"
"|support/known_issues#fingerprint]] to know if there are differences\n"
"between the fingerprints of <span class=\"application\">Tor Browser</span> inside and outside of Tails.\n"
msgstr ""
-"Voir la [[section empreinte des problèmes connus|support/known_issues#fingerprint]]\n"
-"pour une liste des différences connues entre l'empreinte du navigateur\n"
-"<span class=\"application\">navigateur Tor</span> dans Tails et en dehors.\n"
+"Se reporter à la [[section empreinte de notre liste des problèmes connus|support/known_issues#fingerprint]]\n"
+"pour savoir si il y a des différences entre les empreintes du\n"
+"<span class=\"application\">Navigateur Tor</span> à l'intérieur et en dehors de Tails.\n"
#. type: Plain text
#, no-wrap
@@ -109,7 +105,7 @@ msgid ""
"specific to Tails**. More sophisticated\n"
"attacks can use those differences to distinguish Tails users.\n"
msgstr ""
-"En plus de cela, **quelques extensions inclues dans le <span class=\"application\">navigateur Tor</span> de Tails sont spécifiques à Tails**.\n"
+"En plus de cela, **quelques extensions inclues dans le <span class=\"application\">Navigateur Tor</span> de Tails sont spécifiques à Tails**.\n"
"Des attaques plus sophistiquées peuvent utiliser ces différences pour distinguer\n"
"les utilisateurs de Tails.\n"
@@ -122,9 +118,9 @@ msgid ""
"webpage, that could help identify you as a Tails user.\n"
msgstr ""
"Par exemple, Tails comprend <span class=\"application\">Adblock\n"
-"Plus</span> qui supprime les pubs. Si un attaquant peut savoir que vous ne\n"
-"téléchargez pas les pubs inclues dans la page web, ça peut l'aider à vous\n"
-"identifier comme une utilisatrice de Tails.\n"
+"Plus</span> qui supprime les publicités. Si un attaquant peut savoir que vous ne\n"
+"téléchargez pas les publicités inclues dans la page web, cela peut l'aider à vous\n"
+"identifier comme utilisateur de Tails.\n"
#. type: Plain text
#, no-wrap
@@ -166,14 +162,15 @@ msgid ""
"generating only Tor traffic and so maybe using Tails."
msgstr ""
"Un système Tails ne **génère quasiment que du trafic Tor** sur le réseau. "
-"Habituellement les utilisateurs du <span class=\"application\">navigateur "
-"Tor</span> ont également du trafic hors de Tor, que ce soit à travers un "
-"autre navigateur web ou d'autres applications. Ce qui fait que la proportion "
-"de trafic via Tor pourrait être utilisée pour savoir si un utilisateur du "
-"<span class=\"application\">navigateur Tor</span> utilise Tails ou non. Si "
-"vous partagez une connexion Internet avec d'autres personnes qui n'utilisent "
-"pas Tails, il est probablement plus difficile pour votre FAI de savoir si un "
-"utilisateur génère seulement du trafic Tor ou s'il utilise Tails."
+"Habituellement les utilisateurs du <span class=\"application\">Navigateur "
+"Tor</span> sur d'autres systèmes d'exploitation ont également du trafic "
+"réseau hors de Tor, que ce soit à travers un autre navigateur web ou "
+"d'autres applications. Ce qui fait que la proportion de trafic via Tor "
+"pourrait être utilisée pour savoir si un utilisateur du <span class="
+"\"application\">Navigateur Tor</span> utilise Tails ou non. Si vous partagez "
+"une connexion Internet avec d'autres personnes qui n'utilisent pas Tails, il "
+"est probablement plus difficile pour votre FAI de savoir si un utilisateur "
+"génère seulement du trafic Tor ou s'il utilise Tails."
#. type: Bullet: ' - '
msgid ""
diff --git a/wiki/src/doc/about/license.de.po b/wiki/src/doc/about/license.de.po
index 4686611..c18148c 100644
--- a/wiki/src/doc/about/license.de.po
+++ b/wiki/src/doc/about/license.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails Translation\n"
-"POT-Creation-Date: 2016-01-21 20:21+0100\n"
+"POT-Creation-Date: 2016-04-29 13:53+0000\n"
"PO-Revision-Date: 2015-05-16 22:27+0100\n"
"Last-Translator: spriver <spriver@autistici.org>\n"
"Language-Team: Tails Translation <tails-l10n@boum.org>\n"
@@ -23,8 +23,16 @@ msgstr "[[!meta title=\"Lizenzen\"]]\n"
#. type: Plain text
msgid ""
-"Tails is [[Free Software|http://www.gnu.org/philosophy/free-sw.html]] "
-"released under the GNU/GPL (version 3 or above)."
+"Tails is [[Free Software|doc/about/license]]: you can download, use, and "
+"share it with no restrictions."
+msgstr ""
+
+#. type: Plain text
+#, fuzzy
+#| 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 ist [[Freie Software|http://www.gnu.org/philosophy/free-sw.html]], die "
"unter der GNU General Public License (Version 3 oder höher) veröffentlicht "
@@ -184,8 +192,8 @@ msgid ""
"you only require one or two source packages, Tails can work with you to send "
"a copy of individual packages electronically."
msgstr ""
-"Gemäß der General Public License (Abschnitt 3(b) der GPLv2 und Abschnitt 6"
-"(b) der GPLv3) ist der vollständige Quellcode aller Tails-Releases für "
+"Gemäß der General Public License (Abschnitt 3(b) der GPLv2 und Abschnitt "
+"6(b) der GPLv3) ist der vollständige Quellcode aller Tails-Releases für "
"jeden, der danach fragt, als DVD via Briefpost gegen eine Aufwendung "
"verfügbar. Falls Sie nur ein oder zwei Quellpakete benötigen, kann auch eine "
"Lösung ausgearbeitet werden, Ihnen die einzelnen Pakete auf elektronischem "
diff --git a/wiki/src/doc/about/license.fa.po b/wiki/src/doc/about/license.fa.po
index d48cb73..fb81c12 100644
--- a/wiki/src/doc/about/license.fa.po
+++ b/wiki/src/doc/about/license.fa.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2016-01-21 20:21+0100\n"
+"POT-Creation-Date: 2016-04-29 13:53+0000\n"
"PO-Revision-Date: 2015-10-21 10:59+0000\n"
"Last-Translator: sprint5 <translation5@451f.org>\n"
"Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/license/"
@@ -26,8 +26,16 @@ msgstr "[[!meta title=\"گواهی\"]]\n"
#. type: Plain text
msgid ""
-"Tails is [[Free Software|http://www.gnu.org/philosophy/free-sw.html]] "
-"released under the GNU/GPL (version 3 or above)."
+"Tails is [[Free Software|doc/about/license]]: you can download, use, and "
+"share it with no restrictions."
+msgstr ""
+
+#. type: Plain text
+#, fuzzy
+#| 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 ""
"تیلز یک [[نرم‌افزار آزاد|http://www.gnu.org/philosophy/free-sw.html]] است که "
"تحت پروانهٔ عمومی همگانی گنو (نسخهٔ ۳ یا بالاتر) منتشر شده‌است."
diff --git a/wiki/src/doc/about/license.fr.po b/wiki/src/doc/about/license.fr.po
index 7ca5705..4370e59 100644
--- a/wiki/src/doc/about/license.fr.po
+++ b/wiki/src/doc/about/license.fr.po
@@ -5,15 +5,16 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: Tails\n"
"POT-Creation-Date: 2016-01-21 20:21+0100\n"
-"PO-Revision-Date: 2012-04-29 16:02+0100\n"
-"Last-Translator: MR\n"
-"Language-Team: \n"
-"Language: \n"
+"PO-Revision-Date: 2016-05-06 13:02+0100\n"
+"Last-Translator: Chre <tor@renaudineau.org>\n"
+"Language-Team: Tails translators <tails@boum.org>\n"
+"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.6.10\n"
#. type: Plain text
#, no-wrap
@@ -22,8 +23,16 @@ msgstr "[[!meta title=\"Licence\"]]\n"
#. type: Plain text
msgid ""
-"Tails is [[Free Software|http://www.gnu.org/philosophy/free-sw.html]] "
-"released under the GNU/GPL (version 3 or above)."
+"Tails is [[Free Software|doc/about/license]]: you can download, use, and "
+"share it with no restrictions."
+msgstr ""
+
+#. type: Plain text
+#, fuzzy
+#| 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 est un [[Logiciel libre|https://www.gnu.org/philosophy/free-sw.fr."
"html]] publié sous la licence GNU/GPL (version 3 ou supérieure)."
@@ -33,23 +42,21 @@ msgid ""
"However, Tails includes non-free firmware in order to work on as much "
"hardware as possible."
msgstr ""
+"Cependant, Tails inclut des micrologiciels non-libres afin de fonctionner "
+"avec le plus de matériel possible."
#. type: Title =
#, no-wrap
msgid "Website\n"
-msgstr ""
+msgstr "Site 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 ""
"Ce site utilise plusieurs images aux copyrights, licences, marques déposées "
-"et termes de distribution variés :"
+"et termes de distribution distincts :"
#. type: Plain text
#, no-wrap
@@ -86,11 +93,42 @@ msgid ""
" - [[Pause|https://thenounproject.com/term/pause/152046]]:\n"
" Creative Commons — Attribution, by Zech Nelson.\n"
msgstr ""
+" - Le logo Tails est basé sur [[USB|http://thenounproject.com/term/usb/23873/]]\n"
+" par Ilsur Aptukov du Noun Project.\n"
+" - Logo Debian : Copyright (c) 1999 Software in the Public Interest.\n"
+" - Logo Onion : marque déposée par The Tor Project, Inc. ; le projet Tails\n"
+"est autorisé à l'utiliser sous certaines conditions ; sous licence\n"
+"Creative Commons Attribution 3.0 États-Unis.\n"
+" - Icônes de [[The Noun Project|http://thenounproject.com/]] :\n"
+" - [[Announcement|http://thenounproject.com/term/announcement/1186/]] :\n"
+" Creative Commons - Attribution, par Olivier Guin.\n"
+" - [[Code|http://thenounproject.com/term/code/18033/]] :\n"
+" Creative Commons — Attribution, par Azis.\n"
+" - [[Pen|http://thenounproject.com/term/pen/18907/]] :\n"
+" Creative Commons — Attribution, par factor[e] design initiative.\n"
+" - [[Loan|http://thenounproject.com/term/loan/19538/]] :\n"
+" Domaine public, par Rohith M S.\n"
+" - [[User|http://thenounproject.com/term/user/419/]] :\n"
+" Creative Commons — Attribution, par Edward Boatman.\n"
+" - [[Translation|http://thenounproject.com/term/translation/5735/]] :\n"
+" Creative Commons — Attribution, par Joe Mortell.\n"
+" - [[Gears|http://thenounproject.com/term/gears/8949/]] :\n"
+" Creative Commons — Attribution, par Cris Dobbins.\n"
+" - [[Graphic Design|http://thenounproject.com/term/graphic_design/9198/]] :\n"
+" Creative Commons — Attribution, par Cornelius Danger.\n"
+" - [[Check Mark|https://thenounproject.com/term/check/4489/]] :\n"
+" Domaine public, par Julian Norton.\n"
+" - [[Delete|https://thenounproject.com/term/delete/49691/]] :\n"
+" Creative Commons — Attribution, par Kervin Markle.\n"
+" - [[Play|https://thenounproject.com/term/play/152052]] :\n"
+" Creative Commons — Attribution, par Zech Nelson.\n"
+" - [[Pause|https://thenounproject.com/term/pause/152046]] :\n"
+" Creative Commons — Attribution, par Zech Nelson.\n"
#. type: Title =
#, no-wrap
msgid "Distribution of the source code\n"
-msgstr ""
+msgstr "Distribution du code source\n"
#. type: Plain text
msgid ""
@@ -102,6 +140,14 @@ msgid ""
"all parties (packages that can not be found in the regular Debian archive "
"anymore can be found at <http://snapshot.debian.org/>)."
msgstr ""
+"La plupart des logiciels distribués avec Tails proviennent directement des "
+"paquets upstreams Debian, ils n'ont été ni modifiés ni recompilés par Tails. "
+"Les logiciels qui ont été modifiés ou recompilés par Tails sont disponibles "
+"dans [[nos dépôts git|/contribute/git]]. Si vous avez besoin ou envie des "
+"sources pour les paquets upstreams Debian non modifiés, les récupérer depuis "
+"Debian est la solution la plus simple pour toutes les parties (les paquets "
+"qui ne peuvent plus être trouvés dans l'archive Debian standard peuvent être "
+"trouvés à l'adresse <http://snapshot.debian.org/>)."
#. type: Plain text
msgid ""
@@ -111,6 +157,12 @@ msgid ""
"you only require one or two source packages, Tails can work with you to send "
"a copy of individual packages electronically."
msgstr ""
+"Selon la licence GPL (section 3(b) de la GPLv2 et section 6(b) de la GPLv3), "
+"les sources complètes de toutes les versions de Tails sont disponibles pour "
+"toute personne en faisant la demande, au format DVD, par courrier postal, "
+"pour un coût modique. Si vous avez seulement besoin d'un ou deux paquets "
+"source, Tails peut vous envoyer électroniquement une copie individuel des "
+"paquets."
#~ msgid "Debian logo: Copyright (c) 1999 Software in the Public Interest."
#~ msgstr ""
diff --git a/wiki/src/doc/about/license.mdwn b/wiki/src/doc/about/license.mdwn
index 0bbbdb6..7441fd7 100644
--- a/wiki/src/doc/about/license.mdwn
+++ b/wiki/src/doc/about/license.mdwn
@@ -1,7 +1,9 @@
[[!meta title="License"]]
-Tails is [[Free Software|http://www.gnu.org/philosophy/free-sw.html]] released
-under the GNU/GPL (version 3 or above).
+Tails is [[Free Software|doc/about/license]]: you can download, use, and
+share it with no restrictions.
+
+Tails is released under the GNU/GPL (version 3 or above).
However, Tails includes non-free firmware in order to work on as much hardware as
possible.
diff --git a/wiki/src/doc/about/license.pt.po b/wiki/src/doc/about/license.pt.po
index 3fdc027..f3435d4 100644
--- a/wiki/src/doc/about/license.pt.po
+++ b/wiki/src/doc/about/license.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-01-21 20:21+0100\n"
+"POT-Creation-Date: 2016-04-29 13:53+0000\n"
"PO-Revision-Date: 2014-05-23 12:05-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,8 +22,16 @@ msgstr "[[!meta title=\"Licença\"]]\n"
#. type: Plain text
msgid ""
-"Tails is [[Free Software|http://www.gnu.org/philosophy/free-sw.html]] "
-"released under the GNU/GPL (version 3 or above)."
+"Tails is [[Free Software|doc/about/license]]: you can download, use, and "
+"share it with no restrictions."
+msgstr ""
+
+#. type: Plain text
+#, fuzzy
+#| 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 é [[Software Livre|http://www.gnu.org/philosophy/free-sw.html]] (em "
"inglês) lançado sob a GNU/GPL (versão 3 ou superior)."
diff --git a/wiki/src/doc/about/openpgp_keys.de.po b/wiki/src/doc/about/openpgp_keys.de.po
index 816eeb2..0a0171e 100644
--- a/wiki/src/doc/about/openpgp_keys.de.po
+++ b/wiki/src/doc/about/openpgp_keys.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails Translators\n"
-"POT-Creation-Date: 2016-03-21 18:14+0100\n"
+"POT-Creation-Date: 2016-04-29 17:43+0300\n"
"PO-Revision-Date: 2015-05-28 20:20+0100\n"
"Last-Translator: spriver <spriver@autistici.org>\n"
"Language-Team: Tails Translator <tails-l10n@boum.org>\n"
@@ -31,11 +31,14 @@ 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 key|doc/get/trusting_tails_signing_key]]\n"
+#| "that you downloaded, because there are fake (malicious) Tails OpenPGP keys\n"
+#| "on the keyservers.</p>\n"
msgid ""
-"<p>Make sure to [[verify the key|doc/get/trusting_tails_signing_key]]\n"
-"that you downloaded, because there are fake (malicious) Tails OpenPGP keys\n"
-"on the keyservers.</p>\n"
+"<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>Stellen Sie sicher, dass Sie den [[Schlüssel verifizieren|doc/get/trusting_tails_signing_key]],\n"
"den Sie heruntergeladen haben, da es gefälschte (bösartige) Tails OpenPGP Schlüssel\n"
@@ -43,6 +46,15 @@ msgstr ""
#. 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 ""
+
+#. type: Plain text
+#, no-wrap
msgid "</div>\n"
msgstr "</div>\n"
@@ -439,6 +451,48 @@ msgstr ""
"key]]"
#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "<a id=\"press\"></a>\n"
+msgid "<a id=\"mirrors\"></a>\n"
+msgstr "<a id=\"press\"></a>\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"Mirrors team key\n"
+"===================\n"
+msgstr ""
+
+#. type: Bullet: ' - '
+#, fuzzy
+#| msgid ""
+#| "Use this key to encrypt private emails sent to <tails-press@boum.org>."
+msgid ""
+"Use this key to encrypt private emails sent to [[tails-mirrors@boum.org|"
+"about/contact#tails-mirrors]]."
+msgstr ""
+"Verwenden Sie diesen Schlüssel, um private E-Mails an <tails-press@boum.org> "
+"zu verschlüsseln."
+
+#. 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 ""
+
+#. 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 ""
+"laden Sie ihn von der Website herunter: [[!tails_website tails-press.key]]"
+
+#. type: Plain text
#, no-wrap
msgid "<a id=\"sysadmins\"></a>\n"
msgstr "<a id=\"sysadmins\"></a>\n"
diff --git a/wiki/src/doc/about/openpgp_keys.fa.po b/wiki/src/doc/about/openpgp_keys.fa.po
index 799a327..54a5486 100644
--- a/wiki/src/doc/about/openpgp_keys.fa.po
+++ b/wiki/src/doc/about/openpgp_keys.fa.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2016-03-21 18:14+0100\n"
+"POT-Creation-Date: 2016-04-29 17:43+0300\n"
"PO-Revision-Date: 2015-10-21 11:00+0000\n"
"Last-Translator: sprint5 <translation5@451f.org>\n"
"Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/"
@@ -34,17 +34,29 @@ 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 key|doc/get/trusting_tails_signing_key]]\n"
+#| "that you downloaded, because there are fake (malicious) Tails OpenPGP keys\n"
+#| "on the keyservers.</p>\n"
msgid ""
-"<p>Make sure to [[verify the key|doc/get/trusting_tails_signing_key]]\n"
-"that you downloaded, because there are fake (malicious) Tails OpenPGP keys\n"
-"on the keyservers.</p>\n"
+"<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>مطمئن شوید کلیدی که دانلود کرده‌اید را [[تأیید می‌کنید|doc/get/trusting_tails_signing_key]]\n"
" زیرا روی سرورها کلیدهای تقلبی و مخرب اُپن‌پی‌جی‌پی تیلز نیز وجود دارند.</p>\n"
#. 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 ""
+
+#. type: Plain text
+#, no-wrap
msgid "</div>\n"
msgstr "</div>\n"
@@ -448,6 +460,60 @@ msgstr ""
"آن را از این تارنما دانلود کنید: [[!tails_website tails-accounting.key]]"
#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "<a id=\"press\"></a>\n"
+msgid "<a id=\"mirrors\"></a>\n"
+msgstr "<a id=\"press\"></a>\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"Mirrors team key\n"
+"===================\n"
+msgstr ""
+
+#. type: Bullet: ' - '
+#, fuzzy
+#| msgid ""
+#| "Use this key to encrypt private emails sent to <tails-press@boum.org>."
+msgid ""
+"Use this key to encrypt private emails sent to [[tails-mirrors@boum.org|"
+"about/contact#tails-mirrors]]."
+msgstr ""
+"از این کلید برای رمزگذاری رایانامه‌های خصوصی که به <tails-press@boum.org> "
+"فرستاده شده‌اند استفاده کنید."
+
+#. 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"
+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 ""
+" 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: ' - '
+#, 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]]"
+
+#. type: Plain text
#, no-wrap
msgid "<a id=\"sysadmins\"></a>\n"
msgstr "<a id=\"sysadmins\"></a>\n"
diff --git a/wiki/src/doc/about/openpgp_keys.fr.po b/wiki/src/doc/about/openpgp_keys.fr.po
index 91c4020..1706c12 100644
--- a/wiki/src/doc/about/openpgp_keys.fr.po
+++ b/wiki/src/doc/about/openpgp_keys.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails-l10n-wiki\n"
-"POT-Creation-Date: 2016-03-21 18:14+0100\n"
+"POT-Creation-Date: 2016-04-29 17:43+0300\n"
"PO-Revision-Date: 2015-01-17 18:08-0000\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: Tails translators <tails-l10n@boum.org>\n"
@@ -33,9 +33,17 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"<p>Make sure to [[verify the key|doc/get/trusting_tails_signing_key]]\n"
-"that you downloaded, because there are fake (malicious) Tails OpenPGP keys\n"
-"on the keyservers.</p>\n"
+"<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 ""
+
+#. 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 ""
#. type: Plain text
@@ -459,6 +467,60 @@ msgstr "la télécharger depuis ce site : [[!tails_website tails-signing.key]]"
#. type: Plain text
#, no-wrap
+msgid "<a id=\"mirrors\"></a>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"Mirrors team key\n"
+"===================\n"
+msgstr ""
+
+#. type: Bullet: ' - '
+#, fuzzy
+#| msgid ""
+#| "Use this key to encrypt private support requests sent to <tails-support-"
+#| "private@boum.org>."
+msgid ""
+"Use this key to encrypt private emails sent to [[tails-mirrors@boum.org|"
+"about/contact#tails-mirrors]]."
+msgstr ""
+"Utilisez cette clé pour les demandes d'aide adressées à <tails-support-"
+"private@boum.org>."
+
+#. 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"
+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 ""
+" 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"
+
+#. type: Bullet: ' - '
+#, fuzzy
+#| msgid "download it from this website: [[!tails_website tails-email.key]]"
+msgid "download it from this website: [[!tails_website tails-mirrors.key]]"
+msgstr "la télécharger depuis ce site : [[!tails_website tails-email.key]]"
+
+#. type: Plain text
+#, no-wrap
msgid "<a id=\"sysadmins\"></a>\n"
msgstr ""
diff --git a/wiki/src/doc/about/openpgp_keys.mdwn b/wiki/src/doc/about/openpgp_keys.mdwn
index e9ba374..5139c79 100644
--- a/wiki/src/doc/about/openpgp_keys.mdwn
+++ b/wiki/src/doc/about/openpgp_keys.mdwn
@@ -4,9 +4,13 @@ Tails developers maintain several OpenPGP key pairs.
<div class="caution">
-<p>Make sure to [[verify the key|doc/get/trusting_tails_signing_key]]
-that you downloaded, because there are fake (malicious) Tails OpenPGP keys
-on the keyservers.</p>
+<p>Make sure to verify the keys that you download, because there are
+several fake and maybe malicious Tails keys on the key servers.</p>
+
+<p>For example, if you first [[authenticate the Tails signing key
+through the OpenPGP Web of Trust|install/download/openpgp#wot]], then
+you can verify our others keys as they are all certified by the Tails
+signing key.</p>
</div>
@@ -234,6 +238,37 @@ There are multiple ways to get this OpenPGP public key:
- download it from this website: [[!tails_website tails-accounting.key]]
- fetch it from your favourite keyserver.
+<a id="mirrors"></a>
+
+Mirrors team key
+===================
+
+Purpose
+-------
+
+### Encryption
+
+ - Use this key to encrypt private emails sent to
+ [[tails-mirrors@boum.org|about/contact#tails-mirrors]].
+
+Key details
+-----------
+
+ pub rsa4096/0xD2EDA621B572DD73 2016-04-29 [SCEA]
+ Key fingerprint = 0B08 8E31 D4F8 E59A 3D39 9137 D2ED A621 B572 DD73
+ uid [ unknown] Tails mirror pool managers (schleuder list) <tails-mirrors@boum.org>
+ uid [ unknown] Tails mirror pool managers (schleuder list) <tails-mirrors-request@boum.org>
+ uid [ unknown] Tails mirror pool managers (schleuder list) <tails-mirrors-owner@boum.org>
+ sub rsa4096/0x3DCFC1EB1C62C73C 2016-04-29 [SEA]
+
+How to get the public key?
+--------------------------
+
+There are multiple ways to get this OpenPGP public key:
+
+ - download it from this website: [[!tails_website tails-mirrors.key]]
+ - fetch it from your favourite keyserver.
+
<a id="sysadmins"></a>
Sysadmins team key
diff --git a/wiki/src/doc/about/openpgp_keys.pt.po b/wiki/src/doc/about/openpgp_keys.pt.po
index 7f55c79..2e7681b 100644
--- a/wiki/src/doc/about/openpgp_keys.pt.po
+++ b/wiki/src/doc/about/openpgp_keys.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-03-21 18:14+0100\n"
+"POT-Creation-Date: 2016-04-29 17:43+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"
@@ -34,9 +34,17 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"<p>Make sure to [[verify the key|doc/get/trusting_tails_signing_key]]\n"
-"that you downloaded, because there are fake (malicious) Tails OpenPGP keys\n"
-"on the keyservers.</p>\n"
+"<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 ""
+
+#. 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 ""
#. type: Plain text
@@ -402,6 +410,43 @@ msgstr "baixe-a deste website: [[!tails_website tails-signing.key]]"
#. type: Plain text
#, no-wrap
+msgid "<a id=\"mirrors\"></a>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"Mirrors team key\n"
+"===================\n"
+msgstr ""
+
+#. type: Bullet: ' - '
+#, fuzzy
+#| msgid "send an email to <tails-sendkey@boum.org>."
+msgid ""
+"Use this key to encrypt private emails sent to [[tails-mirrors@boum.org|"
+"about/contact#tails-mirrors]]."
+msgstr "envie um email para <tails-sendkey@boum.org>."
+
+#. 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 ""
+
+#. type: Bullet: ' - '
+#, fuzzy
+#| msgid "download it from this website: [[!tails_website tails-email.key]]"
+msgid "download it from this website: [[!tails_website tails-mirrors.key]]"
+msgstr "baixe-a deste website: [[!tails_website tails-email.key]]"
+
+#. type: Plain text
+#, no-wrap
msgid "<a id=\"sysadmins\"></a>\n"
msgstr ""
diff --git a/wiki/src/doc/about/trust.de.po b/wiki/src/doc/about/trust.de.po
index 0605897..2297f4e 100644
--- a/wiki/src/doc/about/trust.de.po
+++ b/wiki/src/doc/about/trust.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2016-04-25 15:51+0200\n"
+"POT-Creation-Date: 2016-04-27 17:19+0000\n"
"PO-Revision-Date: 2016-03-28 15:41+0200\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: \n"
@@ -81,10 +81,10 @@ msgid ""
"thorough audit of the code can reveal if any malicious code, like a "
"backdoor, is present. Furthermore, with the source code it is possible to "
"build the software, and then compare the result against any version that is "
-"already built and being distributed, like the Tails ISO images that [[you "
-"can download from us|install]]. 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."
+"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 ""
"Freie Software [[wie Tails|about/license]] ermöglicht es seinen Benutzern "
"genau zu überprüfen, woraus die einzelnen Softwarebausteine bestehen und wie "
@@ -92,7 +92,7 @@ msgstr ""
"zur Verfügung gestellt werden muss. Eine gründliche Überprüfung des Codes "
"bringt schädlichen Code, wie eine Hintertür, zu Tage. Darüber hinaus ist es "
"möglich, die Software selber zu übersetzen und anschließend mit der "
-"bereitgestellten Version, wie den [[ISO-Images von Tails|install]], zu "
+"bereitgestellten Version, wie den ISO-Images von Tails, zu "
"vergleichen. Auf diesem Weg kann überprüft werden, ob die bereitgestellte "
"Version von der gleichen Codebasis erzeugt oder ob schadhafter Code "
"eingeschleust wurde."
diff --git a/wiki/src/doc/about/trust.fa.po b/wiki/src/doc/about/trust.fa.po
index f379be7..6ebb6d4 100644
--- a/wiki/src/doc/about/trust.fa.po
+++ b/wiki/src/doc/about/trust.fa.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2015-12-24 15:03+0100\n"
+"POT-Creation-Date: 2016-04-27 17:19+0000\n"
"PO-Revision-Date: 2015-10-12 09:16+0000\n"
"Last-Translator: sprint5 <translation5@451f.org>\n"
"Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/trust/fa/"
@@ -100,9 +100,9 @@ msgstr "نرم‌افزار آزاد و مراقبت عمومی\n"
#| "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 [[you "
-#| "can download from us|install]]. 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."
+#| "can download from us|install]]. 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, "
@@ -110,10 +110,10 @@ msgid ""
"thorough audit of the code can reveal if any malicious code, like a "
"backdoor, is present. Furthermore, with the source code it is possible to "
"build the software, and then compare the result against any version that is "
-"already built and being distributed, like the Tails ISO images that [[you "
-"can download from us|install]]. 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."
+"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 ""
"نرم‌افزارهای آزاد [[مانند تیلز|about/license]] به کاربران خود اجازه می‌دهند که "
"ببینند آن توزیع نرم‌افزار دقیقاً از چه ایجاد شده و چطور عمل می‌کند، چون کد منبع "
diff --git a/wiki/src/doc/about/trust.fr.po b/wiki/src/doc/about/trust.fr.po
index a41c71f..448c047 100644
--- a/wiki/src/doc/about/trust.fr.po
+++ b/wiki/src/doc/about/trust.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2015-10-30 11:35+0100\n"
+"POT-Creation-Date: 2016-04-27 17:19+0000\n"
"PO-Revision-Date: 2016-03-23 22:03+0100\n"
"Last-Translator: AtomiKe <tails@atomike.ninja>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -80,10 +80,10 @@ msgid ""
"thorough audit of the code can reveal if any malicious code, like a "
"backdoor, is present. Furthermore, with the source code it is possible to "
"build the software, and then compare the result against any version that is "
-"already built and being distributed, like the Tails ISO images that [[you "
-"can download from us|install]]. 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."
+"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 ""
"Un logiciel libre, [[comme Tails|about/license]], permet à ceux qui "
"l'utilisent de regarder précisément en quoi consiste ce système "
@@ -92,8 +92,8 @@ msgstr ""
"présence de code malveillant, comme une porte dérobée par exemple. De plus, "
"il est possible de construire le logiciel depuis le code source, et de "
"comparer le résultat obtenu avec n'importe quelle version déjà existante et "
-"publiée, telles que les images ISO de Tails que [[vous pouvez télécharger|"
-"install]]. Il est ainsi possible de savoir si la version distribuée est "
+"publiée, telles que les images ISO de Tails que vous pouvez télécharger."
+"Il est ainsi possible de savoir si la version distribuée est "
"celle provenant du code source, ou bien si des changements ont été effectués "
"subrepticement au passage."
diff --git a/wiki/src/doc/about/trust.mdwn b/wiki/src/doc/about/trust.mdwn
index 27849f2..09c6715 100644
--- a/wiki/src/doc/about/trust.mdwn
+++ b/wiki/src/doc/about/trust.mdwn
@@ -30,8 +30,8 @@ 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|install]]. That way it can be determined whether the distributed
+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.
diff --git a/wiki/src/doc/about/trust.pt.po b/wiki/src/doc/about/trust.pt.po
index a3008cf..63da752 100644
--- a/wiki/src/doc/about/trust.pt.po
+++ b/wiki/src/doc/about/trust.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: 1\n"
-"POT-Creation-Date: 2015-10-30 11:35+0100\n"
+"POT-Creation-Date: 2016-04-27 17:19+0000\n"
"PO-Revision-Date: 2012-07-03 16:55-0300\n"
"Last-Translator: drebs <drebs@riseup.net>\n"
"Language-Team: Portuguese <LL@li.org>\n"
@@ -102,9 +102,9 @@ msgstr "Software Livre e escrutínio público\n"
#| "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 [[you "
-#| "can download from us|install]]. 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."
+#| "can download from us|install]]. 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, "
@@ -112,10 +112,10 @@ msgid ""
"thorough audit of the code can reveal if any malicious code, like a "
"backdoor, is present. Furthermore, with the source code it is possible to "
"build the software, and then compare the result against any version that is "
-"already built and being distributed, like the Tails ISO images that [[you "
-"can download from us|install]]. 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."
+"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 ""
"O Software Livre, [[como Tails|about/license]], permite a seus usuários/as "
"checar exatamente no que consiste a distribuição de software e como ela "
diff --git a/wiki/src/doc/about/warning.de.po b/wiki/src/doc/about/warning.de.po
index ccedd6c..c021a40 100644
--- a/wiki/src/doc/about/warning.de.po
+++ b/wiki/src/doc/about/warning.de.po
@@ -117,17 +117,17 @@ msgstr "[[!img htw2-tails.png link=no alt=\"Eine Tor-Verbindung geht üblicherwe
#. 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://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#CanexitnodeseavesdroponcommunicationsIsntthatbad)."
+"communications?](https://www.torproject.org/docs/faq.html.en#CanExitNodesEavesdrop)."
msgstr ""
"Das letzte Relais einer solchen Verbindung, das Ausgangsrelais, stellt die eigentliche Verbindung zu dem Zielserver her. Da Tor die Daten zwischen Ausgangsrelais und Zielserver nicht verschlüsselt und konzeptionell nicht verschlüsseln kann, **kann jedes Ausgangsrelais jeden beliebigen durch ihn hindurch geleiteten Datenverkehr aufzeichnen**. Siehe [Tor FAQ: Can "
-"exit nodes eavesdrop on communications?](https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#CanexitnodeseavesdroponcommunicationsIsntthatbad)."
+"exit nodes eavesdrop on communications?](https://www.torproject.org/docs/faq.html.en#CanExitNodesEavesdrop)."
#. type: Plain text
msgid ""
-"For example, in 2007, a security researcher intercepted thousands of private e-mail 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/"
+"For example, in 2007, a security researcher intercepted thousands of private e-mail 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 ""
-"Beispielsweise hat ein Sicherheitsforscher im Jahr 2007 weltweit tausende private E-Mails zwischen ausländischen Botschaften und Menschenrechtsgruppen abgehört, indem er die aus von ihm betriebenen Ausgangsrelais ausgehenden Verbindungen überwacht hat. Siehe [Wired: Rogue Nodes Turn Tor Anonymizer Into Eavesdropper's Paradise](http://www.wired.com/politics/"
+"Beispielsweise hat ein Sicherheitsforscher im Jahr 2007 weltweit tausende private E-Mails zwischen ausländischen Botschaften und Menschenrechtsgruppen abgehört, indem er die aus von ihm betriebenen Ausgangsrelais ausgehenden Verbindungen überwacht hat. Siehe [Wired: Rogue Nodes Turn Tor Anonymizer Into Eavesdropper's Paradise](http://archive.wired.com/politics/"
"security/news/2007/09/embassy_hacks)."
#. type: Plain text
@@ -225,8 +225,8 @@ msgid "<!-- Source: wiki/lib/man-in-the-middle.svg -->\n"
msgstr "<!-- Source: wiki/lib/man-in-the-middle.svg -->\n"
#. 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](http://www.teamfurry.com/wordpress/2007/11/20/tor-exit-node-doing-mitm-attacks)."
-msgstr "Bei der Verwendung von Tor sind Man-in-the-Middle-Angriffe immer noch zwischen Ausgangsrelais und Zielserver möglich. Zudem kann das Ausgangsrelais selbst als Mittelsmann agieren. Für ein Beispiel eines solchen Angriffs, siehe [MW-Blog: TOR exit-node doing MITM attacks](http://www.teamfurry.com/wordpress/2007/11/20/tor-exit-node-doing-mitm-attacks)."
+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 "Bei der Verwendung von Tor sind Man-in-the-Middle-Angriffe immer noch zwischen Ausgangsrelais und Zielserver möglich. Zudem kann das Ausgangsrelais selbst als Mittelsmann agieren. Für ein Beispiel eines solchen Angriffs, siehe [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)."
#. type: Plain text
#, no-wrap
@@ -270,10 +270,10 @@ msgstr "Allerdings kommt noch hinzu, dass das Vertrauensmodell mit Zertifizierun
#. 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](http://blogs.comodo.com/it-security/data-security/the-recent-ra-compromise/)."
+"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 ""
"Beispielsweise berichtete Comodo, eine der größten SSL-Zertifikat-Autoritäten, am 15. März 2011, dass ein Benutzungskonto mit Rechten einer Registrierungsstelle kompromittiert worden sei. Diese wurde anschließend zum Anlegen eines neuen Benutzungskontos verwendet, welches neun Signierungsanfragen für Zertifikate von sieben Domains ausgestellt hat: mail.google."
-"com, login.live.com, www.google.com, login.yahoo.com (drei Zertifikate), login.skype.com, addons.mozilla.org, und global trustee. Siehe [Comodo: The Recent RA Compromise](http://blogs.comodo.com/it-security/data-security/the-recent-ra-compromise/)."
+"com, login.live.com, www.google.com, login.yahoo.com (drei Zertifikate), login.skype.com, addons.mozilla.org, und global trustee. Siehe [Comodo: The Recent RA Compromise](https://blog.comodo.com/other/the-recent-ra-compromise/)."
#. type: Plain text
msgid ""
@@ -305,14 +305,14 @@ msgstr ""
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"
+"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 ""
"<p class=\"quoted-from\">Zitiert aus [[!wikipedia_de Man-in-the-Middle-Angriff\n"
"desc=\"Wikipedia: %s\"]], [[!wikipedia\n"
-"Comodo_Group#Iran_SSL_certificate_controversy desc=\"Wikipedia: %s\"]] und <a\n"
+"Comodo_Group#Certificate_hacking desc=\"Wikipedia: %s\"]] und <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.fa.po b/wiki/src/doc/about/warning.fa.po
index c55874d..7c73c32 100644
--- a/wiki/src/doc/about/warning.fa.po
+++ b/wiki/src/doc/about/warning.fa.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2016-03-07 18:54+0100\n"
+"POT-Creation-Date: 2016-05-11 15:35+0000\n"
"PO-Revision-Date: 2015-10-15 12:19+0000\n"
"Last-Translator: sprint5 <translation5@451f.org>\n"
"Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/warning/"
@@ -172,16 +172,15 @@ msgid ""
"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://trac.torproject.org/projects/tor/wiki/"
-"TheOnionRouter/TorFAQ#CanexitnodeseavesdroponcommunicationsIsntthatbad)."
+"communications?](https://www.torproject.org/docs/faq.html."
+"en#CanExitNodesEavesdrop)."
msgstr ""
"آخرین رله در این مدار گره خروجی نام دارد و نقطه‌ای است که ارتباط اصلی به سرور "
"مقصد را ایجاد می‌کند. از آن‌جا که تور ترافیک بین یک گره خروجی و سرور مقصد را "
"رمزگذاری نمی‌کند و بنا به طراحی‌اش نباید هم چنین کاری بکند، **هر گره خروجی "
"امکان دسترسی به هر ترافیکی که از آن می‌گذرد را دارد**. رجوع کنید به [سوالات "
-"متداول تور: آیا گره‌های خروجی می‌توانند ارتباطات را شنود کنند؟](https://trac."
-"torproject.org/projects/tor/wiki/TheOnionRouter/"
-"TorFAQ#CanexitnodeseavesdroponcommunicationsIsntthatbad)."
+"متداول تور: آیا گره‌های خروجی می‌توانند ارتباطات را شنود کنند؟](https://www."
+"torproject.org/docs/faq.html.en#CanExitNodesEavesdrop)."
#. type: Plain text
msgid ""
@@ -189,13 +188,14 @@ msgid ""
"e-mail 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)."
+"Paradise](http://archive.wired.com/politics/security/news/2007/09/"
+"embassy_hacks)."
msgstr ""
"برای نمونه در سال ۲۰۰۷ یک پژوهش‌گر امنیتی به هزاران رایانامهٔ خصوصی ارسال‌شده "
"از سوی سفارت‌خانه‌های خارجی و گروه‌های حقوق بشری در دنیا را با جاسوسی روی "
"ارتباطات خارج‌شده از یک گره خروجی که در اختیارش بود دسترسی پیدا کرد. رجوع "
-"کنید به [وایرد: گره‌های یاغی تور را تبدیل به بهشت جاسوسان می‌کنند](http://www."
-"wired.com/politics/security/news/2007/09/embassy_hacks)"
+"کنید به [وایرد: گره‌های یاغی تور را تبدیل به بهشت جاسوسان می‌کنند](http://"
+"archive.wired.com/politics/security/news/2007/09/embassy_hacks)"
#. type: Plain text
#, no-wrap
@@ -311,14 +311,14 @@ 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](http://www.teamfurry.com/wordpress/2007/11/20/tor-exit-"
-"node-doing-mitm-attacks)."
+"doing MITM attacks](https://web.archive.org/web/20120113162841/http://www."
+"teamfurry.com/wordpress/2007/11/20/tor-exit-node-doing-mitm-attacks)."
msgstr ""
"هنگام استفاده از تور همچنان ممکن است حملات فرد میانی بین گره خروجی و سرور "
"مقصد رخ دهند. گره خروجی نیز می‌تواند خود را فرد میانی جا بزند. برای مشاهدهٔ "
"نمونهٔ چنین حمله‌ای رجوع کنید به [وبلاگ ام‌دابلیو: حملات فرد میانی از سوی "
-"گره‌های خروجی تور](http://www.teamfurry.com/wordpress/2007/11/20/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)."
#. type: Plain text
#, no-wrap
@@ -392,8 +392,8 @@ msgid ""
"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](http://blogs.comodo.com/it-security/data-"
-"security/the-recent-ra-compromise/)."
+"[Comodo: The Recent RA Compromise](https://blog.comodo.com/other/the-recent-"
+"ra-compromise/)."
msgstr ""
"برای نمونه در ۱۵ مارس سال ۲۰۱۱ شرکت کومودو که از شرکت‌های اصلی صدور گواهی‌های "
"دیجیتال است گزارش داد که یک حساب کاربری منسوب به صدور گواهی دیجیتال هک "
@@ -461,14 +461,14 @@ msgstr ""
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"
+"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 ""
"<p class=\"quoted-from\">برگرفته از [[!wikipedia Man-in-the-middle_attack\n"
"desc=\"Wikipedia: %s\"]]، [[!wikipedia\n"
-"Comodo_Group#Iran_SSL_certificate_controversy desc=\"Wikipedia: %s\"]] و <a\n"
+"Comodo_Group#Certificate_hacking desc=\"Wikipedia: %s\"]] و <a\n"
"href=\"https://blog.torproject.org/blog/detecting-certificate-authority-compromises-and-web-browser-collusion\">پروژهٔ تور: یافتن\n"
"هک‌های گواهی‌های دیجیتال و \n"
"همدستی‌های مرورگرهای وب</a>.</p>\n"
diff --git a/wiki/src/doc/about/warning.fr.po b/wiki/src/doc/about/warning.fr.po
index 19fa77f..66b2f94 100644
--- a/wiki/src/doc/about/warning.fr.po
+++ b/wiki/src/doc/about/warning.fr.po
@@ -173,17 +173,16 @@ msgid ""
"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://trac.torproject.org/projects/tor/wiki/"
-"TheOnionRouter/TorFAQ#CanexitnodeseavesdroponcommunicationsIsntthatbad)."
+"communications?](https://www.torproject.org/docs/"
+"faq.html.en#CanExitNodesEavesdrop)."
msgstr ""
"Le dernier relais sur ce circuit, appelé nœud de sortie, est celui qui "
"établit la connexion au serveur de la destination. Comme Tor ne chiffre pas, "
"et ne peut pas le faire de toute façon, ce qui transite entre le nœud de "
"sortie et le serveur de la destination, **tout nœud de sortie a la "
"possibilité de capturer le trafic qui passe par lui**. Voir [Tor FAQ: Can "
-"exit nodes eavesdrop on communications? (en anglais)](https://trac."
-"torproject.org/projects/tor/wiki/TheOnionRouter/"
-"TorFAQ#CanexitnodeseavesdroponcommunicationsIsntthatbad)."
+"exit nodes eavesdrop on communications? (en anglais)](https://www."
+"torproject.org/docs/faq.html.en#CanExitNodesEavesdrop)."
#. type: Plain text
msgid ""
@@ -191,13 +190,13 @@ msgid ""
"e-mail 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)."
+"Paradise](http://archive.wired.com/politics/security/news/2007/09/embassy_hacks)."
msgstr ""
"Par exemple, en 2007, un chercheur en sécurité informatique a intercepté des "
"milliers d'e-mails privés envoyés par des ambassades étrangères et des ONG à "
"travers le monde en écoutant le trafic sortant du nœud de sortie qu'il "
"faisait fonctionner. Voir [Wired: Rogue Nodes Turn Tor Anonymizer Into "
-"Eavesdropper's Paradise (en anglais)](http://www.wired.com/politics/security/"
+"Eavesdropper's Paradise (en anglais)](http://archive.wired.com/politics/security/"
"news/2007/09/embassy_hacks)."
#. type: Plain text
@@ -313,14 +312,14 @@ 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](http://www.teamfurry.com/wordpress/2007/11/20/tor-exit-"
-"node-doing-mitm-attacks)."
+"doing MITM attacks](https://web.archive.org/web/20120113162841/http://www."
+"teamfurry.com/wordpress/2007/11/20/tor-exit-node-doing-mitm-attacks)."
msgstr ""
"En utilisant Tor, une attaque de l'homme-du-milieu peut toujours arriver "
"entre le nœud de sortie et le serveur destinataire. Le nœud de sortie peut "
"également agir comme un homme-du-milieu. Pour l'exemple d'une telle attaque "
-"voir (en anglais) [MW-Blog: TOR exit-node doing MITM attacks](http://www."
-"teamfurry.com/wordpress/2007/11/20/tor-exit-node-doing-mitm-attacks)."
+"voir (en anglais) [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)."
#. type: Plain text
#, no-wrap
@@ -373,8 +372,8 @@ msgid ""
"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](http://blogs.comodo.com/it-security/data-"
-"security/the-recent-ra-compromise/)."
+"[Comodo: The Recent RA Compromise](https://blog.comodo.com/other/the-recent-"
+"ra-compromise/)."
msgstr ""
"Par exemple, le 15 Mars 2011, Comodo, une entreprise de délivrance de "
"certificat SSL parmi les plus importantes, annonça qu'un compte utilisateur "
@@ -382,8 +381,7 @@ msgstr ""
"pour générer neuf certificats pour sept noms de domaines : mail.google.com, "
"login.live.com, www.google.com, login.yahoo.com (3 certificats), login.skype."
"com, addons.mozilla.org, et global trustee. Voir (en anglais) [Comodo: The "
-"Recent RA Compromise](http://blogs.comodo.com/it-security/data-security/the-"
-"recent-ra-compromise/)."
+"Recent RA Compromise](https://blog.comodo.com/other/the-recent-ra-compromise/)."
#. type: Plain text
msgid ""
@@ -435,14 +433,14 @@ msgstr ""
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"
+"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 ""
"<p class=\"quoted-from\">Sources [[!wikipedia_fr Attaque_de_l'homme_du_milieu\n"
"desc=\"Wikipedia: %s\"]], [[!wikipedia\n"
-"Comodo_Group#Iran_SSL_certificate_controversy desc=\"Wikipedia: %s\"]] et <a\n"
+"Comodo_Group#Certificate_hacking desc=\"Wikipedia: %s\"]] et <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.mdwn b/wiki/src/doc/about/warning.mdwn
index 0496456..d4315a3 100644
--- a/wiki/src/doc/about/warning.mdwn
+++ b/wiki/src/doc/about/warning.mdwn
@@ -67,13 +67,13 @@ 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://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorFAQ#CanexitnodeseavesdroponcommunicationsIsntthatbad).
+communications?](https://www.torproject.org/docs/faq.html.en#CanExitNodesEavesdrop).
For example, in 2007, a security researcher intercepted thousands of private
e-mail 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).
+Paradise](http://archive.wired.com/politics/security/news/2007/09/embassy_hacks).
**To protect yourself from such attacks you should use end-to-end encryption.**
@@ -122,7 +122,7 @@ 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](http://www.teamfurry.com/wordpress/2007/11/20/tor-exit-node-doing-mitm-attacks).
+attacks](https://web.archive.org/web/20120113162841/http://www.teamfurry.com/wordpress/2007/11/20/tor-exit-node-doing-mitm-attacks).
**Again, to protect yourself from such attacks you should use end-to-end
encryption** and while doing so taking extra care at verifying the server
@@ -148,7 +148,7 @@ 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](http://blogs.comodo.com/it-security/data-security/the-recent-ra-compromise/).
+Compromise](https://blog.comodo.com/other/the-recent-ra-compromise/).
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
@@ -170,7 +170,7 @@ who happen to use Tor.
<p class="quoted-from">Quoted from [[!wikipedia Man-in-the-middle_attack
desc="Wikipedia: %s"]], [[!wikipedia
-Comodo_Group#Iran_SSL_certificate_controversy desc="Wikipedia: %s"]] and <a
+Comodo_Group#Certificate_hacking desc="Wikipedia: %s"]] and <a
href="https://blog.torproject.org/blog/detecting-certificate-authority-compromises-and-web-browser-collusion">Tor
Project: Detecting Certificate Authority compromises and web browser
collusion</a>.</p>
diff --git a/wiki/src/doc/about/warning.pt.po b/wiki/src/doc/about/warning.pt.po
index 543619e..fde3b6b 100644
--- a/wiki/src/doc/about/warning.pt.po
+++ b/wiki/src/doc/about/warning.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-03-07 18:54+0100\n"
+"POT-Creation-Date: 2016-05-11 15:35+0000\n"
"PO-Revision-Date: 2014-11-24 16:47+0100\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -162,17 +162,16 @@ msgid ""
"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://trac.torproject.org/projects/tor/wiki/"
-"TheOnionRouter/TorFAQ#CanexitnodeseavesdroponcommunicationsIsntthatbad)."
+"communications?](https://www.torproject.org/docs/faq.html."
+"en#CanExitNodesEavesdrop)."
msgstr ""
"O último relay desse circuito, chamado de nó de saída, é aquele que "
"estabelece a conexão com o servidor de destino. Como o Tor não criptografa o "
"tráfego entre um nó de saída e o servidor de destino (e nem poderia por "
"questões de projeto), **qualquer nó de saída está numa posição na qual pode "
"capturar qualquer tráfego passando por ele**. Veja a página de [FAQ do Tor: "
-"nós de saída podem bisbilhotar comunicações?](https://trac.torproject.org/"
-"projects/tor/wiki/TheOnionRouter/"
-"TorFAQ#CanexitnodeseavesdroponcommunicationsIsntthatbad)."
+"nós de saída podem bisbilhotar comunicações?](https://www.torproject.org/"
+"docs/faq.html.en#CanExitNodesEavesdrop)."
#. type: Plain text
msgid ""
@@ -180,13 +179,14 @@ msgid ""
"e-mail 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)."
+"Paradise](http://archive.wired.com/politics/security/news/2007/09/"
+"embassy_hacks)."
msgstr ""
"Por exemplo, em 2007 um pesquisador de segurança interceptou milhares de "
"mensagens de e-mail enviadas por embaixadas estrangeiras e grupos de "
"direitos humanos ao redor do mundo através da espionagem das conexões que "
"saíam de um nó de saída que ele estava rodando. Leia [Wired: Rogue Nodes "
-"Turn Tor Anonymizer Into Eavesdropper's Paradise](http://www.wired.com/"
+"Turn Tor Anonymizer Into Eavesdropper's Paradise](http://archive.wired.com/"
"politics/security/news/2007/09/embassy_hacks) (english)."
#. type: Plain text
@@ -303,15 +303,15 @@ 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](http://www.teamfurry.com/wordpress/2007/11/20/tor-exit-"
-"node-doing-mitm-attacks)."
+"doing MITM attacks](https://web.archive.org/web/20120113162841/http://www."
+"teamfurry.com/wordpress/2007/11/20/tor-exit-node-doing-mitm-attacks)."
msgstr ""
"Enquanto o Tor está em uso, ataques man-in-the-middle ainda podem ocorrer "
"entre o nó de saída e o servidor de destino. O nó de saída propriamente dito "
"também pode atuar como um homem-no-meio. Para um exemplo desse tipo de "
-"ataque, veja [MW-Blog: TOR exit-node doing MITM attacks](http://www."
-"teamfurry.com/wordpress/2007/11/20/tor-exit-node-doing-mitm-attacks) (em "
-"inglês)."
+"ataque, veja [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) (em inglês)."
#. type: Plain text
#, no-wrap
@@ -386,8 +386,8 @@ msgid ""
"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](http://blogs.comodo.com/it-security/data-"
-"security/the-recent-ra-compromise/)."
+"[Comodo: The Recent RA Compromise](https://blog.comodo.com/other/the-recent-"
+"ra-compromise/)."
msgstr ""
"Por exemplo, em 15 de Março de 2011, a Comodo, uma das maiores companhias de "
"certificados SSL, relatou que uma conta de usuário numa autoridade "
@@ -457,14 +457,14 @@ msgstr ""
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"
+"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 ""
"<p class=\"quoted-from\">Citado de [[!wikipedia Man-in-the-middle_attack\n"
"desc=\"Wikipedia: %s\"]], [[!wikipedia\n"
-"Comodo_Group#Iran_SSL_certificate_controversy desc=\"Wikipedia: %s\"]] e <a\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> (em inglês).</p>\n"
diff --git a/wiki/src/doc/advanced_topics/paperkey.de.po b/wiki/src/doc/advanced_topics/paperkey.de.po
index 7010a62..047e492 100644
--- a/wiki/src/doc/advanced_topics/paperkey.de.po
+++ b/wiki/src/doc/advanced_topics/paperkey.de.po
@@ -3,48 +3,52 @@
# 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-05-11 14:31+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"
+"PO-Revision-Date: 2016-05-13 19:32+0200\n"
+"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.8.7.1\n"
+"Last-Translator: \n"
+"Language-Team: \n"
#. type: Plain text
#, no-wrap
msgid "[[!meta title=\"Backing up OpenPGP secret keys on paper using paperkey\"]]\n"
-msgstr ""
+msgstr "[[!meta title=\"Geheime OpenPGP-Schlüssel mit Paperkey auf Papier sichern\"]]\n"
#. type: Plain text
#, no-wrap
msgid ""
-"<span "
-"class=\"application\">[Paperkey](http://www.jabberwocky.com/software/paperkey/)</span> "
-"is a command\n"
+"<span class=\"application\">[Paperkey](http://www.jabberwocky.com/software/paperkey/)</span> is a command\n"
"line tool to export OpenPGP secret keys in a format suitable for\n"
"printing on paper.\n"
msgstr ""
+"<span class=\"application\">[Paperkey](http://www.jabberwocky.com/software/paperkey/)</span> ist ein Kommandozeilenwerkzeug,\n"
+"um geheime OpenPGP-Schlüssel in einem zum Druck auf Papier\n"
+"geeigneten Format zu exportieren.\n"
#. type: Plain text
#, no-wrap
msgid ""
"Paper can be destroyed easily but it also has amazingly long retention\n"
"qualities, far longer than the magnetic or optical media that are\n"
-"generally used to back up computer data. So <span "
-"class=\"application\">paperkey</span> can be useful in\n"
+"generally used to back up computer data. So <span class=\"application\">paperkey</span> can be useful in\n"
"combination with other backup strategies.\n"
msgstr ""
+"Papier kann einfach zerstört werden, hat aber auch herausragende Qualitäten in\n"
+"der Langzeithaltbarkeit, viel länger als magnetische oder optische Medien, die\n"
+"normalerweise für Sicherungen von Computerdaten verwendet werden. Somit kann <span class=\"application\">paperkey</span>\n"
+"in Kombination mit anderen Sicherungsmethoden nützlich sein.\n"
#. type: Plain text
#, no-wrap
msgid "<div class=\"note\">\n"
-msgstr ""
+msgstr "<div class=\"note\">\n"
#. type: Plain text
#, no-wrap
@@ -53,32 +57,36 @@ msgid ""
"class=\"application\">paperkey</span> is still protected by your\n"
"passphrase.</p>\n"
msgstr ""
+"<p>Ihre durch <span class=\"application\">paperkey</span>\n"
+"exportieren OpenPGP-Schlüssel werden weiterhin durch\n"
+"Ihr Kennwort geschützt.</p>\n"
#. type: Plain text
#, no-wrap
msgid "</div>\n"
-msgstr ""
+msgstr "</div>\n"
#. type: Plain text
#, no-wrap
msgid ""
-"To learn how to use <span class=\"application\">paperkey</span>, read the "
-"[documentation on the\n"
-"<span class=\"application\">paperkey</span> "
-"website](http://www.jabberwocky.com/software/paperkey/).\n"
+"To learn how to use <span class=\"application\">paperkey</span>, read the [documentation on the\n"
+"<span class=\"application\">paperkey</span> website](http://www.jabberwocky.com/software/paperkey/).\n"
msgstr ""
+"Um zu lernen, wie Sie <span class=\"application\">paperkey</span> verwenden, lesen Sie die [Dokumentation\n"
+"auf der Webseite von <span class=\"application\">paperkey</span>](http://www.jabberwocky.com/software/paperkey/).\n"
#. type: Plain text
#, no-wrap
msgid ""
-"For example, to export an OpenPGP secret key using <span "
-"class=\"application\">paperkey</span>, execute\n"
-"the following command, replacing <span class=\"command\">[keyid]</span> with "
-"the ID of the key that\n"
+"For example, to export an OpenPGP secret key using <span class=\"application\">paperkey</span>, execute\n"
+"the following command, replacing <span class=\"command\">[keyid]</span> with the ID of the key that\n"
"you want to export:\n"
msgstr ""
+"Beispielsweise können Sie folgenden Befehl ausführen, wobei Sie <span class=\"command\">[keyid]</span> mit der\n"
+"ID des Schlüssels ersetzen, den Sie exportieren wollen, um einen geheimen OpenPGP-Schlüssel mit\n"
+"<span class=\"application\">paperkey</span> zu exportieren:\n"
#. type: Plain text
#, no-wrap
msgid " gpg --export-secret-key [keyid] | paperkey | gedit\n"
-msgstr ""
+msgstr " gpg --export-secret-key [keyid] | paperkey | gedit\n"
diff --git a/wiki/src/doc/advanced_topics/virtualization.de.po b/wiki/src/doc/advanced_topics/virtualization.de.po
index a9b7218..f338590 100644
--- a/wiki/src/doc/advanced_topics/virtualization.de.po
+++ b/wiki/src/doc/advanced_topics/virtualization.de.po
@@ -69,8 +69,8 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!img tails-in-jessie.png alt=\"Tails running in a VirtuaBox window inside a Debian desktop with GNOME 3\" link=no]]\n"
-msgstr "[[!img tails-in-jessie.png alt=\"Tails läuft in einer virtuellen Maschine auf einem Debian mit GNOME 3\" link=no]]\n"
+msgid "[[!img tails-in-jessie.png alt=\"\" link=no]]\n"
+msgstr "[[!img tails-in-jessie.png alt=\"\" link=no]]\n"
#. type: Plain text
#, no-wrap
diff --git a/wiki/src/doc/advanced_topics/virtualization.fa.po b/wiki/src/doc/advanced_topics/virtualization.fa.po
index c27e39a..f432cb3 100644
--- a/wiki/src/doc/advanced_topics/virtualization.fa.po
+++ b/wiki/src/doc/advanced_topics/virtualization.fa.po
@@ -71,10 +71,9 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!img tails-in-jessie.png alt=\"Tails running in a VirtuaBox window inside a Debian desktop with GNOME 3\" link=no]]\n"
+msgid "[[!img tails-in-jessie.png alt=\"\" link=no]]\n"
msgstr ""
-"[[!img tails-in-jessie.png alt=\"تیلز در یک پنجرهٔ ویرچوال‌باکس در یک دسکتاپ "
-"دبیان با گنوم ۳\" link=no]]\n"
+"[[!img tails-in-jessie.png alt=\"\" link=no]]\n"
#. type: Plain text
#, no-wrap
diff --git a/wiki/src/doc/advanced_topics/virtualization.fr.po b/wiki/src/doc/advanced_topics/virtualization.fr.po
index 89b3942..9229f2c 100644
--- a/wiki/src/doc/advanced_topics/virtualization.fr.po
+++ b/wiki/src/doc/advanced_topics/virtualization.fr.po
@@ -70,8 +70,8 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!img tails-in-jessie.png alt=\"Tails running in a VirtuaBox window inside a Debian desktop with GNOME 3\" link=no]]\n"
-msgstr "[[!img tails-in-jessie.png alt=\"Tails dans une fenêtre VirtuaBox dans un bureau Debian avec GNOME 3\" link=no]]\n"
+msgid "[[!img tails-in-jessie.png alt=\"\" link=no]]\n"
+msgstr "[[!img tails-in-jessie.png alt=\"\" link=no]]\n"
#. type: Plain text
#, no-wrap
diff --git a/wiki/src/doc/advanced_topics/virtualization.mdwn b/wiki/src/doc/advanced_topics/virtualization.mdwn
index fcb8656..66acf56 100644
--- a/wiki/src/doc/advanced_topics/virtualization.mdwn
+++ b/wiki/src/doc/advanced_topics/virtualization.mdwn
@@ -17,7 +17,7 @@ without the need to restart the computer.
This is how Tails looks like when run in a virtual machine on Debian using *VirtualBox*:
-[[!img tails-in-jessie.png alt="Tails running in a VirtuaBox window inside a Debian desktop with GNOME 3" link=no]]
+[[!img tails-in-jessie.png alt="" link=no]]
<div class="note">
diff --git a/wiki/src/doc/advanced_topics/virtualization.pt.po b/wiki/src/doc/advanced_topics/virtualization.pt.po
index 1980af3..d60de74 100644
--- a/wiki/src/doc/advanced_topics/virtualization.pt.po
+++ b/wiki/src/doc/advanced_topics/virtualization.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-08-09 13:38+0300\n"
+"POT-Creation-Date: 2016-05-16 16:57+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"
@@ -56,7 +56,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!img tails-in-jessie.png alt=\"Tails running in a VirtuaBox window inside a Debian desktop with GNOME 3\" link=no]]\n"
+msgid "[[!img tails-in-jessie.png alt=\"\" link=no]]\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/doc/anonymous_internet.index.de.po b/wiki/src/doc/anonymous_internet.index.de.po
index bc78c6e..9b5c973 100644
--- a/wiki/src/doc/anonymous_internet.index.de.po
+++ b/wiki/src/doc/anonymous_internet.index.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2016-03-07 18:54+0100\n"
+"POT-Creation-Date: 2016-04-29 12:56+0300\n"
"PO-Revision-Date: 2016-01-29 22:15+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: \n"
@@ -32,7 +32,7 @@ msgstr ""
msgid ""
" - [[!traillink Connecting_to_a_network|anonymous_internet/networkmanager]]\n"
" - [[!traillink Logging_in_to_captive_portals|anonymous_internet/unsafe_browser]]\n"
-" - [[!traillink Viewing_the_status_of_Tor|anonymous_internet/Tor_status]]\n"
+" - [[!traillink Viewing_the_status_and_circuits_of_Tor|anonymous_internet/tor_status]]\n"
" - [[!traillink Browsing_the_web_with_<span_class=\"application\">Tor_Browser</span>|anonymous_internet/tor_browser]]\n"
" - [[!traillink Chatting_with_Pidgin_&_OTR|anonymous_internet/pidgin]]\n"
" - [[!traillink Emailing_with_<span_class=\"application\">Icedove_(Thunderbird)</span>|anonymous_internet/icedove]]\n"
diff --git a/wiki/src/doc/anonymous_internet.index.fa.po b/wiki/src/doc/anonymous_internet.index.fa.po
index d895fad..e935a2a6 100644
--- a/wiki/src/doc/anonymous_internet.index.fa.po
+++ b/wiki/src/doc/anonymous_internet.index.fa.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2016-03-07 18:54+0100\n"
+"POT-Creation-Date: 2016-04-29 12:56+0300\n"
"PO-Revision-Date: 2015-10-25 17:46+0000\n"
"Last-Translator: sprint5 <translation5@451f.org>\n"
"Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/"
@@ -24,7 +24,7 @@ msgstr ""
msgid ""
" - [[!traillink Connecting_to_a_network|anonymous_internet/networkmanager]]\n"
" - [[!traillink Logging_in_to_captive_portals|anonymous_internet/unsafe_browser]]\n"
-" - [[!traillink Viewing_the_status_of_Tor|anonymous_internet/Tor_status]]\n"
+" - [[!traillink Viewing_the_status_and_circuits_of_Tor|anonymous_internet/tor_status]]\n"
" - [[!traillink Browsing_the_web_with_<span_class=\"application\">Tor_Browser</span>|anonymous_internet/tor_browser]]\n"
" - [[!traillink Chatting_with_Pidgin_&_OTR|anonymous_internet/pidgin]]\n"
" - [[!traillink Emailing_with_<span_class=\"application\">Icedove_(Thunderbird)</span>|anonymous_internet/icedove]]\n"
diff --git a/wiki/src/doc/anonymous_internet.index.fr.po b/wiki/src/doc/anonymous_internet.index.fr.po
index afe9a44..dc69cd1 100644
--- a/wiki/src/doc/anonymous_internet.index.fr.po
+++ b/wiki/src/doc/anonymous_internet.index.fr.po
@@ -6,28 +6,22 @@
msgid ""
msgstr ""
"Project-Id-Version: SACKAGE VERSION\n"
-"POT-Creation-Date: 2016-03-07 18:54+0100\n"
-"PO-Revision-Date: 2014-05-10 20:35-0000\n"
+"POT-Creation-Date: 2016-04-29 12:56+0300\n"
+"PO-Revision-Date: 2016-05-06 22:04-0000\n"
"Last-Translator: \n"
"Language-Team: SLANGUAGE <LL@li.org>\n"
-"Language: \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.5.4\n"
+"X-Generator: Poedit 1.6.10\n"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| " - [[!traillink Emailing_with_<span_class=\"application\">Icedove_(Thunderbird)</span>|anonymous_internet/icedove]]\n"
-#| " - [[!traillink Migrating_from_<span_class=\"application\">Claws_Mail</span>_to_<span_class=\"application\">Icedove</span>|anonymous_internet/claws_mail_to_icedove]]\n"
-#| " - [[!traillink Exchange_bitcoins_using_<span_class=\"application\">Electrum</span>|anonymous_internet/electrum]]\n"
-#| " - [[!traillink Using_I2P|anonymous_internet/i2p]]\n"
-#| " - [[!traillink Why_Tor_is_slow?|anonymous_internet/why_tor_is_slow]]\n"
+#, no-wrap
msgid ""
" - [[!traillink Connecting_to_a_network|anonymous_internet/networkmanager]]\n"
" - [[!traillink Logging_in_to_captive_portals|anonymous_internet/unsafe_browser]]\n"
-" - [[!traillink Viewing_the_status_of_Tor|anonymous_internet/Tor_status]]\n"
+" - [[!traillink Viewing_the_status_and_circuits_of_Tor|anonymous_internet/tor_status]]\n"
" - [[!traillink Browsing_the_web_with_<span_class=\"application\">Tor_Browser</span>|anonymous_internet/tor_browser]]\n"
" - [[!traillink Chatting_with_Pidgin_&_OTR|anonymous_internet/pidgin]]\n"
" - [[!traillink Emailing_with_<span_class=\"application\">Icedove_(Thunderbird)</span>|anonymous_internet/icedove]]\n"
@@ -36,7 +30,12 @@ msgid ""
" - [[!traillink Using_I2P|anonymous_internet/i2p]]\n"
" - [[!traillink Why_Tor_is_slow?|anonymous_internet/why_tor_is_slow]]\n"
msgstr ""
-" - [[!traillink Lire_et_écrire_des_emails_avec_<span_class=\"application\">Icedove_(Thunderbird)</span>|anonymous_internet/icedove]]\n"
+" - [[!traillink Se_connecter_à_un_réseau|anonymous_internet/networkmanager]]\n"
+" - [[!traillink S'identifier_auprès_d'un_portail_captif|anonymous_internet/unsafe_browser]]\n"
+" - [[!traillink Voir_le_statut_et_les_circuits_de_Tor|anonymous_internet/tor_status]]\n"
+" - [[!traillink Naviguer_sur_le_web_avec_le_<span_class=\"application\">Navigateur_Tor</span>|anonymous_internet/tor_browser]]\n"
+" - [[!traillink Discuter_avec_Pidgin_et_OTR|anonymous_internet/pidgin]]\n"
+" - [[!traillink Lire_et_écrire_des_courriers_électroniques_avec_<span_class=\"application\">Icedove_(Thunderbird)</span>|anonymous_internet/icedove]]\n"
" - [[!traillink Migrer_de_<span_class=\"application\">Claws_Mail</span>_à_<span_class=\"application\">Icedove</span>|anonymous_internet/claws_mail_to_icedove]]\n"
" - [[!traillink Échanger_des_bitcoins_avec_<span_class=\"application\">Electrum</span>|anonymous_internet/electrum]]\n"
" - [[!traillink Utiliser_I2P|anonymous_internet/i2p]]\n"
diff --git a/wiki/src/doc/anonymous_internet.index.mdwn b/wiki/src/doc/anonymous_internet.index.mdwn
index cc7a9f9..c478473 100644
--- a/wiki/src/doc/anonymous_internet.index.mdwn
+++ b/wiki/src/doc/anonymous_internet.index.mdwn
@@ -1,6 +1,6 @@
- [[!traillink Connecting_to_a_network|anonymous_internet/networkmanager]]
- [[!traillink Logging_in_to_captive_portals|anonymous_internet/unsafe_browser]]
- - [[!traillink Viewing_the_status_of_Tor|anonymous_internet/Tor_status]]
+ - [[!traillink Viewing_the_status_and_circuits_of_Tor|anonymous_internet/tor_status]]
- [[!traillink Browsing_the_web_with_<span_class="application">Tor_Browser</span>|anonymous_internet/tor_browser]]
- [[!traillink Chatting_with_Pidgin_&_OTR|anonymous_internet/pidgin]]
- [[!traillink Emailing_with_<span_class="application">Icedove_(Thunderbird)</span>|anonymous_internet/icedove]]
diff --git a/wiki/src/doc/anonymous_internet.index.pt.po b/wiki/src/doc/anonymous_internet.index.pt.po
index 9e268ea1..f119a14 100644
--- a/wiki/src/doc/anonymous_internet.index.pt.po
+++ b/wiki/src/doc/anonymous_internet.index.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-03-07 18:54+0100\n"
+"POT-Creation-Date: 2016-04-29 12:56+0300\n"
"PO-Revision-Date: 2014-05-23 13:58-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,7 +20,7 @@ msgstr ""
msgid ""
" - [[!traillink Connecting_to_a_network|anonymous_internet/networkmanager]]\n"
" - [[!traillink Logging_in_to_captive_portals|anonymous_internet/unsafe_browser]]\n"
-" - [[!traillink Viewing_the_status_of_Tor|anonymous_internet/Tor_status]]\n"
+" - [[!traillink Viewing_the_status_and_circuits_of_Tor|anonymous_internet/tor_status]]\n"
" - [[!traillink Browsing_the_web_with_<span_class=\"application\">Tor_Browser</span>|anonymous_internet/tor_browser]]\n"
" - [[!traillink Chatting_with_Pidgin_&_OTR|anonymous_internet/pidgin]]\n"
" - [[!traillink Emailing_with_<span_class=\"application\">Icedove_(Thunderbird)</span>|anonymous_internet/icedove]]\n"
diff --git a/wiki/src/doc/anonymous_internet/Tor_Browser.de.po b/wiki/src/doc/anonymous_internet/Tor_Browser.de.po
index 05fbb04..5942a7f 100644
--- a/wiki/src/doc/anonymous_internet/Tor_Browser.de.po
+++ b/wiki/src/doc/anonymous_internet/Tor_Browser.de.po
@@ -23,8 +23,8 @@ msgstr "[[!meta title=\"Mit dem Tor Browser im Internet surfen\"]]\n"
#. type: Plain text
#, no-wrap
-msgid "[[!img Tor_Browser/mozicon128.png link=no alt=\"Tor Browser icon\"]]\n"
-msgstr "[[!img Tor_Browser/mozicon128.png link=no alt=\"Tor Browser icon\"]]\n"
+msgid "[[!img Tor_Browser/mozicon128.png link=no alt=\"\"]]\n"
+msgstr "[[!img Tor_Browser/mozicon128.png link=no alt=\"\"]]\n"
#. type: Plain text
#, no-wrap
@@ -226,8 +226,8 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!img doc/anonymous_internet/Tor_Browser/riseup.png link=no alt=\"Tor Browser\"]]\n"
-msgstr "[[!img doc/anonymous_internet/Tor_Browser/riseup.png link=no alt=\"Tor Browser\"]]\n"
+msgid "[[!img doc/anonymous_internet/Tor_Browser/riseup.png link=no alt=\"\"]]\n"
+msgstr "[[!img doc/anonymous_internet/Tor_Browser/riseup.png link=no alt=\"\"]]\n"
#. type: Plain text
msgid ""
@@ -267,8 +267,8 @@ msgstr "HTTPS Everywhere\n"
#. type: Plain text
#, no-wrap
-msgid "[[!img https-everywhere.jpg link=no alt=\"HTTPS Everywhere logo\"]]\n"
-msgstr "[[!img https-everywhere.jpg link=no alt=\"HTTPS Everywhere Logo\"]]\n"
+msgid "[[!img https-everywhere.jpg link=no alt=\"\"]]\n"
+msgstr "[[!img https-everywhere.jpg link=no alt=\"\"]]\n"
#. type: Plain text
#, no-wrap
@@ -363,10 +363,10 @@ msgstr ""
#, no-wrap
msgid ""
"<p>You can see the Tor circuits in\n"
-"<span class=\"application\">[[Onion Circuits|Tor_status#circuits]]</span>.</p>\n"
+"<span class=\"application\">[[Onion Circuits|tor_status#circuits]]</span>.</p>\n"
msgstr ""
"<p>Sie können die Kanäle von Tor in\n"
-"<span class=\"application\">[[Onion Circuits|Tor_status#circuits]]</span> sehen.</p>\n"
+"<span class=\"application\">[[Onion Circuits|tor_status#circuits]]</span> sehen.</p>\n"
#. type: Plain text
#, no-wrap
@@ -550,8 +550,8 @@ msgstr "NoScript um noch mehr Kontrolle über JavaScript zu haben\n"
#. type: Plain text
#, no-wrap
-msgid "[[!img noscript.png link=no alt=\"NoScript logo\"]]\n"
-msgstr "[[!img noscript.png link=no alt=\"NoScript logo\"]]\n"
+msgid "[[!img noscript.png link=no alt=\"\"]]\n"
+msgstr "[[!img noscript.png link=no alt=\"\"]]\n"
#. type: Plain text
#, no-wrap
diff --git a/wiki/src/doc/anonymous_internet/Tor_Browser.fa.po b/wiki/src/doc/anonymous_internet/Tor_Browser.fa.po
index f2a9dd2..37f1932 100644
--- a/wiki/src/doc/anonymous_internet/Tor_Browser.fa.po
+++ b/wiki/src/doc/anonymous_internet/Tor_Browser.fa.po
@@ -26,8 +26,8 @@ msgstr "[[!meta title=\"وب‌گردی با مرورگر تور\"]]\n"
#. type: Plain text
#, no-wrap
-msgid "[[!img Tor_Browser/mozicon128.png link=no alt=\"Tor Browser icon\"]]\n"
-msgstr "[[!img Tor_Browser/mozicon128.png link=no alt=\"نمایهٔ مرورگر تور\"]]\n"
+msgid "[[!img Tor_Browser/mozicon128.png link=no alt=\"\"]]\n"
+msgstr "[[!img Tor_Browser/mozicon128.png link=no alt=\"\"]]\n"
#. type: Plain text
#, no-wrap
@@ -222,8 +222,8 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!img doc/anonymous_internet/Tor_Browser/riseup.png link=no alt=\"Tor Browser\"]]\n"
-msgstr "[[!img doc/anonymous_internet/Tor_Browser/riseup.png link=no alt=\"مرورگر تور\"]]\n"
+msgid "[[!img doc/anonymous_internet/Tor_Browser/riseup.png link=no alt=\"\"]]\n"
+msgstr "[[!img doc/anonymous_internet/Tor_Browser/riseup.png link=no alt=\"\"]]\n"
#. type: Plain text
msgid ""
@@ -260,8 +260,8 @@ msgstr "اچ‌تی‌تی‌پی‌اس همه‌جا\n"
#. type: Plain text
#, no-wrap
-msgid "[[!img https-everywhere.jpg link=no alt=\"HTTPS Everywhere logo\"]]\n"
-msgstr "[[!img https-everywhere.jpg link=no alt=\"لوگوی همه‌جا اچ‌تی‌تی‌پی‌اس\"]]\n"
+msgid "[[!img https-everywhere.jpg link=no alt=\"\"]]\n"
+msgstr "[[!img https-everywhere.jpg link=no alt=\"\"]]\n"
#. type: Plain text
#, no-wrap
@@ -352,7 +352,7 @@ msgstr ""
#, no-wrap
msgid ""
"<p>You can see the Tor circuits in\n"
-"<span class=\"application\">[[Onion Circuits|Tor_status#circuits]]</span>.</p>\n"
+"<span class=\"application\">[[Onion Circuits|tor_status#circuits]]</span>.</p>\n"
msgstr ""
#. type: Plain text
@@ -531,8 +531,8 @@ msgstr "«نواسکریپت» برای کنترل بیشتر روی جاواا
#. type: Plain text
#, no-wrap
-msgid "[[!img noscript.png link=no alt=\"NoScript logo\"]]\n"
-msgstr "[[!img noscript.png link=no alt=\"لوگوی نواسکریپت\"]]\n"
+msgid "[[!img noscript.png link=no alt=\"\"]]\n"
+msgstr "[[!img noscript.png link=no alt=\"\"]]\n"
#. type: Plain text
#, no-wrap
diff --git a/wiki/src/doc/anonymous_internet/Tor_Browser.fr.po b/wiki/src/doc/anonymous_internet/Tor_Browser.fr.po
index a55de5a..62cab78 100644
--- a/wiki/src/doc/anonymous_internet/Tor_Browser.fr.po
+++ b/wiki/src/doc/anonymous_internet/Tor_Browser.fr.po
@@ -23,8 +23,8 @@ msgstr "[[!meta title=\"Naviguer sur le web avec le Navigateur Tor\"]]\n"
#. type: Plain text
#, no-wrap
-msgid "[[!img Tor_Browser/mozicon128.png link=no alt=\"Tor Browser icon\"]]\n"
-msgstr "[[!img Tor_Browser/mozicon128.png link=no alt=\"Icône du Navigateur Tor\"]]\n"
+msgid "[[!img Tor_Browser/mozicon128.png link=no alt=\"\"]]\n"
+msgstr "[[!img Tor_Browser/mozicon128.png link=no alt=\"\"]]\n"
#. type: Plain text
#, no-wrap
@@ -225,8 +225,8 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!img doc/anonymous_internet/Tor_Browser/riseup.png link=no alt=\"Tor Browser\"]]\n"
-msgstr "[[!img doc/anonymous_internet/Tor_Browser/riseup.png link=no alt=\"Navigateur Tor\"]]\n"
+msgid "[[!img doc/anonymous_internet/Tor_Browser/riseup.png link=no alt=\"\"]]\n"
+msgstr "[[!img doc/anonymous_internet/Tor_Browser/riseup.png link=no alt=\"\"]]\n"
#. type: Plain text
msgid ""
@@ -235,8 +235,8 @@ msgid ""
"These are the indicators that an encrypted connection using [[!wikipedia "
"HTTPS]] is being used."
msgstr ""
-"Notez la petite zone à gauche de la barre d'adresse indiquant \"mail.riseup."
-"net\", et l'adresse commençant par \"**https:**//\" (au lieu de \"**http://**"
+"Remarquez l’icône de cadenas à gauche de la barre d'adresse indiquant \"mail."
+"riseup.net\" et l'adresse commençant par \"https://\" (au lieu de \"http://"
"\"). Cela indique que la connexion est chiffrée grâce au [[!wikipedia_fr "
"HyperText_Transfer_Protocol_Secure desc=\"HTTPS\"]]."
@@ -266,8 +266,8 @@ msgstr "HTTPS Everywhere\n"
#. type: Plain text
#, no-wrap
-msgid "[[!img https-everywhere.jpg link=no alt=\"HTTPS Everywhere logo\"]]\n"
-msgstr "[[!img https-everywhere.jpg link=no alt=\"logo HTTPS Everywhere\"]]\n"
+msgid "[[!img https-everywhere.jpg link=no alt=\"\"]]\n"
+msgstr "[[!img https-everywhere.jpg link=no alt=\"\"]]\n"
#. type: Plain text
#, no-wrap
@@ -360,10 +360,10 @@ msgstr ""
#, no-wrap
msgid ""
"<p>You can see the Tor circuits in\n"
-"<span class=\"application\">[[Onion Circuits|Tor_status#circuits]]</span>.</p>\n"
+"<span class=\"application\">[[Onion Circuits|tor_status#circuits]]</span>.</p>\n"
msgstr ""
"<p>Vous pouvez visualiser les circuits Tor dans\n"
-"<span class=\"application\">[[Onion Circuits|Tor_status#circuits]]</span>.</p>\n"
+"<span class=\"application\">[[Onion Circuits|tor_status#circuits]]</span>.</p>\n"
#. type: Plain text
#, no-wrap
@@ -548,8 +548,8 @@ msgstr "NoScript pour encore plus de contrôle sur JavaScript\n"
#. type: Plain text
#, no-wrap
-msgid "[[!img noscript.png link=no alt=\"NoScript logo\"]]\n"
-msgstr "[[!img noscript.png link=no alt=\"logo NoScript\"]]\n"
+msgid "[[!img noscript.png link=no alt=\"\"]]\n"
+msgstr "[[!img noscript.png link=no alt=\"\"]]\n"
#. type: Plain text
#, no-wrap
diff --git a/wiki/src/doc/anonymous_internet/Tor_Browser.mdwn b/wiki/src/doc/anonymous_internet/Tor_Browser.mdwn
index cae7498..8f530d1 100644
--- a/wiki/src/doc/anonymous_internet/Tor_Browser.mdwn
+++ b/wiki/src/doc/anonymous_internet/Tor_Browser.mdwn
@@ -1,6 +1,6 @@
[[!meta title="Browsing the web with Tor Browser"]]
-[[!img Tor_Browser/mozicon128.png link=no alt="Tor Browser icon"]]
+[[!img Tor_Browser/mozicon128.png link=no alt=""]]
<span class="application">[Tor Browser](https://www.torproject.org/projects/torbrowser.html.en)</span> is a web
browser based on [Mozilla Firefox](http://getfirefox.com) and configured to
@@ -86,7 +86,7 @@ For example, here is how the browser looks like when we try to log in an email
account at [riseup.net](https://riseup.net/), using their [webmail
interface](https://mail.riseup.net/):
-[[!img doc/anonymous_internet/Tor_Browser/riseup.png link=no alt="Tor Browser"]]
+[[!img doc/anonymous_internet/Tor_Browser/riseup.png link=no alt=""]]
Notice the padlock icon on the left of the address bar saying "mail.riseup.net"
and the address beginning with "https://" (instead of "http://"). These are the
@@ -103,7 +103,7 @@ content of a page on its way to your browser.
HTTPS Everywhere
----------------
-[[!img https-everywhere.jpg link=no alt="HTTPS Everywhere logo"]]
+[[!img https-everywhere.jpg link=no alt=""]]
[HTTPS Everywhere](https://www.eff.org/https-everywhere) is a Firefox extension
included in <span class="application">Tor Browser</span> and produced as a collaboration between [The Tor
@@ -146,7 +146,7 @@ context of Tails (see [[!tails_ticket 9365 desc="#9365"]] and [[!tails_ticket 93
desc="#9366"]]). This feature is safe to use outside of Tails.</p>
<p>You can see the Tor circuits in
-<span class="application">[[Onion Circuits|Tor_status#circuits]]</span>.</p>
+<span class="application">[[Onion Circuits|tor_status#circuits]]</span>.</p>
</div>
@@ -223,7 +223,7 @@ For more details, see the [design and implementation of the Tor Browser](https:/
NoScript to have even more control over JavaScript
==================================================
-[[!img noscript.png link=no alt="NoScript logo"]]
+[[!img noscript.png link=no alt=""]]
To allow more control over JavaScript, for example to disable JavaScript
completely on some websites, <span class="application">Tor Browser</span> includes the <span class="application">NoScript</span>
diff --git a/wiki/src/doc/anonymous_internet/Tor_Browser.pt.po b/wiki/src/doc/anonymous_internet/Tor_Browser.pt.po
index c19939b..dfe0204 100644
--- a/wiki/src/doc/anonymous_internet/Tor_Browser.pt.po
+++ b/wiki/src/doc/anonymous_internet/Tor_Browser.pt.po
@@ -21,10 +21,9 @@ msgid "[[!meta title=\"Browsing the web with Tor Browser\"]]\n"
msgstr "[[!meta title=\"Navegando na web com o Tor Browser\"]]\n"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid "[[!img Tor_Browser/mozicon128.png link=no alt=\"Iceweasel icon\"]]\n"
-msgid "[[!img Tor_Browser/mozicon128.png link=no alt=\"Tor Browser icon\"]]\n"
-msgstr "[[!img Tor_Browser/mozicon128.png link=no alt=\"Ícone do Iceweasel\"]]\n"
+#, no-wrap
+msgid "[[!img Tor_Browser/mozicon128.png link=no alt=\"\"]]\n"
+msgstr "[[!img Tor_Browser/mozicon128.png link=no alt=\"\"]]\n"
#. type: Plain text
#, fuzzy, no-wrap
@@ -197,10 +196,9 @@ msgstr ""
"webmail](https://lavabit.com/apps/webmail/src/login.php) deles:"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid "[[!img doc/anonymous_internet/Tor_Browser/lavabit.png link=no alt=\"Tor browser\"]]\n"
-msgid "[[!img doc/anonymous_internet/Tor_Browser/riseup.png link=no alt=\"Tor Browser\"]]\n"
-msgstr "[[!img doc/anonymous_internet/Tor_Browser/lavabit.png link=no alt=\"Tor Browser\"]]\n"
+#, no-wrap
+msgid "[[!img doc/anonymous_internet/Tor_Browser/riseup.png link=no alt=\"\"]]\n"
+msgstr "[[!img doc/anonymous_internet/Tor_Browser/riseup.png link=no alt=\"\"]]\n"
#. type: Plain text
#, fuzzy
@@ -243,8 +241,8 @@ msgstr "HTTPS Everywhere\n"
#. type: Plain text
#, no-wrap
-msgid "[[!img https-everywhere.jpg link=no alt=\"HTTPS Everywhere logo\"]]\n"
-msgstr "[[!img https-everywhere.jpg link=no alt=\"Logo do HTTPS Everywhere\"]]\n"
+msgid "[[!img https-everywhere.jpg link=no alt=\"\"]]\n"
+msgstr "[[!img https-everywhere.jpg link=no alt=\"\"]]\n"
#. type: Plain text
#, fuzzy, no-wrap
@@ -325,7 +323,7 @@ msgstr ""
#, no-wrap
msgid ""
"<p>You can see the Tor circuits in\n"
-"<span class=\"application\">[[Onion Circuits|Tor_status#circuits]]</span>.</p>\n"
+"<span class=\"application\">[[Onion Circuits|tor_status#circuits]]</span>.</p>\n"
msgstr ""
#. type: Plain text
@@ -496,8 +494,8 @@ msgstr "Use o NoScript para ter ainda mais controle sobre JavaScript\n"
#. type: Plain text
#, no-wrap
-msgid "[[!img noscript.png link=no alt=\"NoScript logo\"]]\n"
-msgstr "[[!img noscript.png link=no alt=\"Logo do NoScript\"]]\n"
+msgid "[[!img noscript.png link=no alt=\"\"]]\n"
+msgstr "[[!img noscript.png link=no alt=\"\"]]\n"
#. type: Plain text
#, fuzzy, no-wrap
diff --git a/wiki/src/doc/anonymous_internet/Tor_status.mdwn b/wiki/src/doc/anonymous_internet/Tor_status.mdwn
deleted file mode 100644
index 0d39867..0000000
--- a/wiki/src/doc/anonymous_internet/Tor_status.mdwn
+++ /dev/null
@@ -1,60 +0,0 @@
-[[!meta title="Viewing the status of Tor"]]
-
-The Tor status icon and <span class="application">Onion
-Circuits</span> allow you to view the status of Tor.
-
-[[!toc levels=1]]
-
-Status icon
-===========
-
-The current status of Tor appears as an onion icon in the
-notification area:
-
-[[!img doc/first_steps/introduction_to_gnome_and_the_tails_desktop/tor-status.png link="no"]]
-
- - The onion icon is not crossed out when you are connected to Tor.
-
- - The onion icon is crossed out while Tor is stopped or starting.
-
- <div class="tip">
- <p>When Tor is stopped all connections to the Internet are blocked by default.</p>
- </div>
-
-<a id="circuits"></a>
-
-<span class="application">Onion Circuits</span>
-===============================================
-
-<span class="application">Onion Circuits</span> displays information about
-your established Tor circuits and connections.
-
-To open <span class="application">Onion Circuits</span>, click on the
-onion icon and choose <span class="guimenuitem">Open Onion
-Circuits</span>.
-
-In the left pane, there is a list of the
-[[circuits|about/warning#exit_node]] established by Tor. When you connect to
-a destination server, the connection appears in the list below the circuit
-it uses.
-
-In the example below, the connection to
-<span class="code">check.torproject.org</span> goes through the relays
-<span class="guilabel">Unnamed</span>,
-<span class="guilabel">betGamersTorRelay</span>, and the exit node
-<span class="guilabel">hessel0</span>.
-
-If you click on a circuit, in the right pane are displayed technical details
-of the relays composing the circuit.
-
-<!-- Note for translators: the entry guard in use when you take the screenshot
-Onion_Circuits.png is in a position to identify you. You might prefer to leave it
-untranslated.-->
-
-[[!img Tor_status/Onion_Circuits.png link=no]]
-
-Additional Tor configuration
-============================
-
-To configure bridges, firewall, or proxy settings [[select the corresponding
-option in <span class="application">Tails Greeter</span>|first_steps/startup_options/bridge_mode]].
diff --git a/wiki/src/doc/anonymous_internet/networkmanager.fr.po b/wiki/src/doc/anonymous_internet/networkmanager.fr.po
index f81057b..9aa3e6d 100644
--- a/wiki/src/doc/anonymous_internet/networkmanager.fr.po
+++ b/wiki/src/doc/anonymous_internet/networkmanager.fr.po
@@ -19,7 +19,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!meta title=\"Connecting to a network\"]]\n"
-msgstr "[[!meta title=\"Se connecter au réseau\"]]\n"
+msgstr "[[!meta title=\"Se connecter à un réseau\"]]\n"
#. type: Plain text
msgid ""
diff --git a/wiki/src/doc/anonymous_internet/Tor_status.de.po b/wiki/src/doc/anonymous_internet/tor_status.de.po
index 8d71cd1..c2b2b40 100644
--- a/wiki/src/doc/anonymous_internet/Tor_status.de.po
+++ b/wiki/src/doc/anonymous_internet/tor_status.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2016-03-07 18:54+0100\n"
+"POT-Creation-Date: 2016-05-05 18:08+0200\n"
"PO-Revision-Date: 2015-11-09 12:10+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Viewing the status of Tor\"]]\n"
+msgid "[[!meta title=\"Viewing the status and circuits of Tor\"]]\n"
msgstr ""
#. type: Plain text
@@ -34,8 +34,9 @@ msgid "[[!toc levels=1]]\n"
msgstr "[[!toc levels=1]]\n"
#. type: Title =
-#, no-wrap
-msgid "Status icon\n"
+#, fuzzy, no-wrap
+#| msgid "Status icon\n"
+msgid "Tor status icon\n"
msgstr "Statussymbol\n"
#. type: Plain text
@@ -45,7 +46,8 @@ msgstr "Statussymbol\n"
#| "the\n"
#| "notification area:\n"
msgid ""
-"The current status of Tor appears as an onion icon in the notification area:"
+"The current status of Tor appears as an onion-shaped icon in the "
+"notification area:"
msgstr ""
"<span class=\"application\">Vidalia</span> erscheint als Zwiebelsymbol im\n"
"Benachrichtigungsbereich:\n"
@@ -57,41 +59,38 @@ msgid "[[!img doc/first_steps/introduction_to_gnome_and_the_tails_desktop/tor-st
msgstr "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/tor-starting.png link=no]]\n"
#. type: Bullet: ' - '
-#, fuzzy
-#| msgid ""
-#| "<div class=\"text\"><strong>The onion icon is green</strong> when you are "
-#| "connected\n"
-#| "to Tor.</div>\n"
-#| "</div>\n"
-msgid "The onion icon is not crossed out when you are connected to Tor."
+msgid ""
+"[[!img tor-connected.png alt=\"Onion-shaped icon\" link=no class=symbolic]] "
+"You are connected to Tor."
msgstr ""
-"<div class=\"text\"><strong>Das Zwiebelsymbol ist grün</strong>, wenn Sie "
-"mit\n"
-"Tor verbunden sind.</div>\n"
-"</div>\n"
#. type: Bullet: ' - '
+msgid ""
+"[[!img tor-disconnected.png alt=\"Onion-shaped icon crossed out\" link=no "
+"class=\"symbolic\"]] You are not connected to Tor."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"tip\">\n"
+msgstr "<div class=\"tip\">\n"
+
+#. type: Plain text
#, fuzzy
#| msgid ""
-#| "<div class=\"text\"><strong>The onion icon is crossed out</strong> when "
-#| "Tor is\n"
-#| "stopped.\n"
-#| "</div>\n"
-msgid "The onion icon is crossed out while Tor is stopped or starting."
+#| "When Tor is stopped all connections to the Internet are blocked by "
+#| "default."
+msgid ""
+"When you are not connected to Tor, all connections to the Internet are "
+"blocked by default."
msgstr ""
-"<div class=\"text\"><strong>Das Zwiebelsymbol ist durchgestrichen</strong>, "
-"wenn Tor\n"
-"nicht läuft.\n"
-"</div>\n"
+"Wenn Tor nicht mehr läuft, werden alle Verbindungen ins Internet "
+"standardmäßig blockiert."
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid "When Tor is stopped all connections to the Internet are blocked by default."
-msgid ""
-" <div class=\"tip\">\n"
-" <p>When Tor is stopped all connections to the Internet are blocked by default.</p>\n"
-" </div>\n"
-msgstr "Wenn Tor nicht mehr läuft, werden alle Verbindungen ins Internet standardmäßig blockiert."
+#, no-wrap
+msgid "</div>\n"
+msgstr "</div>\n"
#. type: Plain text
#, fuzzy, no-wrap
@@ -111,7 +110,7 @@ msgstr ""
#| "the available Tor relays and your established circuits and connections:\n"
msgid ""
"<span class=\"application\">Onion Circuits</span> displays information about\n"
-"your established Tor circuits and connections.\n"
+"the current Tor circuits and connections.\n"
msgstr ""
"Die <span class=\"guilabel\">Netzwerk-Landkarten</span> Funktion zeigt Informationen über\n"
"verfügbare Tor Relais und die von Ihnen hergestellten Kanäle und Verbindungen an:\n"
@@ -120,20 +119,60 @@ msgstr ""
#, no-wrap
msgid ""
"To open <span class=\"application\">Onion Circuits</span>, click on the\n"
-"onion icon and choose <span class=\"guimenuitem\">Open Onion\n"
+"Tor status icon and choose <span class=\"guimenuitem\">Open Onion\n"
"Circuits</span>.\n"
msgstr ""
#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<!-- Note for translators: the entry guard in use when you take the screenshot\n"
+#| "network_map.png is in a position to identify you. You might prefer to leave it\n"
+#| "untranslated.-->\n"
+msgid ""
+"<!-- Note for translators: the entry guard in use when you take the screenshot\n"
+"onion-circuits.png is in a position to identify you. You might prefer to leave it\n"
+"untranslated.-->\n"
+msgstr ""
+"<!-- Note for translators: the entry guard in use when you take the screenshot\n"
+"network_map.png is in a position to identify you. You might prefer to leave it\n"
+"untranslated.-->\n"
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "[[!img vidalia/network_map.png link=no]]\n"
+msgid "[[!img tor_status/onion-circuits.png link=no]]\n"
+msgstr "[[!img vidalia/network_map.png link=no]]\n"
+
+#. type: Plain text
+msgid ""
+"The circuits established by Tor are listed in the left pane. A Tor circuit "
+"is made of three relays:"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"The first relay or *entry guard*. If you configured a [[Tor bridge|"
+"first_steps/startup_options/bridge_mode]], your bridge is the first relay."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid "The second relay or *middle node*."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid "The exit node."
+msgstr ""
+
+#. type: Plain text
#, fuzzy
#| msgid ""
#| "In the bottom pane, there is a list of the [[circuits|about/"
#| "warning#exit_node]] established by Tor. When you connect to a destination "
#| "server, the connection appears in the list below the circuit it uses."
msgid ""
-"In the left pane, there is a list of the [[circuits|about/"
-"warning#exit_node]] established by Tor. When you connect to a destination "
-"server, the connection appears in the list below the circuit it uses."
+"When you connect to a destination server, for example when visiting a "
+"website, the connection appears in the list below the circuit it uses."
msgstr ""
"Im unteren Fensterbereich befindet sich eine Liste mit den von Tor "
"hergestellten [[Kanälen|about/warning#exit_node]]. Wenn Sie sich zu einem "
@@ -149,7 +188,7 @@ msgstr ""
#| " <span class=\"guilabel\">AxleRelay3</span>, and the exit node\n"
#| " <span class=\"guilabel\">DFRI3</span>.\n"
msgid ""
-"In the example below, the connection to\n"
+"In the example above, the connection to\n"
"<span class=\"code\">check.torproject.org</span> goes through the relays\n"
"<span class=\"guilabel\">Unnamed</span>,\n"
"<span class=\"guilabel\">betGamersTorRelay</span>, and the exit node\n"
@@ -162,54 +201,79 @@ msgstr ""
" <span class=\"guilabel\">DFRI3</span>.\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "If you click on a circuit, in the right pane are displayed technical "
+#| "details of the relays composing the circuit."
msgid ""
-"If you click on a circuit, in the right pane are displayed technical details "
-"of the relays composing the circuit."
+"If you click on a circuit, technical details about the relays of the circuit "
+"appear in the right pane."
msgstr ""
"Wenn Sie eine Verbindung auswählen, werden im rechten Fensterbereich "
"technische Details zu den Relais dieser Verbindung angezeigt."
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<!-- Note for translators: the entry guard in use when you take the screenshot\n"
-#| "network_map.png is in a position to identify you. You might prefer to leave it\n"
-#| "untranslated.-->\n"
-msgid ""
-"<!-- Note for translators: the entry guard in use when you take the screenshot\n"
-"Onion_Circuits.png is in a position to identify you. You might prefer to leave it\n"
-"untranslated.-->\n"
+#, no-wrap
+msgid "[[!img doc/about/warning/htw2-tails.png link=no alt=\"Schematics of a connection to Tor with the client, the three relays, and the destination server.\"]]\n"
msgstr ""
-"<!-- Note for translators: the entry guard in use when you take the screenshot\n"
-"network_map.png is in a position to identify you. You might prefer to leave it\n"
-"untranslated.-->\n"
-#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid "[[!img vidalia/network_map.png link=no]]\n"
-msgid "[[!img Tor_status/Onion_Circuits.png link=no]]\n"
-msgstr "[[!img vidalia/network_map.png link=no]]\n"
+#, fuzzy
+#~| msgid ""
+#~| "<div class=\"text\"><strong>The onion icon is green</strong> when you "
+#~| "are connected\n"
+#~| "to Tor.</div>\n"
+#~| "</div>\n"
+#~ msgid "The onion icon is not crossed out when you are connected to Tor."
+#~ msgstr ""
+#~ "<div class=\"text\"><strong>Das Zwiebelsymbol ist grün</strong>, wenn Sie "
+#~ "mit\n"
+#~ "Tor verbunden sind.</div>\n"
+#~ "</div>\n"
-#. type: Title =
-#, no-wrap
-msgid "Additional Tor configuration\n"
-msgstr "Zusätzliche Konfiguration von Tor\n"
+#, fuzzy
+#~| msgid ""
+#~| "<div class=\"text\"><strong>The onion icon is crossed out</strong> when "
+#~| "Tor is\n"
+#~| "stopped.\n"
+#~| "</div>\n"
+#~ msgid "The onion icon is crossed out while Tor is stopped or starting."
+#~ msgstr ""
+#~ "<div class=\"text\"><strong>Das Zwiebelsymbol ist durchgestrichen</"
+#~ "strong>, wenn Tor\n"
+#~ "nicht läuft.\n"
+#~ "</div>\n"
-#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid "To configure bridges, firewall, or proxy settings [[select the corresponding option in <span class=\"application\">Tails Greeter</span> |first_steps/startup_options/bridge_mode]]."
-msgid ""
-"To configure bridges, firewall, or proxy settings [[select the corresponding\n"
-"option in <span class=\"application\">Tails Greeter</span>|first_steps/startup_options/bridge_mode]].\n"
-msgstr "Um Bridges, Firewall- oder Proxyeinstellungen zu konfigurieren, [[wählen Sie die entsprechende Option im <span class=\"application\">Tails Greeter</span>|first_steps/startup_options/bridge_mode]]."
+#~ msgid "Additional Tor configuration\n"
+#~ msgstr "Zusätzliche Konfiguration von Tor\n"
+
+#, fuzzy
+#~| msgid ""
+#~| "To configure bridges, firewall, or proxy settings [[select the "
+#~| "corresponding option in <span class=\"application\">Tails Greeter</span> "
+#~| "|first_steps/startup_options/bridge_mode]]."
+#~ msgid ""
+#~ "To configure bridges, firewall, or proxy settings [[select the "
+#~ "corresponding\n"
+#~ "option in <span class=\"application\">Tails Greeter</span>|first_steps/"
+#~ "startup_options/bridge_mode]].\n"
+#~ msgstr ""
+#~ "Um Bridges, Firewall- oder Proxyeinstellungen zu konfigurieren, [[wählen "
+#~ "Sie die entsprechende Option im <span class=\"application\">Tails "
+#~ "Greeter</span>|first_steps/startup_options/bridge_mode]]."
#~ msgid "[[!meta title=\"Controlling Tor using Vidalia\"]]\n"
#~ msgstr "[[!meta title=\"Tor mit Vidalia steuern\"]]\n"
#, fuzzy
-#~| msgid "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/tor-on.png link=no]]\n"
-#~ msgid "[[!img doc/first_steps/introduction_to_gnome_and_the_tails_desktop/vidalia.png link=\"no\"]]\n"
-#~ msgstr "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/tor-on.png link=no]]\n"
+#~| msgid ""
+#~| "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/tor-on."
+#~| "png link=no]]\n"
+#~ msgid ""
+#~ "[[!img doc/first_steps/introduction_to_gnome_and_the_tails_desktop/"
+#~ "vidalia.png link=\"no\"]]\n"
+#~ msgstr ""
+#~ "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/tor-on.png "
+#~ "link=no]]\n"
#, fuzzy
#~| msgid ""
@@ -226,42 +290,61 @@ msgstr "Um Bridges, Firewall- oder Proxyeinstellungen zu konfigurieren, [[wähle
#, fuzzy
#~| msgid ""
-#~| "The <span class=\"application\">Vidalia</span> onion icon sometimes stays yellow\n"
+#~| "The <span class=\"application\">Vidalia</span> onion icon sometimes "
+#~| "stays yellow\n"
#~| "even if Tor is already started. If the <span class=\"guilabel\">Tor is\n"
-#~| "ready</span> notification appears or if you can browse the Internet using\n"
-#~| "<span class=\"application\">Tor Browser</span>, then Tor is started correctly.\n"
+#~| "ready</span> notification appears or if you can browse the Internet "
+#~| "using\n"
+#~| "<span class=\"application\">Tor Browser</span>, then Tor is started "
+#~| "correctly.\n"
#~ msgid ""
#~ " <div class=\"bug\">\n"
-#~ " <p>The <span class=\"application\">Vidalia</span> onion icon sometimes stays yellow\n"
-#~ " even if Tor is already started. If the <span class=\"guilabel\">Tor is\n"
-#~ " ready</span> notification appears or if you can browse the Internet using\n"
-#~ " <span class=\"application\">Tor Browser</span>, then Tor is started correctly.</p>\n"
+#~ " <p>The <span class=\"application\">Vidalia</span> onion icon "
+#~ "sometimes stays yellow\n"
+#~ " even if Tor is already started. If the <span class=\"guilabel\">Tor "
+#~ "is\n"
+#~ " ready</span> notification appears or if you can browse the Internet "
+#~ "using\n"
+#~ " <span class=\"application\">Tor Browser</span>, then Tor is started "
+#~ "correctly.</p>\n"
#~ msgstr ""
-#~ "Das Zwiebelsymbol von <span class=\"application\">Vidalia</span> bleibt manchmal gelb,\n"
-#~ "obwohl Tor bereits gestartet wurde. Wenn die Benachrichtigung <span class=\"guilabel\">Tor ist\n"
-#~ "bereit</span> erscheint oder wenn Sie mit dem <span class=\"application\">Tor Browser</span>\n"
+#~ "Das Zwiebelsymbol von <span class=\"application\">Vidalia</span> bleibt "
+#~ "manchmal gelb,\n"
+#~ "obwohl Tor bereits gestartet wurde. Wenn die Benachrichtigung <span class="
+#~ "\"guilabel\">Tor ist\n"
+#~ "bereit</span> erscheint oder wenn Sie mit dem <span class=\"application"
+#~ "\">Tor Browser</span>\n"
#~ "im Internet surfen können, ist Tor korrekt gestartet.\n"
#, fuzzy
-#~| msgid "Tails has other protections that would prevent your from connecting to the Internet without going through Tor."
+#~| msgid ""
+#~| "Tails has other protections that would prevent your from connecting to "
+#~| "the Internet without going through Tor."
#~ msgid ""
-#~ " <p>Tails has other protections that would prevent you from connecting to the\n"
+#~ " <p>Tails has other protections that would prevent you from connecting "
+#~ "to the\n"
#~ " Internet without going through Tor.</p>\n"
#~ " </div>\n"
-#~ msgstr "Tails hat andere Vorsichtsmaßnahmen, die es verhindern würden, dass Sie eine Internetverbindung ohne die Nutzung von Tor herstellen."
+#~ msgstr ""
+#~ "Tails hat andere Vorsichtsmaßnahmen, die es verhindern würden, dass Sie "
+#~ "eine Internetverbindung ohne die Nutzung von Tor herstellen."
#~ msgid "Popup menu\n"
#~ msgstr "Popup-Menü\n"
#~ msgid ""
-#~ "To access more features of <span class=\"application\">Vidalia</span>, right-click\n"
+#~ "To access more features of <span class=\"application\">Vidalia</span>, "
+#~ "right-click\n"
#~ "on the onion icon to open its popup menu:\n"
#~ msgstr ""
-#~ "Um auf mehr Funktionen von <span class=\"application\">Vidalia</span> zuzugreifen, rechtsklicken Sie das\n"
+#~ "Um auf mehr Funktionen von <span class=\"application\">Vidalia</span> "
+#~ "zuzugreifen, rechtsklicken Sie das\n"
#~ "Zwiebelsymbol, um das Popup-Menü zu öffnen.\n"
-#~ msgid "[[!img vidalia/right-click_menu.png link=no alt=\"Vidalia popup menu\"]]\n"
-#~ msgstr "[[!img vidalia/right-click_menu.png link=no alt=\"Vidalia Popup-Menü\"]]\n"
+#~ msgid ""
+#~ "[[!img vidalia/right-click_menu.png link=no alt=\"Vidalia popup menu\"]]\n"
+#~ msgstr ""
+#~ "[[!img vidalia/right-click_menu.png link=no alt=\"Vidalia Popup-Menü\"]]\n"
#~ msgid "The <span class=\"guilabel\">Network Map</span> feature\n"
#~ msgstr "Die <span class=\"guilabel\">Netzwerk-Landkarten</span> Funktion\n"
@@ -282,13 +365,19 @@ msgstr "Um Bridges, Firewall- oder Proxyeinstellungen zu konfigurieren, [[wähle
#~ "wird, wo die Relais jedes Kanals stehen."
#~ msgid ""
-#~ " In the example below, the relay <span class=\"guilabel\">PiratenNDS2</span>\n"
-#~ " is in Germany, the relay <span class=\"guilabel\">AxleRelay3</span> is in the\n"
-#~ " USA, and the relay <span class=\"guilabel\">DFRI3</span> is in Sweden.\n"
+#~ " In the example below, the relay <span class=\"guilabel\">PiratenNDS2</"
+#~ "span>\n"
+#~ " is in Germany, the relay <span class=\"guilabel\">AxleRelay3</span> "
+#~ "is in the\n"
+#~ " USA, and the relay <span class=\"guilabel\">DFRI3</span> is in "
+#~ "Sweden.\n"
#~ msgstr ""
-#~ " In dem Beispiel unten befindet sich das Relais <span class=\"guilabel\">PiratenNDS2</span>\n"
-#~ " in Deutschland, das Relais <span class=\"guilabel\">AxleRelay3</span> in den\n"
-#~ " USA und das Relais <span class=\"guilabel\">DFRI3</span> in Schweden.\n"
+#~ " In dem Beispiel unten befindet sich das Relais <span class=\"guilabel"
+#~ "\">PiratenNDS2</span>\n"
+#~ " in Deutschland, das Relais <span class=\"guilabel\">AxleRelay3</span> "
+#~ "in den\n"
+#~ " USA und das Relais <span class=\"guilabel\">DFRI3</span> in "
+#~ "Schweden.\n"
#~ msgid "<a id=\"new_identity\"></a>\n"
#~ msgstr "<a id=\"new_identity\"></a>\n"
@@ -297,40 +386,49 @@ msgstr "Um Bridges, Firewall- oder Proxyeinstellungen zu konfigurieren, [[wähle
#~ msgstr "<span class=\"guilabel\">Neue Identität</span> Funktion\n"
#~ msgid ""
-#~ "The <span class=\"guilabel\">New Identity</span> feature of Vidalia forces Tor\n"
+#~ "The <span class=\"guilabel\">New Identity</span> feature of Vidalia "
+#~ "forces Tor\n"
#~ "to use new circuits but only for new connections.\n"
#~ msgstr ""
-#~ "Die Funktion <span class=\"guilabel\">Neue Identität</span> von Vidalia zwingt Tor dazu,\n"
+#~ "Die Funktion <span class=\"guilabel\">Neue Identität</span> von Vidalia "
+#~ "zwingt Tor dazu,\n"
#~ "neue Kanäle zu verwenden, jedoch nur für neue Verbindungen.\n"
#~ msgid "<div class=\"caution\">\n"
#~ msgstr "<div class=\"caution\">\n"
-#~ msgid "<p>This feature is not a good solution to [[separate contextual identities|about/warning#identities]], as:\n"
-#~ msgstr "<p>Diese Funktion ist keine gute Lösung, um [[Identitäten für verschiedene Kontexte zu trennen|about/warning#identities]], da:\n"
+#~ msgid ""
+#~ "<p>This feature is not a good solution to [[separate contextual "
+#~ "identities|about/warning#identities]], as:\n"
+#~ msgstr ""
+#~ "<p>Diese Funktion ist keine gute Lösung, um [[Identitäten für "
+#~ "verschiedene Kontexte zu trennen|about/warning#identities]], da:\n"
#~ msgid ""
#~ "<ul>\n"
#~ "<li>Already existing connections might stay open.</li>\n"
#~ "<li>Other sources of information can reveal your past activities, for\n"
-#~ "example the cookies stored in <span class=\"application\">Tor Browser</span> or the random nick in <span class=\"application\">Pidgin</span>.</li>\n"
+#~ "example the cookies stored in <span class=\"application\">Tor Browser</"
+#~ "span> or the random nick in <span class=\"application\">Pidgin</span>.</"
+#~ "li>\n"
#~ "</ul>\n"
#~ msgstr ""
#~ "<ul>\n"
#~ "<li>Bereits bestehende Verbindungen geöffnet bleiben könnten.</li>\n"
-#~ "<li>Andere Informationsquellen Ihre vergangen Aktivitäten enthüllen können, z. B.\n"
-#~ "die im <span class=\"application\">Tor Browser</span> gespeicherten Cookies oder der zufällige Nickname in <span class=\"application\">Pidgin</span>.</li>\n"
+#~ "<li>Andere Informationsquellen Ihre vergangen Aktivitäten enthüllen "
+#~ "können, z. B.\n"
+#~ "die im <span class=\"application\">Tor Browser</span> gespeicherten "
+#~ "Cookies oder der zufällige Nickname in <span class=\"application"
+#~ "\">Pidgin</span>.</li>\n"
#~ "</ul>\n"
#~ msgid "<p>Shutdown and restart Tails instead.</p>\n"
-#~ msgstr "<p>Fahren Sie stattdessen Tails herunter und starten Sie es neu.</p>\n"
+#~ msgstr ""
+#~ "<p>Fahren Sie stattdessen Tails herunter und starten Sie es neu.</p>\n"
#~ msgid "</p>\n"
#~ msgstr "</p>\n"
-#~ msgid "</div>\n"
-#~ msgstr "</div>\n"
-
#~ msgid ""
#~ "It is impossible to edit the <span class=\"filename\">torrc</span> "
#~ "configuration file using <span class=\"application\">Vidalia</span>."
@@ -372,6 +470,3 @@ msgstr "Um Bridges, Firewall- oder Proxyeinstellungen zu konfigurieren, [[wähle
#~ msgstr ""
#~ "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/tor-off."
#~ "png link=no]]\n"
-
-#~ msgid "<div class=\"tip\">\n"
-#~ msgstr "<div class=\"tip\">\n"
diff --git a/wiki/src/doc/anonymous_internet/Tor_status.fa.po b/wiki/src/doc/anonymous_internet/tor_status.fa.po
index 1c15b14..76c7849 100644
--- a/wiki/src/doc/anonymous_internet/Tor_status.fa.po
+++ b/wiki/src/doc/anonymous_internet/tor_status.fa.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2016-03-07 18:54+0100\n"
+"POT-Creation-Date: 2016-05-05 18:08+0200\n"
"PO-Revision-Date: 2015-10-15 08:47+0000\n"
"Last-Translator: sprint5 <translation5@451f.org>\n"
"Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/vidalia/"
@@ -21,7 +21,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Viewing the status of Tor\"]]\n"
+msgid "[[!meta title=\"Viewing the status and circuits of Tor\"]]\n"
msgstr ""
#. type: Plain text
@@ -37,8 +37,9 @@ msgid "[[!toc levels=1]]\n"
msgstr "[[!toc levels=1]]\n"
#. type: Title =
-#, no-wrap
-msgid "Status icon\n"
+#, fuzzy, no-wrap
+#| msgid "Status icon\n"
+msgid "Tor status icon\n"
msgstr "نمایهٔ وضعیت\n"
#. type: Plain text
@@ -48,7 +49,8 @@ msgstr "نمایهٔ وضعیت\n"
#| "the\n"
#| "notification area:\n"
msgid ""
-"The current status of Tor appears as an onion icon in the notification area:"
+"The current status of Tor appears as an onion-shaped icon in the "
+"notification area:"
msgstr ""
"<span class=\"application\">ویدالیا</span> به شکل یک نمایهٔ پیاز\n"
"در محل آگهی دیده می‌شود:\n"
@@ -60,40 +62,38 @@ msgid "[[!img doc/first_steps/introduction_to_gnome_and_the_tails_desktop/tor-st
msgstr "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/tor-starting.png link=no]]\n"
#. type: Bullet: ' - '
-#, fuzzy
-#| msgid ""
-#| "<div class=\"text\"><strong>The onion icon is green</strong> when you are "
-#| "connected\n"
-#| "to Tor.</div>\n"
-#| "</div>\n"
-msgid "The onion icon is not crossed out when you are connected to Tor."
+msgid ""
+"[[!img tor-connected.png alt=\"Onion-shaped icon\" link=no class=symbolic]] "
+"You are connected to Tor."
msgstr ""
-"<div class=\"text\">هنگامی که به تور وصل هستید<strong>نمایهٔ پیاز\n"
-"سبز است.</strong></div>\n"
-"</div>\n"
#. type: Bullet: ' - '
+msgid ""
+"[[!img tor-disconnected.png alt=\"Onion-shaped icon crossed out\" link=no "
+"class=\"symbolic\"]] You are not connected to Tor."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"tip\">\n"
+msgstr "<div class=\"tip\">\n"
+
+#. type: Plain text
#, fuzzy
#| msgid ""
-#| "<div class=\"text\"><strong>The onion icon is crossed out</strong> when "
-#| "Tor is\n"
-#| "stopped.\n"
-#| "</div>\n"
-msgid "The onion icon is crossed out while Tor is stopped or starting."
+#| "When Tor is stopped all connections to the Internet are blocked by "
+#| "default."
+msgid ""
+"When you are not connected to Tor, all connections to the Internet are "
+"blocked by default."
msgstr ""
-"<div class=\"text\">وقتی تور متوقف شده باشد <strong>روی نمایهٔ پیاز یک علامت "
-"ضربدر\n"
-"دیده می‌شود.</strong>\n"
-"</div>\n"
+"وقتی تور متوقف شده باشد تمام ارتباطات شما به اینترنت به طور پیش‌فرض مسدود "
+"می‌شوند."
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid "When Tor is stopped all connections to the Internet are blocked by default."
-msgid ""
-" <div class=\"tip\">\n"
-" <p>When Tor is stopped all connections to the Internet are blocked by default.</p>\n"
-" </div>\n"
-msgstr "وقتی تور متوقف شده باشد تمام ارتباطات شما به اینترنت به طور پیش‌فرض مسدود می‌شوند."
+#, no-wrap
+msgid "</div>\n"
+msgstr "</div>\n"
#. type: Plain text
#, fuzzy, no-wrap
@@ -113,7 +113,7 @@ msgstr ""
#| "the available Tor relays and your established circuits and connections:\n"
msgid ""
"<span class=\"application\">Onion Circuits</span> displays information about\n"
-"your established Tor circuits and connections.\n"
+"the current Tor circuits and connections.\n"
msgstr ""
"ویژگی <span class=\"guilabel\">نقشهٔ شبکه</span> اطلاعاتی در مورد رله‌های \n"
"موجود تور و مدارها و اتصالات برقرارشدهٔ شما در اختیارتان می‌گذارد:\n"
@@ -122,20 +122,60 @@ msgstr ""
#, no-wrap
msgid ""
"To open <span class=\"application\">Onion Circuits</span>, click on the\n"
-"onion icon and choose <span class=\"guimenuitem\">Open Onion\n"
+"Tor status icon and choose <span class=\"guimenuitem\">Open Onion\n"
"Circuits</span>.\n"
msgstr ""
#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<!-- Note for translators: the entry guard in use when you take the screenshot\n"
+#| "network_map.png is in a position to identify you. You might prefer to leave it\n"
+#| "untranslated.-->\n"
+msgid ""
+"<!-- Note for translators: the entry guard in use when you take the screenshot\n"
+"onion-circuits.png is in a position to identify you. You might prefer to leave it\n"
+"untranslated.-->\n"
+msgstr ""
+"<!-- Note for translators: the entry guard in use when you take the screenshot\n"
+"network_map.png is in a position to identify you. You might prefer to leave it\n"
+"untranslated.-->\n"
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "[[!img vidalia/network_map.png link=no]]\n"
+msgid "[[!img tor_status/onion-circuits.png link=no]]\n"
+msgstr "[[!img vidalia/network_map.png link=no]]\n"
+
+#. type: Plain text
+msgid ""
+"The circuits established by Tor are listed in the left pane. A Tor circuit "
+"is made of three relays:"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"The first relay or *entry guard*. If you configured a [[Tor bridge|"
+"first_steps/startup_options/bridge_mode]], your bridge is the first relay."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid "The second relay or *middle node*."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid "The exit node."
+msgstr ""
+
+#. type: Plain text
#, fuzzy
#| msgid ""
#| "In the bottom pane, there is a list of the [[circuits|about/"
#| "warning#exit_node]] established by Tor. When you connect to a destination "
#| "server, the connection appears in the list below the circuit it uses."
msgid ""
-"In the left pane, there is a list of the [[circuits|about/"
-"warning#exit_node]] established by Tor. When you connect to a destination "
-"server, the connection appears in the list below the circuit it uses."
+"When you connect to a destination server, for example when visiting a "
+"website, the connection appears in the list below the circuit it uses."
msgstr ""
"در پایین فهرستی از [[مدارهای|about/warning#exit_node]] تور وجود دارد. وقتی "
"به یک سرور مقصد وصل می‌شوید، این اتصال در فهرست زیر مداری که از آن استفاده "
@@ -150,7 +190,7 @@ msgstr ""
#| " <span class=\"guilabel\">AxleRelay3</span>, and the exit node\n"
#| " <span class=\"guilabel\">DFRI3</span>.\n"
msgid ""
-"In the example below, the connection to\n"
+"In the example above, the connection to\n"
"<span class=\"code\">check.torproject.org</span> goes through the relays\n"
"<span class=\"guilabel\">Unnamed</span>,\n"
"<span class=\"guilabel\">betGamersTorRelay</span>, and the exit node\n"
@@ -163,54 +203,78 @@ msgstr ""
" <span class=\"guilabel\">DFRI3</span> عبور می‌کند.\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "If you click on a circuit, in the right pane are displayed technical "
+#| "details of the relays composing the circuit."
msgid ""
-"If you click on a circuit, in the right pane are displayed technical details "
-"of the relays composing the circuit."
+"If you click on a circuit, technical details about the relays of the circuit "
+"appear in the right pane."
msgstr ""
"اگر روی مدار کلیک کنید در سمت چپ جزییات فنی رله‌های تشکیل‌دهندهٔ مدار را "
"می‌بینید."
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<!-- Note for translators: the entry guard in use when you take the screenshot\n"
-#| "network_map.png is in a position to identify you. You might prefer to leave it\n"
-#| "untranslated.-->\n"
-msgid ""
-"<!-- Note for translators: the entry guard in use when you take the screenshot\n"
-"Onion_Circuits.png is in a position to identify you. You might prefer to leave it\n"
-"untranslated.-->\n"
+#, no-wrap
+msgid "[[!img doc/about/warning/htw2-tails.png link=no alt=\"Schematics of a connection to Tor with the client, the three relays, and the destination server.\"]]\n"
msgstr ""
-"<!-- Note for translators: the entry guard in use when you take the screenshot\n"
-"network_map.png is in a position to identify you. You might prefer to leave it\n"
-"untranslated.-->\n"
-#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid "[[!img vidalia/network_map.png link=no]]\n"
-msgid "[[!img Tor_status/Onion_Circuits.png link=no]]\n"
-msgstr "[[!img vidalia/network_map.png link=no]]\n"
+#, fuzzy
+#~| msgid ""
+#~| "<div class=\"text\"><strong>The onion icon is green</strong> when you "
+#~| "are connected\n"
+#~| "to Tor.</div>\n"
+#~| "</div>\n"
+#~ msgid "The onion icon is not crossed out when you are connected to Tor."
+#~ msgstr ""
+#~ "<div class=\"text\">هنگامی که به تور وصل هستید<strong>نمایهٔ پیاز\n"
+#~ "سبز است.</strong></div>\n"
+#~ "</div>\n"
-#. type: Title =
-#, no-wrap
-msgid "Additional Tor configuration\n"
-msgstr "پیکربندی بیشتر تور\n"
+#, fuzzy
+#~| msgid ""
+#~| "<div class=\"text\"><strong>The onion icon is crossed out</strong> when "
+#~| "Tor is\n"
+#~| "stopped.\n"
+#~| "</div>\n"
+#~ msgid "The onion icon is crossed out while Tor is stopped or starting."
+#~ msgstr ""
+#~ "<div class=\"text\">وقتی تور متوقف شده باشد <strong>روی نمایهٔ پیاز یک "
+#~ "علامت ضربدر\n"
+#~ "دیده می‌شود.</strong>\n"
+#~ "</div>\n"
-#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid "To configure bridges, firewall, or proxy settings [[select the corresponding option in <span class=\"application\">Tails Greeter</span> |first_steps/startup_options/bridge_mode]]."
-msgid ""
-"To configure bridges, firewall, or proxy settings [[select the corresponding\n"
-"option in <span class=\"application\">Tails Greeter</span>|first_steps/startup_options/bridge_mode]].\n"
-msgstr "برای پیکربندی پل‌ها، دیوارهای آتش یا تنظیمات پروکسی [[گزینهٔ مرتبط در <span class=\"application\">خوشامدگوی تیلز</span> انتخاب کنید|first_steps/startup_options/bridge_mode]]."
+#~ msgid "Additional Tor configuration\n"
+#~ msgstr "پیکربندی بیشتر تور\n"
+
+#, fuzzy
+#~| msgid ""
+#~| "To configure bridges, firewall, or proxy settings [[select the "
+#~| "corresponding option in <span class=\"application\">Tails Greeter</span> "
+#~| "|first_steps/startup_options/bridge_mode]]."
+#~ msgid ""
+#~ "To configure bridges, firewall, or proxy settings [[select the "
+#~ "corresponding\n"
+#~ "option in <span class=\"application\">Tails Greeter</span>|first_steps/"
+#~ "startup_options/bridge_mode]].\n"
+#~ msgstr ""
+#~ "برای پیکربندی پل‌ها، دیوارهای آتش یا تنظیمات پروکسی [[گزینهٔ مرتبط در "
+#~ "<span class=\"application\">خوشامدگوی تیلز</span> انتخاب کنید|first_steps/"
+#~ "startup_options/bridge_mode]]."
#~ msgid "[[!meta title=\"Controlling Tor using Vidalia\"]]\n"
#~ msgstr "[[!meta title=\"کنترل تور با استفاده از ویدالیا\"]]\n"
#, fuzzy
-#~| msgid "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/tor-on.png link=no]]\n"
-#~ msgid "[[!img doc/first_steps/introduction_to_gnome_and_the_tails_desktop/vidalia.png link=\"no\"]]\n"
-#~ msgstr "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/tor-on.png link=no]]\n"
+#~| msgid ""
+#~| "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/tor-on."
+#~| "png link=no]]\n"
+#~ msgid ""
+#~ "[[!img doc/first_steps/introduction_to_gnome_and_the_tails_desktop/"
+#~ "vidalia.png link=\"no\"]]\n"
+#~ msgstr ""
+#~ "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/tor-on.png "
+#~ "link=no]]\n"
#, fuzzy
#~| msgid ""
@@ -227,42 +291,61 @@ msgstr "برای پیکربندی پل‌ها، دیوارهای آتش یا ت
#, fuzzy
#~| msgid ""
-#~| "The <span class=\"application\">Vidalia</span> onion icon sometimes stays yellow\n"
+#~| "The <span class=\"application\">Vidalia</span> onion icon sometimes "
+#~| "stays yellow\n"
#~| "even if Tor is already started. If the <span class=\"guilabel\">Tor is\n"
-#~| "ready</span> notification appears or if you can browse the Internet using\n"
-#~| "<span class=\"application\">Tor Browser</span>, then Tor is started correctly.\n"
+#~| "ready</span> notification appears or if you can browse the Internet "
+#~| "using\n"
+#~| "<span class=\"application\">Tor Browser</span>, then Tor is started "
+#~| "correctly.\n"
#~ msgid ""
#~ " <div class=\"bug\">\n"
-#~ " <p>The <span class=\"application\">Vidalia</span> onion icon sometimes stays yellow\n"
-#~ " even if Tor is already started. If the <span class=\"guilabel\">Tor is\n"
-#~ " ready</span> notification appears or if you can browse the Internet using\n"
-#~ " <span class=\"application\">Tor Browser</span>, then Tor is started correctly.</p>\n"
+#~ " <p>The <span class=\"application\">Vidalia</span> onion icon "
+#~ "sometimes stays yellow\n"
+#~ " even if Tor is already started. If the <span class=\"guilabel\">Tor "
+#~ "is\n"
+#~ " ready</span> notification appears or if you can browse the Internet "
+#~ "using\n"
+#~ " <span class=\"application\">Tor Browser</span>, then Tor is started "
+#~ "correctly.</p>\n"
#~ msgstr ""
-#~ "نمایهٔ پیاز <span class=\"application\">ویدالیا</span> گاهی در صورت آغاز شدن تور\n"
+#~ "نمایهٔ پیاز <span class=\"application\">ویدالیا</span> گاهی در صورت آغاز "
+#~ "شدن تور\n"
#~ "زرد باقی می‌ماند. اگر <span class=\"guilabel\">تور آماده باشد\n"
-#~ "</span> آگهی دریافت می کنید یا اگر می توانید با استفاده از <span class=\"application\">Tor Browser</span>\n"
+#~ "</span> آگهی دریافت می کنید یا اگر می توانید با استفاده از <span class="
+#~ "\"application\">Tor Browser</span>\n"
#~ "به وب دسترسی داشته باشید پس تور بدون مشکل راه‌اندازی شده است.\n"
#, fuzzy
-#~| msgid "Tails has other protections that would prevent your from connecting to the Internet without going through Tor."
+#~| msgid ""
+#~| "Tails has other protections that would prevent your from connecting to "
+#~| "the Internet without going through Tor."
#~ msgid ""
-#~ " <p>Tails has other protections that would prevent you from connecting to the\n"
+#~ " <p>Tails has other protections that would prevent you from connecting "
+#~ "to the\n"
#~ " Internet without going through Tor.</p>\n"
#~ " </div>\n"
-#~ msgstr "تیلز ابزارهای محافظتی دیگری نیز برای جلوگیری از متصل شدن شما به اینترنت بدون تور دارد."
+#~ msgstr ""
+#~ "تیلز ابزارهای محافظتی دیگری نیز برای جلوگیری از متصل شدن شما به اینترنت "
+#~ "بدون تور دارد."
#~ msgid "Popup menu\n"
#~ msgstr "فهرست واشو\n"
#~ msgid ""
-#~ "To access more features of <span class=\"application\">Vidalia</span>, right-click\n"
+#~ "To access more features of <span class=\"application\">Vidalia</span>, "
+#~ "right-click\n"
#~ "on the onion icon to open its popup menu:\n"
#~ msgstr ""
-#~ "برای دسترسی به ویژگی‌های بیشتر <span class=\"application\">ویدالیا</span>، روی نمایهٔ پیاز راست‌کلیک کنید\n"
+#~ "برای دسترسی به ویژگی‌های بیشتر <span class=\"application\">ویدالیا</span>، "
+#~ "روی نمایهٔ پیاز راست‌کلیک کنید\n"
#~ " تا فهرست واشوی آن باز شود:\n"
-#~ msgid "[[!img vidalia/right-click_menu.png link=no alt=\"Vidalia popup menu\"]]\n"
-#~ msgstr "[[!img vidalia/right-click_menu.png link=no alt=\"فهرست واشوی ویدالیا\"]]\n"
+#~ msgid ""
+#~ "[[!img vidalia/right-click_menu.png link=no alt=\"Vidalia popup menu\"]]\n"
+#~ msgstr ""
+#~ "[[!img vidalia/right-click_menu.png link=no alt=\"فهرست واشوی ویدالیا"
+#~ "\"]]\n"
#~ msgid "The <span class=\"guilabel\">Network Map</span> feature\n"
#~ msgstr "ویژگی <span class=\"guilabel\">نقشهٔ شبکه</span>\n"
@@ -280,9 +363,12 @@ msgstr "برای پیکربندی پل‌ها، دیوارهای آتش یا ت
#~ msgstr "در قسمت بالا نقشه‌ای حدودی از مکان رله‌های هر مدار وجود دارد."
#~ msgid ""
-#~ " In the example below, the relay <span class=\"guilabel\">PiratenNDS2</span>\n"
-#~ " is in Germany, the relay <span class=\"guilabel\">AxleRelay3</span> is in the\n"
-#~ " USA, and the relay <span class=\"guilabel\">DFRI3</span> is in Sweden.\n"
+#~ " In the example below, the relay <span class=\"guilabel\">PiratenNDS2</"
+#~ "span>\n"
+#~ " is in Germany, the relay <span class=\"guilabel\">AxleRelay3</span> "
+#~ "is in the\n"
+#~ " USA, and the relay <span class=\"guilabel\">DFRI3</span> is in "
+#~ "Sweden.\n"
#~ msgstr ""
#~ " در مثال زیر رلهٔ <span class=\"guilabel\">PiratenNDS2</span>\n"
#~ " در آلمان، رلهٔ <span class=\"guilabel\">AxleRelay3</span> در آمریکا\n"
@@ -295,29 +381,38 @@ msgstr "برای پیکربندی پل‌ها، دیوارهای آتش یا ت
#~ msgstr "ویژگی <span class=\"guilabel\">هویت جدید</span>\n"
#~ msgid ""
-#~ "The <span class=\"guilabel\">New Identity</span> feature of Vidalia forces Tor\n"
+#~ "The <span class=\"guilabel\">New Identity</span> feature of Vidalia "
+#~ "forces Tor\n"
#~ "to use new circuits but only for new connections.\n"
#~ msgstr ""
-#~ "ویژگی <span class=\"guilabel\">هویت جدید</span> ویدالیا تور را وادار به استفاده از\n"
+#~ "ویژگی <span class=\"guilabel\">هویت جدید</span> ویدالیا تور را وادار به "
+#~ "استفاده از\n"
#~ "مدارهای جدید می‌کند، اما تنها برای اتصالات جدید.\n"
#~ msgid "<div class=\"caution\">\n"
#~ msgstr "<div class=\"caution\">\n"
-#~ msgid "<p>This feature is not a good solution to [[separate contextual identities|about/warning#identities]], as:\n"
-#~ msgstr "<p>این ویژگی راه‌حل خوبی برای [[جدا کردن هویت‌های خود|about/warning#identities]] نیست، چرا که:\n"
+#~ msgid ""
+#~ "<p>This feature is not a good solution to [[separate contextual "
+#~ "identities|about/warning#identities]], as:\n"
+#~ msgstr ""
+#~ "<p>این ویژگی راه‌حل خوبی برای [[جدا کردن هویت‌های خود|about/"
+#~ "warning#identities]] نیست، چرا که:\n"
#~ msgid ""
#~ "<ul>\n"
#~ "<li>Already existing connections might stay open.</li>\n"
#~ "<li>Other sources of information can reveal your past activities, for\n"
-#~ "example the cookies stored in <span class=\"application\">Tor Browser</span> or the random nick in <span class=\"application\">Pidgin</span>.</li>\n"
+#~ "example the cookies stored in <span class=\"application\">Tor Browser</"
+#~ "span> or the random nick in <span class=\"application\">Pidgin</span>.</"
+#~ "li>\n"
#~ "</ul>\n"
#~ msgstr ""
#~ "<ul>\n"
#~ "<li>ممکن است اتصالات موجود باز بمانند.</li>\n"
#~ "<li>منابع دیگر اطلاعاتی ممکن است فعالیت‌های قبلی شما را فاش کنند، مثل\n"
-#~ "کوکی‌های ذخیره‌شده در <span class=\"application\">مرورگر تور</span> یا نام‌مستعار تصادفی در <span class=\"application\">پیجین</span>.</li>\n"
+#~ "کوکی‌های ذخیره‌شده در <span class=\"application\">مرورگر تور</span> یا "
+#~ "نام‌مستعار تصادفی در <span class=\"application\">پیجین</span>.</li>\n"
#~ "</ul>\n"
#~ msgid "<p>Shutdown and restart Tails instead.</p>\n"
@@ -326,9 +421,6 @@ msgstr "برای پیکربندی پل‌ها، دیوارهای آتش یا ت
#~ msgid "</p>\n"
#~ msgstr "</p>\n"
-#~ msgid "</div>\n"
-#~ msgstr "</div>\n"
-
#~ msgid ""
#~ "It is impossible to edit the <span class=\"filename\">torrc</span> "
#~ "configuration file using <span class=\"application\">Vidalia</span>."
@@ -375,6 +467,3 @@ msgstr "برای پیکربندی پل‌ها، دیوارهای آتش یا ت
#~ msgstr ""
#~ "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/tor-off."
#~ "png link=no]]\n"
-
-#~ msgid "<div class=\"tip\">\n"
-#~ msgstr "<div class=\"tip\">\n"
diff --git a/wiki/src/doc/anonymous_internet/Tor_status.fr.po b/wiki/src/doc/anonymous_internet/tor_status.fr.po
index 486db4a..34368a7 100644
--- a/wiki/src/doc/anonymous_internet/Tor_status.fr.po
+++ b/wiki/src/doc/anonymous_internet/tor_status.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-03-07 18:54+0100\n"
+"POT-Creation-Date: 2016-05-05 18:08+0200\n"
"PO-Revision-Date: 2014-05-11 13:23-0000\n"
"Last-Translator: amnesia <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Viewing the status of Tor\"]]\n"
+msgid "[[!meta title=\"Viewing the status and circuits of Tor\"]]\n"
msgstr ""
#. type: Plain text
@@ -34,8 +34,9 @@ msgid "[[!toc levels=1]]\n"
msgstr "[[!toc levels=1]]\n"
#. type: Title =
-#, no-wrap
-msgid "Status icon\n"
+#, fuzzy, no-wrap
+#| msgid "Status icon\n"
+msgid "Tor status icon\n"
msgstr "Icônes de statut\n"
#. type: Plain text
@@ -45,7 +46,8 @@ msgstr "Icônes de statut\n"
#| "the\n"
#| "notification area:\n"
msgid ""
-"The current status of Tor appears as an onion icon in the notification area:"
+"The current status of Tor appears as an onion-shaped icon in the "
+"notification area:"
msgstr ""
"<span class=\"application\">Vidalia</span> apparaît comme un icône d'oignon\n"
"dans la zone de notifications :\n"
@@ -57,41 +59,38 @@ msgid "[[!img doc/first_steps/introduction_to_gnome_and_the_tails_desktop/tor-st
msgstr "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/tor-starting.png link=no]]\n"
#. type: Bullet: ' - '
-#, fuzzy
-#| msgid ""
-#| "<div class=\"text\"><strong>The onion icon is green</strong> when you are "
-#| "connected\n"
-#| "to Tor.</div>\n"
-#| "</div>\n"
-msgid "The onion icon is not crossed out when you are connected to Tor."
+msgid ""
+"[[!img tor-connected.png alt=\"Onion-shaped icon\" link=no class=symbolic]] "
+"You are connected to Tor."
msgstr ""
-"<div class=\"text\"><strong>L'icône de l'oignon est vert</strong> quand vous "
-"êtes connecté\n"
-"à Tor.</div>\n"
-"</div>\n"
#. type: Bullet: ' - '
+msgid ""
+"[[!img tor-disconnected.png alt=\"Onion-shaped icon crossed out\" link=no "
+"class=\"symbolic\"]] You are not connected to Tor."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"tip\">\n"
+msgstr "<div class=\"tip\">\n"
+
+#. type: Plain text
#, fuzzy
#| msgid ""
-#| "<div class=\"text\"><strong>The onion icon is crossed out</strong> when "
-#| "Tor is\n"
-#| "stopped.\n"
-#| "</div>\n"
-msgid "The onion icon is crossed out while Tor is stopped or starting."
+#| "When Tor is stopped all connections to the Internet are blocked by "
+#| "default."
+msgid ""
+"When you are not connected to Tor, all connections to the Internet are "
+"blocked by default."
msgstr ""
-"<div class=\"text\"><strong>L'icône d'oignon est barré</strong> quand Tor "
-"est\n"
-"arrêté.\n"
-"</div>\n"
+"Lorsque Tor est arrêté toutes les connexions à internet son bloquées par "
+"défaut."
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid "When Tor is stopped all connections to the Internet are blocked by default."
-msgid ""
-" <div class=\"tip\">\n"
-" <p>When Tor is stopped all connections to the Internet are blocked by default.</p>\n"
-" </div>\n"
-msgstr "Lorsque Tor est arrêté toutes les connexions à internet son bloquées par défaut."
+#, no-wrap
+msgid "</div>\n"
+msgstr "</div>\n"
#. type: Plain text
#, fuzzy, no-wrap
@@ -111,7 +110,7 @@ msgstr ""
#| "the available Tor relays and your established circuits and connections:\n"
msgid ""
"<span class=\"application\">Onion Circuits</span> displays information about\n"
-"your established Tor circuits and connections.\n"
+"the current Tor circuits and connections.\n"
msgstr ""
"La fonction de <span class=\"guilabel\">Carte du réseau</span> affiche des informations à\n"
"propos des relais Tor disponibles, des circuits et connexions établis :\n"
@@ -120,20 +119,60 @@ msgstr ""
#, no-wrap
msgid ""
"To open <span class=\"application\">Onion Circuits</span>, click on the\n"
-"onion icon and choose <span class=\"guimenuitem\">Open Onion\n"
+"Tor status icon and choose <span class=\"guimenuitem\">Open Onion\n"
"Circuits</span>.\n"
msgstr ""
#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<!-- Note for translators: the entry guard in use when you take the screenshot\n"
+#| "network_map.png is in a position to identify you. You might prefer to leave it\n"
+#| "untranslated.-->\n"
+msgid ""
+"<!-- Note for translators: the entry guard in use when you take the screenshot\n"
+"onion-circuits.png is in a position to identify you. You might prefer to leave it\n"
+"untranslated.-->\n"
+msgstr ""
+"<!-- Note for translators: the entry guard in use when you take the screenshot\n"
+"network_map.png is in a position to identify you. You might prefer to leave it\n"
+"untranslated.-->\n"
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "[[!img vidalia/network_map.png link=no]]\n"
+msgid "[[!img tor_status/onion-circuits.png link=no]]\n"
+msgstr "[[!img vidalia/network_map.png link=no]]\n"
+
+#. type: Plain text
+msgid ""
+"The circuits established by Tor are listed in the left pane. A Tor circuit "
+"is made of three relays:"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"The first relay or *entry guard*. If you configured a [[Tor bridge|"
+"first_steps/startup_options/bridge_mode]], your bridge is the first relay."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid "The second relay or *middle node*."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid "The exit node."
+msgstr ""
+
+#. type: Plain text
#, fuzzy
#| msgid ""
#| "In the bottom pane, there is a list of the [[circuits|about/"
#| "warning#exit_node]] established by Tor. When you connect to a destination "
#| "server, the connection appears in the list below the circuit it uses."
msgid ""
-"In the left pane, there is a list of the [[circuits|about/"
-"warning#exit_node]] established by Tor. When you connect to a destination "
-"server, the connection appears in the list below the circuit it uses."
+"When you connect to a destination server, for example when visiting a "
+"website, the connection appears in the list below the circuit it uses."
msgstr ""
"Dans la partie inférieure, une liste des [[circuits|about/"
"warning#exit_node]] établis par Tor. Lorsque vous vous connectez à un "
@@ -149,7 +188,7 @@ msgstr ""
#| " <span class=\"guilabel\">AxleRelay3</span>, and the exit node\n"
#| " <span class=\"guilabel\">DFRI3</span>.\n"
msgid ""
-"In the example below, the connection to\n"
+"In the example above, the connection to\n"
"<span class=\"code\">check.torproject.org</span> goes through the relays\n"
"<span class=\"guilabel\">Unnamed</span>,\n"
"<span class=\"guilabel\">betGamersTorRelay</span>, and the exit node\n"
@@ -162,54 +201,79 @@ msgstr ""
" <span class=\"guilabel\">DFRI3</span>.\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "If you click on a circuit, in the right pane are displayed technical "
+#| "details of the relays composing the circuit."
msgid ""
-"If you click on a circuit, in the right pane are displayed technical details "
-"of the relays composing the circuit."
+"If you click on a circuit, technical details about the relays of the circuit "
+"appear in the right pane."
msgstr ""
"Si vous cliquez sur un circuit, dans la partie de droite s'affichent les "
"détails techniques des relais composant ce circuit."
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<!-- Note for translators: the entry guard in use when you take the screenshot\n"
-#| "network_map.png is in a position to identify you. You might prefer to leave it\n"
-#| "untranslated.-->\n"
-msgid ""
-"<!-- Note for translators: the entry guard in use when you take the screenshot\n"
-"Onion_Circuits.png is in a position to identify you. You might prefer to leave it\n"
-"untranslated.-->\n"
+#, no-wrap
+msgid "[[!img doc/about/warning/htw2-tails.png link=no alt=\"Schematics of a connection to Tor with the client, the three relays, and the destination server.\"]]\n"
msgstr ""
-"<!-- Note for translators: the entry guard in use when you take the screenshot\n"
-"network_map.png is in a position to identify you. You might prefer to leave it\n"
-"untranslated.-->\n"
-#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid "[[!img vidalia/network_map.png link=no]]\n"
-msgid "[[!img Tor_status/Onion_Circuits.png link=no]]\n"
-msgstr "[[!img vidalia/network_map.png link=no]]\n"
+#, fuzzy
+#~| msgid ""
+#~| "<div class=\"text\"><strong>The onion icon is green</strong> when you "
+#~| "are connected\n"
+#~| "to Tor.</div>\n"
+#~| "</div>\n"
+#~ msgid "The onion icon is not crossed out when you are connected to Tor."
+#~ msgstr ""
+#~ "<div class=\"text\"><strong>L'icône de l'oignon est vert</strong> quand "
+#~ "vous êtes connecté\n"
+#~ "à Tor.</div>\n"
+#~ "</div>\n"
-#. type: Title =
-#, no-wrap
-msgid "Additional Tor configuration\n"
-msgstr "Configuration supplémentaire de Tor\n"
+#, fuzzy
+#~| msgid ""
+#~| "<div class=\"text\"><strong>The onion icon is crossed out</strong> when "
+#~| "Tor is\n"
+#~| "stopped.\n"
+#~| "</div>\n"
+#~ msgid "The onion icon is crossed out while Tor is stopped or starting."
+#~ msgstr ""
+#~ "<div class=\"text\"><strong>L'icône d'oignon est barré</strong> quand Tor "
+#~ "est\n"
+#~ "arrêté.\n"
+#~ "</div>\n"
-#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid "To configure bridges, firewall, or proxy settings [[select the corresponding option in <span class=\"application\">Tails Greeter</span> |first_steps/startup_options/bridge_mode]]."
-msgid ""
-"To configure bridges, firewall, or proxy settings [[select the corresponding\n"
-"option in <span class=\"application\">Tails Greeter</span>|first_steps/startup_options/bridge_mode]].\n"
-msgstr "Pour configurer des bridges, pare-feu, ou proxy [[sélectionner l'option correspondante dans <span class=\"application\">Tails Greeter</span> |first_steps/startup_options/bridge_mode]]."
+#~ msgid "Additional Tor configuration\n"
+#~ msgstr "Configuration supplémentaire de Tor\n"
+
+#, fuzzy
+#~| msgid ""
+#~| "To configure bridges, firewall, or proxy settings [[select the "
+#~| "corresponding option in <span class=\"application\">Tails Greeter</span> "
+#~| "|first_steps/startup_options/bridge_mode]]."
+#~ msgid ""
+#~ "To configure bridges, firewall, or proxy settings [[select the "
+#~ "corresponding\n"
+#~ "option in <span class=\"application\">Tails Greeter</span>|first_steps/"
+#~ "startup_options/bridge_mode]].\n"
+#~ msgstr ""
+#~ "Pour configurer des bridges, pare-feu, ou proxy [[sélectionner l'option "
+#~ "correspondante dans <span class=\"application\">Tails Greeter</span> |"
+#~ "first_steps/startup_options/bridge_mode]]."
#~ msgid "[[!meta title=\"Controlling Tor using Vidalia\"]]\n"
#~ msgstr "[[!meta title=\"Contrôler Tor grâce à Vidalia\"]]\n"
#, fuzzy
-#~| msgid "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/tor-on.png link=no]]\n"
-#~ msgid "[[!img doc/first_steps/introduction_to_gnome_and_the_tails_desktop/vidalia.png link=\"no\"]]\n"
-#~ msgstr "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/tor-on.png link=no]]\n"
+#~| msgid ""
+#~| "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/tor-on."
+#~| "png link=no]]\n"
+#~ msgid ""
+#~ "[[!img doc/first_steps/introduction_to_gnome_and_the_tails_desktop/"
+#~ "vidalia.png link=\"no\"]]\n"
+#~ msgstr ""
+#~ "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/tor-on.png "
+#~ "link=no]]\n"
#, fuzzy
#~| msgid ""
@@ -226,42 +290,63 @@ msgstr "Pour configurer des bridges, pare-feu, ou proxy [[sélectionner l'option
#, fuzzy
#~| msgid ""
-#~| "The <span class=\"application\">Vidalia</span> onion icon sometimes stays yellow\n"
+#~| "The <span class=\"application\">Vidalia</span> onion icon sometimes "
+#~| "stays yellow\n"
#~| "even if Tor is already started. If the <span class=\"guilabel\">Tor is\n"
-#~| "ready</span> notification appears or if you can browse the Internet using\n"
-#~| "<span class=\"application\">Tor Browser</span>, then Tor is started correctly.\n"
+#~| "ready</span> notification appears or if you can browse the Internet "
+#~| "using\n"
+#~| "<span class=\"application\">Tor Browser</span>, then Tor is started "
+#~| "correctly.\n"
#~ msgid ""
#~ " <div class=\"bug\">\n"
-#~ " <p>The <span class=\"application\">Vidalia</span> onion icon sometimes stays yellow\n"
-#~ " even if Tor is already started. If the <span class=\"guilabel\">Tor is\n"
-#~ " ready</span> notification appears or if you can browse the Internet using\n"
-#~ " <span class=\"application\">Tor Browser</span>, then Tor is started correctly.</p>\n"
+#~ " <p>The <span class=\"application\">Vidalia</span> onion icon "
+#~ "sometimes stays yellow\n"
+#~ " even if Tor is already started. If the <span class=\"guilabel\">Tor "
+#~ "is\n"
+#~ " ready</span> notification appears or if you can browse the Internet "
+#~ "using\n"
+#~ " <span class=\"application\">Tor Browser</span>, then Tor is started "
+#~ "correctly.</p>\n"
#~ msgstr ""
-#~ "L'icône d'oignon de <span class=\"application\">Vidalia</span> reste quelquefois jaune\n"
-#~ "même si Tor est déjà démarré. Si la notification <span class=\"guilabel\">Tor est\n"
-#~ "prêt</span> apparaît ou si vous pouvez naviguer sur Internet en utilisant le\n"
-#~ "<span class=\"application\">Navigateur Tor</span>, alors Tor est correctement démarré.\n"
+#~ "L'icône d'oignon de <span class=\"application\">Vidalia</span> reste "
+#~ "quelquefois jaune\n"
+#~ "même si Tor est déjà démarré. Si la notification <span class=\"guilabel"
+#~ "\">Tor est\n"
+#~ "prêt</span> apparaît ou si vous pouvez naviguer sur Internet en utilisant "
+#~ "le\n"
+#~ "<span class=\"application\">Navigateur Tor</span>, alors Tor est "
+#~ "correctement démarré.\n"
#, fuzzy
-#~| msgid "Tails has other protections that would prevent your from connecting to the Internet without going through Tor."
+#~| msgid ""
+#~| "Tails has other protections that would prevent your from connecting to "
+#~| "the Internet without going through Tor."
#~ msgid ""
-#~ " <p>Tails has other protections that would prevent you from connecting to the\n"
+#~ " <p>Tails has other protections that would prevent you from connecting "
+#~ "to the\n"
#~ " Internet without going through Tor.</p>\n"
#~ " </div>\n"
-#~ msgstr "Tails a d'autres protections qui vous empêcheraient de vous connecter à Internet sans passer par Tor."
+#~ msgstr ""
+#~ "Tails a d'autres protections qui vous empêcheraient de vous connecter à "
+#~ "Internet sans passer par Tor."
#~ msgid "Popup menu\n"
#~ msgstr "Menu contextuel\n"
#~ msgid ""
-#~ "To access more features of <span class=\"application\">Vidalia</span>, right-click\n"
+#~ "To access more features of <span class=\"application\">Vidalia</span>, "
+#~ "right-click\n"
#~ "on the onion icon to open its popup menu:\n"
#~ msgstr ""
-#~ "Pour accéder à plus de fonctionnalités de <span class=\"application\">Vidalia</span>, faire\n"
+#~ "Pour accéder à plus de fonctionnalités de <span class=\"application"
+#~ "\">Vidalia</span>, faire\n"
#~ "clique-droit sur l'icône d'oignon pour ouvrir son menu contextuel :\n"
-#~ msgid "[[!img vidalia/right-click_menu.png link=no alt=\"Vidalia popup menu\"]]\n"
-#~ msgstr "[[!img vidalia/right-click_menu.png link=no alt=\"menu contextuel de Vidalia\"]]\n"
+#~ msgid ""
+#~ "[[!img vidalia/right-click_menu.png link=no alt=\"Vidalia popup menu\"]]\n"
+#~ msgstr ""
+#~ "[[!img vidalia/right-click_menu.png link=no alt=\"menu contextuel de "
+#~ "Vidalia\"]]\n"
#~ msgid "The <span class=\"guilabel\">Network Map</span> feature\n"
#~ msgstr "La fonction de <span class=\"guilabel\">Carte du réseau</span>\n"
@@ -282,44 +367,63 @@ msgstr "Pour configurer des bridges, pare-feu, ou proxy [[sélectionner l'option
#~ "chaque circuit sont situés."
#~ msgid ""
-#~ " In the example below, the relay <span class=\"guilabel\">PiratenNDS2</span>\n"
-#~ " is in Germany, the relay <span class=\"guilabel\">AxleRelay3</span> is in the\n"
-#~ " USA, and the relay <span class=\"guilabel\">DFRI3</span> is in Sweden.\n"
+#~ " In the example below, the relay <span class=\"guilabel\">PiratenNDS2</"
+#~ "span>\n"
+#~ " is in Germany, the relay <span class=\"guilabel\">AxleRelay3</span> "
+#~ "is in the\n"
+#~ " USA, and the relay <span class=\"guilabel\">DFRI3</span> is in "
+#~ "Sweden.\n"
#~ msgstr ""
-#~ " Dans l'exemple ci-dessous, le relai <span class=\"guilabel\">PiratenNDS2</span>\n"
-#~ " est en Allemagne, le relai <span class=\"guilabel\">AxleRelay3</span> est aux\n"
-#~ " États-Unis, et le relai <span class=\"guilabel\">DFRI3</span> est un Suède.\n"
+#~ " Dans l'exemple ci-dessous, le relai <span class=\"guilabel"
+#~ "\">PiratenNDS2</span>\n"
+#~ " est en Allemagne, le relai <span class=\"guilabel\">AxleRelay3</span> "
+#~ "est aux\n"
+#~ " États-Unis, et le relai <span class=\"guilabel\">DFRI3</span> est un "
+#~ "Suède.\n"
#~ msgid "<a id=\"new_identity\"></a>\n"
#~ msgstr "<a id=\"new_identity\"></a>\n"
#~ msgid "<span class=\"guilabel\">New Identity</span> feature\n"
-#~ msgstr "La fonction <span class=\"guilabel\">Utiliser une nouvelle identité</span>\n"
+#~ msgstr ""
+#~ "La fonction <span class=\"guilabel\">Utiliser une nouvelle identité</"
+#~ "span>\n"
#~ msgid ""
-#~ "The <span class=\"guilabel\">New Identity</span> feature of Vidalia forces Tor\n"
+#~ "The <span class=\"guilabel\">New Identity</span> feature of Vidalia "
+#~ "forces Tor\n"
#~ "to use new circuits but only for new connections.\n"
#~ msgstr ""
-#~ "La fonction <span class=\"guilabel\">Utiliser une nouvelle identité</span> de Vidalia\n"
-#~ "force Tor à utiliser de nouveaux circuits, mais seulement pour les nouvelles connexions.\n"
+#~ "La fonction <span class=\"guilabel\">Utiliser une nouvelle identité</"
+#~ "span> de Vidalia\n"
+#~ "force Tor à utiliser de nouveaux circuits, mais seulement pour les "
+#~ "nouvelles connexions.\n"
#~ msgid "<div class=\"caution\">\n"
#~ msgstr "<div class=\"caution\">\n"
-#~ msgid "<p>This feature is not a good solution to [[separate contextual identities|about/warning#identities]], as:\n"
-#~ msgstr "<p>Cette fonctionnalité n'est *pas* une bonne solution pour [[séparer différentes identités contextuelles|about/warning#identities]], car:\n"
+#~ msgid ""
+#~ "<p>This feature is not a good solution to [[separate contextual "
+#~ "identities|about/warning#identities]], as:\n"
+#~ msgstr ""
+#~ "<p>Cette fonctionnalité n'est *pas* une bonne solution pour [[séparer "
+#~ "différentes identités contextuelles|about/warning#identities]], car:\n"
#~ msgid ""
#~ "<ul>\n"
#~ "<li>Already existing connections might stay open.</li>\n"
#~ "<li>Other sources of information can reveal your past activities, for\n"
-#~ "example the cookies stored in <span class=\"application\">Tor Browser</span> or the random nick in <span class=\"application\">Pidgin</span>.</li>\n"
+#~ "example the cookies stored in <span class=\"application\">Tor Browser</"
+#~ "span> or the random nick in <span class=\"application\">Pidgin</span>.</"
+#~ "li>\n"
#~ "</ul>\n"
#~ msgstr ""
#~ "<ul>\n"
#~ "<li>Des connexions existantes pourraient rester ouvertes.</li>\n"
-#~ "<li>D'autres sources d'informations peuvent révéler vos activités passées, par\n"
-#~ "exemple les cookies stockés dans le <span class=\"application\">Tor Browser</span>.</li>\n"
+#~ "<li>D'autres sources d'informations peuvent révéler vos activités "
+#~ "passées, par\n"
+#~ "exemple les cookies stockés dans le <span class=\"application\">Tor "
+#~ "Browser</span>.</li>\n"
#~ "</ul>\n"
#~ msgid "<p>Shutdown and restart Tails instead.</p>\n"
@@ -328,9 +432,6 @@ msgstr "Pour configurer des bridges, pare-feu, ou proxy [[sélectionner l'option
#~ msgid "</p>\n"
#~ msgstr "</p>\n"
-#~ msgid "</div>\n"
-#~ msgstr "</div>\n"
-
#~ msgid ""
#~ "It is impossible to edit the <span class=\"filename\">torrc</span> "
#~ "configuration file using <span class=\"application\">Vidalia</span>."
@@ -378,9 +479,6 @@ msgstr "Pour configurer des bridges, pare-feu, ou proxy [[sélectionner l'option
#~ "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/tor-off."
#~ "png link=no]]\n"
-#~ msgid "<div class=\"tip\">\n"
-#~ msgstr "<div class=\"tip\">\n"
-
#~ msgid ""
#~ "[[As explained on our warning page|about/warning#identities]], this "
#~ "feature of\n"
diff --git a/wiki/src/doc/anonymous_internet/tor_status.mdwn b/wiki/src/doc/anonymous_internet/tor_status.mdwn
new file mode 100644
index 0000000..4d46951
--- /dev/null
+++ b/wiki/src/doc/anonymous_internet/tor_status.mdwn
@@ -0,0 +1,65 @@
+[[!meta title="Viewing the status and circuits of Tor"]]
+
+The Tor status icon and <span class="application">Onion
+Circuits</span> allow you to view the status of Tor.
+
+[[!toc levels=1]]
+
+Tor status icon
+===============
+
+The current status of Tor appears as an onion-shaped icon in the
+notification area:
+
+[[!img doc/first_steps/introduction_to_gnome_and_the_tails_desktop/tor-status.png link="no"]]
+
+ - [[!img tor-connected.png alt="Onion-shaped icon" link=no class=symbolic]]
+ You are connected to Tor.
+
+ - [[!img tor-disconnected.png alt="Onion-shaped icon crossed out" link=no class="symbolic"]]
+ You are not connected to Tor.
+
+<div class="tip">
+
+When you are not connected to Tor, all connections to the Internet are blocked by default.
+
+</div>
+
+<a id="circuits"></a>
+
+<span class="application">Onion Circuits</span>
+===============================================
+
+<span class="application">Onion Circuits</span> displays information about
+the current Tor circuits and connections.
+
+To open <span class="application">Onion Circuits</span>, click on the
+Tor status icon and choose <span class="guimenuitem">Open Onion
+Circuits</span>.
+
+<!-- Note for translators: the entry guard in use when you take the screenshot
+onion-circuits.png is in a position to identify you. You might prefer to leave it
+untranslated.-->
+
+[[!img tor_status/onion-circuits.png link=no]]
+
+The circuits established by Tor are listed in the left pane. A Tor circuit is
+made of three relays:
+
+ - The first relay or *entry guard*. If you configured a [[Tor bridge|first_steps/startup_options/bridge_mode]], your bridge is the first relay.
+ - The second relay or *middle node*.
+ - The exit node.
+
+When you connect to
+a destination server, for example when visiting a website, the connection appears in the list below the circuit
+it uses.
+
+In the example above, the connection to
+<span class="code">check.torproject.org</span> goes through the relays
+<span class="guilabel">Unnamed</span>,
+<span class="guilabel">betGamersTorRelay</span>, and the exit node
+<span class="guilabel">hessel0</span>.
+
+If you click on a circuit, technical details about the relays of the circuit appear in the right pane.
+
+[[!img doc/about/warning/htw2-tails.png link=no alt="Schematics of a connection to Tor with the client, the three relays, and the destination server."]]
diff --git a/wiki/src/doc/anonymous_internet/Tor_status.pt.po b/wiki/src/doc/anonymous_internet/tor_status.pt.po
index 221cee3..839728e 100644
--- a/wiki/src/doc/anonymous_internet/Tor_status.pt.po
+++ b/wiki/src/doc/anonymous_internet/tor_status.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-03-07 18:54+0100\n"
+"POT-Creation-Date: 2016-05-05 18:08+0200\n"
"PO-Revision-Date: 2014-08-26 15:47-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Viewing the status of Tor\"]]\n"
+msgid "[[!meta title=\"Viewing the status and circuits of Tor\"]]\n"
msgstr ""
#. type: Plain text
@@ -33,8 +33,9 @@ msgid "[[!toc levels=1]]\n"
msgstr "[[!toc levels=1]]\n"
#. type: Title =
-#, no-wrap
-msgid "Status icon\n"
+#, fuzzy, no-wrap
+#| msgid "Status icon\n"
+msgid "Tor status icon\n"
msgstr "Ícone de estado\n"
#. type: Plain text
@@ -44,7 +45,8 @@ msgstr "Ícone de estado\n"
#| "the\n"
#| "notification area:\n"
msgid ""
-"The current status of Tor appears as an onion icon in the notification area:"
+"The current status of Tor appears as an onion-shaped icon in the "
+"notification area:"
msgstr ""
"O <span class=\"application\">Vidalia</span> aparece como um ícone de uma\n"
"cebola na área de notificação:\n"
@@ -56,41 +58,38 @@ msgid "[[!img doc/first_steps/introduction_to_gnome_and_the_tails_desktop/tor-st
msgstr "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/tor-starting.png link=no]]\n"
#. type: Bullet: ' - '
-#, fuzzy
-#| msgid ""
-#| "<div class=\"text\"><strong>The onion icon is green</strong> when you are "
-#| "connected\n"
-#| "to Tor.</div>\n"
-#| "</div>\n"
-msgid "The onion icon is not crossed out when you are connected to Tor."
+msgid ""
+"[[!img tor-connected.png alt=\"Onion-shaped icon\" link=no class=symbolic]] "
+"You are connected to Tor."
msgstr ""
-"<div class=\"text\"><strong>O ícone da cebola fica verde</strong> quando "
-"você está conectado/a\n"
-"ao Tor.</div>\n"
-"</div>\n"
#. type: Bullet: ' - '
+msgid ""
+"[[!img tor-disconnected.png alt=\"Onion-shaped icon crossed out\" link=no "
+"class=\"symbolic\"]] You are not connected to Tor."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"tip\">\n"
+msgstr "<div class=\"tip\">\n"
+
+#. type: Plain text
#, fuzzy
#| msgid ""
-#| "<div class=\"text\"><strong>The onion icon is crossed out</strong> when "
-#| "Tor is\n"
-#| "stopped.\n"
-#| "</div>\n"
-msgid "The onion icon is crossed out while Tor is stopped or starting."
+#| "When Tor is stopped all connections to the Internet are blocked by "
+#| "default."
+msgid ""
+"When you are not connected to Tor, all connections to the Internet are "
+"blocked by default."
msgstr ""
-"<div class=\"text\"><strong>O ícone de cebola fica riscado com um X</strong> "
-"quando o Tor\n"
-"está parado.\n"
-"</div>\n"
+"Quando o Tor está parado, todas as conexões à Internet são bloqueadas por "
+"padrão."
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid "When Tor is stopped all connections to the Internet are blocked by default."
-msgid ""
-" <div class=\"tip\">\n"
-" <p>When Tor is stopped all connections to the Internet are blocked by default.</p>\n"
-" </div>\n"
-msgstr "Quando o Tor está parado, todas as conexões à Internet são bloqueadas por padrão."
+#, no-wrap
+msgid "</div>\n"
+msgstr "</div>\n"
#. type: Plain text
#, no-wrap
@@ -109,7 +108,7 @@ msgstr ""
#| "the available Tor relays and your established circuits and connections:\n"
msgid ""
"<span class=\"application\">Onion Circuits</span> displays information about\n"
-"your established Tor circuits and connections.\n"
+"the current Tor circuits and connections.\n"
msgstr ""
"A funcionalidade <span class=\"guilabel\">Mapa da Rede</span> mostra informações sobre\n"
"os repetidores disponíveis e seus circuitos e conexões estabelecidos:\n"
@@ -118,20 +117,60 @@ msgstr ""
#, no-wrap
msgid ""
"To open <span class=\"application\">Onion Circuits</span>, click on the\n"
-"onion icon and choose <span class=\"guimenuitem\">Open Onion\n"
+"Tor status icon and choose <span class=\"guimenuitem\">Open Onion\n"
"Circuits</span>.\n"
msgstr ""
#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<!-- Note for translators: the entry guard in use when you take the screenshot\n"
+#| "network_map.png is in a position to identify you. You might prefer to leave it\n"
+#| "untranslated.-->\n"
+msgid ""
+"<!-- Note for translators: the entry guard in use when you take the screenshot\n"
+"onion-circuits.png is in a position to identify you. You might prefer to leave it\n"
+"untranslated.-->\n"
+msgstr ""
+"<!-- Nota para tradutores/as: a guarda de entrada usada quando você tira um screenshot\n"
+"network_map.png pode identificar você. Você pode preferir deixá-la não\n"
+"traduzida.-->\n"
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "[[!img vidalia/network_map.png link=no]]\n"
+msgid "[[!img tor_status/onion-circuits.png link=no]]\n"
+msgstr "[[!img vidalia/network_map.png link=no]]\n"
+
+#. type: Plain text
+msgid ""
+"The circuits established by Tor are listed in the left pane. A Tor circuit "
+"is made of three relays:"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid ""
+"The first relay or *entry guard*. If you configured a [[Tor bridge|"
+"first_steps/startup_options/bridge_mode]], your bridge is the first relay."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid "The second relay or *middle node*."
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid "The exit node."
+msgstr ""
+
+#. type: Plain text
#, fuzzy
#| msgid ""
#| "In the bottom pane, there is a list of the [[circuits|about/"
#| "warning#exit_node]] established by Tor. When you connect to a destination "
#| "server, the connection appears in the list below the circuit it uses."
msgid ""
-"In the left pane, there is a list of the [[circuits|about/"
-"warning#exit_node]] established by Tor. When you connect to a destination "
-"server, the connection appears in the list below the circuit it uses."
+"When you connect to a destination server, for example when visiting a "
+"website, the connection appears in the list below the circuit it uses."
msgstr ""
"No painel inferior há uma lista dos [[circuitos|about/warning#exit_node]] "
"estabelecidos pelo Tor. Quando você se conecta a um servidor de destino, a "
@@ -146,7 +185,7 @@ msgstr ""
#| " <span class=\"guilabel\">AxleRelay3</span>, and the exit node\n"
#| " <span class=\"guilabel\">DFRI3</span>.\n"
msgid ""
-"In the example below, the connection to\n"
+"In the example above, the connection to\n"
"<span class=\"code\">check.torproject.org</span> goes through the relays\n"
"<span class=\"guilabel\">Unnamed</span>,\n"
"<span class=\"guilabel\">betGamersTorRelay</span>, and the exit node\n"
@@ -159,54 +198,79 @@ msgstr ""
" <span class=\"guilabel\">DFRI3</span>.\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "If you click on a circuit, in the right pane are displayed technical "
+#| "details of the relays composing the circuit."
msgid ""
-"If you click on a circuit, in the right pane are displayed technical details "
-"of the relays composing the circuit."
+"If you click on a circuit, technical details about the relays of the circuit "
+"appear in the right pane."
msgstr ""
"Se você clicar em um circuido, no painel direito serão mostrados os detalhes "
"técnicos dos repetidores que compõe o circuito."
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<!-- Note for translators: the entry guard in use when you take the screenshot\n"
-#| "network_map.png is in a position to identify you. You might prefer to leave it\n"
-#| "untranslated.-->\n"
-msgid ""
-"<!-- Note for translators: the entry guard in use when you take the screenshot\n"
-"Onion_Circuits.png is in a position to identify you. You might prefer to leave it\n"
-"untranslated.-->\n"
+#, no-wrap
+msgid "[[!img doc/about/warning/htw2-tails.png link=no alt=\"Schematics of a connection to Tor with the client, the three relays, and the destination server.\"]]\n"
msgstr ""
-"<!-- Nota para tradutores/as: a guarda de entrada usada quando você tira um screenshot\n"
-"network_map.png pode identificar você. Você pode preferir deixá-la não\n"
-"traduzida.-->\n"
-#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid "[[!img vidalia/network_map.png link=no]]\n"
-msgid "[[!img Tor_status/Onion_Circuits.png link=no]]\n"
-msgstr "[[!img vidalia/network_map.png link=no]]\n"
+#, fuzzy
+#~| msgid ""
+#~| "<div class=\"text\"><strong>The onion icon is green</strong> when you "
+#~| "are connected\n"
+#~| "to Tor.</div>\n"
+#~| "</div>\n"
+#~ msgid "The onion icon is not crossed out when you are connected to Tor."
+#~ msgstr ""
+#~ "<div class=\"text\"><strong>O ícone da cebola fica verde</strong> quando "
+#~ "você está conectado/a\n"
+#~ "ao Tor.</div>\n"
+#~ "</div>\n"
-#. type: Title =
-#, no-wrap
-msgid "Additional Tor configuration\n"
-msgstr "Configurações adicionais do Tor\n"
+#, fuzzy
+#~| msgid ""
+#~| "<div class=\"text\"><strong>The onion icon is crossed out</strong> when "
+#~| "Tor is\n"
+#~| "stopped.\n"
+#~| "</div>\n"
+#~ msgid "The onion icon is crossed out while Tor is stopped or starting."
+#~ msgstr ""
+#~ "<div class=\"text\"><strong>O ícone de cebola fica riscado com um X</"
+#~ "strong> quando o Tor\n"
+#~ "está parado.\n"
+#~ "</div>\n"
-#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid "To configure bridges, firewall, or proxy settings [[select the corresponding option in <span class=\"application\">Tails Greeter</span> |first_steps/startup_options/bridge_mode]]."
-msgid ""
-"To configure bridges, firewall, or proxy settings [[select the corresponding\n"
-"option in <span class=\"application\">Tails Greeter</span>|first_steps/startup_options/bridge_mode]].\n"
-msgstr "Para configurar pontes (bridges), firewall ou proxy, [[selecione a opção correspondente no <span class=\"application\">Tails Greeter</span>|first_steps/startup_options/bridge_mode]]."
+#~ msgid "Additional Tor configuration\n"
+#~ msgstr "Configurações adicionais do Tor\n"
+
+#, fuzzy
+#~| msgid ""
+#~| "To configure bridges, firewall, or proxy settings [[select the "
+#~| "corresponding option in <span class=\"application\">Tails Greeter</span> "
+#~| "|first_steps/startup_options/bridge_mode]]."
+#~ msgid ""
+#~ "To configure bridges, firewall, or proxy settings [[select the "
+#~ "corresponding\n"
+#~ "option in <span class=\"application\">Tails Greeter</span>|first_steps/"
+#~ "startup_options/bridge_mode]].\n"
+#~ msgstr ""
+#~ "Para configurar pontes (bridges), firewall ou proxy, [[selecione a opção "
+#~ "correspondente no <span class=\"application\">Tails Greeter</span>|"
+#~ "first_steps/startup_options/bridge_mode]]."
#~ msgid "[[!meta title=\"Controlling Tor using Vidalia\"]]\n"
#~ msgstr "[[!meta title=\"Controlando o Tor com Vidalia\"]]\n"
#, fuzzy
-#~| msgid "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/tor-on.png link=no]]\n"
-#~ msgid "[[!img doc/first_steps/introduction_to_gnome_and_the_tails_desktop/vidalia.png link=\"no\"]]\n"
-#~ msgstr "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/tor-on.png link=no]]\n"
+#~| msgid ""
+#~| "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/tor-on."
+#~| "png link=no]]\n"
+#~ msgid ""
+#~ "[[!img doc/first_steps/introduction_to_gnome_and_the_tails_desktop/"
+#~ "vidalia.png link=\"no\"]]\n"
+#~ msgstr ""
+#~ "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/tor-on.png "
+#~ "link=no]]\n"
#, fuzzy
#~| msgid ""
@@ -223,42 +287,62 @@ msgstr "Para configurar pontes (bridges), firewall ou proxy, [[selecione a opç
#, fuzzy
#~| msgid ""
-#~| "The <span class=\"application\">Vidalia</span> onion icon sometimes stays yellow\n"
+#~| "The <span class=\"application\">Vidalia</span> onion icon sometimes "
+#~| "stays yellow\n"
#~| "even if Tor is already started. If the <span class=\"guilabel\">Tor is\n"
-#~| "ready</span> notification appears or if you can browse the Internet using the\n"
-#~| "<span class=\"application\">Tor Browser</span>, then Tor is started correctly.\n"
+#~| "ready</span> notification appears or if you can browse the Internet "
+#~| "using the\n"
+#~| "<span class=\"application\">Tor Browser</span>, then Tor is started "
+#~| "correctly.\n"
#~ msgid ""
#~ " <div class=\"bug\">\n"
-#~ " <p>The <span class=\"application\">Vidalia</span> onion icon sometimes stays yellow\n"
-#~ " even if Tor is already started. If the <span class=\"guilabel\">Tor is\n"
-#~ " ready</span> notification appears or if you can browse the Internet using\n"
-#~ " <span class=\"application\">Tor Browser</span>, then Tor is started correctly.</p>\n"
+#~ " <p>The <span class=\"application\">Vidalia</span> onion icon "
+#~ "sometimes stays yellow\n"
+#~ " even if Tor is already started. If the <span class=\"guilabel\">Tor "
+#~ "is\n"
+#~ " ready</span> notification appears or if you can browse the Internet "
+#~ "using\n"
+#~ " <span class=\"application\">Tor Browser</span>, then Tor is started "
+#~ "correctly.</p>\n"
#~ msgstr ""
-#~ "O ícone do <span class=\"application\">Vidalia</span> algumas vezes fica amarelo\n"
-#~ "mesmo depois do Tor ter iniciado. Se a notificação <span class=\"guilabel\">Tor está\n"
+#~ "O ícone do <span class=\"application\">Vidalia</span> algumas vezes fica "
+#~ "amarelo\n"
+#~ "mesmo depois do Tor ter iniciado. Se a notificação <span class=\"guilabel"
+#~ "\">Tor está\n"
#~ "pronto</span> aparecer ou se você consegue navegar na Internet usando o\n"
-#~ "<span class=\"application\">Navegador Tor</span>, então o Tor foi iniciado corretamente.\n"
+#~ "<span class=\"application\">Navegador Tor</span>, então o Tor foi "
+#~ "iniciado corretamente.\n"
#, fuzzy
-#~| msgid "Tails has other protections that would prevent your from connecting to the Internet without going through Tor."
+#~| msgid ""
+#~| "Tails has other protections that would prevent your from connecting to "
+#~| "the Internet without going through Tor."
#~ msgid ""
-#~ " <p>Tails has other protections that would prevent you from connecting to the\n"
+#~ " <p>Tails has other protections that would prevent you from connecting "
+#~ "to the\n"
#~ " Internet without going through Tor.</p>\n"
#~ " </div>\n"
-#~ msgstr "O Tails possui outras proteções que evitariam que você se conectasse à Internet sem que estivesse passando pela rede Tor."
+#~ msgstr ""
+#~ "O Tails possui outras proteções que evitariam que você se conectasse à "
+#~ "Internet sem que estivesse passando pela rede Tor."
#~ msgid "Popup menu\n"
#~ msgstr "Menu de opções\n"
#~ msgid ""
-#~ "To access more features of <span class=\"application\">Vidalia</span>, right-click\n"
+#~ "To access more features of <span class=\"application\">Vidalia</span>, "
+#~ "right-click\n"
#~ "on the onion icon to open its popup menu:\n"
#~ msgstr ""
-#~ "Para acessar mais funcionalidades do <span class=\"application\">Vidalia</span>, clique\n"
+#~ "Para acessar mais funcionalidades do <span class=\"application\">Vidalia</"
+#~ "span>, clique\n"
#~ "com o botão direito no ícone da cebola para abrir o menu de opções:\n"
-#~ msgid "[[!img vidalia/right-click_menu.png link=no alt=\"Vidalia popup menu\"]]\n"
-#~ msgstr "[[!img vidalia/right-click_menu.png link=no alt=\"Menu de opções do Vidalia\"]]\n"
+#~ msgid ""
+#~ "[[!img vidalia/right-click_menu.png link=no alt=\"Vidalia popup menu\"]]\n"
+#~ msgstr ""
+#~ "[[!img vidalia/right-click_menu.png link=no alt=\"Menu de opções do "
+#~ "Vidalia\"]]\n"
#~ msgid "The <span class=\"guilabel\">Network Map</span> feature\n"
#~ msgstr "A funcionalidade <span class=\"guilabel\">Mapa da Rede</span>\n"
@@ -279,13 +363,19 @@ msgstr "Para configurar pontes (bridges), firewall ou proxy, [[selecione a opç
#~ "circuito estão localizados."
#~ msgid ""
-#~ " In the example below, the relay <span class=\"guilabel\">PiratenNDS2</span>\n"
-#~ " is in Germany, the relay <span class=\"guilabel\">AxleRelay3</span> is in the\n"
-#~ " USA, and the relay <span class=\"guilabel\">DFRI3</span> is in Sweden.\n"
+#~ " In the example below, the relay <span class=\"guilabel\">PiratenNDS2</"
+#~ "span>\n"
+#~ " is in Germany, the relay <span class=\"guilabel\">AxleRelay3</span> "
+#~ "is in the\n"
+#~ " USA, and the relay <span class=\"guilabel\">DFRI3</span> is in "
+#~ "Sweden.\n"
#~ msgstr ""
-#~ " No exemplo abaixo, o repetidor <span class=\"guilabel\">PiratenNDS2</span>\n"
-#~ " está na alemanha, o repetidor <span class=\"guilabel\">AxleRelay3</span> está\n"
-#~ " nos EUA e o repetidor <span class=\"guilabel\">DFRI3</span> está na Suécia.\n"
+#~ " No exemplo abaixo, o repetidor <span class=\"guilabel\">PiratenNDS2</"
+#~ "span>\n"
+#~ " está na alemanha, o repetidor <span class=\"guilabel\">AxleRelay3</"
+#~ "span> está\n"
+#~ " nos EUA e o repetidor <span class=\"guilabel\">DFRI3</span> está na "
+#~ "Suécia.\n"
#, fuzzy
#~| msgid "The <span class=\"guilabel\">New Identity</span> feature\n"
@@ -294,21 +384,21 @@ msgstr "Para configurar pontes (bridges), firewall ou proxy, [[selecione a opç
#, fuzzy
#~| msgid ""
-#~| "The <span class=\"guilabel\">Network Map</span> feature displays information about\n"
+#~| "The <span class=\"guilabel\">Network Map</span> feature displays "
+#~| "information about\n"
#~| "the available Tor relays and your established circuits and connections:\n"
#~ msgid ""
-#~ "The <span class=\"guilabel\">New Identity</span> feature of Vidalia forces Tor\n"
+#~ "The <span class=\"guilabel\">New Identity</span> feature of Vidalia "
+#~ "forces Tor\n"
#~ "to use new circuits but only for new connections.\n"
#~ msgstr ""
-#~ "A funcionalidade <span class=\"guilabel\">Mapa da Rede</span> mostra informações sobre\n"
+#~ "A funcionalidade <span class=\"guilabel\">Mapa da Rede</span> mostra "
+#~ "informações sobre\n"
#~ "os repetidores disponíveis e seus circuitos e conexões estabelecidos:\n"
#~ msgid "<div class=\"caution\">\n"
#~ msgstr "<div class=\"caution\">\n"
-#~ msgid "</div>\n"
-#~ msgstr "</div>\n"
-
#, fuzzy
#~| msgid ""
#~| "It is impossible to edit the <span class=\"filename\">torrc</span> "
@@ -367,9 +457,6 @@ msgstr "Para configurar pontes (bridges), firewall ou proxy, [[selecione a opç
#~ "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/tor-off."
#~ "png link=no]]\n"
-#~ msgid "<div class=\"tip\">\n"
-#~ msgstr "<div class=\"tip\">\n"
-
#~ msgid ""
#~ "[[As explained on our warning page|about/warning#identities]], this "
#~ "feature of\n"
diff --git a/wiki/src/doc/anonymous_internet/Tor_status/Onion_Circuits.png b/wiki/src/doc/anonymous_internet/tor_status/onion-circuits.png
index 03db6d7..03db6d7 100644
--- a/wiki/src/doc/anonymous_internet/Tor_status/Onion_Circuits.png
+++ b/wiki/src/doc/anonymous_internet/tor_status/onion-circuits.png
Binary files differ
diff --git a/wiki/src/doc/anonymous_internet/tor_status/tor-connected.png b/wiki/src/doc/anonymous_internet/tor_status/tor-connected.png
new file mode 100644
index 0000000..1dc526e
--- /dev/null
+++ b/wiki/src/doc/anonymous_internet/tor_status/tor-connected.png
Binary files differ
diff --git a/wiki/src/doc/anonymous_internet/tor_status/tor-disconnected.png b/wiki/src/doc/anonymous_internet/tor_status/tor-disconnected.png
new file mode 100644
index 0000000..b63d127
--- /dev/null
+++ b/wiki/src/doc/anonymous_internet/tor_status/tor-disconnected.png
Binary files differ
diff --git a/wiki/src/doc/encryption_and_privacy/secure_deletion.de.po b/wiki/src/doc/encryption_and_privacy/secure_deletion.de.po
index 65b4a1a..00e23bd 100644
--- a/wiki/src/doc/encryption_and_privacy/secure_deletion.de.po
+++ b/wiki/src/doc/encryption_and_privacy/secure_deletion.de.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: 2016-02-07 17:54+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"
+"PO-Revision-Date: 2016-04-06 16:27+0200\n"
+"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Last-Translator: Tails translators <tails@boum.org>\n"
+"Language-Team: \n"
+"X-Generator: Poedit 1.8.7.1\n"
#. type: Plain text
#, no-wrap
msgid "[[!meta title=\"Securely delete files and clean diskspace\"]]\n"
-msgstr ""
+msgstr "[[!meta title=\"Dateien sicher löschen und Speicherplatz bereinigen\"]]\n"
#. type: Plain text
#, no-wrap
msgid "[[!toc levels=1]]\n"
-msgstr ""
+msgstr "[[!toc levels=1]]\n"
#. type: Plain text
#, no-wrap
msgid "<a id=\"why\"></a>\n"
-msgstr ""
+msgstr "<a id=\"why\"></a>\n"
#. type: Title =
#, no-wrap
msgid "Why use secure deletion?\n"
-msgstr ""
+msgstr "Warum sicheres Löschen verwenden?\n"
#. type: Plain text
#, no-wrap
@@ -43,6 +43,9 @@ msgid ""
"deleted**, even after emptying the trash or explicitly removing the file, from\n"
"the command line for example.\n"
msgstr ""
+"**Betriebssysteme löschen nicht wirklich den Inhalt einer Datei, wenn diese\n"
+"gelöscht wird**, auch nicht, nachdem der Papierkorb entleert wurde oder die Datei\n"
+"explizit entfernt wurde, zum Beispiel über die Kommandozeile.\n"
#. type: Plain text
msgid ""
@@ -51,6 +54,11 @@ msgid ""
"file—the actual data—remain on the storage medium. The data will remain "
"there until the operating system reuses the space for new data."
msgstr ""
+"Stattdessen werden die Einträge der Datei im Verzeichnis des Dateisystems "
+"gelöscht, weil das weniger Arbeit in Anspruch nimmt und deswegen schneller "
+"ist. Die Inhalte der Datei —die eigentlichen Daten— verbleiben auf dem "
+"Speichermedium. Die Daten werden dort verbleiben, bis das Betriebssystem den "
+"Platz für neue Daten verwendet."
#. type: Plain text
msgid ""
@@ -59,6 +67,11 @@ msgid ""
"disk to appear empty or, in the case of reimaging, empty except for the "
"files present in the image, to most software."
msgstr ""
+"Gleichermaßen garantiert das Neuformatieren, Neupartitionieren oder "
+"Neueinspielen eines Abbildes eines Systems nicht, dass auf jeden Bereich des "
+"Laufwerks geschrieben wird, obwohl dies alles das Laufwerk in den meisten "
+"Programmen als leer erscheinen lässt oder im Falle des Neueinspielens eines "
+"Abbildes leer bis auf die Dateien, die im Abbild enthalten sind."
#. type: Plain text
msgid ""
@@ -69,6 +82,12 @@ msgid ""
"such as disassembling the device and directly accessing/reading from its "
"components."
msgstr ""
+"Auch wenn das Speichermedium letztlich überschrieben wird, könnten es die "
+"physikalischen Eigenschaften des Mediums ermöglichen, die vorherigen Inhalte "
+"wiederherzustellen. Allerdings ist dieses Wiederherstellen in den meisten "
+"Fällen nicht durch das einfache Auslesen auf die übliche Art möglich, "
+"sondern benötigt Labortechnologie, wie das Zerlegen des Mediums und direkten "
+"Zugriff bzw. Lesen von den Komponenten."
#. type: Plain text
#, no-wrap
@@ -76,16 +95,18 @@ msgid ""
"<p class=\"quoted-from\">Quoted from [[!wikipedia Secure_file_deletion\n"
"desc=\"Wikipedia: %s\"]].</p>\n"
msgstr ""
+"<p class=\"quoted-from\">Zitiert von [[!wikipedia Secure_file_deletion\n"
+"desc=\"Wikipedia: %s\"]].</p>\n"
#. type: Plain text
#, no-wrap
msgid "<a id=\"usb_and_ssd\"></a>\n"
-msgstr ""
+msgstr "<a id=\"usb_and_ssd\"></a>\n"
#. type: Title =
#, no-wrap
msgid "Warning about USB sticks and solid-state disks\n"
-msgstr ""
+msgstr "Warnung bezüglich USB-Sticks und Solid-State-Disks\n"
#. type: Plain text
#, no-wrap
@@ -93,23 +114,29 @@ msgid ""
"**The methods described below will not work as expected on USB sticks and\n"
"solid-state disks.**\n"
msgstr ""
+"**Die unten beschriebenen Vorgehensweisen werden auf USB-Sticks\n"
+"und Solid-State-Disks nicht wie erwartet funktionieren**\n"
#. type: Bullet: '- '
msgid ""
"The existing hard disk-oriented techniques for secure deletion of individual "
"files are not effective."
msgstr ""
+"Die bekannten, an Festplatten orientierten Vorgehensweisen für sicheres "
+"Löschen einzelner Dateien funktionieren nicht."
#. type: Bullet: '- '
msgid ""
"Overwriting twice the entire disk is usually, but not always, sufficient to "
"securely clean the disk."
msgstr ""
+"Das gesamte Laufwerk zweimal zu überschreiben ist meistens, aber nicht "
+"immer, ausreichend, um das Laufwerk sicher zu bereinigen."
#. type: Plain text
#, no-wrap
msgid "<div class=\"caution\">\n"
-msgstr ""
+msgstr "<div class=\"caution\">\n"
#. type: Plain text
#, no-wrap
@@ -117,28 +144,35 @@ msgid ""
"<p>Unfortunately, Tails does not currently allow you to perform this task\n"
"with graphical tools. See [[!tails_ticket 5323]].</p>\n"
msgstr ""
+"<p>Leider ist es derzeit in Tails unmöglich, diese Aufgabe\n"
+"mit grafischen Werkzeugen zu erledigen. Lesen Sie hierzu [[!tails_ticket 5323]].</p>\n"
#. type: Plain text
#, no-wrap
msgid "</div>\n"
-msgstr ""
+msgstr "</div>\n"
#. type: Plain text
msgid ""
"For more details read the corresponding section of the Wikipedia article on "
"[[!wikipedia Data_erasure#Limitations desc=\"Data erasure\"]]."
msgstr ""
+"Für mehr Details lesen Sie den entsprechenden Abschnitt des Wikipedia-"
+"Artikels zum [[!wikipedia Data_erasure#Limitations desc=\"Löschen von "
+"Dateien (englisch)\"]]."
#. type: Title =
#, no-wrap
msgid "Securely delete files\n"
-msgstr ""
+msgstr "Dateien sicher löschen\n"
#. type: Plain text
msgid ""
"In Tails you can securely delete files thanks to an [extension of the file "
"browser](http://wipetools.tuxfamily.org/nautilus-wipe.html)."
msgstr ""
+"In Tails können Sie Dateien mit einer [Erweiterung des Dateimanagers](http://"
+"wipetools.tuxfamily.org/nautilus-wipe.html) sicher löschen."
#. type: Plain text
#, no-wrap
@@ -147,28 +181,35 @@ msgid ""
" from the <span class=\"guimenu\">Places</span> menu or the <span\n"
" class=\"guilabel\">home</span> icon on the desktop.\n"
msgstr ""
+" 1. Öffnen Sie den Dateimanager, entweder\n"
+" vom <span class=\"guimenu\">Orte</span>-Menü oder dem <span\n"
+" class=\"guilabel\">home</span>-Symbol auf dem Desktop.\n"
#. type: Bullet: ' 1. '
msgid "Navigate to the folder containing the files that you want to delete."
msgstr ""
+"Navigieren Sie zu dem Ordner, der die Dateien enthält, die Sie löschen "
+"möchten."
#. type: Bullet: ' 1. '
msgid "Select the files that you want to delete with the mouse."
-msgstr ""
+msgstr "Wählen Sie mit der Maus die Dateien aus, die Sie löschen möchten."
#. type: Bullet: ' 1. '
msgid ""
"Right-click on the files and choose <span class=\"guimenuitem\">Wipe</span>."
msgstr ""
+"Rechtsklicken Sie die Dateien und wählen Sie <span class=\"guimenuitem"
+"\">Sicheres löschen</span>."
#. type: Plain text
#, no-wrap
msgid " [[!img wipe_files.png link=no alt=\"Right-click&nbsp;▸ Wipe\"]]\n"
-msgstr ""
+msgstr " [[!img wipe_files.png link=no alt=\"Rechtsklick&nbsp;▸ Sicheres löschen\"]]\n"
#. type: Bullet: ' 1. '
msgid "Confirm."
-msgstr ""
+msgstr "Bestätigen Sie."
#. type: Plain text
#, no-wrap
@@ -176,6 +217,8 @@ msgid ""
" 1. The deletion will start. It can last from a few seconds to several minutes,\n"
" according to the size of the files. Be patient…\n"
msgstr ""
+" 1. Das Löschen wird beginnen. Es kann, je nach Größe der Dateien,\n"
+" von wenigen Sekunden bis zu einigen Minuten hin dauern. Seien Sie geduldig…\n"
#. type: Plain text
#, no-wrap
@@ -184,34 +227,46 @@ msgid ""
"the file (for example OpenOffice creates backup copies that allow\n"
"you to recover your work in case OpenOffice stops responding).</p>\n"
msgstr ""
+"<p>Das sichere Löschen von Dateien löscht keine potentiellen Sicherungskopien der Datei\n"
+"(beispielsweise erstellt OpenOffice Sicherungskopien, die es Ihnen erlauben\n"
+" Ihre Arbeit wiederherzustellen, für den Fall, dass OpenOffice nicht mehr reagiert).</p>\n"
#. type: Plain text
#, no-wrap
msgid "<a id=\"empty_trash\"></a>\n"
-msgstr ""
+msgstr "<a id=\"empty_trash\"></a>\n"
#. type: Title =
#, no-wrap
msgid "Emptying the trash\n"
-msgstr ""
+msgstr "Den Papierkorb entleeren\n"
#. type: Plain text
msgid ""
"Before considering [[securely cleaning the available space on a disk|"
"secure_deletion#index5h1]], make sure to empty the trash."
msgstr ""
+"Stellen Sie sicher, dass Sie den Papierkorb entleeren, bevor Sie es in "
+"Erwägung ziehen, [[jeglichen verfügbaren Speicherplatz auf dem Laufwerk "
+"sicher zu löschen|secure_deletion#index5h1]]."
#. type: Bullet: ' 1. '
msgid ""
"Open the file browser, either from the <span class=\"guimenu\">Places</span> "
"menu or the <span class=\"guilabel\">home</span> icon on the desktop."
msgstr ""
+"Öffnen Sie den Dateimanager, entweder vom <span class=\"guimenu\">Orte</"
+"span>-Menü oder über das <span class=\"guilabel\">home</span>-Symbol auf dem "
+"Desktop."
#. type: Bullet: ' 1. '
msgid ""
"Click on the disk on which you want to empty the trash in the left pane to "
"navigate to the root of this disk."
msgstr ""
+"Wählen Sie im linken Fensterbereich das Laufwerk aus, auf welchem Sie den "
+"Papierkorb entleeren möchten, um in das oberste Verzeichnis des Laufwerks zu "
+"navigieren."
#. type: Plain text
#, no-wrap
@@ -222,16 +277,23 @@ msgid ""
" <span class=\"guimenuitem\">Show hidden files</span></span>\n"
" to show hidden files.\n"
msgstr ""
+" 1. Wählen Sie in der Titelleiste\n"
+" <span class=\"menuchoice\">\n"
+" <span class=\"guimenu\">[[!img lib/go-down.png alt=\"Menu\" class=symbolic link=\"no\"]]</span>&nbsp;▸\n"
+" <span class=\"guimenuitem\">Verborgene Dateien anzeigen</span></span>\n"
+" aus, um verborgene Dateien anzuzeigen.\n"
#. type: Bullet: ' 1. '
msgid ""
"Delete the <span class=\"filename\">.Trash-1000</span> folder or similar."
msgstr ""
+"Löschen Sie den Ordner <span class=\"filename\">.Trash-1000</span> oder "
+"ähnlich."
#. type: Plain text
#, no-wrap
msgid "<div class=\"tip\">\n"
-msgstr ""
+msgstr "<div class=\"tip\">\n"
#. type: Plain text
#, no-wrap
@@ -239,16 +301,18 @@ msgid ""
"<p>Apply this technique to the <span class=\"filename\">Persistent</span>\n"
"folder to empty the trash of the persistent volume.</p>\n"
msgstr ""
+"<p>Wenden Sie die Vorgehensweise auf den <span class=\"filename\">Persistent</span>-Ordner\n"
+"an, um den Papierkorb des beständigen Speicherbereichs zu löschen.</p>\n"
#. type: Plain text
#, no-wrap
msgid "<a id=\"clean_disk_space\"></a>\n"
-msgstr ""
+msgstr "<a id=\"clean_disk_space\"></a>\n"
#. type: Title =
#, no-wrap
msgid "Securely clean available disk space\n"
-msgstr ""
+msgstr "Sicheres Löschen von verfügbarem Speicherplatz\n"
#. type: Plain text
msgid ""
@@ -256,6 +320,9 @@ msgid ""
"suppressed but not securely deleted from a disk, it is also possible to "
"securely clean all the free space on the disk."
msgstr ""
+"Um die Inhalte aller Dateien, die zuvor ausgelassen wurden, aber nicht "
+"sicher von dem Laufwerk gelöscht wurden, zu bereinigen, ist es auch möglich "
+"jeglichen freien Speicherplatz auf dem Laufwerk sicher zu löschen."
#. type: Plain text
#, no-wrap
@@ -263,12 +330,16 @@ msgid ""
"<p>This method does not work as expected on solid-state disks or USB\n"
"sticks.</p>\n"
msgstr ""
+"<p>Diese Vorgehensweise funktioniert mit Solid-State-Disks oder\n"
+"USB-Sticks nicht wie erwartet.</p>\n"
#. type: Plain text
msgid ""
"The disk or the folder may or may not contain other files. Those files will "
"not be deleted during the operation."
msgstr ""
+"Das Laufwerk oder der Ordner können andere Dateien enthalten oder nicht. "
+"Diese Dateien werden nicht während des Vorgangs gelöscht."
#. type: Plain text
#, no-wrap
@@ -276,18 +347,26 @@ msgid ""
" 1. Open the file browser, either from the <span class=\"guimenu\">Places</span> menu or\n"
" the <span class=\"guilabel\">home</span> icon on the desktop.\n"
msgstr ""
+" 1. Öffnen Sie den Dateimanager, entweder von dem <span class=\"guimenu\">Orte</span>-Menü oder\n"
+" dem <span class=\"guilabel\">home</span>-Symbol auf dem Desktop.\n"
#. type: Bullet: ' 1. '
msgid ""
"Click on the disk that you want to clean in the left pane to navigate to the "
"root of this disk."
msgstr ""
+"Wählen Sie im linken Speicherbereich das Speichermedium aus, welches Sie "
+"bereinigen möchten, um in das Stammverzeichnis des Speichermediums zu "
+"navigieren."
#. type: Bullet: ' 1. '
msgid ""
"Right-click in empty space in the right pane and choose <span class="
"\"guimenuitem\">Wipe available diskspace</span>."
msgstr ""
+"Rechtsklicken Sie in einen freien Bereich im rechten Fensterbereich und "
+"wählen Sie <span class=\"guimenuitem\">Sicheres Löschen des verfügbaren "
+"Festplattenplatzes</span>."
#. type: Plain text
#, no-wrap
@@ -295,6 +374,8 @@ msgid ""
" [[!img wipe_available_diskspace.png link=no alt=\"Right-click&nbsp;▸ Wipe\n"
" available diskspace\"]]\n"
msgstr ""
+" [[!img wipe_available_diskspace.png link=no alt=\"Rechtsklick&nbsp;▸ Sicheres Löschen\n"
+" des verfügbaren Festplattenplatzes\"]]\n"
#. type: Plain text
#, no-wrap
@@ -305,12 +386,20 @@ msgid ""
" [[instructions above|secure_deletion#index4h1]].</p>\n"
" </div>\n"
msgstr ""
+" <div class=\"tip\">\n"
+" <p>Auf dem vorherigen Bildschirmfoto wird der Papierkorb in dem Ordner<span\n"
+" class=\"filename\">.Trash-1000</span> nicht gelöscht. Lesen Sie die\n"
+" [[obigen Anweisungen|secure_deletion#index4h1]].</p>\n"
+" </div>\n"
#. type: Bullet: ' 1. '
msgid ""
"The cleaning starts. It can last from a few minutes to a few hours, "
"according to the size of the available diskspace. Be patient…"
msgstr ""
+"Die Bereinigung beginnt. Dies kann von einigen Minuten bis zu einigen "
+"Stunden hin dauern, je nachdem wie groß der verfügbare Speicherplatz ist. "
+"Seien Sie geduldig..."
#. type: Plain text
#, no-wrap
@@ -320,6 +409,10 @@ msgid ""
" folder. It is made as big as possible to use all the available diskspace and\n"
" then securely deleted.\n"
msgstr ""
+" Beachten Sie, dass eine Datei mit dem Namen <span\n"
+" class=\"filename\">oooooooo.ooo</span> in dem Ordner erstellt\n"
+" wird. Diese wird so groß wie möglich gemacht, um jeglichen verfügbaren\n"
+" Speicherplatz zu belegen und wird anschließend sicher gelöscht.\n"
#. type: Plain text
#, no-wrap
@@ -331,3 +424,9 @@ msgid ""
" in the titlebar to show them.\n"
"</p>\n"
msgstr ""
+"<p>Diese Option löscht keine verborgenen Dateien. Wählen Sie in der Titelleiste\n"
+" <span class=\"menuchoice\">\n"
+" <span class=\"guimenu\">[[!img lib/go-down.png alt=\"Menu\" class=symbolic link=no]]</span>&nbsp;▸\n"
+" <span class=\"guimenuitem\">Verborgene Dateien anzeigen</span></span>\n"
+" aus, um diese anzuzeigen.\n"
+"</p>\n"
diff --git a/wiki/src/doc/first_steps.index.de.po b/wiki/src/doc/first_steps.index.de.po
index 649a0ae..3b77f25 100644
--- a/wiki/src/doc/first_steps.index.de.po
+++ b/wiki/src/doc/first_steps.index.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2016-02-11 05:30+0100\n"
+"POT-Creation-Date: 2016-04-29 13:53+0000\n"
"PO-Revision-Date: 2016-02-06 17:27+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: \n"
@@ -16,50 +16,46 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.8.6\n"
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"tip\">\n"
-msgstr "<div class=\"tip\">\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>For installing and starting Tails, we recommend you try our new\n"
-"[[installation assistant|install]]. The following pages are the old\n"
-"instructions, provided as a fallback.</p>\n"
-msgstr ""
-"<p>Wir empfehlen Ihnen für das Installieren und Starten von Tails unseren neuen\n"
-"[[Installationsassistenten|install]]. Die nachfolgenden Seiten sind die alten\n"
-"Anweisungen, als Ausweichlösung</p>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
-msgstr "</div>\n"
-
#. type: Bullet: ' - '
-msgid ""
-"[[!traillink "
-"Choosing_between_burning_a_DVD_and_installing_onto_a_USB_stick_or_SD_card|"
-"first_steps/media]]"
-msgstr ""
-"[[!traillink Zwischen_dem_Brennen_einer_DVD,"
-"_oder_der_Installation_auf_einem_USB-Stick_oder_einer_SD-Karte_wählen|"
-"first_steps/media]]"
-
-#. type: Bullet: ' - '
-msgid "[[!traillink Burning_a_DVD|first_steps/dvd]]"
+#, fuzzy
+#| msgid "[[!traillink Burning_a_DVD|first_steps/dvd]]"
+msgid "[[!traillink Start_Tails|first_steps/start_tails]]"
msgstr "[[!traillink Eine_DVD_brennen|first_steps/dvd]]"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " - [[!traillink Installing_onto_a_USB_stick_or_SD_card|first_steps/installation]] (recommended)\n"
+#| " - [[!traillink Manually_Installing_onto_a_USB_stick_or_SD_card|first_steps/installation/manual]]\n"
+#| " using [[!traillink Linux|first_steps/installation/manual/linux]],\n"
+#| " [[!traillink Windows|first_steps/installation/manual/windows]],\n"
+#| " or [[!traillink Mac|first_steps/installation/manual/mac]]\n"
+#| " - [[!traillink Start_Tails|first_steps/start_tails]]\n"
+#| " - [[!traillink Startup_options|first_steps/startup_options]]\n"
+#| " - [[!traillink Administration_password|first_steps/startup_options/administration_password]]\n"
+#| " - [[!traillink MAC_address_spoofing|first_steps/startup_options/mac_spoofing]]\n"
+#| " - [[!traillink Network_configuration|first_steps/startup_options/network_configuration]]\n"
+#| " - [[!traillink Tor_bridge_mode|first_steps/startup_options/bridge_mode]]\n"
+#| " - [[!traillink Disabling_all_networking_(offline_mode)|first_steps/startup_options/offline_mode]]\n"
+#| " - [[!traillink Introduction_to_GNOME_and_the_Tails_desktop|first_steps/introduction_to_gnome_and_the_tails_desktop]]\n"
+#| " - [[!traillink Accessibility|first_steps/accessibility]]\n"
+#| " - [[!traillink Encrypted_persistence|first_steps/persistence]]\n"
+#| " - [[!traillink Warnings_about_persistence|first_steps/persistence/warnings]]\n"
+#| " - [[!traillink Create_&_configure_the_persistent_volume|first_steps/persistence/configure]]\n"
+#| " - [[!traillink Enable_&_use_the_persistent_volume|first_steps/persistence/use]]\n"
+#| " - [[!traillink Change_the_passphrase_of_the_persistent_volume|first_steps/persistence/change_passphrase]]\n"
+#| " - [[!traillink Manually_copy_your_persistent_data_to_a_new_device|first_steps/persistence/copy]]\n"
+#| " - [[!traillink Check_the_file_system_of_the_persistent_volume|first_steps/persistence/check_file_system]]\n"
+#| " - [[!traillink Delete_the_persistent_volume|first_steps/persistence/delete]]\n"
+#| " - [[!traillink Report_an_error|first_steps/bug_reporting]]\n"
+#| " - [[!traillink Tails_does_not_start|first_steps/bug_reporting/tails_does_not_start]]\n"
+#| " - [[!traillink Shutting_down_Tails|first_steps/shutdown]]\n"
+#| " - [[!traillink Upgrading_a_Tails_USB_stick_or_SD_card|first_steps/upgrade]]\n"
+#| " - Uninstalling Tails or resetting a USB stick or SD card\n"
+#| " using [[!traillink Linux|first_steps/reset/linux]],\n"
+#| " [[!traillink Windows|first_steps/reset/windows]],\n"
+#| " or [[!traillink Mac|first_steps/reset/mac]]\n"
msgid ""
-" - [[!traillink Installing_onto_a_USB_stick_or_SD_card|first_steps/installation]] (recommended)\n"
-" - [[!traillink Manually_Installing_onto_a_USB_stick_or_SD_card|first_steps/installation/manual]]\n"
-" using [[!traillink Linux|first_steps/installation/manual/linux]],\n"
-" [[!traillink Windows|first_steps/installation/manual/windows]],\n"
-" or [[!traillink Mac|first_steps/installation/manual/mac]]\n"
-" - [[!traillink Start_Tails|first_steps/start_tails]]\n"
" - [[!traillink Startup_options|first_steps/startup_options]]\n"
" - [[!traillink Administration_password|first_steps/startup_options/administration_password]]\n"
" - [[!traillink MAC_address_spoofing|first_steps/startup_options/mac_spoofing]]\n"
@@ -77,7 +73,6 @@ msgid ""
" - [[!traillink Check_the_file_system_of_the_persistent_volume|first_steps/persistence/check_file_system]]\n"
" - [[!traillink Delete_the_persistent_volume|first_steps/persistence/delete]]\n"
" - [[!traillink Report_an_error|first_steps/bug_reporting]]\n"
-" - [[!traillink Tails_does_not_start|first_steps/bug_reporting/tails_does_not_start]]\n"
" - [[!traillink Shutting_down_Tails|first_steps/shutdown]]\n"
" - [[!traillink Upgrading_a_Tails_USB_stick_or_SD_card|first_steps/upgrade]]\n"
" - Uninstalling Tails or resetting a USB stick or SD card\n"
@@ -115,3 +110,27 @@ msgstr ""
" unter [[!traillink Linux|first_steps/reset/linux]],\n"
" [[!traillink Windows|first_steps/reset/windows]],\n"
" oder [[!traillink Mac|first_steps/reset/mac]]\n"
+
+#~ msgid "<div class=\"tip\">\n"
+#~ msgstr "<div class=\"tip\">\n"
+
+#~ msgid ""
+#~ "<p>For installing and starting Tails, we recommend you try our new\n"
+#~ "[[installation assistant|install]]. The following pages are the old\n"
+#~ "instructions, provided as a fallback.</p>\n"
+#~ msgstr ""
+#~ "<p>Wir empfehlen Ihnen für das Installieren und Starten von Tails unseren neuen\n"
+#~ "[[Installationsassistenten|install]]. Die nachfolgenden Seiten sind die alten\n"
+#~ "Anweisungen, als Ausweichlösung</p>\n"
+
+#~ msgid "</div>\n"
+#~ msgstr "</div>\n"
+
+#~ msgid ""
+#~ "[[!traillink "
+#~ "Choosing_between_burning_a_DVD_and_installing_onto_a_USB_stick_or_SD_card|"
+#~ "first_steps/media]]"
+#~ msgstr ""
+#~ "[[!traillink Zwischen_dem_Brennen_einer_DVD,"
+#~ "_oder_der_Installation_auf_einem_USB-Stick_oder_einer_SD-Karte_wählen|"
+#~ "first_steps/media]]"
diff --git a/wiki/src/doc/first_steps.index.fa.po b/wiki/src/doc/first_steps.index.fa.po
index d3b8aac..26f2aa2 100644
--- a/wiki/src/doc/first_steps.index.fa.po
+++ b/wiki/src/doc/first_steps.index.fa.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2016-01-26 22:36+0100\n"
+"POT-Creation-Date: 2016-04-29 13:53+0000\n"
"PO-Revision-Date: 2015-10-25 18:08+0000\n"
"Last-Translator: sprint5 <translation5@451f.org>\n"
"Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/"
@@ -19,36 +19,10 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Weblate 2.4-dev\n"
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"tip\">\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>For installing and starting Tails, we recommend you try our new\n"
-"[[installation assistant|install]]. The following pages are the old\n"
-"instructions, provided as a fallback.</p>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
-msgstr ""
-
#. type: Bullet: ' - '
-msgid ""
-"[[!traillink "
-"Choosing_between_burning_a_DVD_and_installing_onto_a_USB_stick_or_SD_card|"
-"first_steps/media]]"
-msgstr ""
-"[[!traillink "
-"انتخاب_بین_ایجاد_یک_دی‌وی‌دی_و_نصب_روی_یک_درایو_یواس‌بی_یا_کارت_حافظه|"
-"first_steps/media]]"
-
-#. type: Bullet: ' - '
-msgid "[[!traillink Burning_a_DVD|first_steps/dvd]]"
+#, fuzzy
+#| msgid "[[!traillink Burning_a_DVD|first_steps/dvd]]"
+msgid "[[!traillink Start_Tails|first_steps/start_tails]]"
msgstr "[[!traillink ایجاد_یک_دی‌وی‌دی|first_steps/dvd]]"
#. type: Plain text
@@ -85,12 +59,6 @@ msgstr "[[!traillink ایجاد_یک_دی‌وی‌دی|first_steps/dvd]]"
#| " - [[!traillink Tails_does_not_start|first_steps/bug_reporting/tails_does_not_start]]\n"
#| " - [[!traillink Shutting_down_Tails|first_steps/shutdown]]\n"
msgid ""
-" - [[!traillink Installing_onto_a_USB_stick_or_SD_card|first_steps/installation]] (recommended)\n"
-" - [[!traillink Manually_Installing_onto_a_USB_stick_or_SD_card|first_steps/installation/manual]]\n"
-" using [[!traillink Linux|first_steps/installation/manual/linux]],\n"
-" [[!traillink Windows|first_steps/installation/manual/windows]],\n"
-" or [[!traillink Mac|first_steps/installation/manual/mac]]\n"
-" - [[!traillink Start_Tails|first_steps/start_tails]]\n"
" - [[!traillink Startup_options|first_steps/startup_options]]\n"
" - [[!traillink Administration_password|first_steps/startup_options/administration_password]]\n"
" - [[!traillink MAC_address_spoofing|first_steps/startup_options/mac_spoofing]]\n"
@@ -108,7 +76,6 @@ msgid ""
" - [[!traillink Check_the_file_system_of_the_persistent_volume|first_steps/persistence/check_file_system]]\n"
" - [[!traillink Delete_the_persistent_volume|first_steps/persistence/delete]]\n"
" - [[!traillink Report_an_error|first_steps/bug_reporting]]\n"
-" - [[!traillink Tails_does_not_start|first_steps/bug_reporting/tails_does_not_start]]\n"
" - [[!traillink Shutting_down_Tails|first_steps/shutdown]]\n"
" - [[!traillink Upgrading_a_Tails_USB_stick_or_SD_card|first_steps/upgrade]]\n"
" - Uninstalling Tails or resetting a USB stick or SD card\n"
@@ -146,3 +113,12 @@ msgstr ""
" - [[!traillink گزارش_یک_خطا|first_steps/bug_reporting]]\n"
" - [[!traillink تیلز_راه‌اندازی_نمی‌شود|first_steps/bug_reporting/tails_does_not_start]]\n"
" - [[!traillink خاموش_کردن_تیلز|first_steps/shutdown]]\n"
+
+#~ msgid ""
+#~ "[[!traillink "
+#~ "Choosing_between_burning_a_DVD_and_installing_onto_a_USB_stick_or_SD_card|"
+#~ "first_steps/media]]"
+#~ msgstr ""
+#~ "[[!traillink "
+#~ "انتخاب_بین_ایجاد_یک_دی‌وی‌دی_و_نصب_روی_یک_درایو_یواس‌بی_یا_کارت_حافظه|"
+#~ "first_steps/media]]"
diff --git a/wiki/src/doc/first_steps.index.fr.po b/wiki/src/doc/first_steps.index.fr.po
index 424410b..008312e 100644
--- a/wiki/src/doc/first_steps.index.fr.po
+++ b/wiki/src/doc/first_steps.index.fr.po
@@ -6,89 +6,25 @@
msgid ""
msgstr ""
"Project-Id-Version: SACKAGE VERSION\n"
-"POT-Creation-Date: 2016-01-26 22:36+0100\n"
-"PO-Revision-Date: 2014-10-08 08:44-0000\n"
+"POT-Creation-Date: 2016-05-12 15:19+0000\n"
+"PO-Revision-Date: 2016-05-06 22:37-0000\n"
"Last-Translator: \n"
"Language-Team: SLANGUAGE <LL@li.org>\n"
-"Language: \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.5.4\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"tip\">\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>For installing and starting Tails, we recommend you try our new\n"
-"[[installation assistant|install]]. The following pages are the old\n"
-"instructions, provided as a fallback.</p>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid ""
-"[[!traillink "
-"Choosing_between_burning_a_DVD_and_installing_onto_a_USB_stick_or_SD_card|"
-"first_steps/media]]"
-msgstr ""
-"[[!traillink "
-"Choisir_entre_graver_un_DVD_et_installer_sur_une_clé_USB_ou_une_carte_SD|"
-"first_steps/media]]"
+"X-Generator: Poedit 1.6.10\n"
#. type: Bullet: ' - '
-msgid "[[!traillink Burning_a_DVD|first_steps/dvd]]"
+#, fuzzy
+#| msgid "[[!traillink Burning_a_DVD|first_steps/dvd]]"
+msgid "[[!traillink Start_Tails|first_steps/start_tails]]"
msgstr "[[!traillink Graver_un_DVD|first_steps/dvd]]"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| " - [[!traillink Installing_onto_a_USB_stick_or_SD_card|first_steps/installation]] (recommended)\n"
-#| " - [[!traillink Manually_Installing_onto_a_USB_stick_or_SD_card|first_steps/installation/manual]]\n"
-#| " using [[!traillink Linux|first_steps/installation/manual/linux]],\n"
-#| " [[!traillink Windows|first_steps/installation/manual/windows]],\n"
-#| " or [[!traillink Mac|first_steps/installation/manual/mac]]\n"
-#| " - Uninstalling Tails or resetting a USB stick or SD card\n"
-#| " using [[!traillink Linux|first_steps/reset/linux]]\n"
-#| " [[!traillink Windows|first_steps/reset/windows]],\n"
-#| " or [[!traillink Mac|first_steps/reset/mac]]\n"
-#| " - [[!traillink Upgrading_a_Tails_USB_stick_or_SD_card|first_steps/upgrade]]\n"
-#| " - [[!traillink Start_Tails|first_steps/start_tails]]\n"
-#| " - [[!traillink Startup_options|first_steps/startup_options]]\n"
-#| " - [[!traillink Administration_password|first_steps/startup_options/administration_password]]\n"
-#| " - [[!traillink Windows_camouflage|first_steps/startup_options/windows_camouflage]]\n"
-#| " - [[!traillink MAC_address_spoofing|first_steps/startup_options/mac_spoofing]]\n"
-#| " - [[!traillink Network_configuration|first_steps/startup_options/network_configuration]]\n"
-#| " - [[!traillink Tor_bridge_mode|first_steps/startup_options/bridge_mode]]\n"
-#| " - [[!traillink Disabling_all_networking_(offline_mode)|first_steps/startup_options/offline_mode]]\n"
-#| " - [[!traillink Introduction_to_GNOME_and_the_Tails_desktop|first_steps/introduction_to_gnome_and_the_tails_desktop]]\n"
-#| " - [[!traillink Accessibility|first_steps/accessibility]]\n"
-#| " - [[!traillink Encrypted_persistence|first_steps/persistence]]\n"
-#| " - [[!traillink Warnings_about_persistence|first_steps/persistence/warnings]]\n"
-#| " - [[!traillink Create_&_configure_the_persistent_volume|first_steps/persistence/configure]]\n"
-#| " - [[!traillink Enable_&_use_the_persistent_volume|first_steps/persistence/use]]\n"
-#| " - [[!traillink Change_the_passphrase_of_the_persistent_volume|first_steps/persistence/change_passphrase]]\n"
-#| " - [[!traillink Manually_copy_your_persistent_data_to_a_new_device|first_steps/persistence/copy]]\n"
-#| " - [[!traillink Check_the_file_system_of_the_persistent_volume|first_steps/persistence/check_file_system]]\n"
-#| " - [[!traillink Delete_the_persistent_volume|first_steps/persistence/delete]]\n"
-#| " - [[!traillink Report_an_error|first_steps/bug_reporting]]\n"
-#| " - [[!traillink Tails_does_not_start|first_steps/bug_reporting/tails_does_not_start]]\n"
-#| " - [[!traillink Shutting_down_Tails|first_steps/shutdown]]\n"
+#, no-wrap
msgid ""
-" - [[!traillink Installing_onto_a_USB_stick_or_SD_card|first_steps/installation]] (recommended)\n"
-" - [[!traillink Manually_Installing_onto_a_USB_stick_or_SD_card|first_steps/installation/manual]]\n"
-" using [[!traillink Linux|first_steps/installation/manual/linux]],\n"
-" [[!traillink Windows|first_steps/installation/manual/windows]],\n"
-" or [[!traillink Mac|first_steps/installation/manual/mac]]\n"
-" - [[!traillink Start_Tails|first_steps/start_tails]]\n"
" - [[!traillink Startup_options|first_steps/startup_options]]\n"
" - [[!traillink Administration_password|first_steps/startup_options/administration_password]]\n"
" - [[!traillink MAC_address_spoofing|first_steps/startup_options/mac_spoofing]]\n"
@@ -106,7 +42,6 @@ msgid ""
" - [[!traillink Check_the_file_system_of_the_persistent_volume|first_steps/persistence/check_file_system]]\n"
" - [[!traillink Delete_the_persistent_volume|first_steps/persistence/delete]]\n"
" - [[!traillink Report_an_error|first_steps/bug_reporting]]\n"
-" - [[!traillink Tails_does_not_start|first_steps/bug_reporting/tails_does_not_start]]\n"
" - [[!traillink Shutting_down_Tails|first_steps/shutdown]]\n"
" - [[!traillink Upgrading_a_Tails_USB_stick_or_SD_card|first_steps/upgrade]]\n"
" - Uninstalling Tails or resetting a USB stick or SD card\n"
@@ -117,17 +52,11 @@ msgstr ""
" - [[!traillink Installation_sur_une_clé_USB_ou_une_carte_SD|first_steps/installation]] (recommandée)\n"
" - [[!traillink Installation_manuelle_sur_une_clé_USB_ou_une_carte_SD|first_steps/installation/manual]],\n"
" avec [[!traillink Linux|first_steps/installation/manual/linux]],\n"
-" avec [[!traillink Windows|first_steps/installation/manual/windows]],\n"
-" avec [[!traillink Mac|first_steps/installation/manual/mac]]\n"
-" - Désinstaller Tails ou réinitialiser une clé USB ou une carte SD,\n"
-" avec [[!traillink Linux|first_steps/reset/linux]],\n"
-" [[!traillink Windows|first_steps/reset/windows]],\n"
-" ou [[!traillink Mac|first_steps/reset/mac]]\n"
-" - [[!traillink Mettre_à_jour_une_clé_USB_ou_une_carte_SD_Tails|first_steps/upgrade]]\n"
+" [[!traillink Windows|first_steps/installation/manual/windows]]\n"
+" ou [[!traillink Mac|first_steps/installation/manual/mac]]\n"
" - [[!traillink Démarrer_Tails|first_steps/start_tails]]\n"
" - [[!traillink Options_de_démarrage|first_steps/startup_options]]\n"
-" - [[!traillink Mot_de_passe_administrateur|first_steps/startup_options/administration_password]]\n"
-" - [[!traillink Camouflage_Windows|first_steps/startup_options/windows_camouflage]]\n"
+" - [[!traillink Mot_de_passe_d'administration|first_steps/startup_options/administration_password]]\n"
" - [[!traillink Usurpation_d'adresse_MAC|first_steps/startup_options/mac_spoofing]]\n"
" - [[!traillink Configuration_du_réseau|first_steps/startup_options/network_configuration]]\n"
" - [[!traillink Tor_en_mode_bridge|first_steps/startup_options/bridge_mode]]\n"
@@ -145,3 +74,23 @@ msgstr ""
" - [[!traillink Rapporter_un_bug|first_steps/bug_reporting]]\n"
" - [[!traillink Tails_ne_démarre_pas|first_steps/bug_reporting/tails_does_not_start]]\n"
" - [[!traillink Éteindre_Tails|first_steps/shutdown]]\n"
+" - [[!traillink Mettre_à_jour_une_clé_USB_ou_une_carte_SD_Tails|first_steps/upgrade]]\n"
+" - Désinstaller Tails ou réinitialiser une clé USB ou une carte SD,\n"
+" avec [[!traillink Linux|first_steps/reset/linux]],\n"
+" [[!traillink Windows|first_steps/reset/windows]]\n"
+" ou [[!traillink Mac|first_steps/reset/mac]]\n"
+
+#~ msgid "<div class=\"tip\">\n"
+#~ msgstr "<div class=\"tip\">\n"
+
+#~ msgid ""
+#~ "<p>For installing and starting Tails, we recommend you try our new\n"
+#~ "[[installation assistant|install]]. The following pages are the old\n"
+#~ "instructions, provided as a fallback.</p>\n"
+#~ msgstr ""
+#~ "<p>Pour l'installation et le lancement de Tails, nous vous recommandons notre nouvel\n"
+#~ "[[assistant d'installation|install]]. Les pages suivantes contiennent de vieilles\n"
+#~ "instructions, fournies comme solution de secours.</p>\n"
+
+#~ msgid "</div>\n"
+#~ msgstr "</div>\n"
diff --git a/wiki/src/doc/first_steps.index.mdwn b/wiki/src/doc/first_steps.index.mdwn
index 4701e4f..35a49dc 100644
--- a/wiki/src/doc/first_steps.index.mdwn
+++ b/wiki/src/doc/first_steps.index.mdwn
@@ -1,18 +1,3 @@
-<div class="tip">
-
-<p>For installing and starting Tails, we recommend you try our new
-[[installation assistant|install]]. The following pages are the old
-instructions, provided as a fallback.</p>
-
-</div>
-
- - [[!traillink Choosing_between_burning_a_DVD_and_installing_onto_a_USB_stick_or_SD_card|first_steps/media]]
- - [[!traillink Burning_a_DVD|first_steps/dvd]]
- - [[!traillink Installing_onto_a_USB_stick_or_SD_card|first_steps/installation]] (recommended)
- - [[!traillink Manually_Installing_onto_a_USB_stick_or_SD_card|first_steps/installation/manual]]
- using [[!traillink Linux|first_steps/installation/manual/linux]],
- [[!traillink Windows|first_steps/installation/manual/windows]],
- or [[!traillink Mac|first_steps/installation/manual/mac]]
- [[!traillink Start_Tails|first_steps/start_tails]]
- [[!traillink Startup_options|first_steps/startup_options]]
- [[!traillink Administration_password|first_steps/startup_options/administration_password]]
@@ -31,7 +16,6 @@ instructions, provided as a fallback.</p>
- [[!traillink Check_the_file_system_of_the_persistent_volume|first_steps/persistence/check_file_system]]
- [[!traillink Delete_the_persistent_volume|first_steps/persistence/delete]]
- [[!traillink Report_an_error|first_steps/bug_reporting]]
- - [[!traillink Tails_does_not_start|first_steps/bug_reporting/tails_does_not_start]]
- [[!traillink Shutting_down_Tails|first_steps/shutdown]]
- [[!traillink Upgrading_a_Tails_USB_stick_or_SD_card|first_steps/upgrade]]
- Uninstalling Tails or resetting a USB stick or SD card
diff --git a/wiki/src/doc/first_steps.index.pt.po b/wiki/src/doc/first_steps.index.pt.po
index 89922b0..ebcde99 100644
--- a/wiki/src/doc/first_steps.index.pt.po
+++ b/wiki/src/doc/first_steps.index.pt.po
@@ -5,86 +5,26 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-01-26 22:36+0100\n"
-"PO-Revision-Date: 2014-07-30 18:34-0300\n"
+"Project-Id-Version: \n"
+"POT-Creation-Date: 2016-05-12 15:19+0000\n"
+"PO-Revision-Date: 2016-04-30 11:34-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Language: pt\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 "<div class=\"tip\">\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>For installing and starting Tails, we recommend you try our new\n"
-"[[installation assistant|install]]. The following pages are the old\n"
-"instructions, provided as a fallback.</p>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid ""
-"[[!traillink "
-"Choosing_between_burning_a_DVD_and_installing_onto_a_USB_stick_or_SD_card|"
-"first_steps/media]]"
-msgstr ""
-"[[!traillink "
-"Escolhendo_entre_gravar_um_DVD_e_instalar_em_uma_memória_USB_ou_cartão_SD|"
-"first_steps/media]]"
+"X-Generator: Poedit 1.6.10\n"
#. type: Bullet: ' - '
-msgid "[[!traillink Burning_a_DVD|first_steps/dvd]]"
+#, fuzzy
+#| msgid "[[!traillink Burning_a_DVD|first_steps/dvd]]"
+msgid "[[!traillink Start_Tails|first_steps/start_tails]]"
msgstr "[[!traillink Gravando_um_DVD|first_steps/dvd]]"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| " - [[!traillink Installing_onto_a_USB_stick_or_SD_card|first_steps/installation]] (recommended)\n"
-#| " - [[!traillink Manually_Installing_onto_a_USB_stick_or_SD_card|first_steps/installation/manual]],\n"
-#| " using [[!traillink Linux|first_steps/installation/manual/linux]],\n"
-#| " using [[!traillink Windows|first_steps/installation/manual/windows]],\n"
-#| " using [[!traillink Mac|first_steps/installation/manual/mac]]\n"
-#| " - Uninstalling Tails or resetting a USB stick or SD card,\n"
-#| " using [[!traillink Linux|first_steps/reset/linux]],\n"
-#| " using [[!traillink Windows|first_steps/reset/windows]]\n"
-#| " - [[!traillink Upgrading_a_Tails_USB_stick_or_SD_card|first_steps/upgrade]]\n"
-#| " - [[!traillink Start_Tails|first_steps/start_tails]]\n"
-#| " - [[!traillink Startup_options|first_steps/startup_options]]\n"
-#| " - [[!traillink Administration_password|first_steps/startup_options/administration_password]]\n"
-#| " - [[!traillink Windows_camouflage|first_steps/startup_options/windows_camouflage]]\n"
-#| " - [[!traillink MAC_address_spoofing|first_steps/startup_options/mac_spoofing]]\n"
-#| " - [[!traillink Network_configuration|first_steps/startup_options/network_configuration]]\n"
-#| " - [[!traillink Tor_bridge_mode|first_steps/startup_options/bridge_mode]]\n"
-#| " - [[!traillink Introduction_to_GNOME_and_the_Tails_desktop|first_steps/introduction_to_gnome_and_the_tails_desktop]]\n"
-#| " - [[!traillink Accessibility|first_steps/accessibility]]\n"
-#| " - [[!traillink Encrypted_persistence|first_steps/persistence]]\n"
-#| " - [[!traillink Warnings_about_persistence|first_steps/persistence/warnings]]\n"
-#| " - [[!traillink Create_&_configure_the_persistent_volume|first_steps/persistence/configure]]\n"
-#| " - [[!traillink Enable_&_use_the_persistent_volume|first_steps/persistence/use]]\n"
-#| " - [[!traillink Change_the_passphrase_of_the_persistent_volume|first_steps/persistence/change_passphrase]]\n"
-#| " - [[!traillink Manually_copy_your_persistent_data_to_a_new_device|first_steps/persistence/copy]]\n"
-#| " - [[!traillink Delete_the_persistent_volume|first_steps/persistence/delete]]\n"
-#| " - [[!traillink Report_an_error|first_steps/bug_reporting]]\n"
-#| " - [[!traillink Tails_does_not_start|first_steps/bug_reporting/tails_does_not_start]]\n"
-#| " - [[!traillink Shutting_down_Tails|first_steps/shutdown]]\n"
+#, no-wrap
msgid ""
-" - [[!traillink Installing_onto_a_USB_stick_or_SD_card|first_steps/installation]] (recommended)\n"
-" - [[!traillink Manually_Installing_onto_a_USB_stick_or_SD_card|first_steps/installation/manual]]\n"
-" using [[!traillink Linux|first_steps/installation/manual/linux]],\n"
-" [[!traillink Windows|first_steps/installation/manual/windows]],\n"
-" or [[!traillink Mac|first_steps/installation/manual/mac]]\n"
-" - [[!traillink Start_Tails|first_steps/start_tails]]\n"
" - [[!traillink Startup_options|first_steps/startup_options]]\n"
" - [[!traillink Administration_password|first_steps/startup_options/administration_password]]\n"
" - [[!traillink MAC_address_spoofing|first_steps/startup_options/mac_spoofing]]\n"
@@ -102,7 +42,6 @@ msgid ""
" - [[!traillink Check_the_file_system_of_the_persistent_volume|first_steps/persistence/check_file_system]]\n"
" - [[!traillink Delete_the_persistent_volume|first_steps/persistence/delete]]\n"
" - [[!traillink Report_an_error|first_steps/bug_reporting]]\n"
-" - [[!traillink Tails_does_not_start|first_steps/bug_reporting/tails_does_not_start]]\n"
" - [[!traillink Shutting_down_Tails|first_steps/shutdown]]\n"
" - [[!traillink Upgrading_a_Tails_USB_stick_or_SD_card|first_steps/upgrade]]\n"
" - Uninstalling Tails or resetting a USB stick or SD card\n"
@@ -112,20 +51,16 @@ msgid ""
msgstr ""
" - [[!traillink Instalando_em_uma_memória_USB_ou_cartão_SD|first_steps/installation]] (recomendado)\n"
" - [[!traillink Instalando_manualmente_em_uma_memória_USB_ou_cartão_SD|first_steps/installation/manual]],\n"
-" em [[!traillink Linux|first_steps/installation/manual/linux]],\n"
-" em [[!traillink Windows|first_steps/installation/manual/windows]],\n"
-" em [[!traillink Mac|first_steps/installation/manual/mac]]\n"
-" - Desinstalando Tails ou Resetando uma memória USB ou cartão SD,\n"
-" em [[!traillink Linux|first_steps/reset/linux]],\n"
-" em [[!traillink Windows|first_steps/reset/windows]]\n"
-" - [[!traillink Atualizando_uma_memória_USB_ou_cartão_SD_com_Tails|first_steps/upgrade]]\n"
+" usando [[!traillink Linux|first_steps/installation/manual/linux]],\n"
+" [[!traillink Windows|first_steps/installation/manual/windows]],\n"
+" ou [[!traillink Mac|first_steps/installation/manual/mac]]\n"
" - [[!traillink Inicie_o_Tails|first_steps/start_tails]]\n"
" - [[!traillink Opções_de_Inicialização|first_steps/startup_options]]\n"
" - [[!traillink Senha_de_administração|first_steps/startup_options/administration_password]]\n"
-" - [[!traillink Camuflagem_Windows|first_steps/startup_options/windows_camouflage]]\n"
" - [[!traillink Troca_de_endereço_MAC|first_steps/startup_options/mac_spoofing]]\n"
" - [[!traillink Configuração_de_rede|first_steps/startup_options/network_configuration]]\n"
" - [[!traillink Modo_Tor_Bridge|first_steps/startup_options/bridge_mode]]\n"
+" - [[!traillink Desabilitando_toda_a_rede_(modo_offline)|first_steps/startup_options/offline_mode]]\n"
" - [[!traillink Introdução_ao_GNOME_e_ao_Desktop_Tails|first_steps/introduction_to_gnome_and_the_tails_desktop]]\n"
" - [[!traillink Acessibilidade|first_steps/accessibility]]\n"
" - [[!traillink Persistência_criptografada|first_steps/persistence]]\n"
@@ -134,7 +69,27 @@ msgstr ""
" - [[!traillink Habilite_e_use_o_volume_persistente|first_steps/persistence/use]]\n"
" - [[!traillink Mude_a_senha_do_volume_persistente|first_steps/persistence/change_passphrase]]\n"
" - [[!traillink Copie_manualmente_os_dados_persistentes_para_um_novo_dispositivo|first_steps/persistence/copy]]\n"
+" - [[!traillink Verifique_o_sistema_de_arquivos_do_volume_persistente|first_steps/persistence/check_file_system]]\n"
" - [[!traillink Apague_o_volume_persistente|first_steps/persistence/delete]]\n"
" - [[!traillink Relate_um_erro|first_steps/bug_reporting]]\n"
" - [[!traillink O_Tails_não_inicia|first_steps/bug_reporting/tails_does_not_start]]\n"
" - [[!traillink Desligando_o_Tails|first_steps/shutdown]]\n"
+" - Desinstalando Tails ou Resetando uma memória USB ou cartão SD,\n"
+" usando [[!traillink Linux|first_steps/reset/linux]],\n"
+" [[!traillink Windows|first_steps/reset/windows]],\n"
+" ou [[!traillink Mac|first_steps/reset/mac]]\n"
+
+#~ msgid "<div class=\"tip\">\n"
+#~ msgstr "<div class=\"tip\">\n"
+
+#~ msgid ""
+#~ "<p>For installing and starting Tails, we recommend you try our new\n"
+#~ "[[installation assistant|install]]. The following pages are the old\n"
+#~ "instructions, provided as a fallback.</p>\n"
+#~ msgstr ""
+#~ "<p>Para instalar e iniciar o Tails, recomendamos que você experimente nosso novo\n"
+#~ "[[assistente de instalação|install]]. As páginas a seguir são as instruções antigas,\n"
+#~ "disponibilizadas como uma referência alternativa.</p>\n"
+
+#~ msgid "</div>\n"
+#~ msgstr "</div>\n"
diff --git a/wiki/src/doc/first_steps/bug_reporting.de.po b/wiki/src/doc/first_steps/bug_reporting.de.po
index aea07d8..9cf7f7e 100644
--- a/wiki/src/doc/first_steps/bug_reporting.de.po
+++ b/wiki/src/doc/first_steps/bug_reporting.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2015-09-30 16:26+0300\n"
+"POT-Creation-Date: 2016-04-29 15:20+0000\n"
"PO-Revision-Date: 2015-10-04 19:49+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: Tails Language Team <tails@boum.org>\n"
@@ -370,11 +370,34 @@ msgstr ""
"Starten Sie ein System, das eine Internetverbindung hat und versenden Sie "
"ihre Fehlerbeschreibung"
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "<a id=\"no_internet_access\"></a>\n"
+msgid "<a id=\"does_not_start\"></a>\n"
+msgstr "<a id=\"no_internet_access\"></a>\n"
+
#. type: Title -
#, no-wrap
msgid "Tails does not start\n"
msgstr "Tails startet nicht\n"
#. type: Plain text
-msgid "See [[Tails_does_not_start]]."
-msgstr "Lesen Sie [[Tails startet nicht|Tails_does_not_start]]."
+msgid ""
+"For troubleshooting instructions in case Tails fails to start, refer to our "
+"installation instructions on:"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid "[[Starting a PC on a USB|install/debian/usb#start-tails]]"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid "[[Starting a Mac on a USB|install/mac/usb#start-intermediary]]"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid "[[Starting a Mac on a DVD|install/mac/dvd#start-dvd]]"
+msgstr ""
+
+#~ msgid "See [[Tails_does_not_start]]."
+#~ msgstr "Lesen Sie [[Tails startet nicht|Tails_does_not_start]]."
diff --git a/wiki/src/doc/first_steps/bug_reporting.fa.po b/wiki/src/doc/first_steps/bug_reporting.fa.po
index 710af78..f47a567 100644
--- a/wiki/src/doc/first_steps/bug_reporting.fa.po
+++ b/wiki/src/doc/first_steps/bug_reporting.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: 2015-12-24 15:03+0100\n"
+"POT-Creation-Date: 2016-04-29 15:20+0000\n"
"PO-Revision-Date: 2015-10-06 10:27+0000\n"
"Last-Translator: sprint5 <translation5@451f.org>\n"
"Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/"
@@ -366,11 +366,34 @@ msgstr "سند را روی یک درایو یو‌اس‌بی ذخیره کنی
msgid "Boot into a system with Internet connection and send your report"
msgstr "وارد سیستمی شوید که دسترسی به اینترنت دارد و گزارش خود را بفرستید"
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "<a id=\"no_internet_access\"></a>\n"
+msgid "<a id=\"does_not_start\"></a>\n"
+msgstr "<a id=\"no_internet_access\"></a>\n"
+
#. type: Title -
#, no-wrap
msgid "Tails does not start\n"
msgstr "در صورتی که تیلز راه‌اندازی نمی‌شود\n"
#. type: Plain text
-msgid "See [[Tails_does_not_start]]."
-msgstr "بروید به [[Tails_does_not_start]]."
+msgid ""
+"For troubleshooting instructions in case Tails fails to start, refer to our "
+"installation instructions on:"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid "[[Starting a PC on a USB|install/debian/usb#start-tails]]"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid "[[Starting a Mac on a USB|install/mac/usb#start-intermediary]]"
+msgstr ""
+
+#. type: Bullet: ' - '
+msgid "[[Starting a Mac on a DVD|install/mac/dvd#start-dvd]]"
+msgstr ""
+